diff options
Diffstat (limited to 'npc')
-rw-r--r-- | npc/other/card_trader.txt | 8 | ||||
-rw-r--r-- | npc/other/mail.txt | 2 | ||||
-rw-r--r-- | npc/other/pvp.txt | 16 | ||||
-rw-r--r-- | npc/other/sealstatus.txt | 113 | ||||
-rw-r--r-- | npc/other/turbotrack/Expert_16.txt | 5 | ||||
-rw-r--r-- | npc/other/turbotrack/Expert_4.txt | 5 | ||||
-rw-r--r-- | npc/other/turbotrack/Expert_8.txt | 5 | ||||
-rw-r--r-- | npc/other/turbotrack/Normal_16.txt | 5 | ||||
-rw-r--r-- | npc/other/turbotrack/Normal_4.txt | 5 | ||||
-rw-r--r-- | npc/other/turbotrack/Normal_8.txt | 5 | ||||
-rw-r--r-- | npc/other/turbotrack/Normal_Solo.txt | 7 | ||||
-rw-r--r-- | npc/other/turbotrack/Turbo_Track.txt | 5 |
12 files changed, 62 insertions, 119 deletions
diff --git a/npc/other/card_trader.txt b/npc/other/card_trader.txt index f943b6209..79fce3f31 100644 --- a/npc/other/card_trader.txt +++ b/npc/other/card_trader.txt @@ -1,7 +1,7 @@ //===== rAthena Script ======================================= //= Card Trader //===== By: ================================================== -//= Slim (og2) +//= Elias (og2) //===== Current Version: ===================================== //= 1.2 //===== Compatible With: ===================================== @@ -9,9 +9,9 @@ //===== Description: ========================================= //= Card and Points Trader //===== Additional Comments: ================================= -//= v1.0 Translated from the Official [Slim] -//= v1.1 Fixed variables and optimized script [Slim] -//= v1.2 Fixed char being stuck with breaks [Slim] (bugreport:5374) +//= v1.0 Translated from the Official [Elias] +//= v1.1 Fixed variables and optimized script [Elias] +//= v1.2 Fixed char being stuck with breaks [Elias] (bugreport:5374) //============================================================ prontera,115,90,0 script Putty 90,{ diff --git a/npc/other/mail.txt b/npc/other/mail.txt index 30324749e..8d98f87e2 100644 --- a/npc/other/mail.txt +++ b/npc/other/mail.txt @@ -18,7 +18,7 @@ //= 1.4 Added a Mapflag to prevent mail operations in other maps [Zephyrus] //= 1.5 Moved Morroc Mail boxes to Morroc Ruins. [L0ne_W0lf] //= 1.6 Duplicates now spawn from floating NPCs. [L0ne_W0lf] -//= 1.7 Updated Script from the Official. [Slim] +//= 1.7 Updated Script from the Official. [Elias] //============================================================ // Floating mailbox npc that all NPCs duplicate from. diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 5a33a1b19..01b96d90b 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -3,25 +3,14 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf, Elias (og2) //===== Current Version: ===================================== -//= 1.6 +//= 2.0 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= PvP NPCs that are found in the Inns in major cities. //= Includes Yoyo Mode, Nightmare Mode, and Event Mode //===== Additional Comments: ================================= -//= 1.1 Fixed arena names for Nightmare mode. Added room limit -//= check.[kobra_k88] -//= 1.2 Fixed the bug that you aways savepoint in geffen.[shadowlady] -//= 1.2a Added PvP Narrator function. Using args for Fight -//= Square Helpers. [kobra_k88] -//= 1.3 Rescripted to the official 10.3 standards. [L0ne_W0lf] -//= Removed all receptioned for Yoyo mode, with the -//= exception of the "Free for all" mode. -//= Added PVP event NPCs. -//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//= 1.5 Duplicates now spawn from floating NPCs. [L0ne_W0lf] -//= 1.6 Narrators/GateKeepers,etc. Translated from the Official 2011 [Elias] +//= 2.0 Narrators/GateKeepers,etc. Translated from the Official 2011 [Elias] //============================================================ morocc_in,144,138,4 script PVP Narrator::pvpe 84,{ mes "[PVP Narrator]"; @@ -513,7 +502,6 @@ pvp_2vs2,5,74,0 duplicate(PVPSpecWarp) Combat Square Staff#2 45,1,1 pvp_2vs2,74,74,0 duplicate(PVPSpecWarp) Combat Square Staff#3 45,1,1 pvp_2vs2,74,5,0 duplicate(PVPSpecWarp) Combat Square Staff#4 45,1,1 pvp_2vs2,40,40,0 script Combat Square Staff#5 45,1,1,{ - set mapmove,0; //?? mes "[Combat Square Staff]"; mes "May I help you?"; if (select("To the side viewer seat.:Leave Combat Square.") == 1) { diff --git a/npc/other/sealstatus.txt b/npc/other/sealstatus.txt index 45203c0fd..c314ba976 100644 --- a/npc/other/sealstatus.txt +++ b/npc/other/sealstatus.txt @@ -7,88 +7,49 @@ //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] //= Goid Item Seal Status. //===== Additional Comments: ================================= -//= 1.0 First version. [L0ne_W0lf] +//= 1.0 Translated from the official. [L0ne_W0lf] //= 1.1 Now checks proper char vars. [L0ne_W0lf] //============================================================ prontera,113,294,3 script Sign Post 837,{ mes "======== God Seal Status ========"; - if ($god1 == 0) { - mes "Sleipnir Seal: Unseen"; - } - else if ($god1 < 50) { - mes "Sleipnir Seal: Active"; - } - else if ($god1 < 100) { - mes "Sleipnir Seal: Appeared"; - } - else { - mes "Sleipnir Seal: Released"; - } - if ($god2 == 0) { - mes "Megingjard Seal: Unseen"; - } - else if ($god2 < 50) { - mes "Megingjard Seal: Active"; - } - else if ($god2 < 100) { - mes "Megingjard Seal: Appeared"; - } - else { - mes "Megingjard Seal: Released"; - } - if ($god3 == 0) { - mes "Brisingamen Seal: Unseen"; - } - else if ($god3 < 50) { - mes "Brisingamen Seal: Active"; - } - else if ($god3 < 100) { - mes "Brisingamen Seal: Appeared"; - } - else { - mes "Brisingamen Seal: Released"; - } - if ($god4 == 0) { - mes "Mjolnir Seal: Unseen"; - } - else if ($god4 < 50) { - mes "Mjolnir Seal: Active"; - } - else if ($god4 < 100) { - mes "Mjolnir Seal: Appeared"; - } - else { - mes "Mjolnir Seal: Released"; - } - mes ""; + + if ($god1 == 0) { mes "Sleipnir Seal: Unseen"; } + else if ($god1 < 50) { mes "Sleipnir Seal: Active"; } + else if ($god1 < 100) { mes "Sleipnir Seal: Appeared"; } + else { mes "Sleipnir Seal: Released"; } + + if ($god2 == 0) { mes "Megingjard Seal: Unseen"; } + else if ($god2 < 50) { mes "Megingjard Seal: Active"; } + else if ($god2 < 100) { mes "Megingjard Seal: Appeared"; } + else { mes "Megingjard Seal: Released"; } + + if ($god3 == 0) { mes "Brisingamen Seal: Unseen"; } + else if ($god3 < 50) { mes "Brisingamen Seal: Active"; } + else if ($god3 < 100) { mes "Brisingamen Seal: Appeared"; } + else { mes "Brisingamen Seal: Released"; } + + if ($god4 == 0) { mes "Mjolnir Seal: Unseen"; } + else if ($god4 < 50) { mes "Mjolnir Seal: Active"; } + else if ($god4 < 100) { mes "Mjolnir Seal: Appeared"; } + else { mes "Mjolnir Seal: Released"; } + + mes " "; mes "======= Your Seal Status ========"; - if (god_sl_1 < 51) { - mes "^ff0000Sleipnir Seal: Not Completed^000000"; - } - else { - mes "^00ff00Sleipnir Seal: Completed^000000"; - } - if (god_eremes < 28) { - mes "^ff0000Megingjard Seal: Not Completed^000000"; - } - else { - mes "^00ff00Megingjard Seal: Completed^000000"; - } - if (god_brising < 50) { - mes "^ff0000Brisingamen Seal: Not Completed^000000"; - } - else { - mes "^00ff00Brisingamen Seal: Completed^000000"; - } - if (god_mjo_0 < 11) { - mes "^ff0000Mjolnir Seal: Not Completed^000000"; - } - else { - mes "^00ff00Mjolnir Seal: Completed^000000"; - } - close; + + if (god_sl_1 < 51) { mes "^ff0000Sleipnir Seal: Not Completed^000000"; } + else { mes "^00ff00Sleipnir Seal: Completed^000000"; } + + if (god_eremes < 28) { mes "^ff0000Megingjard Seal: Not Completed^000000"; } + else { mes "^00ff00Megingjard Seal: Completed^000000"; } + + if (god_brising < 50) { mes "^ff0000Brisingamen Seal: Not Completed^000000"; } + else { mes "^00ff00Brisingamen Seal: Completed^000000"; } + + if (god_mjo_0 < 11) { mes "^ff0000Mjolnir Seal: Not Completed^000000"; } + else { mes "^00ff00Mjolnir Seal: Completed^000000"; } + +close; } diff --git a/npc/other/turbotrack/Expert_16.txt b/npc/other/turbotrack/Expert_16.txt index 74e0d80c9..7c2652d8a 100644 --- a/npc/other/turbotrack/Expert_16.txt +++ b/npc/other/turbotrack/Expert_16.txt @@ -7,15 +7,14 @@ //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] //= Turbo Track Course: Expert (PVP) - 16 Person //===== Additional Comments: ================================= -//= 1.0 First version. [L0ne_W0lf] +//= 1.0 Translated from the Official. [L0ne_W0lf] //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Fixed a little mistake [akrus] //= 1.3 Corrected issue with top record setting. [L0ne_W0lf] //= 1.4 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] -//= 1.5 Fixed variable typo [Slim] +//= 1.5 Fixed variable typo [Elias] //============================================================ turbo_room,124,135,3 script Expert mode - 16 person 124,{ diff --git a/npc/other/turbotrack/Expert_4.txt b/npc/other/turbotrack/Expert_4.txt index a27309f22..20187f0da 100644 --- a/npc/other/turbotrack/Expert_4.txt +++ b/npc/other/turbotrack/Expert_4.txt @@ -7,15 +7,14 @@ //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] //= Turbo Track Course: Expert (PVP) - 4 Person //===== Additional Comments: ================================= -//= 1.0 First version. [L0ne_W0lf] +//= 1.0 Translated from the Official [L0ne_W0lf] //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Fixed a little mistake [akrus] //= 1.3 Corrected issue with top record setting. [L0ne_W0lf] //= 1.4 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] -//= 1.5 Fixed variable typo [Slim] +//= 1.5 Fixed variable typo [Elias] //============================================================ turbo_room,110,135,3 script Expert mode - 4 person 124,{ diff --git a/npc/other/turbotrack/Expert_8.txt b/npc/other/turbotrack/Expert_8.txt index c3876911d..1dcb2cc23 100644 --- a/npc/other/turbotrack/Expert_8.txt +++ b/npc/other/turbotrack/Expert_8.txt @@ -7,15 +7,14 @@ //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] //= Turbo Track Course: Expert (PVP) - 8 Person //===== Additional Comments: ================================= -//= 1.0 First version. [L0ne_W0lf] +//= 1.0 Translated from the Official. [L0ne_W0lf] //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Fixed a little mistake [akrus] //= 1.3 Corrected issue with top record setting. [L0ne_W0lf] //= 1.4 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] -//= 1.5 Fixed variable typo [Slim] +//= 1.5 Fixed variable typo [Elias] //============================================================ turbo_room,117,135,3 script Expert mode - 8 person 124,{ diff --git a/npc/other/turbotrack/Normal_16.txt b/npc/other/turbotrack/Normal_16.txt index ff22a5ff5..e0be9bf5c 100644 --- a/npc/other/turbotrack/Normal_16.txt +++ b/npc/other/turbotrack/Normal_16.txt @@ -7,17 +7,16 @@ //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] //= Turbo Track Course: Normal (Non-PVP) - 16 Person //===== Additional Comments: ================================= -//= 1.0 First version. [L0ne_W0lf] +//= 1.0 Translated from the Official. [L0ne_W0lf] //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.3 Fixed a little mistake [akrus] //= 1.4 Corrected issue with top record setting. [L0ne_W0lf] //= 1.5 Fixed name being saved under expert mode. (bugreport:4433) [L0ne_W0lf] //= 1.6 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] -//= 1.7 Fixed variable typo [Slim] +//= 1.7 Fixed variable typo [Elias] //============================================================ turbo_room,91,135,3 script Normal mode - 16 person 124,{ diff --git a/npc/other/turbotrack/Normal_4.txt b/npc/other/turbotrack/Normal_4.txt index 4a9ac1db6..861361a3c 100644 --- a/npc/other/turbotrack/Normal_4.txt +++ b/npc/other/turbotrack/Normal_4.txt @@ -7,16 +7,15 @@ //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] //= Turbo Track Course: Normal (Non-PVP) - 4 Person //===== Additional Comments: ================================= -//= 1.0 First version. [L0ne_W0lf] +//= 1.0 Translated from the Official. [L0ne_W0lf] //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.3 Fixed a little mistake [akrus] //= 1.4 Corrected issue with top record setting. [L0ne_W0lf] //= 1.5 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] -//= 1.6 Fixed variable typo [Slim] +//= 1.6 Fixed variable typo [Elias] //============================================================ turbo_room,77,135,3 script Normal mode - 4 person 124,{ diff --git a/npc/other/turbotrack/Normal_8.txt b/npc/other/turbotrack/Normal_8.txt index b66434d3e..7d5133812 100644 --- a/npc/other/turbotrack/Normal_8.txt +++ b/npc/other/turbotrack/Normal_8.txt @@ -7,17 +7,16 @@ //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] //= Turbo Track Course: Normal (Non-PVP) - 8 Person //===== Additional Comments: ================================= -//= 1.0 First version. [L0ne_W0lf] +//= 1.0 Translated from the Official. [L0ne_W0lf] //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.3 Fixed a little mistake [akrus] //= 1.4 Corrected issue with top record setting. [L0ne_W0lf] //= 1.5 Fixed name being saved under expert mode. (bugreport:4433) [L0ne_W0lf] //= 1.6 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] -//= 1.7 Fixed variable typo [Slim] +//= 1.7 Fixed variable typo [Elias] //============================================================ turbo_room,84,135,3 script Normal mode - 8 person 124,{ diff --git a/npc/other/turbotrack/Normal_Solo.txt b/npc/other/turbotrack/Normal_Solo.txt index bbc7081ff..6c39bf746 100644 --- a/npc/other/turbotrack/Normal_Solo.txt +++ b/npc/other/turbotrack/Normal_Solo.txt @@ -7,16 +7,15 @@ //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] //= Turbo Track Course: Solo Mode/Time Attack //===== Additional Comments: ================================= -//= 1.0 First version. [L0ne_W0lf] +//= 1.0 Translated from the Official. [L0ne_W0lf] //= 1.1 Fixed small official bug. [L0ne_W0lf] //= 1.2 Fixed end timer not enabling warp. (bugreport:1682) [L0ne_W0lf] //= 1.3 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.4 Fixed a little mistake [akrus] -//= 1.5 Fixed variable typo (Deleted in version 1.6) [Slim] -//= 1.6 Fixed the "bing#n1" issue. (bugreport:5050) [Slim] +//= 1.5 Fixed variable typo (Deleted in version 1.6) [Elias] +//= 1.6 Fixed the "bing#n1" issue. (bugreport:5050) [Elias] //============================================================ turbo_room,72,132,3 script Solo Mode#n1 124,{ diff --git a/npc/other/turbotrack/Turbo_Track.txt b/npc/other/turbotrack/Turbo_Track.txt index ac29c7354..3201d18c5 100644 --- a/npc/other/turbotrack/Turbo_Track.txt +++ b/npc/other/turbotrack/Turbo_Track.txt @@ -7,10 +7,9 @@ //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] //= General Turbo Track NPCs, includes Kafra and Tool Merchant //===== Additional Comments: ================================= -//= 1.0 First version. [L0ne_W0lf] +//= 1.0 Translated from the Official. [L0ne_W0lf] //= 1.1 Fixed exp rewarding working backwards.[L0ne_W0lf] //= Fixed a bug in the while loop in the guide. //= 1.2 Fix to prevent point converter from hanging. [L0ne_W0lf] @@ -35,6 +34,7 @@ turbo_room,130,92,3 script Kafra Staff#tt 115,{ } +//Turbo Track Shop turbo_room,124,86,0 shop Turbo Track Merchant 90,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,1065:-1,1750:-1 //This is the name on iRO as well. [Confirmed] @@ -937,6 +937,7 @@ turbo_room,106,117,3 script Point Manager#tt 833,{ // There is no dialog for this option. // It's possible it's missing, or maybe // the dialog was never translated. XD + //?? close; } |