diff options
108 files changed, 387 insertions, 388 deletions
diff --git a/3rdparty/mysql/include/m_ctype.h b/3rdparty/mysql/include/m_ctype.h index 54ae41bf2..7d058d89d 100644 --- a/3rdparty/mysql/include/m_ctype.h +++ b/3rdparty/mysql/include/m_ctype.h @@ -76,7 +76,7 @@ extern MY_UNICASE_INFO *my_unicase_turkish[256]; #define MY_CS_UNICODE 128 /* is a charset is full unicode */ #define MY_CS_READY 256 /* if a charset is initialized */ #define MY_CS_AVAILABLE 512 /* If either compiled-in or loaded*/ -#define MY_CS_CSSORT 1024 /* if case sensitive sort order */ +#define MY_CS_CSSORT 1024 /* if case sensitive sort order */ #define MY_CHARSET_UNDEFINED 0 diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt index 5e56d7b44..ee6964fc1 100644 --- a/db/pre-re/skill_require_db.txt +++ b/db/pre-re/skill_require_db.txt @@ -73,7 +73,7 @@ 61,0,0,3,0,0,0,0:1:2:3:4:5:6:7:8:9:10:12:13:14:15:16:17:18:19:20:21:22,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KN_AUTOCOUNTER#オ?トカウンタ?# 62,0,0,13:14:15:16:17:18:19:20:21:22,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KN_BOWLINGBASH#ボウリングバッシュ# -66,0,0,13:16:19:22:25,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //PR_IMPOSITIO#イムポシティオマヌス# +66,0,0,13:16:19:22:25,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //PR_IMPOSITIO#イムポシティオマヌス# 67,0,0,8,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //PR_SUFFRAGIUM#サフラギウム# 68,0,0,14:18:22:26:30,0,0,0,99,0,0,none,0,523,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //PR_ASPERSIO#アスペルシオ# 69,0,0,20,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //PR_BENEDICTIO#聖?降福# @@ -121,7 +121,7 @@ 124,0,0,5,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_REMOVETRAP#リム?ブトラップ# 125,0,0,1,0,0,0,99,0,0,none,0,1065,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_TALKIEBOX#ト?キ?ボックス# -129,0,0,10:13:16:19:22,0,0,0,99,0,0,falcon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_BLITZBEAT#ブリッツビ?ト# +129,0,0,10:13:16:19:22,0,0,0,99,0,0,falcon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_BLITZBEAT#ブリッツビ?ト# 130,0,0,8,0,0,0,99,0,0,falcon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_DETECTING#ディテクティング# 131,0,0,10,0,0,0,99,0,0,falcon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_SPRINGTRAP#スプリングトラップ# @@ -168,7 +168,7 @@ 232,0,0,20,0,0,0,99,0,0,none,0,7137,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_CANNIBALIZE#バイオプラント# 233,0,0,10,0,0,0,99,0,0,none,0,7138,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_SPHEREMINE#スフィア?マイン# 234,0,0,30,0,0,0,99,0,0,none,0,7139,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_CP_WEAPON#ケミカルウェポンチャ?ジ# -235,0,0,25,0,0,0,99,0,0,none,0,7139,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_CP_SHIELD#ケミカルシ?ルドチャ?ジ# +235,0,0,25,0,0,0,99,0,0,none,0,7139,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_CP_SHIELD#ケミカルシ?ルドチャ?ジ# 236,0,0,25,0,0,0,99,0,0,none,0,7139,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_CP_ARMOR#ケミカルア?マ?チャ?ジ# 237,0,0,25,0,0,0,99,0,0,none,0,7139,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_CP_HELM#ケミカルヘルムチャ?ジ# diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt index f153ec5f6..5fcb94aba 100644 --- a/db/re/skill_require_db.txt +++ b/db/re/skill_require_db.txt @@ -73,7 +73,7 @@ 61,0,0,3,0,0,0,0:1:2:3:4:5:6:7:8:9:10:12:13:14:15:16:17:18:19:20:21:22,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KN_AUTOCOUNTER#オ?トカウンタ?# 62,0,0,13:14:15:16:17:18:19:20:21:22,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KN_BOWLINGBASH#ボウリングバッシュ# -66,0,0,13:16:19:22:25,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //PR_IMPOSITIO#イムポシティオマヌス# +66,0,0,13:16:19:22:25,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //PR_IMPOSITIO#イムポシティオマヌス# 67,0,0,8,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //PR_SUFFRAGIUM#サフラギウム# 68,0,0,14:18:22:26:30,0,0,0,99,0,0,none,0,523,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //PR_ASPERSIO#アスペルシオ# 69,0,0,20,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //PR_BENEDICTIO#聖?降福# @@ -121,7 +121,7 @@ 124,0,0,5,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_REMOVETRAP#リム?ブトラップ# 125,0,0,1,0,0,0,99,0,0,none,0,1065,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_TALKIEBOX#ト?キ?ボックス# -129,0,0,10:13:16:19:22,0,0,0,99,0,0,falcon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_BLITZBEAT#ブリッツビ?ト# +129,0,0,10:13:16:19:22,0,0,0,99,0,0,falcon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_BLITZBEAT#ブリッツビ?ト# 130,0,0,8,0,0,0,99,0,0,falcon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_DETECTING#ディテクティング# 131,0,0,10,0,0,0,99,0,0,falcon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_SPRINGTRAP#スプリングトラップ# @@ -168,7 +168,7 @@ 232,0,0,20,0,0,0,99,0,0,none,0,7137,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_CANNIBALIZE#バイオプラント# 233,0,0,10,0,0,0,99,0,0,none,0,7138,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_SPHEREMINE#スフィア?マイン# 234,0,0,30,0,0,0,99,0,0,none,0,7139,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_CP_WEAPON#ケミカルウェポンチャ?ジ# -235,0,0,25,0,0,0,99,0,0,none,0,7139,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_CP_SHIELD#ケミカルシ?ルドチャ?ジ# +235,0,0,25,0,0,0,99,0,0,none,0,7139,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_CP_SHIELD#ケミカルシ?ルドチャ?ジ# 236,0,0,25,0,0,0,99,0,0,none,0,7139,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_CP_ARMOR#ケミカルア?マ?チャ?ジ# 237,0,0,25,0,0,0,99,0,0,none,0,7139,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_CP_HELM#ケミカルヘルムチャ?ジ# diff --git a/doc/ea_job_system.txt b/doc/ea_job_system.txt index a2bd01991..229216a9e 100644 --- a/doc/ea_job_system.txt +++ b/doc/ea_job_system.txt @@ -170,7 +170,7 @@ About Novices and Super Novices: EAJ_NOVICE -> Novice EAJ_NOVICE|EAJL_2_1 -> EAJ_SUPER_NOVICE EAJ_NOVICE|EAJL_UPPER -> EAJ_NOVICE_HIGH - EAJ_NOVICE|EAJL_BABY -> EAJ_BABY + EAJ_NOVICE|EAJL_BABY -> EAJ_BABY EAJ_NOVICE|EAJL_BABY|EAJL_2_1 -> EAJ_SUPER_BABY So as you can see, on this job system, the Super Novice is treated as the 2-1 job of a Novice, and the Novice job it's at the same level of the other 1st jobs. Even though that may seem like a hindrance, it makes it very easy to add a check to discard Novice types from a quest: diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt index c6789775e..e0a9c3fbf 100644 --- a/doc/item_bonus.txt +++ b/doc/item_bonus.txt @@ -325,7 +325,7 @@ bonus2 bAddSkillBlow,x,y; Pushback the target by y cells when using skill x (su bonus bSPDrainValue,n; When hitting a monster by physical attack, you gain n SP (use negative numbers so the user loses SP) bonus2 bSPDrainValue,n,x; When hitting a monster by physical attack, ... - x: + x: 0=you gain n SP, 1=you drain n SP from target bonus2 bIgnoreDefRate,n,x; Disregard x% of the target's DEF if the target belongs to race n; diff --git a/doc/pccommand_list.txt b/doc/pccommand_list.txt index 5690941a3..9bf97d270 100644 --- a/doc/pccommand_list.txt +++ b/doc/pccommand_list.txt @@ -135,7 +135,7 @@ can be getmapxy, something like this: - script PCDieEvent -1,{ if (getmapxy(@mapname$,@mapx,@mapy,0) == -1) goto L_Finish; if (@mapname$ == "valkyrie") || (@mapname$ == "amatsu") { -killmonster "valkyrie","All"; +killmonster "valkyrie","All"; announce "Deep Voice: You have failed.... you have another opportunity though...",bc_self,0x660033; if (killtest != 0) enablenpc "Outern Voices"; if (killedonce == 1) end; @@ -152,7 +152,7 @@ L_Finish: OnPCDieEvent: if (getmapxy(@mapname$,@mapx,@mapy,0) == -1) goto L_Finish; if (@mapname$ == "valkyrie") || (@mapname$ == "amatsu") { -killmonster "valkyrie","All"; +killmonster "valkyrie","All"; announce "Deep Voice: You have failed.... you have another opportunity though...",bc_self,0x660033; if (killtest != 0) enablenpc "Outern Voices"; if (killedonce == 1) end; diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt index f9f5f42a9..5dbf99f89 100644 --- a/npc/cities/comodo.txt +++ b/npc/cities/comodo.txt @@ -151,7 +151,7 @@ cmd_in02,174,126,4 script Loyar#cmd 83,{ mes "and it makes me want to play "; mes "some more. Alright, let's go!"; next; - switch(rand(1,3)) { + switch(rand(1,3)) { case 1: mes "[Loyar]"; mes "Hmm... Maybe I better"; diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index 9e953cfd2..f5cff90d3 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -346,7 +346,7 @@ OnTouch: break; } set .@Main_gauche_hap,.@input * 9400; - if (Zeny < .@Main_gauche_hap) { + if (Zeny < .@Main_gauche_hap) { mes "[Suspicious Guy]"; mes "Short on zeny?"; mes "When the greatest deal in your life is right before your eyes?! Tragic, truly tragic..."; @@ -1347,7 +1347,7 @@ geffen_in,109,72,2 script Monster Scholar 90,{ mes "[Estheres]"; mes "Still, if you want to seek out strong monsters, you can cross the bridge to the West and fight Kobolds."; next; - mes "[Estheres]"; + mes "[Estheres]"; if (BaseLevel > 40) mes "You look strong enough for that kind of challenge. But if you see anyone more reckless cross the Western bridge, you might want to give them a warning."; else diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt index fdb85d481..9b3ba6aa2 100644 --- a/npc/cities/hugel.txt +++ b/npc/cities/hugel.txt @@ -185,7 +185,7 @@ hu_in01,23,311,4 script Party Supplies Shop 898,{ mes "[Shopkeeper]"; mes "Thank you, please come again."; close; - } + } } hu_in01,18,94,0 script A Part-Timer#1 49,{ diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt index 66199333d..bff881900 100644 --- a/npc/cities/izlude.txt +++ b/npc/cities/izlude.txt @@ -458,7 +458,7 @@ izlude,124,178,2 script Soldier#izlude 105,{ close; } -// Inside Izlude +// Inside Izlude //============================================================ izlude_in,125,164,2 script Aaron#izlude 65,{ mes "[Aaron]"; diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt index fd8da5dd1..603450fb8 100644 --- a/npc/cities/lutie.txt +++ b/npc/cities/lutie.txt @@ -385,7 +385,7 @@ xmas,176,236,4 script Uncle Hairy 712,{ mes "[Cantata]"; mes "^3355FFThachentze^000000, that lovely pickle maker, knows more about it. So if you're curious, you should go talk to her. Alrighty then, Merry Christmas!"; set xmas_npc,5; - close; + close; }else{ mes "[Cantata]"; mes "Oh yeah? Heard about me from Poze, did you? Haw haw haw! Yeah, I know a little bit about Snowysnow. In fact, I may even be his weak point, since..."; diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt index a9a7395ef..31c57bdc2 100644 --- a/npc/cities/yuno.txt +++ b/npc/cities/yuno.txt @@ -323,7 +323,7 @@ yuno,334,182,4 script Juno Soldier#6juno 105,{ mes "[Juno Soldier]"; mes "Its use is limited to the Sage class, and it increases the chance of inflicting critical attacks. So, for Sages, that dagger can be very useful, as well as make them look stylish in battle."; close; -} +} yuno,263,320,4 script Juno Soldier#7juno 105,{ mes "[Juno Soldier]"; diff --git a/npc/custom/banks/bank.txt b/npc/custom/banks/bank.txt index 7c610ec13..33fc558f9 100644 --- a/npc/custom/banks/bank.txt +++ b/npc/custom/banks/bank.txt @@ -69,7 +69,7 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's else if (@withdrawl > #bankstorage) { mes "I show you only have ^00FF00" + #bankstorage +"^000000 zeny in your account!"; close; - } + } else if ((@cost > Zeny) && ((Zeny + @withdrawl) > @cost)) { mes "[Banker]"; mes "You don't have the Zeny for the transaction fee right now. Would you like me to take the fee directly from your withdrawl?"; diff --git a/npc/custom/eAAC_Scripts/kafraExpress/config.txt b/npc/custom/eAAC_Scripts/kafraExpress/config.txt index e3efab224..6ff968655 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/config.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/config.txt @@ -234,7 +234,7 @@ OnLoadRefine: end; //------------------------------------------------------------------------------- //Config for the Renting Module - //------------------------------------------------------------------------------- + //------------------------------------------------------------------------------- OnLoadRent: set $@kert_cartOnly, 0; //Set to 1 to enable only cart rental, 0 enables all add-ons. set $@kert_cartCost, 1000; //Cost to rent a Cart. @@ -252,7 +252,7 @@ OnLoadShop: end; //------------------------------------------------------------------------------- //Config for the Stat Market Module - //------------------------------------------------------------------------------- + //------------------------------------------------------------------------------- OnLoadStatMarket: set $@kesm_stBuyPrice,10000; //Cost of buying stat points set $@kesm_stSellPrice,0; //Return cash for selling stat points diff --git a/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt b/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt index 16931e5ea..d1a5d65a5 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt @@ -197,8 +197,7 @@ function script GF_getJobId { } if (@classId >= Job_Novice_High && @classId <= Job_Paladin2) set @classId, @classId -Job_Novice_High; - else - if (@classId >= Job_Baby && @classId <= Job_Super_Baby) + else if (@classId >= Job_Baby && @classId <= Job_Super_Baby) set @classId, @classId -Job_Baby; if (@type == 1) diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt index 6d10ed043..198650da5 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt @@ -378,7 +378,7 @@ function SF_revertJob { if ($@kejs_announce) announce strcharinfo(0)+" has changed from "+jobname(@thisJobId)+" to "+@newjob$+"...",16; return 1; -} +} //SubFunction: SF_getJobNames(Qty) //Fills an array @names$ with the job names taken from the array "classes", diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt index d9ac1613b..c8a949839 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt @@ -266,7 +266,7 @@ function SF_purify { set @rough, 990; set @qty, 10; break; - case 7: //Ice + case 7: //Ice set @item, 995; set @rough, 991; set @qty, 10; @@ -276,7 +276,7 @@ function SF_purify { set @rough, 992; set @qty, 10; break; - case 9: //Earth + case 9: //Earth set @item, 997; set @rough, 993; set @qty, 10; diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt index 0d103715d..e627d0c61 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt @@ -54,7 +54,7 @@ function script F_keShop { "- Buy items", "- Sell items" ); - break; + break; } if (@kmenu == 1) return; diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt index 8cbf48a54..199494184 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt @@ -504,7 +504,7 @@ function SF_byalan { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"izlu2dun",114,84; break; case 3: @@ -516,7 +516,7 @@ function SF_byalan { case 5: callfunc "F_keWarp",@cost4*100/@discountKP,$@kewd_discount,e_hmm,"iz_dun03",32,63; break; - case 6: + case 6: callfunc "F_keWarp",@cost5*100/@discountKP,$@kewd_discount,e_hmm,"iz_dun04",26,27; break; } @@ -585,7 +585,7 @@ function SF_clockTower { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"aldebaran",140,130; break; case 3: @@ -633,10 +633,10 @@ function SF_coalMine { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"mjolnir_02",89,358; break; - case 3: + case 3: callfunc "F_keWarp",@cost2*100/@discountKP,$@kewd_discount,e_hmm,"mjo_dun02",376,342; break; case 4: @@ -668,10 +668,10 @@ function SF_culvert { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"prt_fild05",274,208; break; - case 3: + case 3: callfunc "F_keWarp",@cost2*100/@discountKP,$@kewd_discount,e_hmm,"prt_sewb2",19,19; break; case 4: @@ -772,7 +772,7 @@ function SF_gefenia { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"gefenia01",60,169; break; case 3: @@ -847,7 +847,7 @@ function SF_glastHeim { "- Underground Cave Level 2 ("+@cost7+"z)" ); } - switch (@submenu) { + switch (@submenu) { case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"glast_01",206,136; break; @@ -947,7 +947,7 @@ function SF_hiddenTemple { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"prt_fild01",136,361; break; case 3: @@ -980,7 +980,7 @@ function SF_juperos { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"jupe_cave",55,52; break; case 3: @@ -1010,7 +1010,7 @@ function SF_kiehl { "- Level 2 ("+@cost2+"z)" ); } - switch (@submenu) { + switch (@submenu) { case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"yuno_fild08",80,179; break; @@ -1041,7 +1041,7 @@ function SF_iceCave { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"ra_fild01",233,319; break; case 3: @@ -1073,7 +1073,7 @@ function SF_lightHalzen { "- Level 3 ("+@cost3+"z)" ); } - switch (@submenu) { + switch (@submenu) { case 2: //This is the Rekkenber building entrance, which officially is only a dungeon exit. callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"lighthalzen",74,72; @@ -1109,7 +1109,7 @@ function SF_louYang { ); }; switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"louyang",41,267; break; case 3: @@ -1169,7 +1169,7 @@ function SF_odin { "- Level 3 ("+@cost3+"z)" ); } - switch (@submenu) { + switch (@submenu) { case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"odin_tem01",91,145; break; @@ -1232,7 +1232,7 @@ function SF_payon { "- Level 5 ("+@cost5+"z)" ); } - switch (@submenu) { + switch (@submenu) { case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"pay_arche",41,133; break; @@ -1277,7 +1277,7 @@ function SF_pyramid { "- Basement 2 ("+@cost3+"z)" ); } - switch (@submenu) { + switch (@submenu) { case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"moc_ruins",62,162; break; @@ -1457,7 +1457,7 @@ function SF_thanatosTower { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"tha_scene01",139,201; break; case 3: @@ -1555,7 +1555,7 @@ function SF_turtleIsland { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"tur_dun01",153,47; break; case 3: diff --git a/npc/custom/eAAC_Scripts/kafraExpress/readme.txt b/npc/custom/eAAC_Scripts/kafraExpress/readme.txt index 8c371d458..5bce41399 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/readme.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/readme.txt @@ -183,7 +183,7 @@ For example, the renting module's configuration segment is: //------------------------------------------------------------------------------- //Config for the Renting Module - //------------------------------------------------------------------------------- + //------------------------------------------------------------------------------- OnLoadRent: set $@kert_cartOnly, 0; //Set to 1 to enable only cart rental, 0 enables all add-ons. set $@kert_cartCost, 2000; //Cost to rent a Cart. diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt index 15c384547..ff364159a 100644 --- a/npc/custom/jobs/jobmaster.txt +++ b/npc/custom/jobs/jobmaster.txt @@ -146,7 +146,7 @@ prontera,153,193,6 script Job Master 123,{ case Job_Thief: set @job_opt[0], Job_Assassin; set @job_opt[1], Job_Rogue; - break; + break; default: set @job_opt[0], Job_Star_Gladiator; set @job_opt[1], Job_Soul_Linker; diff --git a/npc/custom/marriage.txt b/npc/custom/marriage.txt index dbfcd5794..0f21c46e7 100644 --- a/npc/custom/marriage.txt +++ b/npc/custom/marriage.txt @@ -530,7 +530,7 @@ function SF_Register { mes "Come back when you are ready."; close; } -} +} function SF_WedProgress { if (strcharinfo(0) == $wed_groom$) { diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt index 25cbc2b53..48c25732f 100644 --- a/npc/events/christmas_2008.txt +++ b/npc/events/christmas_2008.txt @@ -590,7 +590,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{ } else if (.@SantaCardNpc == 3) { cutin "ｿｽｿｽｿｽﾆｮｿｽｿｽﾄｫｿｽｿｽ",4; - } + } next; set .@SantaCardTurn,.@SantaCardTurn+1; if (.@SantaCardP == .@SantaCardNpc) { @@ -635,10 +635,10 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{ getitem 595,3; } else if (.@SantaCardPrize == 3) { - getitem 593,3; + getitem 593,3; } else if (.@SantaCardPrize == 4) { - getitem 12236,3; + getitem 12236,3; } else if (.@SantaCardPrize == 5) { getitem 538,10; @@ -780,7 +780,7 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{ mes "[Louise Kim]"; mes "If you bring me all that stuff, I can make you a glamorous Santa costume."; next; - if (countitem(2301) < 1 || countitem(501) < 3 || countitem(523) < 1 || countitem(7175) < 4 || countitem(7174) < 1) { + if (countitem(2301) < 1 || countitem(501) < 3 || countitem(523) < 1 || countitem(7175) < 4 || countitem(7174) < 1) { mes "[Louise Kim]"; mes "If you were to bring me all the stuff, I would make you a wonderful costume, for free..."; next; diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index 6f5e80cff..d5f7fbfe4 100644 --- a/npc/events/event_skill_reset.txt +++ b/npc/events/event_skill_reset.txt @@ -63,7 +63,7 @@ yuno,138,187,4 script Hypnotist Teacher 124,{ mes "if you ever want a reset!!"; close; -L_Info: +L_Info: mes @npcname$; mes "This skill reset is not FREE OF CHARGE!!"; mes "Expense for the reset of skill is ^D5A50020000 Zeny x BaseLv^000000."; diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt index 167bce60a..0dd1792a4 100644 --- a/npc/events/halloween_2006.txt +++ b/npc/events/halloween_2006.txt @@ -1068,7 +1068,7 @@ prontera,155,285,3 script Familiar#06_hw01::HWFamiDup 799,{ mes "Ok."; mes "Actually, it's useless to have a special ticket to Nifflheim."; close; - } + } mes "[Familiar]"; mes "Ok."; mes "If you want to ask something, give a piece of pumpkin pie to Loli Ruri."; diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt index 903ec125f..a4844da1b 100644 --- a/npc/events/halloween_2008.txt +++ b/npc/events/halloween_2008.txt @@ -195,7 +195,7 @@ payon,162,176,4 script Halloween Magician#iRO08 704,{ getitem 617,1; goto Enough; } - break; + break; case 5: if(countitem(7941) < 200) { goto NotEnough; diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt index 2e5586de4..c3d314d7a 100644 --- a/npc/events/halloween_2009.txt +++ b/npc/events/halloween_2009.txt @@ -156,7 +156,7 @@ OnTouch: mes "Fine. I have no choice but to trick you!"; sc_start SC_Stun,5000,0; close; - } + } case 3: if(countitem(538) > 0) { mes "[Trick or Treater]"; @@ -177,7 +177,7 @@ OnTouch: mes "Fine. I have no choice but to trick you!"; sc_start SC_Stun,5000,0; close; - } + } case 4: mes "[Trick or Treater]"; mes "At least a Candy, a Candy Cane or a Well-baked Cookie is all I ask for a treat."; diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt index ee9e85f90..8b0121fcf 100644 --- a/npc/events/idul_fitri.txt +++ b/npc/events/idul_fitri.txt @@ -68,7 +68,7 @@ prontera,146,92,3 script Cellerb 58,{ emotion e_thx; close; - case 2: + case 2: mes @npcname$; mes "Oh well, maybe you will participate in tommorow's quest."; emotion e_hmm; diff --git a/npc/events/twintowers.txt b/npc/events/twintowers.txt index 7557b7c6e..942807222 100644 --- a/npc/events/twintowers.txt +++ b/npc/events/twintowers.txt @@ -33,7 +33,7 @@ prontera,146,92,4 script Twin Towers#tt1::Twin-Towers 812,{ next; menu "I shall accept your offer.",YES,"I'll ask for your service next time.",NO; - NO: + NO: mes "[Twin Towers]"; mes "Er, what a pity. Traveling by yourself is still the best evidence of adventure."; mes "Isn't this proving that you are still young?"; @@ -48,7 +48,7 @@ prontera,146,92,4 script Twin Towers#tt1::Twin-Towers 812,{ mes "Forget all your troubles, and create a splendid legend in this wonderful world."; mes "This is such a wonderful world, and you'll always be a great adventurer!"; close; - YES: + YES: mes "[Twin Towers]"; mes "The flaming passion of an adventurer,"; mes "The desire to explore the unknown realms,"; diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index ce9d2ad7e..db072b401 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -123,7 +123,7 @@ prontera,164,174,4 script Trader#Val09 58,{ next; mes "[Marco Bassinio]"; mes "You're not saying that you want an empty chocolate box without any chocolate in it, am I right?"; - close; + close; } if (!checkweight(12744,1)) { mes "[Marco Bassinio]"; @@ -292,7 +292,7 @@ prontera,147,171,5 script Packs Trader#Val09 58,{ getitem 7948,.@input; next; break; - } + } case 4: mes "[Packs Trader]"; mes "Goodbye!"; @@ -503,7 +503,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 113,{ mes "[Valentine Vote Manager]"; mes "The current record shows... "+$Val09name_F$+" is the female vote leader who's registered the total of "+$Val09votes_F+" rings."; next; - break; + break; case 3: mes "[Valentine Vote Manager]"; diff --git a/npc/guild/agit_controller.txt b/npc/guild/agit_controller.txt index 4d21e1e82..27376df86 100644 --- a/npc/guild/agit_controller.txt +++ b/npc/guild/agit_controller.txt @@ -78,7 +78,7 @@ S_DisplayOwners: } else { Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle is currently unoccupied.",bc_all|bc_woe; - } + } } end; } diff --git a/npc/guild/agit_template.txt b/npc/guild/agit_template.txt index 1e35719d7..34d5e7dae 100644 --- a/npc/guild/agit_template.txt +++ b/npc/guild/agit_template.txt @@ -916,7 +916,7 @@ OnSpawnGuardians: OnGuardianDied: end; -} +} // Kafra Template //============================================================ @@ -974,7 +974,7 @@ OnGuardianDied: end; } cutin "", 255; - close; + close; case 3: mes "[Kafra staff]"; mes "Please let me know your destination."; @@ -1028,7 +1028,7 @@ OnGuardianDied: case 2: break; } - } + } break; case 5: mes "[Kafra staff]"; diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt index 31abb61b7..8d7e452f3 100644 --- a/npc/jobs/1-1/thief.txt +++ b/npc/jobs/1-1/thief.txt @@ -79,7 +79,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 69,{ mes "[Thief Guildsman]"; mes "Hey, brother."; mes "Why are you here? Go back to your place~ go back~~"; - close; + close; }else{ mes "[Thief Guildsman]"; mes "What the heck...?"; @@ -87,7 +87,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 69,{ mes "[Thief Guildsman]"; mes "Hey, lady."; mes "Why are you here? Go back to your place~ go back~~"; - close; + close; } } } @@ -146,7 +146,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 69,{ mes "I can see your strong will to become a Thief......"; mes "But only with your will, you cannot make it in a real fight, can you?"; mes "So go and reach at least Basic Skill Level 9."; - close; + close; } mes "[Thief Guildsman]"; mes "Hmm.... I found your interesting criminal records from the data of the detective agency. Well you seem to have what it takes to be a good thief."; diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt index f715eed90..4b768a58a 100644 --- a/npc/jobs/1-1e/gunslinger.txt +++ b/npc/jobs/1-1e/gunslinger.txt @@ -358,7 +358,7 @@ payon,184,65,3 script Wise Bull Horn 866,{ mes "earth. Would you do this old"; mes "Gunslinger a favor a bring me"; mes "a cold glass of Milk, please?"; - close; + close; } delitem 519,1; // Milk set GUNS_Q,5; diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index ec8a828c2..76c12d26b 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -1510,7 +1510,7 @@ job_hunte,55,120,0 duplicate(HntTrap) 23-6 -1,0,0 job_hunte,66,120,0 duplicate(HntTrap) 24-1 -1,0,0 job_hunte,66,121,0 duplicate(HntTrap) 24-2 -1,0,0 job_hunte,67,120,0 duplicate(HntTrap) 24-3 -1,0,0 -job_hunte,67,121,0 duplicate(HntTrap) 24-4 -1,0,0 +job_hunte,67,121,0 duplicate(HntTrap) 24-4 -1,0,0 job_hunte,114,118,0 duplicate(HntTrap) 25-1 -1,0,0 job_hunte,114,119,0 duplicate(HntTrap) 25-2 -1,0,0 job_hunte,115,118,0 duplicate(HntTrap) 25-3 -1,0,0 diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt index 348ebe793..e58dc4dde 100644 --- a/npc/jobs/2-1e/StarGladiator.txt +++ b/npc/jobs/2-1e/StarGladiator.txt @@ -106,7 +106,7 @@ payon,215,102,3 script Moohyun#job_star 828,3,3,{ set STGL_Q,1; setquest 7007; close; - } + } mes "[Moohyun]"; mes "That's fine. Changing your"; mes "job is an important decision,"; @@ -178,7 +178,7 @@ payon,215,102,3 script Moohyun#job_star 828,3,3,{ mes "when you really need it. There"; mes "is no shame in being unable to"; mes "accomplish something alone..."; - close; + close; } mes "[Moohyun]"; mes "Ah, that. Beeryu has"; diff --git a/npc/jobs/3-1/warlock.txt b/npc/jobs/3-1/warlock.txt index 4ab6e19ef..43845777a 100644 --- a/npc/jobs/3-1/warlock.txt +++ b/npc/jobs/3-1/warlock.txt @@ -1488,7 +1488,7 @@ spl_in02,80,108,5 script Guild Master#Warlock 465,{ } } mes "[Master Egnoloria]"; - //Custom Translation + //Custom Translation mes "Ah......?"; close; } @@ -1737,7 +1737,7 @@ OnTimer293000: end; OnTimer303000: - mapannounce "job3_war02","The magic stabilization has failed. The fragment has lost it's power.",bc_map; // custom translation. + mapannounce "job3_war02","The magic stabilization has failed. The fragment has lost it's power.",bc_map; // custom translation. donpcevent "The chamber of magic#W::OnReset"; donpcevent "The chamber of magic#W2::OnReset"; donpcevent "The chamber of magic#W3::OnReset"; diff --git a/npc/jobs/3-2/wanderer.txt b/npc/jobs/3-2/wanderer.txt index 087095f9c..a373fd302 100644 --- a/npc/jobs/3-2/wanderer.txt +++ b/npc/jobs/3-2/wanderer.txt @@ -218,7 +218,7 @@ xmas,132,143,5 script Performance Manager#w 713,{ switch(select("I'm not interested.:What happened?:If you're not saying, why would you tell me that?")) { case 1: mes "[Stage Staff]"; - mes "Oh! What a ruthless world!"; + mes "Oh! What a ruthless world!"; close; case 2: mes "[Stage Staff]"; @@ -231,7 +231,7 @@ xmas,132,143,5 script Performance Manager#w 713,{ case 3: emotion e_ag; mes "[Stage Staff]"; - mes "I am not saying it? I'm too depressed! Well, now you know!"; + mes "I am not saying it? I'm too depressed! Well, now you know!"; next; break; } @@ -247,7 +247,7 @@ L_wh1: next; emotion e_wah; mes "[Stage Staff]"; - mes "People will put a collar on me! Oh, terrible, so terrible!"; + mes "People will put a collar on me! Oh, terrible, so terrible!"; next; goto L_wh2; case 2: @@ -256,7 +256,7 @@ L_wh1: mes "It's <Nuoli Ou>!"; mes "Do you know?"; mes "They are the worst people in the world."; - next; + next; break; case 3: mes "[Stage Staff]"; @@ -386,7 +386,7 @@ L_wh3: mes "Thanks to you, the performance went successfully as planned."; mes "They are really talented!"; mes "As a reward, I will prepare a stage especially for you."; - close; + close; } } mes "[Stage Staff]"; @@ -556,7 +556,7 @@ comodo,140,86,5 script Cheerless Minstrel#w 479,{ else { mes "["+strcharinfo(0)+"]"; mes "It doesn't look like a good idea to me."; - close; + close; } case 3: set .@scream,getskilllv(329); @@ -624,7 +624,7 @@ comodo,140,86,5 script Cheerless Minstrel#w 479,{ emotion e_lv,1; next; break; - } + } } mes "[Guitar Song]"; mes "Ah, oh, well!"; @@ -692,7 +692,7 @@ comodo,140,86,5 script Cheerless Minstrel#w 479,{ else { mes "[inability of the court musicians]"; mes "Where is my companion ..."; - close; + close; } } @@ -753,7 +753,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#w 879,{ emotion e_sob; mes "[Vacant Looking Lady]"; mes "Why didn't Guitar Song recognized me, ah? I still have no make-up on my face so he won't recognize me, ah? Ooo-ooo..."; - next; + next; menu "So you have to solve this problem?",-; emotion e_sob; mes "[Vacant Looking Lady]"; @@ -802,11 +802,11 @@ hu_in01,305,251,5 script Vacant Looking Lady#w 879,{ mes "[Dancer Kim]"; mes "I was once a beautiful dove, but now I became a hen."; mes "Dancer Kim's is no longer wanderer."; - next; + next; if (select("Don't give up.:You'll can handle it yourself.") == 2){ mes "[Dancer Kim]"; mes "My life has not came out from the abyss ..."; - close; + close; } mes "[Dancer Kim]"; mes "I already said that it's all over with Guitar Song."; @@ -828,8 +828,8 @@ hu_in01,305,251,5 script Vacant Looking Lady#w 879,{ if (select("Then there is nothing else to do.:Lets exercise.") == 1){ mes "[Dancer Kim]"; mes "There is no dream, no hope..."; - close; - } + close; + } mes "[Dancer Kim]"; mes "Do you want to exercise with me? Together?"; mes "Really?"; @@ -841,7 +841,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#w 879,{ mes "My heart now feels better!"; mes "I feel like my body is igniting for some action."; mes "And now I'm motivated to take advantage of the time and overcome all difficulties as soon as possible!"; - next; + next; menu "What are we going to do?",-; mes "[Dancer Kim]"; mes "I have a good idea!"; @@ -856,7 +856,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#w 879,{ else if (job_wan == 6 || job_wan == 7) { mes "[Dancer Kim]"; mes "I will wait for you in the Lake of Abyss."; - close; + close; } else if (job_wan == 8) { mes "[Dancer Kim]"; @@ -885,8 +885,8 @@ hu_fild05,342,130,5 script Dancer Kim#fild 879,{ 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!"; - close; - } + close; + } mes "[Dancer Kim]"; mes "Good! So, prepare!"; mes "Start!"; @@ -928,7 +928,7 @@ hu_fild05,342,130,5 script Dancer Kim#fild 879,{ mes "Ah, do me a favour, please."; mes "Can you bring Guitar Song to Lutie?"; mes "Say that his partner is waiting for him."; - next; + next; menu "No problem!",-; mes "[Dancer Kim]"; mes "You're a good person. I'm really happy that I met you."; @@ -950,7 +950,7 @@ hu_fild05,342,130,5 script Dancer Kim#fild 879,{ mes "- It looks like Dancer Kim cannot stand the pain and gives up. She sat down on the ground -"; set job_wan,6; changequest 2221,2220; - close; + close; } mes "[Dancer Kim]"; mes "Ah ...?"; @@ -960,7 +960,7 @@ hu_fild05,342,130,5 script Dancer Kim#fild 879,{ else if (job_wan == 8) { mes "[Dancer Kim]"; mes "Please tell Guitar Song that I'm waiting for him in Lutie."; - close; + close; } mes "[Dancer Kim]"; mes "Hunting Yellow Novus really is the best sport."; @@ -978,11 +978,11 @@ OnTouch: } if (.@bc_rd == 2){ mapannounce "hu_fild05","Dancer Kim: Yeah! Novuses are coming, my sister!",bc_map; - end; + end; } else { mapannounce "hu_fild05","Dancer Kim: Oh, you're tired so soon? It seems that I'll win this!",bc_map; - end; + end; } } end; @@ -999,11 +999,11 @@ OnTouch: } if (.@bc_rd == 2){ mapannounce "hu_fild05","Dancer Kim: Yeah! Novuses are coming, my sister!",bc_map; - end; + end; } else { mapannounce "hu_fild05","Dancer Kim: Oh, you're tired so soon? It seems that I'll win this!",bc_map; - end; + end; } } end; @@ -1020,11 +1020,11 @@ OnTouch: } if (.@bc_rd == 2){ mapannounce "hu_fild05","Dancer Kim: Yeah! Novuses are coming, my sister!",bc_map; - end; + end; } else { mapannounce "hu_fild05","Dancer Kim: Oh, you're tired so soon? It seems that I'll win this!",bc_map; - end; + end; } } end; @@ -1041,11 +1041,11 @@ OnTouch: } if (.@bc_rd == 2){ mapannounce "hu_fild05","Dancer Kim: Yeah! Novuses are coming, my sister!",bc_map; - end; + end; } else { mapannounce "hu_fild05","Dancer Kim: Oh, you're tired so soon? It seems that I'll win this!",bc_map; - end; + end; } } end; @@ -1062,11 +1062,11 @@ OnTouch: } if (.@bc_rd == 2){ mapannounce "hu_fild05","Dancer Kim: Yeah! Novuses are coming, my sister!",bc_map; - end; + end; } else { mapannounce "hu_fild05","Dancer Kim: Oh, you're tired so soon? It seems that I'll win this!",bc_map; - end; + end; } } end; @@ -1083,11 +1083,11 @@ OnTouch: } if (.@bc_rd == 2){ mapannounce "hu_fild05","Dancer Kim: Ah, my nails are broken! It hurt... Forget about it...",bc_map; - end; + end; } else { mapannounce "hu_fild05","Dancer Kim: Oh, you're tired so soon? It seems that I'll win this!",bc_map; - end; + end; } } @@ -1105,11 +1105,11 @@ OnTouch: } if (.@bc_rd == 2){ mapannounce "hu_fild05","Dancer Kim: Ah, my nails are broken! It hurt... Forget about it...",bc_map; - end; + end; } else { mapannounce "hu_fild05","Dancer Kim: Oh, you're tired so soon? It seems that I'll win this!",bc_map; - end; + end; } } end; @@ -1126,11 +1126,11 @@ OnTouch: } if (.@bc_rd == 2){ mapannounce "hu_fild05","Dancer Kim: Ah, my nails are broken! It hurt... Forget about it...",bc_map; - end; + end; } else { mapannounce "hu_fild05","Dancer Kim: Oh, you're tired so soon? It seems that I'll win this!",bc_map; - end; + end; } } end; @@ -1147,11 +1147,11 @@ OnTouch: } if (.@bc_rd == 2){ mapannounce "hu_fild05","Dancer Kim: Ah, my nails are broken! It hurt... Forget about it...",bc_map; - end; + end; } else { mapannounce "hu_fild05","Dancer Kim: Oh, you're tired so soon? It seems that I'll win this!",bc_map; - end; + end; } } end; @@ -1168,11 +1168,11 @@ OnTouch: } if (.@bc_rd == 2){ mapannounce "hu_fild05","Dancer Kim: Ah, my nails are broken! It hurt... Forget about it...",bc_map; - end; + end; } else { mapannounce "hu_fild05","Dancer Kim: Oh, you're tired so soon? It seems that I'll win this!",bc_map; - end; + end; } } end; @@ -1241,7 +1241,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 "Hello !!!!!"; next; diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt index 807275e13..bc6bcae3b 100644 --- a/npc/jobs/novice/novice.txt +++ b/npc/jobs/novice/novice.txt @@ -622,7 +622,7 @@ new_1-2,32,172,4 script Chocolat#nv 96,{ mes "Why are you still here?"; close2; warp "prontera",156,90; - end; + end; } } @@ -1149,7 +1149,7 @@ new_5-3,96,30,4 duplicate(NvBrade) Brade#nv5 733 mes "I'll wait for you here."; mes "Wish you a good luck."; close; - } + } case 4: mes "[Swordman Guildsman]"; mes "If you have any questions about the Swordman class, please ask me."; @@ -1689,7 +1689,7 @@ new_5-3,109,41,4 duplicate(NvMer) Merchant Guide#nv5 97 next; mes "[Archer Guide]"; mes "Do you want to register to test skill experience?"; - mes "Would you like to test Archer skills?"; + mes "Would you like to test Archer skills?"; next; if(select("I want to test Archer skills.:I don't want to test it.") == 2) { mes "[Archer Guide]"; diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt index 936dabac3..19bbbe28f 100644 --- a/npc/merchants/buying_shops.txt +++ b/npc/merchants/buying_shops.txt @@ -234,7 +234,7 @@ alberta_in,58,52,4 script Purchasing Team#Buying 59,{ mes "I've given you 5 Bulk Buyer Shop Licenses for your trial."; mes "Enjoy shopping!"; close; - } + } } }else{ mes "[Mr. Hugh]"; diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt index a849dfad7..fa309738a 100644 --- a/npc/merchants/cashheadgear_dye.txt +++ b/npc/merchants/cashheadgear_dye.txt @@ -78,7 +78,7 @@ prt_in,253,168,4 script Alora 862,{ mes "Oh I'm so excited aren't you?"; mes "And just to be sure, what color is the "+ .@hgn$[.@t] +" you want me to use?"; next; - mes "[Alora]"; + mes "[Alora]"; mes "Please understand that I'm going to use the ^FF00001st "+ .@hgn$[.@t] +" of that color in your inventory!^000000"; next; mes "[Alora]"; diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt index 6a79ebb4c..f619f8c0c 100644 --- a/npc/merchants/clothes_dyer.txt +++ b/npc/merchants/clothes_dyer.txt @@ -161,7 +161,7 @@ L_Super_Novice_M: //================================= // Clothing Dyeing for Females -//================================= +//================================= Female_dye: if(BaseJob==Job_Novice || BaseJob==Job_Novice_High || BaseJob==Job_Baby) goto L_Novice_F; if(BaseJob==Job_Swordman || BaseJob==Job_Swordman_High || BaseJob==Job_Baby_Swordman) goto L_Swordman_F; diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt index 918b0be2d..d04dbe08e 100644 --- a/npc/merchants/icecream.txt +++ b/npc/merchants/icecream.txt @@ -54,7 +54,7 @@ mes "If you eat more than 5 Ice creams,"; mes "If you might haveto make a lot of trips"; mes "to the bathroom tonight."; - next; + next; } } if(Zeny<.@input*100) { diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 9e6ebd034..f2556034e 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -479,7 +479,7 @@ ein_in01,38,29,0 script Paul Spanner 63,{ case 2: set .@item,1011; set .@item_price,1000; - break; + break; case 3: mes "[Paul Spanner]"; mes "If you need anything, just let me know."; @@ -896,7 +896,7 @@ function script refinemain { } mes "[" + getarg(0) + "]"; mes "All finished... Come again soon."; - close; + close; } diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt index 6ed2ef96c..cb29ee807 100644 --- a/npc/other/arena/arena_lvl50.txt +++ b/npc/other/arena/arena_lvl50.txt @@ -59,7 +59,7 @@ OnTimer5000: OnTimer60000: set $@mapcount50, getmapusers ("force_1-1"); - if ($@mapcount50 == 0) { + if ($@mapcount50 == 0) { donpcevent "Heel and Toe#arena::Onfailclearstage"; } mapannounce "force_1-1","Remaining Time : 4 minutes ",0; @@ -67,7 +67,7 @@ OnTimer60000: OnTimer120000: set $@mapcount50, getmapusers ("force_1-1"); - if ($@mapcount50 == 0) { + if ($@mapcount50 == 0) { donpcevent "Heel and Toe#arena::Onfailclearstage"; } mapannounce "force_1-1","Remaining Time : 3 minutes ",0; @@ -75,14 +75,14 @@ OnTimer120000: OnTimer180000: set $@mapcount50, getmapusers ("force_1-1"); - if ($@mapcount50 == 0) { + 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"); - if ($@mapcount50 == 0) { + if ($@mapcount50 == 0) { donpcevent "Heel and Toe#arena::Onfailclearstage"; } mapannounce "force_1-1","Remaining Time : 1 minute ",0; @@ -455,7 +455,7 @@ Onreset: OnMobDeath: set $force_01_50,$force_01_50 -1; - if ($force_01_50 < 1) { + if ($force_01_50 < 1) { donpcevent "Heel and Toe#arena::On01_end"; donpcevent "arena#50::Onreset_01"; } @@ -540,7 +540,7 @@ Onreset: OnMobDeath: set $force_03_50,$force_03_50 -1; donpcevent "force_03mob#50::Onsummonmob_03"; - if ($force_03_50 < 1) { + if ($force_03_50 < 1) { donpcevent "Heel and Toe#arena::On03_end"; donpcevent "arena#50::Onreset_03"; } @@ -598,7 +598,7 @@ Onreset: OnMobDeath: set $force_04_50,$force_04_50 -1; - if ($force_04_50 < 1) { + if ($force_04_50 < 1) { donpcevent "Heel and Toe#arena::On04_end"; donpcevent "arena#50::Onreset_04"; } @@ -653,7 +653,7 @@ Onreset: OnMobDeath: set $force_05_50,$force_05_50 -1; - if ($force_05_50 < 1) { + if ($force_05_50 < 1) { donpcevent "Heel and Toe#arena::On05_end"; donpcevent "arena#50::Onreset_05"; } @@ -711,7 +711,7 @@ Onreset: OnMobDeath: set $force_06_50,$force_06_50 -1; - if ($force_06_50 < 1) { + if ($force_06_50 < 1) { donpcevent "Heel and Toe#arena::On06_end"; donpcevent "arena#50::Onreset_06"; } @@ -774,7 +774,7 @@ Onreset: OnMobDeath: set $force_07_50,$force_07_50 -1; - if ($force_07_50 < 1) { + if ($force_07_50 < 1) { donpcevent "Heel and Toe#arena::On07_end"; donpcevent "arena#50::Onreset_07"; } @@ -844,7 +844,7 @@ Onreset: OnMobDeath: set $force_09_50,$force_09_50 -1; - if ($force_09_50 < 1) { + if ($force_09_50 < 1) { donpcevent "Heel and Toe#arena::On09_end"; donpcevent "arena#50::Onreset_09"; donpcevent "arena#50::Onreset_all"; @@ -860,7 +860,7 @@ prt_are_in,129,188,3 script Staff#50-1 67,{ 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) { + if (arena_point == 30000) { mes "[Staff]"; mes "Uh huh!"; mes "You already have enough arena points."; @@ -924,7 +924,7 @@ prt_are_in,25,188,3 script Staff#50-2 67,{ mes "[Staff]"; mes "Although you failed to make a new record, I hope you will succeed next time."; next; - if (arena_point > 29980) { + 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."; @@ -971,7 +971,7 @@ prt_are_in,25,188,3 script Staff#50-2 67,{ set $arena_50topn$,strcharinfo(0); donpcevent "Vendigos::Onlinerec_50"; next; - if (arena_point > 29950) { + 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."; @@ -1007,7 +1007,7 @@ prt_are_in,25,188,3 script Staff#50-2 67,{ donpcevent "alloff#50::Onon"; donpcevent "lvl 50s Waiting Room::Onstart"; end; - } + } } prt_are_in,14,195,3 script #arn_timer_50 139,{ @@ -1101,7 +1101,7 @@ Onon: enablenpc "arena#50"; end; -OnInit: +OnInit: if(!$top_50min && !$top_50sec) set $top_50min,5; end; diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt index 440d9e451..fa396e88b 100644 --- a/npc/other/arena/arena_lvl60.txt +++ b/npc/other/arena/arena_lvl60.txt @@ -44,7 +44,7 @@ OnTouch: set Zeny,Zeny -1000; disablenpc "ArenaFee#60"; end; -} +} force_2-1,99,20,4 script Minilover#arena 124,{ @@ -72,7 +72,7 @@ OnTimer5000: OnTimer60000: set $@mapcount60, getmapusers ("force_2-1"); - if ($@mapcount60 == 0) { + if ($@mapcount60 == 0) { donpcevent "Minilover#arena::Onfailclearstage"; } mapannounce "force_2-1","Remaining Time : 5 minutes ",0; @@ -80,7 +80,7 @@ OnTimer60000: OnTimer120000: set $@mapcount60, getmapusers ("force_2-1"); - if ($@mapcount60 == 0) { + if ($@mapcount60 == 0) { donpcevent "Minilover#arena::Onfailclearstage"; } mapannounce "force_2-1","Remaining Time : 4 minutes ",0; @@ -88,7 +88,7 @@ OnTimer120000: OnTimer180000: set $@mapcount60, getmapusers ("force_2-1"); - if ($@mapcount60 == 0) { + if ($@mapcount60 == 0) { donpcevent "Minilover#arena::Onfailclearstage"; } mapannounce "force_2-1","Remaining Time : 3 minutes ",0; @@ -96,7 +96,7 @@ OnTimer180000: OnTimer240000: set $@mapcount60, getmapusers ("force_2-1"); - if ($@mapcount60 == 0) { + if ($@mapcount60 == 0) { donpcevent "Minilover#arena::Onfailclearstage"; } mapannounce "force_2-1","Remaining Time : 2 minutes ",0; @@ -104,7 +104,7 @@ OnTimer240000: OnTimer300000: set $@mapcount60, getmapusers ("force_2-1"); - if ($@mapcount60 == 0) { + if ($@mapcount60 == 0) { donpcevent "Minilover#arena::Onfailclearstage"; } mapannounce "force_2-1","Remaining Time : 1 minute ",0; @@ -450,7 +450,7 @@ Onon: OnMobDeath: set $force_01_60,$force_01_60 -1; - if ($force_01_60 < 1) { + if ($force_01_60 < 1) { donpcevent "Minilover#arena::On01_end"; donpcevent "arena#60::Onreset_01"; } @@ -553,7 +553,7 @@ Onreset: OnMobDeath: set $force_03_60,$force_03_60 -1; - if ($force_03_60 < 1) { + if ($force_03_60 < 1) { donpcevent "Minilover#arena::On03_end"; donpcevent "arena#60::Onreset_03"; } @@ -602,7 +602,7 @@ Onon: OnMobDeath: set $force_04_60,$force_04_60 -1; - if ($force_04_60 < 1) { + if ($force_04_60 < 1) { donpcevent "force_04ex#60::Onreset"; donpcevent "Minilover#arena::On04_end"; donpcevent "arena#60::Onreset_04"; @@ -660,7 +660,7 @@ Onon: OnMobDeath: set $force_05_60,$force_05_60 -1; - if ($force_05_60 < 1) { + if ($force_05_60 < 1) { donpcevent "Minilover#arena::On05_end"; donpcevent "arena#60::Onreset_05"; } @@ -741,7 +741,7 @@ Onon: OnMobDeath: set $force_06_60,$force_06_60 -1; - if ($force_06_60 < 1) { + if ($force_06_60 < 1) { set door, 1; donpcevent "Minilover#arena::On06_end"; donpcevent "arena#60::Onreset_06"; @@ -773,7 +773,7 @@ Onon: OnMobDeath: set $force_07_50,$force_07_50 -1; - if ($force_07_50 < 1) { + if ($force_07_50 < 1) { donpcevent "Minilover#arena::On07_end"; donpcevent "arena#60::Onreset_07"; } @@ -854,7 +854,7 @@ Onreset: OnMobDeath: set $force_09_60,$force_09_60 -1; - if ($force_09_60 < 1) { + if ($force_09_60 < 1) { donpcevent "Minilover#arena::On09_end"; donpcevent "arena#60::Onreset_09"; donpcevent "arena#60::Onreset_all"; @@ -870,7 +870,7 @@ prt_are_in,129,135,3 script Staff#60-1 67,{ 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) { + if (arena_point == 30000) { mes "[Staff]"; mes "Uh huh!"; mes "You already have enough arena points."; @@ -934,7 +934,7 @@ prt_are_in,25,135,3 script Staff#60-2 67,{ mes "[Staff]"; mes "Although you failed to make a new record, I hope you will succeed next time."; next; - if (arena_point > 29980) { + 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."; @@ -981,7 +981,7 @@ prt_are_in,25,135,3 script Staff#60-2 67,{ set $arena_60topn$,strcharinfo(0); donpcevent "Vendigos::Onlinerec_60"; next; - if (arena_point > 29950) { + 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."; @@ -1017,7 +1017,7 @@ prt_are_in,25,135,3 script Staff#60-2 67,{ donpcevent "alloff#60::Onon"; donpcevent "lvl 60s Waiting Room::Onstart"; end; - } + } } @@ -1115,7 +1115,7 @@ Onon: enablenpc "arena#60"; end; -OnInit: +OnInit: if(!$top_60min && !$top_60sec) set $top_60min,6; end; diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt index 43e6e4fe0..87c89ce4a 100644 --- a/npc/other/arena/arena_lvl70.txt +++ b/npc/other/arena/arena_lvl70.txt @@ -59,7 +59,7 @@ OnTimer7000: OnTimer60000: set $@mapcount70, getmapusers ("force_3-1"); - if ($@mapcount70 == 0) { + if ($@mapcount70 == 0) { donpcevent "Cadillac#arena::Onfailclearstage"; } mapannounce "force_3-1","Remaining Time : 6 minutes ",0; @@ -67,7 +67,7 @@ OnTimer60000: OnTimer120000: set $@mapcount70, getmapusers ("force_3-1"); - if ($@mapcount70 == 0) { + if ($@mapcount70 == 0) { donpcevent "Cadillac#arena::Onfailclearstage"; } mapannounce "force_3-1","Remaining Time : 5 minutes ",0; @@ -75,14 +75,14 @@ OnTimer120000: OnTimer180000: set $@mapcount70, getmapusers ("force_3-1"); - if ($@mapcount70 == 0) { + if ($@mapcount70 == 0) { donpcevent "Cadillac#arena::Onfailclearstage"; } mapannounce "force_3-1","Remaining Time : 4 minutes ",0; end; OnTimer240000: set $@mapcount70, getmapusers ("force_3-1"); - if ($@mapcount70 == 0) { + if ($@mapcount70 == 0) { donpcevent "Cadillac#arena::Onfailclearstage"; } mapannounce "force_3-1","Remaining Time : 3 minutes ",0; @@ -90,7 +90,7 @@ OnTimer240000: OnTimer300000: set $@mapcount70, getmapusers ("force_3-1"); - if ($@mapcount70 == 0) { + if ($@mapcount70 == 0) { donpcevent "Cadillac#arena::Onfailclearstage"; } mapannounce "force_3-1","Remaining Time : 2 minutes ",0; @@ -98,7 +98,7 @@ OnTimer300000: OnTimer360000: set $@mapcount70, getmapusers ("force_3-1"); - if ($@mapcount70 == 0) { + if ($@mapcount70 == 0) { donpcevent "Cadillac#arena::Onfailclearstage"; } mapannounce "force_3-1","Remaining Time : 1 minute ",0; @@ -435,7 +435,7 @@ Onreset: OnMobDeath: set $force_01_70,$force_01_70 -1; - if ($force_01_70 < 1) { + if ($force_01_70 < 1) { donpcevent "Cadillac#arena::On01_end"; donpcevent "arena#70::Onreset_01"; } @@ -489,7 +489,7 @@ Onon: OnMobDeath: set $force_02_70,$force_02_70 -1; - if ($force_02_70 < 1) { + if ($force_02_70 < 1) { donpcevent "Cadillac#arena::On02_end"; donpcevent "arena#70::Onreset_02"; } @@ -535,7 +535,7 @@ Onreset: OnMobDeath: set $force_03_70,$force_03_70 -1; donpcevent "force_03ex#70::Onsummonmob_03"; - if ($force_03_70 < 1) { + if ($force_03_70 < 1) { donpcevent "Cadillac#arena::On03_end"; donpcevent "arena#70::Onreset_03"; } @@ -585,7 +585,7 @@ Onreset: OnMobDeath: set $force_04_70,$force_04_70 -1; - if ($force_04_70 < 1) { + if ($force_04_70 < 1) { donpcevent "Cadillac#arena::On04_end"; donpcevent "arena#70::Onreset_04"; } @@ -638,7 +638,7 @@ Onreset: OnMobDeath: set $force_05_70,$force_05_70 -1; - if ($force_05_70 < 1) { + if ($force_05_70 < 1) { donpcevent "Cadillac#arena::On05_end"; donpcevent "arena#70::Onreset_05"; } @@ -695,7 +695,7 @@ Onreset: OnMobDeath: set $force_06_70,$force_06_70 -1; - if ($force_06_70 < 1) { + if ($force_06_70 < 1) { donpcevent "Cadillac#arena::On06_end"; donpcevent "arena#70::Onreset_06"; } @@ -749,7 +749,7 @@ Onreset: OnMobDeath: set $force_07_70,$force_07_70 -1; - if ($force_07_70 < 1) { + if ($force_07_70 < 1) { donpcevent "Cadillac#arena::On07_end"; donpcevent "arena#70::Onreset_07"; } @@ -821,7 +821,7 @@ Onreset: OnMobDeath: set $force_09_70,$force_09_70 -1; - if ($force_09_70 < 1) { + if ($force_09_70 < 1) { donpcevent "Cadillac#arena::On09_end"; donpcevent "arena#70::Onreset_09"; donpcevent "arena#70::Onreset_all"; @@ -837,7 +837,7 @@ prt_are_in,129,83,3 script Staff#70-1 67,{ 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) { + if (arena_point == 30000) { mes "[Staff]"; mes "Uh huh!"; mes "You already have enough arena points."; @@ -901,7 +901,7 @@ prt_are_in,25,84,3 script Staff#70-2 67,{ mes "[Staff]"; mes "Although you failed to make a new record, I hope you will succeed next time."; next; - if (arena_point > 29980) { + 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."; @@ -948,7 +948,7 @@ prt_are_in,25,84,3 script Staff#70-2 67,{ set $arena_70topn$,strcharinfo(0); donpcevent "Vendigos::Onlinerec_70"; next; - if (arena_point > 29970) { + 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."; @@ -984,7 +984,7 @@ prt_are_in,25,84,3 script Staff#70-2 67,{ donpcevent "alloff#70::Onon"; donpcevent "lvl 70s Waiting Room::Onstart"; end; - } + } } prt_are_in,14,195,3 script #arn_timer_70 139,{ @@ -1080,7 +1080,7 @@ Onon: enablenpc "arena#70"; end; -OnInit: +OnInit: if(!$top_70min && !$top_70sec) set $top_70min,7; end; diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt index c0db333e7..f91dc9eb9 100644 --- a/npc/other/arena/arena_lvl80.txt +++ b/npc/other/arena/arena_lvl80.txt @@ -59,7 +59,7 @@ OnTimer8000: OnTimer60000: set $@mapcount80, getmapusers ("force_4-1"); - if ($@mapcount80 == 0) { + if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } mapannounce "force_4-1","Remaining Time : 7 minutes ",0; @@ -67,7 +67,7 @@ OnTimer60000: OnTimer120000: set $@mapcount80, getmapusers ("force_4-1"); - if ($@mapcount80 == 0) { + if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } mapannounce "force_4-1","Remaining Time : 6 minutes ",0; @@ -75,14 +75,14 @@ OnTimer120000: OnTimer180000: set $@mapcount80, getmapusers ("force_4-1"); - if ($@mapcount80 == 0) { + if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } mapannounce "force_4-1","Remaining Time : 5 minutes ",0; end; OnTimer240000: set $@mapcount80, getmapusers ("force_4-1"); - if ($@mapcount80 == 0) { + if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } mapannounce "force_4-1","Remaining Time : 4 minutes ",0; @@ -90,7 +90,7 @@ OnTimer240000: OnTimer300000: set $@mapcount80, getmapusers ("force_4-1"); - if ($@mapcount80 == 0) { + if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } mapannounce "force_4-1","Remaining Time : 3 minutes ",0; @@ -98,7 +98,7 @@ OnTimer300000: OnTimer360000: set $@mapcount80, getmapusers ("force_4-1"); - if ($@mapcount80 == 0) { + if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } mapannounce "force_4-1","Remaining Time : 2 minutes ",0; @@ -106,7 +106,7 @@ OnTimer360000: OnTimer420000: set $@mapcount80, getmapusers ("force_4-1"); - if ($@mapcount80 == 0) { + if ($@mapcount80 == 0) { donpcevent "Octus#arena::Onfailclearstage"; } mapannounce "force_4-1","Remaining Time : 1 minute ",0; @@ -459,7 +459,7 @@ Onreset: OnMobDeath: set $force_01_80,$force_01_80 -1; - if ($force_01_80 < 1) { + if ($force_01_80 < 1) { donpcevent "Octus#arena::On01_end"; donpcevent "arena#80::Onreset_01"; } @@ -500,7 +500,7 @@ Onon: OnMobDeath: set $force_02_80,$force_02_80 -1; - if ($force_02_80 < 1) { + if ($force_02_80 < 1) { donpcevent "Octus#arena::On02_end"; donpcevent "arena#80::Onreset_02"; } @@ -551,7 +551,7 @@ Onreset: OnMobDeath: set $force_03_80,$force_03_80 -1; donpcevent "force_03ex#80::Onsummonmob_03"; - if ($force_03_80 < 1) { + if ($force_03_80 < 1) { donpcevent "Octus#arena::On03_end"; donpcevent "arena#80::Onreset_03"; } @@ -605,7 +605,7 @@ Onreset: OnMobDeath: set $force_04_80,$force_04_80 -1; - if ($force_04_80 < 1) { + if ($force_04_80 < 1) { donpcevent "Octus#arena::On04_end"; donpcevent "arena#80::Onreset_04"; } @@ -652,7 +652,7 @@ Onreset: OnMobDeath: set $force_05_80,$force_05_80 -1; - if ($force_05_80 < 1) { + if ($force_05_80 < 1) { donpcevent "Octus#arena::On05_end"; donpcevent "arena#80::Onreset_05"; } @@ -688,7 +688,7 @@ Onreset: OnMobDeath: set $force_06_80,$force_06_80 -1; - if ($force_06_80 < 1) { + if ($force_06_80 < 1) { donpcevent "Octus#arena::On06_end"; donpcevent "arena#80::Onreset_06"; } @@ -734,7 +734,7 @@ Onreset: OnMobDeath: set $force_07_80,$force_07_80 -1; - if ($force_07_80 < 1) { + if ($force_07_80 < 1) { donpcevent "Octus#arena::On07_end"; donpcevent "arena#80::Onreset_07"; } @@ -794,7 +794,7 @@ Onreset: OnMobDeath: set $force_09_80,$force_09_80 -1; - if ($force_09_80 < 1) { + if ($force_09_80 < 1) { donpcevent "Octus#arena::On09_end"; donpcevent "arena#80::Onreset_09"; donpcevent "arena#80::Onreset_all"; @@ -810,7 +810,7 @@ prt_are_in,181,188,3 script Staff#80-1 67,{ 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) { + if (arena_point == 30000) { mes "[Staff]"; mes "Uh huh!"; mes "You already have enough arena points."; @@ -874,7 +874,7 @@ prt_are_in,77,187,3 script Staff#80-2 67,{ mes "[Staff]"; mes "Although you failed to make a new record, I hope you will succeed next time."; next; - if (arena_point > 29980) { + 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."; @@ -921,7 +921,7 @@ prt_are_in,77,187,3 script Staff#80-2 67,{ set $arena_80topn$,strcharinfo(0); donpcevent "Vendigos::Onlinerec_80"; next; - if (arena_point > 29980) { + 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."; @@ -957,7 +957,7 @@ prt_are_in,77,187,3 script Staff#80-2 67,{ donpcevent "alloff#80::Onon"; donpcevent "lvl 80s Waiting Room::Onstart"; end; - } + } } prt_are_in,14,195,3 script #arn_timer_80 139,{ @@ -1051,7 +1051,7 @@ Onon: enablenpc "arena#80"; end; -OnInit: +OnInit: if(!$top_80min && !$top_80sec) set $top_80min,8; end; diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index 03134b0cb..ec9d12f91 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -1140,7 +1140,7 @@ prt_are_in,181,135,3 script Staff#party-1 67,{ 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) { + if (arena_point == 30000) { mes "[Staff]"; mes "Uh huh!"; mes "You already have enough arena points."; @@ -1205,7 +1205,7 @@ prt_are_in,77,135,3 script Staff#party-2 67,{ mes "[Staff]"; mes "Although you failed to make a new record, I hope you will succeed next time."; next; - if (arena_point > 29980) { + 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."; @@ -1293,7 +1293,7 @@ prt_are_in,77,135,3 script Staff#party-2 67,{ } - if (arena_point > 29900) { + 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."; @@ -1331,7 +1331,7 @@ prt_are_in,77,135,3 script Staff#party-2 67,{ specialeffect2 EF_HIT5; warp "arena_room",100,75; end; - } + } } @@ -1455,7 +1455,7 @@ Onon: enablenpc "arena_p"; end; -OnInit: +OnInit: if(!$top_ptmin && !$top_ptsec) set $top_ptmin,10; end; diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt index fe95c7989..3bed8b7e6 100644 --- a/npc/other/bulletin_boards.txt +++ b/npc/other/bulletin_boards.txt @@ -78,7 +78,7 @@ gef_fild10,69,340,5 script Bulletin Board#3 837,{ mes "[Orc Dungeon]"; mes "If you don't have a Holy Weapon and you're teamed with a Priest, the Priest's Aspersio spell would be of tremendous help."; close; -} +} izlu2dun,104,92,5 script Bulletin Board#4 837,{ mes "[Byalan Island]"; diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt index 679244b9f..2d18e01d3 100644 --- a/npc/other/comodo_gambling.txt +++ b/npc/other/comodo_gambling.txt @@ -84,7 +84,7 @@ comodo,219,158,6 script Kachua 91,{ if (countitem(732) == 0) { // anti-hack logmes "Hack: Tried to bypass item check."; - cutin "katsua01.bmp",255; + cutin "katsua01.bmp",255; close; } delitem 732,1; diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt index fee3d3568..483ba7f52 100644 --- a/npc/other/hugel_bingo.txt +++ b/npc/other/hugel_bingo.txt @@ -110,7 +110,7 @@ L_Fill: mes "["+@bingo_e1$+"] ["+@bingo_e2$+"] ["+@bingo_e3$+"] ["+@bingo_e4$+"] ["+@bingo_e5$+"]"; close; - } + } goto L_Fill; } diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt index 113d69225..bd2ffabaf 100644 --- a/npc/other/mercenary_rent.txt +++ b/npc/other/mercenary_rent.txt @@ -325,7 +325,7 @@ izlude,47,139,5 script Mercenary Manager#Sword 734,{ set Zeny, Zeny - (.@ZenyCost * 1000); getitem 12162 + .@Grade, 1; } - close; + close; case 2: mes "[Mercenary Manager]"; mes "Mercenaries are soldiers"; @@ -436,7 +436,7 @@ izlude,47,139,5 script Mercenary Manager#Sword 734,{ mercenary_set_faith SWORD_MERC_GUILD,-400; getitem 12172,1; } - close; + close; } } diff --git a/npc/quests/Dandelion_Request.txt b/npc/quests/Dandelion_Request.txt index a1ded141d..cb2add4f9 100644 --- a/npc/quests/Dandelion_Request.txt +++ b/npc/quests/Dandelion_Request.txt @@ -2735,7 +2735,7 @@ OnTouch: donpcevent "Valdes#2::OnEnter"; donpcevent "Kidd#2::OnEnter"; donpcevent "#mao_table::OnEnter"; - } + } else if(mao_request == 123) { donpcevent "Valdes#2::OnEnter"; @@ -2862,7 +2862,7 @@ OnTouch: donpcevent "Valdes#3::OnEnter"; donpcevent "Kidd#3::OnEnter"; donpcevent "#Rabsent::OnEnter"; - } + } else if(mao_request == 122) { donpcevent "#mao_empty::OnEnter"; diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt index 5f577af9d..3248922f7 100644 --- a/npc/quests/Kiel_Hyre_Quest.txt +++ b/npc/quests/Kiel_Hyre_Quest.txt @@ -68,7 +68,7 @@ //= 3.3 Fixed the receiver log out bugs. [L0ne_W0lf] //= 3.4 Fixed bug when u can't get a Yellow Keycard if u got the Blue one at first [Lupus] //= Note: There are many condition checks that should be omitted in the future fixed item names in item_db.txt / txt resources according the quest -//= for items, should be used bitwise methods in a single variable. So let's fix the rest possible bugs (if they exist) and then optimize ^_- +//= for items, should be used bitwise methods in a single variable. So let's fix the rest possible bugs (if they exist) and then optimize ^_- //= 3.5 Changed the way the Black Keycard distibuting NPCs work slighty. [L0ne_W0lf] //= 3.6 Keil Hyre removes ALL outstanding quest items when he is talked [L0ne_W0lf] //= to after finishing the quest. @@ -1506,7 +1506,7 @@ kh_school,179,39,0 script Cute Student#kh 895,{ mes "homework before it's due!"; mes "Yeah, I've got to go see"; mes "Mrs. Lecollane now."; - next; + next; mes "[Elly]"; mes "Say, "+strcharinfo(0)+","; mes "if it's okay, would you"; @@ -7031,7 +7031,7 @@ kh_kiehl02,50,52,4 script Kiehl#Original 902,{ delitem 7504,1; //Toy_Motor set KielHyreQuest,104; hideonnpc "Kiehl#Copy"; - donpcevent "Kiehl_Room_Exit::OnEnable"; + donpcevent "Kiehl_Room_Exit::OnEnable"; enablenpc "Kiehl_Room_Exit"; initnpctimer; cutin "",255; diff --git a/npc/quests/Lvl4_weapon_quest.txt b/npc/quests/Lvl4_weapon_quest.txt index aba16eaa5..58945768a 100644 --- a/npc/quests/Lvl4_weapon_quest.txt +++ b/npc/quests/Lvl4_weapon_quest.txt @@ -1786,7 +1786,7 @@ niflheim,240,193,3 script Kayron#lv4 794,{ if (lv4_weapon == 29) { mes "this... Guillotine!"; getitem 1369,1; //Guillotine - } + } else { mes "this... Brionac!"; getitem 1470,1; //Brionac diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt index 7d32f96a1..dbb231881 100644 --- a/npc/quests/bunnyband.txt +++ b/npc/quests/bunnyband.txt @@ -55,7 +55,7 @@ alberta,26,229,0 script Kafra Employee#bunny 83,{ mes "bring at least"; mes "1 Pearl."; close; - } + } if (countitem(2213) == 0) { mes "Ooh, I'm sorry"; mes "but you need to"; diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index a28fb9c13..98554b615 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/npc/quests/first_class/tu_archer.txt @@ -1290,7 +1290,7 @@ pay_arche,84,139,3 script Seisner 727,{ set tu_archer01, 3; if(JobLevel == 1){ getexp 0,5; - } else if((JobLevel > 1) && (JobLevel < 11)){ + } else if((JobLevel > 1) && (JobLevel < 11)){ getexp 0,10; } else if((JobLevel > 10) && (JobLevel < 21)){ getexp 0,25; @@ -1485,7 +1485,7 @@ pay_fild08,40,83,5 script Acolyte#tu 95,{ set .@kurae_agi, rand(1,2); if(.@kurae_agi == 1){ unitskilluseid getcharid(3),29,10; - } else if(.@kurae_agi == 2){ + } else if(.@kurae_agi == 2){ unitskilluseid getcharid(3),29,5; } diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt index 2941ea030..44470c483 100644 --- a/npc/quests/first_class/tu_merchant.txt +++ b/npc/quests/first_class/tu_merchant.txt @@ -818,7 +818,7 @@ prontera,66,111,3 script Sagle 82,{ mes "Zeny, alright?"; close; } - if(MaxWeight - Weight < 71){ + if(MaxWeight - Weight < 71){ next; mes "[Sagle]"; mes "Whoa, hold on!"; @@ -1041,7 +1041,7 @@ prt_in,169,11,3 script Aigie 92,{ mes "^666666*Sniff Sniff*^000000"; close; break; - } + } } if(tu_merchant == 7){ mes "[Aigie]"; @@ -1088,7 +1088,7 @@ prt_in,169,11,3 script Aigie 92,{ mes "^666666*Sniff Sniff*^000000"; close; break; - } + } } if(tu_merchant == 6){ mes "[Aigie]"; diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt index d7ada691a..2219810b4 100644 --- a/npc/quests/first_class/tu_sword.txt +++ b/npc/quests/first_class/tu_sword.txt @@ -2002,7 +2002,7 @@ geffen,154,143,3 script Dequ'ee 734,{ mes "out who he is."; close; } - if(tu_swordman == 6){ + if(tu_swordman == 6){ mes "[Dequ'ee]"; mes "Ah...!"; mes "Are you the Swordman"; @@ -2293,7 +2293,7 @@ morocc_in,51,101,3 script Geil 89,{ close; } -//=================================================Meutro==================================================== +//=================================================Meutro==================================================== morocc,82,292,5 script Muetro 84,{ mes "[Muetro]"; if(tu_swordman == 15){ diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt index ecbda0eb7..84407e5d4 100644 --- a/npc/quests/gunslinger_quests.txt +++ b/npc/quests/gunslinger_quests.txt @@ -737,7 +737,7 @@ que_ng,185,180,3 script Vanessa 726,{ next; switch( select( "Maybe next time.","Okay.") ) { - case 1: + case 1: mes "[Vanessa]"; mes "Mm~ Is that so~"; mes "It will be an opportunity for you."; @@ -746,7 +746,7 @@ que_ng,185,180,3 script Vanessa 726,{ mes "Bye~Bye~"; close; - case 2: + case 2: mes "[Vanessa]"; mes "Mm, Okay."; mes "To make a Destroyer,"; diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt index ff4fee6a7..d638d777c 100644 --- a/npc/quests/newgears/2005_headgears.txt +++ b/npc/quests/newgears/2005_headgears.txt @@ -89,7 +89,7 @@ yuno,222,116,3 script Kasis#LhzHat 851,{ next; switch( select( "You can have these if you want.", "Um, why are you staring?" ) ) { - case 1: + case 1: mes "[Kasis]"; mes "Really? Is it alright"; mes "with you for me to have"; @@ -655,7 +655,7 @@ lighthalzen,143,68,0 script Strange Guy#LhzHat 47,{ mes "^0000FF1 Slotted Bucket Hat^000000"; mes "and ^0000FF1,887 zeny^000000. Okay?"; close; - case 2: + case 2: mes "[Morris]"; mes "Great!"; mes "Now let me just"; @@ -1676,7 +1676,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{ else if(ZLMASKQ == 2 || ZLMASKQ == 3) { if(countitem(7315) > 368 && ZLMASKQ == 3) - { + { mes "[Phendark]"; mes "Y-you again!"; mes "Why do you hound me?!"; diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt index 9a1342042..d4e119fac 100644 --- a/npc/quests/ninja_quests.txt +++ b/npc/quests/ninja_quests.txt @@ -257,7 +257,7 @@ que_ng,28,50,3 script Boshuu 709,{ } } } - else{ + else{ set ninbo,0; mes "[Boshuu]"; mes "Oh~ You~!"; @@ -356,7 +356,7 @@ que_ng,28,50,3 script Boshuu 709,{ set Zeny,Zeny-10000; set MISC_QUEST,MISC_QUEST | 2048; getitem 2118,1; - close; + close; } } } diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt index 56d85b9dd..1fc23457b 100644 --- a/npc/quests/quests_comodo.txt +++ b/npc/quests/quests_comodo.txt @@ -1099,7 +1099,7 @@ cmd_in02,32,140,4 script Chief#cmd 49,{ mes "the tourist attraction~"; close; } - } + } } comodo,88,97,4 script Toruna#cmd 109,{ diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt index 798b13bb9..a59857187 100644 --- a/npc/quests/quests_ein.txt +++ b/npc/quests/quests_ein.txt @@ -149,7 +149,7 @@ einbech,97,167,5 script Cavitar 847,{ mes "Come back"; mes "whenever you're ready."; close; - } + } } else { if (BaseLevel < 40){ @@ -423,7 +423,7 @@ einbech,97,167,5 script Cavitar 847,{ mes "But please understand"; mes "that I'm desperate..."; close; - } + } case 2: mes "[Cavitar]"; mes "You're..."; @@ -6022,7 +6022,7 @@ ein_in01,31,138,3 script Calla#ein 90,{ mes "Would you please tell"; mes "me your name again?"; close; - } + } } if (EIN_LOVERQ == 4) { mes "[Calla]"; diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt index 398558399..ec7142c70 100644 --- a/npc/quests/quests_gonryun.txt +++ b/npc/quests/quests_gonryun.txt @@ -3700,7 +3700,7 @@ OnTouch: end; } end; -} +} // Lost Knife //============================================================ diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index e7b8b4f8c..ff0d7f5b4 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -3063,7 +3063,7 @@ hu_in01,256,40,3 script Herico 897,{ end; } else - { + { if(countitem(7342)) { mes "[Herico]"; @@ -3073,7 +3073,7 @@ hu_in01,256,40,3 script Herico 897,{ close2; cutin "",255; end; - } + } else { mes "[Herico]"; @@ -7205,7 +7205,7 @@ OnTouch: mes "game coordinators tend"; mes "to be pretty busy..."; close; - } + } } que_bingo,53,190,7 script Eukran 778,{ @@ -7325,7 +7325,7 @@ OnInit: disablenpc "Young Man#Hu_Quest"; end; -} +} odin_tem01,130,134,4 script Young Man#Hu_Quest 774,{ @@ -9989,7 +9989,7 @@ hu_in01,16,20,4 script Ashe 95,{ mes "Oh, dear, you don't"; mes "look very well. Did"; mes "something happen?"; - close; + close; case 16: mes "[Ashe]"; diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index 2edaee134..9a4675eef 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -285,10 +285,10 @@ yuno_in04,190,125,4 script Scholar 700,{ mes "My life is also fairly"; mes "uneventful, but somehow,"; mes "I'm don't think I'm content."; - close; + close; } - case 4: + case 4: mes "[Fayruz]"; mes "Oh hello, "+strcharinfo(0)+"."; mes "So what brings you to"; @@ -398,7 +398,7 @@ yuno_in04,190,125,4 script Scholar 700,{ next; switch( select( "Take a look at this.","Oh, I'm sorry...") ) { - case 1: + case 1: switch(jupe_hist) { case 1: @@ -1069,7 +1069,7 @@ yuno_in04,186,125,4 script Bundle of Files 111,{ mes "regarding the history"; mes "of Juperos have allowed"; mes "us to make a few conclusions.^000000"; - close; + close; case 2: if(yuno_hist < 9) @@ -1130,7 +1130,7 @@ yuno_in04,186,125,4 script Bundle of Files 111,{ mes "^8B6914..."; mes "......"; mes "..........^000000"; - next; + next; mes "["+strcharinfo(0)+"]"; mes "Huh. This writer keeps"; mes "talking about theories,"; @@ -1254,7 +1254,7 @@ yuno_in04,186,125,4 script Bundle of Files 111,{ } case 2: if(yuno_hist < 5) - { + { mes "["+strcharinfo(0)+"]"; mes "Nah..."; mes "I'm tired of reading."; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 05ad3b40b..24182d46f 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -547,9 +547,9 @@ lighthalzen,341,224,3 script Fishbone 868,{ mes "Lab. However, I do know of"; mes "this secret maze that should"; mes "get you there. Still, if you're"; - mes "willing and ready to go..."; + mes "willing and ready to go..."; } - else { + else { mes "Okay..."; mes "Are you ready now?"; mes "I'm gonna send you"; @@ -8622,7 +8622,7 @@ L_Mission: close2; cutin "",255; end; - } + } } yuno_pre,77,68,0 script Secretary#2 862,{ @@ -11122,7 +11122,7 @@ airplane_01,96,48,3 script Man#Lyozien 868,{ mes "Do you need to take a"; mes "break or something?"; close; - } + } else if(lhz_rekenber == 20) { mes "[Lyozien]"; @@ -11166,7 +11166,7 @@ airplane_01,96,48,3 script Man#Lyozien 868,{ mes "Then, we'll be done once you"; mes "contact Mr. Ahman in Izlude."; close; - } + } else if(lhz_rekenber == 18) { mes "[Lyozien]"; @@ -11370,7 +11370,7 @@ airplane_01,96,48,3 script Man#Lyozien 868,{ mes "I'll be waiting right here."; set lhz_rekenber,11; close; - } + } else if(lhz_rekenber == 9) { mes "[Lyozien]"; @@ -11381,7 +11381,7 @@ airplane_01,96,48,3 script Man#Lyozien 868,{ mes "Let him know his order has"; mes "already arrived, okay?"; close; - } + } else if(lhz_rekenber == 8) { mes "[Lyozien]"; diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index 1d0824732..53b1443ad 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -4805,7 +4805,7 @@ lou_in02,77,37,7 script Hermit 824,{ mes "[Sun Mao]"; switch(QL_REVOL) { - case 1: + case 1: mes "Please make sure that there is a total of two members in your party so that we can recruit your friend. I believe that will look natural."; close; diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index d19f10405..e3b442ffa 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -549,7 +549,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 964,{ warp "mosk_ship",94,110; end; } - else if (gettime(3) >= 18 && gettime(3) < 21) { + else if (gettime(3) >= 18 && gettime(3) < 21) { mes "[Mr. Ibanoff]"; mes "Hmm. It's not a bad time."; mes "We should hurry up"; @@ -632,7 +632,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 964,{ warp "mosk_ship",94,110; end; } - else if (gettime(3) >= 18 && gettime(3) < 21) { + else if (gettime(3) >= 18 && gettime(3) < 21) { mes "[Mr. Ibanoff]"; mes "Hmm. It's not a bad time."; mes "We should hurry up"; @@ -819,7 +819,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 964,{ warp "mosk_ship",94,110; end; } - else if (gettime(3) >= 18 && gettime(3) < 21) { + else if (gettime(3) >= 18 && gettime(3) < 21) { mes "[Mr. Ibanoff]"; mes "Hmm. It's not a bad time."; mes "We should hurry up"; @@ -898,7 +898,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 964,{ warp "mosk_ship",94,110; end; } - else if (gettime(3) >= 18 && gettime(3) < 21) { + else if (gettime(3) >= 18 && gettime(3) < 21) { mes "[Mr. Ibanoff]"; mes "Hmm. It's not a bad time."; mes "We should hurry up"; diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index 4aaac46e7..59d23c234 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -66,7 +66,7 @@ airplane_01,95,61,3 script QuestTrigger#Aru -1,3,3,{ end; -OnTouch: +OnTouch: if ((prt_curse == 36 || prt_curse == 45 || prt_curse == 56 || prt_curse == 61) && (aru_monas < 1)) { hideoffnpc "Agent#Aru"; mes "[????]"; @@ -474,7 +474,7 @@ ve_in,78,314,5 script Magistrate#Aru 945,{ mes "peace, and letting anyone"; mes "in here will cause trouble."; close; - } + } else if (aru_monas == 10) { mes "[Al Hamad]"; mes "I thought I told you"; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index 5302c9008..1a86aa3df 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -402,7 +402,7 @@ ra_in01,384,246,3 script Vincent#ra_in01 47,{ mes "Jenny about Phobe?"; mes "Sure, sure, I'll do that."; close; - } + } else if (lost_boy == 11) { mes "["+strcharinfo(0)+"]"; diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt index cb48eac42..e7b632cc2 100644 --- a/npc/quests/quests_umbala.txt +++ b/npc/quests/quests_umbala.txt @@ -375,9 +375,9 @@ um_in,44,71,2 script Utan Shaman 782,{ mes "using the Kafra Service"; mes "to store some of your items.^000000"; close; - } + } switch(event_umbala) { - default: + default: mes "[??????????]"; mes "Umbah umbah umbabah Utan umbah"; mes "Umbah mookala umbabah.."; @@ -387,7 +387,7 @@ um_in,44,71,2 script Utan Shaman 782,{ close2; warp "umbala",217,186; end; - case 3: + case 3: mes "[Puchuchartan]"; mes "I did not expect that even"; mes "more of you Rune-Midgardians"; diff --git a/npc/quests/quiz/quiz_qt.txt b/npc/quests/quiz/quiz_qt.txt index bf05fa87e..262905f40 100644 --- a/npc/quests/quiz/quiz_qt.txt +++ b/npc/quests/quiz/quiz_qt.txt @@ -966,7 +966,7 @@ if (checkweight(1201,3) == 0 ) goto L_OverWeight; next; mes "[Seeil]"; mes "So this is the last one. Show me some spirit!"; - mes "This is a present to encourage you! Take it!"; + mes "This is a present to encourage you! Take it!"; set quiz_rvl,14; getitem 503,10; //Yellow_Potion close; @@ -1631,7 +1631,7 @@ if(quiz_rvl == 18) { close; } M_MaxItem: - mes "^800000[Radeng]^000000"; + mes "^800000[Radeng]^000000"; mes "- Wait a minute !! -"; mes "- You currently have too many items that -"; mes "- you can't receive an item. -"; @@ -1872,7 +1872,7 @@ if(quiz_rvl == 20) { close; } M_MaxItem: - mes "[Kantryl]"; + mes "[Kantryl]"; mes "- Wait a minute !! -"; mes "- You currently have too many items that -"; mes "- you can't receive an item. -"; diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index 28e0b04d8..a4e87a815 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -900,7 +900,7 @@ yuno_in04,47,113,1 script Studying Scholar#1 749,{ if ($God3 == 50) { announce "The 3rd Seal of [Brisingamen] has appeared.",bc_all; } - else if ($God3 == 100) { + else if ($God3 == 100) { if ($God1 == 100 && $God2 == 100 && $God3 == 100 && $God4 == 100) { announce "Four seals have been released at the same time with the seal of [Brisingamen].",bc_all; } diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt index 65659b6d5..5608acc18 100644 --- a/npc/quests/skills/crusader_skills.txt +++ b/npc/quests/skills/crusader_skills.txt @@ -52,7 +52,7 @@ geffen,110,117,3 script Ford#11 752,{ if (Upper == 1) mes "were dressed like a Paladin..."; else - mes "were dressed like a Crusader..."; + mes "were dressed like a Crusader..."; next; mes "["+ strcharinfo(0) +"]"; mes "I'm sorry..."; diff --git a/src/char/char.c b/src/char/char.c index 69c6a1e23..9f5be7d59 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -273,7 +273,7 @@ void set_char_online(int map_id, int char_id, int account_id) //Notify login server if (login_fd > 0 && !session[login_fd]->flag.eof) - { + { WFIFOHEAD(login_fd,6); WFIFOW(login_fd,0) = 0x272b; WFIFOL(login_fd,2) = account_id; @@ -4169,7 +4169,7 @@ int char_lan_config_read(const char *lancfgName) while(fgets(line, sizeof(line), fp)) { - line_num++; + line_num++; if ((line[0] == '/' && line[1] == '/') || line[0] == '\n' || line[1] == '\n') continue; diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 2ce6d6141..df91e4de4 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -863,7 +863,7 @@ int guild_calcinfo(struct guild *g) // Set the max number of members, Guild Extention skill - currently adds 6 to max per skill lv. g->max_member = 16 + guild_checkskill(g, GD_EXTENSION) * 6; if(g->max_member > MAX_GUILD) - { + { ShowError("Guild %d:%s has capacity for too many guild members (%d), max supported is %d\n", g->guild_id, g->name, g->max_member, MAX_GUILD); g->max_member = MAX_GUILD; } @@ -1672,7 +1672,7 @@ int inter_guild_charname_changed(int guild_id,int account_id, int char_id, char flag |= GS_MEMBER; if( !inter_guild_tosql(g, flag) ) - return 0; + return 0; mapif_guild_info(-1,g); diff --git a/src/common/showmsg.c b/src/common/showmsg.c index 102557df7..7a6f632e7 100644 --- a/src/common/showmsg.c +++ b/src/common/showmsg.c @@ -197,7 +197,7 @@ Escape sequences for Select Character Set int VFPRINTF(HANDLE handle, const char *fmt, va_list argptr) { ///////////////////////////////////////////////////////////////// - /* XXX Two streams are being used. Disabled to avoid inconsistency [flaviojs] + /* XXX Two streams are being used. Disabled to avoid inconsistency [flaviojs] static COORD saveposition = {0,0}; */ @@ -369,7 +369,7 @@ int VFPRINTF(HANDLE handle, const char *fmt, va_list argptr) { // number of chars from cursor to end origin = info.dwCursorPosition; cnt = info.dwSize.X * (info.dwSize.Y - info.dwCursorPosition.Y) - info.dwCursorPosition.X; - } + } FillConsoleOutputAttribute(handle, info.wAttributes, cnt, origin, &tmp); FillConsoleOutputCharacter(handle, ' ', cnt, origin, &tmp); } @@ -384,11 +384,11 @@ int VFPRINTF(HANDLE handle, const char *fmt, va_list argptr) SHORT cnt; DWORD tmp; if(num==1) - { + { cnt = info.dwCursorPosition.X + 1; } else if(num==2) - { + { cnt = info.dwSize.X; } else// 0 and default @@ -512,7 +512,7 @@ int VFPRINTF(HANDLE handle, const char *fmt, va_list argptr) } int FPRINTF(HANDLE handle, const char *fmt, ...) -{ +{ int ret; va_list argptr; va_start(argptr, fmt); @@ -569,7 +569,7 @@ int VFPRINTF(FILE *file, const char *fmt, va_list argptr) while(1) { if( ISDIGIT(*q) ) - { + { ++q; // and next character continue; @@ -648,7 +648,7 @@ int VFPRINTF(FILE *file, const char *fmt, va_list argptr) return 0; } int FPRINTF(FILE *file, const char *fmt, ...) -{ +{ int ret; va_list argptr; va_start(argptr, fmt); diff --git a/src/common/utils.c b/src/common/utils.c index 1602afa52..8b9e33fa0 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -106,7 +106,7 @@ static char* checkpath(char *path, const char *srcpath) } void findfile(const char *p, const char *pat, void (func)(const char*)) -{ +{ WIN32_FIND_DATAA FindFileData; HANDLE hFind; char tmppath[MAX_PATH+1]; @@ -167,7 +167,7 @@ static char* checkpath(char *path, const char*srcpath) } void findfile(const char *p, const char *pat, void (func)(const char*)) -{ +{ DIR* dir; // pointer to the scanned directory. struct dirent* entry; // pointer to one directory entry. struct stat dir_stat; // used by stat(). diff --git a/src/login/account_sql.c b/src/login/account_sql.c index be1b36ebe..bc607c59e 100644 --- a/src/login/account_sql.c +++ b/src/login/account_sql.c @@ -159,7 +159,7 @@ static bool account_db_sql_init(AccountDB* self) Sql_ShowDebug(sql_handle); return true; -} +} /// disconnects from database static void account_db_sql_destroy(AccountDB* self) diff --git a/src/login/login.c b/src/login/login.c index e2c16eaed..78a9b9420 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -265,7 +265,7 @@ bool check_encrypted(const char* str1, const char* str2, const char* passwd) } bool check_password(const char* md5key, int passwdenc, const char* passwd, const char* refpass) -{ +{ if(passwdenc == 0) { return (0==strcmp(passwd, refpass)); diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 3d60e06d0..c723d6d73 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -4524,7 +4524,7 @@ ACMD_FUNC(mapinfo) strcat(atcmd_output, "Leaves | "); /** * No longer available, keeping here just in case it's back someday. [Ind] - **/ + **/ //if (map[m_id].flag.rain) // strcat(atcmd_output, "Rain | "); if (map[m_id].flag.nightenabled) @@ -6319,7 +6319,7 @@ ACMD_FUNC(autolootitem) } /** * No longer available, keeping here just in case it's back someday. [Ind] - **/ + **/ /*========================================== * It is made to rain. *------------------------------------------*/ @@ -6477,7 +6477,7 @@ ACMD_FUNC(clearweather) nullpo_retr(-1, sd); /** * No longer available, keeping here just in case it's back someday. [Ind] - **/ + **/ //map[sd->bl.m].flag.rain=0; map[sd->bl.m].flag.snow=0; map[sd->bl.m].flag.sakura=0; @@ -9181,7 +9181,7 @@ bool is_atcommand(const int fd, struct map_session_data* sd, const char* message } while (*message == charcommand_symbol) - { + { //Checks to see if #command has a name or a name + parameters. x = sscanf(message, "%99s \"%23[^\"]\" %99[^\n]", command, charname, params); y = sscanf(message, "%99s %23s %99[^\n]", command, charname2, params2); @@ -9195,7 +9195,7 @@ bool is_atcommand(const int fd, struct map_session_data* sd, const char* message clif_displaymessage(fd, output); } else { sprintf(output, "Charcommand failed. Usage: #<command> <char name> <params>."); - clif_displaymessage(fd, output); + clif_displaymessage(fd, output); } return true; } diff --git a/src/map/battle.c b/src/map/battle.c index 419e40ebf..11e9fb81f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1069,7 +1069,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo unsigned idef : 1; //Ignore defense unsigned idef2 : 1; //Ignore defense (left weapon) unsigned pdef : 2; //Pierces defense (Investigate/Ice Pick) - unsigned pdef2 : 2; //1: Use def+def2/100, 2: Use def+def2/50 + unsigned pdef2 : 2; //1: Use def+def2/100, 2: Use def+def2/50 unsigned infdef : 1; //Infinite defense (plants) unsigned arrow : 1; //Attack is arrow-based unsigned rh : 1; //Attack considers right hand (wd.damage) @@ -1326,7 +1326,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo if(battle_config.agi_penalty_type && battle_config.agi_penalty_target&target->type) - { + { unsigned char attacker_count; //256 max targets should be a sane max attacker_count = unit_counttargeted(target,battle_config.agi_penalty_count_lv); if(attacker_count >= battle_config.agi_penalty_count) @@ -2224,7 +2224,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo if(skill_num == AM_ACIDTERROR) def1 = 0; //Acid Terror ignores only armor defense. [Skotlex] if(def2 < 1) def2 = 1; } - //Vitality reduction from rodatazone: http://rodatazone.simgaming.net/mechanics/substats.php#def + //Vitality reduction from rodatazone: http://rodatazone.simgaming.net/mechanics/substats.php#def if (tsd) //Sd vit-eq { //[VIT*0.5] + rnd([VIT*0.3], max([VIT*0.3],[VIT^2/150]-1)) vit_def = def2*(def2-15)/150; @@ -2402,7 +2402,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo { // Melee attack if( !battle_config.left_cardfix_to_right ) { - cardfix=cardfix*(100+sd->right_weapon.addrace[tstatus->race])/100; + cardfix=cardfix*(100+sd->right_weapon.addrace[tstatus->race])/100; if (!(nk&NK_NO_ELEFIX)) { int ele_fix = sd->right_weapon.addele[tstatus->def_ele]; for (i = 0; ARRAYLENGTH(sd->right_weapon.addele2) > i && sd->right_weapon.addele2[i].rate != 0; i++) { @@ -2423,9 +2423,9 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo if( flag.lh ) { - cardfix_=cardfix_*(100+sd->left_weapon.addrace[tstatus->race])/100; + cardfix_=cardfix_*(100+sd->left_weapon.addrace[tstatus->race])/100; if (!(nk&NK_NO_ELEFIX)) { - int ele_fix_lh = sd->left_weapon.addele[tstatus->def_ele]; + int ele_fix_lh = sd->left_weapon.addele[tstatus->def_ele]; for (i = 0; ARRAYLENGTH(sd->left_weapon.addele2) > i && sd->left_weapon.addele2[i].rate != 0; i++) { if (sd->left_weapon.addele2[i].ele != tstatus->def_ele) continue; if(!(sd->left_weapon.addele2[i].flag&wd.flag&BF_WEAPONMASK && @@ -3473,7 +3473,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * if(battle_config.agi_penalty_type && battle_config.agi_penalty_target&target->type) - { + { unsigned char attacker_count; //256 max targets should be a sane max attacker_count = unit_counttargeted(target,battle_config.agi_penalty_count_lv); if(attacker_count >= battle_config.agi_penalty_count) @@ -4121,7 +4121,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f case BL_HOM: break; //All else not specified is an invalid target. - default: + default: return 0; } diff --git a/src/map/battle.h b/src/map/battle.h index 2669af83d..de59f5717 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -123,7 +123,7 @@ extern struct Battle_Config int defnotenemy; int vs_traps_bctall; int traps_setting; - int summon_flora; //[Skotlex] + int summon_flora; //[Skotlex] int clear_unit_ondeath; //[Skotlex] int clear_unit_onwarp; //[Skotlex] int random_monster_checklv; diff --git a/src/map/chrif.c b/src/map/chrif.c index 03b4baeb0..10b7135b6 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -1202,7 +1202,7 @@ int chrif_save_scdata(struct map_session_data *sd) //Retrieve and load sc_data for a player. [Skotlex] int chrif_load_scdata(int fd) -{ +{ #ifdef ENABLE_SC_SAVING struct map_session_data *sd; struct status_change_data *data; diff --git a/src/map/chrif.h b/src/map/chrif.h index 1d85ab7a2..dda80cec9 100644 --- a/src/map/chrif.h +++ b/src/map/chrif.h @@ -15,7 +15,7 @@ struct auth_node { struct map_session_data *sd; //Data from logged on char. struct mmo_charstatus *char_dat; //Data from char server. unsigned int node_created; //timestamp for node timeouts - enum sd_state state; //To track whether player was login in/out or changing maps. + enum sd_state state; //To track whether player was login in/out or changing maps. }; void chrif_setuserid(char* id); diff --git a/src/map/clif.c b/src/map/clif.c index 17cc24fd7..9df67ad70 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8750,13 +8750,13 @@ static bool clif_process_message(struct map_session_data* sd, int format, char** if( messagelen != strnlen(message, messagelen)+1 ) { // the declared length must match real length ShowWarning("clif_process_message: Received malformed packet from player '%s' (length is incorrect)!\n", sd->status.name); - return false; + return false; } // verify <message> part of the packet if( message[messagelen-1] != '\0' ) { // message must be zero-terminated ShowWarning("clif_process_message: Player '%s' sent an unterminated message string!\n", sd->status.name); - return false; + return false; } if( messagelen > CHAT_SIZE_MAX-1 ) { // messages mustn't be too long @@ -9789,7 +9789,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd) { char* str = target+4; //Skip the NPC: string part. struct npc_data* npc; - if ((npc = npc_name2id(str))) + if ((npc = npc_name2id(str))) { char split_data[NUM_WHISPER_VAR][CHAT_SIZE_MAX]; char *split; @@ -11493,7 +11493,7 @@ void clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag) /// Request to search for party booking advertisments (CZ_PARTY_BOOKING_REQ_SEARCH). /// 0804 <level>.W <map id>.W <job>.W <last index>.L <result count>.W void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data* sd) -{ +{ short level = RFIFOW(fd,2); short mapid = RFIFOW(fd,4); short job = RFIFOW(fd,6); diff --git a/src/map/homunculus.c b/src/map/homunculus.c index d7f1c5f0c..d196ea566 100644 --- a/src/map/homunculus.c +++ b/src/map/homunculus.c @@ -469,7 +469,7 @@ int merc_hom_food(struct map_session_data *sd, struct homun_data *hd) clif_send_homdata(sd,SP_HUNGRY,hd->homunculus.hunger); clif_send_homdata(sd,SP_INTIMATE,hd->homunculus.intimacy / 100); clif_hom_food(sd,foodID,1); - + // Too much food :/ if(hd->homunculus.intimacy == 0) return merc_hom_delete(sd->hd, E_OMG); diff --git a/src/map/instance.c b/src/map/instance.c index d15b80a8a..52d0dfeef 100644 --- a/src/map/instance.c +++ b/src/map/instance.c @@ -140,7 +140,7 @@ int instance_add_map(const char *name, int instance_id, bool usebasename) map[im].name[0] = '\0'; ShowError("instance_add_map: no more free map indexes.\n"); return -3; // No free map index - } + } // Reallocate cells num_cell = map[im].xs * map[im].ys; diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 6ab88f872..6ea360e0c 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -415,17 +415,17 @@ int itemdb_cansell_sub(struct item_data* item, int gmlv, int unused) } int itemdb_cancartstore_sub(struct item_data* item, int gmlv, int unused) -{ +{ return (item && (!(item->flag.trade_restriction&16) || gmlv >= item->gm_lv_trade_override)); } int itemdb_canstore_sub(struct item_data* item, int gmlv, int unused) -{ +{ return (item && (!(item->flag.trade_restriction&32) || gmlv >= item->gm_lv_trade_override)); } int itemdb_canguildstore_sub(struct item_data* item, int gmlv, int unused) -{ +{ return (item && (!(item->flag.trade_restriction&64) || gmlv >= item->gm_lv_trade_override)); } diff --git a/src/map/map.c b/src/map/map.c index ea6c58d2b..afe385e33 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1633,7 +1633,7 @@ int map_quit(struct map_session_data *sd) sd->bl.y = pt->y; sd->mapindex = pt->map; } - } + } party_booking_delete(sd); // Party Booking [Spiria] pc_makesavestatus(sd); @@ -1784,7 +1784,7 @@ struct mob_data * map_getmob_boss(int m) { if( md->bl.m == m ) { - found = true; + found = true; break; } } diff --git a/src/map/map.h b/src/map/map.h index 0829d93b3..06e955b6e 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -501,7 +501,7 @@ struct map_data { unsigned leaves : 1; // [Valaris] /** * No longer available, keeping here just in case it's back someday. [Ind] - **/ + **/ //unsigned rain : 1; // [Valaris] unsigned nogo : 1; // [Valaris] unsigned nobaseexp : 1; // [Lorky] added by Lupus diff --git a/src/map/mob.c b/src/map/mob.c index 7da208827..cc3c8e6e6 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -931,7 +931,7 @@ static int mob_can_changetarget(struct mob_data* md, struct block_list* target, { // if the monster was provoked ignore the above rule [celest] if(md->state.provoke_flag) - { + { if (md->state.provoke_flag == target->id) return 1; else if (!(battle_config.mob_ai&0x4)) @@ -1112,7 +1112,7 @@ static int mob_warpchase_sub(struct block_list *bl,va_list ap) *target_nd = nd; *min_distance = cur_distance; return 1; - } + } return 0; } /*========================================== @@ -1161,7 +1161,7 @@ static int mob_ai_sub_hard_slavemob(struct mob_data *md,unsigned int tick) if(map_search_freecell(&md->bl, bl->m, &x, &y, MOB_SLAVEDISTANCE, MOB_SLAVEDISTANCE, 1) && unit_walktoxy(&md->bl, x, y, 0)) return 1; - } + } } else if (bl->m != md->bl.m && map_flag_gvg(md->bl.m)) { //Delete the summoned mob if it's in a gvg ground and the master is elsewhere. [Skotlex] status_kill(&md->bl); @@ -2147,7 +2147,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) job_exp = 0; else job_exp = (unsigned int)cap_value(md->db->job_exp * per * bonus/100. * map[m].jexp/100., 1, UINT_MAX); - + if((temp = tmpsd[i]->status.party_id )>0 && !md->dmglog[i].flag == MDLF_HOMUN) //Homun-done damage (flag 1) is not given to party { int j; @@ -2954,7 +2954,7 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event) //Pick a starting position and loop from that. i = battle_config.mob_ai&0x100?rnd()%md->db->maxskill:0; for (n = 0; n < md->db->maxskill; i++, n++) { - int c2, flag = 0; + int c2, flag = 0; if (i == md->db->maxskill) i = 0; @@ -3011,7 +3011,7 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event) flag = ((fbl = mob_getfriendhprate(md, ms[i].cond2, ms[i].val[0])) != NULL); break; case MSC_FRIENDSTATUSON: // friend status[num] on case MSC_FRIENDSTATUSOFF: // friend status[num] off - flag = ((fmd = mob_getfriendstatus(md, ms[i].cond1, ms[i].cond2)) != NULL); break; + flag = ((fmd = mob_getfriendstatus(md, ms[i].cond1, ms[i].cond2)) != NULL); break; case MSC_SLAVELT: // slave < num flag = (mob_countslave(&md->bl) < c2 ); break; case MSC_ATTACKPCGT: // attack pc > num @@ -3049,7 +3049,7 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event) clif_messagecolor(&md->bl, mc->color, temp); } - //Execute skill + //Execute skill if (skill_get_casttype(ms[i].skill_id) == CAST_GROUND) { //Ground skill. short x, y; @@ -3404,7 +3404,7 @@ static int mob_makedummymobdb(int class_) } return 0; } - //Initialize dummy data. + //Initialize dummy data. mob_dummy = (struct mob_db*)aCalloc(1, sizeof(struct mob_db)); //Initializing the dummy mob. sprintf(mob_dummy->sprite,"DUMMY"); sprintf(mob_dummy->name,"Dummy"); diff --git a/src/map/npc.c b/src/map/npc.c index 7802ac1f9..8a7a38b05 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -594,7 +594,7 @@ int npc_timerevent_start(struct npc_data* nd, int rid) else if( nd->u.scr.timerid != INVALID_TIMER ) return 0; - // Arrange for the next event + // Arrange for the next event ted = ers_alloc(timer_event_ers, struct timer_event_data); ted->next = j; // Set event index ted->time = nd->u.scr.timer_event[j].timer; @@ -696,8 +696,8 @@ void npc_timerevent_quit(struct map_session_data* sd) old_tick = nd->u.scr.timertick; old_timer = nd->u.scr.timer; - nd->u.scr.rid = sd->bl.id; - nd->u.scr.timertick = gettick(); + nd->u.scr.rid = sd->bl.id; + nd->u.scr.timertick = gettick(); nd->u.scr.timer = ted->time; //Execute label @@ -741,7 +741,7 @@ int npc_settimerevent_tick(struct npc_data* nd, int newtimer) nullpo_ret(nd); - // TODO: Set player attached timer's tick. + // TODO: Set player attached timer's tick. old_rid = nd->u.scr.rid; nd->u.scr.rid = 0; @@ -1738,7 +1738,7 @@ int npc_unload(struct npc_data* nd) if( nd->subtype == SCRIPT ) { struct s_mapiterator* iter; - struct block_list* bl; + struct block_list* bl; ev_db->foreach(ev_db,npc_unload_ev,nd->exname); //Clean up all events related @@ -3186,7 +3186,7 @@ static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, con map[m].flag.leaves=state; /** * No longer available, keeping here just in case it's back someday. [Ind] - **/ + **/ //else if (!strcmpi(w3,"rain")) // map[m].flag.rain=state; else if (!strcmpi(w3,"nightenabled")) diff --git a/src/map/pc.c b/src/map/pc.c index fc0769b57..abdaf6671 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1254,7 +1254,7 @@ int pc_calc_skilltree(struct map_session_data *sd) for( i = 0; i < MAX_SKILL; i++ ) { if( sd->status.skill[i].flag != SKILL_FLAG_PERMANENT && sd->status.skill[i].flag != SKILL_FLAG_PLAGIARIZED ) - { // Restore original level of skills after deleting earned skills. + { // Restore original level of skills after deleting earned skills. sd->status.skill[i].lv = (sd->status.skill[i].flag == SKILL_FLAG_TEMPORARY) ? 0 : sd->status.skill[i].flag - SKILL_FLAG_REPLACED_LV_0; sd->status.skill[i].flag = SKILL_FLAG_PERMANENT; } @@ -5211,7 +5211,7 @@ static void pc_calcexp(struct map_session_data *sd, unsigned int *base_exp, unsi if (battle_config.pk_mode && (int)(status_get_lv(src) - sd->status.base_level) >= 20) - bonus += 15; // pk_mode additional exp if monster >20 levels [Valaris] + bonus += 15; // pk_mode additional exp if monster >20 levels [Valaris] if (sd->sc.data[SC_EXPBOOST]) bonus += sd->sc.data[SC_EXPBOOST]->val1; @@ -6641,7 +6641,7 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper) break; } //This will automatically adjust bard/dancer classes to the correct gender - //That is, if you try to jobchange into dancer, it will turn you to bard. + //That is, if you try to jobchange into dancer, it will turn you to bard. job = pc_mapid2jobid(b_class, sd->status.sex); if (job == -1) return 1; @@ -8527,7 +8527,7 @@ int pc_readdb(void) stat=0; if (i > MAX_LEVEL) break; - statp[i]=stat; + statp[i]=stat; i++; } fclose(fp); diff --git a/src/map/pc.h b/src/map/pc.h index 05cdc9e73..af26ce8d2 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -487,7 +487,7 @@ enum weapon_type { W_2HMACE, //9 (unused) W_STAFF, //10 W_BOW, //11 - W_KNUCKLE, //12 + W_KNUCKLE, //12 W_MUSICAL, //13 W_WHIP, //14 W_BOOK, //15 diff --git a/src/map/pet.c b/src/map/pet.c index 248373edc..c3fa41219 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -173,7 +173,7 @@ int pet_target_check(struct map_session_data *sd,struct block_list *bl,int type) * Pet SC Check [Skotlex] *------------------------------------------*/ int pet_sc_check(struct map_session_data *sd, int type) -{ +{ struct pet_data *pd; nullpo_ret(sd); @@ -1203,7 +1203,7 @@ int read_petdb() FILE *fp; int nameid,i,j,k; - // Remove any previous scripts in case reloaddb was invoked. + // Remove any previous scripts in case reloaddb was invoked. for( j = 0; j < MAX_PET_DB; j++ ) { if( pet_db[j].pet_script ) @@ -1238,7 +1238,7 @@ int read_petdb() lines = entries = 0; while( fgets(line, sizeof(line), fp) && j < MAX_PET_DB ) - { + { char *str[22], *p; lines++; diff --git a/src/map/quest.c b/src/map/quest.c index 6be181eac..c01557974 100644 --- a/src/map/quest.c +++ b/src/map/quest.c @@ -273,7 +273,7 @@ int quest_check(TBL_PC * sd, int quest_id, quest_check_type type) switch( type ) { - case HAVEQUEST: + case HAVEQUEST: return sd->quest_log[i].state; case PLAYTIME: return (sd->quest_log[i].time < (unsigned int)time(NULL) ? 2 : sd->quest_log[i].state == Q_COMPLETE ? 1 : 0); diff --git a/src/map/script.c b/src/map/script.c index 220583ff5..0e71a0c97 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -328,7 +328,7 @@ enum { MF_LEAVES, /** * No longer available, keeping here just in case it's back someday. [Ind] - **/ + **/ //MF_RAIN, //20 // 21 free MF_NOGO = 22, @@ -4591,7 +4591,7 @@ BUILDIN_FUNC(warpchar) else if(strcmp(str, "SavePoint") == 0) pc_setpos(sd, sd->status.save_point.map,sd->status.save_point.x, sd->status.save_point.y, CLR_TELEPORT); - else + else pc_setpos(sd, mapindex_name2id(str), x, y, CLR_TELEPORT); return 0; @@ -4883,7 +4883,7 @@ BUILDIN_FUNC(input) st->state = RERUNLINE; if( is_string_variable(name) ) clif_scriptinputstr(sd,st->oid); - else + else clif_scriptinput(sd,st->oid); } else @@ -7054,7 +7054,7 @@ BUILDIN_FUNC(bonus) case 1: pc_bonus(sd, type, val1); break; - case 2: + case 2: val2 = script_getnum(st,4); pc_bonus2(sd, type, val1, val2); break; @@ -9675,7 +9675,7 @@ BUILDIN_FUNC(getmapflag) case MF_LEAVES: script_pushint(st,map[m].flag.leaves); break; /** * No longer available, keeping here just in case it's back someday. [Ind] - **/ + **/ //case MF_RAIN: script_pushint(st,map[m].flag.rain); break; case MF_NOGO: script_pushint(st,map[m].flag.nogo); break; case MF_CLOUDS: script_pushint(st,map[m].flag.clouds); break; @@ -9750,7 +9750,7 @@ BUILDIN_FUNC(setmapflag) case MF_LEAVES: map[m].flag.leaves = 1; break; /** * No longer available, keeping here just in case it's back someday. [Ind] - **/ + **/ //case MF_RAIN: map[m].flag.rain = 1; break; case MF_NOGO: map[m].flag.nogo = 1; break; case MF_CLOUDS: map[m].flag.clouds = 1; break; @@ -9828,7 +9828,7 @@ BUILDIN_FUNC(removemapflag) case MF_LEAVES: map[m].flag.leaves = 0; break; /** * No longer available, keeping here just in case it's back someday. [Ind] - **/ + **/ //case MF_RAIN: map[m].flag.rain = 0; break; case MF_NOGO: map[m].flag.nogo = 0; break; case MF_CLOUDS: map[m].flag.clouds = 0; break; @@ -12313,7 +12313,7 @@ BUILDIN_FUNC(isequippedcnt) for(k=0; k<sd->inventory_data[index]->slot; k++) { if (sd->status.inventory[index].card[k] == id) ret++; //[Lupus] - } + } } } } @@ -12381,7 +12381,7 @@ BUILDIN_FUNC(isequipped) hash = 1<<((j<5?j:j-5)*4 + k); // check if card is already used by another set - if ((j<5?sd->setitem_hash:sd->setitem_hash2) & hash) + if ((j<5?sd->setitem_hash:sd->setitem_hash2) & hash) continue; // We have found a match @@ -12444,7 +12444,7 @@ BUILDIN_FUNC(cardscnt) for(k=0; k<sd->inventory_data[index]->slot; k++) { if (sd->status.inventory[index].card[k] == id) ret++; - } + } } } script_pushint(st,ret); @@ -15362,14 +15362,14 @@ BUILDIN_FUNC(instance_detachmap) else if( (sd = script_rid2sd(st)) != NULL && sd->status.party_id && (p = party_search(sd->status.party_id)) != NULL && p->instance_id ) instance_id = p->instance_id; else return 0; - + if( (m = map_mapname2mapid(str)) < 0 || (m = instance_map2imap(m,instance_id)) < 0 ) - { + { ShowError("buildin_instance_detachmap: Trying to detach invalid map %s\n", str); - return 0; - } + return 0; + } - instance_del_map(m); + instance_del_map(m); return 0; } diff --git a/src/map/skill.c b/src/map/skill.c index 74804ef84..cacb29e04 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1222,7 +1222,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int } if( rate ) skill_break_equip(src, EQP_WEAPON, rate, BCT_SELF); - } + } if( battle_config.equip_skill_break_rate && skillid != WS_CARTTERMINATION && skillid != ITM_TOMAHAWK ) { // Cart Termination/Tomahawk won't trigger breaking data. Why? No idea, go ask Gravity. // Target weapon breaking @@ -2377,7 +2377,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds if( ssc && ssc->data[SC_POISONINGWEAPON] && rnd()%100 < 70 + 5*skilllv ) { sc_start(bl,ssc->data[SC_POISONINGWEAPON]->val2,100,ssc->data[SC_POISONINGWEAPON]->val1,skill_get_time2(GC_POISONINGWEAPON,ssc->data[SC_POISONINGWEAPON]->val1)); status_change_end(src,SC_POISONINGWEAPON,-1); - clif_skill_nodamage(src,bl,skillid,skilllv,1); + clif_skill_nodamage(src,bl,skillid,skilllv,1); } } } @@ -3953,7 +3953,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int } else { - struct skill_unit *su = BL_CAST(BL_SKILL,bl); + struct skill_unit *su = BL_CAST(BL_SKILL,bl); struct skill_unit_group* sg; if( su && (sg=su->group) && skill_get_inf2(sg->skill_id)&INF2_TRAP && sg->src_id != src->id && @@ -4559,7 +4559,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in break; case PR_KYRIE: - case MER_KYRIE: + case MER_KYRIE: clif_skill_nodamage(bl,bl,skillid,skilllv, sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv))); break; @@ -5138,7 +5138,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in map_freeblock_unlock(); return 0; } - clif_skill_nodamage(src,bl,skillid,-1,sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv))); + clif_skill_nodamage(src,bl,skillid,-1,sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv))); break; case TK_RUN: if (tsce) @@ -7096,7 +7096,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case WL_JACKFROST: clif_skill_nodamage(src,bl,skillid,skilllv,1); map_foreachinshootrange(skill_area_sub,bl,skill_get_splash(skillid,skilllv),BL_CHAR|BL_SKILL,src,skillid,skilllv,tick,flag|BCT_ENEMY|1,skill_castend_damage_id); - break; + break; case WL_MARSHOFABYSS: // Should marsh of abyss still apply half reduction to players after the 28/10 patch? [LimitLine] @@ -7321,7 +7321,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case NC_DISJOINT: { - if( bl->type != BL_MOB ) break; + if( bl->type != BL_MOB ) break; md = map_id2md(bl->id); if( md && md->class_ >= 2042 && md->class_ <= 2046 ) status_kill(bl); @@ -8407,7 +8407,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, int skillid, int sk i = skill_get_splash(skillid,skilllv); map_foreachinarea(skill_area_sub,src->m,x-i,y-i,x+i,y+i,BL_CHAR, src,skillid,skilllv,tick,flag|BCT_ENEMY|1,skill_castend_damage_id); - break; + break; /** * Guilotine Cross **/ @@ -9803,7 +9803,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns break; case UNT_GRAVITATION: - case UNT_EARTHSTRAIN: + case UNT_EARTHSTRAIN: case UNT_FIREWALK: case UNT_ELECTRICWALK: case UNT_PSYCHIC_WAVE: @@ -10312,7 +10312,7 @@ int skill_check_condition_castbegin(struct map_session_data* sd, short skill, sh if (lv <= 0 || sd->chatID) return 0; if( battle_config.gm_skilluncond && pc_isGM(sd)>= battle_config.gm_skilluncond && sd->skillitem != skill ) - { //GMs don't override the skillItem check, otherwise they can use items without them being consumed! [Skotlex] + { //GMs don't override the skillItem check, otherwise they can use items without them being consumed! [Skotlex] sd->state.arrow_atk = skill_get_ammotype(skill)?1:0; //Need to do arrow state check. sd->spiritball_old = sd->spiritball; //Need to do Spiritball check. return 1; @@ -10972,7 +10972,7 @@ int skill_check_condition_castend(struct map_session_data* sd, short skill, shor return 0; if( battle_config.gm_skilluncond && pc_isGM(sd) >= battle_config.gm_skilluncond && sd->skillitem != skill ) - { //GMs don't override the skillItem check, otherwise they can use items without them being consumed! [Skotlex] + { //GMs don't override the skillItem check, otherwise they can use items without them being consumed! [Skotlex] sd->state.arrow_atk = skill_get_ammotype(skill)?1:0; //Need to do arrow state check. sd->spiritball_old = sd->spiritball; //Need to do Spiritball check. return 1; @@ -14435,14 +14435,14 @@ int skill_stasis_check(struct block_list *bl, int src_id, int skillid) { int inf = 0; if( !bl || skillid < 1 ) - return 0; // Can do it + return 0; // Can do it inf = skill_get_inf2(skillid); if( inf == INF2_SONG_DANCE || /*skill_get_inf2(skillid) == INF2_CHORUS_SKILL ||*/ inf == INF2_SPIRIT_SKILL ) return 1; // Can't do it. switch( skillid ) { - case NV_FIRSTAID: case TF_HIDING: case AS_CLOAKING: case WZ_SIGHTRASHER: + case NV_FIRSTAID: case TF_HIDING: case AS_CLOAKING: case WZ_SIGHTRASHER: case RG_STRIPWEAPON: case RG_STRIPSHIELD: case RG_STRIPARMOR: case WZ_METEOR: case RG_STRIPHELM: case SC_STRIPACCESSARY: case ST_FULLSTRIP: case WZ_SIGHTBLASTER: case ST_CHASEWALK: case SC_ENERVATION: case SC_GROOMY: case WZ_ICEWALL: diff --git a/src/map/status.c b/src/map/status.c index 275c6c8f2..2f36cd6f6 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1244,7 +1244,7 @@ int status_percent_change(struct block_list *src,struct block_list *target,signe status_damage(src, target, 0, INT_MAX, 0, (!src||src==target?5:1)); else status_heal(target, 0, INT_MAX, 0); - } + } if (flag) return status_damage(src, target, hp, sp, 0, (!src||src==target?5:1)); return status_heal(target, hp, sp, 0); @@ -1442,7 +1442,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int tsc = status_get_sc(target); if(tsc && tsc->count) - { + { if( tsc->data[SC_INVINCIBLE] ) return 0; if(!skill_num && tsc->data[SC_TRICKDEAD]) @@ -1926,7 +1926,7 @@ int status_calc_pet_(struct pet_data *pd, bool first) pd->rate_fix = pd->rate_fix*battle_config.pet_support_rate/100; return 1; -} +} /// Helper function for status_base_pc_maxhp(), used to pre-calculate the hp_sigma_val[] array static void status_calc_sigma(void) @@ -3420,7 +3420,7 @@ void status_calc_bl_main(struct block_list *bl, /*enum scb_flag*/int flag) else if( bl->type&BL_HOM ) { - amotion = (1000 -4*status->agi -status->dex) * ((TBL_HOM*)bl)->homunculusDB->baseASPD/1000; + amotion = (1000 -4*status->agi -status->dex) * ((TBL_HOM*)bl)->homunculusDB->baseASPD/1000; status->aspd_rate = status_calc_aspd_rate(bl, sc, b_status->aspd_rate); if(status->aspd_rate != 1000) @@ -4698,7 +4698,7 @@ static unsigned char status_calc_element_lv(struct block_list *bl, struct status if(!sc || !sc->count) return lv; - if(sc->data[SC_FREEZE]) + if(sc->data[SC_FREEZE]) return 1; if(sc->data[SC_STONE] && sc->opt1 == OPT1_STONE) return 1; @@ -5625,7 +5625,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val if (tick == 1) return 1; //Minimal duration: Only strip without causing the SC break; case SC_STRIPSHIELD: - if( val2 == 1 ) val2 = 0; //GX effect. Do not take shield off.. + if( val2 == 1 ) val2 = 0; //GX effect. Do not take shield off.. else if (sd && !(flag&4)) { int i; @@ -6379,7 +6379,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val case SC_DEFENDER: if (!(flag&1)) - { + { val2 = 5 + 15*val1; //Damage reduction val3 = 0; // unused, previously speed adjustment val4 = 250 - 50*val1; //Aspd adjustment @@ -6913,7 +6913,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val case SC_CLOAKINGEXCEED: val2 = ( val1 + 1 ) / 2; // Hits val3 = 90 + val1 * 10; // Walk speed - val_flag |= 1|2|4; + val_flag |= 1|2|4; if (bl->type == BL_PC) val4 |= battle_config.pc_cloak_check_type&7; else @@ -7066,7 +7066,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val val2 = 6 * val1; val2 += val3; //Adding 1% * Lesson Bonus val2 += (int)(val4*2/10); //Adding 0.2% per JobLevel - break; + break; case SC_MOONLITSERENADE: val2 = 10 * val1; break; @@ -7958,7 +7958,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const clif_updatestatus(sd,SP_MANNER); } break; - case SC_SPLASHER: + case SC_SPLASHER: { struct block_list *src=map_id2bl(sce->val3); if(src && tid != INVALID_TIMER) @@ -8116,7 +8116,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const break; case SC_ADORAMUS: status_change_end(bl, SC_BLIND, -1); - break; + break; /* case SC__SHADOWFORM: { @@ -8214,10 +8214,10 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const case SC_SIGHT: sc->option &= ~OPTION_SIGHT; break; - case SC_WEDDING: + case SC_WEDDING: sc->option &= ~OPTION_WEDDING; break; - case SC_XMAS: + case SC_XMAS: sc->option &= ~OPTION_XMAS; break; case SC_SUMMER: diff --git a/src/map/status.h b/src/map/status.h index e11252f1d..03310c3e3 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -741,13 +741,13 @@ enum si_type { // SI_FRIEND = 162, // SI_FRIENDUP = 163, // SI_SG_WARM = 164, - SI_WARM = 165, -// 166 | The three show the exact same display: ultra red character (165, 166, 167) + SI_WARM = 165, +// 166 | The three show the exact same display: ultra red character (165, 166, 167) // 167 | Their names would be SI_SG_SUN_WARM, SI_SG_MOON_WARM, SI_SG_STAR_WARM // SI_EMOTION = 168, SI_SUN_COMFORT = 169, - SI_MOON_COMFORT = 170, - SI_STAR_COMFORT = 171, + SI_MOON_COMFORT = 170, + SI_STAR_COMFORT = 171, // SI_EXPUP = 172, // SI_GDSKILL_BATTLEORDER = 173, // SI_GDSKILL_REGENERATION = 174, diff --git a/src/map/storage.c b/src/map/storage.c index f802dabe4..12d9a8107 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -339,7 +339,7 @@ struct guild_storage *guild2storage2(int guild_id) return (struct guild_storage*)idb_get(guild_storage_db,guild_id); } -int guild_storage_delete(int guild_id) +int guild_storage_delete(int guild_id) { idb_remove(guild_storage_db,guild_id); return 0; diff --git a/src/map/unit.c b/src/map/unit.c index c27bde544..9161c61d1 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -829,7 +829,7 @@ int unit_stop_walking(struct block_list *bl,int type) tick = gettick(); if( (type&0x02 && !ud->walkpath.path_pos) //Force moving at least one cell. || (type&0x04 && td && DIFF_TICK(td->tick, tick) <= td->data/2) //Enough time has passed to cover half-cell - ) { + ) { ud->walkpath.path_len = ud->walkpath.path_pos+1; unit_walktoxy_timer(INVALID_TIMER, tick, bl->id, ud->walkpath.path_pos); } @@ -1176,7 +1176,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh switch(skill_num){ case ALL_RESURRECTION: - if(battle_check_undead(tstatus->race,tstatus->def_ele)) { + if(battle_check_undead(tstatus->race,tstatus->def_ele)) { temp = 1; } else if (!status_isdead(target)) return 0; //Can't cast on non-dead characters. @@ -1220,7 +1220,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh casttime *= 2; break; } - + // moved here to prevent Suffragium from ending if skill fails if (!(skill_get_castnodex(skill_num, skill_lv)&2)) casttime = skill_castfix_sc(src, casttime, skill_num, skill_lv); diff --git a/src/plugins/console.c b/src/plugins/console.c index 74c431d32..673a30e78 100644 --- a/src/plugins/console.c +++ b/src/plugins/console.c @@ -277,7 +277,7 @@ void input_setstate(char state) { if( state == INPUT_READY && input_getstate() == INPUT_READING ) {// send data from the worker to the main process - write(buf.data_pipe[PIPE_WRITE], &buf.len, sizeof(buf.len)); + write(buf.data_pipe[PIPE_WRITE], &buf.len, sizeof(buf.len)); write(buf.data_pipe[PIPE_WRITE], &buf.arr, buf.len); } else if( state == INPUT_WAITING ){ if( buf.close_unused_flag == 0 ) diff --git a/src/plugins/dbghelpplug.c b/src/plugins/dbghelpplug.c index ef9c08534..85556503b 100644 --- a/src/plugins/dbghelpplug.c +++ b/src/plugins/dbghelpplug.c @@ -538,7 +538,7 @@ Dhp__PrintTypeName( switch( symtag ) { case SymTagEnum: - { + { WCHAR* pwszTypeName; if( SymGetTypeInfo_(hProcess, modBase, typeIndex, TI_GET_SYMNAME, &pwszTypeName) ) |