fix: combat formulas and mob attack types (mobs switch attack styles if safespotting)

1 files changed, 48 insertions, 46 deletions

diff --git a/data/mobs/examples/phantom.yaml b/data/mobs/examples/phantom.yaml
index fad8167..34ddcdd 100644
--- a/data/mobs/examples/phantom.yaml
+++ b/data/mobs/examples/phantom.yaml
@@ -1,49 +1,51 @@
-name: phantom
-description: "A semi-transparent entity that phases in and out of visible light. Its psychic attacks are devastating to anyone without a spectral visor."
-idle_descriptions:
-  - "flickers between visible and invisible"
-  - "emits a low, resonant hum"
-  - "drifts through a wall and back again"
-  - "stares at you with hollow, glowing eyes"
-drops:
-  remains: ectoplasm
-  loot:
-    - item_id: credits
-      weight: 60
-      quantity: 500
-    - item_id: spectral_visor
-      weight: 3
-    - item_id: credits
-      weight: 37
-      quantity: 1000
 combat:
-  kind: combat
-  stats:
-    hp: 100
-    attack: 35
-    strength: 30
-    defense: 25
-    attack_type: crush
-    speed: 3
     aggressive: true
+    assassin_level: 45
+    attack_types:
+        - crush
+    combat_descriptions:
+        - blasts %s with a psychic wave
+        - phases through %s's defenses
+        - unleashes a spectral shriek at %s
+    damage_without: spectral_visor
+    kind: combat
     respawn_ticks: 50
-    bonuses:
-      attack_bonus: 0
-      strength_bonus: 0
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 0
-      slash_defense: 0
-      crush_defense: 0
-      science_defense: 0
-      ranged_defense: 0
-  assassin_level: 45
-  damage_without: spectral_visor
-  size: medium
-  combat_descriptions:
-    - "blasts %s with a psychic wave"
-    - "phases through %s's defenses"
-    - "unleashes a spectral shriek at %s"
+    size: medium
+    stats:
+        attack: 35
+        bonuses:
+            attack_bonus: 0
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 0
+        defense: 25
+        defenses:
+            crush_defense: 0
+            ranged_defense: 0
+            science_defense: 0
+            slash_defense: 0
+            stab_defense: 0
+        hp: 100
+        max_melee_hit: 4
+        speed: 3
+        strength: 30
+description: A semi-transparent entity that phases in and out of visible light. Its psychic attacks are devastating to anyone without a spectral visor.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 500
+          weight: 60
+        - item_id: spectral_visor
+          weight: 3
+        - item_id: credits
+          quantity: 1000
+          weight: 37
+    remains: ectoplasm
+idle_descriptions:
+    - flickers between visible and invisible
+    - emits a low, resonant hum
+    - drifts through a wall and back again
+    - stares at you with hollow, glowing eyes
+name: phantom