summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-05-08 16:15:07 +0200
committerHaru <haru@dotalux.com>2015-05-08 16:21:05 +0200
commitad9a14992cde8ad6759263da37e723b2b1825981 (patch)
treef6c168973bb2d2c5f243ad1c5688ae15439dcc5c /npc/merchants
parent513059cad7510c20f44e1a19f731efbe2f28dbec (diff)
downloadhercules-ad9a14992cde8ad6759263da37e723b2b1825981.tar.gz
hercules-ad9a14992cde8ad6759263da37e723b2b1825981.tar.bz2
hercules-ad9a14992cde8ad6759263da37e723b2b1825981.tar.xz
hercules-ad9a14992cde8ad6759263da37e723b2b1825981.zip
Replaced checkre() calls with constants
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/shops.txt4
-rw-r--r--npc/merchants/socket_enchant2.txt3
2 files changed, 3 insertions, 4 deletions
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index a45ec6adb..33f72a1fb 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -269,7 +269,7 @@ OnInit:
sellitem Flash_Shuriken;
sellitem Sharp_Leaf_Shuriken;
sellitem Thorn_Needle_Shuriken;
- if (checkre(0)){
+ if (RENEWAL) {
sellitem Explosive_Kunai;
sellitem Makibishi;
}
@@ -286,7 +286,7 @@ OnInit:
sellitem Charm_Ice;
sellitem Charm_Wind;
sellitem Charm_Earth;
- if (checkre(0)){
+ if (RENEWAL) {
sellitem Fox_Armguard;
sellitem Special_Ninja_Suit;
}
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index afd19eba6..a93c87a03 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -169,8 +169,7 @@
mes "A class? You seem to want little too much. But, no problem.";
mes "So, what kind of armor do you have?";
next;
- switch(select("Pirate Bandana:Black Leather Boots"+(checkre(0)?":Special Ninja Suit":"")))
- {
+ switch (select("Pirate Bandana:Black Leather Boots"+(RENEWAL?":Special Ninja Suit":""))) {
case 1: callfunc "Func_Socket2",2287,5350,50,61,500,985,1; // 50,61 - it's not a typo
case 2: callfunc "Func_Socket2",2425,2434,40,51,500,985,1;
case 3: callfunc "Func_Socket2",15053,15056,50,61,500,985,1;