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

1 files changed, 56 insertions, 53 deletions

diff --git a/data/mobs/examples/ancient_construct.yaml b/data/mobs/examples/ancient_construct.yaml
index ab878cd..139e6ae 100644
--- a/data/mobs/examples/ancient_construct.yaml
+++ b/data/mobs/examples/ancient_construct.yaml
@@ -1,56 +1,59 @@
-name: ancient construct
-description: "An impossibly old machine from before the regression, still operational. Its design is alien even by modern standards, covered in glowing runes that predate recorded history."
-idle_descriptions:
-  - "etches glowing symbols into the air"
-  - "reconfigures its form with clicking sounds"
-  - "projects a holographic star map"
-  - "emits a resonant chime that shakes the walls"
-drops:
-  remains: scrap
-  loot:
-    - item_id: credits
-      weight: 40
-      quantity: 10000
-    - item_id: bloodjunk
-      weight: 20
-      quantity: 8
-    - item_id: deathjunk
-      weight: 15
-      quantity: 8
-    - table: gem_table
-      weight: 10
-    - item_id: uncut_diamond
-      weight: 5
-      quantity: 3
-    - table: herb_table_high
-      weight: 10
 combat:
-  kind: combat
-  stats:
-    hp: 152
-    attack: 58
-    strength: 62
-    defense: 66
-    attack_type: slash
-    speed: 4
     aggressive: true
+    attack_types:
+        - slash
+    combat_descriptions:
+        - slices at %s with a blade of pure light
+        - unleashes a cascade of ancient energy at %s
+        - teleports behind %s and strikes
+    kind: combat
     respawn_ticks: 150
-    bonuses:
-      attack_bonus: 55
-      strength_bonus: 55
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 95
-      slash_defense: 100
-      crush_defense: 85
-      science_defense: -40
-      ranged_defense: 70
-      weakness: chaos
-  size: massive
-  combat_descriptions:
-    - "slices at %s with a blade of pure light"
-    - "unleashes a cascade of ancient energy at %s"
-    - "teleports behind %s and strikes"
+    size: massive
+    stats:
+        attack: 58
+        bonuses:
+            attack_bonus: 55
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 55
+        defense: 66
+        defenses:
+            crush_defense: 85
+            ranged_defense: 70
+            science_defense: -40
+            slash_defense: 100
+            stab_defense: 95
+            weakness: chaos
+            weakness_percent: 50
+        hp: 152
+        max_melee_hit: 13
+        speed: 4
+        strength: 62
+description: An impossibly old machine from before the regression, still operational. Its design is alien even by modern standards, covered in glowing runes that predate recorded history.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 10000
+          weight: 40
+        - item_id: bloodjunk
+          quantity: 8
+          weight: 20
+        - item_id: deathjunk
+          quantity: 8
+          weight: 15
+        - table: gem_table
+          weight: 10
+        - item_id: uncut_diamond
+          quantity: 3
+          weight: 5
+        - table: herb_table_high
+          weight: 10
+    remains: scrap
+idle_descriptions:
+    - etches glowing symbols into the air
+    - reconfigures its form with clicking sounds
+    - projects a holographic star map
+    - emits a resonant chime that shakes the walls
+name: ancient construct