diff options
| -rw-r--r-- | db/pre-re/job_db.conf | 2 | ||||
| -rw-r--r-- | db/re/job_db.conf | 2 | ||||
| -rw-r--r-- | src/map/script.c | 6 | ||||
| -rw-r--r-- | src/map/status.c | 6 |
4 files changed, 12 insertions, 4 deletions
diff --git a/db/pre-re/job_db.conf b/db/pre-re/job_db.conf index ac4ad1582..af8cabf9a 100644 --- a/db/pre-re/job_db.conf +++ b/db/pre-re/job_db.conf @@ -31,6 +31,8 @@ ************* Entry structure ******************************************** ************************************************************************** Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there) + BaseExpGroup: "Exp Group Name" (string) // Name of base exp group defined in exp_group_db.conf + JobExpGroup: "Exp Group Name" (string) // Name of job exp group defined in exp_group_db.conf Inherit: ("Other_Job_Name") // Base job from which this job will inherit its max weight, base ASPD set and HP/SP table. InheritHP: ("Other_Job_Name") // Base job from which this job will inherit its HP table (if different). InheritSP: ("Other_Job_Name") // Base job from which this job will inherit its SP table (if different). diff --git a/db/re/job_db.conf b/db/re/job_db.conf index 93bab17e0..21ba3f4cc 100644 --- a/db/re/job_db.conf +++ b/db/re/job_db.conf @@ -31,6 +31,8 @@ ************* Entry structure ******************************************** ************************************************************************** Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there) + BaseExpGroup: "Exp Group Name" (string) // Name of base exp group defined in exp_group_db.conf + JobExpGroup: "Exp Group Name" (string) // Name of job exp group defined in exp_group_db.conf Inherit: ("Other_Job_Name") // Base job from which this job will inherit its max weight, base ASPD set and HP/SP table. InheritHP: ("Other_Job_Name") // Base job from which this job will inherit its HP table (if different). InheritSP: ("Other_Job_Name") // Base job from which this job will inherit its SP table (if different). diff --git a/src/map/script.c b/src/map/script.c index d9350081a..88d8095e5 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11282,7 +11282,9 @@ BUILDIN(getunits) if (not_server_variable(*name)) { sd = script->rid2sd(st); + if (sd == NULL) { + script_pushint(st, 0); return true; // player variable but no player attached } } @@ -18157,7 +18159,7 @@ BUILDIN(setpcblock) if ((type & PCBLOCK_IMMUNE) != 0) sd->block_action.immune = state; - if ((type & PCBLOCK_SITSTAND) != 0) + if ((type & PCBLOCK_SITSTAND) != 0) sd->block_action.sitstand = state; if ((type & PCBLOCK_COMMANDS) != 0) @@ -25263,7 +25265,7 @@ void script_hardcoded_constants(void) script->set_constant("MST_AROUND3", MST_AROUND3, false, false); script->set_constant("MST_AROUND4", MST_AROUND4, false, false); script->set_constant("MST_AROUND", MST_AROUND , false, false); - + script->constdb_comment("pc block constants, use with *setpcblock* and *checkpcblock*"); script->set_constant("PCBLOCK_NONE", PCBLOCK_NONE, false, false); script->set_constant("PCBLOCK_MOVE", PCBLOCK_MOVE, false, false); diff --git a/src/map/status.c b/src/map/status.c index bf48d2301..4e2724d61 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -13114,7 +13114,8 @@ void status_read_job_db_sub(int idx, const char *name, struct config_setting_t * pc->dbs->class_exp_table[idx][CLASS_EXP_TABLE_BASE] = &VECTOR_INDEX(pc->class_exp_groups[CLASS_EXP_TABLE_BASE], i); } } else { - ShowError("status_read_job_db: BaseExpGroup setting not found for entry '%s'\n", name); + ShowError("status_read_job_db: BaseExpGroup setting not found for entry '%s', skipping..\n", name); + return; } /** @@ -13129,7 +13130,8 @@ void status_read_job_db_sub(int idx, const char *name, struct config_setting_t * pc->dbs->class_exp_table[idx][CLASS_EXP_TABLE_JOB] = &VECTOR_INDEX(pc->class_exp_groups[CLASS_EXP_TABLE_JOB], i); } } else { - ShowError("status_read_job_db: JobExpGroup setting not found for entry '%s'\n", name); + ShowError("status_read_job_db: JobExpGroup setting not found for entry '%s', skipping..\n", name); + return; } if ((temp = libconfig->setting_get_member(jdb, "Inherit"))) { |