mob combat stats overhauled and standardized

1 files changed, 30 insertions, 21 deletions

diff --git a/data/mobs/examples/titan_sentinel.yaml b/data/mobs/examples/titan_sentinel.yaml
index 32ddcc2..6fb36d3 100644
--- a/data/mobs/examples/titan_sentinel.yaml
+++ b/data/mobs/examples/titan_sentinel.yaml
@@ -1,31 +1,10 @@
 name: titan sentinel
 description: "A colossal automaton, the bigger brother of the iron sentinel. Its armor is reinforced adamantite alloy and its optics burn with crimson fire."
-attack: 50
-strength: 52
-defense: 56
-hp: 132
-speed: 5
-aggressive: true
-respawn_ticks: 120
-attack_type: crush
-attack_bonus: 48
-strength_bonus: 45
-stab_defense: 90
-slash_defense: 90
-crush_defense: 80
-science_defense: -35
-ranged_defense: 60
-weakness: solar
 idle_descriptions:
   - "stands motionless, gyros humming"
   - "scans the area with a sweeping crimson beam"
   - "vents superheated exhaust"
   - "rotates its armored torso with a deep grinding sound"
-combat_descriptions:
-  - "smashes %s with a titan-grade fist"
-  - "unleashes a devastating plasma barrage at %s"
-  - "drives %s into the ground with overwhelming force"
-size: massive
 drops:
   loot:
     - item_id: scrap
@@ -39,3 +18,33 @@ drops:
     - item_id: deathjunk
       weight: 5
       quantity: 5
+combat:
+  kind: combat
+  stats:
+    hp: 132
+    attack: 50
+    strength: 52
+    defense: 56
+    attack_type: crush
+    speed: 5
+    aggressive: true
+    respawn_ticks: 120
+    bonuses:
+      attack_bonus: 48
+      strength_bonus: 45
+      science_bonus: 0
+      science_percent_bonus: 0
+      ranged_bonus: 0
+      ranged_strength_bonus: 0
+    defenses:
+      stab_defense: 90
+      slash_defense: 90
+      crush_defense: 80
+      science_defense: -35
+      ranged_defense: 60
+      weakness: solar
+  size: massive
+  combat_descriptions:
+    - "smashes %s with a titan-grade fist"
+    - "unleashes a devastating plasma barrage at %s"
+    - "drives %s into the ground with overwhelming force"