diff options
author | Haru <haru@dotalux.com> | 2014-05-13 18:15:14 +0200 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2014-05-13 18:15:14 +0200 |
commit | c03094034f5338016221775bce4b39a0e9b75ee6 (patch) | |
tree | 559e52c5207911190ea336eb82a933ce37305065 /npc/jobs | |
parent | 3bd57cf4858696b2586543098bc9eeac70a1854e (diff) | |
download | hercules-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/jobs')
-rw-r--r-- | npc/jobs/2-1/assassin.txt | 6 | ||||
-rw-r--r-- | npc/jobs/2-1/blacksmith.txt | 2 | ||||
-rw-r--r-- | npc/jobs/2-1/knight.txt | 2 | ||||
-rw-r--r-- | npc/jobs/2-1/priest.txt | 2 | ||||
-rw-r--r-- | npc/jobs/2-2/alchemist.txt | 2 | ||||
-rw-r--r-- | npc/jobs/2-2/bard.txt | 4 | ||||
-rw-r--r-- | npc/jobs/2-2/crusader.txt | 12 | ||||
-rw-r--r-- | npc/jobs/2-2/dancer.txt | 10 | ||||
-rw-r--r-- | npc/jobs/2-2/monk.txt | 14 | ||||
-rw-r--r-- | npc/jobs/2-2/rogue.txt | 6 | ||||
-rw-r--r-- | npc/jobs/2-2/sage.txt | 12 | ||||
-rw-r--r-- | npc/jobs/2-2e/SoulLinker.txt | 2 |
12 files changed, 37 insertions, 37 deletions
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 896a19e4e..d778d789a 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -26,7 +26,7 @@ //= 2.0 Changed numbers to constants. [Vicious] //= 2.1 Removed Duplicates [Silent] //= 2.2 Merged back JFunc. Fixed missing dialogue [Lupus] -//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I +//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I //= was still able to bypass it) [Toms] //= 2.4 Fixed skipping of Nameless NPC [Lupus] //= 2.5 Fixed a Rogue exploit [Lupus] @@ -981,12 +981,12 @@ OnTouch: mes "[The Anonymous One]"; mes "7. Choose the maximum AGI bonus an Assassin can get at job level 50."; next; - if (select("7:8:9:10") == 4) + if (select("7:8:9:10") == 4) set .@assassin_t,.@assassin_t+10; mes "[The Anonymous One]"; mes "8. Choose the item that an Assassin cannot equip."; next; - if (select("Dagger:Helm:Boots:Brooch") == 2) + if (select("Dagger:Helm:Boots:Brooch") == 2) set .@assassin_t,.@assassin_t+10; mes "[The Anonymous One]"; mes "9. Choose the job change item for Thief."; diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index 48cf68150..c466925e1 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -269,7 +269,7 @@ ein_in01,18,28,4 script Guildsman#BLS 4_M_JOB_BLACKSMITH,{ mes "Congratulations!!!"; if (.@joblvl > 48) getitem 999,30; //Steel - else + else getitem 999,5; //Steel close; } diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index 368cbca45..da1d8a8e4 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -1117,7 +1117,7 @@ prt_in,79,94,4 script Sir Windsor#knt 4_M_JOB_KNIGHT1,{ mes "......"; next; mes "[Sir Windsor]"; - if (KNIGHT_Q == 6) + if (KNIGHT_Q == 6) mes "...Follow me."; else { mes "...Fine."; diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt index 735bb0d54..57f6a2647 100644 --- a/npc/jobs/2-1/priest.txt +++ b/npc/jobs/2-1/priest.txt @@ -1708,7 +1708,7 @@ job_prist,98,105,4 script prst3_1 WARPNPC,3,3,{ OnTouch: if (BaseJob == Job_Priest) { warp "prt_church",15,36; - end; + end; } else if (BaseClass == Job_Acolyte) { set PRIEST_Q,7; diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index 1bb03d812..6f0cea599 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -1983,7 +1983,7 @@ alde_alche,145,19,1 script Chief Researcher#am 1_M_LIBRARYMASTER,{ //= 1.0 Working. //= npc/quests/counteragent_mixture.txt Also Needed //= npc/quests/quests_yuno.txt Also Needed [Darkchild] -//= 1.1 Fixed some minor bugs. Optimized some lines. Re-organized the script a bit. +//= 1.1 Fixed some minor bugs. Optimized some lines. Re-organized the script a bit. //= Giving Parmry NPC, Hammer and Old Book now waves the 50000 fee. (based of mRO website) //= Having a joblvl of 50 allows you to skip Rasputin's test. (based of mRO website) [kobra_k88] //= 1.2 fixed a few typos (have to hunt more) [Lupus] diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt index 6bb4945a6..24d49cbce 100644 --- a/npc/jobs/2-2/bard.txt +++ b/npc/jobs/2-2/bard.txt @@ -485,7 +485,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Turned into a dragon and ate him."; next; input .@Song$; - if (.@Song$ != "There was a man") + if (.@Song$ != "There was a man") set .@w_point,.@w_point+1; mes "^3377FFThere was a man"; @@ -940,7 +940,7 @@ S_ChangeJob: //============================================================ //= 07/06/05 : Added 1st Version. [Muad_Dib] //= Converted to rAthena format by Dr.Evil -//= Info about gifts and other info --> http://www.ragnainfo.net/forums/viewtopic.php?t=51467&start=0 +//= Info about gifts and other info --> http://www.ragnainfo.net/forums/viewtopic.php?t=51467&start=0 //= 1.1 Optimized, changed some stuff, fixed some bugs [Lupus] //= 1.1a minor song test fix [Lupus] //= 1.2 Fixed wrong item ID, added missing commands [Lupus] diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index e7d938a4a..d5bcd70ea 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -43,7 +43,7 @@ prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{ mes "You don't belong here, my friend."; mes "Be advised to continue practicing yourself."; close; - } + } else if(BaseJob != Job_Swordman) { if(BaseJob == Job_Crusader) { mes "Go and train yourself in preparation for the holy war that is coming. Victory will be in the hands of those who are most ready to receive it."; @@ -68,7 +68,7 @@ prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{ mes "[Michael Halig]"; mes "As it happened one thousand years ago, evil forces will one day attack in droves in an attempt to take over the world once again."; close; - } + } else if(CRUS_Q <= 3 && countitem(1004) && countitem(1009)) { mes "Ah..."; mes "I see that you have been called to become a Crusader. We are assured of your will, but now we must test your capabilities."; @@ -124,7 +124,7 @@ prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{ mes "[Michael Halig]"; mes "Train yourself more as a Swordsman and wait for your calling. I understand your intent, but as of now, you cannot join us."; close; - } + } if (SkillPoint) { mes "[Michael Halig]"; mes "You haven't finished learning everything as a Swordsman. Use all of your remaining skill points, and then return to me."; @@ -550,7 +550,7 @@ prt_church,95,127,3 script Crusader 4_F_CRU,{ mes "4. Which Undead monster"; mes "has the highest HP?"; next; - if (select("Ghoul:Skeleton Prisoner:Wraith:Zombie Prisoner") == 4) + if (select("Ghoul:Skeleton Prisoner:Wraith:Zombie Prisoner") == 4) set .@cru_t,.@cru_t+10; mes "[Gabriel Valentine]"; @@ -769,7 +769,7 @@ prt_church,95,127,3 script Crusader 4_F_CRU,{ mes "[Gabriel Valentine]"; mes "Don't stress, you need to know a lot in order to pass this test. In any case, I'll be waiting right here. When you think you're ready, come back, alright?"; close; - } + } else if(CRUS_Q == 8 || CRUS_Q == 9) { mes "Like I mentioned before, you should go to Prontera Castle and meet with Bliant Piyord to take your next test. Good luck, and become a Crusder soon, alright?"; close; @@ -938,7 +938,7 @@ prt_castle,35,151,5 script Patron Knight 4_M_CRU,{ mes "I shall be"; mes "waiting."; close; - } + } else if(CRUS_Q == 10) { mes "Congratulations."; mes "You have completed"; diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index e0b59c71d..6b4ddf5b0 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -286,15 +286,15 @@ job_duncer,43,93,4 script Aile#da 4_F_07,{ } else if (DANC_Q >= 2 && DANC_Q <= 4) { switch(DANC_Q) { - case 2: + case 2: setarray .@item[0], 938,909,501,2403; setarray .@count[0], 20,3,5,1; break; - case 3: + case 3: setarray .@item[0], 1055,2405; setarray .@count[0], 5,1; break; - case 4: + case 4: setarray .@item[0], 965,503,909,1020,2401; setarray .@count[0], 2,5,20,10,1; break; @@ -889,7 +889,7 @@ job_duncer,95,93,4 script Bijou#da 4W_F_01,{ getitem 1950,1; //Rope close; } -} +} // Waiting Room //============================================================ @@ -1379,7 +1379,7 @@ OnOmg: //============================================================ // Old changelog //============================================================ -//= 1.1 Removed the warp I left here my accident, added a check for using +//= 1.1 Removed the warp I left here my accident, added a check for using //= Improved Concentration and arrow shower, people could get away with it //= [Fredzilla] //= 1.0 I tried to keep as much the same from the Jap version as possible diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 221828908..90fccf68c 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -395,13 +395,13 @@ monk_in,99,58,1 script Sensei Moohae#mk 1_M_PASTOR,{ next; mes "[Sensei Moohae]"; switch (.@items[6]) { - case 3: mes "Why the face? This is a test of your abilities."; break; - case 4: mes "What's wrong? This is a test of your abilities."; break; - case 5: mes "You do understand don't you? This is a test of your abilities."; break; - case 6: mes "Don't look at me like that. This is a test of your abilities."; break; - case 7: mes "You don't seem concerned, this is a test of your abilities You should take this seriously."; break; - case 8: mes "It is a test of your abilities so make sure you acquire these on your own."; break; - case 9: mes "Don't be concerned, I believe you can do it. This is only to test your abilities."; break; + case 3: mes "Why the face? This is a test of your abilities."; break; + case 4: mes "What's wrong? This is a test of your abilities."; break; + case 5: mes "You do understand don't you? This is a test of your abilities."; break; + case 6: mes "Don't look at me like that. This is a test of your abilities."; break; + case 7: mes "You don't seem concerned, this is a test of your abilities You should take this seriously."; break; + case 8: mes "It is a test of your abilities so make sure you acquire these on your own."; break; + case 9: mes "Don't be concerned, I believe you can do it. This is only to test your abilities."; break; } next; mes "[Sensei Moohae]"; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 52baaf58d..cf20d5203 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -11,7 +11,7 @@ //= 2.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_BlockHigh" //= 2.4a Deleted unused variables. [Samuray22] -//= 2.4b Changed a Problem with JobLevel what made +//= 2.4b Changed a Problem with JobLevel what made //= impossible get a Gladius [3]. (bugreport:481) [Samuray22] //= 2.4c Corrected a Typo error ";;" and a typo error with "rouge". (bugreport:909) [Samuray22] //= 2.5 Added dummy "OnMyMobDead" labels. (bugreport:1100) [L0ne_W0lf] @@ -1172,7 +1172,7 @@ OnTouch: break; case 4: mes "[" + strcharinfo(0) + "]"; - mes "Hollgrehenn"; + mes "Hollgrehenn"; break; } switch(select("enjoys:doesn't enjoy:likes:doesn't like")) { @@ -1277,7 +1277,7 @@ OnTouch: if (.@input < 1 || .@input > 10000) { if (ROGUE_Q == 12) mes "^3355FFIt didn't work. Please re-enter the four number combination.^000000"; - else + else mes "^3355FFPlease enter a combination of four numbers.^000000"; close; } diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 46973a538..72bacfaf1 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -19,7 +19,7 @@ //= 2.4a Deleted unused variables. [Samuray22] //= 2.5 Updated waiting room. (Removes global var) [L0ne_W0lf] //= 2.5a Corrected some "mes"s without the getitemname. (bugreport:1564) [Samuray22] -//= -Changed an incorrect "!=" to "==". (bugreport:1572) +//= -Changed an incorrect "!=" to "==". (bugreport:1572) //= -And Small Typo Error //= 2.6 Fixed Kayron Grik cutin not being removed as reported by jc1991, bugreport:1825 [Brainstorm] //= 2.6a Fixed a Little Bug with Whispers Summoned in the Last Test. (bugreport:2253) [Samuray22] @@ -525,8 +525,8 @@ yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{ switch (SAGE_Q) { case 1: //Feather_Of_Bird, Fluff, Iron_Ore - setarray .@item[0], 916,914,1002; - setarray .@count[0], 50,50,25; + setarray .@item[0], 916,914,1002; + setarray .@count[0], 50,50,25; break; case 2: //Clover, Feather, Chinese_Ink @@ -539,12 +539,12 @@ yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{ setarray .@count[0], 50,50,50,50; break; } - set .@size, (getarraysize(.@item)-1); + set .@size, (getarraysize(.@item)-1); for( set .@i,0 ; .@i < .@size && countitem(.@item[.@i]) >= .@count[.@i] ; set .@i,.@i+1 ); - if(.@i == .@size) { + if(.@i == .@size) { if (Zeny > 29999) { for (set .@i, 0; .@i < .@size ; set .@i, .@i+1) - delitem .@item[.@i], .@count[.@i]; + delitem .@item[.@i], .@count[.@i]; Zeny -= 30000; mes "[Metheus Sylphe]"; mes "Well done. Let me proceed with your application request."; diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt index 225b4ee7b..38fb47131 100644 --- a/npc/jobs/2-2e/SoulLinker.txt +++ b/npc/jobs/2-2e/SoulLinker.txt @@ -13,7 +13,7 @@ //= 1.2 Rescripted to Aegis 10.3 standards. [Samuray22] //= 1.3 Slight updates and fixes to the script. [L0ne_W0lf] //= Removes the use of labels, and corrects other errors. -//= Removed the GM-use only NPC from the sec_in map. +//= Removed the GM-use only NPC from the sec_in map. //= No longer used a global var, uses an NPC var instead. //= 1.3a Deleted Empty Color Tag. (bugreport:1572) [Samuray22] //= 1.4 Replaced effect numerics with constants. [L0ne_W0lf] |