Instance Dungeons Update

As requested by the community in http://hercules.ws/board/topic/1702-implement-rathena-npc/ we're merging in the latest of rAthena's dungeons, this includes the rewriting of all instance dungeons and the addition of 4 dungeons that were not present previously (BakonawaLake, BangungotHospital, BuwayaCave and OldGlastHeim).
Update also includes the ability for instances to reset (or be destroyed if instance files were disabled/removed) upon @reloadscript, instance scripts are able to control to what stage the instances are to be reset via the instance_set_respawn (reload spawn) script command, OnInstanceInit labels are now triggered when the instance starts via instance_init (and upon reload), they may be used alongside instance variables (which are persistent to @reloadscript) to save players' progress.

- NPC Changelog:
-- npc/instances/EndlessTower.txt
--- 2.2 Instance system rewrite. [Euphy]
--- 2.3 Added some missing announcements. [Euphy]
--- 2.4 Added GM management function. [Euphy]
-- npc/instances/NydhoggsNest.txt
--- 1.5 Instance system rewrite. [Euphy]
--- 1.6 Added GM management NPCs. [Euphy]
-- npc/instances/OrcsMemory.txt
--- 1.7 Instance system rewrite. [Euphy]
-- npc/instances/SealedShrine.txt
--- 2.3 Instance system rewrite. [Euphy]
-- npc/other/gm_npcs.txt
--- 1.0 First version. [Euphy]
-- npc/re/instances/BakonawaLake.txt
--- 1.0 First version. [Euphy]
--- 1.1 Added GM management NPC. [Euphy]
-- npc/re/instances/BangungotHospital.txt
--- 1.0 First version. [Euphy]
--- 1.1 Added GM management function. [Euphy]
-- npc/re/instances/BuwayaCave.txt
--- 1.0 First version. [Euphy]
-- npc/re/instances/HazyForest.txt
--- 1.1 Instance system rewrite. [Euphy]
-- npc/re/instances/MalangdoCulvert.txt
--- 1.0b Fixed incorrect use of 'close'. [Joseph]
--- 1.1 Instance system rewrite. [Euphy]
-- npc/re/instances/OctopusCave.txt
--- 1.1 Instance system rewrite. [Euphy]
-- npc/re/instances/OldGlastHeim.txt
--- 1.0 First version. [Euphy]

Special Thanks to Haru, Uziel for their contributions to this update, and ossi0110 for helping us debug it.

Signed-off-by: shennetsind <ind@henn.et>

1 files changed, 253 insertions, 262 deletions

diff --git a/npc/re/instances/OctopusCave.txt b/npc/re/instances/OctopusCave.txt
index 7eaf25a9c..c6216bfb3 100644
--- a/npc/re/instances/OctopusCave.txt
+++ b/npc/re/instances/OctopusCave.txt
@@ -1,18 +1,20 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ====================================== 
 //= Octopus Cave
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
+//= 1.1
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= Defeat the Disgusting Octopus.
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [Euphy]
+//= 1.1 Instance system rewrite. [Euphy]
 //============================================================ 
 
