mob combat stats overhauled and standardized

1 files changed, 31 insertions, 22 deletions

diff --git a/data/mobs/examples/elite_synth.yaml b/data/mobs/examples/elite_synth.yaml
index b095716..9628572 100644
--- a/data/mobs/examples/elite_synth.yaml
+++ b/data/mobs/examples/elite_synth.yaml
@@ -1,32 +1,10 @@
 name: elite synth
 description: "A sleek combat android with glowing blue optics and a compact energy weapon. Its chassis is polished alloy and its movements are disturbingly fluid."
-attack: 1
-strength: 1
-defense: 38
-hp: 104
-science: 65
-speed: 4
-aggressive: true
-respawn_ticks: 75
-attack_type: science
-attack_bonus: 0
-strength_bonus: 0
-stab_defense: 45
-slash_defense: 45
-crush_defense: 40
-science_defense: 55
-ranged_defense: -15
-weakness: chaos
 idle_descriptions:
   - "calibrates targeting sensors with a soft chime"
   - "projects a holographic tactical display"
   - "emits a binary chirp"
   - "reconfigures its weapon array silently"
-combat_descriptions:
-  - "unleashes a coherent energy beam at %s"
-  - "fires a pulse of disruptor energy at %s"
-  - "overloads its emitters and blasts %s"
-size: medium
 drops:
   remains: circuit_board
   loot:
@@ -41,3 +19,34 @@ drops:
       quantity: 3
     - table: gem_table
       weight: 15
+combat:
+  kind: combat
+  stats:
+    hp: 104
+    attack: 1
+    strength: 1
+    defense: 38
+    science: 65
+    attack_type: science
+    speed: 4
+    aggressive: true
+    respawn_ticks: 75
+    bonuses:
+      attack_bonus: 0
+      strength_bonus: 0
+      science_bonus: 0
+      science_percent_bonus: 0
+      ranged_bonus: 0
+      ranged_strength_bonus: 0
+    defenses:
+      stab_defense: 45
+      slash_defense: 45
+      crush_defense: 40
+      science_defense: 55
+      ranged_defense: -15
+      weakness: chaos
+  size: medium
+  combat_descriptions:
+    - "unleashes a coherent energy beam at %s"
+    - "fires a pulse of disruptor energy at %s"
+    - "overloads its emitters and blasts %s"