diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/Changelog.txt | 7 | ||||
| -rw-r--r-- | npc/cities/lighthalzen.txt | 8 | ||||
| -rw-r--r-- | npc/cities/morocc.txt | 5 | ||||
| -rw-r--r-- | npc/events/christmas_2008.txt | 2 | ||||
| -rw-r--r-- | npc/instances/EndlessTower.txt | 24 | ||||
| -rw-r--r-- | npc/merchants/enchan_arm.txt | 5 |
6 files changed, 39 insertions, 12 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 4c2936f74..87670838d 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,12 @@ Date Added ====== +2010/12/02 + * Rev. 14552 Just going through bug reports. :P [L0ne_W0lf] + - Removed duplicate NPCs in Lighthalzen and Morroc. (bugreport:4555) + - Corrected typo (Sit -> Suit) in enhcant_arm NPC. (bugreport:4586) + - Corrected a typo in the christmas_2008 event. (bugreport:4600) + - Changed which White Lady spawns in endless tower. (bugreport:4601) + - Also added Quest Log Entries to Endless Tower, please test. 2010/11/22 * Rev. 14490 Added quest log support for the following quests. [L0ne_W0lf] - Factory Quest, Murder Quest, Cursed Spirit Quest, Juno Remedy Quest, diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index dc4a31cc7..df5e6fa2a 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= erKURITA, Au{R}oN (Translated by Alan), $ephiroth //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -40,6 +40,7 @@ //= 1.8 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.9 Added Cool Corp. Event Staff, who oringialy resided in the DTS_warper script file. [L0ne_W0lf] //= 2.0 Added missing Lab Staff#amano08 NPC. (bugreport:4319) [Gepard] +//= 2.1 Commented out Duplicate NPCs. (bugreport:4555) //============================================================= lighthalzen,198,285,5 script Jiwon#zen5 862,{ @@ -278,8 +279,8 @@ lighthalzen,78,120,3 script Maivi#zen1 862,{ close; } +/* lighthalzen,226,210,3 script Nannan 86,{ - mes "[Nannan]"; mes "You know, I always thought"; mes "that all Alchemists were bookish,"; @@ -305,6 +306,7 @@ lighthalzen,226,210,3 script Nannan 86,{ mes "to a street guy like me..."; close; } +*/ lighthalzen,230,182,4 script Klaubis#zen3 866,{ mes "[Klaubis]"; @@ -3144,6 +3146,7 @@ lhz_in02,36,284,0 script Cool Event Staff#Cesuna 874,{ close; } +/* lhz_in02,19,274,2 script Maintenance Guy#lhz 851,{ mes "[Kudiuu]"; mes "Holy...!"; @@ -3154,6 +3157,7 @@ lhz_in02,19,274,2 script Maintenance Guy#lhz 851,{ mes "almost a health hazard!"; close; } +*/ // Lighthalzen Mushroom. // Don't really understand why it's there, but it's funny regardless. diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt index 75b1c0c04..5faf5e4a6 100644 --- a/npc/cities/morocc.txt +++ b/npc/cities/morocc.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 2.1 +//= 2.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -24,6 +24,7 @@ //= 2.0 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf] //= 2.0a Fixed outdated info about Milk [Lupus] //= 2.1 Updated/Added NPCs for episode 12.1. [L0ne_W0lf] +//= 2.2 Removed duplicate bartender NPC. (bugreport:4555) [L0ne_W0lf] //============================================================ // Morroc @@ -715,6 +716,7 @@ moc_fild16,211,254,4 script Assassin#07rhea_30 118,{ // Other NPCs //============================================================ //Bartender +/* morocc_in,166,76,3 script Bartender#02 46,{ mes "[Bartender]"; mes "What are you going to order?"; @@ -752,6 +754,7 @@ morocc_in,166,76,3 script Bartender#02 46,{ mes "Don't even think about drinking if you don't have 1,000 zeny."; close; } +*/ // Assassin Guild Guards //=================================================== diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt index dc26d26e0..99b783a22 100644 --- a/npc/events/christmas_2008.txt +++ b/npc/events/christmas_2008.txt @@ -361,7 +361,7 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ mes "[Carolling]"; mes "For all of the children of this"; mes "world!!!"; - mes "Please bring me ^0000FF6Singing Crystal"; + mes "Please bring me ^0000FFSinging Crystal"; mes "Pieces^000000 from ^0000FFViolent Gift Boxes^000000!"; next; emotion 33; diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index 60894861d..796241785 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -17,6 +17,9 @@ //= Added some missing stopnpctimers to npcs. (bugreport:4418) //= 1.3 Fixed a couple copy/paste errors :D I fail. [L0ne_W0lf] // Timer no longer resets when re-entering. +//= 1.4 Added quest log entries based on iRO. [L0ne_W0lf] +//= You may need to update your questid2display. +//= Changed White lady spawn to MVP White Lady. (bugreport:4601) //============================================================ alberta,214,77,6 script Captain Janssen 709,{ @@ -201,6 +204,9 @@ e_tower,81,105,0 script Tower Protection Stone 406,{ set .@partymembercount,$@partymembercount; copyarray .@partymembername$[0],$@partymembername$[0],.@partymembercount; + set .@etower_timer,checkquest(60200,PLAYTIME); // 1 week + set .@etower_timer2,checkquest(60201,PLAYTIME); // 4 hours + set .@dun_lim_time,etower_timer+604800; // 1 week set .@dun_lim_time2,etower_timer+14400; // 4 hours set .@dun_cur_time,gettimetick(2); @@ -210,7 +216,7 @@ e_tower,81,105,0 script Tower Protection Stone 406,{ set .@dun_s,.@dun_ent_t - ((.@dun_h * 3600) + (.@dun_m * 60)); if ((.@party_id > 0) && (.@partymembercount > 1)) { - if (etower_timer < 1) { + if (.@etower_timer == -1) { if (.@ins_mas == getcharid(0)) { mes "Confirmed the party has been made. Would you like to reserve for entrance to the Endless Tower?"; next; @@ -273,6 +279,8 @@ e_tower,81,105,0 script Tower Protection Stone 406,{ else { mapannounce "e_tower", .@p_name2$ + " of the party, " + .@p_name$ + ", is entering the dungeon, " + .@md_name$ + ".",bc_map,"0x00ff99",FW_NORMAL,12; set etower_timer,gettimetick(2); + setquest 60200; + setquest 60201; warp "1@tower",52,354; end; } @@ -299,6 +307,8 @@ e_tower,81,105,0 script Tower Protection Stone 406,{ else { mapannounce "e_tower", .@p_name2$ + " of the party, " + .@p_name$ + ", is entering the dungeon, " + .@md_name$ + ".",bc_map,"0x00ff99",FW_NORMAL,12; set etower_timer,gettimetick(2); + setquest 60200; + setquest 60201; warp "1@tower",52,354; end; } @@ -314,7 +324,7 @@ e_tower,81,105,0 script Tower Protection Stone 406,{ close; } } - else if ((etower_timer > 0) && (.@dun_cur_time < .@dun_lim_time2)) { + else if ((.@etower_timer >= 0) && (.@etower_timer2 < 2)) { mes "If you have the dungeon generated already, you can enter it. "; next; switch(select(.@md_name$ + "Enter the dungeon:Return to Alberta:Cancel")) { @@ -341,8 +351,8 @@ e_tower,81,105,0 script Tower Protection Stone 406,{ } close; } - else if ((.@dun_cur_time > .@dun_lim_time2) && (.@dun_cur_time < .@dun_lim_time)) { - mes "Due to the entree aftereffect, you cannot enter the dungeon right now, " + .@dun_h + "hours " + .@dun_m + "minutes " + .@dun_s + "seconds left to enter the next dungeon."; + else if ((.@etower_timer >= 0) && (.@etower_timer2 == 2)) { + mes "Due to the entry after-effect, you cannot enter the dungeon right now, " + .@dun_h + "hours " + .@dun_m + "minutes " + .@dun_s + "seconds left to enter the next dungeon."; next; mes "It is dangerous here. Let me move you to Alberta."; close2; @@ -351,6 +361,8 @@ e_tower,81,105,0 script Tower Protection Stone 406,{ } else { set etower_timer,0; + erasequest 60200; + erasequest 60201; mes "^0000ffThe records and after effects related to the Endless Tower have been removed. You can generate and enter the Endless Tower again.^000000"; close; } @@ -1380,7 +1392,7 @@ OnInstanceInit: OnEnable: enablenpc instance_npcname("29FGate102tower", instance_id()); - areamonster "2@tower",352,351,362,387,"White Lady",1518,1,instance_npcname("29FGate102tower", instance_id())+"::OnMyMobDead"; + areamonster "2@tower",352,351,362,387,"White Lady",1630,1,instance_npcname("29FGate102tower", instance_id())+"::OnMyMobDead"; areamonster "2@tower",352,351,362,387,"Evil Nymph",1416,30,instance_npcname("29FGate102tower", instance_id())+"::OnMyMobDead"; end; diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt index 535ccc398..802bfc17d 100644 --- a/npc/merchants/enchan_arm.txt +++ b/npc/merchants/enchan_arm.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAhena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //= Add a +1, 2, or 3, of a random stat to specified armor. //===== Additional Comments: ================================= //= 1.0 First version. +//= 1.1 Corrected typo (Sit -> Suit) (bugreport:4586) //============================================================ prontera,165,60,2 script Apprentice Craftsman 73,{ @@ -120,7 +121,7 @@ prontera,165,60,2 script Apprentice Craftsman 73,{ callsub S_EnchantArmor,2351,55; } case 3: - switch(select("Meteo Plate Armor:Orlean's Gown:Life Link:Diablos Robe:Diablos Armor:Assaulter Plate:Elite Engineer Armor:Assassin Robe:Warlock's Battle Robe:Medic's Robe:Elite Archer Suit:Elite Shooter Sit:Sprint Mail:Kandura:Armor of Naga:Improved Tights")) { + switch(select("Meteo Plate Armor:Orlean's Gown:Life Link:Diablos Robe:Diablos Armor:Assaulter Plate:Elite Engineer Armor:Assassin Robe:Warlock's Battle Robe:Medic's Robe:Elite Archer Suit:Elite Shooter Suit:Sprint Mail:Kandura:Armor of Naga:Improved Tights")) { case 1: callsub S_EnchantArmor,2364,60; case 2: |