Update to now deprecated elements, and to harm new flag.

4 files changed, 26 insertions, 57 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 510b3ccbf..184f5e545 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -681,15 +681,20 @@ constants_db: {
 	Ele_Earth:     2
 	Ele_Fire:      3
 	Ele_Wind:      4
-	Ele_Nature:    5
 	Ele_Holy:      6
 	Ele_Dark:      7
 	Ele_Ghost:     8
-	Ele_Undead:    9
 	Ele_All:     255
 
     // Compatibility, legacy, DO NOT USE
+	Ele_Nature:    5
 	Ele_Poison:    5
+	Ele_Undead:    9
+
+	comment__: "Attack Types"
+	HARM_PHYS:     1
+	HARM_MAGI:     2
+	HARM_MISC:     4
 
 	comment__: "Races"
 	RC_Formless:        0
diff --git a/db/re/attr_fix.txt b/db/re/attr_fix.txt
index 31501a8ef..4d2772532 100644
--- a/db/re/attr_fix.txt
+++ b/db/re/attr_fix.txt
@@ -2,96 +2,56 @@
 //
 // Row: target's defense element
 // Column: attacker's weapon element
-// NEUTRAL ELEMENT
-//      STRONG: -
-//      WEAK: GHOST
-//
-// WATER ELEMENT
-//      STRONG: FIRE
-//      WEAK: WIND
-// EARTH ELEMENT
-//      STRONG: WIND
-//      WEAK: FIRE
-// FIRE ELEMENT
-//      STRONG: EARTH
-//      WEAK: WATER
-// WIND ELEMENT
-//      STRONG: WATER
-//      WEAK: EARTH
-//
-// NATURE ELEMENT
-//      STRONG: UNDEAD
-//      WEAK: Undead
-//      WEAK ATTACK: Holy, Shadow, Ghost
-//
-// HOLY ELEMENT
-//      STRONG: SHADOW
-//      WEAK: SHADOW
-//      STRONG DEFENSE: NATURE, GHOST, UNDEAD
-//      WEAK ATTACK: GHOST, UNDEAD
-// SHADOW ELEMENT
-//      STRONG: HOLY
-//      WEAK: HOLY
-//      STRONG DEFENSE: NATURE, GHOST, UNDEAD
-//      WEAK ATTACK: GHOST, UNDEAD
-// GHOST ELEMENT
-//      STRONG: NEUTRAL
-//      WEAK: GHOST
-//      WEAK ATTACK: WATER, EARTH, FIRE, WIND, NATURE, HOLY, SHADOW, UNDEAD
-// UNDEAD ELEMENT
-//      STRONG: NATURE
-//      WEAK: NATURE
-//      WEAK ATTACK: HOLY, SHADOW, GHOST
 
 1,10	// lv1 Attribute table
-//Neut Watr Erth Fire Wind Natu Holy Shdw Gho  Und
+//Neut Watr Erth Fire Wind ---  Holy Shdw Gho  ---
    95, 100, 100, 100, 100, 100, 100, 100, 100, 100,  // Neutral
   100,  95, 100,  75, 125, 100, 100, 100,  70, 100,  // Water
   100, 100,  95, 125,  75, 100, 100, 100,  70, 100,  // Earth
   100, 125,  75,  95, 100, 100, 100, 100,  70, 100,  // Fire
   100,  75, 125, 100,  95, 100, 100, 100,  70, 100,  // Wind
-  100, 100, 100, 100, 100,  95, 100, 100,  70, 125,  // Nature
+  100, 100, 100, 100, 100,  95, 100, 100,  70, 125,  // UNUSED
   100, 100, 100, 100, 100,  85,  95, 125,  70,  70,  // Holy
   100, 100, 100, 100, 100,  85, 125,  95,  70,  70,  // Shadow
    50,  70,  70,  70,  70,  70,  70,  70, 125,  70,  // Ghost
-  100, 100, 100, 100, 100, 120,  80,  80,  70, 100,  // Undead
+  100, 100, 100, 100, 100, 120,  80,  80,  70, 100,  // UNUSED
 
 2,10	// lv2 Attribute table
-//Neut Watr Erth Fire Wind Natu Holy Shdw Gho  Und
+//Neut Watr Erth Fire Wind ---  Holy Shdw Gho  ---
    90, 100, 100, 100, 100, 100, 100, 100, 100, 100,  // Neutral
   100,  90, 100,  50, 150, 100, 100, 100,  70, 100,  // Water
   100, 100,  90, 150,  50, 100, 100, 100,  70, 100,  // Earth
   100, 150,  50,  90, 100, 100, 100, 100,  70, 100,  // Fire
   100,  50, 150, 100,  90, 100, 100, 100,  70, 100,  // Wind
-  100, 100, 100, 100, 100,  90, 100, 100,  70, 150,  // Nature
+  100, 100, 100, 100, 100,  90, 100, 100,  70, 150,  // UNUSED
   100, 100, 100, 100, 100,  80,  90, 150,  70,  70,  // Holy
   100, 100, 100, 100, 100,  80, 150,  90,  70,  70,  // Shadow
    40,  60,  60,  60,  60,  60,  60,  60, 150,  60,  // Ghost
-  100, 100, 100, 100, 100, 140,  70,  70,  70,  70,  // Undead
+  100, 100, 100, 100, 100, 140,  70,  70,  70,  70,  // UNUSED
 
 3,10	// lv3 Attribute table
-//Neut Watr Erth Fire Wind Natu Holy Shdw Gho  Und
+//Neut Watr Erth Fire Wind ---  Holy Shdw Gho  ---
    80, 100, 100, 100, 100, 100, 100, 100, 100, 100,  // Neutral
   100,  80, 100,  25, 175, 100, 100, 100,  70, 100,  // Water
   100, 100,  80, 175,  25, 100, 100, 100,  70, 100,  // Earth
   100, 175,  25,  80, 100, 100, 100, 100,  70, 100,  // Fire
   100,  25, 175, 100,  80, 100, 100, 100,  70, 100,  // Wind
-  100, 100, 100, 100, 100,  80, 100, 100,  70, 175,  // Nature
+  100, 100, 100, 100, 100,  80, 100, 100,  70, 175,  // UNUSED
   100, 100, 100, 100, 100,  75,  80, 175,  70,  70,  // Holy
   100, 100, 100, 100, 100,  75, 175,  80,  70,  70,  // Shadow
    30,  50,  50,  50,  50,  50,  50,  50, 175,  50,  // Ghost
-  100, 100, 100, 100, 100, 160,  60,  60,  70,  60,  // Undead
+  100, 100, 100, 100, 100, 160,  60,  60,  70,  60,  // UNUSED
 
 4,10	// lv4 Attribute table
-//Neut Watr Erth Fire Wind Natu Holy Shdw Gho  Und
+//Neut Watr Erth Fire Wind ---  Holy Shdw Gho  ---
    70, 100, 100, 100, 100, 100, 100, 100, 100, 100,  // Neutral
   100,  70, 100,   5, 200, 100, 100, 100,  70, 100,  // Water
   100, 100,  70, 200,   5, 100, 100, 100,  70, 100,  // Earth
   100, 200,   5,  70, 100, 100, 100, 100,  70, 100,  // Fire
   100,   5, 200, 100,  70, 100, 100, 100,  70, 100,  // Wind
-  100, 100, 100, 100, 100,  70, 100, 100,  70, 200,  // Nature
+  100, 100, 100, 100, 100,  70, 100, 100,  70, 200,  // UNUSED
   100, 100, 100, 100, 100,  70,  70, 200,  70,  70,  // Holy
   100, 100, 100, 100, 100,  70, 200,  70,  70,  70,  // Shadow
    20,  40,  40,  40,  40,  40,  40,  40, 200,  40,  // Ghost
-  100, 100, 100, 100, 100, 180,  50,  50,  70,  50,  // Undead
+  100, 100, 100, 100, 100, 180,  50,  50,  70,  50,  // UNUSED
 
diff --git a/npc/commands/kami.txt b/npc/commands/kami.txt
index 531d09a9d..93ba4d7a4 100644
--- a/npc/commands/kami.txt
+++ b/npc/commands/kami.txt
@@ -68,13 +68,13 @@ OnPurify:
     end;
 
 OnHarm:
-    harm(getcharid(3), 500, 1);
+    harm(getcharid(3), 500, HARM_PHYS);
     end;
 
 OnHarm2:
     .@id=getcharid(3);
     detachrid();
-    harm(.@id, 500, 1);
+    harm(.@id, 500, HARM_MISC, Ele_Holy);
     end;
 
 OnInit:
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index b1e34f5b1..a2a01bebf 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -289,7 +289,11 @@ function	script	HUB_SkillInvoke	{
         case TMW2_JUDGMENT:
             debugmes "Target: %d (%d,%d)", @skillTarget, @skillTargetX, @skillTargetY;
             areasc2(getmap(), @skillTargetX, @skillTargetY, 2, 10000, SC_BLOODING, BL_MOB|BL_PC);
-            harm(@skillTarget, 1000, 1);
+            .@type=any(HARM_PHYS, HARM_MAGI);
+            .@dmg=calcdmg(getcharid(3), @skillTarget, .@type);
+            // Adjusted power: 300
+            .@dmg=.@dmg*300/100;
+            harm(@skillTarget, .@dmg, .@type, Ele_Holy);
             break;
         case TMW2_PARUM:
             SK_parum();