summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2020-07-13 20:31:36 +0000
committergumi <git@gumi.ca>2020-07-13 20:31:53 +0000
commit858de334b4e9dd4d81b7f78aeadd195ecf9ca342 (patch)
treefd856707eab52e1b493c4a3a3beaac814534e55c /src
parent918d53cc4d9c7198b19f20c840cbb8755b6ea3ab (diff)
downloadevol-hercules-858de334b4e9dd4d81b7f78aeadd195ecf9ca342.tar.gz
evol-hercules-858de334b4e9dd4d81b7f78aeadd195ecf9ca342.tar.bz2
evol-hercules-858de334b4e9dd4d81b7f78aeadd195ecf9ca342.tar.xz
evol-hercules-858de334b4e9dd4d81b7f78aeadd195ecf9ca342.zip
update skill constants from hercules
Diffstat (limited to 'src')
-rw-r--r--src/ecommon/init.c6
-rw-r--r--src/emap/enum/esctype.h7
-rw-r--r--src/emap/enum/esitype.h29
3 files changed, 26 insertions, 16 deletions
diff --git a/src/ecommon/init.c b/src/ecommon/init.c
index bcd68d1..11f1df4 100644
--- a/src/ecommon/init.c
+++ b/src/ecommon/init.c
@@ -51,11 +51,11 @@ void common_online(void)
{
checkVar(MAX_SKILL_DB, 1532);
checkVar(MAX_SKILL_ID, 20022);
- checkVar(SC_MAX, 658);
- checkVar(SI_MAX, 991);
+ checkVar(SC_MAX, 682);
+ checkVar(SI_MAX, 1175);
checkVar(OLD_MAX_SKILL_DB, 1510);
checkVar(MAX_EVOL_SKILLS, 22);
checkVar(EVOL_FIRST_SKILL, 20000);
- checkVar(MAX_SKILL_TREE, 110);
+ checkVar(MAX_SKILL_TREE, 108);
checkVar(BASE_GUILD_SIZE, 100);
}
diff --git a/src/emap/enum/esctype.h b/src/emap/enum/esctype.h
index 28e3930..932d297 100644
--- a/src/emap/enum/esctype.h
+++ b/src/emap/enum/esctype.h
@@ -4,9 +4,14 @@
#ifndef EVOL_MAP_ENUM_ESCTYPE
#define EVOL_MAP_ENUM_ESCTYPE
+#ifndef OLD_SC_MAX
+#define OLD_SC_MAX 0
+#error "vars.sh did not define OLD_SC_MAX"
+#endif
+
typedef enum esc_type
{
- SC_PHYSICAL_SHIELD = 654,
+ SC_PHYSICAL_SHIELD = OLD_SC_MAX, // defined in vars.sh
} esc_type;
#endif // EVOL_MAP_ENUM_ESCTYPE
diff --git a/src/emap/enum/esitype.h b/src/emap/enum/esitype.h
index 2791bd4..7dd10a7 100644
--- a/src/emap/enum/esitype.h
+++ b/src/emap/enum/esitype.h
@@ -4,20 +4,25 @@
#ifndef EVOL_MAP_ENUM_ESITYPE
#define EVOL_MAP_ENUM_ESITYPE
+#ifndef OLD_SI_MAX
+#define OLD_SI_MAX 0
+#error "vars.sh did not define OLD_SI_MAX"
+#endif
+
enum esi_type
{
- SI_PHYSICAL_SHIELD = 966,
- //SI_EVOL_INCSTR = 970,
- SI_EVOL_INCAGI = 971,
- SI_EVOL_INCVIT = 972,
- SI_EVOL_INCINT = 973,
- SI_EVOL_INCDEX = 974,
- SI_EVOL_INCLUK = 975,
- SI_EVOL_INCHIT = 976,
- SI_EVOL_INCFLEE = 977,
- SI_EVOL_WALKSPEED = 978,
- SI_EVOL_INCMHPRATE = 979,
- SI_EVOL_INCMSPRATE = 980,
+ SI_PHYSICAL_SHIELD = OLD_SI_MAX, // defined in vars.sh
+ SI_EVOL_INCSTR,
+ SI_EVOL_INCAGI,
+ SI_EVOL_INCVIT,
+ SI_EVOL_INCINT,
+ SI_EVOL_INCDEX,
+ SI_EVOL_INCLUK,
+ SI_EVOL_INCHIT,
+ SI_EVOL_INCFLEE,
+ SI_EVOL_WALKSPEED,
+ SI_EVOL_INCMHPRATE,
+ SI_EVOL_INCMSPRATE,
};
#endif // EVOL_MAP_ENUM_ESITYPE