summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-12-20 21:45:40 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-12-20 21:45:40 +0000
commit51f2559d6041e8b33353494932012b863585de96 (patch)
tree5bc4aa2b7642133f4f281772915c0c63650a2cd8
parent93853f8a479200c455106a5e2f8fdc2a5f827487 (diff)
downloadhercules-51f2559d6041e8b33353494932012b863585de96.tar.gz
hercules-51f2559d6041e8b33353494932012b863585de96.tar.bz2
hercules-51f2559d6041e8b33353494932012b863585de96.tar.xz
hercules-51f2559d6041e8b33353494932012b863585de96.zip
* More bugfixes, to orc dungeon instance, mostly typos. :O (bugreport:3944)
- Also fixed some of the varaibles (types/values) as well. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14209 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/instances/OrcsMemory.txt28
2 files changed, 18 insertions, 13 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index b66625b24..5333252ec 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,8 @@
Date Added
======
+2009/12/20
+ * Rev. 14209 More bugfixes, to orc dungeon instance, mostly typos. :O (bugreport:3944) [L0ne_W0lf]
+ - Also fixed some of the varaibles (types/values) as well.
2009/12/11
* Rev. 14196 Second round of bugfixes for Orc's Memory. (bugreport:3928) [L0ne_W0lf]
- Fixed first warp never enabling, issue not seen because of a local source mod.
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index b7b1896b3..9c50c41b7 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.1a
+//= 1.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -22,6 +22,8 @@
//= Shaman Cargalache, copy/paste fail.
//= Changed spawn point for dungeon according to spawn
//= point on iRO.
+//= 1.2 More bugfixes, mostly typos. :O (bugreport:3944) [L0ne_W0lf]
+//= Fixed some varaibles (types/values) as well.
//============================================================
// Entrance
@@ -52,7 +54,7 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 406,{
set .@instance, instance_create(.@md_name$, .@party_id);
if (.@instance < 0) {
mes "Party Name: "+.@p_name$+"";
- mes "Party Leader: "+p_reader+"";
+ mes "Party Leader: "+.@p_reader+"";
mes "^0000ff"+.@md_name$+" ^000000 - Reservation Failed.";
close;
}
@@ -227,7 +229,7 @@ gef_fild10,238,202,6 script Mad Scientist#orc 865,{
mes "[Mad Scientist]";
mes "Yeah, yeah.. I know it's hard to belive. I don't blame ya.";
mes "I used to study the Dimensional Gorge discovered near Morroc.";
- mes "According to my reseach, the minerals found there have enormous power insde them!";
+ mes "According to my research, the minerals found there have enormous power inside them!";
next;
break;
case 2:
@@ -336,14 +338,14 @@ OnMyMobDead:
instance_announce 0, "High Orc: We need more defense! Get more people here!",bc_map,"0xff4444";
}
}
- else if ((mob_ran > 26) && (mob_ran < 29)) {
+ else if ((.@mob_ran > 26) && (.@mob_ran < 29)) {
areamonster "1@orcs",41,91,51,81,"High Orc",1213,.@mob_dead_num,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
if (rand(1,10) == 9) {
instance_announce 0, "Where are the High Orcs!? Get them to stop the enemies!",bc_map,"0xff4444";
}
}
else {
- areamonster "1@orcs",17,187,27,177,"High Orc",1213,.@mob_dead_num;
+ areamonster "1@orcs",17,187,27,177,"High Orc",1213,.@mob_dead_num,instance_npcname("#Resurrect Monsters1", instance_id())+"::OnMyMobDead";
if (rand(1,5) == 3) {
instance_announce 0, "Caution: The army's starting to concentrate at Zone No.4.",bc_map,"0x77ff77";
}
@@ -486,7 +488,7 @@ OnInstanceInit:
end;
OnMyMobDead:
- set .@callnum,15;
+ set .@callnum,10;
set .@c_mob_num,mobcount("1@orcs",instance_npcname("#Resurrect Monsters4", instance_id())+"::OnMyMobDead");
set .@mob_dead_num,.@callnum - .@c_mob_num;
if (.@mob_dead_num > 0) {
@@ -685,7 +687,7 @@ OnMyMobDead3:
end;
}
-// Orc's Memory Floor 1
+// Orc's Memory Floor 2
2@orcs,36,171,0 script #2Resurrect Monsters1 844,{
end;
@@ -733,7 +735,7 @@ OnDisable:
OnMyMobDead:
set .@callnum,30;
- set .@c_mob_num,mobcount("2@orcs",instance_npcname("#2Resurrect Monster1", instance_id())+"::OnMyMobDead");
+ set .@c_mob_num,mobcount("2@orcs",instance_npcname("#2Resurrect Monsters1", instance_id())+"::OnMyMobDead");
set .@mob_dead_num,.@callnum - .@c_mob_num;
if (.@mob_dead_num > 0) {
set .@mob_ran,rand(1,30);
@@ -800,7 +802,7 @@ OnEnable:
end;
OnMyMobDead:
- set .@callnum,30;
+ set .@callnum,15;
set .@c_mob_num,mobcount("2@orcs",instance_npcname("#2Resurrect Monsters3", instance_id())+"::OnMyMobDead");
set .@mob_dead_num,.@callnum - .@c_mob_num;
set .@mob_ran,rand(1,30);
@@ -1287,17 +1289,17 @@ OnEnable:
OnMyMobDead:
donpcevent instance_npcname("Kruger#", instance_id())+"::OnEnable";
- set .@mob_ran,rand(1,4);
+ set .@mob_ran,rand(1,5);
if (.@mob_ran == 1) {
instance_announce 0, "Shaman Cargalache: How... How could this be... How could someone like you...!!",bc_map,"0xffff00";
}
- else if (.@mob_ran == 1) {
+ else if (.@mob_ran == 2) {
instance_announce 0, "Shaman Cargalache: How is it that I've been overpowered by mere humans!",bc_map,"0xffff00";
}
- else if (.@mob_ran == 2) {
+ else if (.@mob_ran == 3) {
instance_announce 0, "Shaman Cargalache: This... This can't be the end...",bc_map,"0xffff00";
}
- else if (.@mob_ran == 3) {
+ else if (.@mob_ran == 4) {
instance_announce 0, "Shaman Cargalache: I... Can't die... Yet...!",bc_map,"0xffff00";
}
else {