Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated NPC headers to fix errors caused by rev. 11603.

Browse Source 
- Note: non-standard loaded scripts need to be checked for errors/duplicates.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11605 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2007-10-28 23:36:53 +00:00
parent d51639d405
commit 5550180be2
16 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/Changelog.txt
View File

@ -1,6 +1,8 @@
Date Added
======
2007/10/28
* Rev. 11605 Updated NPC headers to fix errors caused by rev. 11603. [L0ne_W0lf]
- Note: non-standard loaded scripts need to be checked for errors/duplicates.
* Updated Veins Field spawn amounts to official [Playtester]
* Added Rekenber Job quest which was missing for some unknown reason. [SinSloth]
* Rev. 11595 Updated Bio Ethics quest to official, and re-added. [L0ne_W0lf]

11
npc/airports/airships.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena Dev Team
//===== Current Version: =====================================
//= 0.9b
//= 1.0
//===== Compatible With: =====================================
//= eAthena SVN 3422+(Requires jA Script System)
//===== Description: =========================================
@ -27,13 +27,14 @@
//= 0.8b Fixed a Little Bug with the "How Does the Airship Work" Quest. [Samuray22]
//= 0.9 Fixed a incorrect variable changed form "mob_inv" to "mobinv". [Samuray22]
//= 0.9b Fixed a typo and bad variable use in the Typing Challenge [ultramage]
//= 1.0 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
//============================================================
//= The Airship System (Yuno -> Hugel -> Einbroch -> Lighthalzen -> repeat)
//============================================================
airplane,243,74,4 script #AirshipWarp-1 45,2,2{
airplane,243,74,4 script #AirshipWarp-1 45,2,2,{
OnTouch:
if($@airplanelocation == 1)warp "einbroch",90,275;
if($@airplanelocation == 2)warp "yuno",85,265;
@ -49,7 +50,7 @@ OnUnhide:
end;
}
airplane,243,29,4 script #AirshipWarp-2 45,2,2{
airplane,243,29,4 script #AirshipWarp-2 45,2,2,{
OnTouch:
if($@airplanelocation == 1)warp "einbroch",90,275;
if($@airplanelocation == 2)warp "yuno",85,265;
@ -634,7 +635,7 @@ airplane_01,221,158,6 script Pilot#air-0::Pilot 852,{
//= The Airship System (Izlude -> Yuno -> Rachel -> Repeat)
//============================================================
airplane_01,243,74,4 script #AirshipWarp-3 45,2,2{
airplane_01,243,74,4 script #AirshipWarp-3 45,2,2,{
OnTouch:
if($@airplanelocation2 == 1)warp "izlude",202,56;
if($@airplanelocation2 == 2)warp "yuno",20,265;
@ -649,7 +650,7 @@ OnUnhide:
end;
}
airplane_01,243,29,4 script #AirshipWarp-4 45,2,2{
airplane_01,243,29,4 script #AirshipWarp-4 45,2,2,{
OnTouch:
if($@airplanelocation2 == 1)warp "izlude",202,56;
if($@airplanelocation2 == 2)warp "yuno",20,265;

