add scary type-safe getter

epic-64 · Oct 20, 2024 · 95a7002 · 95a7002
1 parent c8457f9
commit 95a7002
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 16 deletions.
diff --git a/src/main/scala/ScalaScape/ScalaScape.scala b/src/main/scala/ScalaScape/ScalaScape.scala
@@ -43,8 +43,14 @@ class ScalaScape(forceTerminal: Boolean):
       while (running) {
         val startTime = System.nanoTime()
 
-        update(state)
-        draw(graphics)
+        try {
+          update(state)
+          draw(graphics)
+        } catch {
+          case e: Exception =>
+            running = false
+            e.printStackTrace()
+        }
         screen.refresh()
 
         val endTime = System.nanoTime()

diff --git a/src/main/scala/ScalaScape/components/GameState.scala b/src/main/scala/ScalaScape/components/GameState.scala
@@ -18,7 +18,7 @@ class GameState:
 end GameState
 
 class SkillList:
-  val woodcutting: Woodcutting       = Woodcutting()
-  val woodCuttingOak: WoodCuttingOak = WoodCuttingOak()
-  val woodCuttingTeak: WoodCuttingTeak = WoodCuttingTeak()
+  val woodcutting: Woodcutting = Woodcutting()
+  // val woodCuttingOak: WoodCuttingOak = WoodCuttingOak()
+  // val woodCuttingTeak: WoodCuttingTeak = WoodCuttingTeak()
 end SkillList
diff --git a/src/main/scala/ScalaScape/components/Scenes.scala b/src/main/scala/ScalaScape/components/Scenes.scala
@@ -124,18 +124,20 @@ class WoodCuttingOakScene extends SubSkillScene:
   override val name        = "Oak"
   override val description = "Cut down some oak trees."
 
-  override def getSkill(state: GameState): WoodCuttingOak = state.skills.woodCuttingOak
-  override def asciiArt(pos: Pos): TerminalParagraph     = WoodCuttingArtwork(pos)
-  override def previousScene: Scene                      = WoodCuttingMenuScene()
+  override def getSkill(state: GameState): WoodCuttingOak =
+    state.skills.woodcutting.subSkill[WoodCuttingOak]
+  override def asciiArt(pos: Pos): TerminalParagraph      = WoodCuttingArtwork(pos)
+  override def previousScene: Scene                       = WoodCuttingMenuScene()
 end WoodCuttingOakScene
 
 class WoodCuttingTeakScene extends SubSkillScene:
   override val name        = "Teak"
   override val description = "Cut down some teak trees."
-
-  override def getSkill(state: GameState): WoodCuttingTeak = state.skills.woodCuttingTeak
-  override def asciiArt(pos: Pos): TerminalParagraph       = WoodCuttingArtwork(pos)
-  override def previousScene: Scene                        = WoodCuttingMenuScene()
+
+  override def getSkill(state: GameState): WoodCuttingTeak =
+    state.skills.woodcutting.subSkill[WoodCuttingTeak]
+  override def asciiArt(pos: Pos): TerminalParagraph            = WoodCuttingArtwork(pos)
+  override def previousScene: Scene                             = WoodCuttingMenuScene()
 end WoodCuttingTeakScene
 
 class MiningMenuScene extends MenuScene:

diff --git a/src/main/scala/ScalaScape/components/Skills.scala b/src/main/scala/ScalaScape/components/Skills.scala
@@ -1,6 +1,7 @@
 package ScalaScape.components
 
 import com.googlecode.lanterna.TextColor.ANSI.*
+import scala.reflect.ClassTag
 
 trait Skill:
   val name: String
@@ -102,6 +103,18 @@ trait SubSkill extends Skill:
 end SubSkill
 
 case class Woodcutting() extends Skill:
+  private val subSkills: List[SubSkill] = List(
+    WoodCuttingOak(),
+    WoodCuttingTeak(),
+  )
+
+  def subSkill[T <: SubSkill : ClassTag]: T =
+    val skill = subSkills.collectFirst { case skill: T => skill }
+    skill match {
+      case Some(s) => s
+      case None    => throw new Exception(s"SubSkill ${implicitly[ClassTag[T]].runtimeClass.getSimpleName} not found.")
+    }
+
   override val name: String = "Woodcutting"
 
   override def onComplete(state: GameState, gainedXp: WidthInColumns): Unit =
@@ -114,8 +127,6 @@ class WoodCuttingOak() extends SubSkill:
 
   override def parent(state: GameState): Woodcutting = state.skills.woodcutting
 
-  def getInventorySlot(state: GameState): InventoryItem = state.inventory.items("Oak")
-
   override def onComplete(state: GameState, gainedXp: Int): Unit =
     val key                 = "Oak"
     val item: InventoryItem = state.inventory.items(key)
@@ -134,8 +145,6 @@ class WoodCuttingTeak() extends SubSkill:
 
   override def parent(state: GameState): Woodcutting = state.skills.woodcutting
 
-  def getInventorySlot(state: GameState): InventoryItem = state.inventory.items("Teak")
-
   override def onComplete(state: GameState, gainedXp: Int): Unit =
     val key                 = "Teak"
     val item: InventoryItem = state.inventory.items(key)