From 8be1bf181369089e6e7288ed6922aba4bb4f8e0a Mon Sep 17 00:00:00 2001 From: Haru Date: Sat, 7 Dec 2013 16:42:02 +0100 Subject: Fixed several incorrect script labels and events Signed-off-by: Haru --- npc/battleground/kvm/kvm01.txt | 2 +- npc/battleground/kvm/kvm02.txt | 2 +- npc/battleground/kvm/kvm03.txt | 2 +- npc/custom/quests/bandit_beard.txt | 4 ++-- npc/events/gdevent_aru.txt | 4 ++-- npc/events/gdevent_sch.txt | 4 ++-- npc/events/god_se_festival.txt | 2 +- npc/jobs/2-1/assassin.txt | 6 +++--- npc/jobs/2-1/hunter.txt | 2 +- npc/jobs/2-2/rogue.txt | 2 +- npc/pre-re/mobs/dungeons/lhz_dun.txt | 4 ++-- npc/quests/quests_morocc.txt | 2 +- npc/quests/the_sign_quest.txt | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt index 4fb84ddc3..f70b3b3fa 100644 --- a/npc/battleground/kvm/kvm01.txt +++ b/npc/battleground/kvm/kvm01.txt @@ -357,7 +357,7 @@ OnTimer5000: mapannounce "bat_c01", "Please be careful.",bc_map,"0x00ff00"; end; -OnTimer:55000: +OnTimer55000: mapannounce "bat_c01", "You will be sent back.",bc_map,"0x00ff00"; end; diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt index 33982a2c5..d2a5c38c2 100644 --- a/npc/battleground/kvm/kvm02.txt +++ b/npc/battleground/kvm/kvm02.txt @@ -359,7 +359,7 @@ OnTimer5000: mapannounce "bat_c02", "Please be careful.",bc_map,"0x00ff00"; end; -OnTimer:55000: +OnTimer55000: mapannounce "bat_c02", "You will be sent back.",bc_map,"0x00ff00"; end; diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt index 6866a7147..c821a7db3 100644 --- a/npc/battleground/kvm/kvm03.txt +++ b/npc/battleground/kvm/kvm03.txt @@ -358,7 +358,7 @@ OnTimer5000: mapannounce "bat_c03", "Please be careful.",bc_map,"0x00ff00"; end; -OnTimer:55000: +OnTimer55000: mapannounce "bat_c03", "You will be sent back.",bc_map,"0x00ff00"; end; diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt index fb28732d7..897464b26 100644 --- a/npc/custom/quests/bandit_beard.txt +++ b/npc/custom/quests/bandit_beard.txt @@ -227,8 +227,8 @@ OnDie: if($@beardmob > 0) end; set $@beardMobD,1; end; -On1201: -On0001: +OnClock1201: +OnClock0001: set $@beardmob,0; set $@beardMobD,0; end; diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index 1578127f9..22d30e12c 100644 --- a/npc/events/gdevent_aru.txt +++ b/npc/events/gdevent_aru.txt @@ -45,11 +45,11 @@ OnEnable: end; OnKill: - killmonster "arug_dun01","Monster Controler1#aru::OnMyMObDead"; + killmonster "arug_dun01","Monster Controler1#aru::OnMyMobDead"; end; OnMyMobDead: - if (mobcount("arug_dun01","Monster Controler1#aru::OnMyMObDead") == 0) { + if (mobcount("arug_dun01","Monster Controler1#aru::OnMyMobDead") == 0) { mapannounce "arug_dun01", "Kublin: Aargh!",bc_map,"0x99CC00"; mapannounce "arug_dun01", "Morestone: I thought I heard Kublin screaming!! Who is there? What happened to Kublin? Hey you!",bc_map,"0x99CC00"; donpcevent "Dwarf#aru_gd::OnEnable"; diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index 536b37b79..31537763e 100644 --- a/npc/events/gdevent_sch.txt +++ b/npc/events/gdevent_sch.txt @@ -45,11 +45,11 @@ OnEnable: end; OnKill: - killmonster "schg_dun01","Monster Controler1#sch::OnMyMObDead"; + killmonster "schg_dun01","Monster Controler1#sch::OnMyMobDead"; end; OnMyMobDead: - if (mobcount("schg_dun01","Monster Controler1#sch::OnMyMObDead") == 0) { + if (mobcount("schg_dun01","Monster Controler1#sch::OnMyMobDead") == 0) { mapannounce "schg_dun01", "Kublin: Aargh!",bc_map,"0x99CC00"; mapannounce "schg_dun01", "Morestone: I thought I heard Kublin screaming!! Who is there? What happened to Kublin? Hey you!",bc_map,"0x99CC00"; donpcevent "Dwarf#sch_gd::OnEnable"; diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index 6fc2bb660..4712d6fd7 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -243,7 +243,7 @@ OnTimer308000: OnTimer600000: announce "The second '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; OnTimer603000: diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index e4b231fcf..896a19e4e 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -1255,7 +1255,7 @@ OnReset: donpcevent "Standby Room#ASNTEST::OnStart"; end; -OnResetmob: +OnResetMob: killmonster "in_moc_16","Beholder#ASNTEST::OnMyMobDead"; killmonster "in_moc_16","Beholder#ASNTEST::OnMyMobDead2"; stopnpctimer; @@ -1269,7 +1269,7 @@ OnMyMobDead: changequest 8003,8004; donpcevent "timestopper#1::OnEnable"; donpcevent "Keeper of the Door#ASN::OnEnable"; - donpcevent "Beholder#ASNTEST::OnResetmob"; + donpcevent "Beholder#ASNTEST::OnResetMob"; set .DisableTraps,1; stopnpctimer; } @@ -1354,7 +1354,7 @@ OnTouch: mapannounce "in_moc_16",strcharinfo(0) + ", you're trapped. You will be sent back.",bc_map; set ASSIN_Q,2; warp "in_moc_16",19,161; - donpcevent "Beholder#ASNTEST::OnResetmob"; + donpcevent "Beholder#ASNTEST::OnResetMob"; donpcevent "Standby Room#ASNTEST::OnStart"; } end; diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index b770d93df..1acb63a8b 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -1097,7 +1097,7 @@ OnMyMobDead: if (.MyMobs < 3) { mapannounce "job_hunte","Okay, good job... Now, find the switch in the center of the map!! Be careful of the traps!!",bc_map; set HNTR_Q,14; - donpcevent "switch#hnt::OnEnable"; + donpcevent "Switch#hnt::OnEnable"; donpcevent "Manager#hnt::OnDisable"; } else { diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 842d9cd05..52baaf58d 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -1711,7 +1711,7 @@ OnTouch: end; OnDisable: - killmonster "in_rogue","mob_rogue#3::OnMyMObDead"; + killmonster "in_rogue","mob_rogue#3::OnMyMobDead"; end; OnMyMobDead: diff --git a/npc/pre-re/mobs/dungeons/lhz_dun.txt b/npc/pre-re/mobs/dungeons/lhz_dun.txt index 55e9acbfa..eb544e724 100644 --- a/npc/pre-re/mobs/dungeons/lhz_dun.txt +++ b/npc/pre-re/mobs/dungeons/lhz_dun.txt @@ -279,7 +279,7 @@ OnSummon: case 6: set .@x,175; set .@y,137; break; } set .@mob,rand(1646,1651); - monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,"summon_boss_lt::OnMyMvPDead"; + monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,"summon_boss_lt::OnMyMVPDead"; // Select Coordinates to summon a random 99 on switch(rand(1,6)) { @@ -294,7 +294,7 @@ OnSummon: monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,"summon_boss_lt::OnMVP"; end; -OnMyMvPDead: +OnMyMVPDead: killmonster "lhz_dun03","summon_boss_lt::OnMVP"; initnpctimer; end; diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 86e07aab1..398aa9a97 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -7772,7 +7772,7 @@ OnTouch: } prt_castle,354,276,0 script #peter WARPNPC,1,1,{ -OnTouch:; +OnTouch: if (checkquest(10019) == 0 || checkquest(10019) == 1) { donpcevent "Prince#eisen5::OnEnable"; } diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index ba0d259e9..9ede5352e 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -3546,7 +3546,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 1_F_SIGNZISK,{ mes "But who's going to"; mes "ask us the questions?"; next; - donpcevent "Aaron#sign::onSmile"; + donpcevent "Aaron#sign::OnSmile"; emotion e_gasp; emotion e_gasp,1; mes "[Aaron]"; -- cgit v1.2.3-60-g2f50