5
npc/cities/geffen.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
//= 1.6
//= 1.7
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -19,6 +19,7 @@
//= 1.5a Fixed a small typo [Evera]
//= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//= 1.6a Small bug fix. (end -> next) care of Lesbian. [L0ne_W0lf]
//= 1.7 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
geffen,59,143,0 script Meera 91,{
@ -1404,7 +1405,7 @@ geffen_in,109,72,2 script Monster Scholar 90,{
// Lvl 4 weapon quest related NPC ------------------------------------------------------
geffen,203,146,5 script Citizen 97, {
geffen,203,146,5 script Citizen 97,{
mes "[Citizen]";
mes "There was a skillful weaponsmith";
mes "in Al De Baran who had 4 sons.";

5
npc/cities/lighthalzen.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= erKURITA, Au{R}oN (Translated by Alan), $ephiroth
//===== Current Version: =====================================
//= 1.4
//= 1.5
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@ -26,6 +26,7 @@
//= 1.2 Moved some NPCs to Lighthalzen quests. [SinSloth]
//= 1.3 Moved some other NPCs for quests purposes. [SinSloth]
//= 1.4 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf]
//= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//=============================================================
lighthalzen,198,285,5 script Jiwon 862,{
@ -1807,7 +1808,7 @@ s_Staff:
}
lhz_in01,19,129,0 script LhzHiddenTrg1::LhzTrig -1,1,1{
lhz_in01,19,129,0 script LhzHiddenTrg1::LhzTrig -1,1,1,{
OnTouch:
mes "[Rekenber Guard]";
if(isequipped(2241) && isequipped(2243)){

5
npc/cities/morocc.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
//= 1.9
//= 2.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -21,6 +21,7 @@
//= 1.7 Removed Duplicates [Silent]
//= 1.8 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
//= 1.9 Removed duplicate NPC, changed temp char vars to temp npc. [L0ne_W0;f]
//= 2.0 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
// Morroc
@ -672,7 +673,7 @@ Nomoney:
// Lvl 4 weapon quest related NPC ================================
morocc,289,230,3 script Citizen#06 92, {
morocc,289,230,3 script Citizen#06 92,{
mes "[Citizen]";
mes "Meeting a dead man is basically";
mes "impossible.";

9
npc/quests/Lvl4_weapon_quest.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Vicious_Pucca, Reddozen & MasterOfMuppets
//===== Current Version: =====================================
//= 1.3
//= 1.4
//===== Compatible With: =====================================
//= eAthena SVN 3422+(Requires jA Script System)
//===== Description: =========================================
@ -16,6 +16,7 @@
//= 1.2 A small fix, thanks to vicious_pucca [MasterOfMuppets]
//= 1.21 Fixing MoM's typos (Citrin -> Citrine) [erKURITA]
//= 1.3 Redirected error message for "LV_16" to "LV_16_NOGEM" (Gepard) [L0ne_W0lf]
//= 1.4 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
//---------------------------------------------------------------
@ -2010,7 +2011,7 @@ LV4_50:
// Kayron, creates Longinus' Spear, Guillotine, Great Axe and Brionac
//--------------------------------------------------
niflheim,240,193,3 script Kayron 794, {
niflheim,240,193,3 script Kayron 794,{
set @NowWeight, MaxWeight - Weight;
if (@NowWeight >= 3000) goto LV4_NOT_OW;
mes "- Wait a minute! -";
@ -2417,7 +2418,7 @@ LV4_HACK:
// Reyghema, creates Berserk, Tjungkulleti, Rudra's Bow and Brocca(Skewer)
//--------------------------------------------------
niflheim,99,268,5 script Reyghema 794, {
niflheim,99,268,5 script Reyghema 794,{
set @NowWeight, MaxWeight - Weight;
if (@NowWeight >= 3000) goto LV4_NOT_OW;
mes "- Wait a minute! -";
@ -2817,7 +2818,7 @@ LV4_HACK:
// Hein, creates Excalibur, Schweisersabel, Dragon Slayer and Edge
//--------------------------------------------------
niflheim,187,280,3 script Hein 795, {
niflheim,187,280,3 script Hein 795,{
set @NowWeight, MaxWeight - Weight;
if (@NowWeight >= 3000) goto LV4_NOT_OW;
mes "- Wait a minute! -";

9
npc/quests/first_class/tu_acolyte.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Fix up by Jukka
//===== Current Version: =====================================
//= 1.2
//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN (Testet in Trunk 88xx)
//===== Description: =========================================
@ -13,6 +13,7 @@
//= 1.1 optimized [Lupus]
//= TODO: Test, Add correct misceffects numbers
//= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
//= 1.3 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
@ -938,7 +939,7 @@ prt_monk,235,245,5 script Dog#tu 81,{
}
//=================================================Boy====================================================
prt_monk,243,238,5 script Boy#boy_voi 139,5,5{
prt_monk,243,238,5 script Boy#boy_voi 139,5,5,{
OnTouch:
if(tu_acolyte01 != 10)end;
mes "[???]";
@ -1215,7 +1216,7 @@ prt_monk,28,260,5 script Hedrick 50,{
}
//=================================================Weapon Merchant====================================================
prt_monk,135,263,4 script Weapon Merchant#tu 139,9,9{
prt_monk,135,263,4 script Weapon Merchant#tu 139,9,9,{
OnTouch:
if(tu_acolyte01 != 20 || countitem(1081)==0) end;
delitem 1081, 1;
@ -1518,7 +1519,7 @@ prt_monk,153,210,3 script Cleope Verce 95,{
close;
}
//=================================================Range NPC====================================================
prt_monk,217,123,4 script #tu_monk 139,10,10{
prt_monk,217,123,4 script #tu_monk 139,10,10,{
OnTouch:
if(BaseJob == Job_Acolyte){
switch(tu_acolyte01){

5
npc/quests/first_class/tu_archer.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Fix up by Jukka
//===== Current Version: =====================================
//= 1.3
//= 1.5
//===== Compatible With: =====================================
//= eAthena SVN (Testet in Trunk 88xx)
//===== Description: =========================================
@ -15,6 +15,7 @@
//= 1.3 Moved Master Kavaruk (overlapped Phantasmic Arrow
//= Skill quest NPC) [Lupus]
//= 1.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
//= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
@ -1924,7 +1925,7 @@ prt_castle,76,165,6 script Minister#tu 55,{
}
//=================================================Range NPC====================================================
prt_castle,94,150,4 script #sound_tu 139,10,10{
prt_castle,94,150,4 script #sound_tu 139,10,10,{
OnTouch:
if(tu_archer02 != 6) end;
mes "[Minister]";

9
npc/quests/newgears/2004_headgears.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Dj-Yhn
//===== Current Version: =====================================
//= 1.2
//= 1.3
//===== Compatible With: =====================================
//= eAthena
//===== Description: =========================================
@ -58,6 +58,7 @@
//= 1.1 Fixed a bug in Giant-band-aid that didn't counting rotten bandages
//= Fixed a bug in Fur Hat that didn't count yarn [Evera]
//= 1.2 Syntax fixes for parenthesis, reformatting [KarLaeda]
//= 1.3 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
//Payon /=Black cat ears=/
@ -2271,7 +2272,7 @@ morocc,273,79,4 script Traveler 99,{
}
}
//Payon /=Fox Mask=/ //==Lets hope this works as it's supposed==//
pay_dun03,48,84,4 script Nine Tail#1 1180,1,1{
pay_dun03,48,84,4 script Nine Tail#1 1180,1,1,{
mes "[Nine Tail]";
mes "Kee! KeeKee!";
mes "KeeKeeKee! KeeKee! KeeKee!";
@ -2383,7 +2384,7 @@ pay_dun03,48,84,4 script Nine Tail#2 1180,{
}
}
//Orc Village /=Orc Hero Helm=/
in_orcs01,31,93,1 script Orc Warrior#1 1023,2,2{
in_orcs01,31,93,1 script Orc Warrior#1 1023,2,2,{
if (orcs_hero_hat == 1) {
if (countitem(909)>999) {
delitem 909,1000;
@ -3247,7 +3248,7 @@ in_orcs01,31,93,1 script Orc Warrior#1 1023,2,2{
}
}
}
in_orcs01,162,33,1 script Hero of Orc#1 1087,2,2{
in_orcs01,162,33,1 script Hero of Orc#1 1087,2,2,{
if (orcs_hero_hat < 16) {
mes "[Orc Hero]";
mes ".....Go away, don't interrupt me!";

5
npc/quests/quests_ein.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Evera and The eAthena Dev Team
//===== Current Version: =====================================
//= 1.9
//= 2.0
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@ -26,6 +26,7 @@
//= from being stuck in the quest. [SinSloth]
//= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
//= 1.9 Fixed a bug with Einbroch Pollution quest. [SinSloth]
//= 2.0 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
@ -557,7 +558,7 @@ ein_in01,32,133,6 script Maid 850,{
close;
}
einbroch,51,52,1 script lab_warp 45,2,2{
einbroch,51,52,1 script lab_warp 45,2,2,{
if(Shinokas_Quest != 7 && lhz_heart != 9 && lhz_heart != 10){
mes "^3131FFThe door is locked.";
mes "You cannot enter.";

6
npc/quests/quests_gonryun.txt
View File

@ -3,13 +3,13 @@
//===== By: ==================================================
//= KarLaeda
//===== Current Version: =====================================
//= 1.0
//= 1.1
//===== Compatible With: =====================================
//= eAthena 1
//===== Description: =========================================
//= Gonryun Broken Sword Quest
//===== Additional Comments: =================================
//=
//= 1.1 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
@ -3463,7 +3463,7 @@ yuno_in01,99,101,4 script Doctor#gnbs 744,{
close;
}
yuno_in01,104,94,0 script go away#gnbs 139,2,1{
yuno_in01,104,94,0 script go away#gnbs 139,2,1,{
if (b_sword < 22) {
mes "[??????]";
mes "^FF0000What are you doing here?";

7
npc/quests/quests_hugel.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= MasterOfMuppets & SinSloth
//===== Current Version: =====================================
//= 1.5b
//= 1.6
//===== Compatible With: =====================================
//= eAthena
//===== Description: =========================================
@ -18,6 +18,7 @@
//= 1.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
//= 1.5a Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 1.5b Fixed a variable name. [SinSloth]
//= 1.6 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
//-------------------------------------------------------------------------
@ -4681,7 +4682,7 @@ hugel,198,169,0 script #HugelTree 139,2,2,{
}
hugel,191,172,3 script Manainne 892,1{
hugel,191,172,3 script Manainne 892,1,{
if(hg_memory == 1)
{
@ -7262,7 +7263,7 @@ que_bingo,53,190,7 script Eukran 778,{
}
odin_tem01,129,127,0 script HiddenActivator#Hugel 139,3,3{
odin_tem01,129,127,0 script HiddenActivator#Hugel 139,3,3,{
OnTouch:
if(hg_ma1 == 8)
{

5
npc/quests/quests_louyang.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Evera and The eAthena Dev Team
//===== Current Version: =====================================
//= 1.4
//= 1.5
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@ -15,6 +15,7 @@
//= 1.2 Added Revolution Quest. [SinSloth]
//= 1.3 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
//============================================================
@ -301,7 +302,7 @@ L_1STTIME:
close;
}
lou_in02,61,175,2 script Employee#01 818,2,2{
lou_in02,61,175,2 script Employee#01 818,2,2,{
mes "[Ya Hua]";
mes "^6A6A6A*Yawn...*";
close;

5
npc/quests/quests_morocc.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
//= 1.9
//= 2.0
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@ -20,6 +20,7 @@
//= 1.7 Fixed a bug with XP rewards. [SinSloth]
//= 1.8 Fixed a bug which prevented reset of events. [SinSloth]
//= 1.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 2.0 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
@ -73,7 +74,7 @@ morocc_in,142,100,4 script Pierce 89,{
//==================================================================================//
// Binoculars Quest
//==================================================================================//
morocc_in,76,163,4 script Marius#binos 64,5,5{
morocc_in,76,163,4 script Marius#binos 64,5,5,{
mes "[Marius]";
mes "Ha! Ha! Ha! Another customer coming!";
mes "I know what you are gonna say.";

11
npc/quests/quests_niflheim.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= The eAthena Dev Team
//===== Current Version: =====================================
//= 1.1
//= 1.2
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@ -14,6 +14,7 @@
//= from npc/cities/niflheim.txt [Evera]
//= 1.1 Optimized Book of Devil quest. used bit-wise var,
//= Optimized Piano Quest - now uses 1 variable [Lupus]
//= 1.2 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
//=============================================================
@ -209,7 +210,7 @@ nif_in,31,20,3 script Kurtz 794,{
close;
}
niflheim,169,71,5 script #1 111,2,2{
niflheim,169,71,5 script #1 111,2,2,{
if(MISC_QUEST & 32 || nif_piano&8) end;
mes "- In the nearby tombs -";
@ -226,7 +227,7 @@ L_end:
close;
}
niflheim,208,103,5 script #2 111,2,2{
niflheim,208,103,5 script #2 111,2,2,{
if(MISC_QUEST & 32 || nif_piano&32) end;
if(nif_piano&16){
mes "- In the hole you have dug -";
@ -254,7 +255,7 @@ niflheim,208,103,5 script #2 111,2,2{
close;
}
nif_in,115,181,5 script #4 111,3,3{
nif_in,115,181,5 script #4 111,3,3,{
mes "- You see a huge old piano -";
if((MISC_QUEST & 32)==0) mes "- with a few keys missing -";
if(MISC_QUEST & 32) mes "- with one key missing -";
@ -271,7 +272,7 @@ nif_in,115,181,5 script #4 111,3,3{
close;
}
nif_in,118,151,5 script #5 111,3,3{
nif_in,118,151,5 script #5 111,3,3,{
if((MISC_QUEST & 32)==0) end;
mes "- The very moment the long shadow -";
mes "- of your body falls on the piano -";

5
npc/quests/skills/rogue_skills.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Lupus, Reddozen
//===== Current Version: =====================================
//= 1.4
//= 1.5
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -11,6 +11,7 @@
//= Quests for skills: CLose Confine
//===== Additional Comments: =================================
//= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//============================================================
in_rogue,359,177,0 script #killershow01 -1,{
@ -1255,7 +1256,7 @@ OnTouch:
end;
}
function script F_Kienna -1,{
function script F_Kienna {
if (ROG_SK == 6) {
donpcevent "#1stmove::OnDisable";
mes "[Kienna]";