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

1 files changed, 59 insertions, 57 deletions

diff --git a/data/mobs/examples/man.yaml b/data/mobs/examples/man.yaml
index ec3624c..1ffa746 100644
--- a/data/mobs/examples/man.yaml
+++ b/data/mobs/examples/man.yaml
@@ -1,60 +1,62 @@
-name: man
-description: "A shabby-looking man loitering in the town square."
-idle_descriptions:
-  - "scribbles something in a small notebook"
-  - "gazes skyward at the clouds"
-  - "leans against a wall, looking bored"
-  - "scratches his head thoughtfully"
-  - "stares off into the distance"
-  - "adjusts his tunic and stretches"
-steal:
-  table: man_steal
-  level: 1
-  xp: 8
-  speed: 4
-drops:
-  remains: "bones"
-  loot:
-    - item_id: "credits"
-      weight: 98
-      quantity: 10
-    - item_id: "credits"
-      weight: 2
-      quantity: 150
-    - item_id: "grimy_guam"
-      weight: 8
-    - item_id: "grimy_marrentill"
-      weight: 4
-    - item_id: "grimy_tarromin"
-      weight: 2
 combat:
-  kind: combat
-  stats:
-    hp: 7
-    attack: 1
-    strength: 1
-    defense: 1
-    attack_type: crush
-    speed: 5
     aggressive: false
+    attack_types:
+        - crush
+    combat_descriptions:
+        - is engaged in a fight to the death with %s
+        - is getting pummelled by %s
+        - is locked in combat with %s
+        - trades blows with %s
+        - circles warily around %s
+    kind: combat
     respawn_ticks: 30
-    bonuses:
-      attack_bonus: 0
-      strength_bonus: 0
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      crush_defense: 0
-      ranged_defense: 0
-      science_defense: 0
-      slash_defense: 0
-      stab_defense: 0
-  size: small
-  combat_descriptions:
-    - "is engaged in a fight to the death with %s"
-    - "is getting pummelled by %s"
-    - "is locked in combat with %s"
-    - "trades blows with %s"
-    - "circles warily around %s"
+    size: small
+    stats:
+        attack: 1
+        bonuses:
+            attack_bonus: 0
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 0
+        defense: 1
+        defenses:
+            crush_defense: 0
+            ranged_defense: 0
+            science_defense: 0
+            slash_defense: 0
+            stab_defense: 0
+        hp: 7
+        max_melee_hit: 1
+        speed: 5
+        strength: 1
+description: A shabby-looking man loitering in the town square.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 10
+          weight: 98
+        - item_id: credits
+          quantity: 150
+          weight: 2
+        - item_id: grimy_guam
+          weight: 8
+        - item_id: grimy_marrentill
+          weight: 4
+        - item_id: grimy_tarromin
+          weight: 2
+    remains: bones
+idle_descriptions:
+    - scribbles something in a small notebook
+    - gazes skyward at the clouds
+    - leans against a wall, looking bored
+    - scratches his head thoughtfully
+    - stares off into the distance
+    - adjusts his tunic and stretches
+name: man
+steal:
+    level: 1
+    speed: 4
+    table: man_steal
+    xp: 8