From f7f10cf7bb600b6871ed37f493fef18110dc182b Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 10 Nov 2013 05:09:37 +0100 Subject: Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4 - Consolidated case in remaining variables, labels, constants. Signed-off-by: Haru --- npc/custom/quests/bandit_beard.txt | 12 ++++++------ npc/custom/quests/dead_branch.txt | 12 ++++++------ npc/custom/quests/hunting_missions.txt | 8 ++++---- npc/custom/quests/may_hats.txt | 14 +++++++------- npc/custom/quests/thq/THQS_ChatingNPC.txt | 10 +++++----- npc/custom/quests/thq/THQS_QuestNPC.txt | 2 +- npc/custom/quests/umbalian_language.txt | 4 ++-- 7 files changed, 31 insertions(+), 31 deletions(-) (limited to 'npc/custom/quests') diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt index ebb74afc7..fb28732d7 100644 --- a/npc/custom/quests/bandit_beard.txt +++ b/npc/custom/quests/bandit_beard.txt @@ -44,7 +44,7 @@ L_THREAD: mes "[Bearded Man]"; mes "Also I would need you to get me some things for the beard."; mes "They are:"; -L_LIST: +L_List: mes "^8080FFElastic Band^000000"; mes "^8080FF5 Animal Skins^000000"; mes "^8080FFBlack Dye Stuff^000000"; @@ -96,7 +96,7 @@ L_NOITEMS: mes "What the hell! I can't make a beard without the items!"; mes "Here is the list again:"; emotion 23; - goto L_LIST; + goto L_List; } //Master Tailor---------- @@ -124,7 +124,7 @@ aldeba_in,70,179,5 script Karfa Clerk#bandit 4_F_KAFRA5,{ mes "What can I do for you?"; next; - if(BEARD_QUEST == 2 ) goto L_DELIVERY; + if(BEARD_QUEST == 2 ) goto L_Delivery; menu "What's in the boxes?",-,"Nothing.",M_NOPE; @@ -133,7 +133,7 @@ aldeba_in,70,179,5 script Karfa Clerk#bandit 4_F_KAFRA5,{ M_NOPE: close; -L_DELIVERY: +L_Delivery: mes "[Karfa Clerk]"; mes "Sorry but we have not received any ^8080FFThread^000000."; @@ -209,7 +209,7 @@ M_NO: //mobsummons ------- alberta,1,1,1 script BRDQ_MOBS -1,{ OnStart: - set $@beardMob,10; + set $@beardmob,10; set $@beardMobD,0; monster "alberta",65,120,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie"; monster "alberta",66,120,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie"; @@ -229,7 +229,7 @@ OnDie: end; On1201: On0001: - set $@beardMob,0; + set $@beardmob,0; set $@beardMobD,0; end; } diff --git a/npc/custom/quests/dead_branch.txt b/npc/custom/quests/dead_branch.txt index 95f0a95b7..bb70f6020 100644 --- a/npc/custom/quests/dead_branch.txt +++ b/npc/custom/quests/dead_branch.txt @@ -25,10 +25,10 @@ niflheim,204,179,3 script Mister Mobry 2_M_MOLGENSTEIN,{ mes "[Mister Mobry]"; mes "I can create a spirited branch... That is, if you can provide me with the correct materials..."; next; - goto L_MENU; + goto L_Menu; -L_MENU: - menu "What Do I Need?",-,"Where Can I find this Crap?",M_FIND,"Make me a Dead Branch!",M_CREATE,"Forget it...",M_END; +L_Menu: + menu "What Do I Need?",-,"Where Can I find this Crap?",M_FIND,"Make me a Dead Branch!",M_CREATE,"Forget it...",M_End; mes "[Mister Mobry]"; mes "Mwehehe... I see you want to control tree spirits am I right? Ok... I need:"; @@ -37,7 +37,7 @@ L_MENU: mes "^1354455 Trunk^000000"; mes "^1354451 Wooden Gnarl^000000"; next; - goto L_MENU; + goto L_Menu; M_FIND: mes "[Mister Mobry]"; @@ -47,7 +47,7 @@ M_FIND: mes "^135445Trunks? Seriously, think wood...^000000"; mes "^135445Wooden Gnarl... Gibbet...^000000"; next; - goto L_MENU; + goto L_Menu; L_NOLOG: mes "[Mister Mobry]"; @@ -95,7 +95,7 @@ L_GIVE2: getitem 12103,1; //Bloody Branch close; -M_END: +M_End: mes "[Mister Mobry]"; mes "No spirit for you... then go!"; close; diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt index d07ebb0d0..d5d466f73 100644 --- a/npc/custom/quests/hunting_missions.txt +++ b/npc/custom/quests/hunting_missions.txt @@ -152,7 +152,7 @@ Mission_Status: set .@Mission_Points, 3+(.@j[.Quests]/.Quests/6); set .@Base_Exp, #Mission_Count*.@j[.Quests+1]/5; set .@Job_Exp, #Mission_Count*.@j[.Quests+2]/5; - set .@Zeny, #Mission_Count*.Quests*.@j[.@i]*.Modifier[2]; + set .@zeny, #Mission_Count*.Quests*.@j[.@i]*.Modifier[2]; next; mes "[Hunting Missions]"; @@ -160,7 +160,7 @@ Mission_Status: mes " > Mission Points: ^0055FF"+.@Mission_Points+"^000000"; mes " > Base Experience: ^0055FF"+Cm(.@Base_Exp)+"^000000"; mes " > Job Experience: ^0055FF"+Cm(.@Job_Exp)+"^000000"; - mes " > Zeny: ^0055FF"+Cm(.@Zeny)+"^000000"; + mes " > Zeny: ^0055FF"+Cm(.@zeny)+"^000000"; if (@f) { set @f,0; return; } next; mes "[Hunting Missions]"; @@ -173,7 +173,7 @@ Mission_Status: set #Mission_Points, #Mission_Points+.@Mission_Points; set BaseExp, BaseExp+.@Base_Exp; set JobExp, JobExp+.@Job_Exp; - set Zeny, Zeny+.@Zeny; + set Zeny, Zeny+.@zeny; for(set .@i,0; .@i<.Quests; set .@i,.@i+1) { setd "Mission"+.@i,0; setd "Mission"+.@i+"_",0; @@ -259,7 +259,7 @@ OnNPCKillEvent: for(set .@i,0; .@i<$@partymembercount; set .@i,.@i+1) { if (isloggedin($@partymemberaid[.@i], $@partymembercid[.@i])) { attachrid $@partymemberaid[.@i]; - if (#Mission_Count && Mission0 && HP > 0) { + if (#Mission_Count && Mission0 && Hp > 0) { getmapxy(.@map2$,.@x2,.@y2,0); if ((.@map1$ == .@map2$ || .Party == 1) && (distance(.@x1,.@y1,.@x2,.@y2) <= 30 || .Party < 3)) { for(set .@j,0; .@j<.Quests; set .@j,.@j+1) { diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt index cd81e0149..789fc364f 100644 --- a/npc/custom/quests/may_hats.txt +++ b/npc/custom/quests/may_hats.txt @@ -19,7 +19,7 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{ mes "They are quite rare novadays..."; specialeffect 417; next; - menu "Bird Nest",-,"Lion Mask",M_2,"Skeleton Manteau",M_3,"Fashion Hip Sack",M_4,"Sales Banner",M_5,"Leave",M_EXIT; + menu "Bird Nest",-,"Lion Mask",M_2,"Skeleton Manteau",M_3,"Fashion Hip Sack",M_4,"Sales Banner",M_5,"Leave",M_Exit; mes "[Yakima]"; mes "Oh.. it's an excellent item for any beast hunter."; @@ -34,7 +34,7 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{ mes "[Yakima]"; mes "Do you have all the items?"; next; - menu "Yeah.",-,"Nay.",M_EXIT; + menu "Yeah.",-,"Nay.",M_Exit; if(countitem(5067) < 1 || countitem(916) < 920 || countitem(925) < 310) goto L_NOITEM;//Items: Sombrero, Feather_of_Birds, Bill_of_Birds, delitem 5067,1;//Items: Sombrero, @@ -61,7 +61,7 @@ M_2: mes "[Yakima]"; mes "Do you have all the items?"; next; - menu "Yeah.",-,"Nay.",M_EXIT; + menu "Yeah.",-,"Nay.",M_Exit; if(countitem(5098) < 1 || countitem(1030) < 10 || countitem(1029) < 30 || countitem(7267) < 300) goto L_NOITEM;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty, delitem 5098,1;//Items: Tiger_Mask, @@ -90,7 +90,7 @@ M_3: mes "[Yakima]"; mes "Do you have all the items?"; next; - menu "Yeah.",-,"Nay.",M_EXIT; + menu "Yeah.",-,"Nay.",M_Exit; if(countitem(2508) < 1 || countitem(2506) < 2 || countitem(2609) < 3 || countitem(7207) < 10) goto L_NOITEM;//Items: Ragamuffin_Manteau, Manteau_, Skull_Ring, Old_Manteau, delitem 2508,1;//Items: Ragamuffin_Manteau, @@ -119,7 +119,7 @@ M_4: mes "[Yakima]"; mes "Do you have all the items?"; next; - menu "Yeah.",-,"Nay.",M_EXIT; + menu "Yeah.",-,"Nay.",M_Exit; if(countitem(2269) < 3 || countitem(2207) < 3 || countitem(2612) < 2 || countitem(2287)<3 ) goto L_NOITEM;//Items: Romantic_Flower, Fancy_Flower, Flower_Ring, delitem 2269,3;//Items: Romantic_Flower, @@ -150,7 +150,7 @@ M_5: mes "[Yakima]"; mes "Do you have all the items?"; next; - menu "Yeah.",-,"Nay.",M_EXIT; + menu "Yeah.",-,"Nay.",M_Exit; if(countitem(975) < 1 || countitem(980) < 1 || countitem(2272) < 2 || countitem(2262) < 3 || countitem(7298) < 180 || countitem(7164) < 20) goto L_NOITEM;//Items: Scarlet_Dyestuff, Orange_Dyestuff, Stop_Post, Clown_Nose, Fig_Leaf, Solid_Peach, delitem 975,1;//Items: Scarlet_Dyestuff, @@ -171,7 +171,7 @@ L_NOITEM: emotion e_sry; close; -M_EXIT: +M_Exit: mes "[Yakima]"; mes callfunc("F_Bye"); close; diff --git a/npc/custom/quests/thq/THQS_ChatingNPC.txt b/npc/custom/quests/thq/THQS_ChatingNPC.txt index a8cb49b9f..8ade6d8fd 100644 --- a/npc/custom/quests/thq/THQS_ChatingNPC.txt +++ b/npc/custom/quests/thq/THQS_ChatingNPC.txt @@ -59,9 +59,9 @@ yuno_in01,22,162,6 script Female Assasin 4_F_JOB_ASSASSIN,{ mes "Umm sorry I'm not gona waste my time talking to you if you arn't even a member!"; close; N_Member: - set @TEMP,rand(1,2); - if (@TEMP == 1) goto N_Chat1; - if (@TEMP == 2) goto N_Chat2; + set @temp,rand(1,2); + if (@temp == 1) goto N_Chat1; + if (@temp == 2) goto N_Chat2; mes "How are you reading this???"; mes "Well unless you are reading the code :)"; close; @@ -80,8 +80,8 @@ yuno_in01,25,162,6 script Female Wizard 2_F_MAGICMASTER,{ mes "Umm sorry I'm not gona waste my time talking to you if you arn't even a member!"; close; N_Member: - set @TEMP,rand(2); - if (@TEMP == 1) goto N_Chat; + set @temp,rand(2); + if (@temp == 1) goto N_Chat; mes "Ahh welcome fellow Treasure Hunter "+strcharinfo(0)+"."; mes "Did you hear about that goat man running around in the trees?"; mes " "; diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt index 1fad134aa..9a09089b0 100644 --- a/npc/custom/quests/thq/THQS_QuestNPC.txt +++ b/npc/custom/quests/thq/THQS_QuestNPC.txt @@ -30,7 +30,7 @@ yuno_in01,112,151,6 script Quest Manager 1_M_SIZ,{ mes "Good well get back out there."; close; N_PayZeny: - if (zeny < 2500) goto N_ZenyFail; + if (Zeny < 2500) goto N_ZenyFail; set one_qset, 0; set two_qset, 0; set three_qset, 0; diff --git a/npc/custom/quests/umbalian_language.txt b/npc/custom/quests/umbalian_language.txt index 70ae07d28..5bb17955e 100644 --- a/npc/custom/quests/umbalian_language.txt +++ b/npc/custom/quests/umbalian_language.txt @@ -155,10 +155,10 @@ L_AGAIN: yuno,157,366,2 script Wise Man Fabius 2_M_SAGE_OLD,{ mes "[Fabius]"; if(event_umbala >= 3) set umb_lang,2; //You already learnt Umbalian language from Umbalian Chief. So this Quest is disabled - if(umb_lang<2) goto L_QUEST; + if(umb_lang<2) goto L_Quest; mes "You speak Umbalian fluently! So you will never forget the language of Umbalians!"; close; -L_QUEST: +L_Quest: if((countitem(1006) < 1) || (countitem(7118) < 1) || (countitem(7117) < 1)) goto L_DONE;//Items: Old Magic Book, Torn Scroll, Torn Spell Book, delitem 1006,1; //Items: Old Magic Book, delitem 7118,1; //Items: Torn Scroll, -- cgit v1.2.3-60-g2f50