From 4580df1fef9d2ea371fa7636eb3e5b5595daaee9 Mon Sep 17 00:00:00 2001 From: Dastgir Date: Fri, 12 Jun 2015 17:56:35 +0530 Subject: Fixed Several Bugs(Old GlastHeim) Signed-off-by: Haru --- npc/re/instances/OldGlastHeim.txt | 100 +++++--------------------------------- 1 file changed, 11 insertions(+), 89 deletions(-) (limited to 'npc/re') diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index be0d4d002..131b54eb8 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -3,12 +3,14 @@ //===== By: ================================================== //= Ziu, Heris (translation) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Description: ========================================= //= Discover the history of events that took place in the //= Glast Heim castle and how it ended up in ruins. //===== Additional Comments: ================================= //= 1.0 First version. [Euphy] +//= This is a custom version, and may contain bugs. +//= 1.1 Bug fixes; removed redundant OnInstanceInit scripts. //============================================================ 1@gl_k mapflag src4instance @@ -143,8 +145,6 @@ glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{ end; } OnInstanceInit: - donpcevent instance_npcname("Varmunt#ghinstance1")+"::OnEnable"; - end; OnDisable: hideonnpc instance_npcname("Varmunt#ghinstance1"); end; @@ -185,8 +185,6 @@ OnEnable: } close; OnInstanceInit: - donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname(strnpcinfo(0)); end; @@ -283,8 +281,6 @@ OnEnable: end; } OnInstanceInit: - donpcevent instance_npcname("Heinrich#ghinstance1")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Heinrich#ghinstance1"); end; @@ -296,8 +292,6 @@ OnEnable: 1@gl_k,152,97,3 script Varmunt#ghinstance2 4_M_BARMUND,{ end; OnInstanceInit: - donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Varmunt#ghinstance2"); end; @@ -330,8 +324,6 @@ OnTalk7: 1@gl_k,149,97,6 script Heinrich#ghinstance2 4_M_HEINRICH,{ end; OnInstanceInit: - donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Heinrich#ghinstance2"); end; @@ -373,8 +365,6 @@ OnTalk10: 1@gl_k,149,100,6 script Heinrich#ghinstance3 4_M_HEINRICH,{ end; OnInstanceInit: - donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Heinrich#ghinstance3"); end; @@ -410,8 +400,6 @@ OnTalk8: 1@gl_k,149,89,1 script Himmelmez#ghinstance1 4_F_HIMEL,{ end; OnInstanceInit: - donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Himmelmez#ghinstance1"); end; @@ -448,8 +436,6 @@ OnTalk8: //============================================================ 1@gl_k,0,0,0 script #talkinstance1 -1,{ OnInstanceInit: - donpcevent instance_npcname("#talkinstance1")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#talkinstance1"); end; @@ -705,8 +691,6 @@ OnMyMobDead: 1@gl_k,145,54,6 script .#ghinstance1 MG_KHALITZBURG,{ end; OnInstanceInit: - donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname(strnpcinfo(0)); end; @@ -749,8 +733,6 @@ OnTalkK: 1@gl_k,145,59,6 script .#ghinstance3 HIDDEN_NPC,{ end; OnInstanceInit: - donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname(strnpcinfo(0)); end; @@ -775,8 +757,6 @@ OnEffect1: 1@gl_k,96,80,0 script #ghinstancewarp1 WARPNPC,1,2,{ end; OnInstanceInit: - donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname(strnpcinfo(0)); end; @@ -819,8 +799,6 @@ OnTouch: //============================================================ 1@gl_k,0,0,0 script #ghmemorialmob01 -1,{ OnInstanceInit: - donpcevent instance_npcname("#ghmemorialmob01")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#ghmemorialmob01"); end; @@ -891,8 +869,6 @@ OnMyMobDead: close; } OnInstanceInit: - donpcevent instance_npcname("Aspiring Butcher#clearGH")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Aspiring Butcher#clearGH"); end; @@ -945,8 +921,6 @@ OnEnable: close; } OnInstanceInit: - donpcevent instance_npcname("Hollgrehenn Destroyer")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Hollgrehenn Destroyer"); end; @@ -957,8 +931,6 @@ OnEnable: 1@gl_k,0,0,0 script #ghmemorialmob02 -1,{ OnInstanceInit: - donpcevent instance_npcname("#ghmemorialmob02")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#ghmemorialmob02"); end; @@ -1006,8 +978,6 @@ OnTouch: OnMyMobDead: end; OnInstanceInit: - donpcevent instance_npcname(strnpcinfo(0))+"::OnEnable"; - end; OnEnable: enablenpc instance_npcname(strnpcinfo(0)); end; @@ -1051,8 +1021,6 @@ OnDisable: //============================================================ 1@gl_k,0,0,0 script #ghmemorialmob03 -1,{ OnInstanceInit: - donpcevent instance_npcname("#ghmemorialmob03")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#ghmemorialmob03"); end; @@ -1092,8 +1060,6 @@ OnMyMobDead: //============================================================ 1@gl_k,0,0,0 script #ghmemorialmob04 -1,{ OnInstanceInit: - donpcevent instance_npcname("#ghmemorialmob04")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#ghmemorialmob04"); end; @@ -1123,8 +1089,6 @@ OnTouch: donpcevent instance_npcname("#GHMclear3")+"::OnDisable"; end; OnInstanceInit: - donpcevent instance_npcname("#GHMclear3")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#GHMclear3"); end; @@ -1140,8 +1104,6 @@ OnTimer2000: 1@gl_k,0,0,0 script #controlGH3 -1,{ OnInstanceInit: - donpcevent instance_npcname("#controlGH3")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#controlGH3"); end; @@ -1203,8 +1165,6 @@ OnTimer38000: cutin "gl_heinrich1",255; end; OnInstanceInit: - donpcevent instance_npcname("Heinrich#ghinstance4")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Heinrich#ghinstance4"); end; @@ -1230,8 +1190,6 @@ OnTalk3: cutin "gl_himel2",255; end; OnInstanceInit: - donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Himmelmez#ghinstance2"); end; @@ -1278,8 +1236,6 @@ OnTalk6: cutin "gl_barmund2",255; end; OnInstanceInit: - donpcevent instance_npcname("Varmunt#ghinstance3")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Varmunt#ghinstance3"); end; @@ -1305,8 +1261,6 @@ OnTalk2: cutin "gl_heinrich1",255; end; OnInstanceInit: - donpcevent instance_npcname("Heinrich#ghinstance5")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Heinrich#ghinstance5"); end; @@ -1338,8 +1292,6 @@ OnTalk5: cutin "gl_barmund1",255; end; OnInstanceInit: - donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Varmunt#ghinstance4"); end; @@ -1399,28 +1351,27 @@ OnTalk17: 2@gl_k,150,67,0 script #effectGH01 HIDDEN_NPC,10,10,{ end; OnTouch: - specialeffect EF_BASH; - donpcevent instance_npcname("#controlGH4")+"::OnEnable"; - donpcevent instance_npcname("#effectGH01")+"::OnDisable"; + if (.touch) { + .touch = 0; + specialeffect EF_BASH; + donpcevent instance_npcname("#controlGH4")+"::OnEnable"; + } end; OnEffect: specialeffect EF_LORD; end; OnInstanceInit: - donpcevent instance_npcname("#effectGH01")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#effectGH01"); end; OnEnable: enablenpc instance_npcname("#effectGH01"); + set .touch,1; //Activates OnTouch Only Once. end; } 2@gl_k,0,0,0 script #controlGH4 -1,{ OnInstanceInit: - donpcevent instance_npcname("#controlGH4")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#controlGH4"); end; @@ -1442,7 +1393,6 @@ OnTimer12000: donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk3"; end; OnTimer15000: - donpcevent instance_npcname("#effectGH01")+"::OnEnable"; donpcevent instance_npcname("#effectGH01")+"::OnEffect"; end; OnTimer18000: @@ -1513,8 +1463,6 @@ OnTimer70000: 2@gl_k,0,0,0 script #ghmemorialmob05 -1,{ OnInstanceInit: - donpcevent instance_npcname("#ghmemorialmob05")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#ghmemorialmob05"); end; @@ -1562,8 +1510,6 @@ OnMyMobDead: 2@gl_k,0,0,0 script #ghmemorialmob06 -1,{ OnInstanceInit: - donpcevent instance_npcname("#ghmemorialmob06")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#ghmemorialmob06"); end; @@ -1605,8 +1551,6 @@ OnTimer92000: 2@gl_k,0,0,0 script #ghmemorialmob07 -1,{ OnInstanceInit: - donpcevent instance_npcname("#ghmemorialmob07")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#ghmemorialmob07"); end; @@ -1628,8 +1572,6 @@ OnMyMobDead: 2@gl_k,0,0,0 script #ghmemorialmob08 -1,{ OnInstanceInit: - donpcevent instance_npcname("#ghmemorialmob08")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#ghmemorialmob08"); end; @@ -1676,8 +1618,6 @@ OnMyMobDead: 2@gl_k,0,0,0 script #ghmemorialmob09 -1,{ OnInstanceInit: - donpcevent instance_npcname("#ghmemorialmob09")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#ghmemorialmob09"); end; @@ -1699,8 +1639,6 @@ OnMyMobDead: 2@gl_k,0,0,0 script #ghmemorialmob10 -1,{ OnInstanceInit: - donpcevent instance_npcname("#ghmemorialmob10")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#ghmemorialmob10"); end; @@ -1720,8 +1658,6 @@ OnMyMobDead: 2@gl_k,155,250,7 script Heinrich#ghinstance6 4_M_HEINRICH,{ end; OnInstanceInit: - donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Heinrich#ghinstance6"); end; @@ -1757,8 +1693,6 @@ OnTalk6: cutin "gl_barmund2",255; end; OnInstanceInit: - donpcevent instance_npcname("Varmunt#ghinstance5")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Varmunt#ghinstance5"); end; @@ -1773,8 +1707,6 @@ OnTalk1: 2@gl_k,158,252,3 script Himmelmez#ghinstance4 4_F_HIMEL,4,4,{ end; OnInstanceInit: - donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Himmelmez#ghinstance4"); end; @@ -1828,13 +1760,11 @@ OnTouch: donpcevent instance_npcname("#controlGH6")+"::OnDisable"; end; OnInstanceInit: - donpcevent instance_npcname("#controlGH6")+"::OnDisable"; - end; OnDisable: - hideonnpc instance_npcname("#controlGH6"); + disablenpc instance_npcname("#controlGH6"); end; OnEnable: - hideoffnpc instance_npcname("#controlGH6"); + enablenpc instance_npcname("#controlGH6"); end; } @@ -1847,8 +1777,6 @@ OnTouch: donpcevent instance_npcname("Himmelmez#ghinstance3")+"::OnDisable"; end; OnInstanceInit: - donpcevent instance_npcname("Himmelmez#ghinstance3")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("Himmelmez#ghinstance3"); end; @@ -1860,8 +1788,6 @@ OnEnable: 2@gl_k,158,255,3 script Gerhard#ghinstance1 4_LEVITATEMAN,{ end; OnInstanceInit: - donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnDisable"; - end; OnDisable: hideonnpc instance_npcname("Gerhard#ghinstance1"); end; @@ -1896,8 +1822,6 @@ OnEffect5: 2@gl_k,0,0,0 script #controlGH5 -1,{ OnInstanceInit: - donpcevent instance_npcname("#controlGH5")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("#controlGH5"); end; @@ -2048,8 +1972,6 @@ OnTimer80000: } } OnInstanceInit: - donpcevent instance_npcname("Hugin#ghinstance1")+"::OnDisable"; - end; OnDisable: disablenpc instance_npcname("Hugin#ghinstance1"); end; -- cgit v1.2.3-70-g09d2