diff options
author | Jesusaves <cpntb1@ymail.com> | 2019-03-04 12:40:55 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2019-03-04 12:40:55 -0300 |
commit | 481e786fbb6f03e23d1d4f0c56509f677881b4ec (patch) | |
tree | 680a6b75d3553e209a0e4b60391d2833a5145546 | |
parent | 9001ebdb56bfe0e2c5fddf55c48268681654f6b3 (diff) | |
download | serverdata-481e786fbb6f03e23d1d4f0c56509f677881b4ec.tar.gz serverdata-481e786fbb6f03e23d1d4f0c56509f677881b4ec.tar.bz2 serverdata-481e786fbb6f03e23d1d4f0c56509f677881b4ec.tar.xz serverdata-481e786fbb6f03e23d1d4f0c56509f677881b4ec.zip |
Remove every trailing whitespace
```sed -i 's/[[:space:]]*$//' npc/*/*.txt```
60 files changed, 111 insertions, 111 deletions
diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt index f2676b1d8..ad3ffc676 100644 --- a/npc/000-0-0/sailors.txt +++ b/npc/000-0-0/sailors.txt @@ -96,7 +96,7 @@ L_Step3: mesq l("Yayaya, by pressing @@ or clicking in @@, you'll open your char status window!", b(l("F2")), b(l("STA"))); next; mesn l("Magic Arpan"); - mesq l("You should allocate some attributes to it. You need @@, @@ and @@, on this order of importance.", b(l("Agility")), b(l("Dexterity")), b(l("Strength"))); // b(l("")), + mesq l("You should allocate some attributes to it. You need @@, @@ and @@, on this order of importance.", b(l("Agility")), b(l("Dexterity")), b(l("Strength"))); // b(l("")), next; mesn l("Magic Arpan"); mesq l("Once you allocate status points, you can fight it! Good luck, @@!", strcharinfo(0)); @@ -165,7 +165,7 @@ L_Step4: mesq l("Yayaya, by pressing @@ or clicking in @@, you'll open your char status window!", b(l("F2")), b(l("STA"))); next; mesn l("Magic Arpan"); - mesq l("You should allocate some attributes to it. You need @@, @@ and @@, on this order of importance.", b(l("Agility")), b(l("Dexterity")), b(l("Strength"))); // b(l("")), + mesq l("You should allocate some attributes to it. You need @@, @@ and @@, on this order of importance.", b(l("Agility")), b(l("Dexterity")), b(l("Strength"))); // b(l("")), break; case 4: mesn "Elmo"; diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt index d25701f97..50ea9a107 100644 --- a/npc/000-0/sailors.txt +++ b/npc/000-0/sailors.txt @@ -11,7 +11,7 @@ // Description: // Starting script of Evol Online, modified for TMW2. // Translation: -// FR Translated +// FR Translated 000-0,23,19,0 script Sailors NPC_SAILORS,6,6,{ diff --git a/npc/00000SAVE/021-1_michel.forum.txt b/npc/00000SAVE/021-1_michel.forum.txt index 1cd1e1cb1..641f9df5b 100644 --- a/npc/00000SAVE/021-1_michel.forum.txt +++ b/npc/00000SAVE/021-1_michel.forum.txt @@ -31,7 +31,7 @@ delitem "Raw Log", 25; delitem "Reed Bundle", 15; delitem "Root", 20; set Zeny, Zeny - 10000 -getitem "Iten", 1; +getitem "Iten", 1; mes "\"Here its your towel..Enjoy it.\""; goto L_Close; diff --git a/npc/00000SAVE/andy_alex.forum.txt b/npc/00000SAVE/andy_alex.forum.txt index 18a25ece0..72a83cb83 100644 --- a/npc/00000SAVE/andy_alex.forum.txt +++ b/npc/00000SAVE/andy_alex.forum.txt @@ -12,26 +12,26 @@ if (TOM_Quest == 3) goto L_Alex_Didyou; if (TOM_Quest == 4) goto L_Alex_Okay; if (TOM_Quest == 5) goto L_Alex_End; - + mes "[Alex]"; mes "\"Hey there! Mind giving us a hand?\""; menu - + "Yeah, what do you need?", L_Alex_Help, - + "I Don't have time, sorry.", -; - + close; - + L_Alex_Help - + mes "[Alex]"; mes "\"He shows you little wooden box.\""; mes "\"Give these to Andy you can find him somewhere around in Dark World, I'm sure he'll reward you.\""; set TOM_Quest, 1; close; - + L_Alex_Tablet: mes "[Alex]"; @@ -41,31 +41,31 @@ L_Alex_Tablet: mes "\"I need you to tell Andy that we found what we we're looking for and that we dont have to examine those Dark World creatures anymore, I'm sure he'll understand.\""; set TOM_Quest, 3; close; - + L_Alex_Didyou: - mes "[Alex]"; + mes "[Alex]"; mes "\"Did you tell it to him already, if not please hurry!\""; close; - + L_Alex_Waits_1: mes "[Alex]"; mes "\"Did you give that box to Andy?\""; close; - + L_Alex_Okay: mes "[Alex]"; mes "Did you tell him what I asked you to tell him?"; menu - + "Yes I did, but he asked me to tell you that he is going to stay in Dark World because he likes that place.", L_Alex_Damn, - + "No I didn't", -; - + close; - + L_Alex_Damn: set TOM_Quest, 5; @@ -78,19 +78,19 @@ L_Alex_Damn: set Zeny, Zeny + 4000; getitem "Whiterabbitears", 1; close; - + L_Alex_TooMany: mes "[Alex]"; mes "\"You have too many items for me to give you a reward.\""; close; - + L_Alex_End: mes "[Alex]"; mes "\"Be safe out there, Dark World is dangerous for the unexperienced!\""; close; - + } @@ -107,17 +107,17 @@ L_Alex_End: //Andy ???-?.gat,??,??,?|script|Andy|???,{ - + if (TOM_Quest == 1) goto L_Andy_Okay; if (TOM_Quest == 2) goto L_Andy_Tablet; if (TOM_Quest == 3) goto L_Andy_Tell; if (TOM_Quest == 4) goto L_Andy_whatdidhesay; if (TOM_Quest == 5) goto L_Andy_End; - + mes "[Andy]"; mes "\"Lots of work to do.\""; close; - + L_Andy_Okay: mes "[Andy]"; @@ -128,7 +128,7 @@ L_Andy_Okay: getexp 1000, 0; set Zeny, Zeny + 1000; goto L_Andy_Help - + L_Andy_Help: mes "[Andy]"; @@ -137,7 +137,7 @@ L_Andy_Help: mes "\"Please get this to Alex!\""; set TOM_Quest, 2; close; - + L_Andy_Tablet: mes "[Andy]"; @@ -145,17 +145,17 @@ L_Andy_Tablet: close; L_Andy_Tell - + mes "[Andy]"; mes "\"What did he say?\""; menu - + "He said that you have found what you were looking for and you dont have to stay here in Dark World anymore.", L_Andy_Well, - + "Nothing...", -; - + close; - + L_Andy_Well: mes "[Andy]"; @@ -163,17 +163,17 @@ L_Andy_Well: getexp 1000, 0; set TOM_Quest, 4; close; - + L_Andy_Whatdidhesay: mes "[Andy]"; mes "\"Pleasy hurry!\""; close; - + L_Andy_End: mes "[Andy]"; mes "\"Thanks for your help again!\""; close; - + } diff --git a/npc/001-7/celestia_bossfight.txt b/npc/001-7/celestia_bossfight.txt index 1689a148c..e9c768aee 100644 --- a/npc/001-7/celestia_bossfight.txt +++ b/npc/001-7/celestia_bossfight.txt @@ -9,7 +9,7 @@ // No other safety measures are in place. Lone players cannot challenge the // Yeti King, there must be at least 2 players there to do the challenge. // BEWARE, the Yeti King gains stronger poisons the more people are attacking him. -// +// // $@GM_OVERRIDE allows a single player to challenge him, as usual with all // co-op scripts. // diff --git a/npc/002-1/chefgado.txt b/npc/002-1/chefgado.txt index 90eb5b107..f47a3d9f8 100644 --- a/npc/002-1/chefgado.txt +++ b/npc/002-1/chefgado.txt @@ -10,7 +10,7 @@ // ShipQuests_ChefGado // ShipQuests_Knife // Translation -// FR Translated +// FR Translated 002-1,27,28,0 script Chef Gado NPC_CHEF_GADO,{ .@q = getq(ShipQuests_Knife); diff --git a/npc/002-1/doors.txt b/npc/002-1/doors.txt index cb9a27cc4..ea2380953 100644 --- a/npc/002-1/doors.txt +++ b/npc/002-1/doors.txt @@ -7,7 +7,7 @@ 002-1,72,30,0 script AreaNPC#002-1d NPC_HIDDEN,0,0,{ OnTouch: - if (LOCATION$ == "") + if (LOCATION$ == "") warp "002-3", 42, 26; else if (LOCATION$ == "Tulim" || LOCATION$ == "Candor") warp "002-3@"+LOCATION$, 42, 26; diff --git a/npc/002-1/knife.txt b/npc/002-1/knife.txt index a8d368e73..5628e1650 100644 --- a/npc/002-1/knife.txt +++ b/npc/002-1/knife.txt @@ -1,6 +1,6 @@ // Evol scripts. // Authors: -// Ablu +// Ablu // Saulc // Qwerty Dragon // Description: @@ -22,7 +22,7 @@ menu l("Yeah!"), L_Give, l("Nah."), -; - + closedialog; close; diff --git a/npc/002-2/doors.txt b/npc/002-2/doors.txt index ef7a189bb..0d0760dd6 100644 --- a/npc/002-2/doors.txt +++ b/npc/002-2/doors.txt @@ -1,10 +1,10 @@ // TMW2 Script // Authors: // Jesusalva -// +// // Originally an Evol script authored by: // Ablu, Alastrim and Reid -// +// // Description: // Doors NPCs. @@ -32,7 +32,7 @@ L_Warn: close; L_Warp: - if (LOCATION$ == "") + if (LOCATION$ == "") warp "002-1", 35, 26; else warp "002-1@"+LOCATION$, 35, 26; diff --git a/npc/002-3/doors.txt b/npc/002-3/doors.txt index 54f1c2ad5..d6f6b5135 100644 --- a/npc/002-3/doors.txt +++ b/npc/002-3/doors.txt @@ -36,7 +36,7 @@ OnTouch: 002-3,42,25,0 script AreaNPC#002-3d NPC_HIDDEN,0,0,{ OnTouch: - if (LOCATION$ == "") + if (LOCATION$ == "") warp "002-1", 72, 29; else warp "002-1@"+LOCATION$, 72, 29; diff --git a/npc/002-4/doors.txt b/npc/002-4/doors.txt index b8162cdd1..2d7f9450f 100644 --- a/npc/002-4/doors.txt +++ b/npc/002-4/doors.txt @@ -7,7 +7,7 @@ 002-4,19,27,0 script AreaNPC#002-4d NPC_HIDDEN,0,0,{ OnTouch: - if (LOCATION$ == "") + if (LOCATION$ == "") warp "002-3", 43, 28; else warp "002-3@"+LOCATION$, 43, 28; diff --git a/npc/003-0/mages.txt b/npc/003-0/mages.txt index d6808080c..2ef40f8bd 100644 --- a/npc/003-0/mages.txt +++ b/npc/003-0/mages.txt @@ -1,7 +1,7 @@ // (C) Jesusalva, 2018 // TMW2 Script -// Wizard +// Wizard // MG_COLDBOLT (ice) // MG_LIGHTNINGBOLT (wind) // WZ_EARTHSPIKE (earth) diff --git a/npc/003-1/aidan.txt b/npc/003-1/aidan.txt index 398e0723e..7cc651dec 100644 --- a/npc/003-1/aidan.txt +++ b/npc/003-1/aidan.txt @@ -11,15 +11,15 @@ next; mesn l("Aidan, the Monster Guide"); mesq l("The register fee is 2000 GP."); - + do - { + { select rif(Zeny >= 2000, l("Register")), rif(Zeny < 2000, l("How do I get so much money?!")), l("Not at the moment"), l("Information"); - + switch (@menu) { case 1: mes ""; diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt index c0d737645..a3ddf4ccb 100644 --- a/npc/003-1/ishi.txt +++ b/npc/003-1/ishi.txt @@ -1,8 +1,8 @@ // TMW-2 Script -// Author: +// Author: // Crazyfefe // Jesusalva -// +// // Do not add void items to array. // note : the rare item system suck. @@ -102,7 +102,7 @@ @var = 8; goto L_Items; break; - case 9 : + case 9 : @var = 9; goto L_Items; break; diff --git a/npc/003-2/_import.txt b/npc/003-2/_import.txt index f6711989e..fffe69267 100644 --- a/npc/003-2/_import.txt +++ b/npc/003-2/_import.txt @@ -1,4 +1,4 @@ -// Map 003-2: Tulimshar Guild +// Map 003-2: Tulimshar Guild // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/003-2/_warps.txt", "npc/003-2/eistein.txt", diff --git a/npc/003-4/sorfina.txt b/npc/003-4/sorfina.txt index e9b002600..05e04f492 100644 --- a/npc/003-4/sorfina.txt +++ b/npc/003-4/sorfina.txt @@ -18,7 +18,7 @@ if (getq(TulimsharQuest_Hasan) == 3) goto L_Basement; if (getq(TulimsharQuest_Hasan) == 4) goto L_Finished; // Status 5 returns to default message - //if (getq(TulimsharQuest_Hasan) == 5) goto + //if (getq(TulimsharQuest_Hasan) == 5) goto mesn; mesq l("Hello, darling!"); close; diff --git a/npc/003-5/jeweler.txt b/npc/003-5/jeweler.txt index e72c76664..6442eab82 100644 --- a/npc/003-5/jeweler.txt +++ b/npc/003-5/jeweler.txt @@ -10,7 +10,7 @@ // Jeweler can also polish raw gemstones for a comission ($$$) // Polished gemstones can be inserted on rings. // The less precious the ring, heavier and less defense value. -// +// // All three rings can be swapped by a Light Ring (you will lose any gemstone on them!). // Still pending discussion. diff --git a/npc/003-8/jhedia.txt b/npc/003-8/jhedia.txt index 393a1b6ed..9236f2a3a 100644 --- a/npc/003-8/jhedia.txt +++ b/npc/003-8/jhedia.txt @@ -1,7 +1,7 @@ // TMW2 scripts. // Author: // Crazyfefe -// Saulc +// Saulc // Jesusalva // Description: // Jhedia takes care of Tulimshar forge and makes ingots @@ -49,7 +49,7 @@ speech S_FIRST_BLANK_LINE,// | S_LAST_NEXT, l("You don't have enough material, sorry."); close; - + } L_Menu: diff --git a/npc/005-1-1/main.txt b/npc/005-1-1/main.txt index a78e53d3e..252c67144 100644 --- a/npc/005-1-1/main.txt +++ b/npc/005-1-1/main.txt @@ -21,7 +21,7 @@ // height is not relevant // .@x / .@y - // .@w = 12 + // .@w = 12 // .@i → Real value // For each Y beyond .@offy we add .@w to i diff --git a/npc/005-1/maya.txt b/npc/005-1/maya.txt index 0751b4d36..9858e51f7 100644 --- a/npc/005-1/maya.txt +++ b/npc/005-1/maya.txt @@ -91,7 +91,7 @@ L_Quest2: mes ""; mesn; - mesq l("Good! I want 3 @@ and 10 @@. I have a contract to transform that in good money.", + mesq l("Good! I want 3 @@ and 10 @@. I have a contract to transform that in good money.", getitemlink(ScorpionStinger), getitemlink(PiouFeathers)); setq CandorQuest_Maya, 3; close; diff --git a/npc/005-2/saxsochest.txt b/npc/005-2/saxsochest.txt index ddc9672c6..61a13d509 100644 --- a/npc/005-2/saxsochest.txt +++ b/npc/005-2/saxsochest.txt @@ -5,7 +5,7 @@ // Minor quest for a necklace 005-2,44,41,0 script Saxso Chest NPC_NO_SPRITE,{ - + function quest_completed { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("you already opened the chest."); @@ -46,7 +46,7 @@ } } while (@menu != 2); } - + do { .@chest = getq(CandorQuest_Chest); diff --git a/npc/005-3/barrel.txt b/npc/005-3/barrel.txt index 7330129de..c70ce6664 100644 --- a/npc/005-3/barrel.txt +++ b/npc/005-3/barrel.txt @@ -54,7 +54,7 @@ L_BarrelTally: else if (@rand == 5) getitem TolchiArrow,6; else if (@rand == 6) - getitem BugLeg,1; + getitem BugLeg,1; return; L_Loop: diff --git a/npc/005-4/tolchi.txt b/npc/005-4/tolchi.txt index a9345b66c..cdcf65cc2 100644 --- a/npc/005-4/tolchi.txt +++ b/npc/005-4/tolchi.txt @@ -49,12 +49,12 @@ { speech S_FIRST_BLANK_LINE, l("You don't have the three Coal lumps."); - close2; + close2; goodbye; } delitem .Item2, 3; Zeny = Zeny + 825; - getexp 105,0; + getexp 105,0; setq CandorQuest_Tolchi, 2; } if (@q == 0) diff --git a/npc/005-6/zitoni.txt b/npc/005-6/zitoni.txt index 68dc7f783..b8d3c1b52 100644 --- a/npc/005-6/zitoni.txt +++ b/npc/005-6/zitoni.txt @@ -253,7 +253,7 @@ L_DarkInv_Powder: delitem SulfurPowder, 1; delitem PileOfAsh, 1; getitem EverburnPowder, 1; - getexp 100, 0; + getexp 100, 0; mesn; mesq l("Here you go. Handle it with caution."); close; diff --git a/npc/005-7/trainer.txt b/npc/005-7/trainer.txt index 28aa71b59..426f7329e 100644 --- a/npc/005-7/trainer.txt +++ b/npc/005-7/trainer.txt @@ -536,7 +536,7 @@ OnKillHouseMaggot: message strcharinfo(0), l("@@/4 House Maggots", .@k+1); } } else { - if (is_staff()) + if (is_staff()) dispbottom "It's working. (T:OKHM)"; } end; diff --git a/npc/007-1/zarkor.txt b/npc/007-1/zarkor.txt index a9e6c12d1..2b2ac3b2e 100644 --- a/npc/007-1/zarkor.txt +++ b/npc/007-1/zarkor.txt @@ -1,5 +1,5 @@ // TMW2 Script -// Author: +// Author: // Crazyfefe // Jesusalva // Description: @@ -46,7 +46,7 @@ if (getq2(TulimsharQuest_DarkInvocator) == 0) { setq TulimsharQuest_DarkInvocator, 4; goto L_Quest; - } + } goto L_Ritual; break; diff --git a/npc/009-2/ryan.txt b/npc/009-2/ryan.txt index 50bb8c6d6..ca2664c9d 100644 --- a/npc/009-2/ryan.txt +++ b/npc/009-2/ryan.txt @@ -44,26 +44,26 @@ next; mesn; mesq l("Ah, you really deserve this @@. Good job!", getitemlink(ChefHat)); - } + } if (.@q >= 21) { Zeny=Zeny+rand(1,.@a); getexp rand(1,.@q), rand(1, .@q); - } + } if (.@q >= 51) { Zeny=Zeny+rand(.@q,.@a); getexp rand(1,.@a), rand(1, .@q); - } + } if (.@q >= 91) { Zeny=Zeny+rand(.@a, .@a+.@q); getexp rand(.@q,.@a), rand(1, .@q); - } + } if (.@q == 100) { setq1 HalinarzoQuest_LifeDelight, 3; getitem PlatinumIngot, 1; next; mesn; mesq l("Ah, I have enough @@ for a life! Take this EXTREMELY RARE @@. Good job!", getitemlink(TonoriDelight), getitemlink(PlatinumIngot)); - } + } close; diff --git a/npc/009-5/alvasus.txt b/npc/009-5/alvasus.txt index 23e2fa037..3bb6ddfe4 100644 --- a/npc/009-5/alvasus.txt +++ b/npc/009-5/alvasus.txt @@ -14,7 +14,7 @@ // // First time: Alvasus Pendant // Later times: GP and EXP -// +// // Q1: Current State // Q2: Current Reward // Q3: Current Week Number (for repeat) diff --git a/npc/012-1/jack.txt b/npc/012-1/jack.txt index f8e2d38e6..3eaf5cf54 100644 --- a/npc/012-1/jack.txt +++ b/npc/012-1/jack.txt @@ -123,7 +123,7 @@ L_Loop: mesn; mesq lg("Sorry, son. I know how hard this is. But this is teaching you a valuable lesson, your eye will be more sharp for quality wood from now on."); next; - } + } goto L_Loop; diff --git a/npc/012-5/nicholas.txt b/npc/012-5/nicholas.txt index d1a53af71..1f50fe834 100644 --- a/npc/012-5/nicholas.txt +++ b/npc/012-5/nicholas.txt @@ -71,7 +71,7 @@ speech S_FIRST_BLANK_LINE,// | S_LAST_NEXT, l("You don't have enough material, sorry."); } - return; + return; } L_Menu: diff --git a/npc/016-1/laranja.txt b/npc/016-1/laranja.txt index 32c1770e7..35e3b6373 100644 --- a/npc/016-1/laranja.txt +++ b/npc/016-1/laranja.txt @@ -10,7 +10,7 @@ mesq l("I'm Laranja."); next; mesn; - mesq l("My father lead a dye fabric, I'm in charge to sell @@ around the world.", getitemlink(OrangeDye)); + mesq l("My father lead a dye fabric, I'm in charge to sell @@ around the world.", getitemlink(OrangeDye)); next; mesn; mesq l("Would you like to buy some?"); diff --git a/npc/017-1/paxel.txt b/npc/017-1/paxel.txt index 5e59044c7..ca3603da3 100644 --- a/npc/017-1/paxel.txt +++ b/npc/017-1/paxel.txt @@ -2,7 +2,7 @@ // This is from LoF Forums, to replace LoF Paxel //---------------------------------------------------- // PRSM Helmet quest (seasonal quest) -// Create Quest: Darlord (Depredador) +// Create Quest: Darlord (Depredador) //---------------------------------------------------- // Old Paxel turned Raw Coal in Coal... But we don't have Raw Coal. diff --git a/npc/017-4/pihro.txt b/npc/017-4/pihro.txt index 804742109..5bec27b9a 100644 --- a/npc/017-4/pihro.txt +++ b/npc/017-4/pihro.txt @@ -62,7 +62,7 @@ speech S_FIRST_BLANK_LINE,// | S_LAST_NEXT, l("You don't have enough material, sorry."); } - return; + return; } mesn; mesq l("Hello there! I make bullets for the weapons my friend Pyndragon makes."); diff --git a/npc/017-4/pyndragon.txt b/npc/017-4/pyndragon.txt index 4151cb951..41901733b 100644 --- a/npc/017-4/pyndragon.txt +++ b/npc/017-4/pyndragon.txt @@ -49,7 +49,7 @@ speech S_FIRST_BLANK_LINE,// | S_LAST_NEXT, l("You don't have enough material, sorry."); } - return; + return; } mesn; diff --git a/npc/017-5/nahrec.txt b/npc/017-5/nahrec.txt index 705feb865..fdb94e794 100644 --- a/npc/017-5/nahrec.txt +++ b/npc/017-5/nahrec.txt @@ -51,7 +51,7 @@ speech S_FIRST_BLANK_LINE,// | S_LAST_NEXT, l("You don't have enough material, sorry."); } - return; + return; } mesn; diff --git a/npc/017-5/silversmith.txt b/npc/017-5/silversmith.txt index fc03a6ffc..c4b12e6ac 100644 --- a/npc/017-5/silversmith.txt +++ b/npc/017-5/silversmith.txt @@ -50,7 +50,7 @@ speech S_FIRST_BLANK_LINE,// | S_LAST_NEXT, l("You don't have enough material, sorry."); } - return; + return; } diff --git a/npc/018-2-1/warps.txt b/npc/018-2-1/warps.txt index 6e564c6c4..ddace7c81 100644 --- a/npc/018-2-1/warps.txt +++ b/npc/018-2-1/warps.txt @@ -18,7 +18,7 @@ // 128 - Saulc's Madness // 256 - The Mouboo Realm // 512 - The Moubootaur Dungeon -// +// // Field 3 // 0- The Loyalists // 1- The Wildlife diff --git a/npc/019-4-1/chief.txt b/npc/019-4-1/chief.txt index 746346147..aa45e5f5b 100644 --- a/npc/019-4-1/chief.txt +++ b/npc/019-4-1/chief.txt @@ -164,7 +164,7 @@ L_Main: // Begin Christmas .@q=getq2(SQuest_Christmas); - // + // if (!getq(General_Narrator)) { mesn; mesq l("The stolen christmas boxes!! Christmas is RUINED!!!"); diff --git a/npc/020-5/bracco.txt b/npc/020-5/bracco.txt index 639ea6071..0854387a2 100644 --- a/npc/020-5/bracco.txt +++ b/npc/020-5/bracco.txt @@ -48,7 +48,7 @@ speech S_FIRST_BLANK_LINE,// | S_LAST_NEXT, l("You don't have enough material, sorry."); } - return; + return; } // Start diff --git a/npc/020-6/agostine.txt b/npc/020-6/agostine.txt index 3c6a44591..7e81c7305 100644 --- a/npc/020-6/agostine.txt +++ b/npc/020-6/agostine.txt @@ -137,7 +137,7 @@ L_DeliverFur: next; mesn l("Agostine, the Legendary Tailor"); mesq l("It was an awful cut! Don't think any piece of a sightly lower material will have part in my art!"); - } + } goto L_DeliverFur; diff --git a/npc/commands/ipcheck.txt b/npc/commands/ipcheck.txt index df72e1f5a..83525206a 100644 --- a/npc/commands/ipcheck.txt +++ b/npc/commands/ipcheck.txt @@ -3,7 +3,7 @@ // // @ipcheck <player_name> // #ipcheck <player_name> -// +// // Returns user IP diff --git a/npc/commands/kami.txt b/npc/commands/kami.txt index 0152c98f2..fa17bc442 100644 --- a/npc/commands/kami.txt +++ b/npc/commands/kami.txt @@ -2,7 +2,7 @@ // // @k <message> // Broadcast, and broadcast to #world too -// +// // @servmsg <message> // Experimental, uses servicemessage() - requires up to date server diff --git a/npc/commands/mobinfo.txt b/npc/commands/mobinfo.txt index b5ec1eff4..685349145 100644 --- a/npc/commands/mobinfo.txt +++ b/npc/commands/mobinfo.txt @@ -2,7 +2,7 @@ // // @monsterinfo <monsterAegis> // Sends @mobinfo with a delay (moved from atcommand.conf) -// +// - script @monsterinfo 32767,{ end; diff --git a/npc/commands/resync.txt b/npc/commands/resync.txt index ed28723d3..3c68d8644 100644 --- a/npc/commands/resync.txt +++ b/npc/commands/resync.txt @@ -2,7 +2,7 @@ // Author: Jesusalva <admin@tmw2.org> // // Introduces @resync -// +// // It'll cast slide to your own position // Hopefully making client update your real position without causing server warning // diff --git a/npc/config/magic.txt b/npc/config/magic.txt index df2cb86fc..86a0a60ec 100644 --- a/npc/config/magic.txt +++ b/npc/config/magic.txt @@ -2,10 +2,10 @@ // Author: Jesusalva <admin@tmw2.org> // // Magic Script Core Functions -// +// // Used for our pseudo-magic. // These are only helpers, you can add more restrictions and effects freely. -// Important Variables: +// Important Variables: // MAGIC_EXP // Current mana magic experience // LAST_SKILL diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt index b571768cb..e84b11cef 100644 --- a/npc/functions/fishing.txt +++ b/npc/functions/fishing.txt @@ -130,7 +130,7 @@ function script fishing { .@pull_rand_max = (.@pull_rand_max ? .@pull_rand_max : 800); .@fish_id = CommonCarp; // failsafe - + if (getvariableofnpc(.bait_ids[0], .@npc$) < 1) { diff --git a/npc/functions/mobpoint.txt b/npc/functions/mobpoint.txt index bb2c1f03e..3577e1bdb 100644 --- a/npc/functions/mobpoint.txt +++ b/npc/functions/mobpoint.txt @@ -40,7 +40,7 @@ OnNPCKillEvent: end; // When you kill a player, some special care is needed -// Only a few maps will give you experience for PK: Tulimshar's Guards Arena, +// Only a few maps will give you experience for PK: Tulimshar's Guards Arena, // Frostia Imperial PVP Arena, Call Of Dusty, Arena Quirino Voraz. OnPCKillEvent: // killedrid diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt index 8ae930001..6acebf203 100644 --- a/npc/functions/seasons.txt +++ b/npc/functions/seasons.txt @@ -299,7 +299,7 @@ OnWinterStart: // Nearly all Winterlands + Woodlands + ducks drop winter items. (Summer is Desert shining, Winter is the opposite) // Winterland Area Mobs // Moggun AlphaMouboo BlueSlime SantaSlime IcedFluffy Yeti WaterFairy AzulSlime Fluffy - // RudolphSlime WhiteSlime AngryBat Wolvern WindFairy + // RudolphSlime WhiteSlime AngryBat Wolvern WindFairy // Woodlands Area Mobs // Tipiu Piousse Silkworm Squirrel Blub CobaltPlant MauvePlant GambogePlant AlizarinPlant @@ -308,7 +308,7 @@ OnWinterStart: // ManaBug TrainingDummy // LoF Area Mobs - // ChocolateSlime Lavern ShadowPlant CyanButterfly + // ChocolateSlime Lavern ShadowPlant CyanButterfly // Items: Snowflake CaramelCandy GingerBreadMan ChocolateBiscuit // Quest Requires All Of The Above diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt index ec161fa20..6ccc54502 100644 --- a/npc/functions/weather.txt +++ b/npc/functions/weather.txt @@ -176,7 +176,7 @@ OnMinute45: htidelete(.@hti); // During night, normal monsters respawn 30% faster. (Bifs and Bosses are immune) - // + // // Also, announce to players about day/night cycle changes // The fastest you'll get is 30 minutes for night cycle. // It's 2 messages every 3 hours. (r7.5) diff --git a/npc/items/rand_sc_heal.txt b/npc/items/rand_sc_heal.txt index 8bb6aac0a..1c1c7dc1e 100644 --- a/npc/items/rand_sc_heal.txt +++ b/npc/items/rand_sc_heal.txt @@ -14,7 +14,7 @@ // 2 Other // 3 Special 1 // 4 Special 2 -// +// // *getequipoption(EQI_HEAD_TOP,1,168); → Heal Bonus (should be first bonus on Chef Hat) diff --git a/npc/magic/kalmurk.txt b/npc/magic/kalmurk.txt index dd9ebc062..c9ceda89f 100644 --- a/npc/magic/kalmurk.txt +++ b/npc/magic/kalmurk.txt @@ -2,7 +2,7 @@ // Author: Jesusalva <admin@tmw2.org> // // Magic Script: TMW2_KALMURK -// +// // Spawns Maggots. diff --git a/npc/magic/mkpot.txt b/npc/magic/mkpot.txt index c9182b177..23fb82199 100644 --- a/npc/magic/mkpot.txt +++ b/npc/magic/mkpot.txt @@ -2,7 +2,7 @@ // Author: Jesusalva <admin@tmw2.org> // // Magic Script: TMW2_MKPOT -// +// // Attempts to make a haste potion from Mouboo Milk and Plushroom. // May make sewer water on failure. // TODO: Using too much transmutation magic may have dire consequences! Like, uh, transmutating your head! diff --git a/npc/magic/parum.txt b/npc/magic/parum.txt index d69827d1c..d91dbd1b4 100644 --- a/npc/magic/parum.txt +++ b/npc/magic/parum.txt @@ -2,7 +2,7 @@ // Author: Jesusalva <admin@tmw2.org> // // Magic Script: TMW2_PARUM -// +// // Attempts to transmutate Raw Logs. // May create arrows, Mouboo Figurines, Warped Logs. // With enough ManaExp may create WoodenLog. diff --git a/npc/magic/zarkor.txt b/npc/magic/zarkor.txt index c303a0665..79e85f8c2 100644 --- a/npc/magic/zarkor.txt +++ b/npc/magic/zarkor.txt @@ -2,7 +2,7 @@ // Author: Jesusalva <admin@tmw2.org> // // Magic Script: TMW2_ZARKOR -// +// // Spawns a Cave Maggot. // This is to test stuff, more than to create anything really. diff --git a/npc/soren-2/main.txt b/npc/soren-2/main.txt index 65ddce6c2..ae286d6bb 100644 --- a/npc/soren-2/main.txt +++ b/npc/soren-2/main.txt @@ -24,7 +24,7 @@ // This runs every once in a while, and may either spawn things, or drop // items. ...Needless to say, if it spawn things, everyone on the room will // get mad at you. Luck you, here's not PVP. -// +// // One last thing. If you're way past your share, you'll get warnings about // messing other players life. Simply use the warp, or leave the house and // come back. If you don't, you'll be kicked from the game via @kick. diff --git a/npc/soren/main.txt b/npc/soren/main.txt index fdeb712b0..b74df03e8 100644 --- a/npc/soren/main.txt +++ b/npc/soren/main.txt @@ -16,7 +16,7 @@ // Notes: // I had two options: // getvariableofnpc(<variable>, "<npc name>") -// This way, each summon point would have .caster and .lifetime +// This way, each summon point would have .caster and .lifetime // getvariableofpc(<variable>, <account id>{, <default value>}) // This way, I could use @cast_places to control stuff. // diff --git a/npc/test/karim.txt b/npc/test/karim.txt index 85b17a6e7..c1b74d206 100644 --- a/npc/test/karim.txt +++ b/npc/test/karim.txt @@ -17,11 +17,11 @@ test,2,4,0 script karim NPC_PLAYER,{ .Item1 = RightCraftyWing; .Item2 = LeftCraftyWing; .ItemReward = FlightTalisman; - + function quest_beggining{ speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("my name is karim can you help me?."); - + setq Karim_Quest, 1; return; } @@ -80,12 +80,12 @@ test,2,4,0 script karim NPC_PLAYER,{ l("Can you give me a @@ or a @@", getitemlink(.Item1), getitemlink(.Item2)); do - { + { select l("a Right Crafty Wing"), l("a Left Crafty Wing"), menuaction(l("Quit")); - + switch (@menu) { case 1: diff --git a/npc/test/rock.txt b/npc/test/rock.txt index e899ea4df..4f769cd62 100644 --- a/npc/test/rock.txt +++ b/npc/test/rock.txt @@ -15,7 +15,7 @@ test,2,6,0 script rock NPC_PLAYER,{ function quest_play { - mes l("Before start witch item do you want to play"); + mes l("Before start witch item do you want to play"); mes "##B" + l("Drag and drop an item from your inventory.") + "##b"; .Item = requestitem(); diff --git a/npc/test/test1.txt b/npc/test/test1.txt index 52f788bbc..7297f54a3 100644 --- a/npc/test/test1.txt +++ b/npc/test/test1.txt @@ -2,7 +2,7 @@ // Author: // 4144 // Description: -// script tests +// script tests function script test1function { .var = .walkmask; diff --git a/npc/test/test2.txt b/npc/test/test2.txt index 6870463c7..fdc6f8470 100644 --- a/npc/test/test2.txt +++ b/npc/test/test2.txt @@ -2,7 +2,7 @@ // Author: // 4144 // Description: -// script tests +// script tests test,12,5,0 script test2 NPC_HAT_BOX,{ close; |