summaryrefslogtreecommitdiff
path: root/npc/re/instances
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-05-13 18:15:14 +0200
committerHaru <haru@dotalux.com>2014-05-13 18:15:14 +0200
commitc03094034f5338016221775bce4b39a0e9b75ee6 (patch)
tree559e52c5207911190ea336eb82a933ce37305065 /npc/re/instances
parent3bd57cf4858696b2586543098bc9eeac70a1854e (diff)
downloadhercules-c03094034f5338016221775bce4b39a0e9b75ee6.tar.gz
hercules-c03094034f5338016221775bce4b39a0e9b75ee6.tar.bz2
hercules-c03094034f5338016221775bce4b39a0e9b75ee6.tar.xz
hercules-c03094034f5338016221775bce4b39a0e9b75ee6.zip
Removed trailing whitespace (scripts)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/re/instances')
-rw-r--r--npc/re/instances/BangungotHospital.txt2
-rw-r--r--npc/re/instances/BuwayaCave.txt2
-rw-r--r--npc/re/instances/HazyForest.txt7
-rw-r--r--npc/re/instances/OldGlastHeim.txt8
-rw-r--r--npc/re/instances/WolfchevLaboratory.txt38
5 files changed, 29 insertions, 28 deletions
diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
index de076489e..b995092a1 100644
--- a/npc/re/instances/BangungotHospital.txt
+++ b/npc/re/instances/BangungotHospital.txt
@@ -392,7 +392,7 @@ OnInstanceInit:
disablenpc instance_npcname("#Memorial Start_time");
end;
OnEnable:
- specialeffect EF_BAT2,AREA,instance_npcname("#Memorial Start");
+ specialeffect EF_BAT2,AREA,instance_npcname("#Memorial Start");
initnpctimer;
end;
OnDisable:
diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt
index f20a7e3b5..0a26dab9c 100644
--- a/npc/re/instances/BuwayaCave.txt
+++ b/npc/re/instances/BuwayaCave.txt
@@ -142,7 +142,7 @@ OnTouch:
setquest 4229;
warp "1@ma_c",35,57;
end;
- }
+ }
case 2:
mes "[Guard]";
mes "You must value your life.";
diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt
index c76fe2c46..0c32c73c6 100644
--- a/npc/re/instances/HazyForest.txt
+++ b/npc/re/instances/HazyForest.txt
@@ -111,8 +111,9 @@ bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{
mes "but maybe you humans can.";
mes "Good luck!";
close;
- } else
+ } else {
instance_destroy(.@instance);
+ }
case 2:
mes "[Laphine Soldier]";
mes "Well, you've made the right decision.";
@@ -156,13 +157,13 @@ bif_fild01,161,355,0 script Log Tunnel CLEAR_NPC,{
mes "The world beyond the log tunnel looks dark and suffocating.";
mes "Your instinct is screaming that this forest is dangerous.";
close;
- } else {
+ } else {
if (checkquest(7211,PLAYTIME) == 2) erasequest 7211;
if (checkquest(7211,PLAYTIME) == -1) setquest 7211;
mapannounce "bif_fild01",getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
warp "1@mist",89,29;
close;
- }
+ }
}
// Instance Scripts
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 33027e830..4be3133bc 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -480,7 +480,7 @@ OnTimer35000:
end;
OnTimer45000:
donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk4";
- end;
+ end;
OnTimer50000:
donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk5";
end;
@@ -517,7 +517,7 @@ OnTimer85000:
hideonnpc instance_npcname("Khalitzburg Crusader#22");
set .@map$, instance_mapname("1@gl_k");
- set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead";
+ set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead";
monster .@map$,145,59,"Abyss Knight",2470,1,.@label$;
monster .@map$,154,59,"Abyss Knight",2470,1,.@label$;
monster .@map$,145,69,"Abyss Knight",2470,1,.@label$;
@@ -558,7 +558,7 @@ OnTimer88000:
hideonnpc instance_npcname(".#ghinstance22");
set .@map$, instance_mapname("1@gl_k");
- set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead";
+ set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead";
monster .@map$,145,54,"Khalitzburg",2471,1,.@label$;
monster .@map$,154,54,"Khalitzburg",2471,1,.@label$;
monster .@map$,145,64,"Khalitzburg",2471,1,.@label$;
@@ -1771,7 +1771,7 @@ OnTalk1:
}
2@gl_k,158,252,3 script Himmelmez#ghinstance4 4_F_HIMEL,4,4,{
- end;
+ end;
OnInstanceInit:
donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnDisable";
end;
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index 114555547..8faa15cf2 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -434,13 +434,13 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{
mes "These are the armors I have.";
next;
for(.@i = 1; .@i < 8; .@i++) {
- if(((.@i == 1 || .@i == 5) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) &&
- (countitem(Goast_Chill) >= 35)) ||
- ((.@i == 2 || .@i == 3) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) &&
+ if(((.@i == 1 || .@i == 5) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) &&
+ (countitem(Goast_Chill) >= 35)) ||
+ ((.@i == 2 || .@i == 3) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) &&
(countitem(Goast_Chill) >= 22)) ||
- ((.@i == 4 || .@i == 7) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) &&
+ ((.@i == 4 || .@i == 7) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) &&
(countitem(Goast_Chill) >= 400)) ||
- ((.@i == 6) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) &&
+ ((.@i == 6) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) &&
(countitem(Goast_Chill) >= 30))) {
.@armor$[.@i] = "^0000FF";
} else {
@@ -465,8 +465,8 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{
break;
case 2:
mes "<<Giant Shield[1]>>";
- mes "Decrease 5% of Damage from Large Monsters, if Refine Lv is 9, decrease 5% more of the Damage.";
- mes "Shield / Def 130 / Weight 280 / Required Lv 100 / Socket 1 / for 3rd Swordman Classes";
+ mes "Decrease 5% of Damage from Large Monsters, if Refine Lv is 9, decrease 5% more of the Damage.";
+ mes "Shield / Def 130 / Weight 280 / Required Lv 100 / Socket 1 / for 3rd Swordman Classes";
callsub L_Reward, Giant_Shield, 100, 50, 35;
break;
case 3:
@@ -516,15 +516,15 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{
mes "These are the Weapons I got.";
next;
for(.@i = 1; .@i < 15; .@i++) {
- if(((.@i == 1) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) &&
+ if(((.@i == 1) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) &&
(countitem(Goast_Chill) >= 10)) ||
- ((.@i == 2) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) &&
+ ((.@i == 2) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) &&
(countitem(Goast_Chill) >= 85)) ||
- ((.@i == 3 || .@i == 4 || (.@i >= 8 && .@i < 11) || .@i >= 12) && (countitem(Will_Of_Warrior) >= 50) &&
+ ((.@i == 3 || .@i == 4 || (.@i >= 8 && .@i < 11) || .@i >= 12) && (countitem(Will_Of_Warrior) >= 50) &&
(countitem(Blood_Thirst) >= 100) && (countitem(Goast_Chill) >= 35)) ||
((.@i == 5 || .@i == 7 || .@i == 11) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100)
&& (countitem(Goast_Chill) >= 40)) ||
- ((.@i == 6) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) &&
+ ((.@i == 6) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) &&
(countitem(Goast_Chill) >= 400))) {
.@weapon$[.@i] = "^0000FF";
} else {
@@ -865,7 +865,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
.@equipped$[.@i] = getequipname(.@parts[.@i]);
}
}
- switch(select("I changed my mind.", .@equipped$[0], .@equipped$[1], .@equipped$[2], .@equipped$[3], .@equipped$[4],
+ switch(select("I changed my mind.", .@equipped$[0], .@equipped$[1], .@equipped$[2], .@equipped$[3], .@equipped$[4],
.@equipped$[5], .@equipped$[6])) {
case 1:
mes "[Pudding]";
@@ -947,8 +947,8 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
.@refine_count = getequiprefinerycnt(.@position);
.@equip_item = getequipid(.@position);
.@lhz_max_num = 4000;
- if(.@equip_item == Agent_Katar || .@equip_item == Guillotine_Katar || .@equip_item == Ygnus_Stale ||
- .@equip_item == End_Sektura || .@equip_item = Cannon_Spear || .@equip_item == Giant_Lance ||
+ if(.@equip_item == Agent_Katar || .@equip_item == Guillotine_Katar || .@equip_item == Ygnus_Stale ||
+ .@equip_item == End_Sektura || .@equip_item = Cannon_Spear || .@equip_item == Giant_Lance ||
.@equip_item == Aztoe_Nail || .@equip_item == Scarletto_Nail || .@equip_item == Bloody_Cross) {
.@type = 1;
if(.@equip_item == Giant_Lance)
@@ -958,7 +958,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{
} else if(.@equip_item == Chilly_Spell_Book || .@equip_item == Recovery_Light) {
.@type = 3;
} else if(.@equip_item== Giant_Shield || .@equip_item == Geffenia_Book_Water || .@equip_item == Bible_Of_Promise2 ||
- .@equip_item == Salvage_Cape || .@equip_item == Assassin_Handcuffs || .@equip_item == Green_Operation_Coat ||
+ .@equip_item == Salvage_Cape || .@equip_item == Assassin_Handcuffs || .@equip_item == Green_Operation_Coat ||
.@equip_item == Ancient_Gold_Deco) {
if(.@equip_item == Salvage_Cape || .@equip_item == Ancient_Gold_Deco)
.@lhz_max_num = 4200;
@@ -2020,7 +2020,7 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{
mes "Now, your party is free to pass the entrance.";
} else {
instance_destroy(.@instance);
- }
+ }
}
close;
} else {
@@ -2249,7 +2249,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{
OnEnable:
specialeffect EF_LIGHTSPHERE;
enablenpc instance_npcname("Manual Sheet#1_1");
- end;
+ end;
}
// Left Valve
@@ -2865,7 +2865,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{
monster .@map$,85,58,"Starving Lab animal",MD_DESERT_WOLF,1,.@label$;
monster .@map$,82,60,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$;
monster .@map$,83,58,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$;
- monster .@map$,85,56,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$;
+ monster .@map$,85,56,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$;
monster .@map$,86,60,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$;
monster .@map$,87,58,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$;
end;
@@ -3135,7 +3135,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{
end;
case 13:
donpcevent instance_npcname("Howard Alt-Eisen#boss13")+"::OnEnable";
- end;
+ end;
}
OnDisable: