Now that CaveSnakeLamp was purged, we can use it as a constant

4 files changed, 86 insertions, 85 deletions

diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt
index a1035507..3a969f88 100644
--- a/world/map/db/const-aegis.txt
+++ b/world/map/db/const-aegis.txt
@@ -114,6 +114,7 @@ GrayHint 560
 RawLog 569
 Toothbrush 589
 WhiteFur 611
+CaveSnakeLamp 612
 HardSpike 613
 PinkAntenna 614
 DarkCrystal 631
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf
index 7fbd007c..ec76c6be 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -7526,9 +7526,9 @@ mob_db: (
 	Drops: {
 		IronPowder: 1200
 		IronOre: 1000
-		Coal: 900
+		Coal: 800
 		SilverOre: 500
-		TerraniteOre: 25
+		TerraniteOre: 15
 	}
 },
 )
diff --git a/world/map/db/mob_db_0_19.txt b/world/map/db/mob_db_0_19.txt
index 1611e27a..4856b53d 100644
--- a/world/map/db/mob_db_0_19.txt
+++ b/world/map/db/mob_db_0_19.txt
@@ -22,4 +22,4 @@
 1136, LesserGhost, LesserGhost, 1, 1, 0, 1, 1, 0, 150, 300, 0, 0, 0, 0, 0, 0, 0, 0, 2, 10, 1, 1, 17, 131, 340, 1800, 672, 950, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
 1162, Grinchboo, Grinchboo, 5, 50, 0, 6, 1, 1, 5, 10, 0, 5, 1, 1, 1, 0, 6, 5, 9, 10, 1, 3, 11, 129, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 527, 50, 527, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 1165, ChristmasGift, ChristmasGift, 1, 1, 0, 1, 1, 1, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 9, 10, 1, 3, 12, 0, 800, 800, 672, 480, 742, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-1172, Bif, Bif, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 9, 10, 1, 3, 12, 0, 800, 800, 672, 480, 704, 1200, 640, 1000, 4001, 900, 5292, 500, 763, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1172, Bif, Bif, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 9, 10, 1, 3, 12, 0, 800, 800, 672, 480, 704, 1200, 640, 1000, 4001, 800, 5292, 500, 763, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
diff --git a/world/map/npc/013-3/mask_chest.txt b/world/map/npc/013-3/mask_chest.txt
index 204eec4c..a15cf3fc 100644
--- a/world/map/npc/013-3/mask_chest.txt
+++ b/world/map/npc/013-3/mask_chest.txt
@@ -7,113 +7,113 @@
     if (@state < 2) goto L_This_shouldn_t_happen;
     if (@state == 3) goto L_Finished;
 
-    if (countitem("MaggotSlime") == 0)
+    if (countitem(MaggotSlime) == 0)
         goto L_No_maggot_slime;
-    if (countitem("SmallMushroom") == 0)
+    if (countitem(SmallMushroom) == 0)
         goto L_No_mushroom;
-    if (countitem("PinkPetal") == 0)
+    if (countitem(PinkPetal) == 0)
         goto L_No_pink_petal;
-    if (countitem("Pearl") == 0)
+    if (countitem(Pearl) == 0)
         goto L_No_pearl;
-    if (countitem("HardSpike") == 0)
+    if (countitem(HardSpike) == 0)
         goto L_No_hard_spike;
-    if (countitem("RawLog") == 0)
+    if (countitem(RawLog) == 0)
         goto L_No_raw_log;
-    if (countitem("PinkAntenna") == 0)
+    if (countitem(PinkAntenna) == 0)
         goto L_No_pink_antenna;
-    if (countitem("SnakeTongue") == 0
-        || countitem("MountainSnakeTongue") == 0
-        || countitem("GrassSnakeTongue") == 0
-        || countitem("CaveSnakeTongue") == 0)
+    if (countitem(SnakeTongue) == 0
+        || countitem(MountainSnakeTongue) == 0
+        || countitem(GrassSnakeTongue) == 0
+        || countitem(CaveSnakeTongue) == 0)
             goto L_No_tongues;
-    if (countitem("TreasureKey") == 0)
+    if (countitem(TreasureKey) == 0)
         goto L_No_treasure_key;
-    if (countitem("PileOfAsh") == 0)
+    if (countitem(PileOfAsh) == 0)
         goto L_no_ash;
-    if (countitem("MauveHerb") == 0
-        || countitem("CobaltHerb") == 0
-        || countitem("GambogeHerb") == 0
-        || countitem("AlizarinHerb") == 0)
+    if (countitem(MauveHerb) == 0
+        || countitem(CobaltHerb) == 0
+        || countitem(GambogeHerb) == 0
+        || countitem(AlizarinHerb) == 0)
             goto L_No_herbs;
-    if (countitem("BugLeg") == 0)
+    if (countitem(BugLeg) == 0)
         goto L_No_bug_leg;
-    if (countitem("CaveSnakeLamp") == 0)
+    if (countitem(CaveSnakeLamp) == 0)
         goto L_No_lamp;
-    if (countitem("IronOre") == 0)
+    if (countitem(IronOre) == 0)
         goto L_No_iron_ore;
-    if (countitem("ScorpionStinger") == 0
-        || countitem("RedScorpionStinger") == 0
-        || countitem("BlackScorpionStinger") == 0)
+    if (countitem(ScorpionStinger) == 0
+        || countitem(RedScorpionStinger) == 0
+        || countitem(BlackScorpionStinger) == 0)
             goto L_No_stingers;
-    if (countitem("SilkCocoon") == 0)
+    if (countitem(SilkCocoon) == 0)
         goto L_No_silk;
