summaryrefslogtreecommitdiff
path: root/npc/guild2
diff options
context:
space:
mode:
Diffstat (limited to 'npc/guild2')
-rw-r--r--npc/guild2/arug_cas02.txt7
-rw-r--r--npc/guild2/schg_cas03.txt27
2 files changed, 18 insertions, 16 deletions
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index 1128a1c0a..c0f22f093 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -18,6 +18,7 @@
//= Made it so treasure won't spawn if castle is empty.
//= Treasure will now be killed before spawning.
//= 1.5 Fixed error with control devices. [L0ne_W0lf]
+//= 1.6 Two small fixes. (aegis carry-overs) [L0ne_W0lf]
//============================================================
arug_cas02,1,1,0 script Manager#aru02_02 111,{
@@ -2847,10 +2848,10 @@ aru_gld,120,83,5 script Cyr#flag_Ar02_3 722,{
mes "The Holy Kingdom of";
mes "Arunafeltz decrees that";
mes "this stronghold is owned";
- mes "by the ^FF0000" + guildName + "^000000 Guild.";
+ mes "by the ^FF0000" + getGuildName(.@GID) + "^000000 Guild.";
next;
mes "[ Arunafeltz Royal Edict ]";
- mes "^FF0000" + guildMaster + "^000000 is";
+ mes "^FF0000" + getGuildMaster(.@GID) + "^000000 is";
mes "Guild Master of ^FF0000" + guildName + "^000000.";
mes "Any that object must claim this";
mes "stronghold through strength of";
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index 9b3b0f5e2..71be08f1c 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -22,6 +22,7 @@
//= Made it so treasure won't spawn if castle is empty.
//= Treasure will now be killed before spawning.
//= 1.7 Fixed a typo when disabling a control device. [L0ne_W0lf]
+//= 1.8 Changed the treasure box spawn from 1939 to 1940. [L0ne_W0lf]
//============================================================
schg_cas03,1,1,0 script Manager#sch03_02 111,{
@@ -115,48 +116,48 @@ OnClock0001:
set .@Treasure,GetCastleData("schg_cas03",2)/5+4;
if (.@Treasure) {
- monster "schg_cas03",189,21,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
+ monster "schg_cas03",189,21,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
monster "schg_cas03",190,21,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
- monster "schg_cas03",191,21,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
+ monster "schg_cas03",191,21,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
monster "schg_cas03",192,21,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 5) end;
- monster "schg_cas03",193,21,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
+ monster "schg_cas03",193,21,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 6) end;
monster "schg_cas03",194,21,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 7) end;
- monster "schg_cas03",189,19,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
+ monster "schg_cas03",189,19,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 8) end;
monster "schg_cas03",190,19,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 9) end;
- monster "schg_cas03",191,19,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
+ monster "schg_cas03",191,19,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 10) end;
monster "schg_cas03",192,19,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 11) end;
- monster "schg_cas03",193,19,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
+ monster "schg_cas03",193,19,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 12) end;
monster "schg_cas03",194,19,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 13) end;
- monster "schg_cas03",189,17,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
+ monster "schg_cas03",189,17,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 14) end;
monster "schg_cas03",190,17,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 15) end;
- monster "schg_cas03",191,17,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
+ monster "schg_cas03",191,17,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 16) end;
monster "schg_cas03",192,17,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 17) end;
- monster "schg_cas03",193,17,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
+ monster "schg_cas03",193,17,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 18) end;
monster "schg_cas03",194,17,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 19) end;
- monster "schg_cas03",189,15,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
+ monster "schg_cas03",189,15,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 20) end;
monster "schg_cas03",190,15,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 21) end;
- monster "schg_cas03",191,15,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
+ monster "schg_cas03",191,15,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 22) end;
monster "schg_cas03",192,15,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 23) end;
- monster "schg_cas03",193,15,"Treasure Chest",1939,1,"Manager#sch03_02::OnTreasureDied";
+ monster "schg_cas03",193,15,"Treasure Chest",1940,1,"Manager#sch03_02::OnTreasureDied";
if (.@Treasure < 24) end;
monster "schg_cas03",194,15,"Treasure Chest",1324,1,"Manager#sch03_02::OnTreasureDied";
}