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

Many small scripts fixes - tabs, parenthesis, typo

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9137 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lupus 2006-11-04 22:59:57 +00:00
parent da883b0bb0
commit 7367e7aa5f
28 changed files with 1286 additions and 1304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
npc/Changelog.txt
View File

@ -34,6 +34,7 @@ KarLaeda
Date Added Date Added
====== ======
11/04 11/04
* Many small fixes - tabs, parenthesis [KarLaeda]
* Fixed Weight check in 1st class quests [Lupus] * Fixed Weight check in 1st class quests [Lupus]
- Added missing tabs to airship - Added missing tabs to airship
11/03 11/03

18
npc/airports/einbroch.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= L0ne_W0lf, Muad_Dib //= L0ne_W0lf, Muad_Dib
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.2 //= 1.3
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena Revision 3000+ //= eAthena Revision 3000+
//===== Description: ========================================= //===== Description: =========================================
@ -12,6 +12,7 @@
//= Converted by Dr.Evil, 1.0b more typos and credits [Lupus] //= Converted by Dr.Evil, 1.0b more typos and credits [Lupus]
//= 1.1 Fixed wrong check, added extra condition [Justin84] //= 1.1 Fixed wrong check, added extra condition [Justin84]
//= 1.2 Removed Duplicates [Silent] //= 1.2 Removed Duplicates [Silent]
//= 1.3 Fixed syntax errors for duplicate [KarLaeda]
//============================================================ //============================================================
@ -54,12 +55,8 @@ airport.gat,126,43,4 script Airport Staff#01::AirportE 90,{
close; close;
} }
airport.gat,143,43,4 duplicate(AirportE) Airport Staff#02 90,{ airport.gat,143,43,4 duplicate(AirportE) Airport Staff#02 90
// script Airport_Staff_In; airport.gat,156,43,4 duplicate(AirportE) Airport Staff#03 90
}
airport.gat,156,43,4 duplicate(AirportE) Airport Staff#03 90,{
// script Airport_Staff_In;
}
airport.gat,126,51,4 script Airport Staff#04::AirportE2 90,{ airport.gat,126,51,4 script Airport Staff#04::AirportE2 90,{
mes "[Airport Staff]"; mes "[Airport Staff]";
@ -91,11 +88,8 @@ airport.gat,126,51,4 script Airport Staff#04::AirportE2 90,{
close; close;
} }
airport.gat,143,51,4 duplicate(AirportE2) Airport Staff#05 90,{ airport.gat,143,51,4 duplicate(AirportE2) Airport Staff#05 90
} airport.gat,156,51,4 duplicate(AirportE2) Airport Staff#06 90
airport.gat,156,51,4 duplicate(AirportE2) Airport Staff#06 90,{
}
einbroch.gat,94,267,4 script Airship Staff 91,{ einbroch.gat,94,267,4 script Airship Staff 91,{
mes "[Airship Staff]"; mes "[Airship Staff]";

18
npc/airports/lighthalzen.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= L0ne_W0lf, Muad_Dib //= L0ne_W0lf, Muad_Dib
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.1 //= 1.2
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena Revision 3000+ //= eAthena Revision 3000+
//===== Description: ========================================= //===== Description: =========================================
@ -11,6 +11,7 @@
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 Cloned from einbroch.txt [Justin84] //= 1.0 Cloned from einbroch.txt [Justin84]
//= 1.1 Removed Duplicates [Silent] //= 1.1 Removed Duplicates [Silent]
//= 1.2 Fixed syntax errors for duplicate [KarLaeda]
//============================================================ //============================================================
@ -53,12 +54,8 @@ lhz_airport.gat,126,43,4 script Airport Staff#1::AirportL 90,{
close; close;
} }
lhz_airport.gat,143,43,4 duplicate(AirportL) Airport Staff#2 90,{ lhz_airport.gat,143,43,4 duplicate(AirportL) Airport Staff#2 90
// script Airport_Staff_In; lhz_airport.gat,156,43,4 duplicate(AirportL) Airport Staff#3 90
}
lhz_airport.gat,156,43,4 duplicate(AirportL) Airport Staff#3 90,{
// script Airport_Staff_In;
}
lhz_airport.gat,126,51,4 script Airport Staff#4::AirportL2 90,{ lhz_airport.gat,126,51,4 script Airport Staff#4::AirportL2 90,{
mes "[Airport Staff]"; mes "[Airport Staff]";
@ -90,8 +87,5 @@ lhz_airport.gat,126,51,4 script Airport Staff#4::AirportL2 90,{
close; close;
} }
lhz_airport.gat,143,51,4 duplicate(AirportL2) Airport Staff#5 90,{ lhz_airport.gat,143,51,4 duplicate(AirportL2) Airport Staff#5 90
} lhz_airport.gat,156,51,4 duplicate(AirportL2) Airport Staff#6 90
lhz_airport.gat,156,51,4 duplicate(AirportL2) Airport Staff#6 90,{
}

