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

1 files changed, 47 insertions, 44 deletions

diff --git a/data/mobs/examples/ghoul.yaml b/data/mobs/examples/ghoul.yaml
index 070d6f1..49be88f 100644
--- a/data/mobs/examples/ghoul.yaml
+++ b/data/mobs/examples/ghoul.yaml
@@ -1,47 +1,50 @@
-name: ghoul
-description: "A radiation-scarred crew member, barely recognizable as human. Its flesh glows faintly and its eyes are hollow sockets."
-idle_descriptions:
-  - "shambles aimlessly and moans"
-  - "scratches at the walls leaving glowing marks"
-  - "stares blankly into the darkness"
-  - "emits a low, rattling groan"
-drops:
-  remains: bones
-  loot:
-    - item_id: credits
-      weight: 60
-      quantity: 80
-    - item_id: scrap
-      weight: 25
-    - table: herb_table_low
-      weight: 15
 combat:
-  kind: combat
-  stats:
-    hp: 54
-    attack: 22
-    strength: 22
-    defense: 20
-    attack_type: crush
-    speed: 4
     aggressive: true
+    attack_types:
+        - crush
+    combat_descriptions:
+        - claws at %s with irradiated hands
+        - lunges at %s with a gurgling shriek
+        - bites %s with decaying teeth
+    kind: combat
     respawn_ticks: 35
-    bonuses:
-      attack_bonus: 15
-      strength_bonus: 12
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 20
-      slash_defense: 25
-      crush_defense: 15
-      science_defense: -5
-      ranged_defense: 20
-      weakness: hydro
-  size: medium
-  combat_descriptions:
-    - "claws at %s with irradiated hands"
-    - "lunges at %s with a gurgling shriek"
-    - "bites %s with decaying teeth"
+    size: medium
+    stats:
+        attack: 22
+        bonuses:
+            attack_bonus: 15
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 12
+        defense: 20
+        defenses:
+            crush_defense: 15
+            ranged_defense: 20
+            science_defense: -5
+            slash_defense: 25
+            stab_defense: 20
+            weakness: hydro
+            weakness_percent: 50
+        hp: 54
+        max_melee_hit: 4
+        speed: 4
+        strength: 22
+description: A radiation-scarred crew member, barely recognizable as human. Its flesh glows faintly and its eyes are hollow sockets.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 80
+          weight: 60
+        - item_id: scrap
+          weight: 25
+        - table: herb_table_low
+          weight: 15
+    remains: bones
+idle_descriptions:
+    - shambles aimlessly and moans
+    - scratches at the walls leaving glowing marks
+    - stares blankly into the darkness
+    - emits a low, rattling groan
+name: ghoul