diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-30 16:02:55 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-30 16:02:55 +0000 |
| commit | f17c3bc02c9e82147fb471132940e84d227ec4bc (patch) | |
| tree | c7623d4aefa26cb8ae461b63c1efed99d8c99adf | |
| parent | fa2020be43ddc026460896a3bb8b1d0f425265b2 (diff) | |
| download | hercules-f17c3bc02c9e82147fb471132940e84d227ec4bc.tar.gz hercules-f17c3bc02c9e82147fb471132940e84d227ec4bc.tar.bz2 hercules-f17c3bc02c9e82147fb471132940e84d227ec4bc.tar.xz hercules-f17c3bc02c9e82147fb471132940e84d227ec4bc.zip | |
- Removed trailing tabs, and fixed some spacing.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15524 54d463be-8e91-2dee-dedb-b68131a5f0ec
72 files changed, 462 insertions, 462 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 8faea3314..68b62816e 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -6412,7 +6412,7 @@ Example: --------------------------------------- -*compare (<string>,<substring>) +*compare(<string>,<substring>) This command returns 1 or 0 when the substring is in the main string (1) or not (0). This command is not case sensitive. diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index f64ed1457..1477d9510 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -95,7 +95,7 @@ OnTimer45000: enablenpc "#AirshipWarp-1"; enablenpc "#AirshipWarp-2"; donpcevent "#AirshipWarp-1::OnUnhide"; - donpcevent "#AirshipWarp-2::OnUnhide"; + donpcevent "#AirshipWarp-2::OnUnhide"; mapannounce "airplane","Welcome to Hugel. Have a safe trip.",bc_map,0xBA55D3; end; OnTimer55000: @@ -469,7 +469,7 @@ OnTimer45000: enablenpc "#AirshipWarp-3"; enablenpc "#AirshipWarp-4"; donpcevent "#AirshipWarp-3::OnUnhide"; - donpcevent "#AirshipWarp-4::OnUnhide"; + donpcevent "#AirshipWarp-4::OnUnhide"; mapannounce "airplane_01","Welcome to Izlude. Have a safe trip.",bc_map,0x00FF00; end; OnTimer55000: diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index c3ba2fbb2..e47b86e9e 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -67,7 +67,7 @@ alberta,131,139,2 script Drunken Old Man 54,{ mes "^666666*Hiccup*^000000"; mes "Wh-what are you"; mes "staring at? Get lost!!"; - next; + next; switch(select("Say nothing.","Leave him alone.")) { case 1: mes "[Deagle]"; diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index 5df83326b..9e953cfd2 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -347,7 +347,7 @@ OnTouch: } set .@Main_gauche_hap,.@input * 9400; if (Zeny < .@Main_gauche_hap) { - mes "[Suspicious Guy]"; + mes "[Suspicious Guy]"; mes "Short on zeny?"; mes "When the greatest deal in your life is right before your eyes?! Tragic, truly tragic..."; close; diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt index dfee6d827..fd8da5dd1 100644 --- a/npc/cities/lutie.txt +++ b/npc/cities/lutie.txt @@ -186,7 +186,7 @@ switch (xmas_npc) { mes "and hurry up."; mes "Come back quickly~"; set xmas_npc,6; - close; + close; case 6: mes "[Thachentze]"; mes "Hohohoho~"; diff --git a/npc/custom/WoE_Setter.txt b/npc/custom/WoE_Setter.txt index 9e5dc05c1..fdab6da98 100644 --- a/npc/custom/WoE_Setter.txt +++ b/npc/custom/WoE_Setter.txt @@ -125,7 +125,7 @@ L_Reset: deletearray $sday[0],200; deletearray $eday[0],200; deletearray $woetime[0],200; - deletearray $woetime2[0],200; + deletearray $woetime2[0],200; mes "[Woe Setter]"; mes "They are all gone now, please remember to set new ones"; close; diff --git a/npc/custom/eAAC_Scripts/banker.txt b/npc/custom/eAAC_Scripts/banker.txt index f9111098f..93dcf5e66 100644 --- a/npc/custom/eAAC_Scripts/banker.txt +++ b/npc/custom/eAAC_Scripts/banker.txt @@ -368,7 +368,7 @@ prontera,155,188,3 script Zacariath Madhat 872,{ mes "ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ"; if (@totalzeny > @zenyamount || @totalzeny < 0) { mes "TOTAL Zeny: "+@totalcoins+" - ^CC0000"+@totalzeny+"^000000"; - mes "Zeny Left: "+(@zenyamount-@totalzeny); + mes "Zeny Left: "+(@zenyamount-@totalzeny); goto L_Overzeny; } mes "TOTAL: "+@totalcoins+" ^00CC00"+@totalzeny+"^000000"; diff --git a/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt b/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt index 2b41f9190..16931e5ea 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt @@ -193,7 +193,7 @@ function script GF_getJobId { } if (@classId >= Job_Taekwon && @classId <= Job_Soul_Linker) { //Currently has no alternates. - return @classId; + return @classId; } if (@classId >= Job_Novice_High && @classId <= Job_Paladin2) set @classId, @classId -Job_Novice_High; diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt index d5a4093cb..af90b37e7 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_bank.txt @@ -58,7 +58,7 @@ function script F_keBank { } switch (@kmenu) { case 2: //Deposit - input @amount; + input @amount; if (@amount < $@kebk_minTransact) { callfunc "F_keIntro", -1, "Sorry, the minimum transaction value is "+$@kebk_minTransact+"z."; break; diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt index e720af3aa..5398f97f0 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobchange.txt @@ -144,7 +144,7 @@ function SF_to1stJob { function SF_to2ndJob { do { - set @newjob, -1; + set @newjob, -1; if (@type == EAJL_UPPER && $@kejc_upperPolicy && kej_class2) { set @newjob, eaclass(kej_class2); set @newjob, (@newjob&EAJ_UPPERMASK)|@type; @@ -202,7 +202,7 @@ function SF_testChangeJob { if (BaseLevel < getarg(1)) set @fail, @fail|2; if (JobLevel < getarg(2)) - set @fail, @fail|4; + set @fail, @fail|4; if (@fail > 0) { if (@fail&1) mes "You need "+getarg(0)+"z for the conversion process."; @@ -334,10 +334,10 @@ function SF_changeJob { if ($@kejc_announce) announce strcharinfo(0)+" has been promoted to "+@jobStr$+"!",8; set Zeny,Zeny-@cost; - emotion e_grat; + emotion e_grat; return 1; default: //Cancel... - return 0; + return 0; } } diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt index f1499b2e6..6d10ed043 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt @@ -324,7 +324,7 @@ function SF_swapJob { sc_end -1; callfunc "F_keCharge",getarg(1),$@kejs_swapDiscount,1; - emotion e_ok; + emotion e_ok; return 1; } diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt index a8f65a2b2..c42a072f2 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt @@ -367,7 +367,7 @@ function script F_keCost { if (@kafraPass) { return getarg(0)*(100-getarg(1))/100; } - return getarg(0); + return getarg(0); } //F_keCharge(int cost, int discount%, bool appliesKP) diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt index 3b9c38fac..8cbf48a54 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt @@ -937,7 +937,7 @@ function SF_hiddenTemple { "- Entrance ("+@cost+"z/"+getmapusers("prt_maze01")+" "+$@ked_users$+")", "- Level 2 ("+@cost2+"z/"+getmapusers("prt_maze02")+" "+$@ked_users$+")", "- Level 3 ("+@cost3+"z/"+getmapusers("prt_maze03")+" "+$@ked_users$+")" - ); + ); } else { set @submenu, select( "- Cancel warp to the Laberynth Forest", @@ -970,7 +970,7 @@ function SF_juperos { "- Entrance ("+@cost+"z/"+getmapusers("juperos_01")+" "+$@ked_users$+")", "- Level 2 ("+@cost2+"z/"+getmapusers("juperos_02")+" "+$@ked_users$+")", "- Core ("+@cost3+"z/"+getmapusers("jupe_core")+" "+$@ked_users$+")" - ); + ); } else { set @submenu, select( "- Cancel warp to Juperos", @@ -1031,7 +1031,7 @@ function SF_iceCave { "- Entrance ("+@cost+"z/"+getmapusers("ice_dun01")+" "+$@ked_users$+")", "- Level 2 ("+@cost2+"z/"+getmapusers("ice_dun02")+" "+$@ked_users$+")", "- Level 3 ("+@cost3+"z/"+getmapusers("ice_dun03")+" "+$@ked_users$+")" - ); + ); } else { set @submenu, select( "- Cancel warp to the Ice Cave", diff --git a/npc/custom/eAAC_Scripts/quest_warper.txt b/npc/custom/eAAC_Scripts/quest_warper.txt index a9947ee3f..85919fa0f 100644 --- a/npc/custom/eAAC_Scripts/quest_warper.txt +++ b/npc/custom/eAAC_Scripts/quest_warper.txt @@ -744,7 +744,7 @@ function script QWS_MMarray { set @Mmenuref[@Mj],@Mi; set @Mj,@Mj+1; } - set @Mi,@Mi+1; + set @Mi,@Mi+1; //----------------Town-Warp if ($QW_TW_OFF == 0) set @Mmenulist$[@Mj],@pMmenuitems$[@Mi]; if ($QW_TW_OFF == 0) set @Mmenuref[@Mj],@Mi; diff --git a/npc/custom/marriage.txt b/npc/custom/marriage.txt index 0ca3fb069..dbfcd5794 100644 --- a/npc/custom/marriage.txt +++ b/npc/custom/marriage.txt @@ -440,7 +440,7 @@ prt_church,106,99,3 script Happy Marry 67,{ if (getpartnerid() > 0) { mes "["+@name$+"]"; mes "Isn't marriage beautiful?"; - close; + close; } function SF_WedProgress; @@ -512,7 +512,7 @@ function SF_Register { set $wed_progress,1; mes "["+@name$+"]"; mes "You are now registered as the groom."; - mes "Tell your bride to register as soon as possible."; + mes "Tell your bride to register as soon as possible."; emotion e_hmm; initnpctimer; close; @@ -523,7 +523,7 @@ function SF_Register { mes "You are now registered as the bride."; mes "Tell your groom to register as soon as possible."; emotion e_hmm; - initnpctimer; + initnpctimer; close; default: //Cancel mes "["+@name$+"]"; @@ -633,7 +633,7 @@ function SF_WedProgress { mes "The bride, "+$wed_bride$+", has yet to retrieve the ring."; break; case 4: - mes "The bride, "+$wed_bride$+", is waiting for the groom to retrieve the ring."; + mes "The bride, "+$wed_bride$+", is waiting for the groom to retrieve the ring."; break; case 5: mes "We are just waiting for both "+$wed_groom$+" and "+$wed_bride$+" to be together to marry them."; diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt index b93210497..d6dae7d78 100644 --- a/npc/events/MemorialDay_2008.txt +++ b/npc/events/MemorialDay_2008.txt @@ -168,7 +168,7 @@ prontera,182,214,4 script Lauds#Memorial 58,{ mes "[Mad Sago Lauds]"; mes "Don't panic!"; emotion 0; - close; + close; } else if(.@RandomMsg == 2) { mes "[Mad Sago Lauds]"; diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt index 44aba7738..25cbc2b53 100644 --- a/npc/events/christmas_2008.txt +++ b/npc/events/christmas_2008.txt @@ -44,7 +44,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{ if (Sex) { mes "Hey, boy! What comes to mind when"; }else{ - mes "Hey, girl! What comes to mind when"; + mes "Hey, girl! What comes to mind when"; } mes "you think about Christmas?"; next; @@ -457,7 +457,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{ if (Sex) { mes "Ho ho ho! What a good boy!"; }else{ - mes "Ho ho ho! What a good girl!"; + mes "Ho ho ho! What a good girl!"; } next; mes "[Santa Claus]"; @@ -690,7 +690,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{ if (Sex) { mes "Oh! Poor boy..."; }else{ - mes "Oh! Poor girl..."; + mes "Oh! Poor girl..."; } next; mes "[Santa Claus]"; @@ -698,7 +698,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{ if (Sex) { mes "Oh! Poor boy..."; }else{ - mes "Oh! Poor girl..."; + mes "Oh! Poor girl..."; } mes "..."; next; diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt index 037c316ae..ee9e85f90 100644 --- a/npc/events/idul_fitri.txt +++ b/npc/events/idul_fitri.txt @@ -19,7 +19,7 @@ prontera,146,92,3 script Cellerb 58,{ if((gettime(6)==10 && (gettime(5)==24 || gettime(5)==25))==0) { mes "Congratulation! Celebrate Feast Day Of Ramadan Idul Fitri 1427 H."; specialeffect EF_SANDMAN; - close; + close; } mes "Haii......^FF8800"+strcharinfo(0)+"^000000!!"; mes "First day of Idulfitri has arrived."; diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index 57b2e3f22..ce9d2ad7e 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -392,7 +392,7 @@ prontera,154,185,5 script Event Ring Maker#Val09 721,{ mes "[Event Ring Maker]"; mes "Of course, you've got to get rings from others, that's the way you can participate in the voting, right?"; mes "Challenge yourself to become Valentine's Hottest!"; - close; + close; } // Valentine Vote Manager (Registers votes) diff --git a/npc/jobs/1-1/mage.txt b/npc/jobs/1-1/mage.txt index 8cef63917..99cca81c4 100644 --- a/npc/jobs/1-1/mage.txt +++ b/npc/jobs/1-1/mage.txt @@ -58,7 +58,7 @@ geffen_in,164,124,4 script Mage Guildsman#mage 123,{ mes "Hey, haven't you realized? You're already a Mage, silly!"; mes "One of these days you'll realize the power inside of you when you can make Fire with your mind!"; }else{ - mes "Hey~ C'mon. Quit playing games. You can't be a Mage because you already have another Job."; + mes "Hey~ C'mon. Quit playing games. You can't be a Mage because you already have another Job."; } close; }else{ diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt index a42295d91..31abb61b7 100644 --- a/npc/jobs/1-1/thief.txt +++ b/npc/jobs/1-1/thief.txt @@ -63,7 +63,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 69,{ mes "[Thief Guildsman]"; mes "Well, I'm not in charge of making you a Thief. I just accept applications, get it?"; mes "If you want to become a Thief, ask the sharp-eyed guy next to me."; - close; + close; } if(Class != Job_Novice) { if(Class == Job_Thief) { diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt index 6ab056764..4c73aba83 100644 --- a/npc/jobs/1-1e/ninja.txt +++ b/npc/jobs/1-1e/ninja.txt @@ -163,7 +163,7 @@ que_ng,30,65,3 script Cougar#nq 730,{ mes "why we can't help"; mes "each other in this"; mes "little predicament..."; - close; + close; } mes "[Cougar]"; mes "Great! Now, I wanted to"; @@ -443,7 +443,7 @@ einbroch,184,194,3 script Suspicious Man#nq 881,{ mes "soon as you can. Then,"; mes "I can help you find"; mes "Red Leopard Joe."; - close; + close; } mes "[Suspicious Man]"; mes "Good, good. You've"; diff --git a/npc/jobs/3-2/wanderer.txt b/npc/jobs/3-2/wanderer.txt index 179b5e41a..087095f9c 100644 --- a/npc/jobs/3-2/wanderer.txt +++ b/npc/jobs/3-2/wanderer.txt @@ -213,7 +213,7 @@ xmas,132,143,5 script Performance Manager#w 713,{ mes "May I talk with you?"; mes "In fact, I usually don't say these things to thers."; mes "But I'm very depressed. Really, really depressed."; - next; + next; while(1){ switch(select("I'm not interested.:What happened?:If you're not saying, why would you tell me that?")) { case 1: @@ -271,7 +271,7 @@ L_wh2: mes "[Stage Staff]"; mes "If we switch places, would you not be afraid?"; mes "I am the person in charge of performances! You know how many performances there will be, how many money there will be? Or how many people we will expect to face! Don't you think that I have a multiple burden?"; - next; + next; break; case 2: mes "[Stage Staff]"; @@ -283,7 +283,7 @@ L_wh2: next; mes "[Stage Staff]"; mes "Do you know how many people will complain? This will be terrible..."; - next; + next; goto L_wh3; case 3: mes "[Stage Staff]"; @@ -321,7 +321,7 @@ L_wh3: next; mes "[Stage Staff]"; mes "Hey! Find the minstrel Guitar Song!"; - next; + next; switch(select("Okay.:How can I find him!:Happy!")) { case 1: break; @@ -330,7 +330,7 @@ L_wh3: mes "How do I know!?"; mes "Ah, no, no."; mes "Since you're a dancer, you must be interested in it, right?"; - mes "Don't you want to see the performance?"; + mes "Don't you want to see the performance?"; next; break; case 3: @@ -378,7 +378,7 @@ L_wh3: next; mes "[Stage Staff]"; mes "Good! please take this headgear."; - mes "This item is not easy to get, so be careful and not lose it!"; + mes "This item is not easy to get, so be careful and not lose it!"; close; } else { @@ -401,7 +401,7 @@ comodo,140,86,5 script Cheerless Minstrel#w 479,{ mes "You can dance ~ ~"; mes "You can work ~ ~"; mes "You are the dancing queen ~ ~"; - mes "Feel the beat from the tambourine ~ ~"; + mes "Feel the beat from the tambourine ~ ~"; next; mes "[Cheerless Minstrel]"; mes "Thank you ..."; @@ -412,8 +412,8 @@ comodo,140,86,5 script Cheerless Minstrel#w 479,{ mes "You can dance ~ ~"; mes "You can work ~ ~"; mes "You are the dancing queen ~ ~"; - mes "Feel the King of the tambourines ~ ~"; - next; + mes "Feel the King of the tambourines ~ ~"; + next; mes "- that guy seems to be Guitar Song -"; next; if (select("Thats one Guitar Song's strange song.:Leave him alone.") == 2){ @@ -459,7 +459,7 @@ comodo,140,86,5 script Cheerless Minstrel#w 479,{ mes "Hey, didn't I said to not mention that?"; mes "I don't want to think about it. When I think about it, it makes me sad."; next; - mes "- Guitar Song refused to talk it. He is the only one who knows about <Nuoli Ou>. What should I do? -"; + mes "- Guitar Song refused to talk it. He is the only one who knows about <Nuoli Ou>. What should I do? -"; set job_wan,3; close; case 2: @@ -497,7 +497,7 @@ comodo,140,86,5 script Cheerless Minstrel#w 479,{ mes "It should be very clear that people like how you sing, right?"; mes "Many people are looking forward for your support."; mes "Don't you feel the shame to let people down without a good reason?"; - next; + next; break; } else { @@ -667,7 +667,7 @@ comodo,140,86,5 script Cheerless Minstrel#w 479,{ else if (job_wan > 3 && job_wan < 8) { mes "[Guitar Song]"; mes "Dancer Kim should be in town where monster race is held, right?"; - mes "If you like monster race, you should know the location ..."; + mes "If you like monster race, you should know the location ..."; close; } else if (job_wan == 8){ @@ -680,14 +680,14 @@ comodo,140,86,5 script Cheerless Minstrel#w 479,{ mes "I will truly take care of you ~ ~"; next; mes "[Guitar Song]"; - mes "Immediately, go to Lutie. We will gather as fast as we can."; + mes "Immediately, go to Lutie. We will gather as fast as we can."; set job_wan,9; close; } else if (job_wan == 9){ mes "[Guitar Song]"; mes "I'll go to Lutie as promised."; - close; + close; } else { mes "[inability of the court musicians]"; @@ -737,7 +737,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#w 879,{ next; mes "[Vacant Looking Lady]"; mes "But..."; - next; + next; menu "What happened in the end... ?",-; mes "[Vacant Looking Lady]"; mes "The next morning I get up to brush teeth and wash my face, but I realized that I had no make-up."; @@ -862,7 +862,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#w 879,{ mes "[Dancer Kim]"; mes "Come to the Lutie with Guitar Song!"; mes "I'll start immediately!"; - close; + close; } mes "[Vacant Looking Lady]"; mes "Where is my partner..."; @@ -881,7 +881,7 @@ hu_fild05,342,130,5 script Dancer Kim#fild 879,{ mes "[Dancer Kim]"; mes "The goal is 50 Yellow Novuses."; mes "Are you Ready?"; - next; + next; if (select("No.:Yes.") == 1){ mes "[Dancer Kim]"; mes "Please prepare as fast as you can, before all of this will disappear from my interests!"; @@ -914,7 +914,7 @@ hu_fild05,342,130,5 script Dancer Kim#fild 879,{ mes "I feel that my body is full of power."; mes "I suddenly wanted to see my good partner Guitar Song."; mes "I want to start dancing again."; - next; + next; menu "How about dancing in Lutie?",-; emotion e_gasp; mes "[Dancer Kim]"; @@ -1253,7 +1253,7 @@ if (job_wan == 9){ emotion e_lv,"Audience#xmas3"; emotion e_lv,"Audience#xmas4"; emotion e_lv,"Little Iraki#xm"; - emotion e_lv,"Mimi#xmas"; + emotion e_lv,"Mimi#xmas"; mes "[Audience]"; mes "Ah ah ah ah ah ~ ~ !!"; next; diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 3a0a1be37..a63f083e2 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -619,7 +619,7 @@ M_SET: mes "You've protected your storage with a secret password."; mes "Thank you for using "+getarg(1)+"."; emotion e_thx; - goto M_END; + goto M_END; M_CLEAR: mes getarg(0); @@ -645,7 +645,7 @@ M_CLEAR: mes "Please, next time enter correct password."; emotion e_sry; } - goto M_END; + goto M_END; L_ZENY: mes "You don't have enough zeny."; diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt index f7d209c89..936dabac3 100644 --- a/npc/merchants/buying_shops.txt +++ b/npc/merchants/buying_shops.txt @@ -243,6 +243,6 @@ alberta_in,58,52,4 script Purchasing Team#Buying 59,{ next; mes "[Mr. Hugh]"; mes "My time is solely dedicated to our customers in the Merchant industry."; - close; + close; } } diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt index 55d7c41f7..918b0be2d 100644 --- a/npc/merchants/icecream.txt +++ b/npc/merchants/icecream.txt @@ -61,7 +61,7 @@ mes "[Ice Cream Maker]"; mes "Dear customer, your wallet seems to be light."; mes "Price is ^3355FF100 Zeny^000000 per ice cream."; - close; + close; } if(checkweight(536,.@input) == 0) { mes "[Ice Cream Maker]"; diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index a21130e49..9e6ebd034 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -717,7 +717,7 @@ function script refinemain { next; mes "["+getarg(0)+"]"; mes "I can't make it any clearer."; - mes "Once a weapon is destroyed,"; + mes "Once a weapon is destroyed,"; mes "there's no getting it back."; mes "You really have a chance to"; mes "^FF0000lose this weapon^000000 forever."; diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt index 817501a3a..6ed2ef96c 100644 --- a/npc/other/arena/arena_lvl50.txt +++ b/npc/other/arena/arena_lvl50.txt @@ -36,7 +36,7 @@ force_1-1,99,20,4 script Heel and Toe#arena 124,{ end; OnInit: - set $@mapcount50, 0; + set $@mapcount50, 0; end; Onstart: @@ -58,7 +58,7 @@ OnTimer5000: end; OnTimer60000: - set $@mapcount50, getmapusers ("force_1-1"); + set $@mapcount50, getmapusers ("force_1-1"); if ($@mapcount50 == 0) { donpcevent "Heel and Toe#arena::Onfailclearstage"; } @@ -66,7 +66,7 @@ OnTimer60000: end; OnTimer120000: - set $@mapcount50, getmapusers ("force_1-1"); + set $@mapcount50, getmapusers ("force_1-1"); if ($@mapcount50 == 0) { donpcevent "Heel and Toe#arena::Onfailclearstage"; } @@ -74,14 +74,14 @@ OnTimer120000: end; OnTimer180000: - set $@mapcount50, getmapusers ("force_1-1"); + set $@mapcount50, getmapusers ("force_1-1"); if ($@mapcount50 == 0) { donpcevent "Heel and Toe#arena::Onfailclearstage"; } mapannounce "force_1-1","Remaining Time : 2 minutes ",0; end; OnTimer240000: - set $@mapcount50, getmapusers ("force_1-1"); + set $@mapcount50, getmapusers ("force_1-1"); if ($@mapcount50 == 0) { donpcevent "Heel and Toe#arena::Onfailclearstage"; } @@ -619,7 +619,7 @@ Onreset: end; Onsummonmob_05: - set $@randmonster50,rand(1,2); + set $@randmonster50,rand(1,2); switch($@randmonster50) { case 1: monster "force_1-1",174,174,"Desert Wolf",1432,1,"force_05ex#50::OnMobEx"; @@ -856,20 +856,20 @@ OnMobDeath: prt_are_in,129,188,3 script Staff#50-1 67,{ - mes "[Staff]"; - mes "You did a good job."; - mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points."; + mes "[Staff]"; + mes "You did a good job."; + mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points."; next; if (arena_point == 30000) { - mes "[Staff]"; - mes "Uh huh!"; - mes "You already have enough arena points."; - mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward."; + mes "[Staff]"; + mes "Uh huh!"; + mes "You already have enough arena points."; + mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward."; next; } else set arena_point, arena_point + 1; - mes "[Staff]"; - mes "Let me guide you outside. I hope you had a good time."; + mes "[Staff]"; + mes "Let me guide you outside. I hope you had a good time."; close2; specialeffect2 EF_EXIT; warp "arena_room",100,75; @@ -905,48 +905,48 @@ prt_are_in,25,188,3 script Staff#50-2 67,{ } } set @gap50,(60 * $top_50min + $top_50sec) - (60 * @record_min50 + @record_sec50); - mes "[Staff]"; - mes "Wow, you did a good job~ "; - mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; - mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; + mes "[Staff]"; + mes "Wow, you did a good job~ "; + mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; + mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; next; - mes "[Staff]"; - mes "is "+@record_min50+"minutes "+@record_sec50+"seconds."; - mes "Congratulations!"; + mes "[Staff]"; + mes "is "+@record_min50+"minutes "+@record_sec50+"seconds."; + mes "Congratulations!"; next; - mes "[Staff]"; - mes "The fastest player among people who cleared lvl 50s arena time force battle is ^3131FF"+$arena_50topn$+"^000000."; + mes "[Staff]"; + mes "The fastest player among people who cleared lvl 50s arena time force battle is ^3131FF"+$arena_50topn$+"^000000."; next; - mes "[Staff]"; - mes "^3131FF"+$arena_50topn$+"^000000's running time was ^3131FF"+$top_50min+"^000000minutes ^3131FF"+$top_50sec+"^000000seconds."; + mes "[Staff]"; + mes "^3131FF"+$arena_50topn$+"^000000's running time was ^3131FF"+$top_50min+"^000000minutes ^3131FF"+$top_50sec+"^000000seconds."; next; if (@gap50 < 0) { - mes "[Staff]"; - mes "Although you failed to make a new record, I hope you will succeed next time."; + mes "[Staff]"; + mes "Although you failed to make a new record, I hope you will succeed next time."; next; if (arena_point > 29980) { - mes "[Staff]"; - mes "Then let me reward you with some arena points....eh?"; - mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; + mes "[Staff]"; + mes "Then let me reward you with some arena points....eh?"; + mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; next; - mes "[Staff]"; - mes "You can check the amount of arena points you have in the arena waiting room."; + mes "[Staff]"; + mes "You can check the amount of arena points you have in the arena waiting room."; next; - mes "[Staff]"; - mes "I hope you had a good time and let me guide you to the entrance of arena."; - mes "Thank you."; + mes "[Staff]"; + mes "I hope you had a good time and let me guide you to the entrance of arena."; + mes "Thank you."; close2; } else { set arena_point, arena_point + 20; - mes "[Staff]"; - mes "Let me reward you some arena points."; - mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; + mes "[Staff]"; + mes "Let me reward you some arena points."; + mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; next; - mes "[Staff]"; - mes "Let me guide you to the entrance of arena."; - mes "See you later~"; + mes "[Staff]"; + mes "Let me guide you to the entrance of arena."; + mes "See you later~"; close2; } specialeffect2 EF_EXIT; @@ -960,44 +960,44 @@ prt_are_in,25,188,3 script Staff#50-2 67,{ else { emotion e_omg; - mes "[Staff]"; - mes "Wow! You have renewed the record!"; - mes "What a great job!"; + mes "[Staff]"; + mes "Wow! You have renewed the record!"; + mes "What a great job!"; next; - mes "[Staff]"; - mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 50s^000000, ^3131FF"+strcharinfo(0)+"^000000."; + mes "[Staff]"; + mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 50s^000000, ^3131FF"+strcharinfo(0)+"^000000."; set $top_50min, @record_min50; set $top_50sec, @record_sec50; - set $arena_50topn$,strcharinfo(0); + set $arena_50topn$,strcharinfo(0); donpcevent "Vendigos::Onlinerec_50"; next; if (arena_point > 29950) { - mes "[Staff]"; - mes "Then let me reward you with some arena points....eh?"; - mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; + mes "[Staff]"; + mes "Then let me reward you with some arena points....eh?"; + mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; next; - mes "[Staff]"; - mes "You can check the amount of arena points you have in the arena waiting room."; + mes "[Staff]"; + mes "You can check the amount of arena points you have in the arena waiting room."; next; - mes "[Staff]"; - mes "I hope you had a good time and let me guide you to the entrance of arena."; - mes "Thank you."; + mes "[Staff]"; + mes "I hope you had a good time and let me guide you to the entrance of arena."; + mes "Thank you."; close2; } else { mes "[Staff]"; - mes "Let me reward you with some arena points."; - mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time."; + mes "Let me reward you with some arena points."; + mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time."; next; set arena_point, arena_point + 50; - mes "[Staff]"; - mes "Let me reward you some arena points."; - mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; + mes "[Staff]"; + mes "Let me reward you some arena points."; + mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; next; - mes "[Staff]"; - mes "Let me guide you to the entrance of arena."; - mes "See you later~"; + mes "[Staff]"; + mes "Let me guide you to the entrance of arena."; + mes "See you later~"; close2; } specialeffect2 EF_HIT5; diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt index 9224898cd..440d9e451 100644 --- a/npc/other/arena/arena_lvl60.txt +++ b/npc/other/arena/arena_lvl60.txt @@ -49,7 +49,7 @@ OnTouch: force_2-1,99,20,4 script Minilover#arena 124,{ OnInit: - set $@mapcount60, 0; + set $@mapcount60, 0; end; Onstart: @@ -103,7 +103,7 @@ OnTimer240000: end; OnTimer300000: - set $@mapcount60, getmapusers ("force_2-1"); + set $@mapcount60, getmapusers ("force_2-1"); if ($@mapcount60 == 0) { donpcevent "Minilover#arena::Onfailclearstage"; } @@ -708,7 +708,7 @@ Onon: end; Onsubon: - set $@randmonster60,rand(1,3); + set $@randmonster60,rand(1,3); switch($@randmonster60) { case 1: monster "force_2-1",rand(170,177),rand(70,120),"Sidewinder",1424,1,"force_06ex#60::OnMobEx"; @@ -742,7 +742,7 @@ Onon: OnMobDeath: set $force_06_60,$force_06_60 -1; if ($force_06_60 < 1) { - set door, 1; + set door, 1; donpcevent "Minilover#arena::On06_end"; donpcevent "arena#60::Onreset_06"; } @@ -866,20 +866,20 @@ OnMobDeath: prt_are_in,129,135,3 script Staff#60-1 67,{ - mes "[Staff]"; - mes "You did a good job."; - mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points."; + mes "[Staff]"; + mes "You did a good job."; + mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points."; next; if (arena_point == 30000) { - mes "[Staff]"; - mes "Uh huh!"; - mes "You already have enough arena points."; - mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward."; + mes "[Staff]"; + mes "Uh huh!"; + mes "You already have enough arena points."; + mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward."; next; } else set arena_point, arena_point + 1; - mes "[Staff]"; - mes "Let me guide you outside. I hope you had a good time."; + mes "[Staff]"; + mes "Let me guide you outside. I hope you had a good time."; close2; specialeffect2 EF_EXIT; warp "arena_room",100,75; @@ -915,48 +915,48 @@ prt_are_in,25,135,3 script Staff#60-2 67,{ } } set @gap60,(60 * $top_60min + $top_60sec) - (60 * @record_min60 + @record_sec60); - mes "[Staff]"; - mes "Wow, you did a good job~ "; - mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; - mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; + mes "[Staff]"; + mes "Wow, you did a good job~ "; + mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; + mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; next; - mes "[Staff]"; - mes "is "+@record_min60+"minutes "+@record_sec60+"seconds."; - mes "Congratulations!"; + mes "[Staff]"; + mes "is "+@record_min60+"minutes "+@record_sec60+"seconds."; + mes "Congratulations!"; next; - mes "[Staff]"; - mes "The fastest player among people who cleared lvl 60s arena time force battle is ^3131FF"+$arena_60topn$+"^000000."; + mes "[Staff]"; + mes "The fastest player among people who cleared lvl 60s arena time force battle is ^3131FF"+$arena_60topn$+"^000000."; next; - mes "[Staff]"; - mes "^3131FF"+$arena_60topn$+"^000000's running time was ^3131FF"+$top_60min+"^000000minutes ^3131FF"+$top_60sec+"^000000seconds."; + mes "[Staff]"; + mes "^3131FF"+$arena_60topn$+"^000000's running time was ^3131FF"+$top_60min+"^000000minutes ^3131FF"+$top_60sec+"^000000seconds."; next; if (@gap60 < 0) { - mes "[Staff]"; - mes "Although you failed to make a new record, I hope you will succeed next time."; + mes "[Staff]"; + mes "Although you failed to make a new record, I hope you will succeed next time."; next; if (arena_point > 29980) { - mes "[Staff]"; - mes "Then let me reward you with some arena points....eh?"; - mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; + mes "[Staff]"; + mes "Then let me reward you with some arena points....eh?"; + mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; next; - mes "[Staff]"; - mes "You can check the amount of arena points you have in the arena waiting room."; + mes "[Staff]"; + mes "You can check the amount of arena points you have in the arena waiting room."; next; - mes "[Staff]"; - mes "I hope you had a good time and let me guide you to the entrance of arena."; - mes "Thank you."; + mes "[Staff]"; + mes "I hope you had a good time and let me guide you to the entrance of arena."; + mes "Thank you."; close2; } else { set arena_point, arena_point + 20; - mes "[Staff]"; - mes "Let me reward you some arena points."; - mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; + mes "[Staff]"; + mes "Let me reward you some arena points."; + mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; next; - mes "[Staff]"; - mes "Let me guide you to the entrance of arena."; - mes "See you later~"; + mes "[Staff]"; + mes "Let me guide you to the entrance of arena."; + mes "See you later~"; close2; } specialeffect2 EF_EXIT; @@ -970,44 +970,44 @@ prt_are_in,25,135,3 script Staff#60-2 67,{ else { emotion e_omg; - mes "[Staff]"; - mes "Wow! You have renewed the record!"; - mes "What a great job!"; + mes "[Staff]"; + mes "Wow! You have renewed the record!"; + mes "What a great job!"; next; - mes "[Staff]"; - mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 60s^000000, ^3131FF"+strcharinfo(0)+"^000000."; + mes "[Staff]"; + mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 60s^000000, ^3131FF"+strcharinfo(0)+"^000000."; set $top_60min, @record_min60; set $top_60sec, @record_sec60; - set $arena_60topn$,strcharinfo(0); + set $arena_60topn$,strcharinfo(0); donpcevent "Vendigos::Onlinerec_60"; next; if (arena_point > 29950) { - mes "[Staff]"; - mes "Then let me reward you with some arena points....eh?"; - mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; + mes "[Staff]"; + mes "Then let me reward you with some arena points....eh?"; + mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; next; - mes "[Staff]"; - mes "You can check the amount of arena points you have in the arena waiting room."; + mes "[Staff]"; + mes "You can check the amount of arena points you have in the arena waiting room."; next; - mes "[Staff]"; - mes "I hope you had a good time and let me guide you to the entrance of arena."; - mes "Thank you."; + mes "[Staff]"; + mes "I hope you had a good time and let me guide you to the entrance of arena."; + mes "Thank you."; close2; } else { mes "[Staff]"; - mes "Let me reward you with some arena points."; - mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time."; + mes "Let me reward you with some arena points."; + mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time."; next; set arena_point, arena_point + 50; - mes "[Staff]"; - mes "Let me reward you some arena points."; - mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; + mes "[Staff]"; + mes "Let me reward you some arena points."; + mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; next; - mes "[Staff]"; - mes "Let me guide you to the entrance of arena."; - mes "See you later~"; + mes "[Staff]"; + mes "Let me guide you to the entrance of arena."; + mes "See you later~"; close2; } specialeffect2 EF_HIT5; diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt index aa24b02a9..43e6e4fe0 100644 --- a/npc/other/arena/arena_lvl70.txt +++ b/npc/other/arena/arena_lvl70.txt @@ -36,7 +36,7 @@ force_3-1,99,20,4 script Cadillac#arena 124,{ end; OnInit: - set $@mapcount70, 0; + set $@mapcount70, 0; end; Onstart: @@ -58,7 +58,7 @@ OnTimer7000: end; OnTimer60000: - set $@mapcount70, getmapusers ("force_3-1"); + set $@mapcount70, getmapusers ("force_3-1"); if ($@mapcount70 == 0) { donpcevent "Cadillac#arena::Onfailclearstage"; } @@ -66,7 +66,7 @@ OnTimer60000: end; OnTimer120000: - set $@mapcount70, getmapusers ("force_3-1"); + set $@mapcount70, getmapusers ("force_3-1"); if ($@mapcount70 == 0) { donpcevent "Cadillac#arena::Onfailclearstage"; } @@ -74,14 +74,14 @@ OnTimer120000: end; OnTimer180000: - set $@mapcount70, getmapusers ("force_3-1"); + set $@mapcount70, getmapusers ("force_3-1"); if ($@mapcount70 == 0) { donpcevent "Cadillac#arena::Onfailclearstage"; } mapannounce "force_3-1","Remaining Time : 4 minutes ",0; end; OnTimer240000: - set $@mapcount70, getmapusers ("force_3-1"); + set $@mapcount70, getmapusers ("force_3-1"); if ($@mapcount70 == 0) { donpcevent "Cadillac#arena::Onfailclearstage"; } @@ -89,7 +89,7 @@ OnTimer240000: end; OnTimer300000: - set $@mapcount70, getmapusers ("force_3-1"); + set $@mapcount70, getmapusers ("force_3-1"); if ($@mapcount70 == 0) { donpcevent "Cadillac#arena::Onfailclearstage"; } @@ -97,7 +97,7 @@ OnTimer300000: end; OnTimer360000: - set $@mapcount70, getmapusers ("force_3-1"); + set $@mapcount70, getmapusers ("force_3-1"); if ($@mapcount70 == 0) { donpcevent "Cadillac#arena::Onfailclearstage"; } @@ -606,7 +606,7 @@ Onreset: end; Onsummonmob_05: - set $@randmonster70,rand(1,2); + set $@randmonster70,rand(1,2); switch($@randmonster70) { case 1: monster "force_3-1",174,174,"Ride Word",1478,1,"force_05ex#70::OnMobEx"; @@ -833,22 +833,22 @@ OnMobDeath: prt_are_in,129,83,3 script Staff#70-1 67,{ - mes "[Staff]"; - mes "You did a good job."; - mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points."; + mes "[Staff]"; + mes "You did a good job."; + mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points."; next; if (arena_point == 30000) { - mes "[Staff]"; - mes "Uh huh!"; - mes "You already have enough arena points."; - mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward."; + mes "[Staff]"; + mes "Uh huh!"; + mes "You already have enough arena points."; + mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward."; next; } else set arena_point, arena_point + 1; - mes "[Staff]"; - mes "Let me guide you outside. I hope you had a good time."; + mes "[Staff]"; + mes "Let me guide you outside. I hope you had a good time."; close2; - specialeffect2 EF_EXIT; + specialeffect2 EF_EXIT; warp "arena_room",100,75; end; } @@ -882,48 +882,48 @@ prt_are_in,25,84,3 script Staff#70-2 67,{ } } set @gap70,(60 * $top_70min + $top_70sec) - (60 * @record_min70 + @record_sec70); - mes "[Staff]"; - mes "Wow, you did a good job~ "; - mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; - mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; + mes "[Staff]"; + mes "Wow, you did a good job~ "; + mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; + mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; next; - mes "[Staff]"; - mes "is "+@record_min70+"minutes "+@record_sec70+"seconds."; - mes "Congratulations!"; + mes "[Staff]"; + mes "is "+@record_min70+"minutes "+@record_sec70+"seconds."; + mes "Congratulations!"; next; - mes "[Staff]"; - mes "The fastest player among people who cleared lvl 70s arena time force battle is ^3131FF"+$arena_70topn$+"^000000."; + mes "[Staff]"; + mes "The fastest player among people who cleared lvl 70s arena time force battle is ^3131FF"+$arena_70topn$+"^000000."; next; - mes "[Staff]"; - mes "^3131FF"+$arena_70topn$+"^000000's running time was ^3131FF"+$top_70min+"^000000minutes ^3131FF"+$top_70sec+"^000000seconds."; + mes "[Staff]"; + mes "^3131FF"+$arena_70topn$+"^000000's running time was ^3131FF"+$top_70min+"^000000minutes ^3131FF"+$top_70sec+"^000000seconds."; next; if (@gap70 < 0) { - mes "[Staff]"; - mes "Although you failed to make a new record, I hope you will succeed next time."; + mes "[Staff]"; + mes "Although you failed to make a new record, I hope you will succeed next time."; next; if (arena_point > 29980) { - mes "[Staff]"; - mes "Then let me reward you with some arena points....eh?"; - mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; + mes "[Staff]"; + mes "Then let me reward you with some arena points....eh?"; + mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; next; - mes "[Staff]"; - mes "You can check the amount of arena points you have in the arena waiting room."; + mes "[Staff]"; + mes "You can check the amount of arena points you have in the arena waiting room."; next; - mes "[Staff]"; - mes "I hope you had a good time and let me guide you to the entrance of arena."; - mes "Thank you."; + mes "[Staff]"; + mes "I hope you had a good time and let me guide you to the entrance of arena."; + mes "Thank you."; close2; } else { set arena_point, arena_point + 20; - mes "[Staff]"; - mes "Let me reward you some arena points."; - mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; + mes "[Staff]"; + mes "Let me reward you some arena points."; + mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; next; - mes "[Staff]"; - mes "Let me guide you to the entrance of arena."; - mes "See you later~"; + mes "[Staff]"; + mes "Let me guide you to the entrance of arena."; + mes "See you later~"; close2; } specialeffect2 EF_EXIT; @@ -937,44 +937,44 @@ prt_are_in,25,84,3 script Staff#70-2 67,{ else { emotion e_omg; - mes "[Staff]"; - mes "Wow! You have renewed the record!"; - mes "What a great job!"; + mes "[Staff]"; + mes "Wow! You have renewed the record!"; + mes "What a great job!"; next; - mes "[Staff]"; - mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 70s^000000, ^3131FF"+strcharinfo(0)+"^000000."; + mes "[Staff]"; + mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 70s^000000, ^3131FF"+strcharinfo(0)+"^000000."; set $top_70min, @record_min70; set $top_70sec, @record_sec70; - set $arena_70topn$,strcharinfo(0); + set $arena_70topn$,strcharinfo(0); donpcevent "Vendigos::Onlinerec_70"; next; if (arena_point > 29970) { - mes "[Staff]"; - mes "Then let me reward you with some arena points....eh?"; - mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; + mes "[Staff]"; + mes "Then let me reward you with some arena points....eh?"; + mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; next; - mes "[Staff]"; - mes "You can check the amount of arena points you have in the arena waiting room."; + mes "[Staff]"; + mes "You can check the amount of arena points you have in the arena waiting room."; next; - mes "[Staff]"; - mes "I hope you had a good time and let me guide you to the entrance of arena."; - mes "Thank you."; + mes "[Staff]"; + mes "I hope you had a good time and let me guide you to the entrance of arena."; + mes "Thank you."; close2; } else { mes "[Staff]"; - mes "Let me reward you with some arena points."; - mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time."; + mes "Let me reward you with some arena points."; + mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time."; next; set arena_point, arena_point + 50; - mes "[Staff]"; - mes "Let me reward you some arena points."; - mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; + mes "[Staff]"; + mes "Let me reward you some arena points."; + mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; next; - mes "[Staff]"; - mes "Let me guide you to the entrance of arena."; - mes "See you later~"; + mes "[Staff]"; + mes "Let me guide you to the entrance of arena."; + mes "See you later~"; close2; } specialeffect2 EF_HIT5; diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt index dbdecba73..c0db333e7 100644 --- a/npc/other/arena/arena_lvl80.txt +++ b/npc/other/arena/arena_lvl80.txt @@ -36,7 +36,7 @@ force_4-1,99,20,4 script Octus#arena 124,{ end; OnInit: - set $@mapcount80, 0; + set $@mapcount80, 0; end; Onstart: @@ -58,7 +58,7 @@ OnTimer8000: end; OnTimer60000: - set $@mapcount80, getmapusers ("force_4-1"); + set $@mapcount80, getmapusers ("force_4-1"); if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } @@ -66,7 +66,7 @@ OnTimer60000: end; OnTimer120000: - set $@mapcount80, getmapusers ("force_4-1"); + set $@mapcount80, getmapusers ("force_4-1"); if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } @@ -74,14 +74,14 @@ OnTimer120000: end; OnTimer180000: - set $@mapcount80, getmapusers ("force_4-1"); + set $@mapcount80, getmapusers ("force_4-1"); if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } mapannounce "force_4-1","Remaining Time : 5 minutes ",0; end; OnTimer240000: - set $@mapcount80, getmapusers ("force_4-1"); + set $@mapcount80, getmapusers ("force_4-1"); if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } @@ -89,7 +89,7 @@ OnTimer240000: end; OnTimer300000: - set $@mapcount80, getmapusers ("force_4-1"); + set $@mapcount80, getmapusers ("force_4-1"); if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } @@ -97,7 +97,7 @@ OnTimer300000: end; OnTimer360000: - set $@mapcount80, getmapusers ("force_4-1"); + set $@mapcount80, getmapusers ("force_4-1"); if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } @@ -105,7 +105,7 @@ OnTimer360000: end; OnTimer420000: - set $@mapcount80, getmapusers ("force_4-1"); + set $@mapcount80, getmapusers ("force_4-1"); if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } @@ -806,20 +806,20 @@ OnMobDeath: prt_are_in,181,188,3 script Staff#80-1 67,{ - mes "[Staff]"; - mes "You did a good job."; - mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points."; + mes "[Staff]"; + mes "You did a good job."; + mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points."; next; if (arena_point == 30000) { - mes "[Staff]"; - mes "Uh huh!"; - mes "You already have enough arena points."; - mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward."; + mes "[Staff]"; + mes "Uh huh!"; + mes "You already have enough arena points."; + mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward."; next; } else set arena_point, arena_point + 1; - mes "[Staff]"; - mes "Let me guide you outside. I hope you had a good time."; + mes "[Staff]"; + mes "Let me guide you outside. I hope you had a good time."; close2; specialeffect2 EF_EXIT; warp "arena_room",100,75; @@ -855,48 +855,48 @@ prt_are_in,77,187,3 script Staff#80-2 67,{ } } set @gap80,(60 * $top_80min + $top_80sec) - (60 * @record_min80 + @record_sec80); - mes "[Staff]"; - mes "Wow, you did a good job~ "; - mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; - mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; + mes "[Staff]"; + mes "Wow, you did a good job~ "; + mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; + mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; next; - mes "[Staff]"; - mes "is "+@record_min80+"minutes "+@record_sec80+"seconds."; - mes "Congratulations!"; + mes "[Staff]"; + mes "is "+@record_min80+"minutes "+@record_sec80+"seconds."; + mes "Congratulations!"; next; - mes "[Staff]"; - mes "The fastest player among people who cleared lvl 80s arena time force battle is ^3131FF"+$arena_80topn$+"^000000."; + mes "[Staff]"; + mes "The fastest player among people who cleared lvl 80s arena time force battle is ^3131FF"+$arena_80topn$+"^000000."; next; - mes "[Staff]"; - mes "^3131FF"+$arena_80topn$+"^000000's running time was ^3131FF"+$top_80min+"^000000minutes ^3131FF"+$top_80sec+"^000000seconds."; + mes "[Staff]"; + mes "^3131FF"+$arena_80topn$+"^000000's running time was ^3131FF"+$top_80min+"^000000minutes ^3131FF"+$top_80sec+"^000000seconds."; next; if (@gap80 < 0) { - mes "[Staff]"; - mes "Although you failed to make a new record, I hope you will succeed next time."; + mes "[Staff]"; + mes "Although you failed to make a new record, I hope you will succeed next time."; next; if (arena_point > 29980) { - mes "[Staff]"; - mes "Then let me reward you with some arena points....eh?"; - mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; + mes "[Staff]"; + mes "Then let me reward you with some arena points....eh?"; + mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; next; - mes "[Staff]"; - mes "You can check the amount of arena points you have in the arena waiting room."; + mes "[Staff]"; + mes "You can check the amount of arena points you have in the arena waiting room."; next; - mes "[Staff]"; - mes "I hope you had a good time and let me guide you to the entrance of arena."; - mes "Thank you."; + mes "[Staff]"; + mes "I hope you had a good time and let me guide you to the entrance of arena."; + mes "Thank you."; close2; } else { set arena_point, arena_point + 20; - mes "[Staff]"; - mes "Let me reward you some arena points."; - mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; + mes "[Staff]"; + mes "Let me reward you some arena points."; + mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; next; - mes "[Staff]"; - mes "Let me guide you to the entrance of arena."; - mes "See you later~"; + mes "[Staff]"; + mes "Let me guide you to the entrance of arena."; + mes "See you later~"; close2; } specialeffect2 EF_EXIT; @@ -910,44 +910,44 @@ prt_are_in,77,187,3 script Staff#80-2 67,{ else { emotion e_omg; - mes "[Staff]"; - mes "Wow! You have renewed the record!"; - mes "What a great job!"; + mes "[Staff]"; + mes "Wow! You have renewed the record!"; + mes "What a great job!"; next; - mes "[Staff]"; - mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 80s^000000, ^3131FF"+strcharinfo(0)+"^000000."; + mes "[Staff]"; + mes "You have been recorded as the fastest player among people who cleared ^FF0000Arena Time Force Battle lvl 80s^000000, ^3131FF"+strcharinfo(0)+"^000000."; set $top_80min, @record_min80; set $top_80sec, @record_sec80; - set $arena_80topn$,strcharinfo(0); + set $arena_80topn$,strcharinfo(0); donpcevent "Vendigos::Onlinerec_80"; next; if (arena_point > 29980) { - mes "[Staff]"; - mes "Then let me reward you with some arena points....eh?"; - mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; + mes "[Staff]"; + mes "Then let me reward you with some arena points....eh?"; + mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; next; - mes "[Staff]"; - mes "You can check the amount of arena points you have in the arena waiting room."; + mes "[Staff]"; + mes "You can check the amount of arena points you have in the arena waiting room."; next; - mes "[Staff]"; - mes "I hope you had a good time and let me guide you to the entrance of arena."; - mes "Thank you."; + mes "[Staff]"; + mes "I hope you had a good time and let me guide you to the entrance of arena."; + mes "Thank you."; close2; } else { mes "[Staff]"; - mes "Let me reward you with some arena points."; - mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time."; + mes "Let me reward you with some arena points."; + mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time."; next; set arena_point, arena_point + 50; - mes "[Staff]"; - mes "Let me reward you some arena points."; - mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; + mes "[Staff]"; + mes "Let me reward you some arena points."; + mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; next; - mes "[Staff]"; - mes "Let me guide you to the entrance of arena."; - mes "See you later~"; + mes "[Staff]"; + mes "Let me guide you to the entrance of arena."; + mes "See you later~"; close2; } specialeffect2 EF_HIT5; diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index 880b80e88..03134b0cb 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -1136,20 +1136,20 @@ OnReset: prt_are_in,181,135,3 script Staff#party-1 67,{ - mes "[Staff]"; - mes "You did a good job."; - mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points."; + mes "[Staff]"; + mes "You did a good job."; + mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points."; next; if (arena_point == 30000) { - mes "[Staff]"; - mes "Uh huh!"; - mes "You already have enough arena points."; - mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward."; + mes "[Staff]"; + mes "Uh huh!"; + mes "You already have enough arena points."; + mes "Please spend some arena points later. When I see you next time, I will make sure to give you some reward."; next; } else set arena_point, arena_point + 1; - mes "[Staff]"; - mes "Let me guide you outside. I hope you had a good time."; + mes "[Staff]"; + mes "Let me guide you outside. I hope you had a good time."; close2; specialeffect2 EF_HIT5; warp "arena_room",100,75; @@ -1185,49 +1185,49 @@ prt_are_in,77,135,3 script Staff#party-2 67,{ } } set @gappt,(60 * $top_ptmin + $top_ptsec) - (60 * @record_minpt + @record_secpt); - mes "[Staff]"; - mes "Wow, you did a good job~ "; - mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; - mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; + mes "[Staff]"; + mes "Wow, you did a good job~ "; + mes "Your name is...^3131FF" + strcharinfo(0) +"^000000, isn't it?"; + mes "^3131FF"+ strcharinfo(0) +"^000000, total time you spent to pass the battle.."; next; - mes "[Staff]"; - mes "is "+@record_minpt+"minutes "+@record_secpt+"seconds."; - mes "Congratulations!"; + mes "[Staff]"; + mes "is "+@record_minpt+"minutes "+@record_secpt+"seconds."; + mes "Congratulations!"; next; - mes "[Staff]"; - mes "The fastest party among people who cleared party arena time force battle is ^3131FF"+$arena_pttopn$+"^000000."; + mes "[Staff]"; + mes "The fastest party among people who cleared party arena time force battle is ^3131FF"+$arena_pttopn$+"^000000."; next; - mes "[Staff]"; - mes "^3131FF"+$arena_pttopn$+"^000000's running time was ^3131FF"+$top_ptmin+"^000000minutes ^3131FF"+$top_ptsec+"^000000seconds."; + mes "[Staff]"; + mes "^3131FF"+$arena_pttopn$+"^000000's running time was ^3131FF"+$top_ptmin+"^000000minutes ^3131FF"+$top_ptsec+"^000000seconds."; next; set .arn_party,getcharid(1); if (@gappt < 0) { - mes "[Staff]"; - mes "Although you failed to make a new record, I hope you will succeed next time."; + mes "[Staff]"; + mes "Although you failed to make a new record, I hope you will succeed next time."; next; if (arena_point > 29980) { - mes "[Staff]"; - mes "Then let me reward you with some arena points....eh?"; - mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; + mes "[Staff]"; + mes "Then let me reward you with some arena points....eh?"; + mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; next; - mes "[Staff]"; - mes "You can check the amount of arena points you have in the arena waiting room."; + mes "[Staff]"; + mes "You can check the amount of arena points you have in the arena waiting room."; next; - mes "[Staff]"; - mes "I hope you had a good time and let me guide you to the entrance of arena."; - mes "Thank you."; + mes "[Staff]"; + mes "I hope you had a good time and let me guide you to the entrance of arena."; + mes "Thank you."; close2; } else { set arena_point, arena_point + 40; - mes "[Staff]"; - mes "Let me reward you some arena points."; - mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; + mes "[Staff]"; + mes "Let me reward you some arena points."; + mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; next; - mes "[Staff]"; - mes "Let me guide you to the entrance of arena."; - mes "See you later~"; + mes "[Staff]"; + mes "Let me guide you to the entrance of arena."; + mes "See you later~"; close2; } if(getpartyleader(.arn_party,2) == getcharid(0)) @@ -1244,9 +1244,9 @@ prt_are_in,77,135,3 script Staff#party-2 67,{ else { emotion e_omg; - mes "[Staff]"; - mes "Wow! You have renewed the record!"; - mes "What a great job!"; + mes "[Staff]"; + mes "Wow! You have renewed the record!"; + mes "What a great job!"; next; if(getpartyleader(.arn_party,2) == getcharid(0)) { @@ -1269,7 +1269,7 @@ prt_are_in,77,135,3 script Staff#party-2 67,{ case 1: set $top_ptmin, @record_minpt; set $top_ptsec, @record_secpt; - set $arena_pttopn$,.@arnparty$; + set $arena_pttopn$,.@arnparty$; donpcevent "Vendigos::Onlinerec_pt"; mes "[Staff]"; mes "Your record has been entered."; @@ -1294,32 +1294,32 @@ prt_are_in,77,135,3 script Staff#party-2 67,{ } if (arena_point > 29900) { - mes "[Staff]"; - mes "Then let me reward you with some arena points....eh?"; - mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; + mes "[Staff]"; + mes "Then let me reward you with some arena points....eh?"; + mes "Your arena points have exceeded the maximum amount. I cannot give you more points until you spend some points."; next; - mes "[Staff]"; - mes "You can check the amount of arena points you have in the arena waiting room."; + mes "[Staff]"; + mes "You can check the amount of arena points you have in the arena waiting room."; next; - mes "[Staff]"; - mes "I hope you had a good time and let me guide you to the entrance of arena."; - mes "Thank you."; + mes "[Staff]"; + mes "I hope you had a good time and let me guide you to the entrance of arena."; + mes "Thank you."; close2; } else { mes "[Staff]"; - mes "Let me reward you with some arena points."; - mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time."; + mes "Let me reward you with some arena points."; + mes "At the same time, since you have renewed the record you will receive an extra amount of the points this time."; next; set arena_point, arena_point + 100; - mes "[Staff]"; - mes "Let me reward you some arena points."; - mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; + mes "[Staff]"; + mes "Let me reward you some arena points."; + mes "If you wish to check the amount of arena points you have, please go talk to ^3131FFVendigos^000000 at the arena entrance."; next; - mes "[Staff]"; - mes "Let me guide you to the entrance of arena."; - mes "See you later~"; + mes "[Staff]"; + mes "Let me guide you to the entrance of arena."; + mes "See you later~"; close2; } if(getpartyleader(.arn_party,2) == getcharid(0)) diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt index acd5bad75..fee3d3568 100644 --- a/npc/other/hugel_bingo.txt +++ b/npc/other/hugel_bingo.txt @@ -450,7 +450,7 @@ OnInit: disablenpc "12a#bingo"; disablenpc "13a#bingo"; disablenpc "14a#bingo"; - disablenpc "15a#bingo"; + disablenpc "15a#bingo"; disablenpc "16a#bingo"; disablenpc "17a#bingo"; disablenpc "18a#bingo"; @@ -475,7 +475,7 @@ OnInit: disablenpc "12b#bingo"; disablenpc "13b#bingo"; disablenpc "14b#bingo"; - disablenpc "15b#bingo"; + disablenpc "15b#bingo"; disablenpc "16b#bingo"; disablenpc "17b#bingo"; disablenpc "18b#bingo"; @@ -500,7 +500,7 @@ OnInit: disablenpc "12c#bingo"; disablenpc "13c#bingo"; disablenpc "14c#bingo"; - disablenpc "15c#bingo"; + disablenpc "15c#bingo"; disablenpc "16c#bingo"; disablenpc "17c#bingo"; disablenpc "18c#bingo"; @@ -525,7 +525,7 @@ OnInit: disablenpc "12d#bingo"; disablenpc "13d#bingo"; disablenpc "14d#bingo"; - disablenpc "15d#bingo"; + disablenpc "15d#bingo"; disablenpc "16d#bingo"; disablenpc "17d#bingo"; disablenpc "18d#bingo"; @@ -550,7 +550,7 @@ OnInit: disablenpc "12e#bingo"; disablenpc "13e#bingo"; disablenpc "14e#bingo"; - disablenpc "15e#bingo"; + disablenpc "15e#bingo"; disablenpc "16e#bingo"; disablenpc "17e#bingo"; disablenpc "18e#bingo"; @@ -991,7 +991,7 @@ function script Func_Bingo { if(@bingoplate[17] < 10) set @bingo_d2$,"0"+@bingoplate[17]+""; else set @bingo_d2$,@bingoplate[17]; if(@bingoplate[18] < 10) set @bingo_d3$,"0"+@bingoplate[18]+""; else set @bingo_d3$,@bingoplate[18]; if(@bingoplate[19] < 10) set @bingo_d4$,"0"+@bingoplate[19]+""; else set @bingo_d4$,@bingoplate[19]; - if(@bingoplate[20] < 10) set @bingo_d5$,"0"+@bingoplate[20]+""; else set @bingo_d5$,@bingoplate[20]; + if(@bingoplate[20] < 10) set @bingo_d5$,"0"+@bingoplate[20]+""; else set @bingo_d5$,@bingoplate[20]; if(.@i > 20) mes "["+@bingo_d1$+"] ["+@bingo_d2$+"] ["+@bingo_d3$+"] ["+@bingo_d4$+"] ["+@bingo_d5$+"]"; else if(.@i < 16) mes "[ ] [ ] [ ] [ ] [ ]"; else @@ -1057,7 +1057,7 @@ que_bingo,49,31,4 script Arcade Helper#1 47,{ mes "If you'd like to play"; mes "a game of bingo, then"; mes "please proceed this way."; - close; + close; } que_bingo,42,31,4 script Arcade Helper#2 66,{ diff --git a/npc/other/turbotrack/Expert_16.txt b/npc/other/turbotrack/Expert_16.txt index f9d78b394..74e0d80c9 100644 --- a/npc/other/turbotrack/Expert_16.txt +++ b/npc/other/turbotrack/Expert_16.txt @@ -1484,5 +1484,5 @@ OnTouch: warp "turbo_e_16",218,228; else if (.@bing1 == 6) warp "turbo_e_16",220,195; - end; + end; } diff --git a/npc/other/turbotrack/Expert_4.txt b/npc/other/turbotrack/Expert_4.txt index 5091df596..a27309f22 100644 --- a/npc/other/turbotrack/Expert_4.txt +++ b/npc/other/turbotrack/Expert_4.txt @@ -1402,5 +1402,5 @@ OnTouch: warp "turbo_e_4",218,228; else if (.@bing1 == 6) warp "turbo_e_4",220,195; - end; + end; } diff --git a/npc/other/turbotrack/Expert_8.txt b/npc/other/turbotrack/Expert_8.txt index 46df00488..c3876911d 100644 --- a/npc/other/turbotrack/Expert_8.txt +++ b/npc/other/turbotrack/Expert_8.txt @@ -1406,5 +1406,5 @@ OnTouch: warp "turbo_e_8",218,228; else if (.@bing1 == 6) warp "turbo_e_8",220,195; - end; + end; } diff --git a/npc/other/turbotrack/Normal_16.txt b/npc/other/turbotrack/Normal_16.txt index e15b6347f..ff22a5ff5 100644 --- a/npc/other/turbotrack/Normal_16.txt +++ b/npc/other/turbotrack/Normal_16.txt @@ -1486,5 +1486,5 @@ OnTouch: warp "turbo_n_16",218,228; else if (.@bing1 == 6) warp "turbo_n_16",220,195; - end; + end; } diff --git a/npc/other/turbotrack/Normal_4.txt b/npc/other/turbotrack/Normal_4.txt index 0005e0fb7..4a9ac1db6 100644 --- a/npc/other/turbotrack/Normal_4.txt +++ b/npc/other/turbotrack/Normal_4.txt @@ -1402,5 +1402,5 @@ OnTouch: warp "turbo_n_4",218,228; else if (.@bing1 == 6) warp "turbo_n_4",220,195; - end; + end; } diff --git a/npc/other/turbotrack/Normal_8.txt b/npc/other/turbotrack/Normal_8.txt index d9204e152..b66434d3e 100644 --- a/npc/other/turbotrack/Normal_8.txt +++ b/npc/other/turbotrack/Normal_8.txt @@ -1407,5 +1407,5 @@ OnTouch: warp "turbo_n_8",218,228; else if (.@bing1 == 6) warp "turbo_n_8",220,195; - end; + end; } diff --git a/npc/quests/Bard_Quest.txt b/npc/quests/Bard_Quest.txt index 023aedf2e..2a0483757 100644 --- a/npc/quests/Bard_Quest.txt +++ b/npc/quests/Bard_Quest.txt @@ -630,7 +630,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "in advance~"; set gef_bard_q,24; } - goto L_End; + goto L_End; } else if (@inputstr$ == "Gunther") { mes "[Errende]"; @@ -1719,7 +1719,7 @@ morocc,134,111,3 script Bard#3 741,{ mes "[Kino Kitty]"; mes "Hmm...?"; mes "I wish everyone in the world were as kind and honest as you. If that were the case, there'd be no selfish fights. Hahahahaha~"; - close; + close; } } else if (gef_bard_q > 12 && gef_bard_q < 16) { @@ -1799,7 +1799,7 @@ morocc,134,111,3 script Bard#3 741,{ mes "Hmmm...?"; mes "There's no reason to be scared."; mes "I mean, I won't bite or anything."; - close; + close; } } else if (gef_bard_q == 10) { diff --git a/npc/quests/Lvl4_weapon_quest.txt b/npc/quests/Lvl4_weapon_quest.txt index f4cfb3b53..aba16eaa5 100644 --- a/npc/quests/Lvl4_weapon_quest.txt +++ b/npc/quests/Lvl4_weapon_quest.txt @@ -1162,7 +1162,7 @@ um_in,156,77,5 script Tabezthan#lv4 788,{ if ((countitem(7290) > 29) && (countitem(7289) > 29) && (countitem(7293) > 29)) { mes "[Tabezthan]"; mes "Ah, you've brought all three. However, we can only use one kind of ore at a time, so please choose just one."; - next; + next; switch(select("Phlogopite:Peridot:Rose Quartz")) { case 1: set .@itemreq,7290; //Phlogopite diff --git a/npc/quests/cupet.txt b/npc/quests/cupet.txt index f017fe5a2..7b1669946 100644 --- a/npc/quests/cupet.txt +++ b/npc/quests/cupet.txt @@ -53,7 +53,7 @@ setarray .@tame_amount[0],2,2,2,2,2,2,2,2,2,2,2,2; setarray .@hunt_id[0],938,935,925,7033,945,942,931,901,1094,1021,936,1035; setarray .@hunt_amount[0],500,600,500,300,500,500,500,500,500,500,500,500; - setarray .@hunt_item_count[0],1,1,1,1,1,1,1,1,1; + setarray .@hunt_item_count[0],1,1,1,1,1,1,1,1,1; setarray .@mob_id[0],1031,1042,1019,1077,1056,1057,1023,1026,1188,1110,1029; set .@tame_gets, 2; diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt index 3ad692b25..30daa5dc0 100644 --- a/npc/quests/first_class/tu_acolyte.txt +++ b/npc/quests/first_class/tu_acolyte.txt @@ -1518,7 +1518,7 @@ prt_monk,153,210,3 script Cleope Verce 95,{ break; } next; - mes "[Cleope Verce]"; + mes "[Cleope Verce]"; mes "^333333*Sigh*^000000"; mes "Ah, memories~"; mes "Of course, if I had"; diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt index 5c59020a1..ecbda0eb7 100644 --- a/npc/quests/gunslinger_quests.txt +++ b/npc/quests/gunslinger_quests.txt @@ -381,7 +381,7 @@ SubGarrison_: case 3: mes "[Garrison]"; mes "I'll see you when I see you~"; - close; + close; } } diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt index 24ceed894..2a748c14d 100644 --- a/npc/quests/quests_alberta.txt +++ b/npc/quests/quests_alberta.txt @@ -100,7 +100,7 @@ alberta,117,135,0 script Elin 96,{ next; mes "[Elin]"; if (Sex == 1) { - mes "But since a cute boy is giving it to me, I'll happily take it! Hee hee, soft and fluffy Poring doll~"; + mes "But since a cute boy is giving it to me, I'll happily take it! Hee hee, soft and fluffy Poring doll~"; } else { mes "But since a nice girl is giving it to me, I'll take it! Hee he, soft and fluffy Poring doll~"; } diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt index dbaecf65f..798b13bb9 100644 --- a/npc/quests/quests_ein.txt +++ b/npc/quests/quests_ein.txt @@ -6330,7 +6330,7 @@ ein_in01,200,101,5 script Klitzer#ein 854,{ mes "time, why don't you talk"; mes "to my mother? She always"; mes "likes meeting my friends."; - close; + close; } else { mes "[Klitzer]"; diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index 59915d80e..2edaee134 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -434,7 +434,7 @@ yuno_in04,190,125,4 script Scholar 700,{ } case 6: - mes "[Fayruz]"; + mes "[Fayruz]"; mes "Oh, "+strcharinfo(0)+"!"; mes "The Transparent Plate"; mes "that you brought for me"; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index d229af56f..05ad3b40b 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -6529,7 +6529,7 @@ lighthalzen,179,170,4 script Ordinary Man 98,{ mes "......"; mes ".........."; mes "..............."; - next; + next; mes "[Ghalstein]"; mes "Alright. Yes, it's"; mes "true that I did meet"; diff --git a/npc/quests/quiz/quiz_qt.txt b/npc/quests/quiz/quiz_qt.txt index c9ea91263..bf05fa87e 100644 --- a/npc/quests/quiz/quiz_qt.txt +++ b/npc/quests/quiz/quiz_qt.txt @@ -1600,7 +1600,7 @@ if(quiz_rvl == 18) { mes "For those of who "; mes "got all right need no assignment"; mes " "; - next; + next; mes "^800000[Radeng]^000000"; mes "" + strcharinfo(0)+ ""; mes "Have passed all tests."; diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index da2cc1942..28e0b04d8 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -3682,7 +3682,7 @@ xmas,38,105,0 script #brisindwarf1 111,3,3,{ mes "be just some regular"; mes "puzzle cube that someone"; mes "just dropped in the snow!"; - close; + close; case 3: mes "^3355FFYou use your finger to poke the pile of snow. However, you hurt your finger a little bit after hitting something really solid.^000000"; emotion e_ag,1; diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt index 64ca2b251..ddb2eb30f 100644 --- a/npc/quests/thana_quest.txt +++ b/npc/quests/thana_quest.txt @@ -2356,7 +2356,7 @@ OnTouch: mes "^3355FFThat action had no"; mes "effect. You'll have to"; mes "try something else.^000000"; - close; + close; } thana_boss,202,75,0 script Crest#2 111,3,3,{ @@ -2485,7 +2485,7 @@ OnTouch: mes "^3355FFThat action had no"; mes "effect. You'll have to"; mes "try something else.^000000"; - close; + close; } thana_boss,141,218,0 script Crest#5 111,3,3,{ diff --git a/npc/scripts_renewal.conf b/npc/scripts_renewal.conf index 4783aebe9..a20cec0d6 100644 --- a/npc/scripts_renewal.conf +++ b/npc/scripts_renewal.conf @@ -1,13 +1,13 @@ // -------------------------------------------------------------- -// - IMPORTANT - +// - IMPORTANT - // -------------------------------------------------------------- -// - File is only loaded in REMODE (renewal) servers - +// - File is only loaded in REMODE (renewal) servers - // -------------------------------------------------------------- // - Info - // -------------------------------------------------------------- -// - This file is meant solely for Renewal stuff that may - -// - conflict in pre-re mode, for example for RE monster spawns - -// - that require renewal mobs non-existent in pre-re - +// - This file is meant solely for Renewal stuff that may - +// - conflict in pre-re mode, for example for RE monster spawns - +// - that require renewal mobs non-existent in pre-re - // -------------------------------------------------------------- //Dungeons diff --git a/src/char/char.c b/src/char/char.c index 34819c7a4..69c6a1e23 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -1030,7 +1030,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything { ShowError("Requested non-existant character id: %d!\n", char_id); SqlStmt_Free(stmt); - return 0; + return 0; } p->last_point.map = mapindex_name2id(last_map); p->save_point.map = mapindex_name2id(save_map); @@ -4175,7 +4175,7 @@ int char_lan_config_read(const char *lancfgName) if(sscanf(line,"%[^:]: %[^:]:%[^:]:%[^\r\n]", w1, w2, w3, w4) != 4) { - ShowWarning("Error syntax of configuration file %s in line %d.\n", lancfgName, line_num); + ShowWarning("Error syntax of configuration file %s in line %d.\n", lancfgName, line_num); continue; } diff --git a/src/common/plugins.h b/src/common/plugins.h index c1cf17afd..8c9c70d9f 100644 --- a/src/common/plugins.h +++ b/src/common/plugins.h @@ -47,7 +47,7 @@ typedef struct _Plugin { char state; char* filename; struct _Plugin_Info* info; - struct _Plugin* next; + struct _Plugin* next; } Plugin; ///////////////////////////////////////////// diff --git a/src/common/showmsg.c b/src/common/showmsg.c index 8492d6db7..102557df7 100644 --- a/src/common/showmsg.c +++ b/src/common/showmsg.c @@ -243,7 +243,7 @@ int VFPRINTF(HANDLE handle, const char *fmt, va_list argptr) memset(numbers,0,sizeof(numbers)); // skip escape and bracket - q=q+2; + q=q+2; for(;;) { if( ISDIGIT(*q) ) @@ -358,11 +358,11 @@ int VFPRINTF(HANDLE handle, const char *fmt, va_list argptr) COORD origin = {0,0}; if(num==1) { // chars from start up to and including cursor - cnt = info.dwSize.X * info.dwCursorPosition.Y + info.dwCursorPosition.X + 1; + cnt = info.dwSize.X * info.dwCursorPosition.Y + info.dwCursorPosition.X + 1; } else if(num==2) { // Number of chars on screen. - cnt = info.dwSize.X * info.dwSize.Y; + cnt = info.dwSize.X * info.dwSize.Y; SetConsoleCursorPosition(handle, origin); } else// 0 and default @@ -565,7 +565,7 @@ int VFPRINTF(FILE *file, const char *fmt, va_list argptr) // assuming regular text is starting there // skip escape and bracket - q=q+2; + q=q+2; while(1) { if( ISDIGIT(*q) ) diff --git a/src/common/timer.c b/src/common/timer.c index 05c53b8a3..32bc30520 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -130,7 +130,7 @@ static void rdtsc_calibrate(){ } RDTSC_CLOCK /= 5; - RDTSC_BEGINTICK = _rdtsc(); + RDTSC_BEGINTICK = _rdtsc(); ShowMessage(" done. (Frequency: %u Mhz)\n", (uint32)(RDTSC_CLOCK/1000) ); } diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 7c7aafbb7..3d60e06d0 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -9177,7 +9177,7 @@ bool is_atcommand(const int fd, struct map_session_data* sd, const char* message //Displays as a normal message for Non-GMs if( battle_config.atc_gmonly != 0 && pc_isGM(sd) == 0 ) - return false; + return false; } while (*message == charcommand_symbol) @@ -9251,7 +9251,7 @@ bool is_atcommand(const int fd, struct map_session_data* sd, const char* message //Log atcommands if( *atcmd_msg == atcommand_symbol ) - log_atcommand(sd, info->level, atcmd_msg); + log_atcommand(sd, info->level, atcmd_msg); //Log Charcommands else if( *atcmd_msg == charcommand_symbol && ssd != NULL ) log_atcommand(sd, info->level2, message); diff --git a/src/map/battle.c b/src/map/battle.c index 5865ce02b..419e40ebf 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -76,7 +76,7 @@ static int battle_gettargeted_sub(struct block_list *bl, va_list ap) bl_list[(*c)++] = bl; return 1; } - return 0; + return 0; } struct block_list* battle_gettargeted(struct block_list *target) @@ -127,7 +127,7 @@ static int battle_getenemy_sub(struct block_list *bl, va_list ap) bl_list[(*c)++] = bl; return 1; } - return 0; + return 0; } // Picks a random enemy of the given type (BL_PC, BL_CHAR, etc) within the range given. [Skotlex] @@ -164,7 +164,7 @@ static int battle_getenemyarea_sub(struct block_list *bl, va_list ap) bl_list[(*c)++] = bl; return 1; } - return 0; + return 0; } // Pick a random enemy @@ -1075,7 +1075,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo unsigned rh : 1; //Attack considers right hand (wd.damage) unsigned lh : 1; //Attack considers left hand (wd.damage2) unsigned weapon : 1; //It's a weapon attack (consider VVS, and all that) - } flag; + } flag; memset(&wd,0,sizeof(wd)); memset(&flag,0,sizeof(flag)); @@ -3865,7 +3865,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t if(tsc && tsc->data[SC_KAAHI] && tsc->data[SC_KAAHI]->val4 == INVALID_TIMER && tstatus->hp < tstatus->max_hp) tsc->data[SC_KAAHI]->val4 = add_timer(tick + skill_get_time2(SL_KAAHI,tsc->data[SC_KAAHI]->val1), kaahi_heal_timer, target->id, SC_KAAHI); //Activate heal. - wd = battle_calc_attack(BF_WEAPON, src, target, 0, 0, flag); + wd = battle_calc_attack(BF_WEAPON, src, target, 0, 0, flag); if(sc && sc->data[SC_EXEEDBREAK]) { @@ -4801,7 +4801,7 @@ void battle_adjust_conf() { battle_config.monster_max_aspd = 2000 - battle_config.monster_max_aspd*10; battle_config.max_aspd = 2000 - battle_config.max_aspd*10; - battle_config.max_walk_speed = 100*DEFAULT_WALK_SPEED/battle_config.max_walk_speed; + battle_config.max_walk_speed = 100*DEFAULT_WALK_SPEED/battle_config.max_walk_speed; battle_config.max_cart_weight *= 10; if(battle_config.max_def > 100 && !battle_config.weapon_defense_type) // added by [Skotlex] diff --git a/src/map/battle.h b/src/map/battle.h index e1e196d4d..2669af83d 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -121,7 +121,7 @@ extern struct Battle_Config int use_weapon_skill_range; //[Skotlex] int pc_damage_delay_rate; int defnotenemy; - int vs_traps_bctall; + int vs_traps_bctall; int traps_setting; int summon_flora; //[Skotlex] int clear_unit_ondeath; //[Skotlex] diff --git a/src/map/clif.c b/src/map/clif.c index b2cc2881a..17cc24fd7 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -2931,7 +2931,7 @@ void clif_changelook(struct block_list *bl,int type,int val) break; case LOOK_HEAD_TOP: vd->head_top = val; - break; + break; case LOOK_HEAD_MID: vd->head_mid = val; break; @@ -7862,7 +7862,7 @@ void clif_manner_message(struct map_session_data* sd, uint32 type) /// 1 = negative (mute) void clif_GM_silence(struct map_session_data* sd, struct map_session_data* tsd, uint8 type) { - int fd; + int fd; nullpo_retv(sd); nullpo_retv(tsd); @@ -8584,7 +8584,7 @@ void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* ts #endif safestrncpy((char*)WBUFP(buf, 4), tsd->status.name, NAME_LENGTH); WBUFW(buf,28) = tsd->status.class_; - WBUFW(buf,30) = tsd->vd.hair_style; + WBUFW(buf,30) = tsd->vd.hair_style; WBUFW(buf,32) = tsd->vd.head_bottom; WBUFW(buf,34) = tsd->vd.head_mid; WBUFW(buf,36) = tsd->vd.head_top; @@ -8609,7 +8609,7 @@ void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* ts // Add refine, identify flag, element, etc. clif_item_sub(WBUFP(buf,0), n*s+45, &tsd->status.inventory[i], tsd->inventory_data[i], pc_equippoint(tsd, i)); // Add cards - clif_addcards(WBUFP(buf, n*s+55), &tsd->status.inventory[i]); + clif_addcards(WBUFP(buf, n*s+55), &tsd->status.inventory[i]); // Expiration date stuff, if all of those are set to 0 then the client doesn't show anything related (6 bytes) WBUFL(buf, n*s+63) = tsd->status.inventory[i].expire_time; WBUFW(buf, n*s+67) = 0; @@ -11072,7 +11072,7 @@ void clif_parse_ResetChar(int fd, struct map_session_data *sd) if( sd->mission_mobid ) { //bugreport:2200 sd->mission_mobid = 0; sd->mission_count = 0; - pc_setglobalreg(sd,"TK_MISSION_ID", 0); + pc_setglobalreg(sd,"TK_MISSION_ID", 0); } } log_atcommand(sd, get_atcommand_level("reset"), RFIFOW(fd,2) ? "/resetskill" : "/resetstate"); @@ -12713,7 +12713,7 @@ void clif_parse_NoviceDoriDori(int fd, struct map_session_data *sd) break; case MAPID_SUPER_NOVICE: sd->state.doridori=1; - break; + break; } } @@ -13017,7 +13017,7 @@ void clif_parse_FriendsListRemove(int fd, struct map_session_data *sd) memcpy(&sd->status.friends[j-1], &sd->status.friends[j], sizeof(sd->status.friends[0])); memset(&sd->status.friends[MAX_FRIENDS-1], 0, sizeof(sd->status.friends[MAX_FRIENDS-1])); - clif_displaymessage(fd, "Friend removed"); + clif_displaymessage(fd, "Friend removed"); WFIFOHEAD(fd,packet_len(0x20a)); WFIFOW(fd,0) = 0x20a; diff --git a/src/map/duel.c b/src/map/duel.c index 7621b92be..ac1297bd5 100644 --- a/src/map/duel.c +++ b/src/map/duel.c @@ -27,7 +27,7 @@ void duel_savetime(struct map_session_data* sd) time(&timer); t = localtime(&timer); - pc_setglobalreg(sd, "PC_LAST_DUEL_TIME", t->tm_mday*24*60 + t->tm_hour*60 + t->tm_min); + pc_setglobalreg(sd, "PC_LAST_DUEL_TIME", t->tm_mday*24*60 + t->tm_hour*60 + t->tm_min); return; } diff --git a/src/map/map.c b/src/map/map.c index 841e95df1..ea6c58d2b 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -386,7 +386,7 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick) //Block not in map, just update coordinates, but do naught else. bl->x = x1; bl->y = y1; - return 0; + return 0; } //TODO: Perhaps some outs of bounds checking should be placed here? @@ -2960,7 +2960,7 @@ int map_readallmaps (void) ShowWarning("Map %s already loaded!"CL_CLL"\n", map[i].name); if (map[i].cell) { aFree(map[i].cell); - map[i].cell = NULL; + map[i].cell = NULL; } map_delmapid(i); maps_removed++; diff --git a/src/map/mob.c b/src/map/mob.c index 199c09dd6..7da208827 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -137,7 +137,7 @@ int mobdb_searchname_array(struct mob_db** data, int size, const char *str) if (!mobdb_searchname_array_sub(mob, str)) { if (count < size) data[count] = mob; - count++; + count++; } } return count; @@ -1995,7 +1995,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) if( src ) { // Use Dead skill only if not killed by Script or Command - md->state.skillstate = MSS_DEAD; + md->state.skillstate = MSS_DEAD; mobskill_use(md,tick,-1); } @@ -2561,7 +2561,7 @@ int mob_guardian_guildchange(struct block_list *bl,va_list ap) md->guardian_data->guardup_lv = guild_checkskill(g,GD_GUARDUP); memcpy(md->guardian_data->guild_name, g->name, NAME_LENGTH); - return 1; + return 1; } /*========================================== diff --git a/src/map/npc.c b/src/map/npc.c index 3859d8c68..7802ac1f9 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -511,7 +511,7 @@ int npc_timerevent(int tid, unsigned int tick, int id, intptr_t data) } // These stuffs might need to be restored. - old_rid = nd->u.scr.rid; + old_rid = nd->u.scr.rid; old_tick = nd->u.scr.timertick; old_timer = nd->u.scr.timer; @@ -524,7 +524,7 @@ int npc_timerevent(int tid, unsigned int tick, int id, intptr_t data) te = nd->u.scr.timer_event + ted->next; // Arrange for the next event - ted->next++; + ted->next++; if( nd->u.scr.timeramount > ted->next ) { next = nd->u.scr.timer_event[ ted->next ].timer - nd->u.scr.timer_event[ ted->next - 1 ].timer; @@ -547,7 +547,7 @@ int npc_timerevent(int tid, unsigned int tick, int id, intptr_t data) } // Run the script - run_script(nd->u.scr.script,te->pos,nd->u.scr.rid,nd->bl.id); + run_script(nd->u.scr.script,te->pos,nd->u.scr.rid,nd->bl.id); nd->u.scr.rid = old_rid; // Attached-rid should be restored anyway. if( sd ) diff --git a/src/map/party.c b/src/map/party.c index 15ada66fd..2c9b45a11 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -988,7 +988,7 @@ int party_exp_share(struct party_data* p, struct block_list* src, unsigned int b if (c < 1) return 0; - base_exp/=c; + base_exp/=c; job_exp/=c; zeny/=c; diff --git a/src/map/pc.c b/src/map/pc.c index 44de2f8d4..9af3c9213 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -343,7 +343,7 @@ void pc_addfame(struct map_session_data *sd,int count) break; case MAPID_TAEKWON: // Taekwon clif_fame_taekwon(sd,count); - break; + break; } chrif_updatefamelist(sd); } @@ -5199,7 +5199,7 @@ static void pc_calcexp(struct map_session_data *sd, unsigned int *base_exp, unsi struct status_data *status = status_get_status_data(src); if (sd->expaddrace[status->race]) - bonus += sd->expaddrace[status->race]; + bonus += sd->expaddrace[status->race]; bonus += sd->expaddrace[status->mode&MD_BOSS?RC_BOSS:RC_NONBOSS]; if (battle_config.pk_mode && diff --git a/src/map/pet.c b/src/map/pet.c index 09c924c3c..248373edc 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -655,7 +655,7 @@ int pet_equipitem(struct map_session_data *sd,int index) nullpo_retr(1, sd); pd = sd->pd; - if (!pd) return 1; + if (!pd) return 1; nameid = sd->status.inventory[index].nameid; @@ -1156,7 +1156,7 @@ int pet_skill_support_timer(int tid, unsigned int tick, int id, intptr_t data) struct map_session_data *sd=map_id2sd(id); struct pet_data *pd; struct status_data *status; - short rate = 100; + short rate = 100; if(sd==NULL || sd->pd == NULL || sd->pd->s_skill == NULL) return 1; @@ -1355,7 +1355,7 @@ int do_init_pet(void) add_timer_func_list(pet_hungry,"pet_hungry"); add_timer_func_list(pet_ai_hard,"pet_ai_hard"); add_timer_func_list(pet_skill_bonus_timer,"pet_skill_bonus_timer"); // [Valaris] - add_timer_func_list(pet_delay_item_drop,"pet_delay_item_drop"); + add_timer_func_list(pet_delay_item_drop,"pet_delay_item_drop"); add_timer_func_list(pet_skill_support_timer, "pet_skill_support_timer"); // [Skotlex] add_timer_func_list(pet_recovery_timer,"pet_recovery_timer"); // [Valaris] add_timer_func_list(pet_heal_timer,"pet_heal_timer"); // [Valaris] diff --git a/src/map/script.c b/src/map/script.c index dbbabf74f..220583ff5 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -9356,7 +9356,7 @@ BUILDIN_FUNC(globalmes) /// waitingroom "<title>",<limit>{,"<event>"{,<trigger>{,<zeny>{,<minlvl>{,<maxlvl>}}}}}; BUILDIN_FUNC(waitingroom) { - struct npc_data* nd; + struct npc_data* nd; int pub = 1; const char* title = script_getstr(st, 2); int limit = script_getnum(st, 3); @@ -9630,7 +9630,7 @@ BUILDIN_FUNC(setmapflagnosave) x=script_getnum(st,4); y=script_getnum(st,5); m = map_mapname2mapid(str); - mapindex = mapindex_name2id(str2); + mapindex = mapindex_name2id(str2); if(m >= 0 && mapindex) { map[m].flag.nosave=1; @@ -14147,7 +14147,7 @@ int axtoi(const char *hexStg) BUILDIN_FUNC(axtoi) { const char *hex = script_getstr(st,2); - script_pushint(st,axtoi(hex)); + script_pushint(st,axtoi(hex)); return 0; } @@ -14786,7 +14786,7 @@ BUILDIN_FUNC(mercenary_heal) hp = script_getnum(st,2); sp = script_getnum(st,3); - status_heal(&sd->md->bl, hp, sp, 0); + status_heal(&sd->md->bl, hp, sp, 0); return 0; } diff --git a/src/map/skill.c b/src/map/skill.c index 267f19324..1af0c34b7 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1161,7 +1161,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int **/ case LG_SHIELDPRESS: sc_start(bl, SC_STUN, 30 + 8 * skilllv, skilllv, skill_get_time(skillid,skilllv)); - break; + break; case LG_PINPOINTATTACK: rate = 12 + (10 * skilllv + (sstatus->agi / 100) ) * 140 / 100; switch( skilllv ) { diff --git a/src/map/status.c b/src/map/status.c index c2264717f..275c6c8f2 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3438,7 +3438,7 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag) if(status->aspd_rate != 1000) amotion = amotion*status->aspd_rate/1000; - status->amotion = cap_value(amotion, battle_config.monster_max_aspd, 2000); + status->amotion = cap_value(amotion, battle_config.monster_max_aspd, 2000); temp = b_status->adelay*status->aspd_rate/1000; status->adelay = cap_value(temp, battle_config.monster_max_aspd*2, 4000); @@ -4586,7 +4586,7 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change * if( sc->data[SC_SWINGDANCE] ) aspd_rate -= aspd_rate * sc->data[SC_SWINGDANCE]->val2 / 100; if( sc->data[SC_DANCEWITHWUG] ) - aspd_rate -= aspd_rate * sc->data[SC_DANCEWITHWUG]->val3 / 100; + aspd_rate -= aspd_rate * sc->data[SC_DANCEWITHWUG]->val3 / 100; if( sc->data[SC_GLOOMYDAY] ) aspd_rate += aspd_rate * sc->data[SC_GLOOMYDAY]->val3 / 100; if( sc->data[SC_EARTHDRIVE] ) @@ -7332,7 +7332,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val clif_changelook(bl,LOOK_SHIELD,0); clif_changelook(bl,LOOK_BASE,type==SC_WEDDING?JOB_WEDDING:type==SC_XMAS?JOB_XMAS:JOB_SUMMER); clif_changelook(bl,LOOK_CLOTHES_COLOR,val4); - break; + break; case SC_KAAHI: val4 = INVALID_TIMER; break; @@ -8838,7 +8838,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data) case SC_OBLIVIONCURSE: if( --(sce->val4) >= 0 ) { - clif_emotion(bl,1); + clif_emotion(bl,1); sc_timer_next(3000 + tick, status_change_timer, bl->id, data ); return 0; } @@ -9171,7 +9171,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data) } // default for all non-handled control paths is to end the status - return status_change_end( bl,type,tid ); + return status_change_end( bl,type,tid ); #undef sc_timer_next } diff --git a/src/map/unit.c b/src/map/unit.c index 950ffc983..c27bde544 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -368,7 +368,7 @@ static int unit_walktobl_sub(int tid, unsigned int tick, int id, intptr_t data) set_mobstate(bl, ud->state.attack_continue); } } - return 0; + return 0; } // Chases a tbl. If the flag&1, use hard-path seek, @@ -1019,7 +1019,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh ud = unit_bl2ud(src); if(ud == NULL) return 0; - sc = status_get_sc(src); + sc = status_get_sc(src); if (sc && !sc->count) sc = NULL; //Unneeded @@ -1214,7 +1214,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh if( k > 2 ) k = 2; // ...but hard-limited to 300%. casttime += casttime * k; } - break; + break; case GD_EMERGENCYCALL: //Emergency Call double cast when the user has learned Leap [Daegaladh] if( sd && pc_checkskill(sd,TK_HIGHJUMP) ) casttime *= 2; @@ -1885,7 +1885,7 @@ static int unit_counttargeted_sub(struct block_list* bl, va_list ap) if (ud && ud->target == id && ud->attacktimer != INVALID_TIMER && ud->attacktarget_lv >= target_lv) return 1; - return 0; + return 0; } /*========================================== diff --git a/src/plugins/sig.c b/src/plugins/sig.c index e0d10ba43..15fd71846 100644 --- a/src/plugins/sig.c +++ b/src/plugins/sig.c @@ -103,7 +103,7 @@ void sig_dump(int sn) char file[256]; int no = 0; - crash_flag = 1; + crash_flag = 1; // search for a usable filename do { sprintf (file, "log/%s%04d.stackdump", server_name, ++no); @@ -158,7 +158,7 @@ void sig_dump(int sn) int sig_final () { time_t curtime; - char curtime2[24]; + char curtime2[24]; FILE *fp; long seconds = 0, day = 24*60*60, hour = 60*60, minute = 60, days = 0, hours = 0, minutes = 0; |