Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #881 from rathena/cleanup/const.txt

Browse Source 
Clean up the way we handle our script constants.
Since most of them come from source anyway we now export them directly into the scripting engine to ensure that they use the correct values.
The main benefits are that you users don't have to fear that we forget to adjust something according to source changes, if you use the constants in your scripts that is, and we developers do not have to think about updating them anyway. It also guarantees that constants that used wrong values before this use the correct values that are defined source side.
This commit is contained in:
Lemongrass3110 2016-01-07 19:31:37 +01:00
commit e76fdbf15b
18 changed files with 3137 additions and 2835 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2443
db/const.txt
View File

File diff suppressed because it is too large Load Diff

2
doc/sample/getmonsterinfo.txt
View File

@ -17,7 +17,7 @@ prontera,156,179,6 script test_getmonsterinfo 117,{
}
mes "Monster ID: "+.@value+" '"+getmonsterinfo(.@value,MOB_NAME)+"'";
mes "Current Monster info:";
for (.@i = 0; .@i < 23; .@i++)
for (.@i = MOB_NAME; .@i <= MOB_MVPEXP; .@i++)
mes " getmonsterinfo("+.@value+","+.@i+") = "+getmonsterinfo(.@value,.@i);
close;
}

93
doc/script_commands.txt
View File

