From 16496f556a38e624dc75a61097ce4d9b6c370d0b Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Tue, 9 Jan 2007 17:59:27 +0000 Subject: - Updated some functions calls that where using the wrong number of arguments with checkcart,checkfalcon,checkriding,getgmlevel,basicskillcheck. hmm, maybe I should add a config option for lazy scripter that still want to run script code that uses too many arguments git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9637 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 4 ++++ npc/cities/valkyrie.txt | 18 +++++++++--------- npc/custom/WoE_Setter.txt | 2 +- npc/custom/adoption.txt | 2 +- npc/custom/breeder.txt | 6 +++--- npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt | 4 ++-- npc/custom/eAAC_Scripts/messageboards.txt | 4 ++-- npc/custom/eAAC_Scripts/quest_warper.txt | 8 ++++---- npc/custom/jobs/jobmaster.txt | 2 +- npc/custom/lottery.txt | 2 +- npc/custom/market.txt | 2 +- npc/custom/penal_servitude.txt | 2 +- npc/custom/shifty_assassin.txt | 2 +- npc/custom/stock_market.txt | 4 ++-- npc/events/event_skill_reset.txt | 8 ++++---- npc/jobs/novice/supernovice.txt | 2 +- npc/kafras/functions_kafras.txt | 4 ++-- npc/merchants/renters.txt | 6 +++--- 18 files changed, 43 insertions(+), 39 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 89818ac13..04f6a7b3b 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -34,6 +34,10 @@ KarLaeda Date Added ====== +2007/01/09 + * Updated some functions calls that where using the wrong number of + arguments with checkcart,checkfalcon,checkriding,getgmlevel, + basicskillcheck. [FlavioJS] 2007/01/05 * Updated SL job Quest according to iRO, thanks to Sousuke_PL [Lupus] 2007/01/03 diff --git a/npc/cities/valkyrie.txt b/npc/cities/valkyrie.txt index 4b64b826b..2c145a092 100644 --- a/npc/cities/valkyrie.txt +++ b/npc/cities/valkyrie.txt @@ -257,9 +257,9 @@ L_CHANGE: next; mes "[Valhallana]"; if(Zeny || Weight) goto L_ZENYITEMS; - if(checkcart(0)) goto L_CART; - if(checkfalcon(0)) goto L_FALCON; - if(checkriding(0)) goto L_PECO; + if(checkcart()) goto L_CART; + if(checkfalcon()) goto L_FALCON; + if(checkriding()) goto L_PECO; if(skillpoint > 0) goto L_SKILLPNTS; mes "Let's start your reincarnation ceremony..."; @@ -368,9 +368,9 @@ function script F_ToHigh { L_GETHIGH: mes "["+getarg(3)+"]"; if(JobLevel < 10) goto L_NOTREADY; - if(checkcart(0)) goto L_CART; - if(checkfalcon(0)) goto L_FALCON; - if(checkriding(0)) goto L_PECO; + if(checkcart()) goto L_CART; + if(checkfalcon()) goto L_FALCON; + if(checkriding()) goto L_PECO; if(skillpoint > 0) goto L_SKILLPNTS; mes "Hello there, "+strcharinfo(0)+"!"; @@ -450,9 +450,9 @@ function script F_Rebirth { L_GET3RD: if(JobLevel < 45) goto L_NOTREADY; - if(checkcart(0)) goto L_CART; - if(checkfalcon(0)) goto L_FALCON; - if(checkriding(0)) goto L_PECO; + if(checkcart()) goto L_CART; + if(checkfalcon()) goto L_FALCON; + if(checkriding()) goto L_PECO; if(skillpoint > 0) goto L_SKILLPNTS; mes "Congratulations!"; diff --git a/npc/custom/WoE_Setter.txt b/npc/custom/WoE_Setter.txt index 9fafa0233..bd9460968 100644 --- a/npc/custom/WoE_Setter.txt +++ b/npc/custom/WoE_Setter.txt @@ -26,7 +26,7 @@ //============================================================ prontera.gat,162,194,5 script WoE Setter 806,{ mes "[Woe Setter]"; - if(getgmlevel(99)<1) goto L_NotGM; + if(getgmlevel()<99) goto L_NotGM; mes "Welcome, I can set WoE times for you"; mes "Simply follow the intruction given in each section after this, and it should be set and ready to use"; next; diff --git a/npc/custom/adoption.txt b/npc/custom/adoption.txt index af0c8d3b2..ef4611e0c 100644 --- a/npc/custom/adoption.txt +++ b/npc/custom/adoption.txt @@ -55,7 +55,7 @@ prt_church.gat,162,171,0 warp prtch01-3 1,2,prt_church.gat,113,122 prt_church.gat,166,176,3 script Adoption Man 61,{ //If u're a GM you can always reset current Adoption process - if(getgmlevel(99)>=90) { + if(getgmlevel()>=90) { mes "[GM Menu]"; mes "Would you like to reset curent adoption?"; next; diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index 5f36d4165..9afb31e29 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -25,7 +25,7 @@ L_Menu: close; L_Cart: - if((BaseClass == Job_Merchant || BaseJob == Job_SuperNovice) && checkcart(0) == 0) goto L_Cart_Ok; + if((BaseClass == Job_Merchant || BaseJob == Job_SuperNovice) && checkcart() == 0) goto L_Cart_Ok; if(getskilllv(39)<1) goto L_Need_Skill; mes "[Universal Rental Npc]"; @@ -42,7 +42,7 @@ L_Need_Skill: close; L_Falcon: - if(BaseJob != Job_Archer && BaseClass == Job_Archer && checkfalcon(0) == 0) goto L_Falc; + if(BaseJob != Job_Archer && BaseClass == Job_Archer && checkfalcon() == 0) goto L_Falc; if(getskilllv(127)<1) goto L_Need_Skill2; mes "[Universal Rental Npc]"; @@ -59,7 +59,7 @@ L_Need_Skill2: close; L_Peco: - if (BaseJob != Job_Swordman && BaseClass == Job_Swordman && checkriding(0) == 0) goto L_Peco_Ok; + if (BaseJob != Job_Swordman && BaseClass == Job_Swordman && checkriding() == 0) goto L_Peco_Ok; if(getskilllv(63)<1) goto L_Need_Skill3; mes "[Universal Rental Npc]"; diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt index 5aa2d3dd4..eb5c3567b 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt @@ -300,7 +300,7 @@ L_HEAL_ALL: //Function storage: allows access to the storage facility //The sent argument is the displaying image, so we can clear it afterwards. function script F_keStorage { - if(basicskillcheck(0) > 0 && getskilllv(1) < 6) { + if(basicskillcheck() > 0 && getskilllv(1) < 6) { callfunc "F_keIntro", -1, "I am sorry, but you beed basic skill level 6 to use the storage."; return; } @@ -318,7 +318,7 @@ function script F_keStorage { //Function G Storage: Allows access to the Guild Storage function script F_keGuildStorage { - if(basicskillcheck(0) > 0 && getskilllv(1) < 6) { + if(basicskillcheck() > 0 && getskilllv(1) < 6) { callfunc "F_keIntro", -1, "I am sorry, but you beed basic skill level 6 to use the storage."; return; } diff --git a/npc/custom/eAAC_Scripts/messageboards.txt b/npc/custom/eAAC_Scripts/messageboards.txt index 331e42385..3c03289f8 100644 --- a/npc/custom/eAAC_Scripts/messageboards.txt +++ b/npc/custom/eAAC_Scripts/messageboards.txt @@ -326,8 +326,8 @@ mes "Posted By: "+$messageboardpostname$[@tempview]+"."; mes "On: "+$messageboardpostdate$[@tempview]+"."; mes $messageboardpost$[@tempview]+"."; next; -if(($mymessage[@tempview] == 5) && (getgmlevel(99)>0)) menu "Next Message",L_top2,"Delete My Message",L_delmy,"Edit my message",L_editmy,"Delete This message",L_Del; -if((getgmlevel(99)>0)) menu "Next Message",L_top2,"Delete This message",L_Del; +if(($mymessage[@tempview] == 5) && (getgmlevel()>=99)) menu "Next Message",L_top2,"Delete My Message",L_delmy,"Edit my message",L_editmy,"Delete This message",L_Del; +if((getgmlevel()>=99)) menu "Next Message",L_top2,"Delete This message",L_Del; if(($mymessage[@tempview] == 5)) menu "Next Message",L_top2,"Delete My Message",L_delmy,"Edit my message",L_editmy; menu "Next message",L_top2; close; diff --git a/npc/custom/eAAC_Scripts/quest_warper.txt b/npc/custom/eAAC_Scripts/quest_warper.txt index bfd876060..78857c74b 100644 --- a/npc/custom/eAAC_Scripts/quest_warper.txt +++ b/npc/custom/eAAC_Scripts/quest_warper.txt @@ -578,7 +578,7 @@ Zeny_short_SP: L_Storage: next; - if(basicskillcheck(0) > 0 && getskilllv(1) < 6) goto L_StorageJBlow; + if(basicskillcheck() > 0 && getskilllv(1) < 6) goto L_StorageJBlow; set @fee, $QW_S_PRICE; if ($QW_S_PRICE == 60 && BaseJob == Job_Novice) set @fee, 30; if(Zeny<@fee) callsub L_Short_on_zeny,2; @@ -732,9 +732,9 @@ function script QWS_MMarray { set @Mi,0; // That's our loop counter. set @Mj,0; // That's the menu lines counter. //----------------GameMaster-Menu - if (getgmlevel(80)) set @Mmenulist$[@Mj],@pMmenuitems$[@Mi]; - if (getgmlevel(80)) set @Mmenuref[@Mj],@Mi; - if (getgmlevel(80)) set @Mj,@Mj+1; + if (getgmlevel()>=80) set @Mmenulist$[@Mj],@pMmenuitems$[@Mi]; + if (getgmlevel()>=80) set @Mmenuref[@Mj],@Mi; + if (getgmlevel()>=80) set @Mj,@Mj+1; set @Mi,@Mi+1; //----------------Special-Warp callfunc "QWS_TownStamps"; diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt index a8c147f11..79e609d93 100644 --- a/npc/custom/jobs/jobmaster.txt +++ b/npc/custom/jobs/jobmaster.txt @@ -162,7 +162,7 @@ prontera.gat,153,193,6 script Job Master 123,{ } close; } - if(checkfalcon(0) || checkcart(0) || checkriding(0)) goto L_remove; + if(checkfalcon() || checkcart() || checkriding()) goto L_remove; if((Class >=Job_Knight) && (Class <=Job_Crusader2)){ mes "Do you want to reborn?"; if(select("Yes","No")==1){ diff --git a/npc/custom/lottery.txt b/npc/custom/lottery.txt index ed35fa42e..67002391c 100644 --- a/npc/custom/lottery.txt +++ b/npc/custom/lottery.txt @@ -98,7 +98,7 @@ if ($LID > 99999) mes "Your Ticket ("+#LID+"):"; if ($LID > 99999) mes "^FF0000[" + #LW1 + "] [" + #LW2 + "] [" + #LW3 + "] [" + #LW4 + "] [" + #LW5 + "] [" + #LW6 + "]^000000"; mes "Next Draw-ID: ^FF0000" + $LID + "^000000."; next; -if (getgmlevel(3) > 90) goto L_GM; +if (getgmlevel() > 90) goto L_GM; menu "Claim Prize",L_Claim,"Buy New Ticket",L_Buy,"Cancel",L_Cancel; // PURCHASE TICKET diff --git a/npc/custom/market.txt b/npc/custom/market.txt index c3484c896..1227c2844 100644 --- a/npc/custom/market.txt +++ b/npc/custom/market.txt @@ -23,7 +23,7 @@ prontera.gat,144,174,3 script Market Place 722,{ end; M_ENTER: - if(rand(10)==0 && checkcart(0) && @mrketflg<30 && @mrketflg>5 && getcharid(2)>1) FlagEmblem getcharid(2); + if(rand(10)==0 && checkcart() && @mrketflg<30 && @mrketflg>5 && getcharid(2)>1) FlagEmblem getcharid(2); warp "gon_test",27+rand(5),98; set @mrketflg,@mrketflg+1; end; diff --git a/npc/custom/penal_servitude.txt b/npc/custom/penal_servitude.txt index ec32bb663..1bb5f925b 100644 --- a/npc/custom/penal_servitude.txt +++ b/npc/custom/penal_servitude.txt @@ -87,7 +87,7 @@ M_Q1: menu "OK, I'll work off!",-, "I love this prison!",M_NO_THANKS; mes "[Saddeus]"; - if(checkcart(0) || checkfalcon(0) || checkriding(0)){ + if(checkcart() || checkfalcon() || checkriding()){ emotion e_hmm; mes "I'm sorry, you should release your Cart, PecoPeco or Falcon!"; close; diff --git a/npc/custom/shifty_assassin.txt b/npc/custom/shifty_assassin.txt index 940a7808e..496947c23 100644 --- a/npc/custom/shifty_assassin.txt +++ b/npc/custom/shifty_assassin.txt @@ -20,7 +20,7 @@ M_Start: mes "[Shifty Assassin]"; mes "What do you want?"; next; -if (getgmlevel(3) > 90) goto M_GM; +if (getgmlevel() > 90) goto M_GM; menu "Buy Ninjas",M_Buy,"Assassinate somebody",M_Kill,"Check your Ninjas",M_Check,"Cancel",M_Exit; M_GM: menu "Buy Ninjas",M_Buy,"Assassinate somebody",M_Kill,"Check your Ninjas",M_Check,"Add Ninjas",M_Add,"Cancel",M_Exit; diff --git a/npc/custom/stock_market.txt b/npc/custom/stock_market.txt index 7da3c5244..0d4d36885 100644 --- a/npc/custom/stock_market.txt +++ b/npc/custom/stock_market.txt @@ -178,7 +178,7 @@ set @stotal,$S1+$S2+$S3+$S4+$S5+$S6+$S7+$S8+$S9+$S10; if (@stotal > 0) goto S_Start; mes "[Stock Market]"; mes "Trading is currently closed."; -if (getgmlevel(3) > 90) goto GM_Open; +if (getgmlevel() > 90) goto GM_Open; close; // Begining of interface // @@ -253,7 +253,7 @@ mes "^21698F"+$S10N$+"^000000" + " " + $S10 + "z (" + @S10Update$ + ")"; next; // GM Menu link // -if (getgmlevel(3) > 90) goto GM_subMenu; +if (getgmlevel() > 90) goto GM_subMenu; menu "Portfolio",S_Port,"Buy Shares",S_Buy,"Sell Shares",S_Sell,"Cancel",S_Quit; GM_subMenu: diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index 5da389d56..867a55dd3 100644 --- a/npc/events/event_skill_reset.txt +++ b/npc/events/event_skill_reset.txt @@ -32,7 +32,7 @@ yuno.gat,138,187,4 script Hypnotist Teacher 124,{ mes "Please come again soon!"; close; } - if(Weight || checkfalcon(0) || checkcart(0) || checkriding(0)) { + if(Weight || checkfalcon() || checkcart() || checkriding()) { mes "Would you like to reset skills?"; mes "I'm sorry, but..."; next; @@ -41,11 +41,11 @@ yuno.gat,138,187,4 script Hypnotist Teacher 124,{ mes "You cannot reset skills"; mes "when you keep"; mes "any items."; - } else if(checkcart(0)) + } else if(checkcart()) mes "Please, drop your cart and we'll continue."; - else if(checkfalcon(0)) + else if(checkfalcon()) mes "Please, free your Falcon and we'll continue."; - else if(checkriding(0)) + else if(checkriding()) mes "Please, free your PecoPeco and we'll continue."; next; mes @npcname$; diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt index a988ac0ea..4f94859bb 100644 --- a/npc/jobs/novice/supernovice.txt +++ b/npc/jobs/novice/supernovice.txt @@ -218,7 +218,7 @@ L_Otherjob: // -- Car Rental -- aldebaran.gat,54,238,5 script Kafra 117,{ if(BaseJob != Job_SuperNovice) goto L_Otherjob; - if(checkcart(0) == 1) goto L_GotCart; + if(checkcart() == 1) goto L_GotCart; mes "[Kafra]"; mes "Oh, a Super Novice!"; mes "You're annoyed that the other Kafras won't lend you a cart?"; diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 2b9d67bff..65d03ed21 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -205,7 +205,7 @@ function script F_KafStor { cutin "", 255; close; } - if(basicskillcheck(0) && getskilllv(1) < 6){ + if(basicskillcheck() && getskilllv(1) < 6){ mes "[Kafra]"; mes "I am sorry but you have to be at least Novice level 6 if you want to use the storage."; return; @@ -316,7 +316,7 @@ function script F_KafCart { mes "I'm sorry but you need the skill ^0000FF'Pushcart'^000000 to rent a cart."; return 1; } - if(checkcart(0) == 1){ + if(checkcart() == 1){ mes "[Kafra]"; mes "Excuse me... but you already have a cart...."; emotion e_swt; diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index 0c530710c..a225f736e 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -46,7 +46,7 @@ L_Start: M_0: if(getskilllv(63) == 0) goto sL_NeedSkill; if(Zeny < @price) goto sL_Zeny; - if(checkriding(0) != 0) goto sL_GotPeco; + if(checkriding() != 0) goto sL_GotPeco; set Zeny, Zeny - @price; setriding; mes "Thank you and good day."; @@ -99,7 +99,7 @@ L_Start: M_0: if(getskilllv(63) == 0) goto sL_NeedSkill; if(Zeny < @price) goto sL_Zeny; - if(checkriding(0) != 0) goto sL_GotPeco; + if(checkriding() != 0) goto sL_GotPeco; set Zeny, Zeny - @price; setriding; mes "Thank you and good day."; @@ -147,7 +147,7 @@ hu_in01.gat,375,318,5 script Falcon Master 59,{ sM_0: if(BaseJob != Job_Hunter) goto sL_NotHunter; - if(checkfalcon(0) != 0) goto sL_GotFalc; + if(checkfalcon() != 0) goto sL_GotFalc; if(Zeny < @price) goto sL_Zeny; if(getskilllv(127)==0) goto sL_NoSkill; set Zeny, Zeny - @price; -- cgit v1.2.3-60-g2f50