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

1 files changed, 42 insertions, 39 deletions

diff --git a/data/mobs/examples/zombie.yaml b/data/mobs/examples/zombie.yaml
index 77bb5ed..e104989 100644
--- a/data/mobs/examples/zombie.yaml
+++ b/data/mobs/examples/zombie.yaml
@@ -1,42 +1,45 @@
-name: zombie
-description: "A shambling corpse reanimated by residual asteroid radiation."
-idle_descriptions:
-  - "groans and shuffles forward"
-  - "reaches out with decaying arms"
-  - "stumbles and catches itself"
-  - "stares blankly ahead"
-drops:
-  remains: bones
-  loot:
-    - item_id: credits
-      weight: 60
-      quantity: 50
-    - item_id: credits
-      weight: 40
-      quantity: 200
 combat:
-  kind: combat
-  stats:
-    hp: 30
-    attack: 10
-    strength: 8
-    defense: 8
-    attack_type: crush
-    speed: 6
     aggressive: true
+    attack_types:
+        - crush
+    kind: combat
     respawn_ticks: 35
-    bonuses:
-      attack_bonus: 4
-      strength_bonus: 6
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 8
-      slash_defense: 20
-      crush_defense: -8
-      science_defense: -15
-      ranged_defense: 8
-      weakness: solar
-  size: medium
+    size: medium
+    stats:
+        attack: 10
+        bonuses:
+            attack_bonus: 4
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 6
+        defense: 8
+        defenses:
+            crush_defense: -8
+            ranged_defense: 8
+            science_defense: -15
+            slash_defense: 20
+            stab_defense: 8
+            weakness: solar
+            weakness_percent: 50
+        hp: 30
+        max_melee_hit: 2
+        speed: 6
+        strength: 8
+description: A shambling corpse reanimated by residual asteroid radiation.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 50
+          weight: 60
+        - item_id: credits
+          quantity: 200
+          weight: 40
+    remains: bones
+idle_descriptions:
+    - groans and shuffles forward
+    - reaches out with decaying arms
+    - stumbles and catches itself
+    - stares blankly ahead
+name: zombie