1 files changed, 14 insertions, 27 deletions
diff --git a/data/help/combat.yaml b/data/help/combat.yaml
index b02fb1a..210a6da 100644
--- a/data/help/combat.yaml
+++ b/data/help/combat.yaml
@@ -1,33 +1,20 @@
 name: "combat"
-category: "Combat"
+category: "General"
 description: |
-  Combat basics.
+  Attack a mob with: attack <mob>
 
-  - 600ms tick engine with per-weapon attack speeds
-  - Attack, Strength, and Defense rolls determine hit/miss
-  - Combat triangle: Melee > Ranged > Science > Melee
-  - 4 XP per point of damage, distributed by combat style
-  - Damaged mobs show current HP in look (damaged listed first)
-  - Mobs regenerate 1 HP every 100 ticks (60 seconds)
-  - Players also regenerate 1 HP every 100 ticks
+  Your accuracy depends on your attack type (stab, slash, crush, ranged,
+  or science) and your total equipment bonus for that type. Your weapon
+  determines the attack type.
 
-  Fleeing combat:
-    Move in any direction (n/s/e/w/u/d) to attempt to flee.
-    The movement countdown begins (default 4 ticks). If the mob
-    lands a hit during the countdown, you get "Can't escape!" and
-    remain in combat. If the mob misses or doesn't attack, you
-    successfully escape after the countdown.
+  Mobs have per-type defense bonuses. A skeleton with high slash defense
+  but weak crush defense takes more hits from a mace than a sword.
 
-    Equipment that reduces movement time (Cape of Agility, Graceful
-    set) also reduces the flee countdown. With the Cape of Agility,
-    fleeing is instant.
+  Use the 'style' command to change your combat style:
+    accurate    - +3 attack level, XP to attack
+    aggressive  - +3 strength level, XP to strength
+    defensive   - +3 defense level, XP to defense
+    balanced    - +1 to all, XP split evenly
 
-    Enable "run_countdown" option to see tick-by-tick messages
-    while fleeing.
-
-  Mob level colors in room display and broadcasts:
-    Green        Mob is 5+ levels below you
-    Green-yellow Mob is 1-4 levels below you
-    White        Mob is equal level
-    Orange       Mob is 1-4 levels above you
-    Red          Mob is 5+ levels above you
+  Use 'stats' to see your total equipment bonuses and current attack roll.
+  Use 'look <item>' to see an item's combat stats.