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/gdevent_aru.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/gdevent_aru.txt')
-rw-r--r-- | npc/events/gdevent_aru.txt | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index bb18bd76b..b917a414b 100644 --- a/npc/events/gdevent_aru.txt +++ b/npc/events/gdevent_aru.txt @@ -122,7 +122,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ mes "He stole my Pickaxe!"; mes "I can't live without it..."; next; - if (countitem(6010) > 0) { + if (countitem(Pickaxe) > 0) { mes "[" + strcharinfo(0) + "]"; mes "Is this the pickaxe that you've been looking for?"; next; @@ -172,7 +172,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ mes "Alright! Let's go."; mes "If your friends visit me again later, I will guide them to that area again."; mes "Don't forget, dwarves are grateful beings! Hahaha!"; - delitem 6010,1; //Pickaxe + delitem Pickaxe,1; $@gdeventv_a1 = 1; $@gdevents_a$ = .@chk_yourgdname$; close2; @@ -254,7 +254,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ mes "He stole my Pickaxe!"; mes "I can't live without it..."; next; - if (countitem(6010) > 0) { + if (countitem(Pickaxe) > 0) { mes "[" + strcharinfo(0) + "]"; mes "Is this the pickaxe that you've been looking for?"; next; @@ -304,7 +304,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ mes "Alright! Let's go."; mes "If your friends visit me again later, I will guide them to that area again."; mes "Don't forget, dwarves are grateful beings! Hahaha!"; - delitem 6010,1; //Pickaxe + delitem Pickaxe,1; $@gdeventv_a1 = 1; $@gdevents_a$ = .@chk_yourgdname$; close2; @@ -397,7 +397,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ mes "He stole my Pickaxe!"; mes "I can't live without it..."; next; - if (countitem(6010) > 0) { + if (countitem(Pickaxe) > 0) { mes "[" + strcharinfo(0) + "]"; mes "Is this the pickaxe that you've been looking for?"; next; @@ -447,7 +447,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ mes "Alright! Let's go."; mes "If your friends visit me again later, I will guide them to that area again."; mes "Don't forget, dwarves are grateful beings! Hahaha!"; - delitem 6010,1; //Pickaxe + delitem Pickaxe,1; $@gdeventv_a1 = 1; $@gdevents_a$ = .@chk_yourgdname$; close2; @@ -513,7 +513,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ else { setnpcdisplay "Pierrot Pier#aru_gd", 4_CAT; } - if (checkweight(1201,1) == 0) { + if (checkweight(Knife,1) == 0) { mes "- Wait!! -"; mes "- You're carrying too many items, -"; mes "- you can't receive the materials. -"; @@ -693,7 +693,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "[Pierrot Pier]"; mes "Let me see..."; next; - if (countitem(6031) > 0) { + if (countitem(Glitering_PaperB) > 0) { donpcevent "Controller#gdevent_a::OnStop"; $@gdeventv_a2 = 3; donpcevent "eff_mvp#aru_gd::OnMVP"; @@ -702,11 +702,11 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "Success~!!"; mes "What a success~!!"; mapannounce "arug_que01", "Pierrot Pier: Wow~~!! Success~!! What a success~!!",bc_map,"0x99CC00"; - delitem 6031,1; //Glitering_PaperB + delitem Glitering_PaperB,1; close; } else { - if (countitem(6030) > 0) { + if (countitem(Glitering_PaperA) > 0) { mes "[Pierrot Pier]"; mes "Ahh, what a shame, it seems like you haven't found the treasure map yet."; mes "Quickly! Your time is running out! Hurry up!"; @@ -804,7 +804,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mapannounce "arug_que01", "Pierrot Pier: Here, take Pierre's Treasure Boxes.",bc_map,"0x99CC00"; donpcevent "eff_mvp#aru_gd::OnMVP"; $@gdeventv_a2 = 5; - getitem 14596,10; //Pierre_Treasurebox + getitem Pierre_Treasurebox,10; close; } else if ($@gdeventv_a2 == 4) { @@ -834,7 +834,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "[Pierrot Pier]"; mes "Let me see."; next; - if (countitem(6031) > 0) { + if (countitem(Glitering_PaperB) > 0) { donpcevent "Controller#gdevent_a::OnStop"; $@gdeventv_a2 = 3; donpcevent "eff_mvp#aru_gd::OnMVP"; @@ -842,11 +842,11 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "Wow~~!!"; mes "Success~!!"; mes "What a success~!!"; - delitem 6031,1; //Glitering_PaperB + delitem Glitering_PaperB,1; close; } else { - if (countitem(6030) > 0) { + if (countitem(Glitering_PaperA) > 0) { mes "[Pierrot Pier]"; mes "Ahh, what a shame, it seems like you haven't found the treasure map yet."; mes "Quickly! Your time is running out! Hurry up!"; @@ -944,7 +944,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "[Pierrot Pier]"; mes "Let me see..."; next; - if (countitem(6031) > 0) { + if (countitem(Glitering_PaperB) > 0) { donpcevent "Controller#gdevent_a::OnStop"; $@gdeventv_a2 = 3; donpcevent "eff_mvp#aru_gd::OnMVP"; @@ -953,11 +953,11 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "Success~!!"; mes "What a success~!!"; mapannounce "arug_que01", "Pierrot Pier: Wow~~!! Success~!! What a success~!!",bc_map,"0x99CC00"; - delitem 6031,1; //Glitering_PaperB + delitem Glitering_PaperB,1; close; } else { - if (countitem(6030) > 0) { + if (countitem(Glitering_PaperA) > 0) { mes "[Pierrot Pier]"; mes "Ahh, what a shame, it seems like you haven't found the treasure map yet."; mes "Quickly! Your time is running out! Hurry up!"; @@ -1008,7 +1008,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "[Pierrot Pier]"; mes "Let me see..."; next; - if (countitem(6031) > 0) { + if (countitem(Glitering_PaperB) > 0) { donpcevent "Controller#gdevent_a::OnStop"; $@gdeventv_a2 = 3; donpcevent "eff_mvp#aru_gd::OnMVP"; @@ -1016,11 +1016,11 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "Wow~~!!"; mes "Success~!!"; mes "What a success~!!"; - delitem 6031,1; //Glitering_PaperB + delitem Glitering_PaperB,1; close; } else { - if (countitem(6030) > 0) { + if (countitem(Glitering_PaperA) > 0) { mes "[Pierrot Pier]"; mes "Ahh, what a shame, it seems like you haven't found the treasure map yet."; mes "Quickly! Your time is running out! Hurry up!"; @@ -1334,11 +1334,11 @@ OnInit: end; OnTouch2: - .@paper_aru_gd = countitem(6030); - .@spaper_aru_gd = countitem(6031); + .@paper_aru_gd = countitem(Glitering_PaperA); + .@spaper_aru_gd = countitem(Glitering_PaperB); if ((.@paper_aru_gd > 0) || (.@spaper_aru_gd > 0)) { - delitem 6030,.@paper_aru_gd; //Glitering_PaperA - delitem 6031,.@spaper_aru_gd; //Glitering_PaperB + delitem Glitering_PaperA,.@paper_aru_gd; + delitem Glitering_PaperB,.@spaper_aru_gd; } end; } |