From 1aea178ef7cdb76eda5600540b5fbd29fd54ff88 Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 18 Sep 2015 13:09:16 +0200 Subject: More aggressive whitespace cleanup. Follow up to 51329e6 Signed-off-by: Haru --- npc/re/quests/cupet.txt | 36 ++------- npc/re/quests/eden/100-110.txt | 2 +- npc/re/quests/eden/111-120.txt | 1 - npc/re/quests/eden/131-140.txt | 4 +- npc/re/quests/eden/eden_quests.txt | 2 +- npc/re/quests/quests_dewata.txt | 1 - npc/re/quests/quests_dicastes.txt | 11 +-- npc/re/quests/quests_eclage.txt | 158 +++++++++++-------------------------- npc/re/quests/quests_malangdo.txt | 2 +- npc/re/quests/quests_malaya.txt | 8 +- 10 files changed, 65 insertions(+), 160 deletions(-) (limited to 'npc/re/quests') diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt index 3e339e168..03f5f69dc 100644 --- a/npc/re/quests/cupet.txt +++ b/npc/re/quests/cupet.txt @@ -13,9 +13,8 @@ // 1st NPC - script CPM1 4_M_ALCHE_C,{ - .@npc$ = "[Cute Pet Manager]"; - + setarray .@tame_id[0],619,620,622,623,624,627,628,629,630; setarray .@tame_amount[0],3,3,3,3,3,3,3,3,3; setarray .@hunt_id[0],909,909,705,916,935,919,919,940,921; @@ -29,7 +28,6 @@ mes .@tame_amount + " times for a taming item."; mes "You can't exchange anymore."; next; - mes "[Cute Pet Manager]"; mes "Besides me, there are other"; mes "Cute Pet Managers. If you want"; @@ -37,16 +35,14 @@ mes "you go and see them."; close; } - - callfunc "cute_pet_manager",.@tame_id,.@tame_amount,.@hunt_id,.@hunt_amount,.@mob_id,cpm_one,.@tame_gets,.@hunt_id2,.@hunt_amount2; + callfunc "cute_pet_manager",.@tame_id,.@tame_amount,.@hunt_id,.@hunt_amount,.@mob_id,cpm_one,.@tame_gets,.@hunt_id2,.@hunt_amount2; } // 2nd NPC - script CPM2 4_M_ALCHE_C,{ - .@npc$ = "[Cute Pet Manager]"; - + setarray .@tame_id[0],621,625,632,631,633,634,635,636,659,637,639,640; setarray .@tame_amount[0],2,2,2,2,2,2,2,2,2,2,2,2; setarray .@hunt_id[0],938,935,925,7033,945,942,931,901,1094,1021,936,1035; @@ -61,7 +57,6 @@ mes .@tame_amount + " times for a taming item."; mes "You can't exchange anymore."; next; - mes "[Cute Pet Manager]"; mes "Besides me, there are other"; mes "Cute Pet Managers. If you want"; @@ -69,16 +64,14 @@ mes "you go and see them."; close; } - - callfunc "cute_pet_manager",.@tame_id,.@tame_amount,.@hunt_id,.@hunt_amount,.@mob_id,cpm_two,.@tame_gets,.@hunt_id2,.@hunt_amount2; + callfunc "cute_pet_manager",.@tame_id,.@tame_amount,.@hunt_id,.@hunt_amount,.@mob_id,cpm_two,.@tame_gets,.@hunt_id2,.@hunt_amount2; } // 3rd NPC - script CPM3 4_M_ALCHE_C,{ - .@npc$ = "[Cute Pet Manager]"; - + setarray .@tame_id[0],638,626,641,661,660,642; setarray .@tame_amount[0],1,1,1,1,1,1; setarray .@hunt_id[0],1020,943,1038,7047,1970,923; @@ -94,7 +87,6 @@ mes .@tame_amount + " times for a taming item."; mes "You can't exchange anymore."; next; - mes "[Cute Pet Manager]"; mes "Besides me, there are other"; mes "Cute Pet Managers. If you want"; @@ -102,9 +94,8 @@ mes "you go and see them."; close; } - - callfunc "cute_pet_manager",.@tame_id,.@tame_amount,.@hunt_id,.@hunt_amount,.@mob_id,cpm_three,.@tame_gets,.@hunt_id2,.@hunt_amount2; + callfunc "cute_pet_manager",.@tame_id,.@tame_amount,.@hunt_id,.@hunt_amount,.@mob_id,cpm_three,.@tame_gets,.@hunt_id2,.@hunt_amount2; } function script cute_pet_manager { @@ -123,7 +114,6 @@ function script cute_pet_manager { mes "who is in charge of public relations"; mes "for the New Upgraded Cute Pet system."; next; - mes "[Cute Pet Manager]"; mes "If you have any concerns regarding"; mes "the Cute Pet system I am here to guide you."; @@ -132,18 +122,15 @@ function script cute_pet_manager { mes "then I will tell you the monster"; mes "that you can tame with the item."; next; - mes "Also I will explain what materials"; mes "you need to bring in order to"; mes "get the taming item."; next; - mes "[Cute Pet Manager]"; mes "If you already brought materials"; mes "to exchange for the taming item,"; mes "I can exchange it for taming items immediately."; next; - mes "[Cute Pet Manager]"; mes "However, there is a limit"; mes "for exchanging taming items."; @@ -151,17 +138,14 @@ function script cute_pet_manager { mes getarg(6) + " times. So please make sure"; mes "how many times you have exchanged."; next; - mes "[Cute Pet Manager]"; mes "So, which taming item do you want?"; mes "Please choose one from the list."; next; - // Create Menu System for (.@a = 0; .@a < getarraysize(getarg(0)); ++.@a) { .@menu$ += (.@menu$ == "" ? "" : ":") + getitemname(getelementofarray(getarg(0), .@a)); } - // Query Player Choice .@choice = select(.@menu$) - 1; @@ -173,7 +157,6 @@ function script cute_pet_manager { .@mob_id = getelementofarray(getarg(4), .@choice); .@hunt_id2 = getelementofarray(getarg(7), .@choice); .@hunt_amount2 = getelementofarray(getarg(8), .@choice); - dispbottom "Tame ID: " + .@tame_id; dispbottom "Tame Amount: " + .@tame_amount; dispbottom "Hunt ID: " + .@hunt_id; @@ -182,28 +165,23 @@ function script cute_pet_manager { dispbottom "Mob ID: " + .@mob_id; dispbottom "Hunt ID2: " + .@hunt_id2; dispbottom "Hunt Amount2: " + .@hunt_amount2; - if (.@hunt_id2) { .@hunt2_count = countitem(.@hunt_id2); } if (countitem(.@hunt_id) >= .@hunt_amount && countitem(6083) > 0 && .@hunt2_count >= .@hunt_amount2) { - mes "[Cute Pet Manager]"; mes "Ah, you have gathered all items"; mes "with your friends. You can now"; mes "exchange for an " + getitemname(.@tame_id) + "."; mes "Do you want to exchange with me?"; next; - - if (select("Exchange:Don't Exchange") == 2) { + if (select("Exchange:Don't Exchange") == 2) { mes "[Cute Pet Manager]"; mes "You don't? You will come back again."; close; } - delitem .@hunt_id, .@hunt_amount; delitem 6083, 1; set getarg(5), getarg(5) + 1; getitem .@tame_id, .@tame_amount; - mes "[Cute Pet Manager]"; mes "Wise choice."; mes "I hope you and your pet get along."; diff --git a/npc/re/quests/eden/100-110.txt b/npc/re/quests/eden/100-110.txt index 486a4b6e6..c0065b293 100644 --- a/npc/re/quests/eden/100-110.txt +++ b/npc/re/quests/eden/100-110.txt @@ -782,7 +782,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ .@ran = rand(1,1000); if (.@amount == 1) { if (.@ran <= 100) - setarray .@item[0],Blue_Potion,2; + setarray .@item[0],Blue_Potion,2; else if (.@ran <= 200) setarray .@item[0],White_Slim_Potion,10; else if (.@ran == 333) diff --git a/npc/re/quests/eden/111-120.txt b/npc/re/quests/eden/111-120.txt index b8bd667f1..a8ea81361 100644 --- a/npc/re/quests/eden/111-120.txt +++ b/npc/re/quests/eden/111-120.txt @@ -1135,7 +1135,6 @@ S_Hunting: mes "You finished researching about "+ getarg(.@i+2) +". Thank you."; getexp 700000,getarg(.@i+1); break; - } erasequest .@quest_id; next; diff --git a/npc/re/quests/eden/131-140.txt b/npc/re/quests/eden/131-140.txt index b40c4167f..e23b6a83d 100644 --- a/npc/re/quests/eden/131-140.txt +++ b/npc/re/quests/eden/131-140.txt @@ -573,7 +573,7 @@ S_Erasequest: mes "I'll ask someone else to take care of the rest of the Satan Morroc Incarnations, then!"; break; case 3: - mes "I'll need to ask another adventurer to help with the Scaraba!"; + mes "I'll need to ask another adventurer to help with the Scaraba!"; } break; case 2: @@ -584,7 +584,7 @@ S_Erasequest: getexp 1100000,300000; break; case 2: - mes "Was the story of Satan Morroc worth putting to song? Great work!"; + mes "Was the story of Satan Morroc worth putting to song? Great work!"; getexp 1100000,200000; break; case 3: diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index 1d25e17d3..1ac4f83f1 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -4037,7 +4037,7 @@ S_Enchant: delitem getarg(0),1; para_2nd04 = 4; changequest 7240,7241; - getitem2 getarg(0),1,1,0,0,0,0,.@1st,.@2nd; + getitem2 getarg(0),1,1,0,0,0,0,.@1st,.@2nd; mes "[Thorn]"; mes "Ok, seems that the enhancement went well."; mes "If you don't like the result then you can come back again tomorrow."; diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index db78bce54..821ee6d8d 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -1285,7 +1285,6 @@ dew_fild01,114,275,4 script Lero#dew_drink 4_M_DEWMAN,{ mes "Once you bring the oil palm nuts, Mr. Memo will exchange them with oil."; close; } else if ((.@j & 2) || (.@j & 8) || (.@j & 32)) { - // .@i[]: ,,, if (.@j & 2) setarray .@i[0],20,5046,10,5000; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 10bb003e5..f3d16473d 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -902,7 +902,6 @@ dic_in01,40,270,2 script Transport Dept. 2 Mgr 4_MAN_BENKUNI,{ close; } - dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{ if (!checkweight(1201,1)) { mes "You have too many items in your inventory."; @@ -3985,7 +3984,6 @@ dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{ setarray .@quest, 7194,7195,7196; setarray .@item, 6306,6305,6307; setarray .@str$, "bloodstain","frozen piece of skin","strange magical stone fragment"; - .@size = getarraysize(.@item); for (.@i = 0; .@i < .@size; ++.@i) { if (countitem(.@item[.@i])) { @@ -4800,7 +4798,6 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ .@size = getarraysize(.@npc$); for (.@i = 0; .@i < .@size; ++.@i) if (.@n$ == .@npc$[.@i]) .@type = .@i; - if (ep13_3_secret == 10) { if (.@npc$[.@type] == "Rock Pile") { mes "There are many piles of rock around because of the unstable crustal movements."; @@ -7332,7 +7329,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes "I'm done. Hehe"; close; } - + // Enchant Constants // Ex: .@dex[1]: DEX + 1 | .@cri[5]: CRI + 5 | .@eva[12]: FLEE + 12 .@matk[1] = 4760; .@matk[2] = 4761; @@ -7342,13 +7339,13 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ .@dex[1] = 4720; .@dex[2] = 4721; .@dex[3] = 4722; .@int[1] = 4710; .@int[2] = 4711; .@int[3] = 4712; .@agi[1] = 4730; .@agi[2] = 4731; .@agi[3] = 4732; - + // Enchant attribute is determined by the digit position of variable value (ep13_3_). // For example, assume the variable value is 516: // .@f_[] // slot: 2 3 4 - // index: 5 1 6 - + // index: 5 1 6 + // Enchant Format if (compare(.@v$,"ring")) setarray .@f_2[1],.@agi[1],.@agi[2],.@int[1],.@int[2],.@dex[1],.@dex[2]; else setarray .@f_2[1],.@agi[1],.@agi[2],.@agi[3],.@int[1],.@int[2],.@int[3],.@dex[1],.@dex[2],.@dex[3]; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index 918a8edd3..3b4e7ba0f 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -1,15 +1,15 @@ -//===== Hercules Script ====================================== +//===== Hercules Script ====================================== //= Eclage Quests -//===== By: ================================================== +//===== By: ================================================== //= Dastgir -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Description: ========================================= +//===== Description: ========================================= //= Quests of Eclage //= Contains All Quest of Eclage -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Converted from the official Aegis script. [Dastgir] -//============================================================ +//============================================================ // Teleport Cats //============================================================ @@ -63,7 +63,7 @@ ecl_fild01,118,311,4 script Teleport Cat No.1#1 4_M_BOSSCAT,{ } warp .maps$[.@mindex[.@i]],.x[.@mindex[.@i]],.y[.@mindex[.@i]]; end; - + OnInit: setarray .maps$,"bif_fild02","ecl_fild01","spl_fild02","mid_camp","man_fild02","dic_fild01"; //Map Names //2,4,8,16,32,64 setarray .x,291,116,51,180,133,159; //X-Co-ordinate of Maps @@ -89,7 +89,7 @@ dic_fild01,161,266,4 duplicate(Teleport Cat No.1#1) Teleport Cat No.6#6 4_M_BOSS //============================================================ ecl_fild01,97,322,0 script #ep14_2Entrance WARPNPC,3,3,{ end; - + OnTouch: if (ep14_2_oliver < 3) { mes "[Security Guard]"; @@ -552,7 +552,6 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ ep14_2_oliver = 4; setquest 11312; close; - case 3: mes "[Fairy Carpenter]"; mes "You can't get past here until it's repaired, so please be careful."; @@ -792,7 +791,6 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ ep14_2_oliver = 7; changequest 11314,11315; close; - } else if (ep14_2_oliver == 7) { mes "[Carpenter Fon]"; @@ -2312,7 +2310,7 @@ ecl_in01,70,88,4 script Sack Merchant#ep14_2 4_M_MERCAT1,{ eclage,292,265,0 script #ep14_2Yube Entrance WARPNPC,2,2,{ end; - + OnTouch: if (ep14_2_oliver < 15) { mes "- Looks like the door is locked. -"; @@ -3326,7 +3324,6 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{ mes "Oh, no, no. I am sure you are really busy. I'm sorry to have asked such a favor."; ep14_2_big = 1; close; - case 2: mes "[" + strcharinfo(PC_NAME) + "]"; mes "Sure. It's not a big deal."; @@ -4132,10 +4129,9 @@ ecl_in02,149,117,4 script Wuhuru#eclbig 4_M_FAIRYFREAK,{ mes "......"; close; } -end; + end; } - eclage,200,272,4 script Masione#eclbig 4_F_FAIRYKID2,{ if (checkweight(Knife,1) == 0 || (MaxWeight - Weight)<2000) { mes "- Stop Here!! -"; @@ -4285,7 +4281,6 @@ eclage,163,228,4 script Goatie#eclbig 4_F_FAIRYKID3,{ } } - eclage,170,195,4 script Svery#eclbig 4_M_FAIRYKID2,{ if (checkweight(Knife,1) == 0 || (MaxWeight - Weight) < 2000) { mes "- Stop Here!! -"; @@ -4412,7 +4407,6 @@ eclage,170,195,4 script Svery#eclbig 4_M_FAIRYKID2,{ close; } - eclage,126,151,4 script Pompe#eclbig 4_M_FAIRYKID3,{ if (checkweight(Knife,1) == 0 || (MaxWeight - Weight) < 2000) { mes "- Stop Here!! -"; @@ -4503,7 +4497,6 @@ eclage,126,151,4 script Pompe#eclbig 4_M_FAIRYKID3,{ close; } - ecl_fild01,70,285,4 script Giranni#eclbig 4_F_FAIRY2,{ if (checkweight(Knife,1) == 0 || (MaxWeight - Weight) < 2000) { mes "- Stop Here!! -"; @@ -4608,7 +4601,7 @@ ecl_fild01,70,285,4 script Giranni#eclbig 4_F_FAIRY2,{ next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "Hmm? Where did it go? Did I drop it on the way?"; - close; + close; } mes "- You describe the corpse that you found in the field and show the piece of wing -"; next; @@ -4701,7 +4694,6 @@ ecl_fild01,70,285,4 script Giranni#eclbig 4_F_FAIRY2,{ close; } - ecl_fild01,269,165,4 script A Laphine corpse#eclbig 4_FAIRYDEADLEAF,{ if (checkweight(Knife,1) == 0 || (MaxWeight - Weight) < 2000) { mes "- Stop Here!! -"; @@ -4996,8 +4988,7 @@ ecl_in01,50,104,4 duplicate(Choir member#eclbig01) Choir member#eclbig03 4_M_FAI ecl_in01,52,104,4 duplicate(Choir member#eclbig01) Choir member#eclbig04 4_M_FAIRYKID ecl_in01,54,104,4 duplicate(Choir member#eclbig01) Choir member#eclbig05 4_M_FAIRYKID - -// Mystery Burglary Quest +// Mystery Burglary Quest //============================================================ eclage,156,51,6 script #hidden_eclage HIDDEN_NPC,3,3,{ end; @@ -5037,7 +5028,7 @@ OnTouch: mes "It's probably nothing."; mes "I should just go on my way~"; close; - } + } } } @@ -7538,7 +7529,7 @@ ecl_in04,208,194,3 script Daughter Luen#eclage2 4_F_FAIRYKID2,{ mes "I'll think about it more and"; mes "figure out who the robber is..."; close; - } + } case 2: mes "[" + strcharinfo(PC_NAME) + "]"; mes "I... I guess"; @@ -7882,7 +7873,7 @@ ecl_in04,208,194,3 script Daughter Luen#eclage2 4_F_FAIRYKID2,{ ep14_2_detect = 10; break; } - break; + break; } break; case 6: @@ -9449,7 +9440,6 @@ ecl_in01,82,79,4 script Magazine#02 HIDDEN_NPC,{ close; } - // Light and Darkness //============================================================ ecl_in02,98,32,3 script Eclage Guard#tl1b 4_M_FAIRYSOLDIER2,{ @@ -9469,7 +9459,7 @@ ecl_in02,98,32,3 script Eclage Guard#tl1b 4_M_FAIRYSOLDIER2,{ ecl_in02,133,115,0 script #pa0829Prison Guard HIDDEN_WARP_NPC,3,3,{ end; - + OnTouch: if (ep14_2_etran < 2) { mes "[Clever]"; @@ -10226,7 +10216,6 @@ ecl_in04,109,215,3 script Hiel#pa0829 4_M_FAIRYSCHOLAR,{ mes "Oh... I guess it was too much to ask for. That's too bad then."; ep14_2_etran = 12; close; - case 2: mes "[Hiel]"; mes "Wow wow! Thank you so much! I'll return the favor by operating it together when the experiments are complete! In the meantime, I'll start preparing for material combination!"; @@ -10289,7 +10278,6 @@ ecl_in04,109,215,3 script Hiel#pa0829 4_M_FAIRYSCHOLAR,{ mes "[Hiel]"; mes "How ruthless... Saying that he won't give them after showing them to me."; close; - case 2: if ((countitem(Dark_Debris)) && (countitem(Yellow_Gemstone) > 1) && (countitem(Red_Gemstone) > 1) && (countitem(Blue_Gemstone) > 1)) { mes "[Hiel]"; @@ -11572,7 +11560,6 @@ OnTouch: next; mes "^000099The reactor was activated, but the dimension does not seem to be related to Etran.^000000"; close; - case 2: mes "[????]"; mes "I... I did it. The restricted area!! Absolute zero ductility!!!!!! And they stole it from me. My gravitational pull of 300 grams."; @@ -11582,7 +11569,6 @@ OnTouch: next; mes "^000099The reactor was activated, but the dimension does not seem to be related to Etran.^000000"; close; - case 3: mes "[????]"; mes "Is this-...(Static static) Is this guy really in the right mind?"; @@ -11619,14 +11605,12 @@ OnTouch: next; mes "^000099The reactor was activated, but the dimension does not seem to be related to Etran. It's cold somehow.^000000"; close; - case 2: mes "[????]"; mes "Human!! Human Chicken!!!!!!!!"; next; mes "^000099The reactor was activated, but the dimension does not seem to be related to Etran. It smells delicious somehow.^000000"; close; - case 3: mes "[????]"; mes "You don't know why I'm upset, do you?"; @@ -11641,7 +11625,7 @@ OnTouch: close; } } -end; + end; } ecl_fild01,179,179,0 duplicate(#pa0829Reactor3) #pa0829Reactor8 HIDDEN_WARP_NPC,3,3 @@ -11665,14 +11649,12 @@ OnTouch: next; mes "^000099The reactor was activated but... For some reason, I'm getting lonely.^000000"; close; - case 2: mes "[???]"; mes "3..8..12..33...31..The last number is erased..."; next; mes "^000099How intriguing...^000000"; close; - case 3: mes "[???]"; mes "I'm going insane."; @@ -11710,14 +11692,12 @@ OnTouch: next; mes "^000099The reactor was activated. Somehow it felt like I had to do whatever they said in it.^000000"; close; - case 2: mes "[???]"; mes "3..8..12..33...31..The last number is erased..."; next; mes "^000099How intriguing...^000000"; close; - case 3: mes "[????]"; mes "Baby, you don't know why I'm upset, do you?"; @@ -11953,14 +11933,12 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{ next; mes "^000099It's been a while since I felt that about myself. Yes, indeed... This machine is getting on my nerves.^000000"; close; - case 2: mes "[???]"; mes "CHTTTTSTATIC~~~~ ANG!?~~ CHTTTTT ~ oh my shoulder!!"; next; mes "^000099Oh, I'm sorry. I'm going to leave this channel.^000000"; close; - case 3: mes "^000099Etran's sad legend^000000"; next; @@ -12014,7 +11992,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{ close2; cutin "",255; end; - case 4: mes "^000099What if Etran and Robert were the priosoner and the guard?^000000"; next; @@ -12032,7 +12009,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{ close2; cutin "",255; end; - case 5: mes "^000099Etran and Robert were put to work as cat merchants.^000000"; next; @@ -12074,7 +12050,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{ close2; cutin "",255; end; - case 6: mes "^000099Etran and Robert were placed in a Flight machine.^000000"; next; @@ -12127,7 +12102,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{ close2; cutin "",255; end; - case 7: mes "^000099Iron Chef Robert^000000"; next; @@ -12159,7 +12133,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{ close2; cutin "",255; end; - case 8: mes "^000099Robert actually likes beer.^000000"; next; @@ -12206,7 +12179,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{ close2; cutin "",255; end; - case 9: mes "^000099Robert the cook^000000"; next; @@ -12244,7 +12216,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{ close2; cutin "",255; end; - case 10: mes "^000099Childhood friends, Etran and Robert^000000"; next; @@ -12292,19 +12263,16 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{ close2; cutin "",255; end; - case 11: mes "^000099In boiling water~ 3 minutes~ ... Static static^000000"; next; mes "^0000993 minutes in boiling water... What after that. Does it mean it will die 3 minutes in boiling water? Do I pour the boiling water over a monster or something?^000000"; close; - case 12: mes "^000099Houston~ Houston~ This is CHTTTCHTTT~ We see a large tower and a tree. It seems like there are life forms here on this planet as well~ STATIC~ ^000000"; next; mes "^000099Some desperate voices are heard. Not sure what the words, planets and life forms, are referring to.^000000"; close; - default: mes "^000099There's too much static. Try adjusting the frequency. ^000000"; close; @@ -12336,18 +12304,15 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{ mes "[Fili]"; mes "What is Eclage like? It's such a nice place."; close; - case 2: mes "[Fili]"; mes "People wouldn't hate or hold each other at knife point if their hearts are filled with love for flowers and the earth."; close; - case 3: mes "[Fili]"; mes "You should avoid going into the tower. It's dangerous. We can't do much for the ones who have already entered, though."; close; } - case 2: if (questprogress(13059,PLAYTIME) == 2) { mes "[Fili]"; @@ -12365,7 +12330,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{ mes "[Fili]"; mes "There are four in the work group. Don't forget to tell everyone."; close; - } + } mes "[Fili]"; mes "Thanks. Can you hear the earth singing? The sound of flowers and trees dancing in the wind. You'll hear it someday."; emotion e_lv; @@ -12544,7 +12509,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{ mes "[Fili]"; mes "I think their work for the field is finished for the day. By the way, ^FF0000there's another work. Ask about it if you're interested.^000000"; erasequest 13050; - ep14_2_nines = 2; + ep14_2_nines = 2; getitem Splendide_Coin,1; //Splendide_Coin getexp 300000,300000; close; @@ -12588,7 +12553,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{ close2; } } - } + } if (ep14_2_oliver > 4) { mes "[Fili]"; mes "Look at this beautiful field filled with little blades of grass and twigs breathing!"; @@ -12677,7 +12642,7 @@ ecl_fild01,83,263,5 script Watering Laphine#1 4_M_FAIRYKID3,{ mes "I think this is enough for the day. I have to take a break and draw water, too. Hehe~!"; close; } - else if ((questprogress(13050) == 1) && (questprogress(13052) == 1)) { + else if ((questprogress(13050) == 1) && (questprogress(13052) == 1)) { mes "[Watering Laphine]"; mes "I'll water these dying flowers and grasses again. This brings them back to life! Hehe~!"; erasequest 13052; @@ -12691,7 +12656,6 @@ ecl_fild01,83,263,5 script Watering Laphine#1 4_M_FAIRYKID3,{ mes "[Watering Laphine]"; mes "I'm sure Eclage needs a Laphine like me! Hehe~!"; close; - } else if (ep14_2_nines == 1){ if ((questprogress(13050) == 1) && (questprogress(13052) == 1)) { @@ -12708,7 +12672,6 @@ ecl_fild01,83,263,5 script Watering Laphine#1 4_M_FAIRYKID3,{ mes "[Watering Laphine]"; mes "Hehe~! Now that I'm done watering, I should wait for the great Fili."; close; - } mes "[Watering Laphine]"; mes "It's my job to water the earth."; @@ -12727,7 +12690,7 @@ ecl_fild01,163,196,5 script Dancing Laphine#1 4_F_FAIRYKID3,{ mes "I would love to see the great Fili next time..."; close; } - if ((questprogress(13050) == 1) && (questprogress(13053) == 1)) { + if ((questprogress(13050) == 1) && (questprogress(13053) == 1)) { mes "[Dancing Laphine]"; mes "Ah, it's you again! You're so insensitive. Anyway, you're here to tell me to start working, right? I see, I see. You can go now."; emotion e_pif; @@ -12860,13 +12823,13 @@ ecl_fild01,237,181,5 script Cute Laphine#1 4_M_FAIRYKID5,{ ecl_tdun02,99,63,5 script Rosi#No.1 4_F_HUWOMAN,1,1,{ end; - + OnInit: if (atoi( charat( strnpcinfo(0), getstrlen(strnpcinfo(0))-1 ) ) > 1){ disablenpc strnpcinfo(0); } end; - + OnTouch: if (ep14_2_nines < 2) { mes "[Rosi]"; @@ -12902,7 +12865,6 @@ OnTouch: mes "[Rosi]"; mes "This tower is very quiet yet mysterious. It's definitely something that adventurers would love, right?"; close; - } else if (ep14_2_nines == 2) { if ((questprogress(13055) == 1) && (questprogress(13056) == 1)) { @@ -12952,7 +12914,7 @@ ecl_tdun02,22,36,5 duplicate(Rosi#No.1) Rosi#No.3 4_F_HUWOMAN,1,1 ecl_tdun01,11,62,5 script Euncheong#No.1 4_M_HUBOY,1,1,{ end; - + OnInit: if (atoi( charat( strnpcinfo(0), getstrlen(strnpcinfo(0))-1 ) ) > 1){ disablenpc strnpcinfo(0); @@ -13125,7 +13087,6 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ close2; cutin "",255; end; - case 2: if (questprogress(13062,PLAYTIME) == 1) { cutin "nines02",2; @@ -13218,7 +13179,6 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ close2; cutin "",255; end; - case 3: if (questprogress(13064,PLAYTIME) == 1) { cutin "nines02",2; @@ -13285,7 +13245,6 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ close2; cutin "",255; end; - case 4: if (questprogress(13066,PLAYTIME) == 1) { cutin "nines03",2; @@ -13411,7 +13370,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ close2; cutin "",255; end; - } + } cutin "nines03",2; mes "[New Oz]"; mes "Don't worry. I'm pretty much done writing a song. I'm almost done with the lyrics as well as the melody."; @@ -13421,7 +13380,6 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{ close2; cutin "",255; end; - } cutin "nines02",2; mes "[New Oz]"; @@ -14126,7 +14084,7 @@ ecl_tdun04,26,39,1 script Professor Worm#worm 4_M_PROFESSORWORM,{ ecl_tdun04,21,41,0 script #pf HIDDEN_WARP_NPC,2,2,{ end; - + OnTouch: .@pro = rand(1,100); if (ep14_2_profe == 1) { @@ -14209,7 +14167,6 @@ OnTouch: mes "But why do I have to remain in a place like this, too?"; close; } - } ecl_tdun04,35,31,0 script #prf2 HIDDEN_WARP_NPC,2,2,{ @@ -14251,7 +14208,6 @@ OnTouch: mes "I wonder if I'll forget even my name... How it worries me..."; close; } - } ecl_tdun04,28,43,0 script #prf3 HIDDEN_WARP_NPC,2,2,{ @@ -14378,7 +14334,7 @@ OnTouch: next; mes "[Wall Note 5]"; mes "Monsters, I have to create more monsters to protect me. As many as I could possibly create!"; - close; + close; } } @@ -14608,7 +14564,7 @@ ecl_fild01,173,95,7 script Diary Frog No. 30#worm 4_FROG,{ mes "If you come back to late, all you'll hear are my moans and groans."; changequest 1226,1227; ep14_2_profe = 10; - close; + close; } else if (ep14_2_profe == 10) { if (countitem(Star_Shape_Mushroom) < 10) { @@ -14672,7 +14628,7 @@ ecl_fild01,173,95,7 script Diary Frog No. 30#worm 4_FROG,{ mes "I'm so mad, I oughta throw this out!"; next; mes "It seems that a continued search for diary recordings would be meaningless. I should go back to Professor Worm."; - close; + close; } } @@ -14797,7 +14753,6 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{ mes "Let's talk to other travelers."; setquest 7411; break; - case 2: mes "[Fome]"; mes "The main attraction of Eclage?"; @@ -14855,7 +14810,6 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{ hideonnpc "Eclage Guard#tl01"; warp "ecl_in03",244,89; end; - case 2: mes "[Eclage Guard]"; mes "Oh, is that right?"; @@ -14875,7 +14829,6 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{ cutin "",255; hideonnpc "Eclage Guard#tl01"; end; - } } mes "[Fome]"; @@ -14948,7 +14901,6 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{ mes "What Fome said is interesting."; mes "A distrusted king...should I listen to what other Laphines say about it?"; close; - } mes "[Fome]"; mes "I'm sure there is something."; @@ -14959,7 +14911,7 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{ mes "I should start planning on moving to the next region. "; mes "I'm debating whether I should just go back or go to Mora Village..."; close; - + OnTouch: if (ep14_2_mylord == 0 && BaseLevel > 98) { mes "A group of travelers of Alpheim are having a conversation."; @@ -14971,7 +14923,6 @@ OnTouch: case 1: mes "They don't seem to care that much."; close; - case 2: mes "When you approach, they stop talking for a second and make a seat for you."; mes "Start a conversation."; @@ -15081,7 +15032,6 @@ ecl_in01,32,51,7 script Traveler Litrip#tl02 4_M_DOGTRAVELER,{ cutin "",255; warp "ecl_in03",244,89; end; - case 2: mes "[Eclage Guard]"; mes "Oh, is that right?"; @@ -15101,7 +15051,6 @@ ecl_in01,32,51,7 script Traveler Litrip#tl02 4_M_DOGTRAVELER,{ hideonnpc "Eclage Guard#tl01"; cutin "",255; end; - } } mes "[Litrip]"; @@ -15270,7 +15219,6 @@ ecl_in01,35,51,3 script Traveler Chiba#tl03 4_M_DOGTRAVELER2,{ warp "ecl_in03",244,89; cutin "",255; end; - case 2: mes "[Eclage Guard]"; mes "Oh, is that right?"; @@ -15290,7 +15238,6 @@ ecl_in01,35,51,3 script Traveler Chiba#tl03 4_M_DOGTRAVELER2,{ hideonnpc "Eclage Guard#tl01"; cutin "",255; end; - } } mes "[Chiba]"; @@ -15338,11 +15285,11 @@ ecl_in01,31,49,7 script Eclage Guard#tl01 4_M_FAIRYSOLDIER,{ OnInit: hideonnpc "Eclage Guard#tl01"; end; - + OnEnable: hideoffnpc "Eclage Guard#tl01"; end; - + OnDisable: hideonnpc "Eclage Guard#tl01"; end; @@ -15375,7 +15322,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{ cutin "",255; warp "ecl_in03",244,89; end; - case 2: mes "[Eclage Guard]"; mes "Ah...is that right?"; @@ -15404,7 +15350,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{ warp "ecl_in03",244,89; cutin "",255; end; - case 2: mes "[Eclage Guard]"; mes "Is that right?"; @@ -15439,7 +15384,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{ warp "ecl_in03",58,72; cutin "",255; end; - case 2: mes "[Eclage Guard]"; mes "Do as you wish although Mayor Jun might be upset if you keep him waiting for too long."; @@ -15460,7 +15404,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{ warp "ecl_in03",58,72; cutin "",255; end; - case 2: mes "[Eclage Guard]"; mes "Thank you."; @@ -15496,7 +15439,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{ mes "Well, I understand."; cutin "minuel01",2; break; - case 2: mes "[Minuel]"; mes "Actually I don't have any time for myself since I have to be here all the time."; @@ -15531,7 +15473,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{ mes "I'll be counting on you!"; setquest 7418; break; - case 2: mes "[Minuel]"; mes "Ha, do you really think so?"; @@ -15539,7 +15480,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{ mes "Soon, in the near future. Hehehe"; cutin "minuel02",2; break; - } close2; cutin "",255; @@ -15731,7 +15671,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{ mes "That's too bad."; mes "Maybe next time!"; break; - case 2: mes "[Minuel]"; mes "Thank you so much."; @@ -16041,7 +15980,6 @@ ecl_in03,245,93,3 script Chief of Staff#tl01 4_F_FAIRY,{ mes "A scholar of magics? There's no one with that name among the scholars I know. "; mes "I don't know."; close; - } else if ((ep14_2_mylord > 17) && (ep14_2_mylord < 22)) { mes "[Shenime]"; @@ -16232,7 +16170,6 @@ ecl_in03,245,93,3 script Chief of Staff#tl01 4_F_FAIRY,{ ep14_2_mylord = 26; changequest 7445,7447; close; - } else if (ep14_2_mylord == 26) { mes "[Shenime]"; @@ -16308,7 +16245,6 @@ ecl_in03,245,93,3 script Chief of Staff#tl01 4_F_FAIRY,{ ep14_2_mylord = 28; changequest 7448,7449; close; - case 2: mes "When you held Shenime's hand, you felt a sharp pain in your hand."; mes "You took your hand off quickly and examined it, but nothing was there."; @@ -16323,7 +16259,6 @@ ecl_in03,245,93,3 script Chief of Staff#tl01 4_F_FAIRY,{ close2; warp "ecl_hub01",129,12; end; - } } else if (ep14_2_mylord == 28) { @@ -16336,7 +16271,6 @@ ecl_in03,245,93,3 script Chief of Staff#tl01 4_F_FAIRY,{ mes "Shouldn't you, a foreigner, consider it as an honor and receive the offer?"; mes "You're hesitating too much."; close; - case 2: mes "When you held Shenime's hand, you felt a sharp pain in your hand."; mes "You took your hand off quickly and examined it, but nothing was there."; @@ -17993,7 +17927,6 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{ mes ".........isn't it depressing."; close; } - } ecl_fild01,205,86,3 script Eclage Messenger Roy#tl 4_M_FAIRYSOLDIER2,{ @@ -18825,7 +18758,6 @@ ecl_tdun04,32,35,3 script Hisie#tlord 4_M_FARIY_HISIE,{ mes "I need to see what Avant is researching about."; mes "Let's hurry."; close2; - } else if ((ep14_2_mylord == 22) || (ep14_2_mylord == 23)) { cutin "hisie03",0; @@ -19119,18 +19051,18 @@ OnTouch: close2; cutin "",255; end; - + OnStop: stopnpctimer; end; OnTimer5000: - mapannounce "que_avan01","Welcome, Sir Avant. User certification standby for 5 minutes.",bc_map,"0xA8A8A8"; + mapannounce "que_avan01","Welcome, Sir Avant. User certification standby for 5 minutes.",bc_map,"0xA8A8A8"; end; OnTimer360000: - mapannounce "que_avan01","Warning: Long-term use was not certified. Restrictive magic on unauthorized personnel will automatically be executed.",bc_map,"0xA8A8A8"; + mapannounce "que_avan01","Warning: Long-term use was not certified. Restrictive magic on unauthorized personnel will automatically be executed.",bc_map,"0xA8A8A8"; end; OnTimer365000: - mapannounce "que_avan01","Research lab interior space has been distorted. Sweeping in process.",bc_map,"0x7b68ee"; + mapannounce "que_avan01","Research lab interior space has been distorted. Sweeping in process.",bc_map,"0x7b68ee"; end; OnTimer368000: mapwarp "que_avan01","eclage",265,275; @@ -19383,7 +19315,7 @@ OnEnable: monster "que_avan01",29,36,"DARK_PRIEST",DARK_PRIEST,1; monster "que_avan01",29,32,"DARK_PRIEST",DARK_PRIEST,1; end; - + OnReset: mapwarp "que_avan01","eclage",265,275; killmonster "que_avan01","#avtmanager::OnMyMobDead"; @@ -19399,10 +19331,10 @@ OnReset: hideoffnpc "#tltimer"; $111204_avantlabo = 0; end; - + OnMyMobDead: if (mobcount ("que_avan01","#avtmanager::OnMyMobDead") == 0) { - mapannounce "que_avan01","Hisie: This is it for you! Avant!!",bc_map,"0x7b68ee"; + mapannounce "que_avan01","Hisie: This is it for you! Avant!!",bc_map,"0x7b68ee"; hideonnpc "Hisie#tlspt"; hideoffnpc "Hisie#tlhunt"; } @@ -19420,20 +19352,20 @@ que_avan01,26,41,3 script Avant Magic Scholar#tlac 4_M_FAIRYAVANT,{ initnpctimer; monster "que_avan01",26,38,"HIDDEN_MOB",HIDDEN_MOB,1; end; - + OnInit: hideonnpc "Avant Magic Scholar#tlac"; end; - + OnKill: killmonster "que_avan01","Avant Magic Scholar#tlac::OnMyMobDead"; stopnpctimer; end; - + OnTimer2000: - mapannounce "que_avan01","Hisie: Watch out!!!",bc_map,"0x7b68ee"; + mapannounce "que_avan01","Hisie: Watch out!!!",bc_map,"0x7b68ee"; end; - + OnTimer8000: killmonster "que_avan01","Avant Magic Scholar#tlac::OnMyMobDead"; stopnpctimer; diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index 4cd3ec886..2f13ad618 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -4612,7 +4612,7 @@ mal_in02,187,58,3 script Chef Nyas 4_CAT_CHEF,{ setquest 7276; mal_food = 0; erasequest 7280+.@i; - + // Quantities grouped in 10s repeating. // [ 3, 3, 6, 6, 9, 9, 12, 12, 15, 18 ] // Last group [ 61 - 66 ] receives 25 constant. diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index e67a827e9..925f28507 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -3165,7 +3165,7 @@ ma_fild01,251,93,3 script Lost Child#malaya01 4_F_BARYO_GIRL,{ } } end; - + OnInit: if (strnpcinfo(0) != "Lost Child#malaya01") disablenpc strnpcinfo(0); @@ -3770,7 +3770,7 @@ ma_fild01,158,243,6 script Tribe Blacksmith#malaya 4_M_MALAYA,{ .@newItem = 2492; break; } - + if (!(.@item)) { mes "[Bayani]"; mes "You should wear the equipment to upgrade and not come without it on you."; @@ -3817,11 +3817,11 @@ ma_fild01,158,243,6 script Tribe Blacksmith#malaya 4_M_MALAYA,{ mes "[Bayani]"; mes "BAM!!"; next; - + delitem 6499,20; //Ancient_Grudge delequip .@part; getitem .@newItem, 1; - + mes "[Bayani]"; mes "Ha ha. Perfect."; mes "Congratulations. Your armor is better than ever."; -- cgit v1.2.3-60-g2f50