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

1 files changed, 54 insertions, 49 deletions

diff --git a/data/mobs/examples/plasma_wraith.yaml b/data/mobs/examples/plasma_wraith.yaml
index 7241d9a..8fd8c2e 100644
--- a/data/mobs/examples/plasma_wraith.yaml
+++ b/data/mobs/examples/plasma_wraith.yaml
@@ -1,52 +1,57 @@
-name: plasma wraith
-description: "A shimmering entity of contained plasma, vaguely humanoid in shape. It radiates intense heat and hums with barely contained energy."
-idle_descriptions:
-  - "drifts silently, leaving heat shimmer in its wake"
-  - "pulses with internal light"
-  - "phases partially through a wall"
-  - "emits a low frequency hum"
-drops:
-  remains: ectoplasm
-  loot:
-    - item_id: credits
-      weight: 50
-      quantity: 400
-    - item_id: chaosjunk
-      weight: 20
-      quantity: 2
-    - item_id: cosmicjunk
-      weight: 15
-      quantity: 2
-    - table: gem_table
-      weight: 15
 combat:
-  kind: combat
-  stats:
-    hp: 56
-    attack: 1
-    strength: 1
-    defense: 22
-    science: 65
-    attack_type: science
-    speed: 4
     aggressive: true
+    attack_types:
+        - crush
+        - science
+    combat_descriptions:
+        - lashes %s with a whip of plasma
+        - engulfs %s in a superheated cloud
+        - discharges a concentrated beam at %s
+    kind: combat
     respawn_ticks: 60
-    bonuses:
-      attack_bonus: 0
-      strength_bonus: 0
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 30
-      slash_defense: 30
-      crush_defense: 25
-      science_defense: 45
-      ranged_defense: -10
-      weakness: hydro
-  size: medium
-  combat_descriptions:
-    - "lashes %s with a whip of plasma"
-    - "engulfs %s in a superheated cloud"
-    - "discharges a concentrated beam at %s"
+    size: medium
+    stats:
+        attack: 40
+        bonuses:
+            attack_bonus: 0
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 0
+        defense: 22
+        defenses:
+            crush_defense: 25
+            ranged_defense: -10
+            science_defense: 45
+            slash_defense: 30
+            stab_defense: 30
+            weakness: hydro
+            weakness_percent: 50
+        hp: 56
+        max_melee_hit: 8
+        max_science_hit: 12
+        science: 65
+        speed: 4
+        strength: 40
+description: A shimmering entity of contained plasma, vaguely humanoid in shape. It radiates intense heat and hums with barely contained energy.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 400
+          weight: 50
+        - item_id: chaosjunk
+          quantity: 2
+          weight: 20
+        - item_id: cosmicjunk
+          quantity: 2
+          weight: 15
+        - table: gem_table
+          weight: 15
+    remains: ectoplasm
+idle_descriptions:
+    - drifts silently, leaving heat shimmer in its wake
+    - pulses with internal light
+    - phases partially through a wall
+    - emits a low frequency hum
+name: plasma wraith