summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/guild/agit_template.txt11
-rw-r--r--npc/guild/aldeg_cas02.txt5
-rw-r--r--npc/guild/aldeg_cas05.txt5
-rw-r--r--npc/guild/payg_cas01.txt5
-rw-r--r--npc/guild/payg_cas02.txt5
-rw-r--r--npc/guild/prtg_cas01.txt3
-rw-r--r--npc/guild/prtg_cas03.txt3
-rw-r--r--npc/guild/prtg_cas04.txt3
-rw-r--r--npc/guild/prtg_cas05.txt3
10 files changed, 34 insertions, 13 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 558dd7860..494f14b97 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
Date Added
======
+2008/05/08
+ * Rev. 12691 Fixed times-invested not resetting in WoE scripts. [L0ne_W0lf]
+ - Fixed a warning when the standard chest spawn time triggered.
+ - Corrected several flag-in spawn points, (burgerpot:1475)
2008/04/26
* Rev. 12673 Rewrote the WoE 1.0 from the ground up nearly. [L0ne_W0lf]
- Renamed the WoE Time setting NPC to "agit_controller.txt"
diff --git a/npc/guild/agit_template.txt b/npc/guild/agit_template.txt
index b33902a2e..ecd119780 100644
--- a/npc/guild/agit_template.txt
+++ b/npc/guild/agit_template.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -33,6 +33,8 @@
//= treasure chest spawned.
//===== Additional Comments: =================================
//= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
+//= 1.1 Daily investement will now be reset. [L0ne_W0lf]
+//= Template will no longer try to spawn chests.
//============================================================
// AGIT Manager Template
@@ -1131,6 +1133,9 @@ OnTouch:
end;
OnClock0001:
+ // Do nothing if this script is the template.
+ if (strnpcinfo(1) == "Gld_Trea_Spawn") end;
+
// If there is no owner, do nothing.
if (!GetCastleData(strnpcinfo(2),1)) end;
@@ -1243,6 +1248,10 @@ OnClock0001:
end;
}
+ // Reset daily investment limit.
+ setcastledata strnpcinfo(2),4,0;
+ setcastledata strnpcinfo(2),5,0;
+
// Spawn boxes in proper order.
for (set .@i,0; .@i <= .@Treasure ; set .@i,.@i+1) {
// set treasure box ID
diff --git a/npc/guild/aldeg_cas02.txt b/npc/guild/aldeg_cas02.txt
index 6ce6d9a7c..c61820aa6 100644
--- a/npc/guild/aldeg_cas02.txt
+++ b/npc/guild/aldeg_cas02.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
//= NPCs that relate to Al De Baran Guild Castle 2
//===== Additional Comments: =================================
//= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
+//= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
//============================================================
// Guild Flag (Town)
@@ -46,7 +47,7 @@ alde_gld,99,251,4 script Hohenschwangau#a2-2::Hohenschwangau2 722,{
next;
if (select("Return to the guild castle.:Quit.") == 1) {
if (getcharid(2) == GetCastleData("aldeg_cas02",1)) {
- warp "aldeg_cas02",85,72;
+ warp "aldeg_cas02",84,74;
end;
}
}
diff --git a/npc/guild/aldeg_cas05.txt b/npc/guild/aldeg_cas05.txt
index 1823c1cf5..025637092 100644
--- a/npc/guild/aldeg_cas05.txt
+++ b/npc/guild/aldeg_cas05.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
//= NPCs that relate to Al De Baran Guild Castle 5
//===== Additional Comments: =================================
//= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
+//= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
//============================================================
// Guild Flag (Town)
@@ -46,7 +47,7 @@ alde_gld,265,93,6 script Rothenburg#a5-2::Rothenburg2 722,{
next;
if (select("Return to the guild castle.:Quit.") == 1) {
if (getcharid(2) == GetCastleData("aldeg_cas05",1)) {
- warp "aldeg_cas05",218,170;
+ warp "aldeg_cas05",31,190;
end;
}
}
diff --git a/npc/guild/payg_cas01.txt b/npc/guild/payg_cas01.txt
index 260f6a938..4ea347ad8 100644
--- a/npc/guild/payg_cas01.txt
+++ b/npc/guild/payg_cas01.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
//= NPCs that relate to Payon Guild Castle 1
//===== Additional Comments: =================================
//= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
+//= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
//============================================================
// Guild Flag (Town)
@@ -48,7 +49,7 @@ pay_gld,125,236,4 script Bright Arbor#f1-3::BrightArbor2 722,{
next;
if (select("Return to the guild castle.:Quit.") == 1) {
if (getcharid(2) == GetCastleData("payg_cas01",1)) {
- warp "payg_cas01",87,29;
+ warp "payg_cas01",212,108;
end;
}
}
diff --git a/npc/guild/payg_cas02.txt b/npc/guild/payg_cas02.txt
index 8d415190d..d9a760e1c 100644
--- a/npc/guild/payg_cas02.txt
+++ b/npc/guild/payg_cas02.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
//= NPCs that relate to Payon Guild Castle 2
//===== Additional Comments: =================================
//= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
+//= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
//============================================================
// Guild Flag (Town)
@@ -48,7 +49,7 @@ pay_gld,292,112,6 script Scarlet Palace#f2-3::ScarletPalace2 722,{
next;
if (select("Return to the guild castle.:Quit.") == 1) {
if (getcharid(2) == GetCastleData("payg_cas02",1)) {
- warp "payg_cas02",25,266;
+ warp "payg_cas02",22,275;
end;
}
}
diff --git a/npc/guild/prtg_cas01.txt b/npc/guild/prtg_cas01.txt
index d7ac381c7..1399fb78f 100644
--- a/npc/guild/prtg_cas01.txt
+++ b/npc/guild/prtg_cas01.txt
@@ -10,6 +10,7 @@
//= NPCs that relate to Prontera Guild Castle 1
//===== Additional Comments: =================================
//= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
+//= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
//============================================================
// Guild Flag (Town)
@@ -46,7 +47,7 @@ prt_gld,131,60,6 script Kriemhild#p1-2::Kriemhild2 722,{
next;
if (select("Return to the guild castle.:Quit.") == 1) {
if (getcharid(2) == GetCastleData("prtg_cas01",1)) {
- warp "prtg_cas01",97,174;
+ warp "prtg_cas01",96,173;
end;
}
}
diff --git a/npc/guild/prtg_cas03.txt b/npc/guild/prtg_cas03.txt
index 7a331be9a..b7ae3553c 100644
--- a/npc/guild/prtg_cas03.txt
+++ b/npc/guild/prtg_cas03.txt
@@ -10,6 +10,7 @@
//= NPCs that relate to Prontera Guild Castle 1
//===== Additional Comments: =================================
//= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
+//= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
//============================================================
// Guild Flag (Town)
@@ -47,7 +48,7 @@ prt_gld,147,140,4 script Fadhgridh#p3-2::Fadhgridh2 722,{
next;
if (select("Return to the guild castle.:Quit.") == 1) {
if (getcharid(2) == GetCastleData("prtg_cas03",1)) {
- warp "prtg_cas03",45,99;
+ warp "prtg_cas03",181,215;
end;
}
}
diff --git a/npc/guild/prtg_cas04.txt b/npc/guild/prtg_cas04.txt
index f9c62bc97..8647ecc21 100644
--- a/npc/guild/prtg_cas04.txt
+++ b/npc/guild/prtg_cas04.txt
@@ -10,6 +10,7 @@
//= NPCs that relate to Prontera Guild Castle 4
//===== Additional Comments: =================================
//= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
+//= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
//============================================================
// Guild Flag (Town)
@@ -46,7 +47,7 @@ prt_gld,120,243,6 script Skoegul#p4-2::Skoegul2 722,{
next;
if (select("Return to the guild castle.:Quit.") == 1) {
if (getcharid(2) == GetCastleData("prtg_cas04",1)) {
- warp "prtg_cas04",259,265;
+ warp "prtg_cas04",258,247;
end;
}
}
diff --git a/npc/guild/prtg_cas05.txt b/npc/guild/prtg_cas05.txt
index cd82c301a..2b491eec2 100644
--- a/npc/guild/prtg_cas05.txt
+++ b/npc/guild/prtg_cas05.txt
@@ -10,6 +10,7 @@
//= NPCs that relate to Prontera Guild Castle 1
//===== Additional Comments: =================================
//= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
+//= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
//============================================================
// Guild Flag (Town)
@@ -46,7 +47,7 @@ prt_gld,199,243,2 script Gondul#p5-2::Gondul2 722,{
next;
if (select("Return to the guild castle.:Quit.") == 1) {
if (getcharid(2) == GetCastleData("prtg_cas05",1)) {
- warp "prtg_cas05",34,30;
+ warp "prtg_cas05",52,41;
end;
}
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-10 14:05:36 +0000