mob combat stats overhauled and standardized

1 files changed, 31 insertions, 22 deletions

diff --git a/data/mobs/examples/plasma_wraith.yaml b/data/mobs/examples/plasma_wraith.yaml
index c4ced2b..7241d9a 100644
--- a/data/mobs/examples/plasma_wraith.yaml
+++ b/data/mobs/examples/plasma_wraith.yaml
@@ -1,32 +1,10 @@
 name: plasma wraith
 description: "A shimmering entity of contained plasma, vaguely humanoid in shape. It radiates intense heat and hums with barely contained energy."
-attack: 1
-strength: 1
-defense: 22
-hp: 56
-science: 65
-speed: 4
-aggressive: true
-respawn_ticks: 60
-attack_type: science
-attack_bonus: 0
-strength_bonus: 0
-stab_defense: 30
-slash_defense: 30
-crush_defense: 25
-science_defense: 45
-ranged_defense: -10
-weakness: hydro
 idle_descriptions:
   - "drifts silently, leaving heat shimmer in its wake"
   - "pulses with internal light"
   - "phases partially through a wall"
   - "emits a low frequency hum"
-combat_descriptions:
-  - "lashes %s with a whip of plasma"
-  - "engulfs %s in a superheated cloud"
-  - "discharges a concentrated beam at %s"
-size: medium
 drops:
   remains: ectoplasm
   loot:
@@ -41,3 +19,34 @@ drops:
       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
+    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"