From c116ea51790a6d42280cf599192614dc373cf91d Mon Sep 17 00:00:00 2001 From: Lance Date: Sun, 19 Nov 2006 04:46:50 +0000 Subject: Updated scripts with select().. THERE ARE TONS OF THEM!! Will somebody give me a hand or something? :B git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9259 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/airports/airships.txt | 6 +++++- npc/cities/amatsu.txt | 3 +++ npc/cities/gonryun.txt | 3 +++ npc/cities/hugel.txt | 2 ++ npc/cities/lighthalzen.txt | 2 +- npc/cities/niflheim.txt | 9 +++++++++ npc/cities/valkyrie.txt | 1 + npc/events/idul_fitri.txt | 1 + npc/merchants/kunai_maker.txt | 2 ++ npc/merchants/novice_exchange.txt | 2 ++ npc/merchants/refine.txt | 3 ++- npc/other/comodo_gambling.txt | 2 ++ npc/other/dts_warper.txt | 10 +++------- npc/other/marriage.txt | 10 +++++++++- npc/other/powernpc.txt | 8 +++++++- npc/quests/gunslinger_quests.txt | 11 +++++++++++ 16 files changed, 63 insertions(+), 12 deletions(-) (limited to 'npc') diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index ab5826fac..b6e43c727 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -856,6 +856,7 @@ function script applegamble { mes "in a friendly game of Dice?"; next; switch(select("Play Dice Game:Learn Dice Game Rules:Cancel")){ + case 255: case 3: mes "["+getarg(0)+"]"; mes "I'm up for a game of"; @@ -937,7 +938,7 @@ L_Input: mes "betting ^FF0000"+@amount+"^000000 Apples."; mes "Is that right?"; next; - if(select("Yes:No")==2){ + if(select("Yes:No")==2 || @menu == 255){ mes "["+getarg(0)+"]"; mes "Mm, made a mistake?"; mes "Alright, please enter the"; @@ -1043,6 +1044,9 @@ L_Input: mes "luck next time."; } close; + } else { + if(@menu == 255) + end; } mes "^0000FF*Rolling and rumbling*"; set @player3,rand(1,6); diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index a4542edc3..e54c56e10 100644 --- a/npc/cities/amatsu.txt +++ b/npc/cities/amatsu.txt @@ -823,6 +823,9 @@ s_Got: set @stoneStr$,"Rough Wind"; break; + case 255: + end; + } if(countitem(@stoneID) < 8)goto s_NEnough; mes "[Laspuchin Gregory]"; diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt index 1549721d3..bc92d920f 100644 --- a/npc/cities/gonryun.txt +++ b/npc/cities/gonryun.txt @@ -239,6 +239,7 @@ gonryun.gat,237,226,3 script YunKyoHam#gn 776,{ mes "My curse shall be on his head!!!"; close; } + if(@menu == 255) end; mes "[YunKyoHam]"; mes "ohoh! Thank you!"; mes "Take these potions."; @@ -500,6 +501,8 @@ gonryun.gat,163,60,4 script Gonryun Guide 780,{ mes "Enjoy your trip in"; mes "lovely Gonryun!"; break; + case 255: + end; } close; } diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt index 61c6c5bb0..7d9a9e984 100644 --- a/npc/cities/hugel.txt +++ b/npc/cities/hugel.txt @@ -45,6 +45,8 @@ hu_in01.gat,23,311,4 script Johsh 898,{ mes @npcname$; mes "Aww~~ you miss it"; close; + case 255: + end; } } diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index c03c2c2d0..49fc9f60b 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -1050,7 +1050,7 @@ lighthalzen.gat,312,234,2 script Beggar 777,{ mes "Would you give me"; mes "some money?"; next; - if(select("Give him some money.:Ignore him.")==2){ + if(select("Give him some money.:Ignore him.")==2 || @menu == 255){ mes "[" + strcharinfo(0) + "]"; mes "..."; mes "......"; diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt index 6c20f0141..99a4e5efd 100644 --- a/npc/cities/niflheim.txt +++ b/npc/cities/niflheim.txt @@ -171,12 +171,21 @@ L_book3: if(select("Clover.:Klaatu.:Kleitos.")==2) set @nif_t,@nif_t + 10; + if(@menu == 255) + end; + if(select("Verit.:Veritas.:Verata.")==3) set @nif_t,@nif_t + 10; + if(@menu == 255) + end; + if(select("Necktie.:Necklace.:Nero.:^FFFFFFNictu.^000000")==4) set @nif_t,@nif_t + 10; + if(@menu == 255) + end; + mes "[Ashe Bruce]"; if(@nif_t == 30){ if(rand(9)){ diff --git a/npc/cities/valkyrie.txt b/npc/cities/valkyrie.txt index 1aea9c3aa..502cd46d5 100644 --- a/npc/cities/valkyrie.txt +++ b/npc/cities/valkyrie.txt @@ -45,6 +45,7 @@ yuno_in02.gat,93,207,0 script Book of Ymir 111,{ mes "can be realized in the Hall of Honor."; next; switch(select("Stop reading.:Continue reading.")) { + case 255: case 1: mes "[Book of Ymir]"; mes ". . . . ."; diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt index b5b62df5d..7414c19a9 100644 --- a/npc/events/idul_fitri.txt +++ b/npc/events/idul_fitri.txt @@ -67,6 +67,7 @@ prontera.gat,146,92,3 script Cellerb 58,{ emotion e_thx; close; + case 255: case 2: mes @npcname$; mes "Oh well, maybe you will participate in tommorow's quest."; diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt index f836befdf..3f2eae55c 100644 --- a/npc/merchants/kunai_maker.txt +++ b/npc/merchants/kunai_maker.txt @@ -38,6 +38,7 @@ switch(select("10 Poison Kunais:10 Icycle Kunais:10 Rough Wind Kunais:10 Black S callfunc "Kunai_Trade",13254,1,7521,2,13258; goto L_Bye; case 6: + case 255: goto L_Bye; } L_Bye: @@ -90,6 +91,7 @@ function script Kunai_Trade { next; return; case 2: + case 255: return; } L_Return: diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt index 6c2dda72b..aed369124 100644 --- a/npc/merchants/novice_exchange.txt +++ b/npc/merchants/novice_exchange.txt @@ -134,6 +134,8 @@ function script F_NMerch { mes "Hah, no problem."; mes "Bah!"; close; + case 255: + end; } } diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 1ea743dc3..5f3922984 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -798,12 +798,13 @@ function script repairmain { getitemname(getbrokenid(3)),getitemname(getbrokenid(4)),getitemname(getbrokenid(5)), getitemname(getbrokenid(6)),getitemname(getbrokenid(7)),getitemname(getbrokenid(8)), getitemname(getbrokenid(9)),getitemname(getbrokenid(10))); + if(@choice == 255) end; mes "[" + @name$ + "]"; mes "You're gonna repair " + getitemname(getbrokenid(@choice)) + "."; mes "To repair this, I need " + @repairprice + " Zeny."; mes "Continue?"; next; - if(select("Yes","No") == 2) { + if(select("Yes","No") == 2 || @menu == 255) { mes "[" + @name$ + "]"; mes "Ok, but don't expect to be using that..."; close; diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt index 9412810e1..f9cbd557b 100644 --- a/npc/other/comodo_gambling.txt +++ b/npc/other/comodo_gambling.txt @@ -124,6 +124,8 @@ comodo.gat,219,160,3 script Kachua 91,{ set @item,512; switch( select( "Weapon", "Armor", "Garment", "Helmet", "Shoes", "Shield" ) ) { + case 255: + end; case 1: // Weapons set @gamble,rand(1,1000); if ((@gamble > 920) && (@gamble < 931)) diff --git a/npc/other/dts_warper.txt b/npc/other/dts_warper.txt index f7f71d9c2..31d38bba2 100644 --- a/npc/other/dts_warper.txt +++ b/npc/other/dts_warper.txt @@ -824,17 +824,13 @@ function script F_DTS_Warp { next; switch(select(@dtswarp$[0],@dtswarp$[1],@dtswarp$[2],@dtswarp$[3])){ case 1: - set @num, 0; - break; case 2: - set @num, 1; - break; case 3: - set @num, 2; - break; case 4: - set @num, 3; + set @num, @menu - 1; break; + default: + end; } Lwarp: if (@dtswarp$[@num] == "Cancel") goto Lcancel; diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index 200968bb2..35571a1ae 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -215,6 +215,8 @@ function SF_AcceptGroom { mes "["+@name$+"]"; mes "After your groom approves, you will be given your rings, the ceremony will begin and you will be officially married."; close; + default: + end; } } @@ -248,6 +250,8 @@ function SF_AcceptBride { mes "["+@name$+"]"; mes "After your bride approves, you will be given your rings, the ceremony will begin and you will be officially married."; close; + default: + end; } } @@ -478,6 +482,8 @@ prt_church.gat,106,99,3 script Sister Mary 67,{ case 4: //Register SF_Register(); break; + default: + end; } } while (@menu > 1); end; @@ -873,6 +879,8 @@ prt_church.gat,94,99,4 script Sister Lisa 79,{ initnpctimer; mes "Very well, get your partner to confirm, and I will collect the fee for filing the divorce then."; close; + default: + end; } } while (@menu > 1); end; @@ -894,7 +902,7 @@ function SF_InProgress { mes $@divorcer$+" has asked to divorce you. If you accept, and have the fee of "+$@wed_divorce_fee+"z at hand, I will proceed to divorce you two."; mes "So, should I proceed with the divorce?"; next; - if (select("I don't want to divorce....","Yes, we have agreed to this.")!=2) { + if (select("I don't want to divorce....", "Yes, we have agreed to this.") !=2) { mes "["+@name$+"]"; mes "I hope you can work things out."; emotion e_pat; diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt index 94539780e..5785d1201 100644 --- a/npc/other/powernpc.txt +++ b/npc/other/powernpc.txt @@ -110,6 +110,7 @@ gonryun.gat,180,118,4 script Iron man#gnp 85,{ mes "something new. Wanna try??"; break; case 3: + case 255: mes "[Songmoodoo]"; mes "I guess not.."; mes "...."; @@ -164,7 +165,7 @@ gon_test.gat,50,14,4 script Administrator#gnp 780,{ mes "Remember, you have to pay"; mes "500z to fight."; next; - if (select("Yes, let me fight!:One moment, please.") == 2) { + if (select("Yes, let me fight!:One moment, please.") != 1) { mes "[Administrator]"; mes "Ok, see you later."; close; @@ -199,11 +200,15 @@ gon_test.gat,42,89,4 script Summoner#gnp 774,{ mes "Which monster would you recall?"; next; set @gnpGroup,select("Group 1:Group 2:Group 3:Group 4:Group 5:Group 6:Group 7:Group 8:Group 9:Group 10:Group 11"); + if(@gnpGroup > 11 || @gnpGroup < 1) + end; set @gnpGroupMob$,.gnpMobsName$[(@gnpGroup-1)*6]; for (set @i,1; @i < 6; set @i, @i+1) { set @gnpGroupMob$, @gnpGroupMob$ + ":" + .gnpMobsName$[(@gnpGroup-1)*6 + @i]; } set @gnpMob,select(@gnpGroupMob$); + if(@gnpMob > 6 || @gnpMob < 1) + end; mes "[SongYeunWoo]"; mes "Let the fight begin!"; close2; @@ -305,6 +310,7 @@ gon_test.gat,46,14,3 script Guide of field of fight#gnp 770,{ warp "gonryun.gat",177,112; end; case 5: + case 255: mes "[SongHeeYeon]"; mes "........"; mes "Good bye.."; diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt index cb2823a88..ef769dc87 100644 --- a/npc/quests/gunslinger_quests.txt +++ b/npc/quests/gunslinger_quests.txt @@ -95,6 +95,9 @@ que_ng.gat,182,85,3 script Mr.Garrison 109,{ mes "will never part from his"; mes "favorite gun, heh."; close; + + default: + end; } L_Slot: @@ -162,6 +165,8 @@ L_Slot: mes "Okay, come back when you"; mes "changed your mind."; close; + default: + end; } L_Already: @@ -247,6 +252,8 @@ que_ng.gat,187,163,3 script Ingrid 744,{ mes "Probably a good choice."; mes "It's really dangerous."; close; + default: + end; } } @@ -322,6 +329,8 @@ que_ng.gat,185,180,3 script Vanessa 726,{ mes @npcname$; mes "Oh well, your loss."; close; + default: + end; } } @@ -401,5 +410,7 @@ que_ng.gat,149,178,5 script N.A 744,{ mes @npcname$; mes "Oh well, your loss."; close; + default: + end; } } \ No newline at end of file -- cgit v1.2.3-70-g09d2