summaryrefslogtreecommitdiff
path: root/npc/guild
diff options
context:
space:
mode:
Diffstat (limited to 'npc/guild')
-rw-r--r--npc/guild/aldeg/aldeg_treas.txt20
-rw-r--r--npc/guild/ev_agit_event.txt49
-rw-r--r--npc/guild/gefg/gefg_treas.txt20
-rw-r--r--npc/guild/gldfunc_ev_agit.txt4
-rw-r--r--npc/guild/gldfunc_flag.txt2
-rw-r--r--npc/guild/gldfunc_manager.txt51
-rw-r--r--npc/guild/gldfunc_treasure.txt3
-rw-r--r--npc/guild/nguild/nguild_dunsw.txt7
-rw-r--r--npc/guild/nguild/nguild_ev_agit.txt5
-rw-r--r--npc/guild/nguild/nguild_flags.txt13
-rw-r--r--npc/guild/nguild/nguild_guardians.txt6
-rw-r--r--npc/guild/nguild/nguild_kafras.txt5
-rw-r--r--npc/guild/nguild/nguild_managers.txt13
-rw-r--r--npc/guild/nguild/nguild_treas.txt25
-rw-r--r--npc/guild/payg/payg_treas.txt20
-rw-r--r--npc/guild/prtg/prtg_treas.txt20
16 files changed, 134 insertions, 129 deletions
diff --git a/npc/guild/aldeg/aldeg_treas.txt b/npc/guild/aldeg/aldeg_treas.txt
index 5ab6dacfc..bdc0b75f2 100644
--- a/npc/guild/aldeg/aldeg_treas.txt
+++ b/npc/guild/aldeg/aldeg_treas.txt
@@ -24,9 +24,7 @@ OnRecvCastleA01:
set $@bxA01, $boxNumA01;
callfunc "F_GldTreas","aldeg_cas01","A01",$boxNumA01,$@bxA01,$@boxIdA01,1324,114,218,123,227,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","aldeg_cas01","A01",$boxNumA01,$@bxA01,$@boxIdA01,1324,114,218,123,227,0;
- end;
+
OnDied:
mapannounce "aldeg_cas01.gat","Treasure Chest Broken Open",17;
set $boxNumA01, $boxNumA01 -1;
@@ -50,9 +48,7 @@ OnRecvCastleA02:
set $@bxA02, $boxNumA02;
callfunc "F_GldTreas","aldeg_cas02","A02",$boxNumA02,$@bxA02,$@boxIdA02,1326,130,226,138,235,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","aldeg_cas02","A02",$boxNumA02,$@bxA02,$@boxIdA02,1326,130,226,138,235,0;
- end;
+
OnDied:
mapannounce "aldeg_cas02.gat","Treasure Chest Broken Open",17;
set $boxNumA02, $boxNumA02 -1;
@@ -75,9 +71,7 @@ OnRecvCastleA03:
set $@bxA03, $boxNumA03;
callfunc "F_GldTreas","aldeg_cas03","A03",$boxNumA03,$@bxA03,$@boxIdA03,1328,220,264,229,273,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","aldeg_cas03","A03",$boxNumA03,$@bxA03,$@boxIdA03,1328,220,264,229,273,0;
- end;
+
OnDied:
mapannounce "aldeg_cas03.gat","Treasure Chest Broken Open",17;
set $boxNumA03, $boxNumA03 -1;
@@ -100,9 +94,7 @@ OnRecvCastleA04:
set $@bxA04, $boxNumA04;
callfunc "F_GldTreas","aldeg_cas04","A04",$boxNumA04,$@bxA04,$@boxIdA04,1330,80,8,89,17,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","aldeg_cas04","A04",$boxNumA04,$@bxA04,$@boxIdA04,1330,80,8,89,17,0;
- end;
+
OnDied:
mapannounce "aldeg_cas04.gat","Treasure Chest Broken Open",17;
set $boxNumA04, $boxNumA04 -1;
@@ -125,9 +117,7 @@ OnRecvCastleA05:
set $@bxA05, $boxNumA05;
callfunc "F_GldTreas","aldeg_cas05","A05",$boxNumA05,$@bxA05,$@boxIdA05,1332,58,8,65,15,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","aldeg_cas05","A05",$boxNumA05,$@bxA05,$@boxIdA05,1332,58,8,65,15,0;
- end;
+
OnDied:
mapannounce "aldeg_cas05.gat","Treasure Chest Broken Open",17;
set $boxNumA05, $boxNumA05 -1;
diff --git a/npc/guild/ev_agit_event.txt b/npc/guild/ev_agit_event.txt
index 7a7e89bab..211075560 100644
--- a/npc/guild/ev_agit_event.txt
+++ b/npc/guild/ev_agit_event.txt
@@ -4,7 +4,7 @@
//= kalen (1.0)
//= 1.1 by Akaru and ho|yAnge|
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -17,25 +17,64 @@
//===== Additional Comments: =================================
//= v1.1a changed OnInit to OnAgitInit.[kobra_k88]
//= v1.2 added gettime checks. removed $AgitStarted var.[kobra_k88]
+//= v1.3 Moved treasure spawn time here.[kobra_k88]
//============================================================
-// Auto Start Agit NPC
+// WoE Start/Stop times
+//======================================
- script Agit_Event -1,{
end;
OnAgitInit:
- if(gettime(3) >= 21 || gettime(3) < 11) goto L_Stop;
+ if(gettime(3) >= 17 || gettime(3) < 10) goto L_Stop;
-OnClock1100:
+OnClock1000:
// if(gettime(4)!=1 || gettime(4)!=3 || gettime(4)!=6) end;
Announce "The War Of Emperium has begun!",8;
AgitStart;
Break;
-OnClock2100:
+OnClock1700:
L_Stop:
// if(gettime(4)!=1 || gettime(4)!=3 || gettime(4)!=6) end;
Announce "The War Of Emperium is over!",8;
AgitEnd;
Break;
}
+
+// Treasure Spawn Time
+//========================================
+- script TreasSpawn -1,{
+ end;
+
+OnClock0000:
+ callfunc "F_GldTreas","aldeg_cas01","A01",$boxNumA01,$@bxA01,$@boxIdA01,1324,114,218,123,227,0;
+ callfunc "F_GldTreas","aldeg_cas02","A02",$boxNumA02,$@bxA02,$@boxIdA02,1326,130,226,138,235,0;
+ callfunc "F_GldTreas","aldeg_cas03","A03",$boxNumA03,$@bxA03,$@boxIdA03,1328,220,264,229,273,0;
+ callfunc "F_GldTreas","aldeg_cas04","A04",$boxNumA04,$@bxA04,$@boxIdA04,1330,80,8,89,17,0;
+ callfunc "F_GldTreas","aldeg_cas05","A05",$boxNumA05,$@bxA05,$@boxIdA05,1332,58,8,65,15,0;
+
+ callfunc "F_GldTreas","gefg_cas01","G01",$boxNumG01,$@bxG01,$@boxIdG01,1334,150,108,158,114,0;
+ callfunc "F_GldTreas","gefg_cas02","G02",$boxNumG02,$@bxG02,$@boxIdG02,1336,136,112,145,118,0;
+ callfunc "F_GldTreas","gefg_cas03","G03",$boxNumG03,$@bxG03,$@boxIdG03,1338,266,286,275,293,0;
+ callfunc "F_GldTreas","gefg_cas04","G04",$boxNumG04,$@bxG04,$@boxIdG04,1340,112,114,119,123,0;
+ callfunc "F_GldTreas","gefg_cas05","G05",$boxNumG05,$@bxG05,$@boxIdG05,1342,140,106,147,113,0;
+
+ callfunc "F_GldTreas","payg_cas01","Py01",$boxNumPy01,$@bxPy01,$@boxIdPy01,1344,286,4,295,13,0;
+ callfunc "F_GldTreas","payg_cas02","Py02",$boxNumPy02,$@bxPy02,$@boxIdPy02,1346,140,140,148,149,0;
+ callfunc "F_GldTreas","payg_cas03","Py03",$boxNumPy03,$@bxPy03,$@boxIdPy03,1348,154,164,162,173,0;
+ callfunc "F_GldTreas","payg_cas04","Py04",$boxNumPy04,$@bxPy04,$@boxIdPy04,1350,142,44,151,51,0;
+ callfunc "F_GldTreas","payg_cas05","Py05",$boxNumPy05,$@bxPy05,$@boxIdPy05,1352,152,128,160,135,0;
+
+ callfunc "F_GldTreas","prtg_cas01","Pt01",$boxNumPt01,$@bxPt01,$@boxIdPt01,1354,6,204,15,213,0;
+ callfunc "F_GldTreas","prtg_cas02","Pt02",$boxNumPt02,$@bxPt02,$@boxIdPt02,1356,198,224,207,233,0;
+ callfunc "F_GldTreas","prtg_cas03","Pt03",$boxNumPt03,$@bxPt03,$@boxIdPt03,1358,184,128,193,135,0;
+ callfunc "F_GldTreas","prtg_cas04","Pt04",$boxNumPt04,$@bxPt04,$@boxIdPt04,1360,266,158,275,167,0;
+ callfunc "F_GldTreas","prtg_cas05","Pt05",$boxNumPt05,$@bxPt05,$@boxIdPt05,1362,272,174,279,181,0;
+
+ callfunc "F_GldTreas","nguild_alde","N01",$boxNumN01,$@bxN01,$@boxIdN01,1324,114,218,123,227,0;
+ callfunc "F_GldTreas","nguild_gef","N02",$boxNumN02,$@bxN02,$@boxIdN02,1334,150,108,158,114,0;
+ callfunc "F_GldTreas","nguild_pay","N03",$boxNumN03,$@bxN03,$@boxIdN03,1344,286,4,295,13,0;
+ callfunc "F_GldTreas","nguild_prt","N04",$boxNumN04,$@bxN04,$@boxIdN04,1354,6,204,15,213,0;
+ end;
+}
diff --git a/npc/guild/gefg/gefg_treas.txt b/npc/guild/gefg/gefg_treas.txt
index 95bd57542..8068679bc 100644
--- a/npc/guild/gefg/gefg_treas.txt
+++ b/npc/guild/gefg/gefg_treas.txt
@@ -24,9 +24,7 @@ OnRecvCastleG01:
set $@bxG01, $boxNumG01;
callfunc "F_GldTreas","gefg_cas01","G01",$boxNumG01,$@bxG01,$@boxIdG01,1334,150,108,158,114,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","gefg_cas01","G01",$boxNumG01,$@bxG01,$@boxIdG01,1334,150,108,158,114,0;
- end;
+
OnDied:
mapannounce "gefg_cas01.gat","Treasure Chest Broken Open",17;
set $boxNumG01, $boxNumG01 -1;
@@ -51,9 +49,7 @@ OnRecvCastleG02:
set $@bxG02, $boxNumG02;
callfunc "F_GldTreas","gefg_cas02","G02",$boxNumG02,$@bxG02,$@boxIdG02,1336,136,112,145,118,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","gefg_cas02","G02",$boxNumG02,$@bxG02,$@boxIdG02,1336,136,112,145,118,0;
- end;
+
OnDied:
mapannounce "gefg_cas02.gat","Treasure Chest Broken Open",17;
set $boxNumG02, $boxNumG02 -1;
@@ -77,9 +73,7 @@ OnRecvCastleG03:
set $@bxG03, $boxNumG03;
callfunc "F_GldTreas","gefg_cas03","G03",$boxNumG03,$@bxG03,$@boxIdG03,1338,266,286,275,293,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","gefg_cas03","G03",$boxNumG03,$@bxG03,$@boxIdG03,1338,266,286,275,293,0;
- end;
+
OnDied:
mapannounce "gefg_cas03.gat","Treasure Chest Broken Open",17;
set $boxNumG03, $boxNumG03 -1;
@@ -104,9 +98,7 @@ OnRecvCastleG04:
set $@bxG04, $boxNumG04;
callfunc "F_GldTreas","gefg_cas04","G04",$boxNumG04,$@bxG04,$@boxIdG04,1340,112,114,119,123,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","gefg_cas04","G04",$boxNumG04,$@bxG04,$@boxIdG04,1340,112,114,119,123,0;
- end;
+
OnDied:
mapannounce "gefg_cas04.gat","Treasure Chest Broken Open",17;
set $boxNumG04, $boxNumG04 -1;
@@ -131,9 +123,7 @@ OnRecvCastleG05:
set $@bxG05, $boxNumG05;
callfunc "F_GldTreas","gefg_cas05","G05",$boxNumG05,$@bxG05,$@boxIdG05,1342,140,106,147,113,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","gefg_cas05","G05",$boxNumG05,$@bxG05,$@boxIdG05,1342,140,106,147,113,0;
- end;
+
OnDied:
mapannounce "gefg_cas05.gat","Treasure Chest Broken Open",17;
set $boxNumG05, $boxNumG05 -1;
diff --git a/npc/guild/gldfunc_ev_agit.txt b/npc/guild/gldfunc_ev_agit.txt
index ee4216904..d6622ae87 100644
--- a/npc/guild/gldfunc_ev_agit.txt
+++ b/npc/guild/gldfunc_ev_agit.txt
@@ -141,9 +141,9 @@ function script F_AgitBreak {
// Function for OnAgitEnd ======================================
function script F_AgitEnd {
-// if (GetCastleData(getarg(0)+".gat",1) == 0) return;
+ GvgOff getarg(0)+".gat";
+// if (GetCastleData(getarg(0)+".gat",1) == 0) return; //enable this line to allow take over of non captured castles after woe ends
MapRespawnGuildID getarg(0)+".gat",GetCastleData(getarg(0)+".gat",1),4;
KillMonster getarg(0)+".gat","Agit_"+getarg(1)+"::OnAgitBreak";
- GvgOff getarg(0)+".gat";
end;
}
diff --git a/npc/guild/gldfunc_flag.txt b/npc/guild/gldfunc_flag.txt
index f20c2fdeb..77625d5d2 100644
--- a/npc/guild/gldfunc_flag.txt
+++ b/npc/guild/gldfunc_flag.txt
@@ -49,7 +49,7 @@ L_Startg2:
mes "[ Ringing Voice ]";
mes "Brave one... would you return to your honorable be?";
next;
- menu "Go back to your Guild Castle.",M_Enter,"Cancel.",-;
+ menu "Return.",M_Enter,"Cancel.",-;
return;
M_Enter:
diff --git a/npc/guild/gldfunc_manager.txt b/npc/guild/gldfunc_manager.txt
index bbf913b8a..46c0025e1 100644
--- a/npc/guild/gldfunc_manager.txt
+++ b/npc/guild/gldfunc_manager.txt
@@ -25,6 +25,8 @@
//= Added disablenpc line to surrender castle option to remove kafra
//= upon surrender.[kobra_k88]
//= v1.2b U can't surrender the base during WOE [Lupus]
+//= v1.2c Fixed issue of guardians hp not increasing upon defense
+//= investment.[kobra_k88]
//============================================================
@@ -167,6 +169,23 @@ L_Start:
set Zeny,Zeny-@def_invest;
SetCastleData getarg(1)+".gat",5,@TriggerD+1;
SetCastleData getarg(1)+".gat",3,@Defence+1;
+ // set new hp values for guardians
+ set @Defence, @Defence + 1;
+ set @AGuardian, 28634 + (@Defence*2000);
+ set @KGuardian, 30214 + (@Defence*2000);
+ set @SGuardian, 15670 + (@Defence*2000);
+ //set @AGuardian,strmobinfo(4,1285) + (@Defence*2000);
+ //set @KGuardian,strmobinfo(4,1286) + (@Defence*2000);
+ //set @SGuardian,strmobinfo(4,1287) + (@Defence*2000);
+ if (GetCastleData(getarg(1)+".gat",10) == 1) SetCastleData getarg(1)+".gat",18,@SGuardian;
+ if (GetCastleData(getarg(1)+".gat",11) == 1) SetCastleData getarg(1)+".gat",19,@SGuardian;
+ if (GetCastleData(getarg(1)+".gat",12) == 1) SetCastleData getarg(1)+".gat",20,@SGuardian;
+ if (GetCastleData(getarg(1)+".gat",13) == 1) SetCastleData getarg(1)+".gat",21,@AGuardian;
+ if (GetCastleData(getarg(1)+".gat",14) == 1) SetCastleData getarg(1)+".gat",22,@AGuardian;
+ if (GetCastleData(getarg(1)+".gat",15) == 1) SetCastleData getarg(1)+".gat",23,@KGuardian;
+ if (GetCastleData(getarg(1)+".gat",16) == 1) SetCastleData getarg(1)+".gat",24,@KGuardian;
+ if (GetCastleData(getarg(1)+".gat",17) == 1) SetCastleData getarg(1)+".gat",25,@KGuardian;
+
mes "[ "+getarg(0)+" ]";
mes "You have invested successfully.";
return 0;
@@ -195,9 +214,12 @@ L_Start:
set @Guardian5,guardianinfo(5);
set @Guardian6,guardianinfo(6);
set @Guardian7,guardianinfo(7);
- set @SGuardian,strmobinfo(4,1287)+2000*@Defence;
- set @AGuardian,strmobinfo(4,1286)+2000*@Defence;
- set @KGuardian,strmobinfo(4,1285)+2000*@Defence;
+ set @AGuardian, 28634 + (@Defence*2000);
+ set @KGuardian, 30214 + (@Defence*2000);
+ set @SGuardian, 15670 + (@Defence*2000);
+ //set @AGuardian,strmobinfo(4,1285) + (@Defence*2000);
+ //set @KGuardian,strmobinfo(4,1286) + (@Defence*2000);
+ //set @SGuardian,strmobinfo(4,1287) + (@Defence*2000);
mes "[ "+getarg(0)+" ]";
mes "Would you like to install a guardian? Guardians will protect the guild base from enemies.";
@@ -234,19 +256,19 @@ L_Start:
L4_4:
if (GetCastleData(getarg(1)+".gat",13) == 1) goto L_GotGuard;
set @GDnum,13;
- set @GDnum2,21;
+ set @GDnum2,21;
set @GuardianHP,@AGuardian;
goto L4_9;
L4_5:
if (GetCastleData(getarg(1)+".gat",14) == 1) goto L_GotGuard;
set @GDnum,14;
- set @GDnum2,22;
- set @GuardianHP,@AGuardian;
+ set @GDnum2,22;
+ set @GuardianHP,@AGuardian;
goto L4_9;
L4_6:
if (GetCastleData(getarg(1)+".gat",15) == 1) goto L_GotGuard;
set @GDnum,15;
- set @GDnum2,23;
+ set @GDnum2,23;
set @GuardianHP,@KGuardian;
goto L4_9;
L4_7:
@@ -258,7 +280,7 @@ L_Start:
L4_8:
if (GetCastleData(getarg(1)+".gat",17) == 1) goto L_GotGuard;
set @GDnum,17;
- set @GDnum2,25;
+ set @GDnum2,25;
set @GuardianHP,@KGuardian;
L4_9:
mes "[ "+getarg(0)+" ]";
@@ -384,13 +406,8 @@ L_Start:
//=======
mes "[ "+getarg(0)+" ]";
emotion 19;
- if(agitcheck(0) == 0) goto L_No_WOE;
- mes "Master.... don't you know that we can't give up this guild base during the War Of Emperium?!!";
- close;
- return 0;
- L_No_WOE:
+ if(agitcheck(0) != 0) goto sL_CantSur;
mes "Master.... Do you really want to give up this guild base?? It is not worth it master!!! Please reconsider, master!!";
-
next;
menu "Surrender Guild Base",-, "Cancel",sM_SurEnd;
@@ -405,6 +422,7 @@ L_Start:
mes "Oh well..";
next;
disablenpc "Kafra Service#"+getarg(4);
+ //killmonster getarg(1)+".gat", "Guardian_" +getarg(4)+ "::OnGuardianDied";
set @i, 0;
L_Loop:
set @i, @i + 1;
@@ -414,12 +432,17 @@ L_Start:
Announce "[" + GetGuildName(@GID) + "] has surrendered the Guild Castle [" + GetCastleName(getarg(1)+".gat") + "]",0;
MapRespawnGuildID getarg(1)+".gat",GetCastleData(getarg(1)+".gat",1),7;
return 0;
+
sM_SurEnd:
mes "[ "+getarg(0)+" ]";
mes "I knew it master!! Please, don't scare me like that again.";
emotion 33;
return 0;
+ sL_CantSur:
+ mes "Master.... don't you know that we can't give up this guild base during the War Of Emperium?!!";
+ close;
+
//==========================
M_End:
//=======
diff --git a/npc/guild/gldfunc_treasure.txt b/npc/guild/gldfunc_treasure.txt
index 187d80dd2..8f4235556 100644
--- a/npc/guild/gldfunc_treasure.txt
+++ b/npc/guild/gldfunc_treasure.txt
@@ -36,9 +36,8 @@
//================================================
-// Treasure Spawning Script
+// Treasure Spawning Function
//================================================
-
function script F_GldTreas {
if(getarg(10) == 1) goto TreasureSpawn;
diff --git a/npc/guild/nguild/nguild_dunsw.txt b/npc/guild/nguild/nguild_dunsw.txt
index 52fd1dbab..0c88d0f0c 100644
--- a/npc/guild/nguild/nguild_dunsw.txt
+++ b/npc/guild/nguild/nguild_dunsw.txt
@@ -1,16 +1,15 @@
//===== eAthena Script =======================================
//= War of Emperium Dungeon Switch for NGuild Castles
//===== By: ==================================================
-//= jAthena - kalen (1.0)
-//= 1.1 by Akaru, ho|yAnge|X, and Valaris
+//= kobra_k88
//===== Current Version: =====================================
-//= 1.2
+//= 1.0
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
//= Switch that warps guild members to the guild dungeon
//===== Additional Comments: =================================
-//Based off existing guild scripts. Do not know if it is accurate.[kobra_k88]
+//= Based off existing guild scripts. Do not know if it is accurate.[kobra_k88]
//============================================================
diff --git a/npc/guild/nguild/nguild_ev_agit.txt b/npc/guild/nguild/nguild_ev_agit.txt
index ee5b71255..d690fb348 100644
--- a/npc/guild/nguild/nguild_ev_agit.txt
+++ b/npc/guild/nguild/nguild_ev_agit.txt
@@ -1,10 +1,9 @@
//===== eAthena Script =======================================
//= War of Emperium - NGuild Wars Events
//===== By: ==================================================
-//= jAthena (1.0)
-//= 1.1 by Akaru and ho|yAnge|
+//= kobra_k88
//===== Current Version: =====================================
-//= 1.2
+//= 1.0
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
diff --git a/npc/guild/nguild/nguild_flags.txt b/npc/guild/nguild/nguild_flags.txt
index 7536bb2ac..c1b62a20e 100644
--- a/npc/guild/nguild/nguild_flags.txt
+++ b/npc/guild/nguild/nguild_flags.txt
@@ -1,10 +1,9 @@
//===== eAthena Script =======================================
//= War of Emperium N Guild Flags
//===== By: ==================================================
-//= jAthena - kalen (1.0)
-//= 1.1 by Akaru, ho|yAnge|X, and Valaris
+//= kobra_k88
//===== Current Version: =====================================
-//= 1.2
+//= 1.0
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -15,7 +14,7 @@
//============================================================================//
-// Castle 1
+// Castle 1
//============================================================================//
n_castle.gat,110,96,1 script NGuild Aldebaran#a1-1::NGuildAlde 722,{
callfunc "F_Flags","Al De Baran","nguild_alde",218,170;
@@ -46,7 +45,7 @@ nguild_alde.gat,210,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-20 722
//============================================================================//
-// Castle 2
+// Castle 2
//============================================================================//
n_castle.gat,110,109,3 script NGuild Geffen#g1-1::NGuildGef 722,{
callfunc "F_Flags","Geffen","nguild_gef",83,47;
@@ -68,7 +67,7 @@ nguild_gef.gat,64,16,4 duplicate(NGuildGef) NGuild Geffen#g1-12 722
//============================================================================//
-// Castle 3
+// Castle 3
//============================================================================//
n_castle.gat,94,109,5 script NGuild Payon#f1-1::NGuildPay 722,{
callfunc "F_Flags","Payon","nguild_pay",87,29;
@@ -90,7 +89,7 @@ nguild_pay.gat,212,108,4 duplicate(NGuildPay) NGuild Payon#f1-11 722
//=============================================================================//
-// Castle 4
+// Castle 4
//=============================================================================//
n_castle.gat,94,96,7 script NGuild Prontera#p1-1::NGuildPrt 722,{
callfunc "F_Flags","Prontera","nguild_prt",97,174;
diff --git a/npc/guild/nguild/nguild_guardians.txt b/npc/guild/nguild/nguild_guardians.txt
index 98872d9f9..0a8516bca 100644
--- a/npc/guild/nguild/nguild_guardians.txt
+++ b/npc/guild/nguild/nguild_guardians.txt
@@ -1,11 +1,9 @@
//===== eAthena Script =======================================
//= War of Emperium - nguild guardians script
//===== By: ==================================================
-//= holyAngelX (1.0)
-//= 1.1 by joedukk
-//= 1.2 by Akaru and Valaris
+//= kobra_k88
//===== Current Version: =====================================
-//= 1.2a
+//= 1.0
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
diff --git a/npc/guild/nguild/nguild_kafras.txt b/npc/guild/nguild/nguild_kafras.txt
index a302efece..17062aec9 100644
--- a/npc/guild/nguild/nguild_kafras.txt
+++ b/npc/guild/nguild/nguild_kafras.txt
@@ -1,10 +1,9 @@
//===== eAthena Script =======================================
//= War of Emperium Kafras for N Guild Castles
//===== By: ==================================================
-//= jAthena - kalen (1.0)
-//= 1.1 by Akaru, ho|yAnge|X, and Valaris
+//= kobra_k88
//===== Current Version: =====================================
-//= 1.2
+//= 1.0
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
diff --git a/npc/guild/nguild/nguild_managers.txt b/npc/guild/nguild/nguild_managers.txt
index 81377c95d..dc983bec7 100644
--- a/npc/guild/nguild/nguild_managers.txt
+++ b/npc/guild/nguild/nguild_managers.txt
@@ -1,10 +1,9 @@
//===== eAthena Script =======================================
//= War of Emperium Managers for N Guild Castles
//===== By: ==================================================
-//= jAthena - kalen (1.0)
-//= 1.1 by Akaru, ho|yAnge|X, and Valaris
+//= kobra_k88
//===== Current Version: =====================================
-//= 1.2
+//= 1.0
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -26,7 +25,7 @@ nguild_alde.gat,218,175,0 script Frolo 55,{
if(@GDnum==15) guardian "nguild_alde.gat",62,204,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",5;
if(@GDnum==16) guardian "nguild_alde.gat",113,100,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",6;
if(@GDnum==17) guardian "nguild_alde.gat",211,174,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",7;
- mes "[Arl Fredo]";
+ mes "[Frolo]";
mes "Guardian has been installed, the guardian will protect our guild base against enemies.";
close;
}
@@ -44,7 +43,7 @@ nguild_gef.gat,40,48,5 script Leiber 55,{
if(@GDnum==15) guardian "nguild_gef.gat",51,192,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",5;
if(@GDnum==16) guardian "nguild_gef.gat",49,67,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",6;
if(@GDnum==17) guardian "nguild_gef.gat",181,14,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",7;
- mes "[ Gnaucher ]";
+ mes "[Leiber]";
mes "Guardian has been installed, guardian will protect our guild base against enemies.";
close;
}
@@ -62,7 +61,7 @@ nguild_pay.gat,120,58,4 script Dundar 55,{
if(@GDnum==15) guardian "nguild_pay.gat",214,53,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",5;
if(@GDnum==16) guardian "nguild_pay.gat",69,26,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",6;
if(@GDnum==17) guardian "nguild_pay.gat",23,141,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",7;
- mes "[ Grunday ]";
+ mes "[Dundar]";
mes "Guardian has been installed, guardian will protect our guild base against enemies.";
close;
}
@@ -80,7 +79,7 @@ nguild_prt.gat,112,181,0 script Thefton 55,{
if(@GDnum==15) guardian "nguild_prt.gat",58,59,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",5;
if(@GDnum==16) guardian "nguild_prt.gat",112,200,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",6;
if(@GDnum==17) guardian "nguild_prt.gat",101,194,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",7;
- mes "[ Abrai ]";
+ mes "[Thefton]";
mes "Guardian has been installed, the guardian will protect our guild base against enemies.";
close;
}
diff --git a/npc/guild/nguild/nguild_treas.txt b/npc/guild/nguild/nguild_treas.txt
index f71f8368f..de40908e8 100644
--- a/npc/guild/nguild/nguild_treas.txt
+++ b/npc/guild/nguild/nguild_treas.txt
@@ -1,16 +1,15 @@
//===== eAthena Script =======================================
-//= War of Emperium Treasure Rooms for Al De Baran Guild Castles
+//= War of Emperium Treasure Rooms for NGuild Guild Castles
//===== By: ==================================================
-//= jAthena - kalen (1.0)
-//= 1.1 by Akaru, ho|yAnge|X, and Valaris
+//= kobra_k88
//===== Current Version: =====================================
-//= 1.2
+//= 1.0
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
//=
//===== Additional Comments: =================================
-//= v1.2 Optimized with functions.[kobra_k88]
+//= Based off existing guild scripts. Do not know if it is accurate.[kobra_k88]
//============================================================
@@ -24,9 +23,7 @@ OnRecvCastleN01:
set $@bxN01, $boxNumN01;
callfunc "F_GldTreas","nguild_alde","N01",$boxNumN01,$@bxN01,$@boxIdN01,1324,114,218,123,227,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","nguild_alde","N01",$boxNumN01,$@bxN01,$@boxIdN01,1324,114,218,123,227,0;
- end;
+
OnDied:
mapannounce "nguild_alde.gat","Treasure Chest Broken Open",17;
set $boxNumN01, $boxNumN01 -1;
@@ -50,9 +47,7 @@ OnRecvCastleN02:
set $@bxN02, $boxNumN02;
callfunc "F_GldTreas","nguild_gef","N02",$boxNumN02,$@bxN02,$@boxIdN02,1334,150,108,158,114,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","nguild_gef","N02",$boxNumN02,$@bxN02,$@boxIdN02,1334,150,108,158,114,0;
- end;
+
OnDied:
mapannounce "nguild_gef.gat","Treasure Chest Broken Open",17;
set $boxNumN02, $boxNumN02 -1;
@@ -75,9 +70,7 @@ OnRecvCastleN03:
set $@bxN03, $boxNumN03;
callfunc "F_GldTreas","nguild_pay","N03",$boxNumN03,$@bxN03,$@boxIdN03,1344,286,4,295,13,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","nguild_pay","N03",$boxNumN03,$@bxN03,$@boxIdN03,1344,286,4,295,13,0;
- end;
+
OnDied:
mapannounce "nguild_pay.gat","Treasure Chest Broken Open",17;
set $boxNumN03, $boxNumN03 -1;
@@ -100,9 +93,7 @@ OnRecvCastleN04:
set $@bxN04, $boxNumN04;
callfunc "F_GldTreas","nguild_prt","N04",$boxNumN04,$@bxN04,$@boxIdN04,1354,6,204,15,213,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","nguild_prt","N04",$boxNumN04,$@bxN04,$@boxIdN04,1354,6,204,15,213,0;
- end;
+
OnDied:
mapannounce "nguild_prt.gat","Treasure Chest Broken Open",17;
set $boxNumN04, $boxNumN04 -1;
diff --git a/npc/guild/payg/payg_treas.txt b/npc/guild/payg/payg_treas.txt
index b1e253df6..06ff7fad7 100644
--- a/npc/guild/payg/payg_treas.txt
+++ b/npc/guild/payg/payg_treas.txt
@@ -23,9 +23,7 @@ OnRecvCastlePy01:
set $@bxPy01, $boxNumPy01;
callfunc "F_GldTreas","payg_cas01","Py01",$boxNumPy01,$@bxPy01,$@boxIdPy01,1344,286,4,295,13,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","payg_cas01","Py01",$boxNumPy01,$@bxPy01,$@boxIdPy01,1344,286,4,295,13,0;
- end;
+
OnDied:
mapannounce "payg_cas01.gat","Treasure Chest Broken Open",17;
set $boxNumPy01, $boxNumPy01 -1;
@@ -48,9 +46,7 @@ OnRecvCastlePy02:
set $@bxPy02, $boxNumPy02;
callfunc "F_GldTreas","payg_cas02","Py02",$boxNumPy02,$@bxPy02,$@boxIdPy02,1346,140,140,148,149,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","payg_cas02","Py02",$boxNumPy02,$@bxPy02,$@boxIdPy02,1346,140,140,148,149,0;
- end;
+
OnDied:
mapannounce "payg_cas02.gat","Treasure Chest Broken Open",17;
set $boxNumPy02, $boxNumPy02 -1;
@@ -73,9 +69,7 @@ OnRecvCastlePy03:
set $@bxPy03, $boxNumPy03;
callfunc "F_GldTreas","payg_cas03","Py03",$boxNumPy03,$@bxPy03,$@boxIdPy03,1348,154,164,162,173,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","payg_cas03","Py03",$boxNumPy03,$@bxPy03,$@boxIdPy03,1348,154,164,162,173,0;
- end;
+
OnDied:
mapannounce "payg_cas03.gat","Treasure Chest Broken Open",17;
set $boxNumPy03, $boxNumPy03 -1;
@@ -98,9 +92,7 @@ OnRecvCastlePy04:
set $@bxPy04, $boxNumPy04;
callfunc "F_GldTreas","payg_cas04","Py04",$boxNumPy04,$@bxPy04,$@boxIdPy04,1350,142,44,151,51,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","payg_cas04","Py04",$boxNumPy04,$@bxPy04,$@boxIdPy04,1350,142,44,151,51,0;
- end;
+
OnDied:
mapannounce "payg_cas04.gat","Treasure Chest Broken Open",17;
set $boxNumPy04, $boxNumPy04 -1;
@@ -123,9 +115,7 @@ OnRecvCastlePy05:
set $@bxPy05, $boxNumPy05;
callfunc "F_GldTreas","payg_cas05","Py05",$boxNumPy05,$@bxPy05,$@boxIdPy05,1352,152,128,160,135,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","payg_cas05","Py05",$boxNumPy05,$@bxPy05,$@boxIdPy05,1352,152,128,160,135,0;
- end;
+
OnDied:
mapannounce "payg_cas05.gat","Treasure Chest Broken Open",17;
set $boxNumPy05, $boxNumPy05 -1;
diff --git a/npc/guild/prtg/prtg_treas.txt b/npc/guild/prtg/prtg_treas.txt
index 3b7376279..ed5c3211e 100644
--- a/npc/guild/prtg/prtg_treas.txt
+++ b/npc/guild/prtg/prtg_treas.txt
@@ -23,9 +23,7 @@ OnRecvCastlePt01:
set $@bxPt01, $boxNumPt01;
callfunc "F_GldTreas","prtg_cas01","Pt01",$boxNumPt01,$@bxPt01,$@boxIdPt01,1354,6,204,15,213,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","prtg_cas01","Pt01",$boxNumPt01,$@bxPt01,$@boxIdPt01,1354,6,204,15,213,0;
- end;
+
OnDied:
mapannounce "prtg_cas01.gat","Treasure Chest Broken Open",17;
set $boxNumPt01, $boxNumPt01 -1;
@@ -49,9 +47,7 @@ OnRecvCastlePt02:
set $@bxPt02, $boxNumPt02;
callfunc "F_GldTreas","prtg_cas02","Pt02",$boxNumPt02,$@bxPt02,$@boxIdPt02,1356,198,224,207,233,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","prtg_cas02","Pt02",$boxNumPt02,$@bxPt02,$@boxIdPt02,1356,198,224,207,233,0;
- end;
+
OnDied:
mapannounce "prtg_cas02.gat","Treasure Chest Broken Open",17;
set $boxNumPt02, $boxNumPt02 -1;
@@ -75,9 +71,7 @@ OnRecvCastlePt03:
set $@bxPt03, $boxNumPt03;
callfunc "F_GldTreas","prtg_cas03","Pt03",$boxNumPt03,$@bxPt03,$@boxIdPt03,1358,184,128,193,135,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","prtg_cas03","Pt03",$boxNumPt03,$@bxPt03,$@boxIdPt03,1358,184,128,193,135,0;
- end;
+
OnDied:
mapannounce "prtg_cas03.gat","Treasure Chest Broken Open",17;
set $boxNumPt03, $boxNumPt03 -1;
@@ -101,9 +95,7 @@ OnRecvCastlePt04:
set $@bxPt04, $boxNumPt04;
callfunc "F_GldTreas","prtg_cas04","Pt04",$boxNumPt04,$@bxPt04,$@boxIdPt04,1360,266,158,275,167,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","prtg_cas04","Pt04",$boxNumPt04,$@bxPt04,$@boxIdPt04,1360,266,158,275,167,0;
- end;
+
OnDied:
mapannounce "prtg_cas04.gat","Treasure Chest Broken Open",17;
set $boxNumPt04, $boxNumPt04 -1;
@@ -127,9 +119,7 @@ OnRecvCastlePt05:
set $@bxPt05, $boxNumPt05;
callfunc "F_GldTreas","prtg_cas05","Pt05",$boxNumPt05,$@bxPt05,$@boxIdPt05,1362,272,174,279,181,1;
end;
-OnClock1200:
- callfunc "F_GldTreas","prtg_cas05","Pt05",$boxNumPt05,$@bxPt05,$@boxIdPt05,1362,272,174,279,181,0;
- end;
+
OnDied:
mapannounce "prtg_cas05.gat","Treasure Chest Broken Open",17;
set $boxNumPt05, $boxNumPt05 -1;