From 64c3397ef48083b1842268cf0b691a07fe572b97 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Tue, 16 Oct 2007 23:40:07 +0000 Subject: * Added a return at the end of several scripts. Should deal with errors being shown in due to a recent commit by FlavioJS git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11495 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 3 +++ npc/cities/jawaii.txt | 2 +- npc/cities/yuno.txt | 2 +- npc/custom/adoption.txt | 2 +- npc/guild/prtg/prtg_treas.txt | 2 +- npc/jobs/1-1e/gunslinger.txt | 2 +- npc/jobs/1-1e/ninja.txt | 2 +- npc/jobs/2-1/knight.txt | 2 +- npc/jobs/2-1/wizard.txt | 2 +- npc/merchants/ammo_boxes.txt | 2 +- npc/merchants/ammo_dealer.txt | 2 +- npc/merchants/gemstone.txt | 2 +- npc/merchants/hair_dyer.txt | 2 +- npc/merchants/kunai_maker.txt | 2 +- npc/merchants/old_pharmacist.txt | 2 +- npc/merchants/quivers.txt | 2 +- npc/other/divorce.txt | 2 +- npc/other/hugel_bingo.txt | 2 +- npc/quests/doomed_swords_quest.txt | 2 +- npc/quests/quests_ayothaya.txt | 2 +- npc/quests/quests_comodo.txt | 2 +- npc/quests/quests_louyang.txt | 2 +- npc/quests/skills/blacksmith_skills.txt | 2 +- npc/quests/skills/knight_skills.txt | 2 +- 24 files changed, 26 insertions(+), 23 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 13eee60fa..c8d019ec7 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,8 @@ Date Added ====== +2007/10/16 + * Rev. 11495 Added a return at the end of several scripts. [L0ne_W0lf] + Should deal with errors being shown in due to a recent commit by FlavioJS 2007/10/14 * Rev. 11473 Changed "Marthilda" to "Mathilda" in the Aco and priest Job quests. [L0ne_W0lf] * Rev. 11472 Updated Merchant quest skill NPCs. [L0ne_W0lf] diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 39f68f129..4055cdae5 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -1454,4 +1454,4 @@ izlude,171,185,3 script Honeymoon Helper#Izlude 71,{ mes "A vacation in Jawaii could very well be the greatest gift that you could give to the one you love~"; close; } -} \ No newline at end of file +} diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt index 7cc4f61ec..b6f263898 100644 --- a/npc/cities/yuno.txt +++ b/npc/cities/yuno.txt @@ -387,4 +387,4 @@ S_Warp: mes "Please check the amount of zeny that you have."; close; } -} \ No newline at end of file +} diff --git a/npc/custom/adoption.txt b/npc/custom/adoption.txt index 3ab37d3e1..2a63922b7 100644 --- a/npc/custom/adoption.txt +++ b/npc/custom/adoption.txt @@ -501,4 +501,4 @@ L_Cancel: mes "[Mario]"; mes "Bye bye!"; close; -} \ No newline at end of file +} diff --git a/npc/guild/prtg/prtg_treas.txt b/npc/guild/prtg/prtg_treas.txt index 442636f10..81a43f7d8 100644 --- a/npc/guild/prtg/prtg_treas.txt +++ b/npc/guild/prtg/prtg_treas.txt @@ -172,4 +172,4 @@ prtg_cas05,276,178,0 script ban_warp#5 -1,6,6,{ OnTouch: callfunc "F_TreasProtect", "prtg_cas05", "prontera",109,179; end; -} \ No newline at end of file +} diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt index 0facac58d..4d32aa203 100644 --- a/npc/jobs/1-1e/gunslinger.txt +++ b/npc/jobs/1-1e/gunslinger.txt @@ -431,4 +431,4 @@ payon,184,65,3 script The Wise Bull Horn 866,{ mes "Hopefully you'll become a strong Gunslinger."; close; } -} \ No newline at end of file +} diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt index 4ce5c4987..4fe0a6150 100644 --- a/npc/jobs/1-1e/ninja.txt +++ b/npc/jobs/1-1e/ninja.txt @@ -684,4 +684,4 @@ einbroch,184,194,3 script Suspicious Guy 881,{ mes "Don't give up -- it'll all come in handy during your training."; close; } -} \ No newline at end of file +} diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index b96cb5f01..4f5dd4a9a 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -2628,4 +2628,4 @@ L_AskQuestions: mes "treasure!"; close; } -} \ No newline at end of file +} diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index e18c685d4..b69eb74fa 100644 --- a/npc/jobs/2-1/wizard.txt +++ b/npc/jobs/2-1/wizard.txt @@ -1947,4 +1947,4 @@ gef_tower,107,36,4 script White Dog#wiz 81,{ cutin "job_wizard_maria01",255; end; } -} \ No newline at end of file +} diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt index 1b935309a..fa1b1d51f 100644 --- a/npc/merchants/ammo_boxes.txt +++ b/npc/merchants/ammo_boxes.txt @@ -124,4 +124,4 @@ function script Func_Casing { delitem getarg(0), .@amount * 500; getitem getarg(1), .@amount; close; -} \ No newline at end of file +} diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt index 1ec1d74ba..6742b6022 100644 --- a/npc/merchants/ammo_dealer.txt +++ b/npc/merchants/ammo_dealer.txt @@ -98,4 +98,4 @@ function script Bullet_Trade { mes "Prepare again and come back."; close; } -} \ No newline at end of file +} diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt index 9faa09393..3814ceb7c 100644 --- a/npc/merchants/gemstone.txt +++ b/npc/merchants/gemstone.txt @@ -113,4 +113,4 @@ S_TradeGems: close; } } -} \ No newline at end of file +} diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt index eefeed271..6b5cea10f 100644 --- a/npc/merchants/hair_dyer.txt +++ b/npc/merchants/hair_dyer.txt @@ -149,4 +149,4 @@ S_NoDye: mes "Eh?! But you need the item '"+getitemname(getarg(0))+"' to dye your hair "+getarg(1)+"..."; close; } -} \ No newline at end of file +} diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt index 32a238e96..ad2adaddd 100644 --- a/npc/merchants/kunai_maker.txt +++ b/npc/merchants/kunai_maker.txt @@ -92,4 +92,4 @@ function script Kunai_Trade { delitem getarg(2),getarg(3)*.@amount; getitem getarg(4),10*.@amount; close; -} \ No newline at end of file +} diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt index 8bbfb4945..8f872c1e9 100644 --- a/npc/merchants/old_pharmacist.txt +++ b/npc/merchants/old_pharmacist.txt @@ -247,4 +247,4 @@ L_making: mes "Get lost!"; close; } -} \ No newline at end of file +} diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt index f9616fb72..c035f9e25 100644 --- a/npc/merchants/quivers.txt +++ b/npc/merchants/quivers.txt @@ -176,4 +176,4 @@ S_BuyQuiver: mes "It's a miracle of science! One that you can experience for yourself if you bring me at least 500 Arrows and 500 Zeny for each Quiver."; close; } -} \ No newline at end of file +} diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt index 4aff827a9..d726ee38a 100644 --- a/npc/other/divorce.txt +++ b/npc/other/divorce.txt @@ -214,4 +214,4 @@ nif_in,190,112,5 script Deviruchi#divorce 738,{ } mes "Hmmm...your spouse isn't online..."; close; -} \ No newline at end of file +} diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt index 33423a77c..569b66afb 100644 --- a/npc/other/hugel_bingo.txt +++ b/npc/other/hugel_bingo.txt @@ -1154,4 +1154,4 @@ que_bingo,54,17,5 script Arcade Owner 712,{ break; } -} \ No newline at end of file +} diff --git a/npc/quests/doomed_swords_quest.txt b/npc/quests/doomed_swords_quest.txt index 261add84e..5712807d2 100644 --- a/npc/quests/doomed_swords_quest.txt +++ b/npc/quests/doomed_swords_quest.txt @@ -1095,4 +1095,4 @@ S_GetSword: mes "then, take care of yourself, and be cautious in using that sword."; set dmdswrd_Q,45; return; -} \ No newline at end of file +} diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt index 6c0fa345d..96b3cc128 100644 --- a/npc/quests/quests_ayothaya.txt +++ b/npc/quests/quests_ayothaya.txt @@ -2903,4 +2903,4 @@ s_Win2: mes "one of the most important values"; mes "for human beings."; close; -} \ No newline at end of file +} diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt index ca4d07b55..b86d8d692 100644 --- a/npc/quests/quests_comodo.txt +++ b/npc/quests/quests_comodo.txt @@ -2345,4 +2345,4 @@ comodo,232,87,4 script Won#cmd 106,{ mes "anything right now, but..."; close; } -} \ No newline at end of file +} diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index a383d4400..1011496d3 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -3621,4 +3621,4 @@ lou_in01,82,139,7 script Soldier 825,{ close2; warp "lou_in01",47,141; end; -} \ No newline at end of file +} diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt index caaabf74b..973e1c296 100644 --- a/npc/quests/skills/blacksmith_skills.txt +++ b/npc/quests/skills/blacksmith_skills.txt @@ -713,4 +713,4 @@ geffen,172,52,7 script Goodday 826,{ mes "Why don't you become a"; mes "blacksmith someday?"; close; -} \ No newline at end of file +} diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt index f26ef6c57..a4503adf0 100644 --- a/npc/quests/skills/knight_skills.txt +++ b/npc/quests/skills/knight_skills.txt @@ -403,4 +403,4 @@ prontera,66,358,7 script Knight#4 733,{ mes "have to live together...just because we're..."; mes "out of shape...its...not a sin. (pant)"; close; -} \ No newline at end of file +} -- cgit v1.2.3-60-g2f50