mob combat stats overhauled and standardized

1 files changed, 30 insertions, 21 deletions

diff --git a/data/mobs/examples/molten_elemental.yaml b/data/mobs/examples/molten_elemental.yaml
index 9c46ccb..3c9b023 100644
--- a/data/mobs/examples/molten_elemental.yaml
+++ b/data/mobs/examples/molten_elemental.yaml
@@ -1,31 +1,10 @@
 name: molten elemental
 description: "A flowing mass of liquid metal and superheated slag, roughly humanoid. The air around it shimmers with heat and droplets of molten alloy drip to the floor."
-attack: 48
-strength: 52
-defense: 52
-hp: 115
-speed: 5
-aggressive: true
-respawn_ticks: 80
-attack_type: crush
-attack_bonus: 40
-strength_bonus: 42
-stab_defense: 60
-slash_defense: 60
-crush_defense: 70
-science_defense: -30
-ranged_defense: 45
-weakness: hydro
 idle_descriptions:
   - "bubbles and churns, throwing off sparks"
   - "melts a nearby chunk of metal absent-mindedly"
   - "pulses with an inner orange glow"
   - "drips glowing droplets onto the floor"
-combat_descriptions:
-  - "hurls a glob of molten metal at %s"
-  - "engulfs %s in a wave of liquid fire"
-  - "smashes %s with a superheated limb"
-size: large
 drops:
   remains: scrap
   loot:
@@ -40,3 +19,33 @@ drops:
       quantity: 2
     - table: herb_table_high
       weight: 15
+combat:
+  kind: combat
+  stats:
+    hp: 115
+    attack: 48
+    strength: 52
+    defense: 52
+    attack_type: crush
+    speed: 5
+    aggressive: true
+    respawn_ticks: 80
+    bonuses:
+      attack_bonus: 40
+      strength_bonus: 42
+      science_bonus: 0
+      science_percent_bonus: 0
+      ranged_bonus: 0
+      ranged_strength_bonus: 0
+    defenses:
+      stab_defense: 60
+      slash_defense: 60
+      crush_defense: 70
+      science_defense: -30
+      ranged_defense: 45
+      weakness: hydro
+  size: large
+  combat_descriptions:
+    - "hurls a glob of molten metal at %s"
+    - "engulfs %s in a wave of liquid fire"
+    - "smashes %s with a superheated limb"