diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/merchants/renters.txt | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/merchants/renters.txt')
| -rw-r--r-- | npc/merchants/renters.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index ee9f70952..dc4d67235 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -25,7 +25,7 @@ //============================================================ // PecoPeco Breeder (for Knights)------------------------------------------- -prontera,55,350,5 script Peco Peco Breeder#knt 105,{ +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 @@ -88,7 +88,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 105,{ } // Grand PecoPeco Breeder (for Crusaders)------------------------------------------- -prontera,232,318,3 script Peco Peco Breeder#cru 105,{ +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 @@ -150,7 +150,7 @@ prontera,232,318,3 script Peco Peco Breeder#cru 105,{ } // Falcon Master-------------------------------------------------------------- -hu_in01,381,304,5 script Falcon Breeder#hnt 105,{ +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 |