summaryrefslogtreecommitdiff
path: root/npc/guild
diff options
context:
space:
mode:
Diffstat (limited to 'npc/guild')
-rw-r--r--npc/guild/aldeg/aldeg_ev_agit.txt10
-rw-r--r--npc/guild/ev_agit_event.txt60
-rw-r--r--npc/guild/gefg/gefg_ev_agit.txt10
-rw-r--r--npc/guild/gefg/gefg_flags.txt15
-rw-r--r--npc/guild/gefg/gefg_kafras.txt15
-rw-r--r--npc/guild/gldfunc_dunsw.txt11
-rw-r--r--npc/guild/gldfunc_manager.txt13
-rw-r--r--npc/guild/gldfunc_treasure.txt32
-rw-r--r--npc/guild/nguild/nguild_ev_agit.txt8
-rw-r--r--npc/guild/payg/payg_ev_agit.txt10
-rw-r--r--npc/guild/payg/payg_flags.txt15
-rw-r--r--npc/guild/payg/payg_guardians.txt2
-rw-r--r--npc/guild/payg/payg_managers.txt2
-rw-r--r--npc/guild/prtg/prtg_ev_agit.txt10
-rw-r--r--npc/guild/prtg/prtg_flags.txt15
-rw-r--r--npc/guild/prtg/prtg_kafras.txt2
16 files changed, 150 insertions, 80 deletions
diff --git a/npc/guild/aldeg/aldeg_ev_agit.txt b/npc/guild/aldeg/aldeg_ev_agit.txt
index 8287ad417..942e479b7 100644
--- a/npc/guild/aldeg/aldeg_ev_agit.txt
+++ b/npc/guild/aldeg/aldeg_ev_agit.txt
@@ -16,7 +16,7 @@
// Castle 1 ================================================================
aldeg_cas01.gat,216,24,0 script Agit_A01 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "aldeg_cas01.gat",0,"::OnRecvCastleA01";
end;
OnRecvCastleA01:
@@ -39,7 +39,7 @@ OnAgitEnd:
// Castle 2 ================================================================
aldeg_cas02.gat,214,24,0 script Agit_A02 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "aldeg_cas02.gat",0,"::OnRecvCastleA02";
end;
OnRecvCastleA02:
@@ -62,7 +62,7 @@ OnAgitEnd:
// Castle 3 ================================================================
aldeg_cas03.gat,206,32,0 script Agit_A03 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "aldeg_cas03.gat",0,"::OnRecvCastleA03";
end;
OnRecvCastleA03:
@@ -85,7 +85,7 @@ OnAgitEnd:
// Castle 4 ================================================================
aldeg_cas04.gat,36,218,0 script Agit_A04 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "aldeg_cas04.gat",0,"::OnRecvCastleA04";
end;
OnRecvCastleA04:
@@ -108,7 +108,7 @@ OnAgitEnd:
// Castle 5 ================================================================
aldeg_cas05.gat,28,102,0 script Agit_A05 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "aldeg_cas05.gat",0,"::OnRecvCastleA05";
end;
OnRecvCastleA05:
diff --git a/npc/guild/ev_agit_event.txt b/npc/guild/ev_agit_event.txt
index cf31057a3..2696d5864 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.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -19,6 +19,8 @@
//= v1.3 Moved treasure spawn time here.[kobra_k88]
//= v1.3a Implemented Shadowlady's idea to allow for different
//= start/stop times on different days.[kobra_k88]
+//= 1.4 Fixed treasure chests spawn! We had to unroll some loops
+//= Now they appear in castles from 00:01 to 00:24. [Lupus]
//============================================================
// WoE Start/Stop times
@@ -34,7 +36,7 @@ OnAgitInit:
if((gettime(4)==2) && (gettime(3)>=21 && gettime(3)<23)) goto L_Start;
if((gettime(4)==4) && (gettime(3)>=21 && gettime(3)<23)) goto L_Start;
if((gettime(4)==6) && (gettime(3)>=16 && gettime(3)<18)) goto L_Start;
- if(gettime(4)!=2 || gettime(4)!=4 || gettime(4)!=6) end; //stops script on non woe day
+ if(gettime(4)!=2 && gettime(4)!=4 && gettime(4)!=6) end; //stops script on non woe day
Announce "The War Of Emperium is over!",8;
AgitEnd;
@@ -51,34 +53,76 @@ L_Start:
- script TreasSpawn -1,{
end;
-OnClock0000:
+OnClock0001:
callfunc "F_GldTreas","aldeg_cas01","A01",$boxNumA01,$@bxA01,$@boxIdA01,1324,114,218,123,227,0;
+ end;
+OnClock0002:
callfunc "F_GldTreas","aldeg_cas02","A02",$boxNumA02,$@bxA02,$@boxIdA02,1326,130,226,138,235,0;
+ end;
+OnClock0003:
callfunc "F_GldTreas","aldeg_cas03","A03",$boxNumA03,$@bxA03,$@boxIdA03,1328,220,264,229,273,0;
+ end;
+OnClock0004:
callfunc "F_GldTreas","aldeg_cas04","A04",$boxNumA04,$@bxA04,$@boxIdA04,1330,80,8,89,17,0;
+ end;
+OnClock0005:
callfunc "F_GldTreas","aldeg_cas05","A05",$boxNumA05,$@bxA05,$@boxIdA05,1332,58,8,65,15,0;
-
+ end;
+OnClock0006:
callfunc "F_GldTreas","gefg_cas01","G01",$boxNumG01,$@bxG01,$@boxIdG01,1334,150,108,158,114,0;
+ end;
+OnClock0007:
callfunc "F_GldTreas","gefg_cas02","G02",$boxNumG02,$@bxG02,$@boxIdG02,1336,136,112,145,118,0;
+ end;
+OnClock0008:
callfunc "F_GldTreas","gefg_cas03","G03",$boxNumG03,$@bxG03,$@boxIdG03,1338,266,286,275,293,0;
+ end;
+OnClock0009:
callfunc "F_GldTreas","gefg_cas04","G04",$boxNumG04,$@bxG04,$@boxIdG04,1340,112,114,119,123,0;
+ end;
+OnClock0010:
callfunc "F_GldTreas","gefg_cas05","G05",$boxNumG05,$@bxG05,$@boxIdG05,1342,140,106,147,113,0;
-
+ end;
+OnClock0011:
callfunc "F_GldTreas","payg_cas01","Py01",$boxNumPy01,$@bxPy01,$@boxIdPy01,1344,286,4,295,13,0;
+ end;
+OnClock0012:
callfunc "F_GldTreas","payg_cas02","Py02",$boxNumPy02,$@bxPy02,$@boxIdPy02,1346,140,140,148,149,0;
+ end;
+OnClock0013:
callfunc "F_GldTreas","payg_cas03","Py03",$boxNumPy03,$@bxPy03,$@boxIdPy03,1348,154,164,162,173,0;
+ end;
+OnClock0014:
callfunc "F_GldTreas","payg_cas04","Py04",$boxNumPy04,$@bxPy04,$@boxIdPy04,1350,142,44,151,51,0;
+ end;
+OnClock0015:
callfunc "F_GldTreas","payg_cas05","Py05",$boxNumPy05,$@bxPy05,$@boxIdPy05,1352,152,128,160,135,0;
-
+ end;
+OnClock0016:
callfunc "F_GldTreas","prtg_cas01","Pt01",$boxNumPt01,$@bxPt01,$@boxIdPt01,1354,6,204,15,213,0;
+ end;
+OnClock0017:
callfunc "F_GldTreas","prtg_cas02","Pt02",$boxNumPt02,$@bxPt02,$@boxIdPt02,1356,198,224,207,233,0;
+ end;
+OnClock0018:
callfunc "F_GldTreas","prtg_cas03","Pt03",$boxNumPt03,$@bxPt03,$@boxIdPt03,1358,184,128,193,135,0;
+ end;
+OnClock0019:
callfunc "F_GldTreas","prtg_cas04","Pt04",$boxNumPt04,$@bxPt04,$@boxIdPt04,1360,266,158,275,167,0;
+ end;
+OnClock0020:
callfunc "F_GldTreas","prtg_cas05","Pt05",$boxNumPt05,$@bxPt05,$@boxIdPt05,1362,272,174,279,181,0;
-
+ end;
+OnClock0021:
callfunc "F_GldTreas","nguild_alde","N01",$boxNumN01,$@bxN01,$@boxIdN01,1324,114,218,123,227,0;
+ end;
+OnClock0022:
callfunc "F_GldTreas","nguild_gef","N02",$boxNumN02,$@bxN02,$@boxIdN02,1334,150,108,158,114,0;
+ end;
+OnClock0023:
callfunc "F_GldTreas","nguild_pay","N03",$boxNumN03,$@bxN03,$@boxIdN03,1344,286,4,295,13,0;
+ end;
+OnClock0024:
callfunc "F_GldTreas","nguild_prt","N04",$boxNumN04,$@bxN04,$@boxIdN04,1354,6,204,15,213,0;
end;
-}
+} \ No newline at end of file
diff --git a/npc/guild/gefg/gefg_ev_agit.txt b/npc/guild/gefg/gefg_ev_agit.txt
index 5be223f03..3ac4c7432 100644
--- a/npc/guild/gefg/gefg_ev_agit.txt
+++ b/npc/guild/gefg/gefg_ev_agit.txt
@@ -16,7 +16,7 @@
// Castle 1 ================================================================
gefg_cas01.gat,198,182,0 script Agit_G01 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "gefg_cas01.gat",0,"::OnRecvCastleG01";
end;
OnRecvCastleG01:
@@ -39,7 +39,7 @@ OnAgitEnd:
// Castle 2 ================================================================
gefg_cas02.gat,176,178,0 script Agit_G02 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "gefg_cas02.gat",0,"::OnRecvCastleG02";
end;
OnRecvCastleG02:
@@ -62,7 +62,7 @@ OnAgitEnd:
// Castle 3 ================================================================
gefg_cas03.gat,245,167,0 script Agit_G03 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "gefg_cas03.gat",0,"::OnRecvCastleG03";
end;
OnRecvCastleG03:
@@ -85,7 +85,7 @@ OnAgitEnd:
// Castle 4 ================================================================
gefg_cas04.gat,174,178,0 script Agit_G04 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "gefg_cas04.gat",0,"::OnRecvCastleG04";
end;
OnRecvCastleG04:
@@ -108,7 +108,7 @@ OnAgitEnd:
// Castle 5 ================================================================
gefg_cas05.gat,194,184,0 script Agit_G05 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "gefg_cas05.gat",0,"::OnRecvCastleG05";
end;
OnRecvCastleG05:
diff --git a/npc/guild/gefg/gefg_flags.txt b/npc/guild/gefg/gefg_flags.txt
index 8f1e30d0c..bad3a95a8 100644
--- a/npc/guild/gefg/gefg_flags.txt
+++ b/npc/guild/gefg/gefg_flags.txt
@@ -17,8 +17,7 @@
//================================================================================//
// Castle 1
//================================================================================//
-geffen.gat,109,123,2 script Reprion#g1-1::Reprion 722,
-{
+geffen.gat,109,123,2 script Reprion#g1-1::Reprion 722,{
callfunc "F_Flags","Geffen","gefg_cas01",83,47;
close;
@@ -45,8 +44,7 @@ gefg_cas01.gat,64,16,4 duplicate(Reprion) Reprion#g1-12 722
//===================================================================================//
// Castle 2
//===================================================================================//
-geffen.gat,112,129,1 script Yolbriger#g2-1::Yolbriger 722,
-{
+geffen.gat,112,129,1 script Yolbriger#g2-1::Yolbriger 722,{
callfunc "F_Flags","Geffen","gefg_cas02",23,66;
close;
@@ -73,8 +71,7 @@ gefg_cas02.gat,68,36,2 duplicate(Yolbriger) Yolbriger#g2-12 722
//================================================================================//
// Castle 3
//================================================================================//
-geffen.gat,120,132,8 script Isinlife#g3-1::Isinlife 722,
-{
+geffen.gat,120,132,8 script Isinlife#g3-1::Isinlife 722,{
callfunc "F_Flags","Geffen","gefg_cas03",116,89;
close;
@@ -104,8 +101,7 @@ gefg_cas03.gat,34,208,1 duplicate(Isinlife) Isinlife#g3-15 722
//================================================================================//
// Castle 4
//================================================================================//
-geffen.gat,127,130,7 script Berigel#g4-1::Berigel 722,
-{
+geffen.gat,127,130,7 script Berigel#g4-1::Berigel 722,{
callfunc "F_Flags","Geffen","gefg_cas04",59,70;
close;
@@ -131,8 +127,7 @@ gefg_cas04.gat,35,73,4 duplicate(Berigel) Berigel#g4-11 722
//================================================================================//
// Castle 5
//================================================================================//
-geffen.gat,131,123,6 script Melsedetsu#g5-1::Melsedetsu 722,
-{
+geffen.gat,131,123,6 script Melsedetsu#g5-1::Melsedetsu 722,{
callfunc "F_Flags","Geffen","gefg_cas05",61,52;
close;
diff --git a/npc/guild/gefg/gefg_kafras.txt b/npc/guild/gefg/gefg_kafras.txt
index 94eaa093a..82daa84cb 100644
--- a/npc/guild/gefg/gefg_kafras.txt
+++ b/npc/guild/gefg/gefg_kafras.txt
@@ -17,8 +17,7 @@
// Castle 1 ===============================================
//gefg_cas01.gat,96,173,0 script Kafra Service#G01 117,{
-gefg_cas01.gat,35,37,0 script Kafra Service#G01 117,
-{
+gefg_cas01.gat,35,37,0 script Kafra Service#G01 117,{
callfunc "F_GKafra", "gefg_cas01", "Geffen";
end;
OnRecvCastleG01:
@@ -28,8 +27,7 @@ OnRecvCastleG01:
// Castle 2 ===============================================
-gefg_cas02.gat,23,66,3 script Kafra Service#G02 117,
-{
+gefg_cas02.gat,23,66,3 script Kafra Service#G02 117,{
callfunc "F_GKafra", "gefg_cas02", "Geffen";
end;
OnRecvCastleG02:
@@ -39,8 +37,7 @@ OnRecvCastleG02:
// Castle 3 ===============================================
-gefg_cas03.gat,116,89,5 script Kafra Service#G03 117,
-{
+gefg_cas03.gat,116,89,5 script Kafra Service#G03 117,{
callfunc "F_GKafra", "gefg_cas03", "Geffen";
end;
OnRecvCastleG03:
@@ -50,8 +47,7 @@ OnRecvCastleG03:
// Castle 4 ===============================================
-gefg_cas04.gat,59,70,3 script Kafra Service#G04 117,
-{
+gefg_cas04.gat,59,70,3 script Kafra Service#G04 117,{
callfunc "F_GKafra", "gefg_cas04", "Geffen";
end;
OnRecvCastleG04:
@@ -61,8 +57,7 @@ OnRecvCastleG04:
// Castle 5 ===============================================
-gefg_cas05.gat,61,52,5 script Kafra Service#G05 117,
-{
+gefg_cas05.gat,61,52,5 script Kafra Service#G05 117,{
callfunc "F_GKafra", "gefg_cas05", "Geffen";
end;
OnRecvCastleG05:
diff --git a/npc/guild/gldfunc_dunsw.txt b/npc/guild/gldfunc_dunsw.txt
index 6d954c639..a23978515 100644
--- a/npc/guild/gldfunc_dunsw.txt
+++ b/npc/guild/gldfunc_dunsw.txt
@@ -4,7 +4,7 @@
//= jAthena - kalen (1.0)
//= 1.1 by Akaru, ho|yAnge|X, and Valaris
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -16,7 +16,12 @@
//= arg(2): x1 coordinate for warp
//= arg(3): y1 coordinate for warp
//===== Additional Comments: =================================
-//= v1.2: All guild Dungeon Switch npcs use this function.[kobra_k88]
+//= 1.2: All guild Dungeon Switch npcs use this function.[kobra_k88]
+//= 1.3 Reverted back. Don't listen to ... people at forums
+ and check all bugs yourself!
+ Some not competent people try to change gld_dun -> gld_dun0
+ IT is wrong, because we already supple "02","03",etc as suffix.
+ [Lupus]
//============================================================
//==================================================
@@ -30,7 +35,7 @@ function script F_GldDunSw {
menu "Yes",-,"No",M_No;
set @GID, GetCastleData(getarg(0)+".gat",1);
- if (getcharid(2) != @GID) goto L_NotGLead;
+ if (@GID == 0 || getcharid(2) != @GID) goto L_NotGLead;
warp "gld_dun"+getarg(1)+".gat",getarg(2),getarg(3);
end;
diff --git a/npc/guild/gldfunc_manager.txt b/npc/guild/gldfunc_manager.txt
index de47fbeab..29ce59054 100644
--- a/npc/guild/gldfunc_manager.txt
+++ b/npc/guild/gldfunc_manager.txt
@@ -4,7 +4,7 @@
//= jAthena - kalen (1.0)
//= 1.1 by Akaru, ho|yAnge|X, and Valaris
//===== Current Version: =====================================
-//= 1.2b
+//= 1.31
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -19,6 +19,7 @@
//= arg(3): y1 coordinate for warp to treasure room
//= arg(4): guild script suffix for kafra, gaurdian scripts etc.
//===== Additional Comments: =================================
+//= v1.31: Added support for Emsolute Develop [celest]
//= v1.2: All Guild manager scripts use this function. Optimized
//= Comerce and Defense investment. [kobra_k88]
//= v1.2a Function now returns to script that called it.
@@ -27,6 +28,7 @@
//= 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]
+//= 1.3 Now you can't install Guardians during WOE [Lupus]
//============================================================
@@ -115,6 +117,8 @@ L_Start:
set Zeny,Zeny-@eco_invest;
SetCastleData getarg(1)+".gat",4,@TriggerE+1;
SetCastleData getarg(1)+".gat",2,@Economy+1;
+ // if we learnt Emsolute Develop there's a chance to get +1 investment again
+ if (getgdskilllv(@GID,10014) > 0 && rand(100)>50) set @Economy, @Economy + 1;
mes "[ "+getarg(0)+" ]";
mes "You have invested successfully.";
return 0;
@@ -171,6 +175,8 @@ L_Start:
SetCastleData getarg(1)+".gat",3,@Defence+1;
// set new hp values for guardians
set @Defence, @Defence + 1;
+ // if we learnt Emsolute Develop there's a chance to get +1 investment again
+ if (getgdskilllv(@GID,10014) > 0 && rand(100)>50) set @Defence, @Defence + 1;
set @AGuardian, 28634 + (@Defence*2000);
set @KGuardian, 30214 + (@Defence*2000);
set @SGuardian, 15670 + (@Defence*2000);
@@ -222,6 +228,7 @@ L_Start:
//set @SGuardian,strmobinfo(4,1287) + (@Defence*2000);
mes "[ "+getarg(0)+" ]";
+ if(agitcheck(0) != 0) goto L_CantGuard;
mes "Would you like to install a guardian? Guardians will protect the guild base from enemies.";
mes "Please choose a guardian.";
next;
@@ -308,6 +315,10 @@ L_Start:
mes "Excuse me Master, but that guardian has already been installed.....";
emotion 4;
return 0;
+ L_CantGuard:
+ mes "Master.... don't you know that we can't install guardians during the War Of Emperium?!!";
+ emotion 4;
+ return 0;
//===========================
M_Kaf:
diff --git a/npc/guild/gldfunc_treasure.txt b/npc/guild/gldfunc_treasure.txt
index 8f4235556..c1d0f62bd 100644
--- a/npc/guild/gldfunc_treasure.txt
+++ b/npc/guild/gldfunc_treasure.txt
@@ -4,7 +4,7 @@
//= holyAngelX (1.0)
//= 1.1 by Akaru and ho|yAnge|X
//===== Current Version: =====================================
-//= 1.2b
+//= 1.3
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -32,6 +32,7 @@
//= v1.2a Function now returns to script that called it. Removed TreasureSpawn2.
//= Changed back to using specific global variables for number of boxes and the box id. [kobra_k88]
//= v1.2b Added a check to allow un broken treasure chests to respawn after map server restart.[kobra_k88]
+//= 1.3 Fixed treasure boxes spawn. (Unrolled one loop a bit) [Lupus]
//============================================================
@@ -51,6 +52,35 @@ function script F_GldTreas {
set getarg(3), getarg(2); //sets the counter variable = to the box number amount
TreasureSpawn:
+
+ set getarg(4), getarg(5); //sets the box id variable = to the box id
+ set $@temp, rand(4);
+ if ($@temp > 2) set getarg(4), getarg(4) + 1;
+ areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
+ set getarg(3), getarg(3) - 1;
+ if(getarg(3) <= 0) return;
+
+ set getarg(4), getarg(5); //sets the box id variable = to the box id
+ set $@temp, rand(4);
+ if ($@temp > 2) set getarg(4), getarg(4) + 1;
+ areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
+ set getarg(3), getarg(3) - 1;
+ if(getarg(3) <= 0) return;
+
+ set getarg(4), getarg(5); //sets the box id variable = to the box id
+ set $@temp, rand(4);
+ if ($@temp > 2) set getarg(4), getarg(4) + 1;
+ areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
+ set getarg(3), getarg(3) - 1;
+ if(getarg(3) <= 0) return;
+
+ set getarg(4), getarg(5); //sets the box id variable = to the box id
+ set $@temp, rand(4);
+ if ($@temp > 2) set getarg(4), getarg(4) + 1;
+ areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
+ set getarg(3), getarg(3) - 1;
+ if(getarg(3) <= 0) return;
+
set getarg(4), getarg(5); //sets the box id variable = to the box id
set $@temp, rand(4);
if ($@temp > 2) set getarg(4), getarg(4) + 1;
diff --git a/npc/guild/nguild/nguild_ev_agit.txt b/npc/guild/nguild/nguild_ev_agit.txt
index d690fb348..84074a72b 100644
--- a/npc/guild/nguild/nguild_ev_agit.txt
+++ b/npc/guild/nguild/nguild_ev_agit.txt
@@ -15,7 +15,7 @@
// Castle 1 ================================================================
nguild_alde.gat,0,0,0 script Agit_N01 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "nguild_alde.gat",0,"::OnRecvCastleN01";
end;
OnRecvCastleN01:
@@ -38,7 +38,7 @@ OnAgitEnd:
// Castle 2 ================================================================
nguild_gef.gat,0,0,0 script Agit_N02 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "nguild_gef.gat",0,"::OnRecvCastleN02";
end;
OnRecvCastleN02:
@@ -61,7 +61,7 @@ OnAgitEnd:
// Castle 3 ================================================================
nguild_pay.gat,0,0,0 script Agit_N03 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "nguild_pay.gat",0,"::OnRecvCastleN03";
end;
OnRecvCastleN03:
@@ -84,7 +84,7 @@ OnAgitEnd:
// Castle 4 ================================================================
nguild_prt.gat,0,0,0 script Agit_N04 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "nguild_prt.gat",0,"::OnRecvCastleN04";
end;
OnRecvCastleN04:
diff --git a/npc/guild/payg/payg_ev_agit.txt b/npc/guild/payg/payg_ev_agit.txt
index a873f9bea..95b735ed9 100644
--- a/npc/guild/payg/payg_ev_agit.txt
+++ b/npc/guild/payg/payg_ev_agit.txt
@@ -16,7 +16,7 @@
// Castle 1 ================================================================
payg_cas01.gat,139,139,0 script Agit_Py01 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "payg_cas01.gat",0,"::OnRecvCastlePy01";
end;
OnRecvCastlePy01:
@@ -39,7 +39,7 @@ OnAgitEnd:
// Castle 2 ================================================================
payg_cas02.gat,39,25,0 script Agit_Py02 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "payg_cas02.gat",0,"::OnRecvCastlePy02";
end;
OnRecvCastlePy02:
@@ -62,7 +62,7 @@ OnAgitEnd:
// Castle 3 ================================================================
payg_cas03.gat,269,265,0 script Agit_Py03 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "payg_cas03.gat",0,"::OnRecvCastlePy03";
end;
OnRecvCastlePy03:
@@ -85,7 +85,7 @@ OnAgitEnd:
// Castle 4 ================================================================
payg_cas04.gat,271,29,0 script Agit_Py04 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "payg_cas04.gat",0,"::OnRecvCastlePy04";
end;
OnRecvCastlePy04:
@@ -108,7 +108,7 @@ OnAgitEnd:
// Castle 5 ================================================================
payg_cas05.gat,30,30,0 script Agit_Py05 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "payg_cas05.gat",0,"::OnRecvCastlePy05";
end;
OnRecvCastlePy05:
diff --git a/npc/guild/payg/payg_flags.txt b/npc/guild/payg/payg_flags.txt
index 619cddaf7..2d553a45b 100644
--- a/npc/guild/payg/payg_flags.txt
+++ b/npc/guild/payg/payg_flags.txt
@@ -17,8 +17,7 @@
//============================================================================//
// Castle 1
//============================================================================//
-payon.gat,165,177,3 script Mingting#f1-1::Mingting 722,
-{
+payon.gat,165,177,3 script Mingting#f1-1::Mingting 722,{
callfunc "F_Flags","Payon","payg_cas01",87,29;
close;
@@ -44,8 +43,7 @@ payg_cas01.gat,212,108,4 duplicate(Mingting) Mingting#f1-11 722
//===========================================================================//
// Castle 2
//============================================================================//
-payon.gat,165,173,3 script Tiantan#f2-1::Tiantan 722,
-{
+payon.gat,165,173,3 script Tiantan#f2-1::Tiantan 722,{
callfunc "F_Flags","Payon","payg_cas02",25,266;
close;
@@ -71,8 +69,7 @@ payg_cas02.gat,70,282,4 duplicate(Tiantan) Tiantan#f2-11 722
//============================================================================//
// Castle 3
//============================================================================//
-payon.gat,165,169,3 script Fuying#f3-1::Fuying 722,
-{
+payon.gat,165,169,3 script Fuying#f3-1::Fuying 722,{
callfunc "F_Flags","Payon","payg_cas03",9,263;
close;
@@ -98,8 +95,7 @@ payg_cas03.gat,43,31,4 duplicate(Fuying) Fuying#f3-11 722
//============================================================================//
// Castle 4
//============================================================================//
-payon.gat,165,165,3 script Honglou#f4-1::Honglou 722,
-{
+payon.gat,165,165,3 script Honglou#f4-1::Honglou 722,{
callfunc "F_Flags","Payon","payg_cas04",40,235;
close;
@@ -125,8 +121,7 @@ payg_cas04.gat,239,181,4 duplicate(Honglou) Honglou#f4-11 722
//============================================================================//
// Castle 5
//============================================================================//
-payon.gat,165,161,3 script Zhulinxian#f5-1::Zhulinxian 722,
-{
+payon.gat,165,161,3 script Zhulinxian#f5-1::Zhulinxian 722,{
callfunc "F_Flags","Payon","payg_cas05",276,227;
close;
diff --git a/npc/guild/payg/payg_guardians.txt b/npc/guild/payg/payg_guardians.txt
index 02243dfad..45bcd926d 100644
--- a/npc/guild/payg/payg_guardians.txt
+++ b/npc/guild/payg/payg_guardians.txt
@@ -94,7 +94,7 @@ OnAgitInit:
if (GetCastleData("payg_cas05.gat",10) == 1) guardian "payg_cas05.gat",51,258,"Soldier Guardian",1287,1,"Guardian_Py05::OnGuardianDied",0;
if (GetCastleData("payg_cas05.gat",11) == 1) guardian "payg_cas05.gat",286,235,"Soldier Guardian",1287,1,"Guardian_Py05::OnGuardianDied",1;
if (GetCastleData("payg_cas05.gat",12) == 1) guardian "payg_cas05.gat",282,277,"Soldier Guardian",1287,1,"Guardian_Py05::OnGuardianDied",2;
- if (GetCastleData("payg_cas05.gat",13) == 1) guardian "payg_cas05.gat",46,273,"Archer Guardian",1285,1,"Guardian_Py05::OnGuardianDied",3;
+ if (GetCastleData("payg_cas05.gat",13) == 1) guardian "payg_cas05.gat",18,281,"Archer Guardian",1285,1,"Guardian_Py05::OnGuardianDied",3;
if (GetCastleData("payg_cas05.gat",14) == 1) guardian "payg_cas05.gat",289,256,"Archer Guardian",1285,1,"Guardian_Py05::OnGuardianDied",4;
if (GetCastleData("payg_cas05.gat",15) == 1) guardian "payg_cas05.gat",275,42,"Knight Guardian",1286,1,"Guardian_Py05::OnGuardianDied",5;
if (GetCastleData("payg_cas05.gat",16) == 1) guardian "payg_cas05.gat",254,9,"Knight Guardian",1286,1,"Guardian_Py05::OnGuardianDied",6;
diff --git a/npc/guild/payg/payg_managers.txt b/npc/guild/payg/payg_managers.txt
index cc888975f..73d383ba4 100644
--- a/npc/guild/payg/payg_managers.txt
+++ b/npc/guild/payg/payg_managers.txt
@@ -93,7 +93,7 @@ payg_cas05.gat,277,249,3 script Najarf 55,{
if(@GDnum==10) guardian "payg_cas05.gat",51,258,"Soldier Guardian",1287,1,"Guardian_Py05::OnGuardianDied",0;
if(@GDnum==11) guardian "payg_cas05.gat",286,235,"Soldier Guardian",1287,1,"Guardian_Py05::OnGuardianDied",1;
if(@GDnum==12) guardian "payg_cas05.gat",282,277,"Soldier Guardian",1287,1,"Guardian_Py05::OnGuardianDied",2;
- if(@GDnum==13) guardian "payg_cas05.gat",46,273,"Archer Guardian",1285,1,"Guardian_Py05::OnGuardianDied",3;
+ if(@GDnum==13) guardian "payg_cas05.gat",18,281,"Archer Guardian",1285,1,"Guardian_Py05::OnGuardianDied",3;
if(@GDnum==14) guardian "payg_cas05.gat",289,256,"Archer Guardian",1285,1,"Guardian_Py05::OnGuardianDied",4;
if(@GDnum==15) guardian "payg_cas05.gat",275,42,"Knight Guardian",1286,1,"Guardian_Py05::OnGuardianDied",5;
if(@GDnum==16) guardian "payg_cas05.gat",254,9,"Knight Guardian",1286,1,"Guardian_Py05::OnGuardianDied",6;
diff --git a/npc/guild/prtg/prtg_ev_agit.txt b/npc/guild/prtg/prtg_ev_agit.txt
index 6c83ad390..b654aa037 100644
--- a/npc/guild/prtg/prtg_ev_agit.txt
+++ b/npc/guild/prtg/prtg_ev_agit.txt
@@ -16,7 +16,7 @@
// Castle 1 ================================================================
prtg_cas01.gat,197,197,0 script Agit_Pt01 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "prtg_cas01.gat",0,"::OnRecvCastlePt01";
end;
OnRecvCastlePt01:
@@ -39,7 +39,7 @@ OnAgitEnd:
// Castle 2 ================================================================
prtg_cas02.gat,158,174,0 script Agit_Pt02 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "prtg_cas02.gat",0,"::OnRecvCastlePt02";
end;
OnRecvCastlePt02:
@@ -62,7 +62,7 @@ OnAgitEnd:
// Castle 3 ================================================================
prtg_cas03.gat,17,221,0 script Agit_Pt03 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "prtg_cas03.gat",0,"::OnRecvCastlePt03";
end;
OnRecvCastlePt03:
@@ -85,7 +85,7 @@ OnAgitEnd:
// Castle 4 ================================================================
prtg_cas04.gat,292,14,0 script Agit_Pt04 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "prtg_cas04.gat",0,"::OnRecvCastlePt04";
end;
OnRecvCastlePt04:
@@ -108,7 +108,7 @@ OnAgitEnd:
// Castle 5 ================================================================
prtg_cas05.gat,266,266,0 script Agit_Pt05 -1,{
-OnInterIfInit:
+OnInterIfInitOnce:
GetCastleData "prtg_cas05.gat",0,"::OnRecvCastlePt05";
end;
OnRecvCastlePt05:
diff --git a/npc/guild/prtg/prtg_flags.txt b/npc/guild/prtg/prtg_flags.txt
index c43d2b2ec..c277d1907 100644
--- a/npc/guild/prtg/prtg_flags.txt
+++ b/npc/guild/prtg/prtg_flags.txt
@@ -17,8 +17,7 @@
//================================================================================//
// Castle 1
//================================================================================//
-prontera.gat,155,190,4 script Creamhilt#p1-1::Creamhilt 722,
-{
+prontera.gat,155,190,4 script Creamhilt#p1-1::Creamhilt 722,{
callfunc "F_Flags","Prontera","prtg_cas01",97,174;
close;
@@ -49,8 +48,7 @@ prtg_cas01.gat,45,46,4 duplicate(Creamhilt) Creamhilt#p1-16 722
//================================================================================//
// Castle 2
//================================================================================//
-prontera.gat,146,194,3 script Sbanhealt#p2-1::Sbanhealt 722,
-{
+prontera.gat,146,194,3 script Sbanhealt#p2-1::Sbanhealt 722,{
callfunc "F_Flags","Prontera","prtg_cas02",71,36;
close;
@@ -84,8 +82,7 @@ prtg_cas02.gat,162,161,4 duplicate(Sbanhealt) Sbanhealt#p2-18 722
//================================================================================//
// Castle 3
//================================================================================//
-prontera.gat,143,203,2 script Lazrigees#p3-1::Lazrigees 722,
-{
+prontera.gat,143,203,2 script Lazrigees#p3-1::Lazrigees 722,{
callfunc "F_Flags","Prontera","prtg_cas03",45,99;
close;
@@ -116,8 +113,7 @@ prtg_cas03.gat,165,201,4 duplicate(Lazrigees) Lazrigees#p3-16 722
//================================================================================//
// Castle 4
//================================================================================//
-prontera.gat,167,203,6 script Squagul#p4-1::Squagul 722,
-{
+prontera.gat,167,203,6 script Squagul#p4-1::Squagul 722,{
callfunc "F_Flags","Prontera","prtg_cas04",259,265;
close;
@@ -149,8 +145,7 @@ prtg_cas04.gat,263,27,4 duplicate(Squagul) Squagul#p4-16 722
//================================================================================//
// Castle 5
//================================================================================//
-prontera.gat,165,194,5 script Guindull#p5-1::Guindull 722,
-{
+prontera.gat,165,194,5 script Guindull#p5-1::Guindull 722,{
callfunc "F_Flags","Prontera","prtg_cas05",34,30;
close;
diff --git a/npc/guild/prtg/prtg_kafras.txt b/npc/guild/prtg/prtg_kafras.txt
index b14db6b9e..ace8cb1c3 100644
--- a/npc/guild/prtg/prtg_kafras.txt
+++ b/npc/guild/prtg/prtg_kafras.txt
@@ -36,7 +36,7 @@ OnRecvCastlePt02:
// Castle 3 ========================
-//prtg_cas03.gat,181,215,4 script Kafra Service#Pt03 117,
+//prtg_cas03.gat,181,215,4 script Kafra Service#Pt03 117,{
prtg_cas03.gat,39,99,4 script Kafra Service#Pt03 117,{
callfunc "F_GKafra", "prtg_cas03", "Prontera";
end;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-01-24 14:37:54 +0000