diff options
| author | Haru <haru@dotalux.com> | 2015-12-18 05:22:33 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-12-18 05:22:33 +0100 |
| commit | 8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a (patch) | |
| tree | 54669433655bb853309ea1cae12da049622324fa /npc/events/christmas_2008.txt | |
| parent | 53abb8cdf92cd3d153b0a3d5b99b55cbd631f36c (diff) | |
| parent | 0828824948c77bbfc357e08e8a5a0a96671b1ca6 (diff) | |
| download | hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.gz hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.bz2 hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.xz hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.zip | |
Merge branch 'dastgir-ScriptCleanup2' into hercules
Closes #920 as merged
Diffstat (limited to 'npc/events/christmas_2008.txt')
| -rw-r--r-- | npc/events/christmas_2008.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt index 6286a4289..593a23caf 100644 --- a/npc/events/christmas_2008.txt +++ b/npc/events/christmas_2008.txt @@ -132,7 +132,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?"; next; select("Why not? Sure, I can give you some."); - if (countitem(6092) < 6) { + if (countitem(Singing_Crystal_Piece) < 6) { mes "[Caroller]"; mes "Yes, please."; next; @@ -304,7 +304,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ } if (iROxmas08carol == 1) { - if (countitem(6092) < 6) { + if (countitem(Singing_Crystal_Piece) < 6) { mes "[Caroller]"; mes "Maybe, it's quite hard to make a jukebox for the villages, but a music box might be possible."; next; @@ -370,7 +370,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ } if (iROxmas08carol == 2) { - if (countitem(1019) < 10 || countitem(1005) < 1 || countitem(7312) < 1 || countitem(938) < 10 || countitem(732) < 1) { + if (countitem(Wooden_Block) < 10 || countitem(Hammer_Of_Blacksmith) < 1 || countitem(Jubilee) < 1 || countitem(Sticky_Mucus) < 10 || countitem(Crystal_Jewel__) < 1) { mes "[Caroller]"; mes "We can make a music box with Singing Crystal Pieces."; mes "It's handy, you can hear carols anywhere. Sounds cool?"; @@ -800,7 +800,7 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 4_F_06,{ mes "[Louise Kim]"; mes "If you bring me all that stuff, I can make you a glamorous Santa costume."; next; - if (countitem(2301) < 1 || countitem(501) < 3 || countitem(523) < 1 || countitem(7175) < 4 || countitem(7174) < 1) { + if (countitem(Cotton_Shirt) < 1 || countitem(Red_Potion) < 3 || countitem(Holy_Water) < 1 || countitem(Packing_Paper) < 4 || countitem(Packing_Ribbon) < 1) { mes "[Louise Kim]"; mes "If you were to bring me all the stuff, I would make you a wonderful costume, for free..."; next; |