diff options
| author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
| commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
| tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /npc/merchants/renters.txt | |
| parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
| parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
| download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'npc/merchants/renters.txt')
| -rw-r--r-- | npc/merchants/renters.txt | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index cac757f85..00ff18dd5 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -26,9 +26,9 @@ // PecoPeco Breeder (for Knights)------------------------------------------- prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ - if(Upper==0) set .@price,2500; //Normal Peco - default price - if(Upper==1) set .@price,2500; //Armored Peco - if(Upper==2) set .@price,2500; //Baby Peco + if(Upper==0) .@price = 2500; //Normal Peco - default price + if(Upper==1) .@price = 2500; //Armored Peco + if(Upper==2) .@price = 2500; //Baby Peco mes "[Peco Peco Breeder]"; if (BaseJob == Job_Knight && Class < Job_Rune_Knight) { @@ -48,7 +48,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ mes "bankrupt?"; close; } - else if(getskilllv("KN_RIDING") == 0) { + else if(getskilllv(KN_RIDING) == 0) { mes "[Peco Peco Breeder]"; mes "I'm sorry, but you're"; mes "not eligible for this"; @@ -56,7 +56,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ mes "the Peco Peco Ride skill first."; close; } - else if(checkriding()) { + else if(checkmount()) { mes "[Peco Peco Breeder]"; mes "You're already"; mes "mounted on a"; @@ -68,7 +68,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ close; } Zeny -= .@price; - setriding; + setmount(MOUNT_PECO); close; case 2: mes "[Peco Peco Breeder]"; @@ -88,9 +88,9 @@ prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ // Grand PecoPeco Breeder (for Crusaders)------------------------------------------- prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{ - if(Upper==0) set .@price,3500; //Normal Peco - default price - if(Upper==1) set .@price,3500; //Armored Peco - if(Upper==2) set .@price,3500; //Baby Peco + if(Upper==0) .@price = 3500; //Normal Peco - default price + if(Upper==1) .@price = 3500; //Armored Peco + if(Upper==2) .@price = 3500; //Baby Peco mes "[PecoPeco Breeder]"; if (BaseJob == Job_Crusader && Class < Job_Rune_Knight) { @@ -112,14 +112,14 @@ prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{ mes "bring "+.@price+" zeny..."; close; } - else if(getskilllv("KN_RIDING") == 0) { + else if(getskilllv(KN_RIDING) == 0) { mes "[Peco Peco Breeder]"; mes "You must first learn"; mes "to ride a PecoPeco before"; mes "I can rent one to you."; close; } - else if(checkriding()) { + else if(checkmount()) { mes "[Peco Peco Breeder]"; mes "You are already"; mes "mounted on a Peco Peco."; @@ -130,7 +130,7 @@ prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{ close; } Zeny -= .@price; - setriding; + setmount(MOUNT_PECO); close; case 2: mes "[PecoPeco Breeder]"; @@ -149,9 +149,9 @@ prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{ // Falcon Master-------------------------------------------------------------- hu_in01,381,304,5 script Falcon Breeder#hnt 8W_SOLDIER,{ - if(Upper==0) set .@price,2500; //Normal Falcon - default price - if(Upper==1) set .@price,2500; //Scarf Falcon - if(Upper==2) set .@price,2500; //Baby Falcon + if(Upper==0) .@price = 2500; //Normal Falcon - default price + if(Upper==1) .@price = 2500; //Scarf Falcon + if(Upper==2) .@price = 2500; //Baby Falcon mes "[Falcon Breeder]"; if (BaseJob == Job_Hunter) { |