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

1 files changed, 61 insertions, 58 deletions

diff --git a/data/mobs/examples/void_reaper.yaml b/data/mobs/examples/void_reaper.yaml
index bf85470..4223f69 100644
--- a/data/mobs/examples/void_reaper.yaml
+++ b/data/mobs/examples/void_reaper.yaml
@@ -1,61 +1,64 @@
-name: void reaper
-description: "A shadowy figure that seems to absorb light itself. Its form shifts between a hooded specter and an armored construct. A scythe of dark energy flickers in its grasp."
-idle_descriptions:
-  - "flickers in and out of existence"
-  - "draws the warmth from the surrounding air"
-  - "whispers in a language that predates humanity"
-  - "reaches out with shadowy tendrils"
-drops:
-  remains: ectoplasm
-  loot:
-    - item_id: credits
-      weight: 30
-      quantity: 20000
-    - item_id: law_identifier
-      weight: 5
-    - item_id: death_identifier
-      weight: 5
-    - item_id: blood_identifier
-      weight: 5
-    - item_id: bloodjunk
-      weight: 20
-      quantity: 10
-    - table: gem_table
-      weight: 15
-    - item_id: uncut_diamond
-      weight: 10
-      quantity: 5
-    - table: herb_table_high
-      weight: 10
 combat:
-  kind: combat
-  stats:
-    hp: 170
-    attack: 62
-    strength: 68
-    defense: 72
-    attack_type: slash
-    speed: 3
     aggressive: true
+    assassin_level: 80
+    attack_types:
+        - slash
+    combat_descriptions:
+        - swings its void scythe at %s
+        - drains the life force from %s
+        - envelops %s in absolute darkness
+    finishing_blow: lawjunk
+    kind: combat
     respawn_ticks: 200
-    bonuses:
-      attack_bonus: 60
-      strength_bonus: 60
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 100
-      slash_defense: 110
-      crush_defense: 90
-      science_defense: -45
-      ranged_defense: 75
-      weakness: bio
-  assassin_level: 80
-  finishing_blow: lawjunk
-  size: massive
-  combat_descriptions:
-    - "swings its void scythe at %s"
-    - "drains the life force from %s"
-    - "envelops %s in absolute darkness"
+    size: massive
+    stats:
+        attack: 62
+        bonuses:
+            attack_bonus: 60
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 60
+        defense: 72
+        defenses:
+            crush_defense: 90
+            ranged_defense: 75
+            science_defense: -45
+            slash_defense: 110
+            stab_defense: 100
+            weakness: bio
+            weakness_percent: 50
+        hp: 170
+        max_melee_hit: 15
+        speed: 3
+        strength: 68
+description: A shadowy figure that seems to absorb light itself. Its form shifts between a hooded specter and an armored construct. A scythe of dark energy flickers in its grasp.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 20000
+          weight: 30
+        - item_id: law_identifier
+          weight: 5
+        - item_id: death_identifier
+          weight: 5
+        - item_id: blood_identifier
+          weight: 5
+        - item_id: bloodjunk
+          quantity: 10
+          weight: 20
+        - table: gem_table
+          weight: 15
+        - item_id: uncut_diamond
+          quantity: 5
+          weight: 10
+        - table: herb_table_high
+          weight: 10
+    remains: ectoplasm
+idle_descriptions:
+    - flickers in and out of existence
+    - draws the warmth from the surrounding air
+    - whispers in a language that predates humanity
+    - reaches out with shadowy tendrils
+name: void reaper