diff options
author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-05-21 10:47:21 +0200 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2021-02-15 16:26:09 -0300 |
commit | 5c02f09cdad2234eb39efbb8cf77d3087ef27c7f (patch) | |
tree | 87ad158dfa8f4340ae742e10d2bde9f195de1bf2 /src/map/skill.c | |
parent | 4bb151256dc1386825f6198d717fad896676b61d (diff) | |
download | hercules-5c02f09cdad2234eb39efbb8cf77d3087ef27c7f.tar.gz hercules-5c02f09cdad2234eb39efbb8cf77d3087ef27c7f.tar.bz2 hercules-5c02f09cdad2234eb39efbb8cf77d3087ef27c7f.tar.xz hercules-5c02f09cdad2234eb39efbb8cf77d3087ef27c7f.zip |
Remove hard-coded required item amounts and update skill DBs accordingly
Diffstat (limited to 'src/map/skill.c')
-rw-r--r-- | src/map/skill.c | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 7451fbf41..3ec73e0d7 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -15397,23 +15397,11 @@ static struct skill_condition skill_get_requirement(struct map_session_data *sd, } for( i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++ ) { - int item_idx = (skill_lv - 1) % MAX_SKILL_ITEM_REQUIRE; - if ((skill_id == AM_POTIONPITCHER || skill_id == CR_SLIMPITCHER || skill_id == CR_CULTIVATION) && i != item_idx) - continue; - switch( skill_id ) { case AM_CALLHOMUN: if (sd->status.hom_id) //Don't delete items when hom is already out. continue; break; - case NC_SHAPESHIFT: - if( i < 4 ) - continue; - break; - case WZ_FIREPILLAR: // celest - if (skill_lv <= 5) // no gems required at level 1-5 - continue; - break; case AB_ADORAMUS: if( itemid_isgemstone(skill->dbs->db[idx].itemid[i]) && skill->check_pc_partner(sd,skill_id,&skill_lv, 1, 2) ) continue; @@ -15422,21 +15410,6 @@ static struct skill_condition skill_get_requirement(struct map_session_data *sd, if( itemid_isgemstone(skill->dbs->db[idx].itemid[i]) && skill->check_pc_partner(sd,skill_id,&skill_lv, 1, 0) ) continue; break; - case GN_FIRE_EXPANSION: - if( i < 5 ) - continue; - break; - case SO_SUMMON_AGNI: - case SO_SUMMON_AQUA: - case SO_SUMMON_VENTUS: - case SO_SUMMON_TERA: - case SO_WATER_INSIGNIA: - case SO_FIRE_INSIGNIA: - case SO_WIND_INSIGNIA: - case SO_EARTH_INSIGNIA: - if( i < 3 ) - continue; - break; default: { if (skill->get_requirement_item_unknown(sc, sd, &skill_id, &skill_lv, &idx, &i)) @@ -15478,39 +15451,6 @@ static struct skill_condition skill_get_requirement(struct map_session_data *sd, } } - /* requirements are level-dependent */ - switch( skill_id ) { - case NC_SHAPESHIFT: - case GN_FIRE_EXPANSION: - case SO_SUMMON_AGNI: - case SO_SUMMON_AQUA: - case SO_SUMMON_VENTUS: - case SO_SUMMON_TERA: - case SO_WATER_INSIGNIA: - case SO_FIRE_INSIGNIA: - case SO_WIND_INSIGNIA: - case SO_EARTH_INSIGNIA: - req.itemid[skill_lv-1] = skill->dbs->db[idx].itemid[skill_lv-1]; - req.amount[skill_lv-1] = skill->dbs->db[idx].amount[skill_lv-1]; - break; - } - if (skill_id == NC_REPAIR) { - switch(skill_lv) { - case 1: - case 2: - req.itemid[1] = ITEMID_REPAIRA; - break; - case 3: - case 4: - req.itemid[1] = ITEMID_REPAIRB; - break; - case 5: - req.itemid[1] = ITEMID_REPAIRC; - break; - } - req.amount[1] = 1; - } - // Check for cost reductions due to skills & SCs switch(skill_id) { case MC_MAMMONITE: |