Removed direct occurrences of itemids

1 files changed, 19 insertions, 19 deletions

diff --git a/world/map/npc/xmas/2009/event.txt b/world/map/npc/xmas/2009/event.txt
index 4e78b38a..21c91642 100644
--- a/world/map/npc/xmas/2009/event.txt
+++ b/world/map/npc/xmas/2009/event.txt
@@ -2,12 +2,12 @@
     if (QUEST_Christmas09_state > 0) goto L_Finished;
 
     set @cond, 0;
-    if (countitem(1234) > 0) set @cond, @cond + 1;
-    if (countitem(1235) > 0) set @cond, @cond + 1;
-    if (countitem(1236) > 0) set @cond, @cond + 1;
-    if (countitem(1237) > 0) set @cond, @cond + 1;
-    if (countitem(1238) > 0) set @cond, @cond + 1;
-    if (countitem(1239) > 0) set @cond, @cond + 1;
+    if (countitem("RedOrnament") > 0) set @cond, @cond + 1;
+    if (countitem("YellowOrnament") > 0) set @cond, @cond + 1;
+    if (countitem("GreenOrnament") > 0) set @cond, @cond + 1;
+    if (countitem("AquaOrnament") > 0) set @cond, @cond + 1;
+    if (countitem("BlueOrnament") > 0) set @cond, @cond + 1;
+    if (countitem("MagentaOrnament") > 0) set @cond, @cond + 1;
     
     if (@cond == 6) goto L_Give;
     
@@ -57,26 +57,26 @@ L_SANTA_DESCRIBE_QUEST:
 L_Give:
     getinventorylist;
     set @freeslots, 100 - @inventorylist_count;
-    if (countitem(1234) <= 1) set @freeslots, @freeslots + 1;
-    if (countitem(1235) <= 1) set @freeslots, @freeslots + 1;
-    if (countitem(1236) <= 1) set @freeslots, @freeslots + 1;
-    if (countitem(1237) <= 1) set @freeslots, @freeslots + 1;
-    if (countitem(1238) <= 1) set @freeslots, @freeslots + 1;
-    if (countitem(1239) <= 1) set @freeslots, @freeslots + 1;
+    if (countitem("RedOrnament") <= 1) set @freeslots, @freeslots + 1;
+    if (countitem("YellowOrnament") <= 1) set @freeslots, @freeslots + 1;
+    if (countitem("GreenOrnament") <= 1) set @freeslots, @freeslots + 1;
+    if (countitem("AquaOrnament") <= 1) set @freeslots, @freeslots + 1;
+    if (countitem("BlueOrnament") <= 1) set @freeslots, @freeslots + 1;
+    if (countitem("MagentaOrnament") <= 1) set @freeslots, @freeslots + 1;
     if (@freeslots < 3) goto L_NoRoom;
-    delitem 1234, 1;
-    delitem 1235, 1;
-    delitem 1236, 1;
-    delitem 1237, 1;
-    delitem 1238, 1;
-    delitem 1239, 1;
+    delitem "RedOrnament", 1;
+    delitem "YellowOrnament", 1;
+    delitem "GreenOrnament", 1;
+    delitem "AquaOrnament", 1;
+    delitem "BlueOrnament", 1;
+    delitem "MagentaOrnament", 1;
     mes "[Santa Claus]";
     mes "\"I knew I could count on you!:";
     mes "Please accept these small gifts:";
     mes "The official Christmas 2009 headgear!";
     mes "And a little something from the elves to say Thank You!";
     mes "Ho Ho Ho Merry Christmas!\"";
-    getitem 1242, 1;
+    getitem "SnowGoggles", 1;
     setarray @snowglob$, "SantaSnowGlobe", "SnowmanSnowGlobe";
     getitem @snowglob$[rand(getarraysize(@snowglob$))], 1;
     setarray @oldstock$, "SantaBeardHat", "ChristmasTreeHat", "Goggles", "LeatherGoggles", "AntlerHat";