From 03996d97def7dda1d6a6f79a466daf668884d277 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sun, 18 Apr 2021 03:35:03 -0300 Subject: Change max skills from 60 to 75; Reduce skill tree from 186 to 150. Increase SC/SI limits. Validate over1500 SIs (but this check seems to have died) --- src/ecommon/init.c | 14 +++++++------- tools/vars.sh | 10 ++++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/ecommon/init.c b/src/ecommon/init.c index 1ac476d..213b0f4 100644 --- a/src/ecommon/init.c +++ b/src/ecommon/init.c @@ -42,20 +42,20 @@ void commonClean(void) #define checkVar(name, value) \ if (name != value) \ { \ - ShowError(#name" wrong value. Found %d but must be %d.\n", \ + ShowError(#name" wrong value. Found %d but should be %d.\n", \ name, \ value); \ } void common_online(void) { - checkVar(MAX_SKILL_DB, 1570); - checkVar(MAX_SKILL_ID, 20060); - checkVar(SC_MAX, 682); - checkVar(SI_MAX, 1175); + checkVar(MAX_SKILL_DB, 1585); + checkVar(MAX_SKILL_ID, 20075); + checkVar(SC_MAX, 1010); + checkVar(SI_MAX, 1550); checkVar(OLD_MAX_SKILL_DB, 1510); - checkVar(MAX_EVOL_SKILLS, 60); + checkVar(MAX_EVOL_SKILLS, 75); checkVar(EVOL_FIRST_SKILL, 20000); - checkVar(MAX_SKILL_TREE, 146); + checkVar(MAX_SKILL_TREE, 125); checkVar(BASE_GUILD_SIZE, 100); } diff --git a/tools/vars.sh b/tools/vars.sh index 44ede9d..f6f2c11 100755 --- a/tools/vars.sh +++ b/tools/vars.sh @@ -3,7 +3,7 @@ # NOTE: ecommon/init.c needs to be updated when vars.sh changes # what the plugin adds: -MAX_EVOL_SKILLS=60 +MAX_EVOL_SKILLS=75 MAX_EVOL_SC=5 MAX_EVOL_SI=25 @@ -12,17 +12,19 @@ OLD_SI_MAX=1150 # from constants OLD_SC_MAX=677 # in src/map/status.h OLD_MAX_SKILL_ID=10015 # in src/common/mmo.h OLD_MAX_SKILL_DB=1510 # in src/common/mmo.h -OLD_MAX_SKILL_TREE=86 # in src/common/mmo.h +OLD_MAX_SKILL_TREE=50 # in src/common/mmo.h OLD_IT_MAX=19 # in src/common/mmo.h # constants: EVOL_FIRST_SKILL=20000 # skills have to be saved to SQL so they shouldn't change ID +SC_MAX=1010 # Some SCs can be in SQL as well, so they shouldn't change ID +SI_MAX=1550 # SIs can change ID but could quickly get troublesome # calculated: MAX_SKILL_DB=$(($OLD_MAX_SKILL_DB + $MAX_EVOL_SKILLS)) MAX_SKILL_ID=$(($EVOL_FIRST_SKILL + $MAX_EVOL_SKILLS)) -SC_MAX=$(($OLD_SC_MAX + $MAX_EVOL_SC)) -SI_MAX=$(($OLD_SI_MAX + $MAX_EVOL_SI)) +#SC_MAX=$(($OLD_SC_MAX + $MAX_EVOL_SC)) +#SI_MAX=$(($OLD_SI_MAX + $MAX_EVOL_SI)) CUSTOM_SKILL_RANGES="{${EVOL_FIRST_SKILL},${MAX_SKILL_ID}}," MAX_SKILL_TREE=$(($OLD_MAX_SKILL_TREE + $MAX_EVOL_SKILLS)) IT_VIRTUAL=$(($OLD_IT_MAX + 1)) -- cgit v1.2.3-60-g2f50