@ -3255,32 +3255,31 @@ mob database and return the info set by TYPE argument.
It will return -1 if there is no such monster (or the type value is invalid),
or "null" if you requested the monster's name.
Valid types are listed in 'db/const.txt':
MOB_NAME 0
MOB_LV 1
MOB_MAXHP 2
MOB_BASEEXP 3
MOB_JOBEXP 4
MOB_ATK1 5
MOB_ATK2 6
MOB_DEF 7
MOB_MDEF 8
MOB_STR 9
MOB_AGI 10
MOB_VIT 11
MOB_INT 12
MOB_DEX 13
MOB_LUK 14
MOB_RANGE 15
MOB_RANGE2 16
MOB_RANGE3 17
MOB_SIZE 18
MOB_RACE 19
MOB_ELEMENT 20
MOB_MODE 21
MOB_MVPEXP 22
Valid types are:
MOB_NAME - monster's name, if there is no such monster "null" is returned
MOB_LV - monster's level
MOB_MAXHP - monster's maximum hp
MOB_BASEEXP - monster's base experience
MOB_JOBEXP - monster's job experience
MOB_ATK1 - monster's atk
MOB_ATK2 - monster's atk2
MOB_DEF - monster's def
MOB_MDEF - monster's mdef
MOB_STR - monster's str
MOB_AGI - monster's agi
MOB_VIT - monster's vit
MOB_INT - monster's int
MOB_DEX - monster's dex
MOB_LUK - monster's luk
MOB_RANGE - monster's range
MOB_RANGE2 - monster's range2
MOB_RANGE3 - monster's range3
MOB_SIZE - monster's size
MOB_RACE - monster's race
MOB_ELEMENT - monster's element(doesn't return the element level, only the element ID)
MOB_MODE - monster's mode
MOB_MVPEXP - monster's mvp experience
Note: MOB_ELEMENT doesn't return the element level, only the element ID.
For more details, see the sample in 'doc/sample/getmonsterinfo.txt'.
---------------------------------------
@ -4216,28 +4215,28 @@ type you want to change, then the palette you want to use. Make sure you specify
a palette number that exists/is usable by the client you use.
'changelook' works the same, but is only client side (it doesn't save the look value).
// This will change your hair(6), so that it uses palette 8, what ever your
// This will change your hair color, so that it uses palette 8, what ever your
// palette 8 is, your hair will use that color
setlook 6,8;
setlook LOOK_HAIR_COLOR,8;
// This will change your clothes(7), so they are using palette 1, whatever
// This will change your clothes color, so they are using palette 1, whatever
// your palette 1 is, your clothes will then use that set of colors.
setlook 7,1;
setlook LOOK_CLOTHES_COLOR,1;
Here are the possible look types:
0 - Base sprite
1 - Hairstyle
2 - Weapon
3 - Head bottom
4 - Head top
5 - Head mid
6 - Hair color
7 - Clothes color
8 - Shield
9 - Shoes
LOOK_BASE - Base sprite
LOOK_HAIR - Hairstyle
LOOK_WEAPON - Weapon
LOOK_HEAD_BOTTOM - Head bottom
LOOK_HEAD_TOP - Head top
LOOK_HEAD_MID - Head mid
LOOK_HAIR_COLOR - Hair color
LOOK_CLOTHES_COLOR - Clothes color
LOOK_SHIELD - Shield
LOOK_SHOES - Shoes
Whatever 'shoes' means is anyone's guess, ask Gravity - the client does nothing
with this value. It still wants it from the server though, so it is kept, but
@ -8507,15 +8506,15 @@ server and the egg will disappear when anyone tries to hatch it.
This function will return pet information for the pet the invoking character
currently has active. Valid types are:
0 - Pet ID
1 - Pet class number as per 'db/pet_db.txt' - will tell you what kind of a pet it
PETINFO_ID - Pet ID
PETINFO_CLASS - Pet class number as per 'db/pet_db.txt' - will tell you what kind of a pet it
is.
2 - Pet name. Will return "null" if there's no pet.
3 - Pet friendly level (intimacy score). 1000 is full loyalty.
4 - Pet hungry level. 100 is completely full.
5 - Pet rename flag. 0 means this pet has not been named yet.
6 - Pet level
7 - Pet Game ID
PETINFO_NAME - Pet name. Will return "null" if there's no pet.
PETINFO_INTIMATE - Pet friendly level (intimacy score). 1000 is full loyalty.
PETINFO_HUNGRY - Pet hungry level. 100 is completely full.
PETINFO_RENAMED - Pet rename flag. 0 means this pet has not been named yet.
PETINFO_LEVEL - Pet level
PETINFO_BLOCKID - Pet Game ID
---------------------------------------

1
src/map/CMakeLists.txt
View File

@ -39,6 +39,7 @@ set( MAP_HEADERS
"${MAP_SOURCE_DIR}/pet.h"
"${MAP_SOURCE_DIR}/quest.h"
"${MAP_SOURCE_DIR}/script.h"
"${MAP_SOURCE_DIR}/script_constants.h"
"${MAP_SOURCE_DIR}/searchstore.h"
"${MAP_SOURCE_DIR}/skill.h"
"${MAP_SOURCE_DIR}/status.h"

4
src/map/pc.c
View File

@ -11674,10 +11674,10 @@ bool pc_is_same_equip_index(enum equip_index eqi, short *equip_index, short inde
if (eqi == EQI_HEAD_TOP && (equip_index[EQI_HEAD_MID] == index || equip_index[EQI_HEAD_LOW] == index))
return true;
// Headgear with Mid & Low location
if (eqi == EQI_COSTUME_MID && equip_index[EQI_COSTUME_LOW] == index)
if (eqi == EQI_COSTUME_HEAD_MID && equip_index[EQI_COSTUME_HEAD_LOW] == index)
return true;
// Headgear with Top & Mid or Low location
if (eqi == EQI_COSTUME_TOP && (equip_index[EQI_COSTUME_MID] == index || equip_index[EQI_COSTUME_LOW] == index))
if (eqi == EQI_COSTUME_HEAD_TOP && (equip_index[EQI_COSTUME_HEAD_MID] == index || equip_index[EQI_COSTUME_HEAD_LOW] == index))
return true;
return false;
}

6
src/map/pc.h
View File

@ -54,9 +54,9 @@ enum equip_index {
EQI_ARMOR,
EQI_HAND_L,
EQI_HAND_R,
EQI_COSTUME_TOP,
EQI_COSTUME_MID,
EQI_COSTUME_LOW,
EQI_COSTUME_HEAD_TOP,
EQI_COSTUME_HEAD_MID,
EQI_COSTUME_HEAD_LOW,
EQI_COSTUME_GARMENT,
EQI_AMMO,
EQI_SHADOW_ARMOR,

395
src/map/script.c
View File

@ -2237,304 +2237,7 @@ static void read_constdb(void)
* Sets source-end constants for NPC scripts to access.
**/
void script_hardcoded_constants(void) {
/* server defines */
script_set_constant("PACKETVER",PACKETVER,false);
script_set_constant("MAX_LEVEL",MAX_LEVEL,false);
script_set_constant("MAX_STORAGE",MAX_STORAGE,false);
script_set_constant("MAX_INVENTORY",MAX_INVENTORY,false);
script_set_constant("MAX_CART",MAX_INVENTORY,false);
script_set_constant("MAX_ZENY",MAX_ZENY,false);
script_set_constant("MAX_PARTY",MAX_PARTY,false);
script_set_constant("MAX_GUILD",MAX_GUILD,false);
script_set_constant("MAX_GUILDLEVEL",MAX_GUILDLEVEL,false);
script_set_constant("MAX_GUILD_STORAGE",MAX_GUILD_STORAGE,false);
script_set_constant("MAX_BG_MEMBERS",MAX_BG_MEMBERS,false);
script_set_constant("MAX_CHAT_USERS",MAX_CHAT_USERS,false);
script_set_constant("VIP_SCRIPT",VIP_SCRIPT,false);
script_set_constant("MIN_STORAGE",MIN_STORAGE,false);
/* status options */
script_set_constant("Option_Nothing",OPTION_NOTHING,false);
script_set_constant("Option_Sight",OPTION_SIGHT,false);
script_set_constant("Option_Hide",OPTION_HIDE,false);
script_set_constant("Option_Cloak",OPTION_CLOAK,false);
script_set_constant("Option_Falcon",OPTION_FALCON,false);
script_set_constant("Option_Riding",OPTION_RIDING,false);
script_set_constant("Option_Invisible",OPTION_INVISIBLE,false);
script_set_constant("Option_Orcish",OPTION_ORCISH,false);
script_set_constant("Option_Wedding",OPTION_WEDDING,false);
script_set_constant("Option_Ruwach",OPTION_RUWACH,false);
script_set_constant("Option_Chasewalk",OPTION_CHASEWALK,false);
script_set_constant("Option_Flying",OPTION_FLYING,false);
script_set_constant("Option_Xmas",OPTION_XMAS,false);
script_set_constant("Option_Transform",OPTION_TRANSFORM,false);
script_set_constant("Option_Summer",OPTION_SUMMER,false);
script_set_constant("Option_Dragon1",OPTION_DRAGON1,false);
script_set_constant("Option_Wug",OPTION_WUG,false);
script_set_constant("Option_Wugrider",OPTION_WUGRIDER,false);
script_set_constant("Option_Madogear",OPTION_MADOGEAR,false);
script_set_constant("Option_Dragon2",OPTION_DRAGON2,false);
script_set_constant("Option_Dragon3",OPTION_DRAGON3,false);
script_set_constant("Option_Dragon4",OPTION_DRAGON4,false);
script_set_constant("Option_Dragon5",OPTION_DRAGON5,false);
script_set_constant("Option_Hanbok",OPTION_HANBOK,false);
script_set_constant("Option_Oktoberfest",OPTION_OKTOBERFEST,false);
/* status option compounds */
script_set_constant("Option_Dragon",OPTION_DRAGON,false);
script_set_constant("Option_Costume",OPTION_COSTUME,false);
/* sc_start flags */
script_set_constant("SCSTART_NONE",SCSTART_NONE,false);
script_set_constant("SCSTART_NOAVOID",SCSTART_NOAVOID,false);
script_set_constant("SCSTART_NOTICKDEF",SCSTART_NOTICKDEF,false);
script_set_constant("SCSTART_LOADED",SCSTART_LOADED,false);
script_set_constant("SCSTART_NORATEDEF",SCSTART_NORATEDEF,false);
script_set_constant("SCSTART_NOICON",SCSTART_NOICON,false);
/* unit control - mob */
script_set_constant("UMOB_SIZE",UMOB_SIZE,false);
script_set_constant("UMOB_LEVEL",UMOB_LEVEL,false);
script_set_constant("UMOB_HP",UMOB_HP,false);
script_set_constant("UMOB_MAXHP",UMOB_MAXHP,false);
script_set_constant("UMOB_MASTERAID",UMOB_MASTERAID,false);
script_set_constant("UMOB_MAPID",UMOB_MAPID,false);
script_set_constant("UMOB_X",UMOB_X,false);
script_set_constant("UMOB_Y",UMOB_Y,false);
script_set_constant("UMOB_SPEED",UMOB_SPEED,false);
script_set_constant("UMOB_MODE",UMOB_MODE,false);
script_set_constant("UMOB_AI",UMOB_AI,false);
script_set_constant("UMOB_SCOPTION",UMOB_SCOPTION,false);
script_set_constant("UMOB_SEX",UMOB_SEX,false);
script_set_constant("UMOB_CLASS",UMOB_CLASS,false);
script_set_constant("UMOB_HAIRSTYLE",UMOB_HAIRSTYLE,false);
script_set_constant("UMOB_HAIRCOLOR",UMOB_HAIRCOLOR,false);
script_set_constant("UMOB_HEADBOTTOM",UMOB_HEADBOTTOM,false);
script_set_constant("UMOB_HEADMIDDLE",UMOB_HEADMIDDLE,false);
script_set_constant("UMOB_HEADTOP",UMOB_HEADTOP,false);
script_set_constant("UMOB_CLOTHCOLOR",UMOB_CLOTHCOLOR,false);
script_set_constant("UMOB_SHIELD",UMOB_SHIELD,false);
script_set_constant("UMOB_WEAPON",UMOB_WEAPON,false);
script_set_constant("UMOB_LOOKDIR",UMOB_LOOKDIR,false);
script_set_constant("UMOB_STR",UMOB_STR,false);
script_set_constant("UMOB_AGI",UMOB_AGI,false);
script_set_constant("UMOB_VIT",UMOB_VIT,false);
script_set_constant("UMOB_INT",UMOB_INT,false);
script_set_constant("UMOB_DEX",UMOB_DEX,false);
script_set_constant("UMOB_LUK",UMOB_LUK,false);
script_set_constant("UMOB_SLAVECPYMSTRMD",UMOB_SLAVECPYMSTRMD,false);
script_set_constant("UMOB_DMGIMMUNE",UMOB_DMGIMMUNE,false);
script_set_constant("UMOB_ATKRANGE",UMOB_ATKRANGE,false);
script_set_constant("UMOB_ATKMIN",UMOB_ATKMIN,false);
script_set_constant("UMOB_ATKMAX",UMOB_ATKMAX,false);
script_set_constant("UMOB_MATKMIN",UMOB_MATKMIN,false);
script_set_constant("UMOB_MATKMAX",UMOB_MATKMAX,false);
script_set_constant("UMOB_DEF",UMOB_DEF,false);
script_set_constant("UMOB_MDEF",UMOB_MDEF,false);
script_set_constant("UMOB_HIT",UMOB_HIT,false);
script_set_constant("UMOB_FLEE",UMOB_FLEE,false);
script_set_constant("UMOB_PDODGE",UMOB_PDODGE,false);
script_set_constant("UMOB_CRIT",UMOB_CRIT,false);
script_set_constant("UMOB_RACE",UMOB_RACE,false);
script_set_constant("UMOB_ELETYPE",UMOB_ELETYPE,false);
script_set_constant("UMOB_ELELEVEL",UMOB_ELELEVEL,false);
script_set_constant("UMOB_AMOTION",UMOB_AMOTION,false);
script_set_constant("UMOB_ADELAY",UMOB_ADELAY,false);
script_set_constant("UMOB_DMOTION",UMOB_DMOTION,false);
/* unit control - homunculus */
script_set_constant("UHOM_SIZE",UHOM_SIZE,false);
script_set_constant("UHOM_LEVEL",UHOM_LEVEL,false);
script_set_constant("UHOM_HP",UHOM_HP,false);
script_set_constant("UHOM_MAXHP",UHOM_MAXHP,false);
script_set_constant("UHOM_SP",UHOM_SP,false);
script_set_constant("UHOM_MAXSP",UHOM_MAXSP,false);
script_set_constant("UHOM_MASTERCID",UHOM_MASTERCID,false);
script_set_constant("UHOM_MAPID",UHOM_MAPID,false);
script_set_constant("UHOM_X",UHOM_X,false);
script_set_constant("UHOM_Y",UHOM_Y,false);
script_set_constant("UHOM_HUNGER",UHOM_HUNGER,false);
script_set_constant("UHOM_INTIMACY",UHOM_INTIMACY,false);
script_set_constant("UHOM_SPEED",UHOM_SPEED,false);
script_set_constant("UHOM_LOOKDIR",UHOM_LOOKDIR,false);
script_set_constant("UHOM_CANMOVETICK",UHOM_CANMOVETICK,false);
script_set_constant("UHOM_STR",UHOM_STR,false);
script_set_constant("UHOM_AGI",UHOM_AGI,false);
script_set_constant("UHOM_VIT",UHOM_VIT,false);
script_set_constant("UHOM_INT",UHOM_INT,false);
script_set_constant("UHOM_DEX",UHOM_DEX,false);
script_set_constant("UHOM_LUK",UHOM_LUK,false);
script_set_constant("UHOM_DMGIMMUNE",UHOM_DMGIMMUNE,false);
script_set_constant("UHOM_ATKRANGE",UHOM_ATKRANGE,false);
script_set_constant("UHOM_ATKMIN",UHOM_ATKMIN,false);
script_set_constant("UHOM_ATKMAX",UHOM_ATKMAX,false);
script_set_constant("UHOM_MATKMIN",UHOM_MATKMIN,false);
script_set_constant("UHOM_MATKMAX",UHOM_MATKMAX,false);
script_set_constant("UHOM_DEF",UHOM_DEF,false);
script_set_constant("UHOM_MDEF",UHOM_MDEF,false);
script_set_constant("UHOM_HIT",UHOM_HIT,false);
script_set_constant("UHOM_FLEE",UHOM_FLEE,false);
script_set_constant("UHOM_PDODGE",UHOM_PDODGE,false);
script_set_constant("UHOM_CRIT",UHOM_CRIT,false);
script_set_constant("UHOM_RACE",UHOM_RACE,false);
script_set_constant("UHOM_ELETYPE",UHOM_ELETYPE,false);
script_set_constant("UHOM_ELELEVEL",UHOM_ELELEVEL,false);
script_set_constant("UHOM_AMOTION",UHOM_AMOTION,false);
script_set_constant("UHOM_ADELAY",UHOM_ADELAY,false);
script_set_constant("UHOM_DMOTION",UHOM_DMOTION,false);
/* unit control - pet */
script_set_constant("UPET_SIZE",UPET_SIZE,false);
script_set_constant("UPET_LEVEL",UPET_LEVEL,false);
script_set_constant("UPET_HP",UPET_HP,false);
script_set_constant("UPET_MAXHP",UPET_MAXHP,false);
script_set_constant("UPET_MASTERAID",UPET_MASTERAID,false);
script_set_constant("UPET_MAPID",UPET_MAPID,false);
script_set_constant("UPET_X",UPET_X,false);
script_set_constant("UPET_Y",UPET_Y,false);
script_set_constant("UPET_HUNGER",UPET_HUNGER,false);
script_set_constant("UPET_INTIMACY",UPET_INTIMACY,false);
script_set_constant("UPET_SPEED",UPET_SPEED,false);
script_set_constant("UPET_LOOKDIR",UPET_LOOKDIR,false);
script_set_constant("UPET_CANMOVETICK",UPET_CANMOVETICK,false);
script_set_constant("UPET_STR",UPET_STR,false);
script_set_constant("UPET_AGI",UPET_AGI,false);
script_set_constant("UPET_VIT",UPET_VIT,false);
script_set_constant("UPET_INT",UPET_INT,false);
script_set_constant("UPET_DEX",UPET_DEX,false);
script_set_constant("UPET_LUK",UPET_LUK,false);
script_set_constant("UPET_DMGIMMUNE",UPET_DMGIMMUNE,false);
script_set_constant("UPET_ATKRANGE",UPET_ATKRANGE,false);
script_set_constant("UPET_ATKMIN",UPET_ATKMIN,false);
script_set_constant("UPET_ATKMAX",UPET_ATKMAX,false);
script_set_constant("UPET_MATKMIN",UPET_MATKMIN,false);
script_set_constant("UPET_MATKMAX",UPET_MATKMAX,false);
script_set_constant("UPET_DEF",UPET_DEF,false);
script_set_constant("UPET_MDEF",UPET_MDEF,false);
script_set_constant("UPET_HIT",UPET_HIT,false);
script_set_constant("UPET_FLEE",UPET_FLEE,false);
script_set_constant("UPET_PDODGE",UPET_PDODGE,false);
script_set_constant("UPET_CRIT",UPET_CRIT,false);
script_set_constant("UPET_RACE",UPET_RACE,false);
script_set_constant("UPET_ELETYPE",UPET_ELETYPE,false);
script_set_constant("UPET_ELELEVEL",UPET_ELELEVEL,false);
script_set_constant("UPET_AMOTION",UPET_AMOTION,false);
script_set_constant("UPET_ADELAY",UPET_ADELAY,false);
script_set_constant("UPET_DMOTION",UPET_DMOTION,false);
/* unit control - mercenary */
script_set_constant("UMER_SIZE",UMER_SIZE,false);
script_set_constant("UMER_HP",UMER_HP,false);
script_set_constant("UMER_MAXHP",UMER_MAXHP,false);
script_set_constant("UMER_MASTERCID",UMER_MASTERCID,false);
script_set_constant("UMER_MAPID",UMER_MAPID,false);
script_set_constant("UMER_X",UMER_X,false);
script_set_constant("UMER_Y",UMER_Y,false);
script_set_constant("UMER_KILLCOUNT",UMER_KILLCOUNT,false);
script_set_constant("UMER_LIFETIME",UMER_LIFETIME,false);
script_set_constant("UMER_SPEED",UMER_SPEED,false);
script_set_constant("UMER_LOOKDIR",UMER_LOOKDIR,false);
script_set_constant("UMER_CANMOVETICK",UMER_CANMOVETICK,false);
script_set_constant("UMER_STR",UMER_STR,false);
script_set_constant("UMER_AGI",UMER_AGI,false);
script_set_constant("UMER_VIT",UMER_VIT,false);
script_set_constant("UMER_INT",UMER_INT,false);
script_set_constant("UMER_DEX",UMER_DEX,false);
script_set_constant("UMER_LUK",UMER_LUK,false);
script_set_constant("UMER_DMGIMMUNE",UMER_DMGIMMUNE,false);
script_set_constant("UMER_ATKRANGE",UMER_ATKRANGE,false);
script_set_constant("UMER_ATKMIN",UMER_ATKMIN,false);
script_set_constant("UMER_ATKMAX",UMER_ATKMAX,false);
script_set_constant("UMER_MATKMIN",UMER_MATKMIN,false);
script_set_constant("UMER_MATKMAX",UMER_MATKMAX,false);
script_set_constant("UMER_DEF",UMER_DEF,false);
script_set_constant("UMER_MDEF",UMER_MDEF,false);
script_set_constant("UMER_HIT",UMER_HIT,false);
script_set_constant("UMER_FLEE",UMER_FLEE,false);
script_set_constant("UMER_PDODGE",UMER_PDODGE,false);
script_set_constant("UMER_CRIT",UMER_CRIT,false);
script_set_constant("UMER_RACE",UMER_RACE,false);
script_set_constant("UMER_ELETYPE",UMER_ELETYPE,false);
script_set_constant("UMER_ELELEVEL",UMER_ELELEVEL,false);
script_set_constant("UMER_AMOTION",UMER_AMOTION,false);
script_set_constant("UMER_ADELAY",UMER_ADELAY,false);
script_set_constant("UMER_DMOTION",UMER_DMOTION,false);
/* unit control - elemental */
script_set_constant("UELE_SIZE",UELE_SIZE,false);
script_set_constant("UELE_HP",UELE_HP,false);
script_set_constant("UELE_MAXHP",UELE_MAXHP,false);
script_set_constant("UELE_SP",UELE_SP,false);
script_set_constant("UELE_MAXSP",UELE_MAXSP,false);
script_set_constant("UELE_MASTERCID",UELE_MASTERCID,false);
script_set_constant("UELE_MAPID",UELE_MAPID,false);
script_set_constant("UELE_X",UELE_X,false);
script_set_constant("UELE_Y",UELE_Y,false);
script_set_constant("UELE_LIFETIME",UELE_LIFETIME,false);
script_set_constant("UELE_MODE",UELE_MODE,false);
script_set_constant("UELE_SPEED",UELE_SPEED,false);
script_set_constant("UELE_LOOKDIR",UELE_LOOKDIR,false);
script_set_constant("UELE_CANMOVETICK",UELE_CANMOVETICK,false);
script_set_constant("UELE_STR",UELE_STR,false);
script_set_constant("UELE_AGI",UELE_AGI,false);
script_set_constant("UELE_VIT",UELE_VIT,false);
script_set_constant("UELE_INT",UELE_INT,false);
script_set_constant("UELE_DEX",UELE_DEX,false);
script_set_constant("UELE_LUK",UELE_LUK,false);
script_set_constant("UELE_DMGIMMUNE",UELE_DMGIMMUNE,false);
script_set_constant("UELE_ATKRANGE",UELE_ATKRANGE,false);
script_set_constant("UELE_ATKMIN",UELE_ATKMIN,false);
script_set_constant("UELE_ATKMAX",UELE_ATKMAX,false);
script_set_constant("UELE_MATKMIN",UELE_MATKMIN,false);
script_set_constant("UELE_MATKMAX",UELE_MATKMAX,false);
script_set_constant("UELE_DEF",UELE_DEF,false);
script_set_constant("UELE_MDEF",UELE_MDEF,false);
script_set_constant("UELE_HIT",UELE_HIT,false);
script_set_constant("UELE_FLEE",UELE_FLEE,false);
script_set_constant("UELE_PDODGE",UELE_PDODGE,false);
script_set_constant("UELE_CRIT",UELE_CRIT,false);
script_set_constant("UELE_RACE",UELE_RACE,false);
script_set_constant("UELE_ELETYPE",UELE_ELETYPE,false);
script_set_constant("UELE_ELELEVEL",UELE_ELELEVEL,false);
script_set_constant("UELE_AMOTION",UELE_AMOTION,false);
script_set_constant("UELE_ADELAY",UELE_ADELAY,false);
script_set_constant("UELE_DMOTION",UELE_DMOTION,false);
/* unit control - NPC */
script_set_constant("UNPC_DISPLAY",UNPC_DISPLAY,false);
script_set_constant("UNPC_LEVEL",UNPC_LEVEL,false);
script_set_constant("UNPC_HP",UNPC_HP,false);
script_set_constant("UNPC_MAXHP",UNPC_MAXHP,false);
script_set_constant("UNPC_MAPID",UNPC_MAPID,false);
script_set_constant("UNPC_X",UNPC_X,false);
script_set_constant("UNPC_Y",UNPC_Y,false);
script_set_constant("UNPC_LOOKDIR",UNPC_LOOKDIR,false);
script_set_constant("UNPC_STR",UNPC_STR,false);
script_set_constant("UNPC_AGI",UNPC_AGI,false);
script_set_constant("UNPC_VIT",UNPC_VIT,false);
script_set_constant("UNPC_INT",UNPC_INT,false);
script_set_constant("UNPC_DEX",UNPC_DEX,false);
script_set_constant("UNPC_LUK",UNPC_LUK,false);
script_set_constant("UNPC_PLUSALLSTAT",UNPC_PLUSALLSTAT,false);
script_set_constant("UNPC_DMGIMMUNE",UNPC_DMGIMMUNE,false);
script_set_constant("UNPC_ATKRANGE",UNPC_ATKRANGE,false);
script_set_constant("UNPC_ATKMIN",UNPC_ATKMIN,false);
script_set_constant("UNPC_ATKMAX",UNPC_ATKMAX,false);
script_set_constant("UNPC_MATKMIN",UNPC_MATKMIN,false);
script_set_constant("UNPC_MATKMAX",UNPC_MATKMAX,false);
script_set_constant("UNPC_DEF",UNPC_DEF,false);
script_set_constant("UNPC_MDEF",UNPC_MDEF,false);
script_set_constant("UNPC_HIT",UNPC_HIT,false);
script_set_constant("UNPC_FLEE",UNPC_FLEE,false);
script_set_constant("UNPC_PDODGE",UNPC_PDODGE,false);
script_set_constant("UNPC_CRIT",UNPC_CRIT,false);
script_set_constant("UNPC_RACE",UNPC_RACE,false);
script_set_constant("UNPC_ELETYPE",UNPC_ELETYPE,false);
script_set_constant("UNPC_ELELEVEL",UNPC_ELELEVEL,false);
script_set_constant("UNPC_AMOTION",UNPC_AMOTION,false);
script_set_constant("UNPC_ADELAY",UNPC_ADELAY,false);
script_set_constant("UNPC_DMOTION",UNPC_DMOTION,false);
#include "script_constants.h"
}
/*==========================================
@ -10678,7 +10381,7 @@ BUILDIN_FUNC(announce)
const char *mes = script_getstr(st,2);
int flag = script_getnum(st,3);
const char *fontColor = script_hasdata(st,4) ? script_getstr(st,4) : NULL;
int fontType = script_hasdata(st,5) ? script_getnum(st,5) : 0x190; // default fontType (FW_NORMAL)
int fontType = script_hasdata(st,5) ? script_getnum(st,5) : FW_NORMAL; // default fontType
int fontSize = script_hasdata(st,6) ? script_getnum(st,6) : 12; // default fontSize
int fontAlign = script_hasdata(st,7) ? script_getnum(st,7) : 0; // default fontAlign
int fontY = script_hasdata(st,8) ? script_getnum(st,8) : 0; // default fontY
@ -10737,7 +10440,7 @@ BUILDIN_FUNC(mapannounce)
const char *mes = script_getstr(st,3);
int flag = script_getnum(st,4);
const char *fontColor = script_hasdata(st,5) ? script_getstr(st,5) : NULL;
int fontType = script_hasdata(st,6) ? script_getnum(st,6) : 0x190; // default fontType (FW_NORMAL)
int fontType = script_hasdata(st,6) ? script_getnum(st,6) : FW_NORMAL; // default fontType
int fontSize = script_hasdata(st,7) ? script_getnum(st,7) : 12; // default fontSize
int fontAlign = script_hasdata(st,8) ? script_getnum(st,8) : 0; // default fontAlign
int fontY = script_hasdata(st,9) ? script_getnum(st,9) : 0; // default fontY
@ -10763,7 +10466,7 @@ BUILDIN_FUNC(areaannounce)
const char *mes = script_getstr(st,7);
int flag = script_getnum(st,8);
const char *fontColor = script_hasdata(st,9) ? script_getstr(st,9) : NULL;
int fontType = script_hasdata(st,10) ? script_getnum(st,10) : 0x190; // default fontType (FW_NORMAL)
int fontType = script_hasdata(st,10) ? script_getnum(st,10) : FW_NORMAL; // default fontType
int fontSize = script_hasdata(st,11) ? script_getnum(st,11) : 12; // default fontSize
int fontAlign = script_hasdata(st,12) ? script_getnum(st,12) : 0; // default fontAlign
int fontY = script_hasdata(st,13) ? script_getnum(st,13) : 0; // default fontY
@ -14338,14 +14041,14 @@ BUILDIN_FUNC(getpetinfo)
}
switch(type){
case 0: script_pushint(st,pd->pet.pet_id); break;
case 1: script_pushint(st,pd->pet.class_); break;
case 2: script_pushstrcopy(st,pd->pet.name); break;
case 3: script_pushint(st,pd->pet.intimate); break;
case 4: script_pushint(st,pd->pet.hungry); break;
case 5: script_pushint(st,pd->pet.rename_flag); break;
case 6: script_pushint(st,(int)pd->pet.level); break;
case 7: script_pushint(st,pd->bl.id); break;
case PETINFO_ID: script_pushint(st,pd->pet.pet_id); break;
case PETINFO_CLASS: script_pushint(st,pd->pet.class_); break;
case PETINFO_NAME: script_pushstrcopy(st,pd->pet.name); break;
case PETINFO_INTIMATE: script_pushint(st,pd->pet.intimate); break;
case PETINFO_HUNGRY: script_pushint(st,pd->pet.hungry); break;
case PETINFO_RENAMED: script_pushint(st,pd->pet.rename_flag); break;
case PETINFO_LEVEL: script_pushint(st,(int)pd->pet.level); break;
case PETINFO_BLOCKID: script_pushint(st,pd->bl.id); break;
default:
script_pushint(st,0);
break;
@ -14621,6 +14324,7 @@ BUILDIN_FUNC(getlook)
type=script_getnum(st,2);
val=-1;
switch(type) {
// TODO: implement LOOK_BASE as stated in script doc
case LOOK_HAIR: val=sd->status.hair; break; //1
case LOOK_WEAPON: val=sd->status.weapon; break; //2
case LOOK_HEAD_BOTTOM: val=sd->status.head_bottom; break; //3
@ -16772,7 +16476,7 @@ BUILDIN_FUNC(getmonsterinfo)
mob_id = script_getnum(st,2);
if (!mobdb_checkid(mob_id)) {
//ShowError("buildin_getmonsterinfo: Wrong Monster ID: %i\n", mob_id);
if ( !script_getnum(st,3) ) //requested a string
if ( script_getnum(st,3) == MOB_NAME ) // requested the name
script_pushconststr(st,"null");
else
script_pushint(st,-1);
@ -16780,29 +16484,29 @@ BUILDIN_FUNC(getmonsterinfo)
}
mob = mob_db(mob_id);
switch ( script_getnum(st,3) ) {
case 0: script_pushstrcopy(st,mob->jname); break;
case 1: script_pushint(st,mob->lv); break;
case 2: script_pushint(st,mob->status.max_hp); break;
case 3: script_pushint(st,mob->base_exp); break;
case 4: script_pushint(st,mob->job_exp); break;
case 5: script_pushint(st,mob->status.rhw.atk); break;
case 6: script_pushint(st,mob->status.rhw.atk2); break;
case 7: script_pushint(st,mob->status.def); break;
case 8: script_pushint(st,mob->status.mdef); break;
case 9: script_pushint(st,mob->status.str); break;
case 10: script_pushint(st,mob->status.agi); break;
case 11: script_pushint(st,mob->status.vit); break;
case 12: script_pushint(st,mob->status.int_); break;
case 13: script_pushint(st,mob->status.dex); break;
case 14: script_pushint(st,mob->status.luk); break;
case 15: script_pushint(st,mob->status.rhw.range); break;
case 16: script_pushint(st,mob->range2); break;
case 17: script_pushint(st,mob->range3); break;
case 18: script_pushint(st,mob->status.size); break;
case 19: script_pushint(st,mob->status.race); break;
case 20: script_pushint(st,mob->status.def_ele); break;
case 21: script_pushint(st,mob->status.mode); break;
case 22: script_pushint(st,mob->mexp); break;
case MOB_NAME: script_pushstrcopy(st,mob->jname); break;
case MOB_LV: script_pushint(st,mob->lv); break;
case MOB_MAXHP: script_pushint(st,mob->status.max_hp); break;
case MOB_BASEEXP: script_pushint(st,mob->base_exp); break;
case MOB_JOBEXP: script_pushint(st,mob->job_exp); break;
case MOB_ATK1: script_pushint(st,mob->status.rhw.atk); break;
case MOB_ATK2: script_pushint(st,mob->status.rhw.atk2); break;
case MOB_DEF: script_pushint(st,mob->status.def); break;
case MOB_MDEF: script_pushint(st,mob->status.mdef); break;
case MOB_STR: script_pushint(st,mob->status.str); break;
case MOB_AGI: script_pushint(st,mob->status.agi); break;
case MOB_VIT: script_pushint(st,mob->status.vit); break;
case MOB_INT: script_pushint(st,mob->status.int_); break;
case MOB_DEX: script_pushint(st,mob->status.dex); break;
case MOB_LUK: script_pushint(st,mob->status.luk); break;
case MOB_RANGE: script_pushint(st,mob->status.rhw.range); break;
case MOB_RANGE2: script_pushint(st,mob->range2); break;
case MOB_RANGE3: script_pushint(st,mob->range3); break;
case MOB_SIZE: script_pushint(st,mob->status.size); break;
case MOB_RACE: script_pushint(st,mob->status.race); break;
case MOB_ELEMENT: script_pushint(st,mob->status.def_ele); break;
case MOB_MODE: script_pushint(st,mob->status.mode); break;
case MOB_MVPEXP: script_pushint(st,mob->mexp); break;
default: script_pushint(st,-1); //wrong Index
}
return SCRIPT_CMD_SUCCESS;
@ -18636,11 +18340,26 @@ BUILDIN_FUNC(questinfo)
icon = script_getnum(st, 3);
#if PACKETVER >= 20120410
if(icon < 0 || (icon > 8 && icon != 9999) || icon == 7)
icon = 9999; // Default to nothing if icon id is invalid.
switch(icon){
case QTYPE_QUEST:
case QTYPE_QUEST2:
case QTYPE_JOB:
case QTYPE_JOB2:
case QTYPE_EVENT:
case QTYPE_EVENT2:
case QTYPE_WARG:
case QTYPE_WARG2:
// Leave everything as it is
break;
case QTYPE_NONE:
default:
// Default to nothing if icon id is invalid.
icon = QTYPE_NONE;
break;
}
#else
if(icon < 0 || icon > 7)
icon = 0;
if(icon < QTYPE_QUEST || icon > 7) // TODO: check why 7 and not QTYPE_WARG, might be related to icon + 1 below
icon = QTYPE_QUEST;
else
icon = icon + 1;
#endif
@ -19292,7 +19011,7 @@ BUILDIN_FUNC(instance_announce) {
const char *mes = script_getstr(st,3);
int flag = script_getnum(st,4);
const char *fontColor = script_hasdata(st,5) ? script_getstr(st,5) : NULL;
int fontType = script_hasdata(st,6) ? script_getnum(st,6) : 0x190; // default fontType (FW_NORMAL)
int fontType = script_hasdata(st,6) ? script_getnum(st,6) : FW_NORMAL; // default fontType
int fontSize = script_hasdata(st,7) ? script_getnum(st,7) : 12; // default fontSize
int fontAlign = script_hasdata(st,8) ? script_getnum(st,8) : 0; // default fontAlign
int fontY = script_hasdata(st,9) ? script_getnum(st,9) : 0; // default fontY

66
src/map/script.h
View File

@ -297,6 +297,72 @@ enum script_parse_options {
SCRIPT_RETURN_EMPTY_SCRIPT = 0x4// returns the script object instead of NULL for empty scripts
};
enum monsterinfo_types {
MOB_NAME = 0,
MOB_LV,
MOB_MAXHP,
MOB_BASEEXP,
MOB_JOBEXP,
MOB_ATK1,
MOB_ATK2,
MOB_DEF,
MOB_MDEF,
MOB_STR,
MOB_AGI,
MOB_VIT,
MOB_INT,
MOB_DEX,
MOB_LUK,
MOB_RANGE,
MOB_RANGE2,
MOB_RANGE3,
MOB_SIZE,
MOB_RACE,
MOB_ELEMENT,
MOB_MODE,
MOB_MVPEXP
};
enum petinfo_types {
PETINFO_ID = 0,
PETINFO_CLASS,
PETINFO_NAME,
PETINFO_INTIMATE,
PETINFO_HUNGRY,
PETINFO_RENAMED,
PETINFO_LEVEL,
PETINFO_BLOCKID
};
enum questinfo_types {
QTYPE_QUEST = 0,
QTYPE_QUEST2,
QTYPE_JOB,
QTYPE_JOB2,
QTYPE_EVENT,
QTYPE_EVENT2,
QTYPE_WARG,
// 7 = free
QTYPE_WARG2 = 8,
// 9 - 9998 = free
QTYPE_NONE = 9999
};
#ifndef WIN32
// These are declared in wingdi.h
/* Font Weights */
#define FW_DONTCARE 0
#define FW_THIN 100
#define FW_EXTRALIGHT 200
#define FW_LIGHT 300
#define FW_NORMAL 400
#define FW_MEDIUM 500
#define FW_SEMIBOLD 600
#define FW_BOLD 700
#define FW_EXTRABOLD 800
#define FW_HEAVY 900
#endif
enum unitdata_mobtypes {
UMOB_SIZE = 0,
UMOB_LEVEL,

2940
src/map/script_constants.h Normal file
View File

File diff suppressed because it is too large Load Diff

1
vcproj-10/map-server.vcxproj
View File

@ -196,6 +196,7 @@
<ClInclude Include="..\src\config\secure.h" />
<ClInclude Include="..\src\config\classes\general.h" />
<ClInclude Include="..\src\map\script.h" />
<ClInclude Include="..\src\map\script_constants.h" />
<ClInclude Include="..\src\map\searchstore.h" />
<ClInclude Include="..\src\map\skill.h" />
<ClInclude Include="..\src\map\status.h" />

3
vcproj-10/map-server.vcxproj.filters
View File

@ -94,6 +94,9 @@
<ClCompile Include="..\src\map\script.c">
<Filter>map</Filter>
</ClCompile>
<ClInclude Include="..\src\map\script_constants.h">
<Filter>map</Filter>
</ClInclude>
<ClCompile Include="..\src\map\searchstore.c">
<Filter>map</Filter>
</ClCompile>

3
vcproj-12/map-server.vcxproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -200,6 +200,7 @@
<ClInclude Include="..\src\config\secure.h" />
<ClInclude Include="..\src\config\classes\general.h" />
<ClInclude Include="..\src\map\script.h" />
<ClInclude Include="..\src\map\script_constants.h" />
<ClInclude Include="..\src\map\searchstore.h" />
<ClInclude Include="..\src\map\skill.h" />
<ClInclude Include="..\src\map\status.h" />

3
vcproj-12/map-server.vcxproj.filters
View File

@ -94,6 +94,9 @@
<ClCompile Include="..\src\map\script.c">
<Filter>map</Filter>
</ClCompile>
<ClInclude Include="..\src\map\script_constants.h">
<Filter>map</Filter>
</ClInclude>
<ClCompile Include="..\src\map\searchstore.c">
<Filter>map</Filter>
</ClCompile>

1
vcproj-13/map-server.vcxproj
View File

@ -200,6 +200,7 @@
<ClInclude Include="..\src\config\secure.h" />
<ClInclude Include="..\src\config\classes\general.h" />
<ClInclude Include="..\src\map\script.h" />
<ClInclude Include="..\src\map\script_constants.h" />
<ClInclude Include="..\src\map\searchstore.h" />
<ClInclude Include="..\src\map\skill.h" />
<ClInclude Include="..\src\map\status.h" />

3
vcproj-13/map-server.vcxproj.filters
View File

@ -94,6 +94,9 @@
<ClCompile Include="..\src\map\script.c">
<Filter>map</Filter>
</ClCompile>
<ClInclude Include="..\src\map\script_constants.h">
<Filter>map</Filter>
</ClInclude>
<ClCompile Include="..\src\map\searchstore.c">
<Filter>map</Filter>
</ClCompile>

1
vcproj-14/map-server.vcxproj
View File

@ -199,6 +199,7 @@
<ClInclude Include="..\src\config\secure.h" />
<ClInclude Include="..\src\config\classes\general.h" />
<ClInclude Include="..\src\map\script.h" />
<ClInclude Include="..\src\map\script_constants.h" />
<ClInclude Include="..\src\map\searchstore.h" />
<ClInclude Include="..\src\map\skill.h" />
<ClInclude Include="..\src\map\status.h" />

3
vcproj-14/map-server.vcxproj.filters
View File

@ -94,6 +94,9 @@
<ClCompile Include="..\src\map\script.c">
<Filter>map</Filter>
</ClCompile>
<ClInclude Include="..\src\map\script_constants.h">
<Filter>map</Filter>
</ClInclude>
<ClCompile Include="..\src\map\searchstore.c">
<Filter>map</Filter>
</ClCompile>

4
vcproj-9/map-server.vcproj
View File

@ -740,6 +740,10 @@
RelativePath="..\src\map\script.h"
>
</File>
<File
RelativePath="..\src\map\script_constants.h"
>
</File>
<File
RelativePath="..\src\map\searchstore.c"
>