summaryrefslogtreecommitdiff
path: root/npc/events
diff options
context:
space:
mode:
Diffstat (limited to 'npc/events')
-rw-r--r--npc/events/gdevent_aru.txt20
-rw-r--r--npc/events/gdevent_sch.txt20
-rw-r--r--npc/events/god_se_festival.txt70
-rw-r--r--npc/events/nguild/nguild_ev_agit.txt6
4 files changed, 58 insertions, 58 deletions
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index 9f1a9617a..1578127f9 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -660,7 +660,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{
mes "Let the game.. Begin!";
mapannounce "arug_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00";
set $@gdeventv_a2,1;
- donpcevent "Controller#gdevent_a::Ongame_start";
+ donpcevent "Controller#gdevent_a::OnGame_start";
erasequest 2143;
close;
}
@@ -677,7 +677,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{
if (countitem(6031) > 0) {
donpcevent "Controller#gdevent_a::OnStop";
set $@gdeventv_a2,3;
- donpcevent "eff_mvp#aru_gd::Onmvp";
+ donpcevent "eff_mvp#aru_gd::OnMVP";
mes "[Pierrot Pier]";
mes "Wow~~!!";
mes "Success~!!";
@@ -762,7 +762,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{
mes "Let the game.. Begin!";
mapannounce "arug_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00";
set $@gdeventv_a2,10;
- donpcevent "Controller#gdevent_a::Ongame_start";
+ donpcevent "Controller#gdevent_a::OnGame_start";
close;
}
}
@@ -784,7 +784,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{
mes "You've completeled an unbelievable task, I will give you the wonderful gift master has prepared!! Ha!";
mapannounce "arug_que01", "Pierrot Pier: You've completeled an unbelievable task, I will give you the wonderful gift my master has prepared!! Ha!",bc_map,"0x99CC00";
mapannounce "arug_que01", "Pierrot Pier: Here, take Pierre's Treasure Boxes.",bc_map,"0x99CC00";
- donpcevent "eff_mvp#aru_gd::Onmvp";
+ donpcevent "eff_mvp#aru_gd::OnMVP";
set $@gdeventv_a2,5;
getitem 14596,10; //Pierre_Treasurebox
close;
@@ -819,7 +819,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{
if (countitem(6031) > 0) {
donpcevent "Controller#gdevent_a::OnStop";
set $@gdeventv_a2,3;
- donpcevent "eff_mvp#aru_gd::Onmvp";
+ donpcevent "eff_mvp#aru_gd::OnMVP";
mes "[Pierrot Pier]";
mes "Wow~~!!";
mes "Success~!!";
@@ -929,7 +929,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{
if (countitem(6031) > 0) {
donpcevent "Controller#gdevent_a::OnStop";
set $@gdeventv_a2,3;
- donpcevent "eff_mvp#aru_gd::Onmvp";
+ donpcevent "eff_mvp#aru_gd::OnMVP";
mes "[Pierrot Pier]";
mes "Wow~~!!";
mes "Success~!!";
@@ -993,7 +993,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{
if (countitem(6031) > 0) {
donpcevent "Controller#gdevent_a::OnStop";
set $@gdeventv_a2,3;
- donpcevent "eff_mvp#aru_gd::Onmvp";
+ donpcevent "eff_mvp#aru_gd::OnMVP";
mes "[Pierrot Pier]";
mes "Wow~~!!";
mes "Success~!!";
@@ -1024,11 +1024,11 @@ OnInit:
set $@gdeventv_a2,0;
end;
-Onwin:
+OnWin:
donpcevent "treg#aru_gd::OnEnable";
end;
-Ongame_start:
+OnGame_start:
initnpctimer;
donpcevent "paper_sp_1_a::OnEnable";
donpcevent "paper_sp_2_a::OnEnable";
@@ -1334,7 +1334,7 @@ OnTouch2:
arug_que01,6,6,1 script eff_mvp#aru_gd CLEAR_NPC,{
end;
-Onmvp:
+OnMVP:
initnpctimer;
end;
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index 343c21ead..536b37b79 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -659,7 +659,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
mes "Let the game.. Begin!";
mapannounce "schg_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00";
set $@gdeventv_s2,1;
- donpcevent "Controller#gdevent_s::Ongame_start";
+ donpcevent "Controller#gdevent_s::OnGame_start";
erasequest 2143;
close;
}
@@ -676,7 +676,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
if (countitem(6031) > 0) {
donpcevent "Controller#gdevent_s::OnStop";
set $@gdeventv_s2,3;
- donpcevent "eff_mvp#sch_gd::Onmvp";
+ donpcevent "eff_mvp#sch_gd::OnMVP";
mes "[Pierrot Pier]";
mes "Wow~~!!";
mes "Success~!!";
@@ -761,7 +761,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
mes "Let the game.. Begin!";
mapannounce "schg_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00";
set $@gdeventv_s2,10;
- donpcevent "Controller#gdevent_s::Ongame_start";
+ donpcevent "Controller#gdevent_s::OnGame_start";
close;
}
}
@@ -783,7 +783,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
mes "You've completeled an unbelievable task, I will give you the wonderful gift master has prepared!! Ha!";
mapannounce "schg_que01", "Pierrot Pier: You've completeled an unbelievable task, I will give you the wonderful gift my master has prepared!! Ha!",bc_map,"0x99CC00";
mapannounce "schg_que01", "Pierrot Pier: Here, take Pierre's Treasure Boxes.",bc_map,"0x99CC00";
- donpcevent "eff_mvp#sch_gd::Onmvp";
+ donpcevent "eff_mvp#sch_gd::OnMVP";
set $@gdeventv_s2,5;
getitem 14596,10; //Pierre_Treasurebox
close;
@@ -818,7 +818,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
if (countitem(6031) > 0) {
donpcevent "Controller#gdevent_s::OnStop";
set $@gdeventv_s2,3;
- donpcevent "eff_mvp#sch_gd::Onmvp";
+ donpcevent "eff_mvp#sch_gd::OnMVP";
mes "[Pierrot Pier]";
mes "Wow~~!!";
mes "Success~!!";
@@ -928,7 +928,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
if (countitem(6031) > 0) {
donpcevent "Controller#gdevent_s::OnStop";
set $@gdeventv_s2,3;
- donpcevent "eff_mvp#sch_gd::Onmvp";
+ donpcevent "eff_mvp#sch_gd::OnMVP";
mes "[Pierrot Pier]";
mes "Wow~~!!";
mes "Success~!!";
@@ -992,7 +992,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
if (countitem(6031) > 0) {
donpcevent "Controller#gdevent_s::OnStop";
set $@gdeventv_s2,3;
- donpcevent "eff_mvp#sch_gd::Onmvp";
+ donpcevent "eff_mvp#sch_gd::OnMVP";
mes "[Pierrot Pier]";
mes "Wow~~!!";
mes "Success~!!";
@@ -1023,11 +1023,11 @@ OnInit:
set $@gdeventv_s2,0;
end;
-Onwin:
+OnWin:
donpcevent "treg#sch_gd::OnEnable";
end;
-Ongame_start:
+OnGame_start:
initnpctimer;
donpcevent "paper_sp_1_s::OnEnable";
donpcevent "paper_sp_2_s::OnEnable";
@@ -1333,7 +1333,7 @@ OnTouch2:
schg_que01,6,6,1 script eff_mvp#sch_gd CLEAR_NPC,{
end;
-Onmvp:
+OnMVP:
initnpctimer;
end;
diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt
index 01d9734d5..6fc2bb660 100644
--- a/npc/events/god_se_festival.txt
+++ b/npc/events/god_se_festival.txt
@@ -32,13 +32,13 @@ yuno,1,1,0 script Festival Manager#gq_fes0 4_F_HUGIRL,{
case 1:
mes "[Festival Manager]";
mes "Ending festivals and disabling NPCs.";
- donpcevent "Rmimi Ravies#gq_fes01::Onover";
- donpcevent "Rmimi Ravies#gq_fes01::Onover";
+ donpcevent "Rmimi Ravies#gq_fes01::OnOver";
+ donpcevent "Rmimi Ravies#gq_fes01::OnOver";
close;
case 2:
mes "[Festival Manager]";
mes "Resetting festivals and enabling NPCs.";
- donpcevent "Rmimi Ravies#gq_fes01::Onover";
+ donpcevent "Rmimi Ravies#gq_fes01::OnOver";
donpcevent "Rmimi Ravies#gq_fes01::OnEnable";
close;
}
@@ -169,7 +169,7 @@ OnStart:
set $@gqse_festival,1;
end;
-Oncall:
+OnCall:
if (mobcount("yuno","Rmimi Ravies#gq_fes01::OnMyMobDead") < 31) {
monster "yuno",0,0,"Valkyrie's Blessing",1083,100,"Rmimi Ravies#gq_fes01::OnMyMobDead";
monster "yuno",0,0,"Valkyrie's Gift",1951,25,"Rmimi Ravies#gq_fes01::OnMyMobDead";
@@ -195,7 +195,7 @@ Oncall:
}
end;
-Onover:
+OnOver:
killmonster "yuno","Rmimi Ravies#gq_fes01::OnMyMobDead";
set $@gqse_festival,0;
stopnpctimer;
@@ -230,7 +230,7 @@ OnTimer243000:
OnTimer300000:
announce "The first 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+ donpcevent "Rmimi Ravies#gq_fes01::OnCall";
end;
OnTimer303000:
@@ -256,7 +256,7 @@ OnTimer608000:
OnTimer900000:
announce "The third 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+ donpcevent "Rmimi Ravies#gq_fes01::OnCall";
end;
OnTimer903000:
@@ -269,7 +269,7 @@ OnTimer908000:
OnTimer1200000:
announce "The fourth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+ donpcevent "Rmimi Ravies#gq_fes01::OnCall";
end;
OnTimer1203000:
@@ -282,7 +282,7 @@ OnTimer1208000:
OnTimer1500000:
announce "The fifth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+ donpcevent "Rmimi Ravies#gq_fes01::OnCall";
end;
OnTimer1503000:
@@ -295,7 +295,7 @@ OnTimer1508000:
OnTimer1800000:
announce "The sixth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+ donpcevent "Rmimi Ravies#gq_fes01::OnCall";
end;
OnTimer1803000:
@@ -308,7 +308,7 @@ OnTimer1808000:
OnTimer2100000:
announce "The seventh 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+ donpcevent "Rmimi Ravies#gq_fes01::OnCall";
end;
OnTimer2103000:
@@ -321,7 +321,7 @@ OnTimer2108000:
OnTimer2400000:
announce "The eighth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+ donpcevent "Rmimi Ravies#gq_fes01::OnCall";
end;
OnTimer2403000:
@@ -334,7 +334,7 @@ OnTimer2408000:
OnTimer2700000:
announce "The ninth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+ donpcevent "Rmimi Ravies#gq_fes01::OnCall";
end;
OnTimer2703000:
@@ -347,7 +347,7 @@ OnTimer2708000:
OnTimer3000000:
announce "The first0 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+ donpcevent "Rmimi Ravies#gq_fes01::OnCall";
end;
OnTimer3003000:
@@ -360,7 +360,7 @@ OnTimer3008000:
OnTimer3300000:
announce "The eleventh 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+ donpcevent "Rmimi Ravies#gq_fes01::OnCall";
end;
OnTimer3303000:
@@ -373,7 +373,7 @@ OnTimer3308000:
OnTimer3600000:
announce "The twelfth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rmimi Ravies#gq_fes01::Oncall";
+ donpcevent "Rmimi Ravies#gq_fes01::OnCall";
end;
OnTimer3603000:
@@ -386,7 +386,7 @@ OnTimer3608000:
OnTimer3900000:
announce "The entire ceremony is over now, I am sure all of you had fun.",bc_all,"0x70dbdb";
- donpcevent "Rmimi Ravies#gq_fes01::Onover";
+ donpcevent "Rmimi Ravies#gq_fes01::OnOver";
end;
}
@@ -410,13 +410,13 @@ rachel,1,1,0 script Festival Manager#gq_fes2 4_F_HUGIRL,{
case 1:
mes "[Festival Manager]";
mes "Ending festivals and disabling NPCs.";
- donpcevent "Rhehe Ravies#gq_fes03::Onover";
- donpcevent "Rhehe Ravies#gq_fes03::Ondisable";
+ donpcevent "Rhehe Ravies#gq_fes03::OnOver";
+ donpcevent "Rhehe Ravies#gq_fes03::OnDisable";
close;
case 2:
mes "[Festival Manager]";
mes "Resetting festivals and enabling NPCs.";
- donpcevent "Rhehe Ravies#gq_fes03::Onover";
+ donpcevent "Rhehe Ravies#gq_fes03::OnOver";
donpcevent "Rhehe Ravies#gq_fes03::OnEnable";
close;
}
@@ -551,7 +551,7 @@ OnStart:
set $@gqse_festival,1;
end;
-Oncall:
+OnCall:
if (mobcount("rachel","Rhehe Ravies#gq_fes03::OnMyMobDead") < 31) {
monster "rachel",0,0,"Valkyrie's Blessing",1083,100,"Rhehe Ravies#gq_fes03::OnMyMobDead";
monster "rachel",0,0,"Valkyrie's Gift",1951,25,"Rhehe Ravies#gq_fes03::OnMyMobDead";
@@ -577,7 +577,7 @@ Oncall:
}
end;
-Onover:
+OnOver:
killmonster "rachel","Rhehe Ravies#gq_fes03::OnMyMobDead";
set $@gqse_festival,0;
stopnpctimer;
@@ -612,7 +612,7 @@ OnTimer243000:
OnTimer300000:
announce "The first 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+ donpcevent "Rhehe Ravies#gq_fes03::OnCall";
end;
OnTimer303000:
@@ -625,7 +625,7 @@ OnTimer308000:
OnTimer600000:
announce "The second 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+ donpcevent "Rhehe Ravies#gq_fes03::OnCall";
end;
OnTimer603000:
@@ -638,7 +638,7 @@ OnTimer608000:
OnTimer900000:
announce "The third 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+ donpcevent "Rhehe Ravies#gq_fes03::OnCall";
end;
OnTimer903000:
@@ -651,7 +651,7 @@ OnTimer908000:
OnTimer1200000:
announce "The fourth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+ donpcevent "Rhehe Ravies#gq_fes03::OnCall";
end;
OnTimer1203000:
@@ -664,7 +664,7 @@ OnTimer1208000:
OnTimer1500000:
announce "The fifth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+ donpcevent "Rhehe Ravies#gq_fes03::OnCall";
end;
OnTimer1503000:
@@ -677,7 +677,7 @@ OnTimer1508000:
OnTimer1800000:
announce "The sixth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+ donpcevent "Rhehe Ravies#gq_fes03::OnCall";
end;
OnTimer1803000:
@@ -690,7 +690,7 @@ OnTimer1808000:
OnTimer2100000:
announce "The seventh 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+ donpcevent "Rhehe Ravies#gq_fes03::OnCall";
end;
OnTimer2103000:
@@ -703,7 +703,7 @@ OnTimer2108000:
OnTimer2400000:
announce "The eighth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+ donpcevent "Rhehe Ravies#gq_fes03::OnCall";
end;
OnTimer2403000:
@@ -716,7 +716,7 @@ OnTimer2408000:
OnTimer2700000:
announce "The ninth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+ donpcevent "Rhehe Ravies#gq_fes03::OnCall";
end;
OnTimer2703000:
@@ -729,7 +729,7 @@ OnTimer2708000:
OnTimer3000000:
announce "The tenth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+ donpcevent "Rhehe Ravies#gq_fes03::OnCall";
end;
OnTimer3003000:
@@ -742,7 +742,7 @@ OnTimer3008000:
OnTimer3300000:
announce "The eleventh 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+ donpcevent "Rhehe Ravies#gq_fes03::OnCall";
end;
OnTimer3303000:
@@ -755,7 +755,7 @@ OnTimer3308000:
OnTimer3600000:
announce "The twelfth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Oncall";
+ donpcevent "Rhehe Ravies#gq_fes03::OnCall";
end;
OnTimer3603000:
@@ -768,6 +768,6 @@ OnTimer3608000:
OnTimer3900000:
announce "The entire ceremony is over now, I am sure all of you had fun.",bc_all,"0x70dbdb";
- donpcevent "Rhehe Ravies#gq_fes03::Onover";
+ donpcevent "Rhehe Ravies#gq_fes03::OnOver";
end;
}
diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt
index f35903828..097abb53c 100644
--- a/npc/events/nguild/nguild_ev_agit.txt
+++ b/npc/events/nguild/nguild_ev_agit.txt
@@ -54,9 +54,9 @@ function script F_AgitBreak {
if (.@Economy < 0) set .@Economy, 0;
setcastledata .@map$, 2, .@Economy;
- set .@Defence,getcastledata(.@map$,3) - 5;
- if (.@Defence < 0) set .@Defence, 0;
- setcastledata .@map$, 3, .@Defence;
+ set .@defence,getcastledata(.@map$,3) - 5;
+ if (.@defence < 0) set .@defence, 0;
+ setcastledata .@map$, 3, .@defence;
setcastledata .@map$,1, .@GID;
mapannounce .@map$,"The emperium has been destroyed.",bc_map,0x00CCFF;