Skip to content

Commit

Permalink
Removed trailing whitespace (scripts)
Browse files Browse the repository at this point in the history
Signed-off-by: Haru <haru@dotalux.com>
  • Loading branch information
MishimaHaruna committed May 13, 2014
1 parent 3bd57cf commit c030940
Show file tree
Hide file tree
Showing 199 changed files with 761 additions and 812 deletions.
22 changes: 11 additions & 11 deletions npc/MOTD.txt
@@ -1,15 +1,15 @@
//====================================================
//= _ _ _
//= | | | | | |
//= | |_| | ___ _ __ ___ _ _| | ___ ___
//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
//=
//= http://hercules.ws/board/
//======= Hercules Script ===========================
//= _ _ _ =
//= | | | | | | =
//= | |_| | ___ _ __ ___ _ _| | ___ ___ =
//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| =
//= | | | | __/ | | (__| |_| | | __/\__ \ =
//= \_| |_/\___|_| \___|\__,_|_|\___||___/ =
//= =
//= http://hercules.ws/board/ =
//====================================================
// run when any character logs in, attached to them.
- script HerculesMOTD -1,{
message strcharinfo(0),"Welcome to Hercules! Enjoy! Please report any bugs you find.";
end;
message strcharinfo(0),"Welcome to Hercules! Enjoy! Please report any bugs you find.";
end;
}
2 changes: 1 addition & 1 deletion npc/airports/airships.txt
Expand Up @@ -654,7 +654,7 @@ airplane_01,243,73,0 script #AirshipWarp-3 WARPNPC,1,1,{
OnTouch:
switch ($@airplanelocation2) {
case 0: warp "ra_fild12",292,204; end;
case 1:
case 1:
if(checkre(0))
warp "izlude",200,73;
else
Expand Down
12 changes: 4 additions & 8 deletions npc/battleground/kvm/kvm01.txt
Expand Up @@ -52,11 +52,11 @@ bat_room,169,211,0 warp #kvm802 2,2,bat_room,154,150
- script KVM01::CellEffect -1,{
end;

OnKvM01One:
OnKvM01One:
specialeffect EF_CHANGECOLD;
end;

OnKvM01Two:
OnKvM01Two:
specialeffect EF_CHANGEPOISON;
end;
}
Expand Down Expand Up @@ -380,9 +380,7 @@ bat_c01,51,130,5 script KVM Officer#KVM01A 4_M_KY_HEAD,{
mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 5";
close2;
}
else
{ //
} else {
set kvm_point,kvm_point + 1;
mes "[KVM Officer]";
mes "I am so sorry.";
Expand All @@ -409,9 +407,7 @@ bat_c01,148,53,1 script KVM Officer#KVM01B 4_M_CRU_HEAD,{
mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 5";
close2;
}
else
{ //
} else {
set kvm_point,kvm_point + 1;
mes "[KVM Officer]";
mes "I am so sorry.";
Expand Down
12 changes: 4 additions & 8 deletions npc/battleground/kvm/kvm02.txt
Expand Up @@ -54,11 +54,11 @@ bat_room,197,211,0 warp #kvm602 2,2,bat_room,154,150
- script KVM02::CellEffect2 -1,{
end;

OnKvM02One:
OnKvM02One:
specialeffect EF_CHANGECOLD;
end;

OnKvM02Two:
OnKvM02Two:
specialeffect EF_CHANGEPOISON;
end;
}
Expand Down Expand Up @@ -382,9 +382,7 @@ bat_c02,51,130,5 script KVM Officer#KVM02A 4_M_KY_HEAD,{
mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 1";
close2;
}
else
{ //
} else {
mes "[KVM Officer]";
mes "I am so sorry.";
mes "I wish you better luck next time.";
Expand All @@ -410,9 +408,7 @@ bat_c02,148,53,1 script KVM Officer#KVM02B 4_M_CRU_HEAD,{
mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 1";
close2;
}
else
{ //
} else {
mes "[KVM Officer]";
mes "I am so sorry.";
mes "I wish you better luck next time.";
Expand Down
12 changes: 4 additions & 8 deletions npc/battleground/kvm/kvm03.txt
Expand Up @@ -53,11 +53,11 @@ bat_room,225,211,0 warp #kvm702 2,2,bat_room,154,150
- script KVM03::CellEffect3 -1,{
end;

OnKvM03One:
OnKvM03One:
specialeffect EF_CHANGECOLD;
end;

OnKvM03Two:
OnKvM03Two:
specialeffect EF_CHANGEPOISON;
end;
}
Expand Down Expand Up @@ -381,9 +381,7 @@ bat_c03,51,130,5 script KVM Officer#KVM03A 4_M_KY_HEAD,{
mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 2";
close2;
}
else
{ //
} else {
set kvm_point,kvm_point + 1;
mes "[KVM Officer]";
mes "I am so sorry.";
Expand All @@ -410,9 +408,7 @@ bat_c03,148,53,1 script KVM Officer#KVM03B 4_M_CRU_HEAD,{
mes "May the glory of KVM be with you.";
mes "You aquire the winning points: 2";
close2;
}
else
{ //
} else {
set kvm_point,kvm_point + 1;
mes "[KVM Officer]";
mes "I am so sorry.";
Expand Down
4 changes: 2 additions & 2 deletions npc/battleground/kvm/kvm_item_pay.txt
Expand Up @@ -7,7 +7,7 @@
//===== Description: =========================================
//= [Official Conversion]
//= Kreiger Von Midgard Battleground Point redemption NPC
//= * NOTE *
//= * NOTE *
//= KvM Does NOT use items, but a character variable to
//= keep track of points. This NPC when talked to will
//= convert already-given tokens and convert them to points.
Expand Down Expand Up @@ -77,7 +77,7 @@ bat_room,151,144,3 script KVM Logistic Officer#a 4_M_JOB_KNIGHT2,{
mes "Please select a sub-category.";
next;
switch(select("Dagger:One-handed Sword:Two-handed Sword:One-handed Spear:Two-handed Spear")) {
case 1: callsub PurchaseItem,13042,0,1; //Krieger_Dagger1
case 1: callsub PurchaseItem,13042,0,1; //Krieger_Dagger1
case 2:
mes "[Logistics]";
mes "You have selected the 'One-handed Sword' category.";
Expand Down
2 changes: 1 addition & 1 deletion npc/battleground/tierra/tierra01.txt
Expand Up @@ -613,7 +613,7 @@ OnTouch:

bat_a01,194,265,0 script barri_warp_down#bat_a01a -1,7,0,{
OnTouch:
if (getcharid(4) == $@TierraBG1_id1)
if (getcharid(4) == $@TierraBG1_id1)
warp "bat_a01",194,270;
end;
}
Expand Down
2 changes: 1 addition & 1 deletion npc/battleground/tierra/tierra02.txt
Expand Up @@ -612,7 +612,7 @@ OnTouch:

bat_a02,194,265,0 script barri_warp_down#bat_a02a -1,7,0,{
OnTouch:
if (getcharid(4) == $@TierraBG2_id1)
if (getcharid(4) == $@TierraBG2_id1)
warp "bat_a02",194,270;
end;
}
Expand Down
10 changes: 5 additions & 5 deletions npc/cities/aldebaran.txt
Expand Up @@ -11,7 +11,7 @@
//= 1.1 Added RS125 NPC. Added another Kafra Reserve points agent.
//= The 2nd reserve points agent is not complete yet.
//= 1.2 Lottery input number fix [Lupus], 1.2a - label typo fixed
//= 1.3 Gatekeeper's bug fixed (wrong check and wrong item ID
//= 1.3 Gatekeeper's bug fixed (wrong check and wrong item ID
//= for underground), fixed some typos [Lupus]
//= 1.4 Fixed Typos & Spellcheck [massdriller]
//= 1.5 Finally added the Special Reserve 2 Lotto 8))
Expand Down Expand Up @@ -1250,7 +1250,7 @@ aldeba_in,88,161,3 script Kafra#05 4_F_KAFRA3,{
mes "You have the following amount of special reserve points: ^5544FF"+RESRVPTS+"^000000.";
mes "Make a choice and test your luck!";
next;
menu "5000pts = 1st Lottery Chance!",sM_1st, "7000pts = 2nd Lottery Chance!",sM_2nd, "10000pts = 3rd Lottery Chance!",sM_3rd, "Cancel",M_End;
menu "5000pts = 1st Lottery Chance!",sM_1st, "7000pts = 2nd Lottery Chance!",sM_2nd, "10000pts = 3rd Lottery Chance!",sM_3rd, "Cancel",M_End;