18
npc/airports/yuno.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= L0ne_W0lf, Muad_Dib //= L0ne_W0lf, Muad_Dib
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.1 //= 1.2
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena Revision 3000+ //= eAthena Revision 3000+
//===== Description: ========================================= //===== Description: =========================================
@ -11,6 +11,7 @@
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 Cloned from Einbroch [Justin84] //= 1.0 Cloned from Einbroch [Justin84]
//= 1.1 Removed Duplicates [Silent] //= 1.1 Removed Duplicates [Silent]
//= 1.2 Fixed syntax errors for duplicate [KarLaeda]
//============================================================ //============================================================
@ -53,12 +54,8 @@ y_airport.gat,126,43,4 script Airport Staff#001::AirportY 90,{
close; close;
} }
y_airport.gat,143,43,4 duplicate(AirportY) Airport Staff#002 90,{ y_airport.gat,143,43,4 duplicate(AirportY) Airport Staff#002 90
// script Airport_Staff_In; y_airport.gat,156,43,4 duplicate(AirportY) Airport Staff#003 90
}
y_airport.gat,156,43,4 duplicate(AirportY) Airport Staff#003 90,{
// script Airport_Staff_In;
}
y_airport.gat,126,51,4 script Airport Staff#004::AirportY2 90,{ y_airport.gat,126,51,4 script Airport Staff#004::AirportY2 90,{
mes "[Airport Staff]"; mes "[Airport Staff]";
@ -90,8 +87,5 @@ y_airport.gat,126,51,4 script Airport Staff#004::AirportY2 90,{
close; close;
} }
y_airport.gat,143,51,4 duplicate(AirportY2) Airport Staff#005 90,{ y_airport.gat,143,51,4 duplicate(AirportY2) Airport Staff#005 90
} y_airport.gat,156,51,4 duplicate(AirportY2) Airport Staff#006 90
y_airport.gat,156,51,4 duplicate(AirportY2) Airport Staff#006 90,{
}

5
npc/cities/lighthalzen.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= erKURITA //= erKURITA
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.0a //= 1.0b
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena 1.0 //= eAthena 1.0
//===== Description: ========================================= //===== Description: =========================================
@ -20,6 +20,7 @@
//= 0.9 Removed Duplicates [Toms] //= 0.9 Removed Duplicates [Toms]
//= 1.0 Added a missing feature to the donation NPC [MasterOfMuppets] //= 1.0 Added a missing feature to the donation NPC [MasterOfMuppets]
//= 1.0a added constants to emotions, minor optimization [Lupus] //= 1.0a added constants to emotions, minor optimization [Lupus]
//= 1.0b npcid fix [KarLaeda]
//============================================================= //=============================================================
lighthalzen.gat,198,285,5 script Jiwon 862,{ lighthalzen.gat,198,285,5 script Jiwon 862,{
@ -2016,7 +2017,7 @@ OnTouch:
} }
lhz_in01.gat,23,137,0 duplicate(LhzTrig) LhzHiddenTrg2 -1,1,1 lhz_in01.gat,23,137,0 duplicate(LhzTrig) LhzHiddenTrg2 139,1,1
lhz_in01.gat,24,131,2 duplicate(LhzTrig) Rekenber Guard#02 867 lhz_in01.gat,24,131,2 duplicate(LhzTrig) Rekenber Guard#02 867

4
npc/cities/valkyrie.txt
View File

