diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/Changelog.txt | 3 | ||||
| -rw-r--r-- | npc/merchants/cash_trader.txt | 5 | ||||
| -rw-r--r-- | npc/other/monster_museum.txt | 7 | ||||
| -rw-r--r-- | npc/quests/quests_louyang.txt | 19 |
4 files changed, 20 insertions, 14 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 223117720..219c9abfb 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,8 @@ Date Added ====== +2008/03/01 + * Rev 12275 Resolves bugreport:1025, bugreport:1062, [L0ne_W0lf] + bugreport:1077 and bugreport:1078. :P 2008/02/29 * Rev 12274 Updated Turtle Island quest, and mixture quest. [L0ne_W0lf] 2008/02/28 diff --git a/npc/merchants/cash_trader.txt b/npc/merchants/cash_trader.txt index 757817397..3dfa04dc6 100644 --- a/npc/merchants/cash_trader.txt +++ b/npc/merchants/cash_trader.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 2.4 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //= Based on iRO's Cash shop. Headgears omitted. //===== Additional Comments: ================================= //= 1.0 First Version. Sample shop per-say. +//= 1.1 FIxed typo. (bugreport:1078) [L0ne_W0lf] //============================================================ // Payon @@ -23,4 +24,4 @@ // Blessing and Increase Agility Scroll boxes, Dungeon // Teleport Scroll Box, Stat Food boxes, and Gym Passes. -payon,171,142,4 cashshop Kafra Shop Employee 116,12900:1000,12901:200,12902:1000,12909:100,12910:100,12911:1500,12922:150,7619:100,7620:100,12916:150,12917:150,12915:100,12918:100,12913:125,12914:125,13553:5012903:100,12904:100,12905:100,12906:100,12907:100,12908:100,7776:50 +payon,171,142,4 cashshop Kafra Shop Employee 116,12900:1000,12901:200,12902:1000,12909:100,12910:100,12911:1500,12922:150,7619:100,7620:100,12916:150,12917:150,12915:100,12918:100,12913:125,12914:125,13553:50,12903:100,12904:100,12905:100,12906:100,12907:100,12908:100,7776:50 diff --git a/npc/other/monster_museum.txt b/npc/other/monster_museum.txt index 3fa1d4978..9e59e93c8 100644 --- a/npc/other/monster_museum.txt +++ b/npc/other/monster_museum.txt @@ -4,7 +4,7 @@ //= Muad_Dib (The Prometheus Project) //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -18,6 +18,7 @@ //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 1.3 Added a Missing "case 1:". [Samuray22] // -Thanks to Dr.Evil +//= 1.4 Corrected a few typos. (bugreport:1077) [L0ne_W0lf] //============================================================ yuno_in03,32,15,3 script Museum Guide 67,{ @@ -78,7 +79,7 @@ yuno_in03,33,21,1 script #DEVIACE 111,{ mes "character."; next; mes "Therefore, it never initiates"; - mes "attack on an undersea traveller"; + mes "attack on an undersea traveler"; mes "unless it's attacked first."; mes "However, once it becomes upset, it"; mes "uses high level magic skills. So"; @@ -270,7 +271,7 @@ yuno_in03,12,45,1 script #ASSULTER 111,{ mes " Attribute : Wind"; next; mes "Explanation :"; - mes "Unlike other turtles on on Turtle"; + mes "Unlike other turtles on Turtle"; mes "Island, this turtle stands on two"; mes "legs and attacks passersby with"; mes "the other two legs, wielding a"; diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index d2f1514d3..a2f6887cc 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Evera and The eAthena Dev Team //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= @@ -28,6 +28,7 @@ //= quest progress from the old scripts. //= 1.7 Added missing checkweights. And corrected [L0ne_W0lf] //= a typo in Poison King quest. +//= 1.8 Bug fixes. (bugreport:1025 bugreport:1062) [L0ne_Wplf] //============================================================ // Soup Quest @@ -361,7 +362,6 @@ lou_in02,62,183,3 script Chef#1-2 820,2,2,{ close; OnTouch: - set rand(1,10),rand(1,10); if (ch_tre == 2 || ch_tre == 3) { if (gettime(3) >= 10 && gettime(3) < 14) { if (rand(1,10) < 9) { @@ -2417,12 +2417,13 @@ lou_in02,203,159,0 warp Storage Warp#4 1,1,louyang,129,118 //============================================================ lou_in02,123,39,4 script Poison King#lou 824,{ // Attempt to preserve prior quest progress. - if (QL_POISONKING <= 12) set ch_poison,QL_POISONKING; - else if (QL_POISONKING == 16) set ch_poison,19; - else if (QL_POISONKING >= 17) set ch_poison,20; - // Remove outdated variable. - set QL_POISONKING,0; - + if (ch_poison == 0 && CL_POISONKING != 0) { + if (QL_POISONKING <= 12) set ch_poison,QL_POISONKING; + else if (QL_POISONKING == 16) set ch_poison,19; + else if (QL_POISONKING >= 17) set ch_poison,20; + // Remove outdated variable. + set QL_POISONKING,0; + } if (checkweight(1201,1) == 0) { mes "^3355FF * Wait a minute! *"; mes "Right now, you are carrying too many items with you. Please place some of your items into Kafra Storage and try again.^000000"; @@ -3072,7 +3073,7 @@ lou_in02,123,39,4 script Poison King#lou 824,{ mes "my worst memories."; next; set ch_poison,1; - if (BaseCalss == Job_Thief) { + if (BaseClass == Job_Thief) { mes "[Nagash Arses]"; mes "Ah, you look just like I did when"; mes "I was young. It seems you know"; |