diff options
author | kobra_k88 <kobra_k88@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-17 19:14:29 +0000 |
---|---|---|
committer | kobra_k88 <kobra_k88@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-17 19:14:29 +0000 |
commit | 02f2b6d3dd876c2bb6ae4988ff4b48c78b7e49e6 (patch) | |
tree | a3c49e1fdb659a0a9082b33304b17499986afd2c /npc/guild/nguild | |
parent | 32eac40dc34fcab873a8c4ad8e5490ba2c831d6d (diff) | |
download | hercules-02f2b6d3dd876c2bb6ae4988ff4b48c78b7e49e6.tar.gz hercules-02f2b6d3dd876c2bb6ae4988ff4b48c78b7e49e6.tar.bz2 hercules-02f2b6d3dd876c2bb6ae4988ff4b48c78b7e49e6.tar.xz hercules-02f2b6d3dd876c2bb6ae4988ff4b48c78b7e49e6.zip |
Fixed issue of guardians hp not updating after defense investment.
Moved treasure spawn time to ev_agit_event.txt.
Changes to headers and comments in various files.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@233 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/guild/nguild')
-rw-r--r-- | npc/guild/nguild/nguild_dunsw.txt | 7 | ||||
-rw-r--r-- | npc/guild/nguild/nguild_ev_agit.txt | 5 | ||||
-rw-r--r-- | npc/guild/nguild/nguild_flags.txt | 13 | ||||
-rw-r--r-- | npc/guild/nguild/nguild_guardians.txt | 6 | ||||
-rw-r--r-- | npc/guild/nguild/nguild_kafras.txt | 5 | ||||
-rw-r--r-- | npc/guild/nguild/nguild_managers.txt | 13 | ||||
-rw-r--r-- | npc/guild/nguild/nguild_treas.txt | 25 |
7 files changed, 29 insertions, 45 deletions
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; |