summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c17
-rw-r--r--src/map/skill.c1
-rw-r--r--src/map/status.c273
-rw-r--r--src/map/status.h3
4 files changed, 159 insertions, 135 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 539d3516e..31b04ad44 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -427,7 +427,7 @@ int64 battle_calc_weapon_damage(struct block_list *src, struct block_list *bl, u
else
damage = battle->calc_sizefix(sd, damage, EQI_HAND_L, size, flag & 8);
- if ( flag & 2 && sd->bonus.arrow_atk )
+ if ( flag & 2 && sd->bonus.arrow_atk && skill_id != GN_CARTCANNON )
damage += sd->bonus.arrow_atk;
if ( sd->battle_status.equip_atk != 0 )
@@ -886,8 +886,6 @@ int64 battle_calc_elefix(struct block_list *src, struct block_list *target, uint
damage = battle->attr_fix(src,target,damage,ELE_NEUTRAL,tstatus->def_ele, tstatus->ele_lv);
if( skill_id == NC_ARMSCANNON )
damage = battle->attr_fix(src,target,damage,ELE_NEUTRAL,tstatus->def_ele, tstatus->ele_lv);
- if( skill_id == GN_CARTCANNON )
- damage = battle->attr_fix(src,target,damage,ELE_NEUTRAL,tstatus->def_ele, tstatus->ele_lv);
if( skill_id == GS_GROUNDDRIFT ) //Additional 50*lv Neutral damage.
damage += battle->attr_fix(src,target,50*skill_lv,ELE_NEUTRAL,tstatus->def_ele, tstatus->ele_lv);
}
@@ -2541,7 +2539,7 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
}
break;
case GN_CARTCANNON:
- skillratio = 50 * (sd ? pc->checkskill(sd, GN_REMODELING_CART) : 5) * (st->int_ / 40) + 60 * skill_lv;
+ skillratio += -100 + (int)(50.0f * (sd ? pc->checkskill(sd, GN_REMODELING_CART) : 5) * (st->int_ / 40.0f) + 60.0f * skill_lv);
break;
case GN_SPORE_EXPLOSION:
skillratio = 100 * skill_lv + (200 + st->int_) * status->get_lv(src) / 100;
@@ -4352,6 +4350,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
case PA_SACRIFICE:
flag.distinct = 1;
break;
+ case GN_CARTCANNON:
case PA_SHIELDCHAIN:
case GS_MAGICALBULLET:
case NJ_SYURIKEN:
@@ -4928,6 +4927,14 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
wd.damage = max(wd.damage, 1);
}
break;
+ case GN_CARTCANNON:
+ GET_NORMAL_ATTACK((sc && sc->data[SC_MAXIMIZEPOWER] ? 1 : 0) | (sc && sc->data[SC_WEAPONPERFECT] ? 8 : 0), skill_id);
+ ATK_ADD(sd ? sd->bonus.arrow_atk : 0);
+ wd.damage = battle->calc_masteryfix(src, target, skill_id, skill_lv, wd.damage, wd.div_, 0, flag.weapon);
+ ATK_RATE(battle->calc_skillratio(BF_WEAPON, src, target, skill_id, skill_lv, skillratio, wflag));
+ if ( sd && s_ele != sd->bonus.arrow_ele )
+ s_ele = sd->bonus.arrow_ele;
+ break;
case NJ_TATAMIGAESHI:
ATK_RATE(200);
/* Fall through */
@@ -5208,7 +5215,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
//Div fix.
damage_div_fix(wd.damage, wd.div_);
if ( skill_id > 0 && (skill->get_ele(skill_id, skill_lv) == ELE_NEUTRAL || flag.distinct) ) { // re-evaluate forced neutral skills
- wd.damage = battle->attr_fix(src, target, wd.damage, s_ele_, tstatus->def_ele, tstatus->ele_lv);
+ wd.damage = battle->attr_fix(src, target, wd.damage, s_ele, tstatus->def_ele, tstatus->ele_lv);
if ( flag.lh )
wd.damage2 = battle->attr_fix(src, target, wd.damage2, s_ele_, tstatus->def_ele, tstatus->ele_lv);
}
diff --git a/src/map/skill.c b/src/map/skill.c
index 4c8ecb40f..a9737f129 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7649,6 +7649,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
map->freeblock_unlock(); // Don't consume item requirements
return 0;
}
+ clif->skill_nodamage(src, bl, skill_id, skill_lv, 1);
}
break;
diff --git a/src/map/status.c b/src/map/status.c
index 91ab19558..0b406850e 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -12052,18 +12052,11 @@ int status_get_sc_type(sc_type type) {
return status->sc_conf[type];
}
-/*------------------------------------------
-* DB reading.
-* job_db1.txt - weight, hp, sp, aspd
-* job_db2.txt - job level stat bonuses
-* size_fix.txt - size adjustment table for weapons
-* refine_db.txt - refining data table
-*------------------------------------------*/
-void status_read_job_db(void) { /* [malufett/Hercules] */
- int i = 0;
- config_t job_db_conf;
- config_setting_t *jdb = NULL;
- const char *config_filename = "db/"DBPATH"job_db.conf";
+void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
+{
+ config_setting_t *temp = NULL;
+ int i32 = 0;
+
struct {
const char *name;
int id;
@@ -12097,139 +12090,160 @@ void status_read_job_db(void) { /* [malufett/Hercules] */
#endif
};
- if ( libconfig->read_file(&job_db_conf, config_filename) ) {
- ShowError("can't read %s\n", config_filename);
- return;
- }
- while ( (jdb = libconfig->setting_get_elem(job_db_conf.root, i++)) ) {
- int class_, idx, i32 = 0;
- config_setting_t *temp = NULL;
- const char *name = config_setting_name(jdb);
-
- if ( (class_ = pc->check_job_name(name)) == -1 ) {
- ShowWarning("pc_read_job_db: '%s' unknown job name!\n", name);
- continue;
- }
-
- idx = pc->class2idx(class_);
- if ( (temp = libconfig->setting_get_member(jdb, "Inherit")) ) {
- int nidx = 0, iidx, w;
- const char *iname;
- while ( (iname = libconfig->setting_get_string_elem(temp, nidx++)) ) {
- int iclass, ave, total = 0;
- if ( (iclass = pc->check_job_name(iname)) == -1 ) {
- ShowWarning("status_read_job_db: '%s' trying to inherit unknown '%s'!\n", name, iname);
- continue;
- }
- iidx = pc->class2idx(iclass);
- status->max_weight_base[idx] = status->max_weight_base[iidx];
- memcpy(&status->aspd_base[idx], &status->aspd_base[iidx], sizeof(status->aspd_base[iidx]));
- for ( w = 1; w <= MAX_LEVEL && status->HP_table[iidx][w]; w++ ) {
- status->HP_table[idx][w] = status->HP_table[iidx][w];
- total += status->HP_table[idx][w];
- }
- ave = total / (w - 1);
- for ( ; w <= pc->max_level[idx][0]; w++ ) {
- status->HP_table[idx][w] = min(ave * w, battle_config.max_hp);
- }
- for ( w = 1; w <= MAX_LEVEL && status->SP_table[iidx][w]; w++ ) {
- status->SP_table[idx][w] = status->SP_table[iidx][w];
- total += status->SP_table[idx][w];
- }
- ave = total / (w - 1);
- for ( ; w <= pc->max_level[idx][0]; w++ ) {
- status->SP_table[idx][w] = min(ave * w, battle_config.max_sp);
- }
+ if ((temp = libconfig->setting_get_member(jdb, "Inherit"))) {
+ int nidx = 0, iidx, w;
+ const char *iname;
+ while ((iname = libconfig->setting_get_string_elem(temp, nidx++))) {
+ int iclass, ave, total = 0;
+ if ((iclass = pc->check_job_name(iname)) == -1) {
+ ShowWarning("status_read_job_db: '%s' trying to inherit unknown '%s'!\n", name, iname);
+ continue;
+ }
+ iidx = pc->class2idx(iclass);
+ status->max_weight_base[idx] = status->max_weight_base[iidx];
+ memcpy(&status->aspd_base[idx], &status->aspd_base[iidx], sizeof(status->aspd_base[iidx]));
+ for (w = 1; w <= MAX_LEVEL && status->HP_table[iidx][w]; w++) {
+ status->HP_table[idx][w] = status->HP_table[iidx][w];
+ total += status->HP_table[idx][w] - status->HP_table[idx][w - 1];
+ }
+ ave = total / (w - 1);
+ for ( ; w <= pc->max_level[idx][0]; w++) {
+ status->HP_table[idx][w] = min(ave * w, battle_config.max_hp);
+ }
+ for (w = 1; w <= MAX_LEVEL && status->SP_table[iidx][w]; w++) {
+ status->SP_table[idx][w] = status->SP_table[iidx][w];
+ total += status->SP_table[idx][w] - status->SP_table[idx][w - 1];
+ }
+ ave = total / (w - 1);
+ for ( ; w <= pc->max_level[idx][0]; w++) {
+ status->SP_table[idx][w] = min(ave * w, battle_config.max_sp);
}
}
- if ( (temp = libconfig->setting_get_member(jdb, "InheritHP")) ) {
- int nidx = 0, iidx;
- const char *iname;
- while ( (iname = libconfig->setting_get_string_elem(temp, nidx++)) ) {
- int iclass, w, ave, total = 0;
- if ( (iclass = pc->check_job_name(iname)) == -1 ) {
- ShowWarning("status_read_job_db: '%s' trying to inherit unknown '%s' HP!\n", name, iname);
- continue;
- }
- iidx = pc->class2idx(iclass);
- for ( w = 1; w <= MAX_LEVEL && status->HP_table[iidx][w]; w++ ) {
- status->HP_table[idx][w] = status->HP_table[iidx][w];
- total += status->HP_table[idx][w];
- }
- ave = total / (w - 1);
- for ( ; w <= pc->max_level[idx][0]; w++ ) {
- status->HP_table[idx][w] = min(ave * w, battle_config.max_hp);
- }
+ }
+ if ((temp = libconfig->setting_get_member(jdb, "InheritHP"))) {
+ int nidx = 0, iidx;
+ const char *iname;
+ while ((iname = libconfig->setting_get_string_elem(temp, nidx++))) {
+ int iclass, w, ave, total = 0;
+ if ((iclass = pc->check_job_name(iname)) == -1) {
+ ShowWarning("status_read_job_db: '%s' trying to inherit unknown '%s' HP!\n", name, iname);
+ continue;
+ }
+ iidx = pc->class2idx(iclass);
+ for (w = 1; w <= MAX_LEVEL && status->HP_table[iidx][w]; w++) {
+ status->HP_table[idx][w] = status->HP_table[iidx][w];
+ total += status->HP_table[idx][w] - status->HP_table[idx][w - 1];
+ }
+ ave = total / (w - 1);
+ for ( ; w <= pc->max_level[idx][0]; w++ ) {
+ status->HP_table[idx][w] = min(ave * w, battle_config.max_hp);
}
}
- if ( (temp = libconfig->setting_get_member(jdb, "InheritSP")) ) {
- int nidx = 0, iidx, ave, total = 0;
- const char *iname;
- while ( (iname = libconfig->setting_get_string_elem(temp, nidx++)) ) {
- int iclass, w;
- if ( (iclass = pc->check_job_name(iname)) == -1 ) {
- ShowWarning("status_read_job_db: '%s' trying to inherit unknown '%s' SP!\n", name, iname);
- continue;
- }
- iidx = pc->class2idx(iclass);
- for ( w = 1; w <= MAX_LEVEL && status->SP_table[iidx][w]; w++ ) {
- status->SP_table[idx][w] = status->SP_table[iidx][w];
- total += status->SP_table[idx][w];
- }
- ave = total / (w - 1);
- for ( ; w <= pc->max_level[idx][0]; w++ ) {
- status->SP_table[idx][w] = min(ave * w, battle_config.max_sp);
- }
+ }
+ if ((temp = libconfig->setting_get_member(jdb, "InheritSP"))) {
+ int nidx = 0, iidx, ave, total = 0;
+ const char *iname;
+ while ((iname = libconfig->setting_get_string_elem(temp, nidx++))) {
+ int iclass, w;
+ if ((iclass = pc->check_job_name(iname)) == -1) {
+ ShowWarning("status_read_job_db: '%s' trying to inherit unknown '%s' SP!\n", name, iname);
+ continue;
+ }
+ iidx = pc->class2idx(iclass);
+ for (w = 1; w <= MAX_LEVEL && status->SP_table[iidx][w]; w++) {
+ status->SP_table[idx][w] = status->SP_table[iidx][w];
+ total += status->SP_table[idx][w] - status->SP_table[idx][w-1];
+ }
+ ave = total / (w - 1);
+ for ( ; w <= pc->max_level[idx][0]; w++) {
+ status->SP_table[idx][w] = min(ave * w, battle_config.max_sp);
}
}
+ }
- if ( libconfig->setting_lookup_int(jdb, "Weight", &i32) )
- status->max_weight_base[idx] = i32;
- else if ( !status->max_weight_base[idx] )
- status->max_weight_base[idx] = 20000;
+ if (libconfig->setting_lookup_int(jdb, "Weight", &i32))
+ status->max_weight_base[idx] = i32;
+ else if (!status->max_weight_base[idx])
+ status->max_weight_base[idx] = 20000;
- if ( (temp = libconfig->setting_get_member(jdb, "BaseASPD")) ) {
- int widx = 0;
- config_setting_t *wpn = NULL;
- while ( (wpn = libconfig->setting_get_elem(temp, widx++)) ) {
- int w, wlen = ARRAYLENGTH(wnames);
- const char *wname = config_setting_name(wpn);
+ if ((temp = libconfig->setting_get_member(jdb, "BaseASPD"))) {
+ int widx = 0;
+ config_setting_t *wpn = NULL;
+ while ((wpn = libconfig->setting_get_elem(temp, widx++))) {
+ int w, wlen = ARRAYLENGTH(wnames);
+ const char *wname = config_setting_name(wpn);
- ARR_FIND(0, wlen, w, strcmp(wnames[w].name, wname) == 0);
- if ( w != wlen ) {
- status->aspd_base[idx][wnames[w].id] = libconfig->setting_get_int(wpn);
- } else {
- ShowWarning("status_read_job_db: unknown weapon type '%s'!\n", wname);
- }
+ ARR_FIND(0, wlen, w, strcmp(wnames[w].name, wname) == 0);
+ if (w != wlen) {
+ status->aspd_base[idx][wnames[w].id] = libconfig->setting_get_int(wpn);
+ } else {
+ ShowWarning("status_read_job_db: unknown weapon type '%s'!\n", wname);
}
}
+ }
- if ( (temp = libconfig->setting_get_member(jdb, "HPTable")) ) {
- int level = 0, ave, total = 0;
- config_setting_t *hp = NULL;
- while ( (hp = libconfig->setting_get_elem(temp, level++)) ) {
- status->HP_table[idx][level] = i32 = min(libconfig->setting_get_int(hp), battle_config.max_hp);
- total += i32 - status->HP_table[idx][level - 1];
- }
- ave = total / (level - 1);
- for ( ; level <= pc->max_level[idx][0]; level++ ) { /* limit only to possible maximum level of the given class */
- status->HP_table[idx][level] = min(ave * level, battle_config.max_hp); /* some are still empty? then let's use the average increase */
- }
+ if ((temp = libconfig->setting_get_member(jdb, "HPTable"))) {
+ int level = 0, ave, total = 0;
+ config_setting_t *hp = NULL;
+ while ((hp = libconfig->setting_get_elem(temp, level++))) {
+ status->HP_table[idx][level] = i32 = min(libconfig->setting_get_int(hp), battle_config.max_hp);
+ total += i32 - status->HP_table[idx][level - 1];
}
+ ave = total / (level - 1);
+ for ( ; level <= pc->max_level[idx][0]; level++ ) { /* limit only to possible maximum level of the given class */
+ status->HP_table[idx][level] = min(ave * level, battle_config.max_hp); /* some are still empty? then let's use the average increase */
+ }
+ }
- if ( (temp = libconfig->setting_get_member(jdb, "SPTable")) ) {
- int level = 0, ave, total = 0;
- config_setting_t *sp = NULL;
- while ( (sp = libconfig->setting_get_elem(temp, level++)) ) {
- status->SP_table[idx][level] = i32 = min(libconfig->setting_get_int(sp), battle_config.max_sp);
- total += i32 - status->SP_table[idx][level - 1];
- }
- ave = total / (level - 1);
- for ( ; level <= pc->max_level[idx][0]; level++ ) {
- status->SP_table[idx][level] = min(ave * level, battle_config.max_sp);
- }
+ if ((temp = libconfig->setting_get_member(jdb, "SPTable"))) {
+ int level = 0, ave, total = 0;
+ config_setting_t *sp = NULL;
+ while ((sp = libconfig->setting_get_elem(temp, level++))) {
+ status->SP_table[idx][level] = i32 = min(libconfig->setting_get_int(sp), battle_config.max_sp);
+ total += i32 - status->SP_table[idx][level - 1];
+ }
+ ave = total / (level - 1);
+ for ( ; level <= pc->max_level[idx][0]; level++ ) {
+ status->SP_table[idx][level] = min(ave * level, battle_config.max_sp);
}
}
+}
+
+/*------------------------------------------
+* DB reading.
+* job_db.conf - weight, hp, sp, aspd
+* job_db2.txt - job level stat bonuses
+* size_fix.txt - size adjustment table for weapons
+* refine_db.txt - refining data table
+*------------------------------------------*/
+void status_read_job_db(void) { /* [malufett/Hercules] */
+ int i = 0;
+ config_t job_db_conf;
+ config_setting_t *jdb = NULL;
+ const char *config_filename =
+#ifdef RENEWAL_ASPD
+ "db/re/job_db.conf";
+#else
+ "db/pre-re/job_db.conf";
+#endif
+
+ if ( libconfig->read_file(&job_db_conf, config_filename) ) {
+ ShowError("can't read %s\n", config_filename);
+ return;
+ }
+ while ( (jdb = libconfig->setting_get_elem(job_db_conf.root, i++)) ) {
+ int class_, idx;
+ const char *name = config_setting_name(jdb);
+
+ if ( (class_ = pc->check_job_name(name)) == -1 ) {
+ ShowWarning("pc_read_job_db: '%s' unknown job name!\n", name);
+ continue;
+ }
+
+ idx = pc->class2idx(class_);
+ status->read_job_db_sub(idx, name, jdb);
+ }
+ ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", i, config_filename);
libconfig->destroy(&job_db_conf);
}
@@ -12547,4 +12561,5 @@ void status_defaults(void) {
status->readdb_refine = status_readdb_refine;
status->readdb_scconfig = status_readdb_scconfig;
status->read_job_db = status_read_job_db;
+ status->read_job_db_sub = status_read_job_db_sub;
}
diff --git a/src/map/status.h b/src/map/status.h
index 98d5d415c..c8a7a08f7 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -6,7 +6,7 @@
#define MAP_STATUS_H
#include "../config/core.h" // defType, RENEWAL, RENEWAL_ASPD
-
+#include "../common/conf.h"
#include "../common/cbasetypes.h"
#include "../common/mmo.h" // NEW_CARTS
@@ -2116,6 +2116,7 @@ struct status_interface {
bool (*readdb_refine) (char *fields[], int columns, int current);
bool (*readdb_scconfig) (char *fields[], int columns, int current);
void (*read_job_db) (void);
+ void (*read_job_db_sub) (int idx, const char *name, config_setting_t *jdb);
};
struct status_interface *status;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-02 23:32:30 +0000