diff --git a/db/constants.conf b/db/constants.conf index 332269c02a4..aa93a82b45f 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -91,10 +91,6 @@ constants_db: { Job_Monk: 15 Job_Sage: 16 Job_Rogue: 17 - Job_Alchem: { - Value: 18 - Deprecated: true - } Job_Alchemist: 18 Job_Bard: 19 Job_Dancer: 20 @@ -147,10 +143,6 @@ constants_db: { Job_Baby_Monk: 4038 Job_Baby_Sage: 4039 Job_Baby_Rogue: 4040 - Job_Baby_Alchem: { - Value: 4041 - Deprecated: true - } Job_Baby_Alchemist: 4041 Job_Baby_Bard: 4042 Job_Baby_Dancer: 4043 @@ -3808,44 +3800,6 @@ constants_db: { FW_EXTRABOLD: 800 FW_HEAVY: 900 - comment__: "old setlook (use LOOK_* constants instead)" - VAR_HEAD: { - Value: 1 - Deprecated: true // Use LOOK_HAIR - } - VAR_WEAPON: { - Value: 2 - Deprecated: true // Use LOOK_WEAPON - } - VAR_HEAD_TOP: { - Value: 3 - Deprecated: true // Use LOOK_HEAD_TOP - } - VAR_HEAD_MID: { - Value: 4 - Deprecated: true // Use LOOK_HEAD_MID - } - VAR_HEAD_BOTTOM: { - Value: 5 - Deprecated: true // Use LOOK_HEAD_BOTTOM - } - VAR_HEADPALETTE: { - Value: 6 - Deprecated: true // Use LOOK_HAIR_COLOR - } - VAR_BODYPALETTE: { - Value: 7 - Deprecated: true // Use LOOK_CLOTHES_COLOR - } - VAR_SHIELD: { - Value: 8 - Deprecated: true // Use LOOK_SHIELD - } - VAR_SHOES: { - Value: 9 - Deprecated: true // Use LOOK_SHOES - } - comment__: "Directions" DIR_NORTH: 0 DIR_NORTHWEST: 1 @@ -4213,6 +4167,12 @@ constants_db: { ACH_ACHIEVE: 44 ACH_ACHIEVEMENT_RANK: 45 + comment__: "Deprecated skill names" + BA_FROSTJOKER: { + Value: 318 + Deprecated: true + } + comment__: "inventory expansion" INVENTORY_INCREASE_STEP: 10 diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index c3ded39c9af..d65ae9bbd3a 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -33223,7 +33223,12 @@ item_db: ( Buy: 20 Weight: 10 Loc: "EQP_ACC" - Script: <" bonus3 bAutoSpell,BA_FROSTJOKER,1+4*(getskilllv(BA_FROSTJOKER)==5),20; "> + Script: <" + if (getskilllv(BA_FROSTJOKE) == 5) + bonus3(bAutoSpell, BA_FROSTJOKE, 5, 20); + else + bonus3(bAutoSpell, BA_FROSTJOKE, 1, 20); + "> }, { Id: 4210 @@ -50283,13 +50288,11 @@ item_db: ( bonus2 bSubEle,Ele_Water,7; bonus2 bAddMonsterDropItem,530,100; bonus2 bAddMonsterDropItem,12354,300; - if(getrefine()>7) { - bonus5 bAutoSpellWhenHit,BA_FROSTJOKER,5,20,BF_WEAPON|BF_MAGIC,0; - } - else { - bonus5 bAutoSpellWhenHit,BA_FROSTJOKER,1,20,BF_WEAPON|BF_MAGIC,0; + if (getrefine() > 7) { + bonus5(bAutoSpellWhenHit, BA_FROSTJOKE, 5, 20, BF_WEAPON | BF_MAGIC, 0); + } else { + bonus5(bAutoSpellWhenHit, BA_FROSTJOKE, 1, 20, BF_WEAPON | BF_MAGIC, 0); } - "> }, /* @@ -71414,7 +71417,7 @@ item_db: ( else if (.@temp == 2) itemskill(TF_PICKSTONE, 1); else if (.@temp == 3) - itemskill(BA_FROSTJOKER, 1); + itemskill(BA_FROSTJOKE, 1); else if (.@temp == 4) itemskill(DC_SCREAM, 1); else if (.@temp == 5) diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf index b0ddb486350..3dcdecbb07d 100644 --- a/db/pre-re/skill_db.conf +++ b/db/pre-re/skill_db.conf @@ -9578,7 +9578,7 @@ skill_db: ( }, { Id: 318 - Name: "BA_FROSTJOKER" + Name: "BA_FROSTJOKE" StatusChange: "SC_FREEZE" Description: "Unbarring Octave" MaxLevel: 5 diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf index 855c12f3aad..64bf7ef35d7 100644 --- a/db/pre-re/skill_tree.conf +++ b/db/pre-re/skill_tree.conf @@ -1047,7 +1047,7 @@ Bard: { BA_MUSICALLESSON: 1 BD_ADAPTATION: 1 } - BA_FROSTJOKER: { + BA_FROSTJOKE: { MaxLevel: 5 BD_ENCORE: 1 } diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 89707e967b7..0b8f15f9136 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -43871,7 +43871,12 @@ item_db: ( Buy: 20 Weight: 10 Loc: "EQP_ACC" - Script: <" bonus3 bAutoSpell,BA_FROSTJOKER,1+4*(getskilllv(BA_FROSTJOKER)==5),20; "> + Script: <" + if (getskilllv(BA_FROSTJOKE) == 5) + bonus3(bAutoSpell, BA_FROSTJOKE, 1, 20); + else + bonus3(bAutoSpell, BA_FROSTJOKE, 5, 20); + "> }, { Id: 4210 @@ -65506,11 +65511,10 @@ item_db: ( bonus2 bSubEle,Ele_Water,7; bonus2 bAddMonsterDropItem,530,100; bonus2 bAddMonsterDropItem,12354,300; - if(getrefine()>7) { - bonus5 bAutoSpellWhenHit,BA_FROSTJOKER,5,20,BF_WEAPON|BF_MAGIC,0; - } - else { - bonus5 bAutoSpellWhenHit,BA_FROSTJOKER,1,20,BF_WEAPON|BF_MAGIC,0; + if (getrefine() > 7) { + bonus5(bAutoSpellWhenHit, BA_FROSTJOKE, 5, 20, BF_WEAPON | BF_MAGIC, 0); + } else { + bonus5(bAutoSpellWhenHit, BA_FROSTJOKE, 1, 20, BF_WEAPON | BF_MAGIC, 0); } "> }, @@ -91362,7 +91366,7 @@ item_db: ( else if (.@temp == 2) itemskill(TF_PICKSTONE, 1); else if (.@temp == 3) - itemskill(BA_FROSTJOKER, 1); + itemskill(BA_FROSTJOKE, 1); else if (.@temp == 4) itemskill(DC_SCREAM, 1); else if (.@temp == 5) diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index 46e08e001eb..de0013928e2 100644 --- a/db/re/skill_db.conf +++ b/db/re/skill_db.conf @@ -9918,7 +9918,7 @@ skill_db: ( }, { Id: 318 - Name: "BA_FROSTJOKER" + Name: "BA_FROSTJOKE" StatusChange: "SC_FREEZE" Description: "Unbarring Octave" MaxLevel: 5 diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf index 559f86bcbd1..5eb6b600bf6 100644 --- a/db/re/skill_tree.conf +++ b/db/re/skill_tree.conf @@ -1047,7 +1047,7 @@ Bard: { BA_MUSICALLESSON: 1 BD_ADAPTATION: 1 } - BA_FROSTJOKER: { + BA_FROSTJOKE: { MaxLevel: 5 BD_ENCORE: 1 } diff --git a/doc/constants.md b/doc/constants.md index 115d04192d0..294b6b1a885 100644 --- a/doc/constants.md +++ b/doc/constants.md @@ -4124,6 +4124,10 @@ - `ACH_ACHIEVE`: 44 - `ACH_ACHIEVEMENT_RANK`: 45 +### Deprecated skill names + +- `BA_FROSTJOKER`: 318 **(DEPRECATED)** + ### inventory expansion - `INVENTORY_INCREASE_STEP`: 10 @@ -6089,7 +6093,7 @@ - `BA_POEMBRAGI`: 321 - `BA_ASSASSINCROSS`: 320 - `BA_WHISTLE`: 319 -- `BA_FROSTJOKER`: 318 +- `BA_FROSTJOKE`: 318 - `BA_DISSONANCE`: 317 - `BA_MUSICALSTRIKE`: 316 - `BA_MUSICALLESSON`: 315 diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 787736eafe2..fbf1bd280b5 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -8607,23 +8607,6 @@ This command will unbind a NPC event label from an atcommand. --------------------------------------- -*useatcmd("command") - - @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ - @ /!\ This command is deprecated @ - @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ - -This command will execute an atcommand binding on the attached RID from a -script. The three .@atcmd_***** variables will NOT be set when invoking -scripts-atcommands this way. - -This command is deprecated and it should not be used in new scripts, as it is -likely to be removed at a later time. Instead, you should directly call to the -event label of the binding using timers or doevent(). For built-in commands, -atcommand() should be used instead. - ---------------------------------------- - *can_use_command(""{, }) Checks if the attached or specified player can use the specified diff --git a/src/map/battle.c b/src/map/battle.c index 11a5ba296e2..bd2fd061451 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -7445,7 +7445,6 @@ static const struct battle_data { { "monster_active_enable", &battle_config.monster_active_enable, 1, 0, 1, }, { "monster_damage_delay_rate", &battle_config.monster_damage_delay_rate, 100, 0, INT_MAX, }, { "monster_loot_type", &battle_config.monster_loot_type, 0, 0, 1, }, - //{ "mob_skill_use", &battle_config.mob_skill_use, 1, 0, 1, }, //Deprecated { "mob_skill_rate", &battle_config.mob_skill_rate, 100, 0, INT_MAX, }, { "mob_skill_delay", &battle_config.mob_skill_delay, 100, 0, INT_MAX, }, { "mob_count_rate", &battle_config.mob_count_rate, 100, 0, INT_MAX, }, diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 0d4fd3491ae..f4e02ef4bb8 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -2052,7 +2052,6 @@ static int itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const * WeaponLv: Weapon Level * EquipLv: Equip required level or [min, max] * Refine: Refineable - * View: View ID * BindOnEquip: (true or false) * BuyingStore: (true or false) * Delay: Delay to use item @@ -2219,21 +2218,6 @@ static int itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const if (map->setting_lookup_const(it, "ViewSprite", &i32) && i32 >= 0) id.view_sprite = i32; - if (map->setting_lookup_const(it, "View", &i32) && i32 >= 0) { // TODO: Remove (Deprecated - 2016-09-04 [Haru]) - if ((id.type == IT_WEAPON || id.type == IT_AMMO) && id.subtype == 0) { - ShowWarning("itemdb_readdb_libconfig_sub: The 'View' field is deprecated. Please rename it to 'Subtype' (or 'ViewSprite'). (Item #%d: %s)\n", - id.nameid, id.name); - id.subtype = i32; - } else if ((id.type != IT_WEAPON && id.type != IT_AMMO) && id.view_sprite == 0) { - ShowWarning("itemdb_readdb_libconfig_sub: The 'View' field is deprecated. Please rename it to 'ViewSprite' (or 'Subtype'). (Item #%d: %s)\n", - id.nameid, id.name); - id.view_sprite = i32; - } else { - ShowWarning("itemdb_readdb_libconfig_sub: The 'View' field is deprecated. Please rename it to 'Subtype' or 'ViewSprite'. (Item #%d: %s)\n", - id.nameid, id.name); - } - } - if( (t = libconfig->setting_get_member(it, "BindOnEquip")) ) id.flag.bindonequip = libconfig->setting_get_bool(t) ? 1 : 0; diff --git a/src/map/script.c b/src/map/script.c index cdd9458029f..a00bd85711f 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -25013,43 +25013,6 @@ static BUILDIN(unbindatcmd) return true; } -static BUILDIN(useatcmd) -{ - struct map_session_data *sd = NULL; - struct map_session_data *dummy_sd = NULL; - int fd; - const char* cmd; - - cmd = script_getstr(st,2); - - if (st->rid != 0 && (sd = map->id2sd(st->rid)) != NULL) { - fd = sd->fd; - } else { - // Use a dummy character. - sd = dummy_sd = pc->get_dummy_sd(); - fd = 0; - - if( st->oid ) { - struct block_list* bl = map->id2bl(st->oid); - memcpy(&sd->bl, bl, sizeof(struct block_list)); - if (bl->type == BL_NPC) - safestrncpy(sd->status.name, BL_UCAST(BL_NPC, bl)->name, NAME_LENGTH); - } - } - - // compatibility with previous implementation (deprecated!) - if( cmd[0] != atcommand->at_symbol ) { - cmd += strlen(sd->status.name); - while( *cmd != atcommand->at_symbol && *cmd != 0 ) - cmd++; - } - - atcommand->exec(fd, sd, cmd, true); - if (dummy_sd) - aFree(dummy_sd); - return true; -} - static BUILDIN(has_permission) { struct map_session_data *sd; @@ -28779,7 +28742,6 @@ static void script_parse_builtin(void) **/ BUILDIN_DEF(bindatcmd, "ss???"), BUILDIN_DEF(unbindatcmd, "s"), - BUILDIN_DEF_DEPRECATED(useatcmd, "s"), BUILDIN_DEF(has_permission, "v?"), BUILDIN_DEF(can_use_command, "s?"), BUILDIN_DEF(add_group_command, "siii"), diff --git a/src/map/skill.c b/src/map/skill.c index 70d707df12a..d7cf2933f2b 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1824,7 +1824,7 @@ static int skill_additional_effect(struct block_list *src, struct block_list *bl #endif break; - case BA_FROSTJOKER: + case BA_FROSTJOKE: sc_start(src, bl, SC_FREEZE, (15 + 5 * skill_lv), skill_lv, skill->get_time2(skill_id, skill_lv), skill_id); break; @@ -4384,7 +4384,7 @@ static int skill_timerskill(int tid, int64 tick, int id, intptr_t data) unit->warp(target, -1, x, y, CLR_TELEPORT); } break; - case BA_FROSTJOKER: + case BA_FROSTJOKE: case DC_SCREAM: range= skill->get_splash(skl->skill_id, skl->skill_lv); map->foreachinarea(skill->frostjoke_scream,skl->map,skl->x-range,skl->y-range, @@ -8043,7 +8043,7 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * } break; - case BA_FROSTJOKER: + case BA_FROSTJOKE: case DC_SCREAM: clif->skill_nodamage(src,bl,skill_id,skill_lv,1); skill->addtimerskill(src,tick+2000,bl->id,src->x,src->y,skill_id,skill_lv,0,flag); diff --git a/src/map/skill.h b/src/map/skill.h index 884d34846dc..991863d6470 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -564,7 +564,7 @@ enum e_skill { BA_MUSICALLESSON, BA_MUSICALSTRIKE, BA_DISSONANCE, - BA_FROSTJOKER, + BA_FROSTJOKE, BA_WHISTLE, BA_ASSASSINCROSS, BA_POEMBRAGI,