sM_1st:
if(RESRVPTS < 5000) goto sL_NotEnuf;
Expand Down Expand Up @@ -1379,12 +1379,12 @@ sF_Spin:
//============================================================
c_tower3,10,249,4 script Gatekeeper#ct 4_M_02,{
//Key_Of_Clock_Tower
callfunc "F_ClockTowerGate","4th",7026,"c_tower4",185,44;
callfunc "F_ClockTowerGate","4th",7026,"c_tower4",185,44;
}

alde_dun03,264,16,4 script Gatekeeper#ct1 4W_F_01,{
//Underground_Key
callfunc "F_ClockTowerGate","B4th",7027,"alde_dun04",79,267;
callfunc "F_ClockTowerGate","B4th",7027,"alde_dun04",79,267;
}

function script F_ClockTowerGate {
Expand Down Expand Up @@ -1463,7 +1463,7 @@ function script F_ClockTowerGate {
mes "Please,You may enter.";
mes "May God bless you ..";
close2;
delitem getarg(1),1;
delitem getarg(1),1;
warp getarg(2),getarg(3),getarg(4);
end;
}
Expand Down
4 changes: 2 additions & 2 deletions npc/cities/ayothaya.txt
Expand Up @@ -301,8 +301,8 @@ ayothaya,241,264,5 script Young Man#5ayothaya2 4_M_THAIONGBAK,{
//============================================================
//= 0.1 Added a Sailor NPC to get back to Alberta [ZoDIaC]
//= 0.2 fixed coords, dialogues
//= 0.3 Fixed Warp name, ayotaya doesn't exist, even though iRO
//= decided to call it Ayotaya, it really is Ayothaya, like
//= 0.3 Fixed Warp name, ayotaya doesn't exist, even though iRO
//= decided to call it Ayotaya, it really is Ayothaya, like
//= that Yuno/Juno thing
//= 0.4 Added the official warp npc for Ayothaya. [MasterOfMuppets]
//= 1.0 Added most of the official npcs. The following quests were added: [MasterOfMuppets]
Expand Down
4 changes: 2 additions & 2 deletions npc/cities/geffen.txt
Expand Up @@ -77,7 +77,7 @@ geffen_in,164,109,0 script Wizard Stanza 1_M_WIZARD,{
}
else if (Class == Job_Novice)
mes "Although you may not be able to use magic or any other kind of powerful skills for now, this knowledge may be helpful in the future, young Novice...";
else
else
mes "Although you are not formally trained in the use of magic, you use skills which draw upon otherworldly energies, whether you know it or not...";
next;
mes "[Stanza]";
Expand Down Expand Up @@ -1351,7 +1351,7 @@ geffen_in,109,72,2 script Monster Scholar 4_F_01,{
mes "[Estheres]";
if (BaseLevel > 40)
mes "You look strong enough for that kind of challenge. But if you see anyone more reckless cross the Western bridge, you might want to give them a warning.";
else
else
mes "Um, but if you're planning to go there, you better not go alone. I really recommend that you be well prepared if you're gonna fight those kinds of monsters.";
break;
case 2:
Expand Down
2 changes: 1 addition & 1 deletion npc/cities/hugel.txt
Expand Up @@ -148,7 +148,7 @@ hu_in01,23,311,4 script Party Supplies Shop 4_M_HUMAN_01,{
next;
switch (select("Buy:Cancel")) {
case 1:
if (Zeny < 500) {
if (Zeny < 500) {
mes "[Shopkeeper]";
mes "I am sorry, but you don't have";
mes "enough money~";
Expand Down
2 changes: 1 addition & 1 deletion npc/cities/jawaii.txt
Expand Up @@ -414,7 +414,7 @@ jawaii,214,168,5 script Honeymoon Helper#Jawaii 1_F_LIBRARYGIRL,{
mes "[Helper]";
if (Zeny > 49999) {
Zeny -= 50000;
getitem 681,1; //Memory_Of_Wedding
getitem 681,1; //Memory_Of_Wedding
mes "Thank you very much~!";
mes "Please remember, you";
mes "should use this with your";
Expand Down
4 changes: 2 additions & 2 deletions npc/cities/lighthalzen.txt
Expand Up @@ -2170,7 +2170,7 @@ lhz_in02,147,222,3 script Officer Guo#06::off_guo 4_M_03,{

lhz_in02,142,222,6 duplicate(off_guo) Suspect#6 4_M_LGTPOOR

// New -----------------------------------------------------------------------
// New -----------------------------------------------------------------------

lhz_in01,14,28,3 script Banquet Staff 4_M_MANAGER,{
mes "[Banquet Staff]";
Expand Down Expand Up @@ -3205,7 +3205,7 @@ lhz_in01,157,54,0,0 monster Red Mushroom 1085,1,120000,100000,0
//= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
//= 1.6 Massive NPC clean up, includes corrected dialogs and [L0ne_W0lf]
//= added missing dialogs, fixed indentation, corrected some NPC
//= facing positions, NPC names are more unique now. Removed
//= facing positions, NPC names are more unique now. Removed
//= whitespace (empty lines after header and before end curly)
//= reduced usage of the command "goto", grammatical corrections.
//= Added additional missing NPCs.
Expand Down
2 changes: 1 addition & 1 deletion npc/cities/louyang.txt
@@ -1,5 +1,5 @@
//===== Hercules Script ======================================
//= Louyang City NPCs
//= Louyang City NPCs
//===== By: ==================================================
//= Vidar (1.0)
//= Mass Zero (1.1)
Expand Down
2 changes: 1 addition & 1 deletion npc/cities/lutie.txt
Expand Up @@ -10,7 +10,7 @@
//= 1.1 Edited some text and updated/enabled some triggers
//= for the quest.[kobra_k88]
//= 1.2 Fixed exploit. Checked for Bard Job Quest compatibility [Lupus]
//= 1.3 Fixed typos [Nexon]
//= 1.3 Fixed typos [Nexon]
//= 1.4 Fixed exploit [Lupus]
//= 1.5 Fixed a bug that could reset Lutie quest state [Lupus]
//= 1.6 Heavy optimization to all the NPCs [DZeroX]
Expand Down
4 changes: 2 additions & 2 deletions npc/cities/niflheim.txt
@@ -1,5 +1,5 @@
//===== Hercules Script ======================================
//= Niflheim Script
//= Niflheim Script
//===== By: ==================================================
//= Fyrien, Dizzy, PKGINGO
//= Official NPCs translated and re-edited by Celest
Expand All @@ -15,7 +15,7 @@
//= fixed zeny/item, exploit in Sairin, some optimizations [Lupus]
//= 1.06 some typos in some variables fixed (thx 2 Dr.Evil) [Lupus]
//= 1.07 Fixed typos [Nexon]
//= 1.08 Commented "Traveler" out as it is not official & we have correct Bungee quest in.
//= 1.08 Commented "Traveler" out as it is not official & we have correct Bungee quest in.
//= Also removed TODO, as they are already done. [Vicious_Pucca]
//= 1.1 Replaced nif_q_done with MISC_QUEST & 32. nif_t -> @nif_t [Lupus]
//= 1.2 Removed Duplicates [Silent]
Expand Down
2 changes: 1 addition & 1 deletion npc/cities/rachel.txt
Expand Up @@ -9,7 +9,7 @@
//= [Partial Official Conversion]
//= Arunafeltz NPCs
//===== Additional Comments: =================================
//= 0.5 Text translated from Korean > English, incomplete,
//= 0.5 Text translated from Korean > English, incomplete,
//= possibly missing some NPCs and missing all quests.
//= 0.6 Removed Inn Keeper (it's in inn.txt), name duplicates [Lupus]
//= 0.7 Total update of most if not all NPCs. [L0ne_W0lf]
Expand Down
8 changes: 2 additions & 6 deletions npc/custom/battleground/bg_flavius_01.txt
Expand Up @@ -279,9 +279,7 @@ bat_b01,390,13,5 script Guillaume Vintenar#fl1 4_M_KY_HEAD,{
mes "" + strcharinfo(0) + ", its a sign reflecting victory";
close2;
set .@reward, 9;
}
else
{ //
} else {
mes "[Swandery]";
mes "You lost, but you're dedicated to this battle.";
mes "This is a reward for your great dedication by Guillaume Marollo!";
Expand Down Expand Up @@ -310,9 +308,7 @@ bat_b01,10,293,5 script Croix Vintenar#fl1 4_M_CRU_HEAD,{
mes "" + strcharinfo(0) + ", its a sign reflecting victory";
close2;
set .@reward, 9;
}
else
{ //
} else {
mes "[Swandery]";
mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
mes "Even though we didn't win, we did our best.";
Expand Down
8 changes: 2 additions & 6 deletions npc/custom/battleground/bg_flavius_02.txt
Expand Up @@ -279,9 +279,7 @@ bat_b02,390,13,5 script Guillaume Vintenar#fl2 4_M_KY_HEAD,{
mes "" + strcharinfo(0) + ", its a sign reflecting victory";
close2;
set .@reward, 9;
}
else
{ //
} else {
mes "[Swandery]";
mes "You lost, but you're dedicated to this battle.";
mes "This is a reward for your great dedication by Guillaume Marollo!";
Expand Down Expand Up @@ -310,9 +308,7 @@ bat_b02,10,293,5 script Croix Vintenar#fl2 4_M_CRU_HEAD,{
mes "" + strcharinfo(0) + ", its a sign reflecting victory";
close2;
set .@reward, 9;
}
else
{ //
} else {
mes "[Swandery]";
mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
mes "Even though we didn't win, we did our best.";
Expand Down
8 changes: 2 additions & 6 deletions npc/custom/battleground/bg_kvm01.txt
Expand Up @@ -319,9 +319,7 @@ bat_c01,51,130,5 script Guillaume Vintenar::VintenarKvM01a 4_M_KY_HEAD,{
mes "Let's enjoy our glorious victory!";
mes "" + strcharinfo(0) + ", its a sign reflecting victory";
close2;
}
else
{ //
} else {
set .@reward, 1;
mes "[Swandery]";
mes "You lost, but you're dedicated to this battle.";
Expand Down Expand Up @@ -357,9 +355,7 @@ bat_c01,148,53,1 script Croix Vintenar::VintenarKvM01b 4_M_CRU_HEAD,{
mes "Let's enjoy our glorious victory!";
mes "" + strcharinfo(0) + ", its a sign reflecting victory";
close2;
}
else
{ //
} else {
set .@reward, 1;
mes "[Swandery]";
mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
Expand Down

0 comments on commit c030940

Please sign in to comment.