defs: updated stats

diff --git a/src/defs.s b/src/defs.s
index 5722c81dea0e8ee4274c4cac487f0094e8305ac5..d46946220ad8794e15b0afb4b9ddf372f68a33ea 100644 (file)
--- a/src/defs.s
+++ b/src/defs.s
@@ -165,21 +165,26 @@
 .de act_ac, stat_size 
 
   ; stats2
+  ; str: increases health and heavy weapon damage
+  ; int: increases mana and spell damage
+  ; dex: increases dodge change and ranged/short weapon damage
+  ; hit: increases chance to hit
+  ; speed: decreases time between moves and attack speed
+  ; resistances: decrease how long a dot lasts and how much damage
+  ;              is taken
+
 .de act_str, stat_size
 .de act_int, stat_size
 .de act_dex, stat_size
   
-  ; increases chance to hit
-.de act_luck, stat_size
-
-  ; resistances 
+.de act_hit, stat_size
 .de act_poison_res, stat_size
 .de act_fire_res, stat_size
 .de act_lightning_res, stat_size
-
-  ; decreases time between moves
 .de act_speed, stat_size
 
+
+
   ; inventory
   ; stores items, for all actors but player
   ; there are 4 inventory slots.
@@ -194,8 +199,8 @@
 .de act_eq_body, 2
 .de act_eq_hand1, 2
 .de act_eq_hand2, 2
-.de act_eq_ring1, 2
-.de act_eq_ring2, 2
+.de act_eq_ring, 2
+.de act_eq_amulet, 2
 
   ; status effects
 .de act_effect, EFFECTS_MAX * effect_size 

diff --git a/src/macros.inc b/src/macros.inc
index b5d379e819f68e89ad65b75ec1cc76a47f6ce538..b01b30cefcba4d2cf244d165a67e3373e48522de 100644 (file)
--- a/src/macros.inc
+++ b/src/macros.inc
@@ -248,8 +248,8 @@
   ;   $2: body
   ;   $3: hand1
   ;   $4: hand2
-  ;   $5: ring1
-  ;   $6: ring2
+  ;   $5: ring
+  ;   $6: amulet 
 #macro act_equipment_def
   dw $1
   dw $2