diff options
| -rw-r--r-- | world/map/npc/009-8/celestia.txt | 16 | ||||
| -rw-r--r-- | world/map/npc/magic/level2-make-arrows.txt | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/world/map/npc/009-8/celestia.txt b/world/map/npc/009-8/celestia.txt index f73a2ecc..a6a027c6 100644 --- a/world/map/npc/009-8/celestia.txt +++ b/world/map/npc/009-8/celestia.txt @@ -19,9 +19,9 @@ 009-8,31,123,0|script|Celestia|144 { callfunc "CelestiaState"; - if (getequipid(equip_head) == 4027) // check if yeti mask (4027) is equipped + if (getequipid(equip_head) == YetiMask) // check if yeti mask (4027) is equipped goto L_YetiMask; - if (getequipid(equip_head) == 647) // check if Developer's Cap (647) is equipped + if (getequipid(equip_head) == DevelopersCap) // check if Developer's Cap (647) is equipped goto L_Debug; if (QL_CELESTIA == 2) // check if the player has the easy quest goto L_ExplainEasy; @@ -127,7 +127,7 @@ L_ExplainEasy: mes " %%E 50 ["+ getitemlink("GingerBreadMan") +"]"; next; mes "\"I really hope you can find a reliable provider for these items before it forces me to put an end to my tea parties.\""; - if (countitem("ChocolateBar") >= 100 && countitem("GingerBreadMan") >= 50) // check if the player has the items + if (countitem(ChocolateBar) >= 100 && countitem(GingerBreadMan) >= 50) // check if the player has the items menu // if yes then allow the player to give them "I have the grocery order of Chocolate Bars and Ginger Bread Men for you.", L_GiveGroceries, "I will come back later.", L_InstaClose; @@ -147,9 +147,9 @@ L_GiveGroceries: mes "["+getitemlink("Beret")+"]"; mes "[10,000 GP]"; mes "[20,000 EXP]"; - delitem "ChocolateBar", 100; // remove chocolate bars - delitem "GingerBreadMan", 50; // remove ginger bread men - getitem "Beret", 1; // give beret + delitem ChocolateBar, 100; // remove chocolate bars + delitem GingerBreadMan, 50; // remove ginger bread men + getitem Beret, 1; // give beret getexp 20000, 0; // XXX is this amount reasonable? set Zeny, Zeny + 10000; // XXX is this amount reasonable? set QL_CELESTIA, 3; // set the state to "completed easy quest" @@ -213,7 +213,7 @@ L_AcceptTrinket: mes "\"May our path cross again.\""; mes; mes "["+getitemlink("HeartNecklace")+"]"; - getitem "HeartNecklace", 1; + getitem HeartNecklace, 1; set QL_CELESTIA, 206; close; @@ -311,7 +311,7 @@ function|script|CelestiaState } 009-8,40,125,0|script|Celestia Basement|32767,0,0 { - if ($DOOMSDAY == 2||countitem(647)||countitem(725)||countitem(1178)||countitem(5131)||countitem(5132)||countitem(5133)||countitem(5134)||countitem(5135)||countitem(5136)||countitem(5137)||countitem(5138)||countitem(5139)||countitem(5140)||(getgmlevel()>=20)|| + if ($DOOMSDAY == 2||countitem(DevelopersCap)||countitem(GMCap)||countitem(1178)||countitem(5131)||countitem(5132)||countitem(5133)||countitem(5134)||countitem(5135)||countitem(5136)||countitem(5137)||countitem(5138)||countitem(5139)||countitem(5140)||(getgmlevel()>=20)|| strcharinfo(1) == "Celestia's Tea Party") warp "009-8", 82, 126; if (strcharinfo(1) != "Celestia's Tea Party" && $DOOMSDAY != 2) diff --git a/world/map/npc/magic/level2-make-arrows.txt b/world/map/npc/magic/level2-make-arrows.txt index ff836272..dbd2bc2f 100644 --- a/world/map/npc/magic/level2-make-arrows.txt +++ b/world/map/npc/magic/level2-make-arrows.txt @@ -4,8 +4,8 @@ if (Sp < 8) end; if (getskilllv(SKILL_MAGIC) < .level) end; if (getskilllv(.school) < .level) end; - if (countitem("RawLog") < 1) end; - delitem "RawLog", 1; + if (countitem(RawLog) < 1) end; + delitem RawLog, 1; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 5000, "Magic Timer::OnClear"; // set the new debuff sc_start SC_COOLDOWN, 5000, 0, BL_ID; |