summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/Changelog.txt7
-rw-r--r--npc/mobs/dungeons/nyd_dun.txt4
-rw-r--r--npc/mobs/fields/manuk.txt9
-rw-r--r--npc/other/CashShop_Functions.txt17
-rw-r--r--npc/quests/okolnir/godse_aru01.txt14
-rw-r--r--npc/quests/okolnir/godse_aru02.txt14
-rw-r--r--npc/quests/okolnir/godse_aru03.txt14
-rw-r--r--npc/quests/okolnir/godse_aru04.txt14
-rw-r--r--npc/quests/okolnir/godse_aru05.txt14
-rw-r--r--npc/quests/okolnir/godse_sch01.txt14
-rw-r--r--npc/quests/okolnir/godse_sch02.txt14
-rw-r--r--npc/quests/okolnir/godse_sch03.txt14
-rw-r--r--npc/quests/okolnir/godse_sch04.txt14
-rw-r--r--npc/quests/okolnir/godse_sch05.txt14
-rw-r--r--npc/quests/quests_13_2.txt13
15 files changed, 112 insertions, 78 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 0bbd6ea7e..9e1446643 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,12 @@
Date Added
======
+2010/05/24
+ * Rev. 14305 Some bug fixing :x Nothing to new today folks! Stay tuned. [L0ne_W0lf]
+ - Fixed input checks in the 'Ring of Wise King' quest. (bugreport:4147)
+ - Fixed some of the erros reported in the Oolnir scripts. (bugreport:4220)
+ - Added Azoi's giant flywing update to not warp dead players. (bugreport:4242)
+ - Fixed confusing inconsistancy in the nyd_dun mob spawn file. (bugreport:4246)
+ - Fixed the Manuk field 2 monsters spawning on Manul field 1. (bugreport:4248)
2010/05/22
* Rev. 14304 Added the warps for Brasilis, not sure how they got missed :x [L0ne_W0lf]
2010/05/20
diff --git a/npc/mobs/dungeons/nyd_dun.txt b/npc/mobs/dungeons/nyd_dun.txt
index abe7e07f2..a0d13ab71 100644
--- a/npc/mobs/dungeons/nyd_dun.txt
+++ b/npc/mobs/dungeons/nyd_dun.txt
@@ -1,5 +1,5 @@
//===== eAthena Script =======================================
-//= Yggdrasil Dungeon
+//= Yggdrasil Root Dungeon
//===== By: ==================================================
//= Athena (1.0)
//===== Current Version: =====================================
@@ -11,7 +11,7 @@
//============================================================
//==================================================
-// nyd_dun01 - Nidhoggur Dungeon 1
+// nyd_dun01 - Yggdrasil Root Dungeon
//==================================================
nyd_dun01,0,0,0,0 monster Draco 2013,40,0,0,0
nyd_dun01,0,0,0,0 monster Draco's Egg 2014,10,0,0,0
diff --git a/npc/mobs/fields/manuk.txt b/npc/mobs/fields/manuk.txt
index 364c2be6c..62a1275d4 100644
--- a/npc/mobs/fields/manuk.txt
+++ b/npc/mobs/fields/manuk.txt
@@ -3,12 +3,13 @@
//===== By: ==================================================
//= alexx, MaC
//===== Current Version: =====================================
-//= 1.1
+//= 1.1a
//===== Compatible With: =====================================
//= Any Athena Version
//===== Additional Comments: =================================
//= 1.0 Official spawn ammounts from Aegis script [alexx]
//= 1.1 Added 13.2 mob spawn update [scriptor]
+//= 1.1a Corrected fild2 mobs spawning on fild1. (bugreport:4248)
//============================================================
//============================================================
@@ -22,9 +23,9 @@ man_fild01,0,0,0,0 monster Centipede 1987,2,0,0,0
//============================================================
// man_fild02 - Manuk Field
//============================================================
-man_fild01,0,0,0,0 monster Bradium Golem 2024,50,0,0,0
-man_fild01,0,0,0,0 monster Centipede 1987,35,0,0,0
-man_fild01,0,0,0,0 monster Tatacho 1986,25,0,0,0
+man_fild02,0,0,0,0 monster Bradium Golem 2024,50,0,0,0
+man_fild02,0,0,0,0 monster Centipede 1987,35,0,0,0
+man_fild02,0,0,0,0 monster Tatacho 1986,25,0,0,0
//============================================================
// man_fild03 - Manuk Field
diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt
index 9695a10e1..5489581ee 100644
--- a/npc/other/CashShop_Functions.txt
+++ b/npc/other/CashShop_Functions.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -19,6 +19,7 @@
//= Added Town Teleport Scroll Function
//= Added Seige Teleport Scroll Function
//= 1.2 Updated the dungeon teleport scroll menu. [L0ne_w0lf]
+//= 1.3 Implemented Aozi Giant Flywing Fix. (bugreport:4242) [L0ne_w0lf]
//============================================================
// Kafra Card
@@ -46,12 +47,16 @@ function script F_CashPartyCall {
warp "Random",0,0;
if(getpartyleader(getcharid(1),2) == getcharid(0)) {
getmapxy .@mapl$, .@xl, .@yl, 0;
- getpartymember getcharid(1);
+ getpartymember getcharid(1),2;
set .@partymembercount, $@partymembercount;
- copyarray .@partymembername$[0], $@partymembername$[0], .@partymembercount;
- for(set .@i, 0; .@i < .@partymembercount; set .@i, .@i + 1)
- if(!(getmapxy(.@mapm$, .@xm, .@ym, 0, .@partymembername$[.@i])) && (.@mapm$ == .@mapl$))
- warpchar .@mapl$, .@xl, .@yl, getcharid(0, .@partymembername$[.@i]);
+ copyarray .@partymemberaid[0], $@partymemberaid[0], .@partymembercount;
+ for(set .@i, 0; .@i < .@partymembercount; set .@i, .@i + 1) {
+ if(attachrid(.@partymemberaid[.@i])) {
+ if(strcharinfo(3) == .@mapl$ && HP > 0) {
+ warp .@mapl$, .@xl, .@yl;
+ }
+ }
+ }
}
return;
}
diff --git a/npc/quests/okolnir/godse_aru01.txt b/npc/quests/okolnir/godse_aru01.txt
index 2f30bdf7b..02da7678e 100644
--- a/npc/quests/okolnir/godse_aru01.txt
+++ b/npc/quests/okolnir/godse_aru01.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2a
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -22,6 +22,8 @@
//= Corrected non-angry Piamette not disabling.
//= Removed extra dialog that was used in the Brynhild quest.
//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf]
+//= 1.3 Corrected invalid coordinates in maze. (bugreport:4220)
+//= Corrected typo in Guard of Shadow NPC.
//============================================================
arug_cas01,161,371,3 script Guide#gq_aru01 899,{
@@ -802,7 +804,7 @@ OnTouch:
monster "que_qaru01",102,275,strcharinfo(0),1652,1,"#Gate_manager_aru01::OnMyMobDead";
}
set $gqse_aru01_miro,17;
- warp "que_qaru01",102,281;
+ warp "que_qaru01",102,282;
end;
}
else if ($gqse_aru01_miro == 17) {
@@ -929,7 +931,7 @@ OnTimer6000:
monster "que_qaru01",63,282,"Seyren Windsor",1640,1,"#gq_miromob2_aru01::OnMyMobDead";
monster "que_qaru01",61,243,"Kathryne Keyron",1645,1,"#gq_miromob2_aru01::OnMyMobDead";
monster "que_qaru01",70,249,"Cecil Damon",1644,1,"#gq_miromob2_aru01::OnMyMobDead";
- monster "que_qaru01",102,281,"Margaretha Sorin",1643,1,"#gq_miromob2_aru01::OnMyMobDead";
+ monster "que_qaru01",102,282,"Margaretha Sorin",1643,1,"#gq_miromob2_aru01::OnMyMobDead";
monster "que_qaru01",66,300,"Eremes Guile",1641,1,"#gq_miromob2_aru01::OnMyMobDead";
monster "que_qaru01",57,258,"Howard Alt-Eisen",1642,1,"#gq_miromob2_aru01::OnMyMobDead";
stopnpctimer;
@@ -1256,8 +1258,8 @@ OnEnable:
setcell "que_qaru01",94,256,97,256,cell_shootable,0;
setcell "que_qaru01",64,298,64,301,cell_walkable,0;
setcell "que_qaru01",64,298,64,301,cell_shootable,0;
- setcell "que_qaru01",000,251,003,251,cell_walkable,0;
- setcell "que_qaru01",000,251,003,251,cell_shootable,0;
+ setcell "que_qaru01",100,251,103,251,cell_walkable,0;
+ setcell "que_qaru01",100,251,103,251,cell_shootable,0;
end;
OnDisable:
@@ -2864,7 +2866,7 @@ OnInit:
end;
OnDisable:
- killmonster "que_qaru01","Guard of Shadow#aru01_01::OnMyMobDead";
+ killmonster "que_qaru01","Guard of Shadow#aru01_02::OnMyMobDead";
disablenpc "Guard of Shadow#aru01_02";
end;
diff --git a/npc/quests/okolnir/godse_aru02.txt b/npc/quests/okolnir/godse_aru02.txt
index bc006f47c..22d44e634 100644
--- a/npc/quests/okolnir/godse_aru02.txt
+++ b/npc/quests/okolnir/godse_aru02.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2a
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -22,6 +22,8 @@
//= Corrected non-angry Piamette not disabling.
//= Removed extra dialog that was used in the Brynhild quest.
//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf]
+//= 1.3 Corrected invalid coordinates in maze. (bugreport:4220)
+//= Corrected typo in Guard of Shadow NPC.
//============================================================
arug_cas02,349,347,3 script Guide#gq_aru02 899,{
@@ -802,7 +804,7 @@ OnTouch:
monster "que_qaru02",102,275,strcharinfo(0),1652,1,"#Gate_manager_aru02::OnMyMobDead";
}
set $gqse_aru02_miro,17;
- warp "que_qaru02",102,281;
+ warp "que_qaru02",102,282;
end;
}
else if ($gqse_aru02_miro == 17) {
@@ -929,7 +931,7 @@ OnTimer6000:
monster "que_qaru02",63,282,"Seyren Windsor",1640,1,"#gq_miromob2_aru02::OnMyMobDead";
monster "que_qaru02",61,243,"Kathryne Keyron",1645,1,"#gq_miromob2_aru02::OnMyMobDead";
monster "que_qaru02",70,249,"Cecil Damon",1644,1,"#gq_miromob2_aru02::OnMyMobDead";
- monster "que_qaru02",102,281,"Margaretha Sorin",1643,1,"#gq_miromob2_aru02::OnMyMobDead";
+ monster "que_qaru02",102,282,"Margaretha Sorin",1643,1,"#gq_miromob2_aru02::OnMyMobDead";
monster "que_qaru02",66,300,"Eremes Guile",1641,1,"#gq_miromob2_aru02::OnMyMobDead";
monster "que_qaru02",57,258,"Howard Alt-Eisen",1642,1,"#gq_miromob2_aru02::OnMyMobDead";
stopnpctimer;
@@ -1256,8 +1258,8 @@ OnEnable:
setcell "que_qaru02",94,256,97,256,cell_shootable,0;
setcell "que_qaru02",64,298,64,301,cell_walkable,0;
setcell "que_qaru02",64,298,64,301,cell_shootable,0;
- setcell "que_qaru02",000,251,003,251,cell_walkable,0;
- setcell "que_qaru02",000,251,003,251,cell_shootable,0;
+ setcell "que_qaru02",100,251,103,251,cell_walkable,0;
+ setcell "que_qaru02",100,251,103,251,cell_shootable,0;
end;
OnDisable:
@@ -2864,7 +2866,7 @@ OnInit:
end;
OnDisable:
- killmonster "que_qaru02","Guard of Shadow#aru02_01::OnMyMobDead";
+ killmonster "que_qaru02","Guard of Shadow#aru02_02::OnMyMobDead";
disablenpc "Guard of Shadow#aru02_02";
end;
diff --git a/npc/quests/okolnir/godse_aru03.txt b/npc/quests/okolnir/godse_aru03.txt
index c53637c02..9afffc676 100644
--- a/npc/quests/okolnir/godse_aru03.txt
+++ b/npc/quests/okolnir/godse_aru03.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2a
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -22,6 +22,8 @@
//= Corrected non-angry Piamette not disabling.
//= Removed extra dialog that was used in the Brynhild quest.
//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf]
+//= 1.3 Corrected invalid coordinates in maze. (bugreport:4220)
+//= Corrected typo in Guard of Shadow NPC.
//============================================================
arug_cas03,324,161,3 script Guide#gq_aru03 899,{
@@ -802,7 +804,7 @@ OnTouch:
monster "que_qaru03",102,275,strcharinfo(0),1652,1,"#Gate_manager_aru03::OnMyMobDead";
}
set $gqse_aru03_miro,17;
- warp "que_qaru03",102,281;
+ warp "que_qaru03",102,282;
end;
}
else if ($gqse_aru03_miro == 17) {
@@ -929,7 +931,7 @@ OnTimer6000:
monster "que_qaru03",63,282,"Seyren Windsor",1640,1,"#gq_miromob2_aru03::OnMyMobDead";
monster "que_qaru03",61,243,"Kathryne Keyron",1645,1,"#gq_miromob2_aru03::OnMyMobDead";
monster "que_qaru03",70,249,"Cecil Damon",1644,1,"#gq_miromob2_aru03::OnMyMobDead";
- monster "que_qaru03",102,281,"Margaretha Sorin",1643,1,"#gq_miromob2_aru03::OnMyMobDead";
+ monster "que_qaru03",102,282,"Margaretha Sorin",1643,1,"#gq_miromob2_aru03::OnMyMobDead";
monster "que_qaru03",66,300,"Eremes Guile",1641,1,"#gq_miromob2_aru03::OnMyMobDead";
monster "que_qaru03",57,258,"Howard Alt-Eisen",1642,1,"#gq_miromob2_aru03::OnMyMobDead";
stopnpctimer;
@@ -1256,8 +1258,8 @@ OnEnable:
setcell "que_qaru03",94,256,97,256,cell_shootable,0;
setcell "que_qaru03",64,298,64,301,cell_walkable,0;
setcell "que_qaru03",64,298,64,301,cell_shootable,0;
- setcell "que_qaru03",000,251,003,251,cell_walkable,0;
- setcell "que_qaru03",000,251,003,251,cell_shootable,0;
+ setcell "que_qaru03",100,251,103,251,cell_walkable,0;
+ setcell "que_qaru03",100,251,103,251,cell_shootable,0;
end;
OnDisable:
@@ -2864,7 +2866,7 @@ OnInit:
end;
OnDisable:
- killmonster "que_qaru03","Guard of Shadow#aru03_01::OnMyMobDead";
+ killmonster "que_qaru03","Guard of Shadow#aru03_02::OnMyMobDead";
disablenpc "Guard of Shadow#aru03_02";
end;
diff --git a/npc/quests/okolnir/godse_aru04.txt b/npc/quests/okolnir/godse_aru04.txt
index 983115ad5..34f86b069 100644
--- a/npc/quests/okolnir/godse_aru04.txt
+++ b/npc/quests/okolnir/godse_aru04.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2a
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -22,6 +22,8 @@
//= Corrected non-angry Piamette not disabling.
//= Removed extra dialog that was used in the Brynhild quest.
//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf]
+//= 1.3 Corrected invalid coordinates in maze. (bugreport:4220)
+//= Corrected typo in Guard of Shadow NPC.
//============================================================
arug_cas04,324,161,3 script Guide#gq_aru04 899,{
@@ -802,7 +804,7 @@ OnTouch:
monster "que_qaru04",102,275,strcharinfo(0),1652,1,"#Gate_manager_aru04::OnMyMobDead";
}
set $gqse_aru04_miro,17;
- warp "que_qaru04",102,281;
+ warp "que_qaru04",102,282;
end;
}
else if ($gqse_aru04_miro == 17) {
@@ -929,7 +931,7 @@ OnTimer6000:
monster "que_qaru04",63,282,"Seyren Windsor",1640,1,"#gq_miromob2_aru04::OnMyMobDead";
monster "que_qaru04",61,243,"Kathryne Keyron",1645,1,"#gq_miromob2_aru04::OnMyMobDead";
monster "que_qaru04",70,249,"Cecil Damon",1644,1,"#gq_miromob2_aru04::OnMyMobDead";
- monster "que_qaru04",102,281,"Margaretha Sorin",1643,1,"#gq_miromob2_aru04::OnMyMobDead";
+ monster "que_qaru04",102,282,"Margaretha Sorin",1643,1,"#gq_miromob2_aru04::OnMyMobDead";
monster "que_qaru04",66,300,"Eremes Guile",1641,1,"#gq_miromob2_aru04::OnMyMobDead";
monster "que_qaru04",57,258,"Howard Alt-Eisen",1642,1,"#gq_miromob2_aru04::OnMyMobDead";
stopnpctimer;
@@ -1256,8 +1258,8 @@ OnEnable:
setcell "que_qaru04",94,256,97,256,cell_shootable,0;
setcell "que_qaru04",64,298,64,301,cell_walkable,0;
setcell "que_qaru04",64,298,64,301,cell_shootable,0;
- setcell "que_qaru04",000,251,003,251,cell_walkable,0;
- setcell "que_qaru04",000,251,003,251,cell_shootable,0;
+ setcell "que_qaru04",100,251,103,251,cell_walkable,0;
+ setcell "que_qaru04",100,251,103,251,cell_shootable,0;
end;
OnDisable:
@@ -2864,7 +2866,7 @@ OnInit:
end;
OnDisable:
- killmonster "que_qaru04","Guard of Shadow#aru04_01::OnMyMobDead";
+ killmonster "que_qaru04","Guard of Shadow#aru04_02::OnMyMobDead";
disablenpc "Guard of Shadow#aru04_02";
end;
diff --git a/npc/quests/okolnir/godse_aru05.txt b/npc/quests/okolnir/godse_aru05.txt
index 37ca9536b..1cdf272e9 100644
--- a/npc/quests/okolnir/godse_aru05.txt
+++ b/npc/quests/okolnir/godse_aru05.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -22,6 +22,8 @@
//= Corrected non-angry Piamette not disabling.
//= Removed extra dialog that was used in the Brynhild quest.
//= 1.2a Fixed Wish maiden asking for soft feathers. [L0ne_W0lf]
+//= 1.3 Corrected invalid coordinates in maze. (bugreport:4220)
+//= Corrected typo in Guard of Shadow NPC.
//============================================================
arug_cas05,324,161,3 script Guide#gq_aru05 899,{
@@ -802,7 +804,7 @@ OnTouch:
monster "que_qaru05",102,275,strcharinfo(0),1652,1,"#Gate_manager_aru05::OnMyMobDead";
}
set $gqse_aru05_miro,17;
- warp "que_qaru05",102,281;
+ warp "que_qaru05",102,282;
end;
}
else if ($gqse_aru05_miro == 17) {
@@ -929,7 +931,7 @@ OnTimer6000:
monster "que_qaru05",63,282,"Seyren Windsor",1640,1,"#gq_miromob2_aru05::OnMyMobDead";
monster "que_qaru05",61,243,"Kathryne Keyron",1645,1,"#gq_miromob2_aru05::OnMyMobDead";
monster "que_qaru05",70,249,"Cecil Damon",1644,1,"#gq_miromob2_aru05::OnMyMobDead";
- monster "que_qaru05",102,281,"Margaretha Sorin",1643,1,"#gq_miromob2_aru05::OnMyMobDead";
+ monster "que_qaru05",102,282,"Margaretha Sorin",1643,1,"#gq_miromob2_aru05::OnMyMobDead";
monster "que_qaru05",66,300,"Eremes Guile",1641,1,"#gq_miromob2_aru05::OnMyMobDead";
monster "que_qaru05",57,258,"Howard Alt-Eisen",1642,1,"#gq_miromob2_aru05::OnMyMobDead";
stopnpctimer;
@@ -1256,8 +1258,8 @@ OnEnable:
setcell "que_qaru05",94,256,97,256,cell_shootable,0;
setcell "que_qaru05",64,298,64,301,cell_walkable,0;
setcell "que_qaru05",64,298,64,301,cell_shootable,0;
- setcell "que_qaru05",000,251,003,251,cell_walkable,0;
- setcell "que_qaru05",000,251,003,251,cell_shootable,0;
+ setcell "que_qaru05",100,251,103,251,cell_walkable,0;
+ setcell "que_qaru05",100,251,103,251,cell_shootable,0;
end;
OnDisable:
@@ -2864,7 +2866,7 @@ OnInit:
end;
OnDisable:
- killmonster "que_qaru05","Guard of Shadow#aru05_01::OnMyMobDead";
+ killmonster "que_qaru05","Guard of Shadow#aru05_02::OnMyMobDead";
disablenpc "Guard of Shadow#aru05_02";
end;
diff --git a/npc/quests/okolnir/godse_sch01.txt b/npc/quests/okolnir/godse_sch01.txt
index fb1802f93..1aa7e7f1c 100644
--- a/npc/quests/okolnir/godse_sch01.txt
+++ b/npc/quests/okolnir/godse_sch01.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -20,6 +20,8 @@
//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
//= Fixed message on the portal when the okolnir section is full.
//= Corrected non-angry Piamette not disabling.
+//= 1.3 Corrected invalid coordinates in maze. (bugreport:4220)
+//= Corrected typo in Guard of Shadow NPC.
//============================================================
schg_cas01,376,307,3 script Guide#gq_sch01 899,{
@@ -802,7 +804,7 @@ OnTouch:
monster "que_qsch01",102,275,strcharinfo(0),1652,1,"#Gate_manager_sch01::OnMyMobDead";
}
set $gqse_sch01_miro,17;
- warp "que_qsch01",102,281;
+ warp "que_qsch01",102,282;
end;
}
else if ($gqse_sch01_miro == 17) {
@@ -929,7 +931,7 @@ OnTimer6000:
monster "que_qsch01",63,282,"Seyren Windsor",1640,1,"#gq_miromob2_sch01::OnMyMobDead";
monster "que_qsch01",61,243,"Kathryne Keyron",1645,1,"#gq_miromob2_sch01::OnMyMobDead";
monster "que_qsch01",70,249,"Cecil Damon",1644,1,"#gq_miromob2_sch01::OnMyMobDead";
- monster "que_qsch01",102,281,"Margaretha Sorin",1643,1,"#gq_miromob2_sch01::OnMyMobDead";
+ monster "que_qsch01",102,282,"Margaretha Sorin",1643,1,"#gq_miromob2_sch01::OnMyMobDead";
monster "que_qsch01",66,300,"Eremes Guile",1641,1,"#gq_miromob2_sch01::OnMyMobDead";
monster "que_qsch01",57,258,"Howard Alt-Eisen",1642,1,"#gq_miromob2_sch01::OnMyMobDead";
stopnpctimer;
@@ -1256,8 +1258,8 @@ OnEnable:
setcell "que_qsch01",94,256,97,256,cell_shootable,0;
setcell "que_qsch01",64,298,64,301,cell_walkable,0;
setcell "que_qsch01",64,298,64,301,cell_shootable,0;
- setcell "que_qsch01",000,251,003,251,cell_walkable,0;
- setcell "que_qsch01",000,251,003,251,cell_shootable,0;
+ setcell "que_qsch01",100,251,103,251,cell_walkable,0;
+ setcell "que_qsch01",100,251,103,251,cell_shootable,0;
end;
OnDisable:
@@ -2864,7 +2866,7 @@ OnInit:
end;
OnDisable:
- killmonster "que_qsch01","Guard of Shadow#sch01_01::OnMyMobDead";
+ killmonster "que_qsch01","Guard of Shadow#sch01_02::OnMyMobDead";
disablenpc "Guard of Shadow#sch01_02";
end;
diff --git a/npc/quests/okolnir/godse_sch02.txt b/npc/quests/okolnir/godse_sch02.txt
index 4a7040a10..4b6812735 100644
--- a/npc/quests/okolnir/godse_sch02.txt
+++ b/npc/quests/okolnir/godse_sch02.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -19,6 +19,8 @@
//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
//= Fixed message on the portal when the okolnir section is full.
//= Corrected non-angry Piamette not disabling.
+//= 1.3 Corrected invalid coordinates in maze. (bugreport:4220)
+//= Corrected typo in Guard of Shadow NPC.
//============================================================
schg_cas02,181,335,3 script Guide#gq_sch02 899,{
@@ -801,7 +803,7 @@ OnTouch:
monster "que_qsch02",102,275,strcharinfo(0),1652,1,"#Gate_manager_sch02::OnMyMobDead";
}
set $gqse_sch02_miro,17;
- warp "que_qsch02",102,281;
+ warp "que_qsch02",102,282;
end;
}
else if ($gqse_sch02_miro == 17) {
@@ -928,7 +930,7 @@ OnTimer6000:
monster "que_qsch02",63,282,"Seyren Windsor",1640,1,"#gq_miromob2_sch02::OnMyMobDead";
monster "que_qsch02",61,243,"Kathryne Keyron",1645,1,"#gq_miromob2_sch02::OnMyMobDead";
monster "que_qsch02",70,249,"Cecil Damon",1644,1,"#gq_miromob2_sch02::OnMyMobDead";
- monster "que_qsch02",102,281,"Margaretha Sorin",1643,1,"#gq_miromob2_sch02::OnMyMobDead";
+ monster "que_qsch02",102,282,"Margaretha Sorin",1643,1,"#gq_miromob2_sch02::OnMyMobDead";
monster "que_qsch02",66,300,"Eremes Guile",1641,1,"#gq_miromob2_sch02::OnMyMobDead";
monster "que_qsch02",57,258,"Howard Alt-Eisen",1642,1,"#gq_miromob2_sch02::OnMyMobDead";
stopnpctimer;
@@ -1255,8 +1257,8 @@ OnEnable:
setcell "que_qsch02",94,256,97,256,cell_shootable,0;
setcell "que_qsch02",64,298,64,301,cell_walkable,0;
setcell "que_qsch02",64,298,64,301,cell_shootable,0;
- setcell "que_qsch02",000,251,003,251,cell_walkable,0;
- setcell "que_qsch02",000,251,003,251,cell_shootable,0;
+ setcell "que_qsch02",100,251,103,251,cell_walkable,0;
+ setcell "que_qsch02",100,251,103,251,cell_shootable,0;
end;
OnDisable:
@@ -2863,7 +2865,7 @@ OnInit:
end;
OnDisable:
- killmonster "que_qsch02","Guard of Shadow#sch02_01::OnMyMobDead";
+ killmonster "que_qsch02","Guard of Shadow#sch02_02::OnMyMobDead";
disablenpc "Guard of Shadow#sch02_02";
end;
diff --git a/npc/quests/okolnir/godse_sch03.txt b/npc/quests/okolnir/godse_sch03.txt
index 41c5324da..6d8a9cb28 100644
--- a/npc/quests/okolnir/godse_sch03.txt
+++ b/npc/quests/okolnir/godse_sch03.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -19,6 +19,8 @@
//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
//= Fixed message on the portal when the okolnir section is full.
//= Corrected non-angry Piamette not disabling.
+//= 1.3 Corrected invalid coordinates in maze. (bugreport:4220)
+//= Corrected typo in Guard of Shadow NPC.
//============================================================
schg_cas03,84,101,3 script Guide#gq_sch03 899,{
@@ -801,7 +803,7 @@ OnTouch:
monster "que_qsch03",102,275,strcharinfo(0),1652,1,"#Gate_manager_sch03::OnMyMobDead";
}
set $gqse_sch03_miro,17;
- warp "que_qsch03",102,281;
+ warp "que_qsch03",102,282;
end;
}
else if ($gqse_sch03_miro == 17) {
@@ -928,7 +930,7 @@ OnTimer6000:
monster "que_qsch03",63,282,"Seyren Windsor",1640,1,"#gq_miromob2_sch03::OnMyMobDead";
monster "que_qsch03",61,243,"Kathryne Keyron",1645,1,"#gq_miromob2_sch03::OnMyMobDead";
monster "que_qsch03",70,249,"Cecil Damon",1644,1,"#gq_miromob2_sch03::OnMyMobDead";
- monster "que_qsch03",102,281,"Margaretha Sorin",1643,1,"#gq_miromob2_sch03::OnMyMobDead";
+ monster "que_qsch03",102,282,"Margaretha Sorin",1643,1,"#gq_miromob2_sch03::OnMyMobDead";
monster "que_qsch03",66,300,"Eremes Guile",1641,1,"#gq_miromob2_sch03::OnMyMobDead";
monster "que_qsch03",57,258,"Howard Alt-Eisen",1642,1,"#gq_miromob2_sch03::OnMyMobDead";
stopnpctimer;
@@ -1255,8 +1257,8 @@ OnEnable:
setcell "que_qsch03",94,256,97,256,cell_shootable,0;
setcell "que_qsch03",64,298,64,301,cell_walkable,0;
setcell "que_qsch03",64,298,64,301,cell_shootable,0;
- setcell "que_qsch03",000,251,003,251,cell_walkable,0;
- setcell "que_qsch03",000,251,003,251,cell_shootable,0;
+ setcell "que_qsch03",100,251,103,251,cell_walkable,0;
+ setcell "que_qsch03",100,251,103,251,cell_shootable,0;
end;
OnDisable:
@@ -2863,7 +2865,7 @@ OnInit:
end;
OnDisable:
- killmonster "que_qsch03","Guard of Shadow#sch03_01::OnMyMobDead";
+ killmonster "que_qsch03","Guard of Shadow#sch03_02::OnMyMobDead";
disablenpc "Guard of Shadow#sch03_02";
end;
diff --git a/npc/quests/okolnir/godse_sch04.txt b/npc/quests/okolnir/godse_sch04.txt
index 6bca62310..6a12f5995 100644
--- a/npc/quests/okolnir/godse_sch04.txt
+++ b/npc/quests/okolnir/godse_sch04.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -19,6 +19,8 @@
//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
//= Fixed message on the portal when the okolnir section is full.
//= Corrected non-angry Piamette not disabling.
+//= 1.3 Corrected invalid coordinates in maze. (bugreport:4220)
+//= Corrected typo in Guard of Shadow NPC.
//============================================================
schg_cas04,376,307,3 script Guide#gq_sch04 899,{
@@ -801,7 +803,7 @@ OnTouch:
monster "que_qsch04",102,275,strcharinfo(0),1652,1,"#Gate_manager_sch04::OnMyMobDead";
}
set $gqse_sch04_miro,17;
- warp "que_qsch04",102,281;
+ warp "que_qsch04",102,282;
end;
}
else if ($gqse_sch04_miro == 17) {
@@ -928,7 +930,7 @@ OnTimer6000:
monster "que_qsch04",63,282,"Seyren Windsor",1640,1,"#gq_miromob2_sch04::OnMyMobDead";
monster "que_qsch04",61,243,"Kathryne Keyron",1645,1,"#gq_miromob2_sch04::OnMyMobDead";
monster "que_qsch04",70,249,"Cecil Damon",1644,1,"#gq_miromob2_sch04::OnMyMobDead";
- monster "que_qsch04",102,281,"Margaretha Sorin",1643,1,"#gq_miromob2_sch04::OnMyMobDead";
+ monster "que_qsch04",102,282,"Margaretha Sorin",1643,1,"#gq_miromob2_sch04::OnMyMobDead";
monster "que_qsch04",66,300,"Eremes Guile",1641,1,"#gq_miromob2_sch04::OnMyMobDead";
monster "que_qsch04",57,258,"Howard Alt-Eisen",1642,1,"#gq_miromob2_sch04::OnMyMobDead";
stopnpctimer;
@@ -1255,8 +1257,8 @@ OnEnable:
setcell "que_qsch04",94,256,97,256,cell_shootable,0;
setcell "que_qsch04",64,298,64,301,cell_walkable,0;
setcell "que_qsch04",64,298,64,301,cell_shootable,0;
- setcell "que_qsch04",000,251,003,251,cell_walkable,0;
- setcell "que_qsch04",000,251,003,251,cell_shootable,0;
+ setcell "que_qsch04",100,251,103,251,cell_walkable,0;
+ setcell "que_qsch04",100,251,103,251,cell_shootable,0;
end;
OnDisable:
@@ -2863,7 +2865,7 @@ OnInit:
end;
OnDisable:
- killmonster "que_qsch04","Guard of Shadow#sch04_01::OnMyMobDead";
+ killmonster "que_qsch04","Guard of Shadow#sch04_02::OnMyMobDead";
disablenpc "Guard of Shadow#sch04_02";
end;
diff --git a/npc/quests/okolnir/godse_sch05.txt b/npc/quests/okolnir/godse_sch05.txt
index 36645ebf7..24da32ec6 100644
--- a/npc/quests/okolnir/godse_sch05.txt
+++ b/npc/quests/okolnir/godse_sch05.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -19,6 +19,8 @@
//= 1.2 More bug fixes, sorry it took so long. [L0ne_W0lf]
//= Fixed message on the portal when the okolnir section is full.
//= Corrected non-angry Piamette not disabling.
+//= 1.3 Corrected invalid coordinates in maze. (bugreport:4220)
+//= Corrected typo in Guard of Shadow NPC.
//============================================================
schg_cas05,376,307,3 script Guide#gq_sch05 899,{
@@ -801,7 +803,7 @@ OnTouch:
monster "que_qsch05",102,275,strcharinfo(0),1652,1,"#Gate_manager_sch05::OnMyMobDead";
}
set $gqse_sch05_miro,17;
- warp "que_qsch05",102,281;
+ warp "que_qsch05",102,282;
end;
}
else if ($gqse_sch05_miro == 17) {
@@ -928,7 +930,7 @@ OnTimer6000:
monster "que_qsch05",63,282,"Seyren Windsor",1640,1,"#gq_miromob2_sch05::OnMyMobDead";
monster "que_qsch05",61,243,"Kathryne Keyron",1645,1,"#gq_miromob2_sch05::OnMyMobDead";
monster "que_qsch05",70,249,"Cecil Damon",1644,1,"#gq_miromob2_sch05::OnMyMobDead";
- monster "que_qsch05",102,281,"Margaretha Sorin",1643,1,"#gq_miromob2_sch05::OnMyMobDead";
+ monster "que_qsch05",102,282,"Margaretha Sorin",1643,1,"#gq_miromob2_sch05::OnMyMobDead";
monster "que_qsch05",66,300,"Eremes Guile",1641,1,"#gq_miromob2_sch05::OnMyMobDead";
monster "que_qsch05",57,258,"Howard Alt-Eisen",1642,1,"#gq_miromob2_sch05::OnMyMobDead";
stopnpctimer;
@@ -1255,8 +1257,8 @@ OnEnable:
setcell "que_qsch05",94,256,97,256,cell_shootable,0;
setcell "que_qsch05",64,298,64,301,cell_walkable,0;
setcell "que_qsch05",64,298,64,301,cell_shootable,0;
- setcell "que_qsch05",000,251,003,251,cell_walkable,0;
- setcell "que_qsch05",000,251,003,251,cell_shootable,0;
+ setcell "que_qsch05",100,251,103,251,cell_walkable,0;
+ setcell "que_qsch05",100,251,103,251,cell_shootable,0;
end;
OnDisable:
@@ -2863,7 +2865,7 @@ OnInit:
end;
OnDisable:
- killmonster "que_qsch05","Guard of Shadow#sch05_01::OnMyMobDead";
+ killmonster "que_qsch05","Guard of Shadow#sch05_02::OnMyMobDead";
disablenpc "Guard of Shadow#sch05_02";
end;
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 282647060..066bc8130 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -17,6 +17,7 @@
//= 1.2 Fixed Half-buried Gem#1 not re-enabling. (bugreport:4129)
//= 1.3 Moved misc NPCs to the their respective city file. [L0ne_W0lf]
//= 1.3 Added the "Two Tribes" quest. [L0ne_W0lf]
+//= 1.4 Corrected issues with Otherworld Language. (Bugreport:4147)
//============================================================
// Cat Hand Addition.
@@ -5259,7 +5260,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{
next;
set .@spl_score00,0;
input .@input$;
- if (.@input$ == "TKANTLFDMS") {
+ if (.@input$ == "RLGHLRXLA TKANTLFDMS") {
mes "[Linguist Dictionary]";
mes ""+ .@input$ +"....";
mes "And?";
@@ -5273,7 +5274,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{
next;
}
input .@input$;
- if (.@input$ == "TNAHRDNJSDMFH") {
+ if (.@input$ == "WJACK TNAHRDNJSDMFH") {
mes ""+ .@input$ +"....";
mes "And?";
set .@spl_score02,.@spl_score01+1;
@@ -5286,7 +5287,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{
next;
}
input .@input$;
- if ((.@input$ == "!!") || (.@input$ == "WLSGHKWND")) {
+ if ((.@input$ == "WLSGHKWND !!") || (.@input$ == "WLSGHKWND")) {
mes ""+ .@input$ +"....";
mes "Is that all?";
set .@spl_score03,.@spl_score02+1;
@@ -5324,7 +5325,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{
next;
set .@man_score00,0;
input .@input$;
- if (.@input$ == "CJFDI") {
+ if (.@input$ == "TJDTMFJDNS CJFDI") {
mes "[Linguist Dictionary]";
mes ""+ .@input$ +"....";
mes "And?";
@@ -5338,7 +5339,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{
next;
}
input .@input$;
- if (.@input$ == "QKATOS") {
+ if (.@input$ == "TKADLFDMF QKATOS") {
mes ""+ .@input$ +"....";
mes "And?";
set .@man_score02,.@man_score01+1;
@@ -5351,7 +5352,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{
next;
}
input .@input$;
- if ((.@input$ == "DLFMADMS..") || (.@input$ == "DLFMADMS..")) {
+ if ((.@input$ == "EKDTLSDML DLFMADMS..") || (.@input$ == "EKDTLSDML DLFMADMS")) {
mes ""+ .@input$ +"....";
mes "This is it?";
set .@man_score03,.@man_score02+1;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-14 00:28:22 +0000