@ -26,8 +26,8 @@
// -== Warp's needed! ==- // -== Warp's needed! ==-
valkyrie.gat,48,73,0 warp valk01 1,1,valkyrie.gat,48,64,0 valkyrie.gat,48,73,0 warp valk01 1,1,valkyrie.gat,48,64
valkyrie.gat,48,66,0 warp valk01 1,1,valkyrie.gat,48,75,0 valkyrie.gat,48,66,0 warp valk01 1,1,valkyrie.gat,48,75
// -== Book of Ymir (Heavens Door) ==- // -== Book of Ymir (Heavens Door) ==-
yuno_in02.gat,93,207,0 script Book of Ymir 111,{ yuno_in02.gat,93,207,0 script Book of Ymir 111,{

50
npc/custom/eAAC_Scripts/quest_warper.txt
View File

@ -4,7 +4,7 @@
//= Old Warper 2 by Darkchild - Remade with quest format by DZeroX //= Old Warper 2 by Darkchild - Remade with quest format by DZeroX
//= Huge Rewrite by Neouni //= Huge Rewrite by Neouni
//===== Current Version: ========================================== //===== Current Version: ==========================================
//= 2.0b //= 2.0c
//===== Compatible With: ========================================== //===== Compatible With: ==========================================
//= Any eAthena Version //= Any eAthena Version
//===== Description: ============================================== //===== Description: ==============================================
@ -70,8 +70,8 @@
// - Limits dungeon based on Depth, access special setup menu thru GM-Menu // - Limits dungeon based on Depth, access special setup menu thru GM-Menu
// - Dungeon fees split up based on Basic , Advanced & Overseas // - Dungeon fees split up based on Basic , Advanced & Overseas
// - Old Dungeon fee system removed, all dungeon fees now set to 0 // - Old Dungeon fee system removed, all dungeon fees now set to 0
//-2.0b //-2.0b - Special warpname menu option name bug fixed
// - Special warpname menu option name bug fixed //-2.0c - Parenthesis fixes [KarLaeda]
//================================================================= //=================================================================
//========================Function=&=Script======================== //========================Function=&=Script========================
@ -145,7 +145,7 @@ next;
if ($QW_HF == 1) mes "Healing full = ^00FF00 On ^000000"; if ($QW_HF == 1) mes "Healing full = ^00FF00 On ^000000";
//----------------Healpart //----------------Healpart
if ($QW_HP == 1) mes "Healing partly = ^00FF00 On ^000000"; if ($QW_HP == 1) mes "Healing partly = ^00FF00 On ^000000";
if (($QW_HF == 0)&&($QW_HP == 0)) mes "Healing = ^FF0000 Off ^000000"; if ($QW_HF == 0 && $QW_HP == 0) mes "Healing = ^FF0000 Off ^000000";
//----------------Storage //----------------Storage
if ($QW_Stor == 1) mes "Storage = ^00FF00 On ^000000"; if ($QW_Stor == 1) mes "Storage = ^00FF00 On ^000000";
if ($QW_Stor == 0) mes "Storage = ^FF0000 Off ^000000"; if ($QW_Stor == 0) mes "Storage = ^FF0000 Off ^000000";
@ -263,7 +263,7 @@ Setprice:
if ($QW_HP_S_PRICE != 0) mes "^0000FFSP ^000000Part Healing = ^00FF00 "+$QW_HP_S_PRICE+" ^000000 a point"; if ($QW_HP_S_PRICE != 0) mes "^0000FFSP ^000000Part Healing = ^00FF00 "+$QW_HP_S_PRICE+" ^000000 a point";
if ($QW_HP_S_PRICE == 0) mes "^0000FFSP ^000000Part Healing = ^FF0000 Free ^000000"; if ($QW_HP_S_PRICE == 0) mes "^0000FFSP ^000000Part Healing = ^FF0000 Free ^000000";
//----------------Storage //----------------Storage
if (($QW_S_PRICE != 0)&&($QW_S_PRICE != 60)) mes "Storage = ^00FF00 "+$QW_S_PRICE+" ^000000"; if ($QW_S_PRICE != 0 && $QW_S_PRICE != 60) mes "Storage = ^00FF00 "+$QW_S_PRICE+" ^000000";
if ($QW_S_PRICE == 0) mes "Storage = ^FF0000 Free ^000000"; if ($QW_S_PRICE == 0) mes "Storage = ^FF0000 Free ^000000";
if ($QW_S_PRICE == 60) mes "Storage = ^0000FF Kafra Mode ^000000"; if ($QW_S_PRICE == 60) mes "Storage = ^0000FF Kafra Mode ^000000";
//----------------Guild-Storage //----------------Guild-Storage
@ -349,7 +349,7 @@ case 8:
case 9: case 9:
next; next;
if (($QW_S_PRICE != 0)&&($QW_S_PRICE != 60)) mes "Storage = ^00FF00 "+$QW_S_PRICE+" ^000000"; if ($QW_S_PRICE != 0 && $QW_S_PRICE != 60) mes "Storage = ^00FF00 "+$QW_S_PRICE+" ^000000";
if ($QW_S_PRICE == 0) mes "Storage = ^FF0000 Free ^000000"; if ($QW_S_PRICE == 0) mes "Storage = ^FF0000 Free ^000000";
if ($QW_S_PRICE == 60) mes "Storage = ^0000FF Kafra Mode ^000000"; if ($QW_S_PRICE == 60) mes "Storage = ^0000FF Kafra Mode ^000000";
mes "Storage cost, if set to 60 Kafra pricing will be handled"; mes "Storage cost, if set to 60 Kafra pricing will be handled";
@ -531,11 +531,11 @@ PHeal:
if(getarg(0) == 1)set @HpPrice, (MaxHp-Hp)*$QW_HP_H_PRICE; if(getarg(0) == 1)set @HpPrice, (MaxHp-Hp)*$QW_HP_H_PRICE;
if(getarg(1) == 1)set @SpPrice, (MaxSp-Sp)*$QW_HP_S_PRICE; if(getarg(1) == 1)set @SpPrice, (MaxSp-Sp)*$QW_HP_S_PRICE;
set @healfee, @HpPrice+@SpPrice; set @healfee, @HpPrice+@SpPrice;
if (getarg(0) == 1)&&(getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_Short_Both; if (getarg(0) == 1 && getarg(1) == 1 && Zeny<@healfee) goto Zeny_Short_Both;
if (getarg(0) == 1)&&(Zeny<@healfee) goto Zeny_short_HP; if (getarg(0) == 1 && Zeny<@healfee) goto Zeny_short_HP;
if (getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_short_SP; if (getarg(1) == 1 && Zeny<@healfee) goto Zeny_short_SP;
set Zeny, Zeny-@healfee; set Zeny, Zeny-@healfee;
if (getarg(0) == 1)&&(getarg(1) == 1) percentheal 100,100; if (getarg(0) == 1 && getarg(1) == 1) percentheal 100,100;
if (getarg(0) == 1) percentheal 100,0; if (getarg(0) == 1) percentheal 100,0;
if (getarg(1) == 1) percentheal 0,100; if (getarg(1) == 1) percentheal 0,100;
close; close;
@ -561,7 +561,6 @@ Zeny_short_HP:
close; close;
end; end;
Zeny_short_SP: Zeny_short_SP:
mes "[Warpra]"; mes "[Warpra]";
mes "do you want me to partly heal your SP ?"; mes "do you want me to partly heal your SP ?";
@ -575,15 +574,13 @@ Zeny_short_SP:
close; close;
end; end;
//=============================Storage============================= //=============================Storage=============================
L_Storage: L_Storage:
next; next;
if(basicskillcheck(0) > 0 && getskilllv(1) < 6) goto L_StorageJBlow; if(basicskillcheck(0) > 0 && getskilllv(1) < 6) goto L_StorageJBlow;
set @fee, $QW_S_PRICE; set @fee, $QW_S_PRICE;
if ($QW_S_PRICE == 60)&&(BaseJob == Job_Novice) set @fee, 30; if ($QW_S_PRICE == 60 && BaseJob == Job_Novice) set @fee, 30;
if ($QW_S_PRICE == 60)&&(BaseJob != Job_Novice) set @fee, 60;
if(Zeny<@fee) callsub L_Short_on_zeny,2; if(Zeny<@fee) callsub L_Short_on_zeny,2;
set Zeny, Zeny-@fee; set Zeny, Zeny-@fee;
if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@fee/5); if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + (@fee/5);
@ -742,7 +739,7 @@ function script QWS_MMarray {
//----------------Special-Warp //----------------Special-Warp
callfunc "QWS_TownStamps"; callfunc "QWS_TownStamps";
callfunc "QWS_DungeonStamps"; callfunc "QWS_DungeonStamps";
if (@Tstamp == @MaxTstamp)&&(@Dstamp == @MaxDstamp)&&($QW_SP_WarpMap$ != "") { if (@Tstamp == @MaxTstamp && @Dstamp == @MaxDstamp && $QW_SP_WarpMap$ != "") {
set @Mmenulist$[@Mj],@pMmenuitems$[@Mi]; set @Mmenulist$[@Mj],@pMmenuitems$[@Mi];
set @Mmenuref[@Mj],@Mi; set @Mmenuref[@Mj],@Mi;
set @Mj,@Mj+1; set @Mj,@Mj+1;
@ -1046,10 +1043,10 @@ menu_item:
set @Ti,@Ti+1; set @Ti,@Ti+1;
return; return;
} }
if (@pTprice[@Ti] != 0)&&($QW_MapUserShow == 0) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]+" -> "+@pTprice[@Ti]; if (@pTprice[@Ti] != 0 && $QW_MapUserShow == 0) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]+" -> "+@pTprice[@Ti];
if (@pTprice[@Ti] == 0)&&($QW_MapUserShow == 0) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]; if (@pTprice[@Ti] == 0 && $QW_MapUserShow == 0) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti];
if (@pTprice[@Ti] != 0)&&($QW_MapUserShow == 1) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]+" ["+getmapusers(@pTmap$[@Ti])+"]"+" -> "+@pTprice[@Ti]; if (@pTprice[@Ti] != 0 && $QW_MapUserShow == 1) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]+" ["+getmapusers(@pTmap$[@Ti])+"]"+" -> "+@pTprice[@Ti];
if (@pTprice[@Ti] == 0)&&($QW_MapUserShow == 1) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]+" ["+getmapusers(@pTmap$[@Ti])+"]"; if (@pTprice[@Ti] == 0 && $QW_MapUserShow == 1) set @Tmenulist$[@Tj], @pTmenuitems$[@Ti]+" ["+getmapusers(@pTmap$[@Ti])+"]";
set @Tmenuref[@Tj],@Ti; set @Tmenuref[@Tj],@Ti;
set @Tj,@Tj+1; set @Tj,@Tj+1;
set @Ti,@Ti+1; set @Ti,@Ti+1;
@ -1572,14 +1569,13 @@ function script QWS_DLarray {
set @DWj,0; // That's the menu lines counter. set @DWj,0; // That's the menu lines counter.
cleararray @DWLmenulist$[0],"",20; // Clearing the array to get rid off ghost items in menu cleararray @DWLmenulist$[0],"",20; // Clearing the array to get rid off ghost items in menu
do { do {
if ($QW_DL == 0)||($QW_DDL >= @DDepth[@DWref]) { if ($QW_DL == 0 || $QW_DDL >= @DDepth[@DWref]) {
set @warpprice, (@pDprice[@DwarpMenu]+ (getd(@pDfee$[@DwarpMenu])*@DDepth[@DWref])); set @warpprice, (@pDprice[@DwarpMenu]+ (getd(@pDfee$[@DwarpMenu])*@DDepth[@DWref]));
if (@warpprice != 0)&&($QW_MapUserShow == 0) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]+" -> "+@warpprice; if (@warpprice != 0 && $QW_MapUserShow == 0) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]+" -> "+@warpprice;
if (@warpprice == 0)&&($QW_MapUserShow == 0) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]; if (@warpprice == 0 && $QW_MapUserShow == 0) set @DWLmenulist$[@DWj], @DLevelName$[@DWref];
if (@warpprice != 0)&&($QW_MapUserShow == 1) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]+" ["+getmapusers(@DGat$[@DWref])+"] -> "+@warpprice; if (@warpprice != 0 && $QW_MapUserShow == 1) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]+" ["+getmapusers(@DGat$[@DWref])+"] -> "+@warpprice;
if (@warpprice == 0)&&($QW_MapUserShow == 1) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]+" ["+getmapusers(@DGat$[@DWref])+"]"; if (@warpprice == 0 && $QW_MapUserShow == 1) set @DWLmenulist$[@DWj], @DLevelName$[@DWref]+" ["+getmapusers(@DGat$[@DWref])+"]";
set @DWLmenuref[@DWj],@DWref; set @DWLmenuref[@DWj],@DWref;
set @DWj,@DWj+1; set @DWj,@DWj+1;
@ -1781,7 +1777,7 @@ function script QWS_Dungeon_Warpra {
function QWS_D_getbin; function QWS_D_getbin;
function QWS_D_setbin; function QWS_D_setbin;
if ((QWS_D_getbin(getarg(0)) == 0) && (getarg(1) != "")) { if (QWS_D_getbin(getarg(0)) == 0 && getarg(1) != "") {
mes "[Warpra]"; mes "[Warpra]";
mes getarg(1)+" unlocked!"; mes getarg(1)+" unlocked!";
QWS_D_setbin(getarg(0)); QWS_D_setbin(getarg(0));
@ -1827,7 +1823,7 @@ function script QWS_Town_Warpra {
function QWS_T_getbin; function QWS_T_getbin;
function QWS_T_setbin; function QWS_T_setbin;
if ((QWS_T_getbin(getarg(0)) == 0) && (getarg(1) != "")) { if (QWS_T_getbin(getarg(0)) == 0 && getarg(1) != "") {
mes "[Warpra]"; mes "[Warpra]";
mes getarg(1)+" unlocked!"; mes getarg(1)+" unlocked!";
QWS_T_setbin(getarg(0)); QWS_T_setbin(getarg(0));

3
npc/guides/guides_einbe.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= Muad_dib //= Muad_dib
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.4 //= 1.4a
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena 7.15 + //= eAthena 7.15 +
//===== Description: ========================================= //===== Description: =========================================
@ -15,6 +15,7 @@
//= 1.2 Optimized, updated common guide names [Lupus] //= 1.2 Optimized, updated common guide names [Lupus]
//= 1.3 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA] //= 1.3 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
//= 1.4 Removed Duplicates [Silent] //= 1.4 Removed Duplicates [Silent]
//= 1.4a missing tabs [KarLaeda]
//============================================================ //============================================================
einbech.gat,67,37,4 script Guide#1::Einbech_Guide 852,{ einbech.gat,67,37,4 script Guide#1::Einbech_Guide 852,{
cutin "ein_soldier",2; cutin "ein_soldier",2;

3
npc/guild/ev_agit_event.txt
View File

@ -4,7 +4,7 @@
//= kalen (1.0) //= kalen (1.0)
//= 1.1 by Akaru and ho|yAnge| //= 1.1 by Akaru and ho|yAnge|
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.5 //= 1.5a
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+ //= eAthena 0.1+; RO Episode 4+
//===== Description: ========================================= //===== Description: =========================================
@ -22,6 +22,7 @@
//= 1.4 Fixed treasure chests spawn! We had to unroll some loops //= 1.4 Fixed treasure chests spawn! We had to unroll some loops
//= Now they appear in castles from 00:01 to 00:24. [Lupus] //= Now they appear in castles from 00:01 to 00:24. [Lupus]
//= 1.5 Fixed WOE end messages on non-WOE days, by Avaj //= 1.5 Fixed WOE end messages on non-WOE days, by Avaj
//= 1.5a missing tabs [KarLaeda]
//============================================================ //============================================================
//| To know how to set up WoE times, go to doc\woe_time_explanation.txt //| To know how to set up WoE times, go to doc\woe_time_explanation.txt
// WoE Start/Stop times // WoE Start/Stop times

9
npc/jobs/1-1e/gunslinger.txt
View File

@ -7,7 +7,7 @@
//= DON'T REMOVE THIS! (by request of him, he provided all //= DON'T REMOVE THIS! (by request of him, he provided all
//= the info regarding the quests and shops.) //= the info regarding the quests and shops.)
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.7a //= 1.7b
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena SVN //= eAthena SVN
//===== Description: ========================================= //===== Description: =========================================
@ -21,6 +21,7 @@
//= optimized [Lupus] //= optimized [Lupus]
//= 1.7 Now uses only ONE variable GUNS_Q [Lupus] //= 1.7 Now uses only ONE variable GUNS_Q [Lupus]
//= 1.7a Grammar fixes, few spelling fixes, etc [CBMaster] //= 1.7a Grammar fixes, few spelling fixes, etc [CBMaster]
//= 1.7b Parenthesis fixes [KarLaeda]
//============================================================ //============================================================
que_ng.gat,152,167,3 script Gunslinger Jobchanger 901,{ que_ng.gat,152,167,3 script Gunslinger Jobchanger 901,{
@ -212,8 +213,8 @@ payon.gat,184,65,3 script Mr. Tanieh 866,{
set @npcname$,""; set @npcname$,"";
end; end;
} }
} else if (GUNS_Q == 10003) || (GUNS_Q == 10004) { } else if (GUNS_Q == 10003 || GUNS_Q == 10004) {
if (countitem(519) >= 1) && (GUNS_Q == 10004) { if (countitem(519) >= 1 && GUNS_Q == 10004) {
mes @npcname$; mes @npcname$;
mes "THAT'S IT!! I was missing the Milk! Oh yes, thanks so much, will you give it to me?"; mes "THAT'S IT!! I was missing the Milk! Oh yes, thanks so much, will you give it to me?";
switch(select("Sure, take it:Sorry but I need it")) { switch(select("Sure, take it:Sorry but I need it")) {
@ -241,7 +242,7 @@ payon.gat,184,65,3 script Mr. Tanieh 866,{
set @npcname$,""; set @npcname$,"";
set GUNS_Q,10004; set GUNS_Q,10004;
end; end;
} else if (Class == Job_Gunslinger) || (GUNS_Q == 10005) { } else if (Class == Job_Gunslinger || GUNS_Q == 10005) {
mes @npcname$; mes @npcname$;
mes "Hi ^0000CC"+strcharinfo(0)+"^000000!, how have you been doing? My wife sends you regards and thanks for the ingredients..."; mes "Hi ^0000CC"+strcharinfo(0)+"^000000!, how have you been doing? My wife sends you regards and thanks for the ingredients...";
close2; close2;

2
npc/jobs/2-1/blacksmith.txt
View File

@ -27,7 +27,7 @@
//= 2.0 Changed numbers to constants. [Vicious] //= 2.0 Changed numbers to constants. [Vicious]
//= 2.1 Removed Duplicates [Silent] //= 2.1 Removed Duplicates [Silent]
//= 2.2 Merged Jfunc, changed job numbers to constants [Lupus] //= 2.2 Merged Jfunc, changed job numbers to constants [Lupus]
============================================================== //==============================================================

2
npc/jobs/2-1/hunter.txt
View File

@ -1064,7 +1064,7 @@ job_hunte.gat,76,105,1 duplicate(HntTrap) 50-1 139,0,0
job_hunte.gat,76,104,1 duplicate(HntTrap) 50-2 139,0,0 job_hunte.gat,76,104,1 duplicate(HntTrap) 50-2 139,0,0
job_hunte.gat,78,101,1 duplicate(HntTrap) 50-3 139,0,2 job_hunte.gat,78,101,1 duplicate(HntTrap) 50-3 139,0,2
job_hunte.gat,79,101,1 duplicate(HntTrap) 50-4 139,0,2 job_hunte.gat,79,101,1 duplicate(HntTrap) 50-4 139,0,2
job_hunte.gat,76,99,1 duplicate(HntTrap) 51-1 139,10 job_hunte.gat,76,99,1 duplicate(HntTrap) 51-1 139,1,0
job_hunte.gat,77,98,1 duplicate(HntTrap) 51-2 139,2,0 job_hunte.gat,77,98,1 duplicate(HntTrap) 51-2 139,2,0
job_hunte.gat,74,99,1 duplicate(HntTrap) 51-3 139,0,0 job_hunte.gat,74,99,1 duplicate(HntTrap) 51-3 139,0,0
job_hunte.gat,74,98,1 duplicate(HntTrap) 51-4 139,0,0 job_hunte.gat,74,98,1 duplicate(HntTrap) 51-4 139,0,0

2
npc/jobs/2-1/priest.txt
View File

@ -20,7 +20,7 @@
//= to go. [Lupus] //= to go. [Lupus]
//= 2.0 Changed numbers to constants. [Vicious] //= 2.0 Changed numbers to constants. [Vicious]
//= 2.1 Merged JFunc [Lupus] //= 2.1 Merged JFunc [Lupus]
========================================================== //==========================================================
//*********************************************************************************************************************************************************************************\\ //*********************************************************************************************************************************************************************************\\

2
npc/jobs/2-2a/Clown.txt
View File

@ -16,6 +16,6 @@
//============================================================ //============================================================
// -== Clown ==- // -== Clown ==-
valkyrie.gat,53,54,4z script Clown 741,{ valkyrie.gat,53,54,4 script Clown 741,{
callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Clown,"Clown"; callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Clown,"Clown";
} }

2
npc/kafras/functions_kafras.txt
View File

@ -437,7 +437,7 @@ function script F_CheckKafCode {
} }
// Set / Change / Clear Storage Password Function ==================== // Set / Change / Clear Storage Password Function ====================
function script F_SetKafCode 115,{ function script F_SetKafCode {
mes "[Kafra]"; mes "[Kafra]";
if(#kafra_code) { if(#kafra_code) {
mes "Your storage is protected with a password. What would you do now?"; mes "Your storage is protected with a password. What would you do now?";

2
npc/merchants/kunai_maker.txt
View File

@ -47,7 +47,7 @@ L_Bye:
close; close;
} }
function script Kunai_Trade -1,{ function script Kunai_Trade {
next; next;
mes "[Jin]"; mes "[Jin]";
if (MaxWeight*50/100 < Weight) { if (MaxWeight*50/100 < Weight) {

8
npc/other/pvp.txt
View File

@ -42,7 +42,7 @@ morocc_in.gat,144,138,4 script PvP Narrator#4 84,{
end; end;
} }
// Geffen -------------------------------------- // Geffen --------------------------------------
geffen_in.gat, 67,63,4 script PvP Narrator#5 84,{ geffen_in.gat,67,63,4 script PvP Narrator#5 84,{
callfunc "F_PvPNarr", "geffen_in.gat", 64, 60; callfunc "F_PvPNarr", "geffen_in.gat", 64, 60;
end; end;
} }
@ -129,7 +129,7 @@ function script F_PvPNarr {
//========================================================================== //==========================================================================
// Alberta ----------------------------------- // Alberta -----------------------------------
alberta_in.gat, 26,146,4 script Gate Keeper#1::GateKeep 83,{ alberta_in.gat,26,146,4 script Gate Keeper#1::GateKeep 83,{
mes "[Gate Keeper]"; mes "[Gate Keeper]";
mes "Hi. I'm glad to be of service. I will open the PvP fight square for you!"; mes "Hi. I'm glad to be of service. I will open the PvP fight square for you!";
mes "If you have any questions about the PvP modes or rules, please ask the Narrator....."; mes "If you have any questions about the PvP modes or rules, please ask the Narrator.....";
@ -211,9 +211,9 @@ sF_Move:
} }
// Geffen -------------------------------------------- // Geffen --------------------------------------------
geffen_in.gat, 63,63,4 duplicate(GateKeep) Gate Keeper#2 83 geffen_in.gat,63,63,4 duplicate(GateKeep) Gate Keeper#2 83
// Morroc---------------------------------------------- // Morroc----------------------------------------------
morocc_in.gat, 144,142,4 duplicate(GateKeep) Gate Keeper#3 83 morocc_in.gat,144,142,4 duplicate(GateKeep) Gate Keeper#3 83
// Payon ---------------------------------------------- // Payon ----------------------------------------------
payon_in01.gat,175,106,3 duplicate(GateKeep) Gate Keeper#4 83 payon_in01.gat,175,106,3 duplicate(GateKeep) Gate Keeper#4 83
// Prontera ------------------------------------------- // Prontera -------------------------------------------

4
npc/quests/The_Sign_Quest.txt
View File

@ -1985,8 +1985,6 @@ OnTouch:
} }
}
aldeba_in.gat,147,104,1 script PotionActivator 139,3,0,{ aldeba_in.gat,147,104,1 script PotionActivator 139,3,0,{
OnTouch: OnTouch:
if(@aldesigncheck == 0) if(@aldesigncheck == 0)
@ -4062,8 +4060,6 @@ L_Ever:
close; close;
} }
}
cmd_in01.gat,32,25,3 script Lamadin 724,{ cmd_in01.gat,32,25,3 script Lamadin 724,{
if(SignDance == 1)goto L_Win; if(SignDance == 1)goto L_Win;

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

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= Dj-Yhn //= Dj-Yhn
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.1 //= 1.2
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena //= eAthena
//===== Description: ========================================= //===== Description: =========================================
@ -56,7 +56,8 @@
//= Fixed possible item exploits, fixed Straw Hat //= Fixed possible item exploits, fixed Straw Hat
//= Added missing checks [Lupus] //= Added missing checks [Lupus]
//= 1.1 Fixed a bug in Giant-band-aid that didn't counting rotten bandages //= 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] //= Fixed a bug in Fur Hat that didn't count yarn [Evera]
//= 1.2 Syntax fixes for parenthesis, reformatting [KarLaeda]
//============================================================ //============================================================
//Payon /=Black cat ears=/ //Payon /=Black cat ears=/
@ -140,7 +141,7 @@ geffen.gat,129,148,3 script Arjen 779,{
next; next;
switch(select("^3131FFX Hairpin:Giant Band Aid:Flower Hairpin^000000:End conversation.")) { switch(select("^3131FFX Hairpin:Giant Band Aid:Flower Hairpin^000000:End conversation.")) {
case 1: case 1:
if ((countitem(2294) > 0) && (countitem(7220) > 399)) { if (countitem(2294) > 0 && countitem(7220) > 399) {
mes "[Arjen]"; mes "[Arjen]";
mes "X Hairpin!"; mes "X Hairpin!";
mes "That's very good !!"; mes "That's very good !!";
@ -159,7 +160,7 @@ geffen.gat,129,148,3 script Arjen 779,{
mes "^3131FF - Sha Sha !! - ^000000"; mes "^3131FF - Sha Sha !! - ^000000";
mes "^3131FF - Cha Sha Haa !! - ^000000"; mes "^3131FF - Cha Sha Haa !! - ^000000";
next; next;
if ((countitem(2294) > 0) && (countitem(7220) > 399)) { if (countitem(2294) > 0 && countitem(7220) > 399) {
delitem 2294,1; delitem 2294,1;
delitem 7220,400; delitem 7220,400;
getitem 5079,1; //X-Hairping == crossed hair band? getitem 5079,1; //X-Hairping == crossed hair band?
@ -190,16 +191,16 @@ geffen.gat,129,148,3 script Arjen 779,{
close; close;
} }
case 2: case 2:
if (countitem(970) > 0) && (countitem(930) > 499) { if (countitem(970) > 0 && countitem(930) > 499) {
mes "[Arjen]"; mes "[Arjen]";
mes "Giant Band Aid??.."; mes "Giant Band Aid??..";
mes "Oh well- Then,"; mes "Oh well- Then,";
mes "it's time to show my skill after all this time !?"; mes "it's time to show my skill after all this time !?";
next; next;
mes "^3131FF &#1038;V Sha Sha !! - ^000000"; mes "^3131FF - Sha Sha !! - ^000000";
mes "^3131FF - Cha Sha Haa !! - ^000000"; mes "^3131FF - Cha Sha Haa !! - ^000000";
next; next;
if (countitem(970) > 0) && (countitem(930) > 499) { if (countitem(970) > 0 && countitem(930) > 499) {
delitem 970,1; delitem 970,1;
delitem 930,500; delitem 930,500;
getitem 5063,1; //another one in wich I love gravity for changing names =X getitem 5063,1; //another one in wich I love gravity for changing names =X
@ -227,15 +228,15 @@ geffen.gat,129,148,3 script Arjen 779,{
close; close;
} }
case 3: case 3:
if ((countitem(2269) > 0) & (countitem(999) > 9) & (Zeny > 19999)) { if (countitem(2269) > 0 && countitem(999) > 9 && Zeny > 19999) {
mes "[Arjen]"; mes "[Arjen]";
mes "Great !! Flower Hairpin ~"; mes "Great !! Flower Hairpin ~";
mes "it's time to show my skill after all this time !?"; mes "it's time to show my skill after all this time !?";
next; next;
mes "^3131FF &#1038;V Sha Sha !! - ^000000"; mes "^3131FF - Sha Sha !! - ^000000";
mes "^3131FF - Cha Sha Haa !! - ^000000"; mes "^3131FF - Cha Sha Haa !! - ^000000";
next; next;
if ((countitem(2269) > 0) & (countitem(999) > 9) & (Zeny > 19999)) { if (countitem(2269) > 0 && countitem(999) > 9 && Zeny > 19999) {
delitem 2269,1; delitem 2269,1;
delitem 999,10; delitem 999,10;
set Zeny,Zeny-20000; set Zeny,Zeny-20000;
@ -1998,26 +1999,30 @@ alde_alche.gat,88,180,1 script Muscle Man#Masked Alarm 748,{
} }
} }
OnInit: OnInit:
disablenpc "#Masked Alarm1"; disablenpc "#Masked Alarm1";
disablenpc "#Masked Alarm2"; disablenpc "#Masked Alarm2";
disablenpc "#Masked Alarm3"; disablenpc "#Masked Alarm3";
disablenpc "#Masked Alarm4"; disablenpc "#Masked Alarm4";
disablenpc "Muscle Man#Alarm"; disablenpc "Muscle Man#Alarm";
end; end;
} }
alde_alche.gat,86,184,3 script #Masked Alarm1 1193,{ end; alde_alche.gat,86,184,3 script #Masked Alarm1 1193,{
end;
OnBlast: OnBlast:
misceffect 106; misceffect 106;
end; } end; }
alde_alche.gat,89,184,3 script #Masked Alarm2 1193,{ end; alde_alche.gat,89,184,3 script #Masked Alarm2 1193,{
end;
OnBlast: OnBlast:
misceffect 106; misceffect 106;
end; } end; }
alde_alche.gat,92,184,3 script #Masked Alarm3 1193,{ end; alde_alche.gat,92,184,3 script #Masked Alarm3 1193,{
end;
OnBlast: OnBlast:
misceffect 106; misceffect 106;
end; } end; }
alde_alche.gat,95,184,3 script #Masked Alarm4 1193,{ end; alde_alche.gat,95,184,3 script #Masked Alarm4 1193,{
end;
OnBlast: OnBlast:
misceffect 106; misceffect 106;
end; } end; }
@ -2828,8 +2833,7 @@ in_orcs01.gat,31,93,1 script Orc Warrior#1 1023,2,2{
} else { } else {
set orc_hero_quest,rand(1,10); set orc_hero_quest,rand(1,10);
if (orc_hero_quest > 9) { if (orc_hero_quest > 9) {
if (orcs_hero_hat == 12) { if (orcs_hero_hat == 12 && countitem(931)>99) {
if (countitem(931)>99) {
mes "[Orc Warrior]"; mes "[Orc Warrior]";
mes "Uhoh, that is really great."; mes "Uhoh, that is really great.";
mes "After all these battles, I am not sure how much you understand."; mes "After all these battles, I am not sure how much you understand.";
@ -2889,7 +2893,6 @@ in_orcs01.gat,31,93,1 script Orc Warrior#1 1023,2,2{
close; close;
} }
} }
}
mes "[Orc Warrior]"; mes "[Orc Warrior]";
mes "The best way to understand Orcs,"; mes "The best way to understand Orcs,";
mes "is through battle."; mes "is through battle.";

8
npc/quests/seals/brisingamen_seal.txt
View File

@ -5096,21 +5096,21 @@ mjolnir_09.gat,85,129,0 script #brisindwarf3 111,3,3,{
mes "Failed."; mes "Failed.";
mes "Failed..."; mes "Failed...";
close; close;
break break;
case 2: case 2:
specialeffect 109; specialeffect 109;
mes "[Echoing Voice]"; mes "[Echoing Voice]";
mes "Failed."; mes "Failed.";
mes "Failed..."; mes "Failed...";
close; close;
break break;
case 3: case 3:
specialeffect 109; specialeffect 109;
mes "[Echoing Voice]"; mes "[Echoing Voice]";
mes "Failed."; mes "Failed.";
mes "Failed..."; mes "Failed...";
close; close;
break break;
case 4: case 4:
specialeffect 109; specialeffect 109;
mes "[Echoing Voice]"; mes "[Echoing Voice]";
@ -5124,7 +5124,7 @@ mjolnir_09.gat,85,129,0 script #brisindwarf3 111,3,3,{
mes "gonna drown to death!"; mes "gonna drown to death!";
mes "Who woke me up?"; mes "Who woke me up?";
close; close;
break break;
} }
} }
else else

2
npc/quests/seals/megingard_seal.txt
View File

@ -2149,7 +2149,7 @@ in_rogue.gat,243,61,0 script Suspicious Man#God 748,{
mes "You are same as others! Go away from me!"; mes "You are same as others! Go away from me!";
set god_megin_2,0; set god_megin_2,0;
close; close;
break break;
case 3: case 3:
mes "[Cuaque Donon]"; mes "[Cuaque Donon]";
mes "And...that night...I heard ^0000FFhe^000000 had an argue with the leader."; mes "And...that night...I heard ^0000FFhe^000000 had an argue with the leader.";

2
npc/quests/seals/mjolnir_seal.txt
View File

@ -2484,7 +2484,7 @@ mjolnir_01.gat,35,136,7 script Dwarf Blacksmith#west 826,{
PART16: PART16:
set @vestripart,6; set @vestripart,6;
if (getequipisequiped(6)) goto L_Check2-1; if (getequipisequiped(6)) goto L_Check21;
goto M_Menu2; goto M_Menu2;
PART17: PART17: