From c6ba813994eaaae0a98416f5be7ff65d0e8e13b5 Mon Sep 17 00:00:00 2001 From: Cydh Ramdh Date: Tue, 30 Sep 2014 09:52:29 +0700 Subject: [PATCH] Bug Fixes: * Wrong calls, should be callfunc. Thank @raynra * Follow up 8256194, updated const.txt following new MAPID values for Super Novices * EAJL_SUPER_NOVICE 0x8000, for Super Novice masking * EAJ_SUPER_NOVICE 0x8100 * EAJ_SUPER_BABY 0xA100 * EAJ_SUPER_NOVICE_E 0xC100 * EAJ_SUPER_BABY_E 0xE100 Signed-off-by: Cydh Ramdh --- db/const.txt | 10 ++++++---- npc/merchants/ammo_dealer.txt | 4 ++-- src/map/map.h | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/db/const.txt b/db/const.txt index f31b3d0740..43cd8799c5 100644 --- a/db/const.txt +++ b/db/const.txt @@ -175,6 +175,7 @@ EAJL_2 0x300 EAJL_UPPER 0x1000 EAJL_BABY 0x2000 EAJL_THIRD 0x4000 +EAJL_SUPER_NOVICE 0x8000 EAJ_BASEMASK 0x00ff EAJ_UPPERMASK 0x0fff @@ -192,7 +193,6 @@ EAJ_GUNSLINGER 0x09 EAJ_NINJA 0x0A EAJ_GANGSI 0x0E -EAJ_SUPER_NOVICE 0x100 EAJ_KNIGHT 0x101 EAJ_WIZARD 0x102 EAJ_HUNTER 0x103 @@ -243,7 +243,6 @@ EAJ_BABY_ACOLYTE 0x2004 EAJ_BABY_MERCHANT 0x2005 EAJ_BABY_THIEF 0x2006 -EAJ_SUPER_BABY 0x2100 EAJ_BABY_KNIGHT 0x2101 EAJ_BABY_WIZARD 0x2102 EAJ_BABY_HUNTER 0x2103 @@ -258,7 +257,6 @@ EAJ_BABY_MONK 0x2204 EAJ_BABY_ALCHEMIST 0x2205 EAJ_BABY_ROGUE 0x2206 -EAJ_SUPER_NOVICE_E 0x4100 EAJ_RUNE_KNIGHT 0x4101 EAJ_WARLOCK 0x4102 EAJ_RANGER 0x4103 @@ -287,7 +285,6 @@ EAJ_SURA_T 0x5204 EAJ_GENETIC_T 0x5205 EAJ_SHADOW_CHASER_T 0x5206 -EAJ_SUPER_BABY_E 0x6100 EAJ_BABY_RUNE 0x6101 EAJ_BABY_WARLOCK 0x6102 EAJ_BABY_RANGER 0x6103 @@ -302,6 +299,11 @@ EAJ_BABY_SURA 0x6204 EAJ_BABY_GENETIC 0x6205 EAJ_BABY_CHASER 0x6206 +EAJ_SUPER_NOVICE 0x8100 +EAJ_SUPER_BABY 0xA100 +EAJ_SUPER_NOVICE_E 0xC100 +EAJ_SUPER_BABY_E 0xE100 + bc_all 0 bc_map 1 bc_area 2 diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt index 6699257ace..c4f00ab6a5 100644 --- a/npc/merchants/ammo_dealer.txt +++ b/npc/merchants/ammo_dealer.txt @@ -67,11 +67,11 @@ S_BulletTrade: mes "[Tony]"; mes "For every set of"; - mes callsub("F_InsertPlural",30,getitemname(.@bullet_id))+","; + mes callfunc("F_InsertPlural",30,getitemname(.@bullet_id))+","; mes "you must give me"; mes "1 Emveretarcon,"; mes "1 Phracon, and"; - mes callsub("F_InsertPlural",.@required_amount,getitemname(.@required_id))+"."; + mes callfunc("F_InsertPlural",.@required_amount,getitemname(.@required_id))+"."; next; mes "[Tony]"; mes "Remember that I can give"; diff --git a/src/map/map.h b/src/map/map.h index 0db15d47e9..3d9ba11b34 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -114,7 +114,7 @@ enum MOBID { //These marks the "level" of the job. #define JOBL_2_1 0x100 //256 #define JOBL_2_2 0x200 //512 -#define JOBL_2 0x300 //1024 +#define JOBL_2 0x300 //768 #define JOBL_UPPER 0x1000 //4096 #define JOBL_BABY 0x2000 //8192