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

1 files changed, 48 insertions, 45 deletions

diff --git a/data/mobs/examples/mutant_rat.yaml b/data/mobs/examples/mutant_rat.yaml
index 676b510..233bd50 100644
--- a/data/mobs/examples/mutant_rat.yaml
+++ b/data/mobs/examples/mutant_rat.yaml
@@ -1,48 +1,51 @@
-name: mutant rat
-description: "A bloated rodent with glowing green eyes and exposed muscle tissue. Bio-engineering runoff has made it unnaturally aggressive."
-idle_descriptions:
-  - "scurries frantically in circles"
-  - "gnaws on a rusted pipe"
-  - "emits a gurgling screech"
-  - "twitches unnaturally"
-drops:
-  remains: bones
-  loot:
-    - item_id: credits
-      weight: 60
-      quantity: 20
-    - item_id: scrap
-      weight: 30
-    - item_id: credits
-      weight: 10
-      quantity: 60
 combat:
-  kind: combat
-  stats:
-    hp: 32
-    attack: 13
-    strength: 13
-    defense: 12
-    attack_type: crush
-    speed: 4
     aggressive: true
+    attack_types:
+        - crush
+    combat_descriptions:
+        - bites %s with glowing teeth
+        - slashes %s with mutated claws
+        - lunges at %s with unnatural speed
+    kind: combat
     respawn_ticks: 25
-    bonuses:
-      attack_bonus: 8
-      strength_bonus: 6
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 15
-      slash_defense: 15
-      crush_defense: 10
-      science_defense: -10
-      ranged_defense: 5
-      weakness: bio
-  size: small
-  combat_descriptions:
-    - "bites %s with glowing teeth"
-    - "slashes %s with mutated claws"
-    - "lunges at %s with unnatural speed"
+    size: small
+    stats:
+        attack: 13
+        bonuses:
+            attack_bonus: 8
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 6
+        defense: 12
+        defenses:
+            crush_defense: 10
+            ranged_defense: 5
+            science_defense: -10
+            slash_defense: 15
+            stab_defense: 15
+            weakness: bio
+            weakness_percent: 50
+        hp: 32
+        max_melee_hit: 2
+        speed: 4
+        strength: 13
+description: A bloated rodent with glowing green eyes and exposed muscle tissue. Bio-engineering runoff has made it unnaturally aggressive.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 20
+          weight: 60
+        - item_id: scrap
+          weight: 30
+        - item_id: credits
+          quantity: 60
+          weight: 10
+    remains: bones
+idle_descriptions:
+    - scurries frantically in circles
+    - gnaws on a rusted pipe
+    - emits a gurgling screech
+    - twitches unnaturally
+name: mutant rat