+1@cash	mapflag	src4instance
+//============================================================
+
 // Instance Creation
 //============================================================
 mal_dun01,151,235,5	script	Starfish	551,{
@@ -39,7 +41,7 @@ mal_dun01,151,235,5	script	Starfish	551,{
 	mes "It is just roughly blocked for now.";
 	mes "But someday this cave must be sealed forever, hehe!";
 	next;
-	while (1) {
+	while(1) {
 		switch(select("Ask what's going on.:Ask to open the gate.:Go to other location.")) {
 		case 1:
 			mes "[Starfish]";
@@ -83,7 +85,7 @@ mal_dun01,151,235,5	script	Starfish	551,{
 			}
 			if (.@playtime == 2) erasequest 4197;
 			if (countitem(6442)) {
-				set .@instance, instance_create(.@md_name$,.@party_id);
+				set .@instance,instance_create(.@md_name$,.@party_id);
 				if (.@instance < 0) {
 					mes "[Starfish]";
 					mes "Party name is... "+getpartyname(.@party_id)+".";
@@ -97,32 +99,9 @@ mal_dun01,151,235,5	script	Starfish	551,{
 					instance_destroy(.@instance);
 					close;
 				}
-				instance_attach(.@instance);
 				instance_set_timeout 3600,300,.@instance;
 				instance_init(.@instance);
-
-				donpcevent instance_npcname("oct_enter", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_enter_broad", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_foot_4", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_foot1", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_foot_exit1", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_foot2", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_foot_exit2", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_foot3", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_foot_exit3", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_foot4", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_foot_exit4", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_mob_con", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_backattack1", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_backattack2", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_backattack3", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_backattack4", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_boss_con", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_boss_foot", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_boss_warp", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_exit_1", instance_id())+"::OnInstanceInit";
-				donpcevent instance_npcname("oct_exit_2", instance_id())+"::OnInstanceInit";
-
+				
 				mes "[Starfish]";
 				mes "I will open the gate for a while to ^0000ff"+.@md_name$+"^000000.";
 				mes "Please catch that pervert octopus,";
@@ -150,7 +129,6 @@ mal_dun01,153,237,5	script	Weird Entrance	844,{
 	switch(select("Go in.:Stop.")) {
 	case 1:
 		if (countitem(6442)) {
-			// TODO: Add official MD_Enter cases.
 			if (has_instance("1@cash") == "") {
 				if (checkquest(4197,PLAYTIME) == 0 || checkquest(4197,PLAYTIME) == 1) {
 					mes "[Starfish]";
@@ -167,7 +145,7 @@ mal_dun01,153,237,5	script	Weird Entrance	844,{
 			mapannounce "mal_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member started to hunt the Octopus!",bc_map,"0x00ff99";
 			if (checkquest(4197) == -1) setquest 4197;
 			warp "1@cash",199,99;
-			close;
+			end;
 		}
 		mes "[Starfish]";
 		mes "You should definitely prepare";
@@ -186,169 +164,170 @@ mal_dun01,153,237,5	script	Weird Entrance	844,{
 //============================================================
 1@cash,199,99,0	script	oct_enter	139,4,4,{
 	end;
-OnInstanceInit:
-	enablenpc instance_npcname("oct_enter", instance_id());
-	end;
 OnTouch:
-	donpcevent instance_npcname("oct_enter_broad", instance_id())+"::OnEnable";
+	donpcevent instance_npcname("oct_enter_broad")+"::OnEnable";
 	specialeffect EF_BASH;
-	disablenpc instance_npcname("oct_enter", instance_id());
+	disablenpc instance_npcname("oct_enter");
 	end;
 }
 
 1@cash,1,1,0	script	oct_enter_broad	-1,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("oct_enter_broad", instance_id())+"::OnDisable";
+	donpcevent instance_npcname("oct_enter_broad")+"::OnDisable";
 	end;
 OnEnable:
-	enablenpc instance_npcname("oct_enter_broad", instance_id());
-	donpcevent instance_npcname("oct_foot_4", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("oct_mob_con", instance_id())+"::OnEnable";
+	enablenpc instance_npcname("oct_enter_broad");
+	donpcevent instance_npcname("oct_foot_4")+"::OnEnable";
+	donpcevent instance_npcname("oct_mob_con")+"::OnEnable";
 	initnpctimer;
 	end;
 OnDisable:
-	disablenpc instance_npcname("oct_enter_broad", instance_id());
+	disablenpc instance_npcname("oct_enter_broad");
 	end;
 OnTimer1000:
-	instance_announce 0,"Pervert Octopus : How dare you to come inside of my place!",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@cash"),"Pervert Octopus : How dare you to come inside of my place!",bc_map,"0xFFFF00";
 	end;
 OnTimer4000:
-	instance_announce 0,"Pervert Octopus : But I blocked all the cave gates!! There is nothing you can do!",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@cash"),"Pervert Octopus : But I blocked all the cave gates!! There is nothing you can do!",bc_map,"0xFFFF00";
 	end;
 OnTimer7000:
-	instance_announce 0,"Pervert Octopus : My juniors~ There is your toy! Play with it~ kakaka",bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@cash"),"Pervert Octopus : My juniors~ There is your toy! Play with it~ kakaka",bc_map,"0xFFFF00";
 	stopnpctimer;
-	donpcevent instance_npcname("oct_enter_broad", instance_id())+"::OnDisable";
+	donpcevent instance_npcname("oct_enter_broad")+"::OnDisable";
 	end;
 }
 
 1@cash,3,3,0	script	oct_foot_4	-1,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("oct_foot_4", instance_id())+"::OnDisable";
+	donpcevent instance_npcname("oct_foot_4")+"::OnDisable";
 	end;
 OnEnable:
-	enablenpc instance_npcname("oct_foot_4", instance_id());
-	donpcevent instance_npcname("oct_foot1", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("oct_foot2", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("oct_foot3", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("oct_foot4", instance_id())+"::OnEnable";
-	monster "1@cash",20,114,"Octopus Leg#1",2193,1,instance_npcname("oct_foot_4", instance_id())+"::OnMyMobDead";
-	monster "1@cash",88,190,"Octopus Leg#2",2193,1,instance_npcname("oct_foot_4", instance_id())+"::OnMyMobDead";
-	monster "1@cash",307,215,"Octopus Leg#3",2193,1,instance_npcname("oct_foot_4", instance_id())+"::OnMyMobDead";
-	monster "1@cash",372,131,"Octopus Leg#4",2193,1,instance_npcname("oct_foot_4", instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname("oct_foot_4");
+	donpcevent instance_npcname("oct_foot1")+"::OnEnable";
+	donpcevent instance_npcname("oct_foot2")+"::OnEnable";
+	donpcevent instance_npcname("oct_foot3")+"::OnEnable";
+	donpcevent instance_npcname("oct_foot4")+"::OnEnable";
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,20,114,"Octopus Leg#1",2193,1,instance_npcname("oct_foot_4")+"::OnMyMobDead";
+	monster .@map$,88,190,"Octopus Leg#2",2193,1,instance_npcname("oct_foot_4")+"::OnMyMobDead";
+	monster .@map$,307,215,"Octopus Leg#3",2193,1,instance_npcname("oct_foot_4")+"::OnMyMobDead";
+	monster .@map$,372,131,"Octopus Leg#4",2193,1,instance_npcname("oct_foot_4")+"::OnMyMobDead";
 	end;
 OnDisable:
-	disablenpc instance_npcname("oct_foot_4", instance_id());
+	disablenpc instance_npcname("oct_foot_4");
 	end;
 OnMyMobDead:
-	if (mobcount("1@cash",instance_npcname("oct_foot_4", instance_id())+"::OnMyMobDead") < 1) {
-		donpcevent instance_npcname("oct_boss_con", instance_id())+"::OnEnable";
-		instance_announce 0,"Hey you!! I'll personally take care of you all! Let's bring it on!",bc_map,"0x00ff99";
-		enablenpc instance_npcname("oct_boss_warp", instance_id());
-		instance_warpall "1@cash",199,99;
+	set .@map$, instance_mapname("1@cash");
+	if (mobcount(.@map$,instance_npcname("oct_foot_4")+"::OnMyMobDead") < 1) {
+		donpcevent instance_npcname("oct_boss_con")+"::OnEnable";
+		mapannounce .@map$,"Hey you!! I'll personally take care of you all! Let's bring it on!",bc_map,"0x00ff99";
+		enablenpc instance_npcname("oct_boss_warp");
+		instance_warpall .@map$,199,99;
 		end;
 	}
-	instance_announce 0,"Arrgg!! That hurts!!! I need another strategy...",bc_map,"0x00ff99";
+	mapannounce .@map$,"Arrgg!! That hurts!!! I need another strategy...",bc_map,"0x00ff99";
 	end;
 }
 
 1@cash,20,114,0	script	oct_foot1	139,6,6,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname(strnpcinfo(0), instance_id())+"::OnDisable";
+	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
 	end;
 OnEnable:
-	enablenpc instance_npcname(strnpcinfo(0), instance_id());
-	set .@label$, instance_npcname(strnpcinfo(0), instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname(strnpcinfo(0));
+	set .@label$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
 	set .@i, atoi(charat(strnpcinfo(0),8));
+	set .@map$, instance_mapname("1@cash");
 	switch(.@i) {
 	case 1:
-		areamonster "1@cash",34,96,38,100,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",39,90,41,92,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",38,76,40,78,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",39,58,41,60,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",50,38,56,44,"Octopus's Henchman",2192,5,.@label$;
-		areamonster "1@cash",68,32,72,36,"Octopus's Henchman",2192,5,.@label$;
-		areamonster "1@cash",83,26,85,28,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",107,28,109,30,"Octopus's Henchman",2192,1,.@label$;
-		areamonster "1@cash",123,28,125,30,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",134,31,138,35,"Octopus's Henchman",2192,5,.@label$;
-		areamonster "1@cash",142,39,146,43,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,34,96,38,100,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,39,90,41,92,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,38,76,40,78,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,39,58,41,60,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,50,38,56,44,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,68,32,72,36,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,83,26,85,28,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,107,28,109,30,"Octopus's Henchman",2192,1,.@label$;
+		areamonster .@map$,123,28,125,30,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,134,31,138,35,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,142,39,146,43,"Octopus's Henchman",2192,2,.@label$;
 		break;
 	case 2:
-		areamonster "1@cash",139,113,143,117,"Octopus's Henchman",2192,5,.@label$;
-		areamonster "1@cash",135,104,137,106,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",123,93,127,97,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",113,90,115,92,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",103,89,105,91,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",89,90,91,92,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",74,104,76,106,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",74,120,76,122,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",83,131,87,135,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",92,142,94,144,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",98,159,100,161,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",94,180,98,184,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,139,113,143,117,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,135,104,137,106,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,123,93,127,97,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,113,90,115,92,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,103,89,105,91,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,89,90,91,92,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,74,104,76,106,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,74,120,76,122,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,83,131,87,135,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,92,142,94,144,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,98,159,100,161,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,94,180,98,184,"Octopus's Henchman",2192,5,.@label$;
 		break;
 	case 3:
-		areamonster "1@cash",299,209,303,213,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",292,203,296,207,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",291,186,293,188,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",292,166,294,168,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",293,151,295,153,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",299,137,303,141,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",300,123,304,127,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",300,104,304,108,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",279,101,281,103,"Octopus's Henchman",2192,2,.@label$;
-		monster "1@cash",260,103,"Octopus's Henchman",2192,1,.@label$;
+		areamonster .@map$,299,209,303,213,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,292,203,296,207,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,291,186,293,188,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,292,166,294,168,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,293,151,295,153,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,299,137,303,141,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,300,123,304,127,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,300,104,304,108,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,279,101,281,103,"Octopus's Henchman",2192,2,.@label$;
+		monster .@map$,260,103,"Octopus's Henchman",2192,1,.@label$;
 		break;
 	case 4:
-		areamonster "1@cash",363,123,367,127,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",364,108,368,112,"Octopus's Henchman",2192,5,.@label$;
-		areamonster "1@cash",363,93,367,97,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",364,72,366,74,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",364,58,366,60,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",355,44,359,48,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",346,36,350,40,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",319,28,325,34,"Octopus's Henchman",2192,5,.@label$;
-		areamonster "1@cash",305,27,307,29,"Octopus's Henchman",2192,2,.@label$;
-		areamonster "1@cash",276,29,280,33,"Octopus's Henchman",2192,5,.@label$;
-		areamonster "1@cash",258,37,262,41,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,363,123,367,127,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,364,108,368,112,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,363,93,367,97,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,364,72,366,74,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,364,58,366,60,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,355,44,359,48,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,346,36,350,40,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,319,28,325,34,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,305,27,307,29,"Octopus's Henchman",2192,2,.@label$;
+		areamonster .@map$,276,29,280,33,"Octopus's Henchman",2192,5,.@label$;
+		areamonster .@map$,258,37,262,41,"Octopus's Henchman",2192,2,.@label$;
 		break;
 	}
 	end;
 OnDisable:
-	killmonster "1@cash",instance_npcname(strnpcinfo(0), instance_id())+"::OnMyMobDead"; // Not in official script.
-	disablenpc instance_npcname(strnpcinfo(0), instance_id());
+	killmonster instance_mapname("1@cash"),instance_npcname(strnpcinfo(0))+"::OnMyMobDead"; // Not in official script.
+	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 OnTouch:
 	if (getd("."+strnpcinfo(0)+instance_id())) end;
 	setd "."+strnpcinfo(0)+instance_id(),1;
-	hideonnpc instance_npcname(strnpcinfo(0), instance_id());
-	instance_announce 0,"Come out all my babies and help me out!",bc_map,"0xFFFF00";
+	hideonnpc instance_npcname(strnpcinfo(0));
+	mapannounce instance_mapname("1@cash"),"Come out all my babies and help me out!",bc_map,"0xFFFF00";
 	initnpctimer;
 	end;
 OnTimer5000:
-	instance_announce 0,"Let's give them a lesson!",bc_map,"0xFFFF00";
-	set .@label$, instance_npcname(strnpcinfo(0), instance_id())+"::OnMyMobDead";
+	set .@map$, instance_mapname("1@cash");
+	mapannounce .@map$,"Let's give them a lesson!",bc_map,"0xFFFF00";
+	set .@label$, instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
 	set .@i, atoi(charat(strnpcinfo(0),8));
 	switch(.@i) {
 	case 1:
-		areamonster "1@cash",18,112,22,116,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",18,112,22,116,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,18,112,22,116,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,18,112,22,116,"Octopus's Henchman",2192,3,.@label$;
 		break;
 	case 2:
-		areamonster "1@cash",86,188,90,192,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",96,98,100,102,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,86,188,90,192,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,96,98,100,102,"Octopus's Henchman",2192,3,.@label$;
 		break;
 	case 3:
-		areamonster "1@cash",305,213,309,217,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",305,213,309,217,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,305,213,309,217,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,305,213,309,217,"Octopus's Henchman",2192,3,.@label$;
 		break;
 	case 4:
-		areamonster "1@cash",370,129,374,133,"Octopus's Henchman",2192,3,.@label$;
-		areamonster "1@cash",370,129,374,133,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,370,129,374,133,"Octopus's Henchman",2192,3,.@label$;
+		areamonster .@map$,370,129,374,133,"Octopus's Henchman",2192,3,.@label$;
 		break;
 	}
 	end;
@@ -356,17 +335,18 @@ OnTimer30000:
 	setd "."+strnpcinfo(0)+instance_id(),0;
 	stopnpctimer;
 	set .@i, atoi(charat(strnpcinfo(0),8));
-	donpcevent instance_npcname("oct_foot_exit"+.@i, instance_id())+"::OnEnable";
-	donpcevent instance_npcname(strnpcinfo(0), instance_id())+"::OnDisable";
+	donpcevent instance_npcname("oct_foot_exit"+.@i)+"::OnEnable";
+	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
 	end;
 OnMyMobDead:
-	if (mobcount("1@cash",instance_npcname(strnpcinfo(0), instance_id())+"::OnMyMobDead") < 1) {
-		instance_announce 0,"You hurt my babies!!? You'll have to pay for this!!!",bc_map,"0x00ff99";
+	set .@map$, instance_mapname("1@cash");
+	if (mobcount(.@map$,instance_npcname(strnpcinfo(0))+"::OnMyMobDead") < 1) {
+		mapannounce .@map$,"You hurt my babies!!? You'll have to pay for this!!!",bc_map,"0x00ff99";
 		setd "."+strnpcinfo(0)+instance_id(),0;
 		stopnpctimer;
 		set .@i, atoi(charat(strnpcinfo(0),8));
-		donpcevent instance_npcname("oct_foot_exit"+.@i, instance_id())+"::OnEnable";
-		donpcevent instance_npcname(strnpcinfo(0), instance_id())+"::OnDisable";
+		donpcevent instance_npcname("oct_foot_exit"+.@i)+"::OnEnable";
+		donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
 		end;
 	}
 	end;
@@ -378,13 +358,13 @@ OnMyMobDead:
 1@cash,16,117,0	script	oct_foot_exit1	45,2,2,{
 	end;
 OnInstanceInit:
-	disablenpc instance_npcname(strnpcinfo(0), instance_id());
+	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 OnEnable:
-	enablenpc instance_npcname(strnpcinfo(0), instance_id());
+	enablenpc instance_npcname(strnpcinfo(0));
 	end;
 OnTouch:
-	warp "1@cash",198,99;
+	warp instance_mapname("1@cash"),198,99;
 	end;
 }
 1@cash,77,193,0	duplicate(oct_foot_exit1)	oct_foot_exit2	45,2,2
@@ -394,196 +374,205 @@ OnTouch:
 1@cash,15,15,0	script	oct_mob_con	-1,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("oct_mob_con", instance_id())+"::OnDisable";
+	donpcevent instance_npcname("oct_mob_con")+"::OnDisable";
 	end;
 OnEnable:
-	enablenpc instance_npcname("oct_mob_con", instance_id());
-	monster "1@cash",32,94,"Hydra",1068,1;
-	monster "1@cash",41,101,"Hydra",1068,1;
-	monster "1@cash",35,78,"Hydra",1068,1;
-	monster "1@cash",35,62,"Hydra",1068,1;
-	monster "1@cash",49,54,"Hydra",1068,1;
-	monster "1@cash",70,28,"Hydra",1068,1;
-	monster "1@cash",83,22,"Hydra",1068,1;
-	monster "1@cash",99,23,"Hydra",1068,1;
-	monster "1@cash",115,23,"Hydra",1068,1;
-	monster "1@cash",132,25,"Hydra",1068,1;
-	monster "1@cash",100,185,"Hydra",1068,1;
-	monster "1@cash",92,178,"Hydra",1068,1;
-	monster "1@cash",92,162,"Hydra",1068,1;
-	monster "1@cash",70,121,"Hydra",1068,1;
-	monster "1@cash",70,105,"Hydra",1068,1;
-	monster "1@cash",105,85,"Hydra",1068,1;
-	monster "1@cash",121,84,"Hydra",1068,1;
-	monster "1@cash",292,209,"Hydra",1068,1;
-	monster "1@cash",303,206,"Hydra",1068,1;
-	monster "1@cash",290,163,"Hydra",1068,1;
-	monster "1@cash",299,150,"Hydra",1068,1;
-	monster "1@cash",308,141,"Hydra",1068,1;
-	monster "1@cash",308,125,"Hydra",1068,1;
-	monster "1@cash",295,97,"Hydra",1068,1;
-	monster "1@cash",279,97,"Hydra",1068,1;
-	monster "1@cash",370,111,"Hydra",1068,1;
-	monster "1@cash",370,110,"Hydra",1068,1;
-	monster "1@cash",371,96,"Hydra",1068,1;
-	monster "1@cash",371,80,"Hydra",1068,1;
-	monster "1@cash",367,55,"Hydra",1068,1;
-	monster "1@cash",343,29,"Hydra",1068,1;
-	monster "1@cash",327,24,"Hydra",1068,1;
-	monster "1@cash",311,22,"Hydra",1068,1;
-	monster "1@cash",295,22,"Hydra",1068,1;
-	monster "1@cash",279,22,"Hydra",1068,1;
-	areamonster "1@cash",30,67,50,87,"Stapo",1784,1;
-	areamonster "1@cash",102,19,122,39,"Stapo",1784,1;
-	areamonster "1@cash",89,138,109,158,"Stapo",1784,1;
-	areamonster "1@cash",112,83,132,103,"Stapo",1784,1;
-	areamonster "1@cash",283,168,303,188,"Stapo",1784,1;
-	areamonster "1@cash",292,97,312,117,"Stapo",1784,1;
-	areamonster "1@cash",355,64,375,84,"Stapo",1784,1;
-	areamonster "1@cash",317,17,337,37,"Stapo",1784,1;
-	donpcevent instance_npcname("oct_backattack1", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("oct_backattack2", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("oct_backattack3", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("oct_backattack4", instance_id())+"::OnEnable";
-	donpcevent instance_npcname("oct_mob_con", instance_id())+"::OnDisable";
+	set .@map$, instance_mapname("1@cash");
+	enablenpc instance_npcname("oct_mob_con");
+	monster .@map$,32,94,"Hydra",1068,1;
+	monster .@map$,41,101,"Hydra",1068,1;
+	monster .@map$,35,78,"Hydra",1068,1;
+	monster .@map$,35,62,"Hydra",1068,1;
+	monster .@map$,49,54,"Hydra",1068,1;
+	monster .@map$,70,28,"Hydra",1068,1;
+	monster .@map$,83,22,"Hydra",1068,1;
+	monster .@map$,99,23,"Hydra",1068,1;
+	monster .@map$,115,23,"Hydra",1068,1;
+	monster .@map$,132,25,"Hydra",1068,1;
+	monster .@map$,100,185,"Hydra",1068,1;
+	monster .@map$,92,178,"Hydra",1068,1;
+	monster .@map$,92,162,"Hydra",1068,1;
+	monster .@map$,70,121,"Hydra",1068,1;
+	monster .@map$,70,105,"Hydra",1068,1;
+	monster .@map$,105,85,"Hydra",1068,1;
+	monster .@map$,121,84,"Hydra",1068,1;
+	monster .@map$,292,209,"Hydra",1068,1;
+	monster .@map$,303,206,"Hydra",1068,1;
+	monster .@map$,290,163,"Hydra",1068,1;
+	monster .@map$,299,150,"Hydra",1068,1;
+	monster .@map$,308,141,"Hydra",1068,1;
+	monster .@map$,308,125,"Hydra",1068,1;
+	monster .@map$,295,97,"Hydra",1068,1;
+	monster .@map$,279,97,"Hydra",1068,1;
+	monster .@map$,370,111,"Hydra",1068,1;
+	monster .@map$,370,110,"Hydra",1068,1;
+	monster .@map$,371,96,"Hydra",1068,1;
+	monster .@map$,371,80,"Hydra",1068,1;
+	monster .@map$,367,55,"Hydra",1068,1;
+	monster .@map$,343,29,"Hydra",1068,1;
+	monster .@map$,327,24,"Hydra",1068,1;
+	monster .@map$,311,22,"Hydra",1068,1;
+	monster .@map$,295,22,"Hydra",1068,1;
+	monster .@map$,279,22,"Hydra",1068,1;
+	areamonster .@map$,30,67,50,87,"Stapo",1784,1;
+	areamonster .@map$,102,19,122,39,"Stapo",1784,1;
+	areamonster .@map$,89,138,109,158,"Stapo",1784,1;
+	areamonster .@map$,112,83,132,103,"Stapo",1784,1;
+	areamonster .@map$,283,168,303,188,"Stapo",1784,1;
+	areamonster .@map$,292,97,312,117,"Stapo",1784,1;
+	areamonster .@map$,355,64,375,84,"Stapo",1784,1;
+	areamonster .@map$,317,17,337,37,"Stapo",1784,1;
+	donpcevent instance_npcname("oct_backattack1")+"::OnEnable";
+	donpcevent instance_npcname("oct_backattack2")+"::OnEnable";
+	donpcevent instance_npcname("oct_backattack3")+"::OnEnable";
+	donpcevent instance_npcname("oct_backattack4")+"::OnEnable";
+	donpcevent instance_npcname("oct_mob_con")+"::OnDisable";
 	end;
 OnDisable:
-	disablenpc instance_npcname("oct_mob_con", instance_id());
+	disablenpc instance_npcname("oct_mob_con");
 	end;
 }
 
 1@cash,45,53,0	script	oct_backattack1	139,3,3,{
 	end;
 OnInstanceInit:
-	disablenpc instance_npcname("oct_backattack1", instance_id());
+	disablenpc instance_npcname("oct_backattack1");
 	end;
 OnTouch:
-	monster "1@cash",39,59,"Hydra",1068,1;
-	monster "1@cash",40,59,"Hydra",1068,1;
-	monster "1@cash",41,59,"Hydra",1068,1;
-	monster "1@cash",47,50,"Hydra",1068,1;
-	monster "1@cash",48,50,"Hydra",1068,1;
-	monster "1@cash",49,50,"Hydra",1068,1;
-	monster "1@cash",41,53,"Octopus's Henchman",2192,1;
-	instance_announce 0,"Don't let them break through, stop them!!!",bc_map,"0x00ff99";
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,39,59,"Hydra",1068,1;
+	monster .@map$,40,59,"Hydra",1068,1;
+	monster .@map$,41,59,"Hydra",1068,1;
+	monster .@map$,47,50,"Hydra",1068,1;
+	monster .@map$,48,50,"Hydra",1068,1;
+	monster .@map$,49,50,"Hydra",1068,1;
+	monster .@map$,41,53,"Octopus's Henchman",2192,1;
+	mapannounce .@map$,"Don't let them break through, stop them!!!",bc_map,"0x00ff99";
 	specialeffect EF_BASH;
-	disablenpc instance_npcname("oct_backattack1", instance_id());
+	disablenpc instance_npcname("oct_backattack1");
 	end;
 OnEnable:
-	enablenpc instance_npcname("oct_backattack1", instance_id());
+	enablenpc instance_npcname("oct_backattack1");
 	end;
 }
 
 1@cash,78,99,0	script	oct_backattack2	139,3,3,{
 	end;
 OnInstanceInit:
-	disablenpc instance_npcname("oct_backattack2", instance_id());
+	disablenpc instance_npcname("oct_backattack2");
 	end;
 OnTouch:
 	if (getd("."+instance_id())) end;
 	setd "."+instance_id(),1;
 	initnpctimer;
-	monster "1@cash",71,105,"Octopus's Henchman ",2192,1;
-	instance_announce 0,"Headquarters are empty, GO!!!",bc_map,"0x00ff99";
-	hideonnpc instance_npcname("oct_backattack2", instance_id());
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,71,105,"Octopus's Henchman ",2192,1;
+	mapannounce .@map$,"Headquarters are empty, GO!!!",bc_map,"0x00ff99";
+	hideonnpc instance_npcname("oct_backattack2");
 	end;
 OnTimer2000:
-	monster "1@cash",71,105,"Octopus's Henchman ",2192,1;
-	instance_announce 0,"Run, RUN! Go, GO!!!",bc_map,"0x00ff99";
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,71,105,"Octopus's Henchman ",2192,1;
+	mapannounce .@map$,"Run, RUN! Go, GO!!!",bc_map,"0x00ff99";
 	end;
 OnTimer4000:
-	monster "1@cash",71,105,"Octopus's Henchman ",2192,1;
-	instance_announce 0,"No time, come out fast!",bc_map,"0x00ff99";
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,71,105,"Octopus's Henchman ",2192,1;
+	mapannounce .@map$,"No time, come out fast!",bc_map,"0x00ff99";
 	end;
 OnTimer6000:
-	monster "1@cash",71,105,"Octopus's Henchman ",2192,3;
-	instance_announce 0,"Let's take over the headquarters!!!",bc_map,"0x00ff99";
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,71,105,"Octopus's Henchman ",2192,3;
+	mapannounce .@map$,"Let's take over the headquarters!!!",bc_map,"0x00ff99";
 	end;
 OnTimer8000:
-	monster "1@cash",71,105,"Octopus's Henchman ",2192,1;
-	instance_announce 0,"There is no time to lose, hurry up!!!",bc_map,"0x00ff99";
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,71,105,"Octopus's Henchman ",2192,1;
+	mapannounce .@map$,"There is no time to lose, hurry up!!!",bc_map,"0x00ff99";
 	stopnpctimer;
 	end;
 OnEnable:
-	enablenpc instance_npcname("oct_backattack2", instance_id());
+	enablenpc instance_npcname("oct_backattack2");
 	end;
 }
 
 1@cash,299,144,0	script	oct_backattack3	139,3,3,{
 	end;
 OnInstanceInit:
-	disablenpc instance_npcname("oct_backattack2", instance_id());
+	disablenpc instance_npcname("oct_backattack3");
 	end;
 OnTouch:
 	if (getd("."+instance_id())) end;
 	setd "."+instance_id(),1;
-	monster "1@cash",293,153,"Octopus's Henchman ",2192,1;
-	monster "1@cash",294,152,"Octopus's Henchman ",2192,1;
-	monster "1@cash",292,153,"Octopus's Henchman ",2192,1;
-	monster "1@cash",293,151,"Octopus's Henchman ",2192,1;
-	monster "1@cash",293,152,"Octopus's Henchman ?",2175,1;
-	instance_announce 0,"Kakaka! Suprised??!!",bc_map,"0x00ff99";
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,293,153,"Octopus's Henchman ",2192,1;
+	monster .@map$,294,152,"Octopus's Henchman ",2192,1;
+	monster .@map$,292,153,"Octopus's Henchman ",2192,1;
+	monster .@map$,293,151,"Octopus's Henchman ",2192,1;
+	monster .@map$,293,152,"Octopus's Henchman ?",2175,1;
+	mapannounce .@map$,"Kakaka! Suprised??!!",bc_map,"0x00ff99";
 	initnpctimer;
-	hideonnpc instance_npcname("oct_backattack3", instance_id());
+	hideonnpc instance_npcname("oct_backattack3");
 	end;
 OnTimer5000:
-	instance_announce 0,"... Looks like we have a spy among us.",bc_map,"0x00ff99";
+	mapannounce instance_mapname("1@cash"),"... Looks like we have a spy among us.",bc_map,"0x00ff99";
 	stopnpctimer;
 	end;
 OnEnable:
-	enablenpc instance_npcname("oct_backattack3", instance_id());
+	enablenpc instance_npcname("oct_backattack3");
 	end;
 }
 
 1@cash,336,36,0	script	oct_backattack4	139,3,3,{
 	end;
 OnInstanceInit:
-	disablenpc instance_npcname("oct_backattack2", instance_id());
+	disablenpc instance_npcname("oct_backattack4");
 	end;
 OnTouch:
 	if (getd("."+instance_id())) end;
 	setd "."+instance_id(),1;
-	monster "1@cash",332,37,"Octopus's Henchman ",2192,1;
-	monster "1@cash",332,36,"Octopus's Henchman ",2192,1;
-	monster "1@cash",332,35,"Octopus's Henchman ",2192,1;
-	monster "1@cash",332,34,"Octopus's Henchman ",2192,1;
-	monster "1@cash",341,37,"Octopus's Henchman ",2192,1;
-	monster "1@cash",341,36,"Octopus's Henchman ",2192,1;
-	monster "1@cash",341,35,"Octopus's Henchman ",2192,1;
-	monster "1@cash",341,34,"Octopus's Henchman ",2192,1;
-	monster "1@cash",260,40,"Mercenary Squid",2175,1;
-	monster "1@cash",260,41,"Mercenary Squid",2175,1;
-	monster "1@cash",260,39,"Mercenary Squid",2175,1;
-	monster "1@cash",259,40,"Mercenary Squid",2175,1;
-	monster "1@cash",261,40,"Mercenary Squid",2175,1;
-	instance_announce 0,"What a successful pincer tactic! The enemy is strong! Let's not lose yourselves! Anyway, where are all the mercenaries??",bc_map,"0x00ff99";
+	set .@map$, instance_mapname("1@cash");
+	monster .@map$,332,37,"Octopus's Henchman ",2192,1;
+	monster .@map$,332,36,"Octopus's Henchman ",2192,1;
+	monster .@map$,332,35,"Octopus's Henchman ",2192,1;
+	monster .@map$,332,34,"Octopus's Henchman ",2192,1;
+	monster .@map$,341,37,"Octopus's Henchman ",2192,1;
+	monster .@map$,341,36,"Octopus's Henchman ",2192,1;
+	monster .@map$,341,35,"Octopus's Henchman ",2192,1;
+	monster .@map$,341,34,"Octopus's Henchman ",2192,1;
+	monster .@map$,260,40,"Mercenary Squid",2175,1;
+	monster .@map$,260,41,"Mercenary Squid",2175,1;
+	monster .@map$,260,39,"Mercenary Squid",2175,1;
+	monster .@map$,259,40,"Mercenary Squid",2175,1;
+	monster .@map$,261,40,"Mercenary Squid",2175,1;
+	mapannounce .@map$,"What a successful pincer tactic! The enemy is strong! Let's not lose yourselves! Anyway, where are all the mercenaries??",bc_map,"0x00ff99";
 	initnpctimer;
-	hideonnpc instance_npcname("oct_backattack4", instance_id());
+	hideonnpc instance_npcname("oct_backattack4");
 	end;
 OnTimer5000:
-	instance_announce 0,"Mercenary Squid : eh...eh... wrong direction. No enemies are shown in this direction.",bc_map,"0x00ff99";
+	mapannounce instance_mapname("1@cash"),"Mercenary Squid : eh...eh... wrong direction. No enemies are shown in this direction.",bc_map,"0x00ff99";
 	end;
 OnTimer7000:
-	instance_announce 0,"Pervert Octopus : Fools! Can't you read the map??!! Useless!!",bc_map,"0x00ff99";
+	mapannounce instance_mapname("1@cash"),"Pervert Octopus : Fools! Can't you read the map??!! Useless!!",bc_map,"0x00ff99";
 	stopnpctimer;
 	end;
 OnEnable:
-	enablenpc instance_npcname("oct_backattack4", instance_id());
+	enablenpc instance_npcname("oct_backattack4");
 	end;
 }
 
 1@cash,2,2,0	script	oct_boss_con	-1,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("oct_boss_con", instance_id())+"::OnDisable";
+	donpcevent instance_npcname("oct_boss_con")+"::OnDisable";
 	end;
 OnDisable:
-	disablenpc instance_npcname("oct_boss_con", instance_id());
+	disablenpc instance_npcname("oct_boss_con");
 	end;
 OnEnable:
-	enablenpc instance_npcname("oct_boss_con", instance_id());
-	donpcevent instance_npcname("oct_boss_foot", instance_id())+"::OnEnable";
-	monster "1@cash",199,188,"Disgusting Octopus",2194,1,instance_npcname("oct_boss_con", instance_id())+"::OnMyMobDead";
+	enablenpc instance_npcname("oct_boss_con");
+	donpcevent instance_npcname("oct_boss_foot")+"::OnEnable";
+	monster instance_mapname("1@cash"),199,188,"Disgusting Octopus",2194,1,instance_npcname("oct_boss_con")+"::OnMyMobDead";
 	initnpctimer;
 	end;
 OnTimer7000:
@@ -631,16 +620,17 @@ OnTimer49000:
 	initnpctimer;
 	end;
 OnAnnounce:
-	instance_announce 0,"Disgusting Octopus : "+getarg(rand(3)),bc_map,"0xFFFF00";
+	mapannounce instance_mapname("1@cash"),"Disgusting Octopus : "+getarg(rand(3)),bc_map,"0xFFFF00";
 	return;
 OnMyMobDead:
-	if (mobcount("1@cash",instance_npcname("oct_boss_con", instance_id())+"::OnMyMobDead") < 1) {
-		instance_announce 0,"Disgusting Octopus : That's it for the today! Next time, I will play with you badly!",bc_map,"0xFFFF00";
-		enablenpc instance_npcname("oct_exit_1", instance_id());
-		enablenpc instance_npcname("oct_exit_2", instance_id());
-		donpcevent instance_npcname("oct_boss_foot", instance_id())+"::OnDisable";
+	set .@map$, instance_mapname("1@cash");
+	if (mobcount(.@map$,instance_npcname("oct_boss_con")+"::OnMyMobDead") < 1) {
+		mapannounce .@map$,"Disgusting Octopus : That's it for the today! Next time, I will play with you badly!",bc_map,"0xFFFF00";
+		enablenpc instance_npcname("oct_exit_1");
+		enablenpc instance_npcname("oct_exit_2");
+		donpcevent instance_npcname("oct_boss_foot")+"::OnDisable";
 		stopnpctimer;
-		donpcevent instance_npcname("oct_boss_con", instance_id())+"::OnDisable";
+		donpcevent instance_npcname("oct_boss_con")+"::OnDisable";
 		end;
 	}
 	end;
@@ -649,22 +639,23 @@ OnMyMobDead:
 1@cash,4,4,0	script	oct_boss_foot	-1,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("oct_boss_foot", instance_id())+"::OnDisable";
+	donpcevent instance_npcname("oct_boss_foot")+"::OnDisable";
 	end;
 OnEnable:
-	enablenpc instance_npcname("oct_boss_foot", instance_id());
+	enablenpc instance_npcname("oct_boss_foot");
 	initnpctimer;
 	end;
 OnCall:
-	if (mobcount("1@cash",instance_npcname("oct_boss_foot", instance_id())+"::OnMyMobDead") < 100) {
+	set .@map$, instance_mapname("1@cash");
+	if (mobcount(.@map$,instance_npcname("oct_boss_foot")+"::OnMyMobDead") < 100) {
 		switch(rand(2)) {
 		case 0:
-			instance_announce 0,"Disgusting Octopus : Do you know how many legs octopus have? It doesn't matter, I have unlimited legs!!",bc_map,"0xFFFF00";
-			areamonster "1@cash",192,181,206,195,"Octopus Leg",2193,1,instance_npcname("oct_boss_foot", instance_id())+"::OnMyMobDead";
+			mapannounce .@map$,"Disgusting Octopus : Do you know how many legs octopus have? It doesn't matter, I have unlimited legs!!",bc_map,"0xFFFF00";
+			areamonster .@map$,192,181,206,195,"Octopus Leg",2193,1,instance_npcname("oct_boss_foot")+"::OnMyMobDead";
 			break;
 		case 1:
-			instance_announce 0,"Disgusting Octopus : I...cannot..hold anymore, my babies~ please come out and fight!",bc_map,"0xFFFF00";
-			areamonster "1@cash",192,181,206,195,"Octopus's Henchman ",2192,5,instance_npcname("oct_boss_foot", instance_id())+"::OnMyMobDead";
+			mapannounce .@map$,"Disgusting Octopus : I...cannot..hold anymore, my babies~ please come out and fight!",bc_map,"0xFFFF00";
+			areamonster .@map$,192,181,206,195,"Octopus's Henchman ",2192,5,instance_npcname("oct_boss_foot")+"::OnMyMobDead";
 			break;
 		}
 	}
@@ -672,12 +663,12 @@ OnCall:
 	end;
 OnTimer10000:
 	stopnpctimer;
-	donpcevent instance_npcname("oct_boss_foot", instance_id())+"::OnCall";
+	donpcevent instance_npcname("oct_boss_foot")+"::OnCall";
 	end;
 OnDisable:
 	stopnpctimer;
-	killmonster "1@cash",instance_npcname("oct_boss_foot", instance_id())+"::OnMyMobDead"; // Not in official script.
-	disablenpc instance_npcname("oct_boss_foot", instance_id());
+	killmonster instance_mapname("1@cash"),instance_npcname("oct_boss_foot")+"::OnMyMobDead"; // Not in official script.
+	disablenpc instance_npcname("oct_boss_foot");
 	end;
 OnMyMobDead:
 	end;
@@ -686,17 +677,17 @@ OnMyMobDead:
 1@cash,198,116,0	script	oct_boss_warp	45,2,2,{
 	end;
 OnInstanceInit:
-	disablenpc instance_npcname("oct_boss_warp", instance_id());
+	disablenpc instance_npcname("oct_boss_warp");
 	end;
 OnTouch:
-	warp "1@cash",210,172;
+	warp instance_mapname("1@cash"),210,172;
 	end;
 }
 
 1@cash,190,208,0	script	oct_exit_1	45,2,2,{
 	end;
 OnInstanceInit:
-	disablenpc instance_npcname(strnpcinfo(0), instance_id());
+	disablenpc instance_npcname(strnpcinfo(0));
 	end;
 OnTouch:
 	mes "Do you want to go out from the octopus dungeon?";