From 11b27bf485299d5591354ef74cc557ce05d986e6 Mon Sep 17 00:00:00 2001 From: Lupus Date: Fri, 10 Mar 2006 05:50:01 +0000 Subject: minor typos, fixed Turtle island exploit git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5549 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 4 ++-- npc/cities/alberta.txt | 25 ++++++++++++------------- npc/custom/adoption.txt | 2 +- npc/merchants/shops.txt | 2 +- 4 files changed, 16 insertions(+), 17 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index b88b85b6e..3058d2eda 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -27,10 +27,10 @@ Nexon Date Added ====== - +03/10 + * Fixed Turtle Island quest, got rid of 2 useless variables [Lupus] 03/07 * Fixed some reference to old locations of the Blacksmith NPC's, Thanks to Neouni. [Poki#3] - 03/06 * Fixed Thanatos warps: tha_t06,tha_t06a,tha_t06b,tha_t05a thanks to Justin84 [Lupus] - Added Temp Thanatos Keys solution (more close to official than that Thanatos Statues Quest) diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index 1c677247d..f1cba32c8 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -3,9 +3,9 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== -//= eAthena 7.15 + +//= eAthena SVN //===== Description: ========================================= //= //===== Additional Comments: ================================= @@ -17,6 +17,7 @@ //= 1.5 Fixed typo in script. [massdriller] //= 1.6 Fixed some typos, optimized, added Gotanblue#2 to be able to return back to Alberta [Lupus] //= 1.7 Fixed Phelix bugs [Lupus] +//= 1.8 Got rid of 2 useless variables, fixed Turtle Island Quest exploit [Lupus] //============================================================ @@ -261,7 +262,7 @@ alberta.gat,190,173,4 script Phelix 85,{ M_Yes: mes "[Phelix]"; - mes "What do you want to exchange your jellopies for?"; + mes "What do you want to exchange your Jellopies for?"; next; menu "Red Potion please.",-,"Sweet Potato please.",M_1,"Cancel",M_End; @@ -290,7 +291,7 @@ alberta.gat,190,173,4 script Phelix 85,{ L_NotEnough: mes "[Phelix]"; - mes "I'm sorry but you do not have enough jellopy."; + mes "I'm sorry but you do not have enough Jellopies."; next; goto M_Yes; @@ -351,7 +352,7 @@ MEnd: //<====================================================== Turtle Island ========================================================>\\ // Gotanblue -------------------------------------------------------------------------- alberta.gat,247,123,5 script Gotanblue 709,{ - if(TURTLE == 1) goto L_Turtle; + if(TURTLE) goto L_Turtle; mes "[Gotanblue]"; mes "Ha ha! The sea seems endless!! We cannot begin to grasp it's size merely by gazing at it from land...."; next; @@ -594,8 +595,7 @@ alberta_in.gat,23,104,2 script Turtle Grandpa 120,{ next; mes "[Turtle Grandpa]"; mes "Oh! One more thing... look for his '^5555FFjournal^000000'. He usually has it close by. It's definitely an interesting read."; - set TURTLE, 1; - set JORNADAN, 1; + if(TURTLE==0) set TURTLE, 1; close; sM_1: mes "[Turtle Grandpa]"; @@ -720,7 +720,7 @@ alberta.gat,248,90,1 script Jornadan Niliria 121,{ // Jornadan's Voyage Log ------------------------------------------------- alberta.gat,247,93,1 script A Voyage Log 111,{ - if(JORNADAN == 1) goto L_Treasure; + if(TURTLE == 1) goto L_Treasure; mes "[A Voyage Log]"; mes "= 03:20 am ="; mes "The moon was dark and I couldn't even see 100m in front of me. I had a bad feeling about the situation..... I was not the only one..."; @@ -835,14 +835,13 @@ L_Treasure: mes "- with a skull mark on it -"; mes "- You've gained -"; mes "- a 'Skull Key' -^000000"; - set SKULLKEY, 1; - set JORNADAN, 0; + set TURTLE, 2; close; } // Burried treasure -------------------------------------------------------------------- tur_dun01.gat,160,80,1 script Skull Stone 111,{ - if(SKULLKEY == 1) goto L_OpenBox; + if(TURTLE == 2) goto L_OpenBox; mes "^5555FF(It's a frightening stone tomb with horrible skull on it.)^000000"; close; @@ -852,9 +851,9 @@ L_OpenBox: mes "^5555FF(~click!~click!~)^000000"; next; mes "^5555FF(Suddenly the top of the stone opens with many things coming out!)^000000"; - set SKULLKEY, 0; + set TURTLE, 3; next; - mes "^5555FF(You got 5 Bananas, and 5 Banana Juices.)^000000"; + mes "^5555FF(You got 5 Tropical Bananas and 5 Banana Juices.)^000000"; getitem 634, 5; getitem 532, 5; close; diff --git a/npc/custom/adoption.txt b/npc/custom/adoption.txt index 77bfc4498..fca5a639e 100644 --- a/npc/custom/adoption.txt +++ b/npc/custom/adoption.txt @@ -79,7 +79,7 @@ A_No: close; A_Cannot: mes "[Oliver]"; - mes "There is currentally an adoption inprogress, come back when it has finished."; + mes "There is currentlly an adoption in progress, come back when it is finished."; close; A_Yes: mes "[Oliver]"; diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index d2c37c1e1..d893925dd 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -89,7 +89,7 @@ cmd_in01.gat,117,165,4 shop Armor Dealer 101,2226:-1,2228:-1,2103:-1,2105:-1,240 cmd_in01.gat,131,165,4 shop Weapon Dealer 49,1903:-1,1905:-1,1907:-1,1950:-1,1952:-1,1954:-1,1956:-1,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1 cmd_in01.gat,79,182,4 shop Tool Dealer 83,1753:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,657:-1,601:-1,602:-1,611:-1,1065:-1 comodo.gat,296,125,4 shop Souvenir Merchant 101,965:-1,964:-1 -comodo.gat,244,296,7 shop Item Collector 74,909:-1,5 +comodo.gat,244,296,7 shop Item Collector 74,909:-1 comodo.gat,224,164,4 shop Food Seller 750,7455:-1 //======================================================= -- cgit v1.2.3-60-g2f50