-    if (countitem("WhiteFur") == 0)
+    if (countitem(WhiteFur) == 0)
         goto L_No_fur;
-    if (countitem("DarkCrystal") == 0)
+    if (countitem(DarkCrystal) == 0)
         goto L_No_dark_crystal;
-    if (countitem("BottleOfWater") == 0)
+    if (countitem(BottleOfWater) == 0)
         goto L_No_water;
     getinventorylist;
     if (@inventorylist_count == 100
-        && countitem("MaggotSlime") > 1
-        && countitem("BugLeg") > 1
-        && countitem("SilkCocoon") > 1
-        && countitem("SmallMushroom") > 1
-        && countitem("PinkPetal") > 1
-        && countitem("Pearl") > 1
-        && countitem("HardSpike") > 1
-        && countitem("RawLog") > 1
-        && countitem("PinkAntenna") > 1
-        && countitem("DarkCrystal") > 1
-        && countitem("IronOre") > 1
-        && countitem("ScorpionStinger") > 1
-        && countitem("RedScorpionStinger") > 1
-        && countitem("BlackScorpionStinger") > 1
-        && countitem("SnakeTongue") > 1
-        && countitem("MountainSnakeTongue") > 1
-        && countitem("GrassSnakeTongue") > 1
-        && countitem("CaveSnakeTongue") > 1
-        && countitem("MauveHerb") > 1
-        && countitem("CobaltHerb") > 1
-        && countitem("GambogeHerb") > 1
-        && countitem("AlizarinHerb") > 1
-        && countitem("TreasureKey") > 1
-        && countitem("CaveSnakeLamp") > 1
-        && countitem("PileOfAsh") > 1
-        && countitem("WhiteFur") > 1
-        && countitem("BottleOfWater") > 1)
+        && countitem(MaggotSlime) > 1
+        && countitem(BugLeg) > 1
+        && countitem(SilkCocoon) > 1
+        && countitem(SmallMushroom) > 1
+        && countitem(PinkPetal) > 1
+        && countitem(Pearl) > 1
+        && countitem(HardSpike) > 1
+        && countitem(RawLog) > 1
+        && countitem(PinkAntenna) > 1
+        && countitem(DarkCrystal) > 1
+        && countitem(IronOre) > 1
+        && countitem(ScorpionStinger) > 1
+        && countitem(RedScorpionStinger) > 1
+        && countitem(BlackScorpionStinger) > 1
+        && countitem(SnakeTongue) > 1
+        && countitem(MountainSnakeTongue) > 1
+        && countitem(GrassSnakeTongue) > 1
+        && countitem(CaveSnakeTongue) > 1
+        && countitem(MauveHerb) > 1
+        && countitem(CobaltHerb) > 1
+        && countitem(GambogeHerb) > 1
+        && countitem(AlizarinHerb) > 1
+        && countitem(TreasureKey) > 1
+        && countitem(CaveSnakeLamp) > 1
+        && countitem(PileOfAsh) > 1
+        && countitem(WhiteFur) > 1
+        && countitem(BottleOfWater) > 1)
             goto L_TooMany;
 
-    delitem "MaggotSlime", 1;
-    delitem "BugLeg", 1;
-    delitem "SilkCocoon", 1;
-    delitem "SmallMushroom", 1;
-    delitem "PinkPetal", 1;
-    delitem "Pearl", 1;
-    delitem "HardSpike", 1;
-    delitem "RawLog", 1;
-    delitem "PinkAntenna", 1;
-    delitem "DarkCrystal", 1;
-    delitem "IronOre", 1;
-    delitem "ScorpionStinger", 1;
-    delitem "RedScorpionStinger", 1;
-    delitem "BlackScorpionStinger", 1;
-    delitem "SnakeTongue", 1;
-    delitem "MountainSnakeTongue", 1;
-    delitem "GrassSnakeTongue", 1;
-    delitem "CaveSnakeTongue", 1;
-    delitem "MauveHerb", 1;
-    delitem "CobaltHerb", 1;
-    delitem "GambogeHerb", 1;
-    delitem "AlizarinHerb", 1;
-    delitem "TreasureKey", 1;
-    delitem "CaveSnakeLamp", 1;
-    delitem "WhiteFur", 1;
-    delitem "PileOfAsh", 1;
-    delitem "BottleOfWater", 1;
+    delitem MaggotSlime, 1;
+    delitem BugLeg, 1;
+    delitem SilkCocoon, 1;
+    delitem SmallMushroom, 1;
+    delitem PinkPetal, 1;
+    delitem Pearl, 1;
+    delitem HardSpike, 1;
+    delitem RawLog, 1;
+    delitem PinkAntenna, 1;
+    delitem DarkCrystal, 1;
+    delitem IronOre, 1;
+    delitem ScorpionStinger, 1;
+    delitem RedScorpionStinger, 1;
+    delitem BlackScorpionStinger, 1;
+    delitem SnakeTongue, 1;
+    delitem MountainSnakeTongue, 1;
+    delitem GrassSnakeTongue, 1;
+    delitem CaveSnakeTongue, 1;
+    delitem MauveHerb, 1;
+    delitem CobaltHerb, 1;
+    delitem GambogeHerb, 1;
+    delitem AlizarinHerb, 1;
+    delitem TreasureKey, 1;
+    delitem CaveSnakeLamp, 1;
+    delitem WhiteFur, 1;
+    delitem PileOfAsh, 1;
+    delitem BottleOfWater, 1;
 
     mes "You managed to perform the ritual and open the chest.";
-    getitem "DemonMask", 1;
+    getitem DemonMask, 1;
     mes "You found a demon mask inside.";
     set @state, 3;
     callsub S_Update_Mask;