summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt6
-rw-r--r--npc/guild2/arug_cas02.txt7
-rw-r--r--npc/guild2/schg_cas03.txt27
-rw-r--r--npc/other/arena/arena_lvl60.txt5
-rw-r--r--npc/quests/Kiel_Hyre_Quest.txt13
5 files changed, 35 insertions, 23 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index c5d4434ba..85ce04e8e 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,11 @@
Date Added
======
+2008/08/29
+ * Rev. 13152 Just fixing some reported script bug. [L0ne_W0lf]
+ - Fixed coordinate in level 60 arena. (bugreport:1663)
+ - Fixed errors in the Keil Hyre quest. (bugreport:2129)
+ - Fixed guild look ups in Arug_cas02. (bugreport:2134)
+ - Corrected treasure spawn in schg_cas03. (bugreport:2142)
2008/08/20
* Rev. 13102 Follow up to r13091, fixed weight check in stone dismantler. [L0ne_W0lf]
2008/08/19
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";
}
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index 508bc5168..cac8b6c23 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= SinSloth
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
//= Izlude Battle Arena Level 60
//===== Additional Comments: =================================
//= 1.0 First version.
+//= 1.1 Fixed coordinate typo. (bugreport:1663) [L0ne_W0lf]
//============================================================
arena_room,38,88,5 script lvl 60s Waiting Room 124,{
@@ -434,7 +435,7 @@ Onreset:
Onon:
donpcevent "force_01ex#60::Onon";
monster "force_2-1",25,32,"Goblin Archer",1577,1,"force_01mob#60::OnMobDeath";
- monster "force_2-1",21,260,"Goblin",1534,1,"force_01mob#60::OnMobDeath";
+ monster "force_2-1",21,26,"Goblin",1534,1,"force_01mob#60::OnMobDeath";
monster "force_2-1",25,36,"Goblin",1536,1,"force_01mob#60::OnMobDeath";
monster "force_2-1",25,15,"Goblin",1534,1,"force_01mob#60::OnMobDeath";
monster "force_2-1",40,30,"Goblin",1536,1,"force_01mob#60::OnMobDeath";
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index 3be965ca1..17b5f122b 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf (Script), DZeroX (Timer)
//===== Current Version: =====================================
-//= 4.1
+//= 4.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -88,6 +88,7 @@
//= Changed the way some NPCs work.
//= Updated comments for get/delitem commands.
//= 4.1 Added an 'end;' to Kiel Hyre's dialog for the "Yes" option for if you want to confront Kiehl.
+//= 4.2 Fixed some issues reported in bugreport:2129. [L0ne_W0lf]
//============================================================
//============================================================================
@@ -447,7 +448,7 @@ yuno_in01,35,179,4 script Pub Master#kh 46,5,5,{
mes "can complain about the delivery.";
close;
}
- else if (KielHyreQuest > 6) {
+ else if (KielHyreQuest == 6) {
if (countitem(7487) == 0) {
mes "[Vandt]";
mes "Oh, you're back.";
@@ -492,7 +493,8 @@ yuno_in01,35,179,4 script Pub Master#kh 46,5,5,{
mes "worker, you know that?";
mes "Dependable, responsible,";
mes "willing to help others, and";
- mes "proactive too! I think you'll^FFFFFF ^000000 go far in life, kid, I really do~";
+ mes "proactive too! I think you'll";
+ mes "go far in life, kid, I really do~";
close;
}
@@ -2531,6 +2533,7 @@ kh_vila,14,55,0 script Calabash#khp1 111,{
mes "feel around with your";
mes "fingers until you retrieve";
mes "an Old Bronze Key.^000000";
+ getitem 7329,1; //Old_Bronze_Key
close;
case 3:
mes "^3355FFThere's probably";
@@ -3344,7 +3347,7 @@ kh_dun01,235,48,0 script Heavy Door#kh1::HeavyDoorKHQ1 111,{
close;
}
}
- else if ((KielHyreQuest >= 38) && (KielHyreQuest < 46)) {
+ else if ((KielHyreQuest <= 38) && (KielHyreQuest > 46)) {
mes "^3355FFThere is a large, heavy";
mes "door in front of you.^000000";
next;
@@ -3386,7 +3389,7 @@ kh_dun01,235,48,0 script Heavy Door#kh1::HeavyDoorKHQ1 111,{
// Robotic's Factory; Heavy Door (These doors don't seem to serve any purpose)
//----------------------------------------------------------------------------
kh_dun01,76,233,0 script Heavy Door::HeavyDoorKHQ2 111,{
- if ((KielHyreQuest >= 38) && (KielHyreQuest < 46)) {
+ if ((KielHyreQuest <= 38) && (KielHyreQuest > 46)) {
mes "^3355FFThere is a large, heavy";
mes "door infront of you.^000000";
next;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-01 04:02:56 +0000