From 63f57fa5c3944ba7759f84361dd42391709f21c8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 28 Nov 2018 22:06:11 +0300 Subject: Remove typedef from clr_type. --- src/map/unit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index ee856cb76..68e6aeec1 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -918,7 +918,7 @@ static int unit_blown(struct block_list *bl, int dx, int dy, int count, int flag //Warps a unit/ud to a given map/position. //In the case of players, pc->setpos is used. //it respects the no warp flags, so it is safe to call this without doing nowarpto/nowarp checks. -static int unit_warp(struct block_list *bl, short m, short x, short y, clr_type type) +static int unit_warp(struct block_list *bl, short m, short x, short y, enum clr_type type) { struct unit_data *ud; nullpo_ret(bl); @@ -2419,7 +2419,7 @@ static int unit_changeviewsize(struct block_list *bl, short size) * Otherwise it is assumed bl is being warped. * On-Kill specific stuff is not performed here, look at status->damage for that. *------------------------------------------*/ -static int unit_remove_map(struct block_list *bl, clr_type clrtype, const char *file, int line, const char *func) +static int unit_remove_map(struct block_list *bl, enum clr_type clrtype, const char *file, int line, const char *func) { struct unit_data *ud = unit->bl2ud(bl); struct status_change *sc = status->get_sc(bl); @@ -2665,7 +2665,7 @@ static int unit_remove_map(struct block_list *bl, clr_type clrtype, const char * return 1; } -static void unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype) +static void unit_remove_map_pc(struct map_session_data *sd, enum clr_type clrtype) { nullpo_retv(sd); unit->remove_map(&sd->bl,clrtype,ALC_MARK); @@ -2697,7 +2697,7 @@ static void unit_free_pc(struct map_session_data *sd) * Function to free all related resources to the bl * if unit is on map, it is removed using the clrtype specified *------------------------------------------*/ -static int unit_free(struct block_list *bl, clr_type clrtype) +static int unit_free(struct block_list *bl, enum clr_type clrtype) { struct unit_data *ud = unit->bl2ud( bl ); nullpo_ret(bl); -- cgit v1.2.3-70-g09d2 From 9ace7eb2f6992776b58deeefc2aadfecae2f7bd5 Mon Sep 17 00:00:00 2001 From: Emistry Haoyan Date: Wed, 1 May 2019 20:25:52 +0800 Subject: Update unitwarp script command. - allow NPC to warp to non-walkable cell. Just like `*movenpc` --- src/map/unit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 68e6aeec1..088b6d865 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -957,7 +957,7 @@ static int unit_warp(struct block_list *bl, short m, short x, short y, enum clr_ return 2; } - } else if (map->getcell(m, bl, x, y, CELL_CHKNOREACH)) { + } else if (bl->type != BL_NPC && map->getcell(m, bl, x, y, CELL_CHKNOREACH)) { //Invalid target cell ShowWarning("unit_warp: Specified non-walkable target cell: %d (%s) at [%d,%d]\n", m, map->list[m].name, x,y); -- cgit v1.2.3-70-g09d2 From 7923cecc16aad3ff6fb80070240e99e667af1d6c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 3 May 2019 01:37:55 +0300 Subject: Add missing checks for prevend flag --- src/map/atcommand.c | 6 +++--- src/map/buyingstore.c | 6 +++--- src/map/chat.c | 4 ++-- src/map/clif.c | 14 ++++++++------ src/map/mail.c | 2 +- src/map/pc.c | 10 +++++----- src/map/trade.c | 4 ++-- src/map/unit.c | 1 + 8 files changed, 25 insertions(+), 22 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/atcommand.c b/src/map/atcommand.c index fa4436eed..8bca17fa1 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -868,7 +868,7 @@ ACMD(speed) *------------------------------------------*/ ACMD(storage) { - if (sd->npc_id || sd->state.vending || sd->state.buyingstore || sd->state.trading || sd->state.storage_flag) + if (sd->npc_id || sd->state.vending || sd->state.prevend || sd->state.buyingstore || sd->state.trading || sd->state.storage_flag) return false; if (storage->open(sd) == 1) { //Already open. @@ -891,7 +891,7 @@ ACMD(guildstorage) return false; } - if (sd->npc_id || sd->state.vending || sd->state.buyingstore || sd->state.trading) + if (sd->npc_id || sd->state.vending || sd->state.prevend || sd->state.buyingstore || sd->state.trading) return false; if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) { @@ -5425,7 +5425,7 @@ ACMD(clearcart) return false; } - if (sd->state.vending) { + if (sd->state.vending || sd->state.prevend) { clif->message(fd, msg_fd(fd,548)); // You can't clean a cart while vending! return false; } diff --git a/src/map/buyingstore.c b/src/map/buyingstore.c index df622e4ab..8cac65775 100644 --- a/src/map/buyingstore.c +++ b/src/map/buyingstore.c @@ -91,7 +91,7 @@ static void buyingstore_create(struct map_session_data *sd, int zenylimit, unsig return; } - if( !battle_config.feature_buying_store || pc_istrading(sd) || sd->buyingstore.slots == 0 || count > sd->buyingstore.slots || zenylimit <= 0 || zenylimit > sd->status.zeny || !storename[0] ) + if( !battle_config.feature_buying_store || pc_istrading(sd) || sd->state.prevend || sd->buyingstore.slots == 0 || count > sd->buyingstore.slots || zenylimit <= 0 || zenylimit > sd->status.zeny || !storename[0] ) {// disabled or invalid input sd->buyingstore.slots = 0; clif->buyingstore_open_failed(sd, BUYINGSTORE_CREATE, 0); @@ -218,7 +218,7 @@ static void buyingstore_open(struct map_session_data *sd, int account_id) struct map_session_data* pl_sd; nullpo_retv(sd); - if( !battle_config.feature_buying_store || pc_istrading(sd) ) + if (!battle_config.feature_buying_store || pc_istrading(sd) || sd->state.prevend) {// not allowed to sell return; } @@ -255,7 +255,7 @@ static void buyingstore_trade(struct map_session_data* sd, int account_id, unsig return; } - if( !battle_config.feature_buying_store || pc_istrading(sd) ) + if (!battle_config.feature_buying_store || pc_istrading(sd) || sd->state.prevend) {// not allowed to sell clif->buyingstore_trade_failed_seller(sd, BUYINGSTORE_TRADE_SELLER_FAILED, 0); return; diff --git a/src/map/chat.c b/src/map/chat.c index 77a12a560..b650ff029 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -102,7 +102,7 @@ static bool chat_createpcchat(struct map_session_data *sd, const char *title, co if (sd->chat_id != 0) return false; //Prevent people abusing the chat system by creating multiple chats, as pointed out by End of Exam. [Skotlex] - if( sd->state.vending || sd->state.buyingstore ) + if (sd->state.vending || sd->state.prevend || sd->state.buyingstore) {// not chat, when you already have a store open return false; } @@ -147,7 +147,7 @@ static bool chat_joinchat(struct map_session_data *sd, int chatid, const char *p cd = map->id2cd(chatid); if (cd == NULL || cd->bl.type != BL_CHAT || cd->bl.m != sd->bl.m - || sd->state.vending || sd->state.buyingstore || sd->chat_id != 0 + || sd->state.vending || sd->state.prevend || sd->state.buyingstore || sd->chat_id != 0 || ((cd->owner->type == BL_NPC) ? cd->users+1 : cd->users) >= cd->limit ) { clif->joinchatfail(sd,0); // room full diff --git a/src/map/clif.c b/src/map/clif.c index 1348889d3..c9b895656 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -11774,7 +11774,7 @@ static void clif_parse_NpcClicked(int fd, struct map_session_data *sd) #endif return; } - if ( pc_cant_act2(sd) || !(bl = map->id2bl(RFIFOL(fd,2))) || sd->state.vending ) + if (pc_cant_act2(sd) || !(bl = map->id2bl(RFIFOL(fd,2))) || sd->state.vending || sd->state.prevend) return; switch (bl->type) { @@ -12146,7 +12146,7 @@ static void clif_parse_PutItemToCart(int fd, struct map_session_data *sd) __attr static void clif_parse_PutItemToCart(int fd, struct map_session_data *sd) { int flag = 0; - if (pc_istrading(sd)) + if (pc_istrading(sd) || sd->state.prevend) return; if (!pc_iscarton(sd)) return; @@ -12161,6 +12161,8 @@ static void clif_parse_GetItemFromCart(int fd, struct map_session_data *sd) __at /// 0127 .W .L static void clif_parse_GetItemFromCart(int fd, struct map_session_data *sd) { + if (sd->state.vending || sd->state.prevend) + return; if (!pc_iscarton(sd)) return; pc->getitemfromcart(sd,RFIFOW(fd,2)-2,RFIFOL(fd,4)); @@ -13072,7 +13074,7 @@ static void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd) /// 0129 .W .L static void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd) { - if( sd->state.vending ) + if (sd->state.vending || sd->state.prevend) return; if (!pc_iscarton(sd)) return; @@ -13088,7 +13090,7 @@ static void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd) /// 0128 .W .L static void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd) { - if( sd->state.vending ) + if (sd->state.vending || sd->state.prevend) return; if (!pc_iscarton(sd)) return; @@ -16579,7 +16581,7 @@ static void clif_Auction_openwindow(struct map_session_data *sd) nullpo_retv(sd); fd = sd->fd; - if (sd->state.storage_flag != STORAGE_FLAG_CLOSED || sd->state.vending || sd->state.buyingstore || sd->state.trading) + if (sd->state.storage_flag != STORAGE_FLAG_CLOSED || sd->state.vending || sd->state.prevend || sd->state.buyingstore || sd->state.trading) return; if( !battle_config.feature_auction ) @@ -19169,7 +19171,7 @@ static void clif_parse_SkillSelectMenu(int fd, struct map_session_data *sd) if( sd->menuskill_id != SC_AUTOSHADOWSPELL ) return; - if( pc_istrading(sd) ) { + if (pc_istrading(sd) || sd->state.prevend) { clif->skill_fail(sd, sd->ud.skill_id, 0, 0, 0); clif_menuskill_clear(sd); return; diff --git a/src/map/mail.c b/src/map/mail.c index 0a4b91e34..0a6603a45 100644 --- a/src/map/mail.c +++ b/src/map/mail.c @@ -177,7 +177,7 @@ static int mail_openmail(struct map_session_data *sd) { nullpo_ret(sd); - if (sd->state.storage_flag != STORAGE_FLAG_CLOSED || sd->state.vending || sd->state.buyingstore || sd->state.trading) + if (sd->state.storage_flag != STORAGE_FLAG_CLOSED || sd->state.vending || sd->state.prevend || sd->state.buyingstore || sd->state.trading) return 0; clif->mail_window(sd->fd, 0); diff --git a/src/map/pc.c b/src/map/pc.c index 140cf7ac1..5416fbec2 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4854,7 +4854,7 @@ static int pc_dropitem(struct map_session_data *sd, int n, int amount) if(sd->status.inventory[n].nameid <= 0 || sd->status.inventory[n].amount <= 0 || sd->status.inventory[n].amount < amount || - sd->state.trading || sd->state.vending || + sd->state.trading || sd->state.vending || sd->state.prevend || !sd->inventory_data[n] //pc->delitem would fail on this case. ) return 0; @@ -5472,7 +5472,7 @@ static int pc_putitemtocart(struct map_session_data *sd, int idx, int amount) item_data = &sd->status.inventory[idx]; - if( item_data->nameid == 0 || amount < 1 || item_data->amount < amount || sd->state.vending ) + if (item_data->nameid == 0 || amount < 1 || item_data->amount < amount || sd->state.vending || sd->state.prevend) return 1; if( (flag = pc->cart_additem(sd,item_data,amount,LOG_TYPE_NONE)) == 0 ) @@ -5519,10 +5519,10 @@ static int pc_getitemfromcart(struct map_session_data *sd, int idx, int amount) item_data=&sd->status.cart[idx]; - if(item_data->nameid==0 || amount < 1 || item_data->amountstate.vending ) + if (item_data->nameid == 0 || amount < 1 || item_data->amount < amount || sd->state.vending || sd->state.prevend) return 1; - if((flag = pc->additem(sd,item_data,amount,LOG_TYPE_NONE)) == 0) + if ((flag = pc->additem(sd,item_data,amount,LOG_TYPE_NONE)) == 0) return pc->cart_delitem(sd,idx,amount,0,LOG_TYPE_NONE); return flag; @@ -12356,7 +12356,7 @@ static bool pc_expandInventory(struct map_session_data *sd, int adjustSize) clif->inventoryExpandResult(sd, EXPAND_INVENTORY_RESULT_MAX_SIZE); return false; } - if (pc_isdead(sd) || sd->state.vending || sd->state.buyingstore || sd->chat_id != 0 || sd->state.trading || sd->state.storage_flag || sd->state.prevend) { + if (pc_isdead(sd) || sd->state.vending || sd->state.prevend || sd->state.buyingstore || sd->chat_id != 0 || sd->state.trading || sd->state.storage_flag || sd->state.prevend) { clif->inventoryExpandResult(sd, EXPAND_INVENTORY_RESULT_OTHER_WORK); return false; } diff --git a/src/map/trade.c b/src/map/trade.c index 9c284ba23..cef14ffe6 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -163,8 +163,8 @@ static void trade_tradeack(struct map_session_data *sd, int type) } //Check if you can start trade. - if (sd->npc_id || sd->state.vending || sd->state.buyingstore || sd->state.storage_flag != STORAGE_FLAG_CLOSED - || tsd->npc_id || tsd->state.vending || tsd->state.buyingstore || tsd->state.storage_flag != STORAGE_FLAG_CLOSED + if (sd->npc_id || sd->state.vending || sd->state.prevend || sd->state.buyingstore || sd->state.storage_flag != STORAGE_FLAG_CLOSED + || tsd->npc_id || tsd->state.vending || tsd->state.prevend || tsd->state.buyingstore || tsd->state.storage_flag != STORAGE_FLAG_CLOSED ) { //Fail clif->tradestart(sd, 2); diff --git a/src/map/unit.c b/src/map/unit.c index 68e6aeec1..a6805c610 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1090,6 +1090,7 @@ static int unit_can_move(struct block_list *bl) if (sd && ( pc_issit(sd) || sd->state.vending || + sd->state.prevend || sd->state.buyingstore || sd->block_action.move )) -- cgit v1.2.3-70-g09d2 From ef4128360d2c5c5798e4ece52fbf3d0f290d07bd Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 10 Oct 2019 00:11:28 +0200 Subject: Fix Homunculus skill requirements being put on owner as well This fixes not being able to use Homunculus skills when having 90% overweight. This also fixes not being able to use Homunculus skills when the owner has low HP or SP, even though the Homunculus has enough HP or SP to use the skill. --- src/map/unit.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 45cb7dffd..9cbef3091 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1410,13 +1410,6 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill } } - if (src->type == BL_HOM) { - // In case of homunuculus, set the sd to the homunculus' master, as needed below - struct block_list *master = battle->get_master(src); - if (master) - sd = map->id2sd(master->id); - } - if (sd) { /* temporarily disabled, awaiting for kenpachi to detail this so we can make it work properly */ #if 0 -- cgit v1.2.3-70-g09d2 From b2e1879cc22faeda1511108e912d915c90d30b6e Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 10 Oct 2019 03:13:14 +0200 Subject: Fix Chaotic Blessings never healing the enemy It has a chance to roll for enemy and heal the enemy, While calculating the chance was correct, it was getting the enemy with battle->check_target. But unit->stop_attack has been called before in unit->skilluse_id2, making battle->check_target return NULL at that point, since it has no attack target anymore. So it defaulted to heal the Homunculus itself, instead of the enemy. --- src/map/skill.c | 16 ++++++++++++---- src/map/unit.c | 6 ++++++ 2 files changed, 18 insertions(+), 4 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/skill.c b/src/map/skill.c index b5f84679e..fc5fc013e 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8758,12 +8758,20 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * int r = rnd()%100; int target = (skill_lv-1)%5; int hp; - if(rget_master(src); - else //Enemy - bl = map->id2bl(battle->get_target(src)); + } else if ((per[target][1] - per[target][0]) < per[target][0] + && bl == battle->get_master(src)) { + /** + * Skill rolled for enemy, but there's nothing the Homunculus is attacking. + * So bl has been set to its master in unit->skilluse_id2. + * If it's more likely that it will heal itself, + * we let it heal itself. + */ + bl = src; + } if (!bl) bl = src; hp = skill->calc_heal(src, bl, skill_id, 1+rnd()%skill_lv, true); diff --git a/src/map/unit.c b/src/map/unit.c index 9cbef3091..1e9433eaf 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1328,6 +1328,12 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill if (src->type==BL_HOM) switch(skill_id) { //Homun-auto-target skills. + case HVAN_CHAOTIC: + target_id = ud->target; // Choose attack target for now + target = map->id2bl(target_id); + if (target != NULL) + break; + FALLTHROUGH // Attacking nothing, choose master as default target instead case HLIF_HEAL: case HLIF_AVOID: case HAMI_DEFENCE: -- cgit v1.2.3-70-g09d2 From 78696300e2c09d948407b98d9eac014c882046fe Mon Sep 17 00:00:00 2001 From: skyleo Date: Fri, 18 Oct 2019 23:32:32 +0200 Subject: Fix ud->target_to not being cleared appropriately --- src/map/unit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 45cb7dffd..f527b3b00 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -459,10 +459,10 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) } if (tbl->m == bl->m && check_distance_bl(bl, tbl, ud->chaserange)) { //Reached destination. + ud->target_to = 0; if (ud->state.attack_continue) { //Aegis uses one before every attack, we should //only need this one for syncing purposes. [Skotlex] - ud->target_to = 0; clif->fixpos(bl); unit->attack(bl, tbl->id, ud->state.attack_continue); } @@ -544,6 +544,8 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) ud->to_x = x; ud->to_y = y; unit->stop_attack(bl); //Sets target to 0 + if ((flag & 8) == 0) // Stepaction might be delayed due to occupied cell + unit->stop_stepaction(bl); // unit->walktoxy removes any remembered stepaction and resets ud->target_to sc = status->get_sc(bl); if( sc ) { -- cgit v1.2.3-70-g09d2 From c6635fbf0145b03656d1b90212a3f3093de228d3 Mon Sep 17 00:00:00 2001 From: Asheraf Date: Tue, 5 Nov 2019 22:04:26 +0100 Subject: Dehardcode Status Icons --- db/constants.conf | 668 +++++++++++++++++++++++++++++++ db/sc_config.conf | 787 ++++++++++++++++++++++++++++++++++++ src/map/atcommand.c | 2 +- src/map/battle.c | 2 +- src/map/clif.c | 37 +- src/map/clif.h | 4 +- src/map/constants.inc | 1029 ----------------------------------------------- src/map/pc.c | 26 +- src/map/script.c | 3 +- src/map/skill.c | 16 +- src/map/status.c | 1040 ++++++++++++++++++++---------------------------- src/map/status.h | 1055 ++----------------------------------------------- src/map/unit.c | 4 +- 13 files changed, 1944 insertions(+), 2729 deletions(-) delete mode 100644 src/map/constants.inc (limited to 'src/map/unit.c') diff --git a/db/constants.conf b/db/constants.conf index 3d1f9202d..f87e60ee0 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -1402,6 +1402,21 @@ constants_db: { // Clan System SC_CLAN_INFO: 654 + SC_SIT: 655 + SC_MOON: 656 + SC_TING: 657 + SC_DEVIL1: 658 + SC_RIDING: 659 + SC_FALCON: 660 + SC_WUGRIDER: 661 + SC_POSTDELAY: 662 + SC_ON_PUSH_CART: 663 + SC_RESIST_PROPERTY_WATER: 664 + SC_RESIST_PROPERTY_GROUND: 665 + SC_RESIST_PROPERTY_FIRE: 666 + SC_RESIST_PROPERTY_WIND: 667 + SC_CLIENT_ONLY_EQUIP_ARROW: 668 + comment__: "Emotes" e_gasp: 0 e_what: 1 @@ -4062,4 +4077,657 @@ constants_db: { comment__: "inventory expansion" INVENTORY_INCREASE_STEP: 10 + + comment__: "Status Effect Icons" + SI_BLANK: -1 + SI_PROVOKE: 0 + SI_ENDURE: 1 + SI_TWOHANDQUICKEN: 2 + SI_CONCENTRATION: 3 + SI_HIDING: 4 + SI_CLOAKING: 5 + SI_ENCHANTPOISON: 6 + SI_POISONREACT: 7 + SI_QUAGMIRE: 8 + SI_ANGELUS: 9 + SI_BLESSING: 10 + SI_CRUCIS: 11 + SI_INC_AGI: 12 + SI_DEC_AGI: 13 + SI_SLOWPOISON: 14 + SI_IMPOSITIO: 15 + SI_SUFFRAGIUM: 16 + SI_ASPERSIO: 17 + SI_BENEDICTIO: 18 + SI_KYRIE: 19 + SI_MAGNIFICAT: 20 + SI_GLORIA: 21 + SI_LEXAETERNA: 22 + SI_ADRENALINE: 23 + SI_WEAPONPERFECT: 24 + SI_OVERTHRUST: 25 + SI_MAXIMIZE: 26 + SI_RIDING: 27 + SI_FALCON: 28 + SI_TRICKDEAD: 29 + SI_SHOUT: 30 + SI_ENERGYCOAT: 31 + SI_BROKENARMOR: 32 + SI_BROKENWEAPON: 33 + SI_ILLUSION: 34 + SI_WEIGHTOVER50: 35 + SI_WEIGHTOVER90: 36 + SI_ATTHASTE_POTION1: 37 + SI_ATTHASTE_POTION2: 38 + SI_ATTHASTE_POTION3: 39 + SI_ATTHASTE_INFINITY: 40 + SI_MOVHASTE_POTION: 41 + SI_MOVHASTE_INFINITY: 42 + SI_ANKLESNARE: 45 + SI_POSTDELAY: 46 + SI_NOEQUIPWEAPON: 50 + SI_NOEQUIPSHIELD: 51 + SI_NOEQUIPARMOR: 52 + SI_NOEQUIPHELM: 53 + SI_PROTECTWEAPON: 54 + SI_PROTECTSHIELD: 55 + SI_PROTECTARMOR: 56 + SI_PROTECTHELM: 57 + SI_AUTOGUARD: 58 + SI_REFLECTSHIELD: 59 + SI_PROVIDENCE: 61 + SI_DEFENDER: 62 + SI_AUTOSPELL: 65 + SI_SPEARQUICKEN: 68 + SI_EXPLOSIONSPIRITS: 86 + SI_STEELBODY: 87 + SI_EXTREMITYFIST: 88 + SI_PROPERTYFIRE: 90 + SI_PROPERTYWATER: 91 + SI_PROPERTYWIND: 92 + SI_PROPERTYGROUND: 93 + SI_STOP: 95 + SI_PROPERTYUNDEAD: 97 + SI_AURABLADE: 103 + SI_PARRYING: 104 + SI_LKCONCENTRATION: 105 + SI_TENSIONRELAX: 106 + SI_BERSERK: 107 + SI_ASSUMPTIO: 110 + SI_GROUNDMAGIC: 112 + SI_MAGICPOWER: 113 + SI_EDP: 114 + SI_TRUESIGHT: 115 + SI_WINDWALK: 116 + SI_MELTDOWN: 117 + SI_CARTBOOST: 118 + SI_SWORDREJECT: 120 + SI_MARIONETTE_MASTER: 121 + SI_MARIONETTE: 122 + SI_MOON: 123 + SI_BLOODING: 124 + SI_JOINTBEAT: 125 + SI_PROTECTEXP: 130 + SI_AUTOBERSERK: 132 + SI_RUN: 133 + SI_TING: 134 + SI_STORMKICK_ON: 135 + SI_STORMKICK_READY: 136 + SI_DOWNKICK_ON: 137 + SI_DOWNKICK_READY: 138 + SI_TURNKICK_ON: 139 + SI_TURNKICK_READY: 140 + SI_COUNTER_ON: 141 + SI_COUNTER_READY: 142 + SI_DODGE_ON: 143 + SI_DODGE_READY: 144 + SI_STRUP: 145 + SI_PROPERTYDARK: 146 + SI_ADRENALINE2: 147 + SI_PROPERTYTELEKINESIS: 148 + SI_SOULLINK: 149 + SI_PLUSATTACKPOWER: 150 + SI_PLUSMAGICPOWER: 151 + SI_DEVIL1: 152 + SI_KAITE: 153 + SI_KAIZEL: 156 + SI_KAAHI: 157 + SI_KAUPE: 158 + SI_SMA_READY: 159 + SI_SKE: 160 + SI_ONEHANDQUICKEN: 161 + SI_SG_SUN_WARM: 165 + SI_SUN_COMFORT: 169 + SI_MOON_COMFORT: 170 + SI_STAR_COMFORT: 171 + SI_PRESERVE: 181 + SI_INCSTR: 182 + SI_CLAIRVOYANCE: 184 + SI_MOVESLOW_POTION: 185 + SI_DOUBLECASTING: 186 + SI_OVERTHRUSTMAX: 188 + SI_TAROTCARD: 191 + SI_CR_SHRINK: 197 + SI_WZ_SIGHTBLASTER: 198 + SI_DC_WINKCHARM: 199 + SI_RG_CCONFINE_M: 200 + SI_RG_CCONFINE_S: 201 + SI_GS_MADNESSCANCEL: 203 + SI_GS_GATLINGFEVER: 204 + SI_EARTHSCROLL: 205 + SI_NJ_UTSUSEMI: 206 + SI_NJ_BUNSINJYUTSU: 207 + SI_NJ_NEN: 208 + SI_GS_ADJUSTMENT: 209 + SI_GS_ACCURACY: 210 + SI_NJ_SUITON: 211 + SI_FOOD_STR: 241 + SI_FOOD_AGI: 242 + SI_FOOD_VIT: 243 + SI_FOOD_DEX: 244 + SI_FOOD_INT: 245 + SI_FOOD_LUK: 246 + SI_FOOD_BASICAVOIDANCE: 247 + SI_FOOD_BASICHIT: 248 + SI_FOOD_CRITICALSUCCESSVALUE: 249 + SI_CASH_PLUSEXP: 250 + SI_CASH_DEATHPENALTY: 251 + SI_CASH_RECEIVEITEM: 252 + SI_CASH_BOSS_ALARM: 253 + SI_FOOD_STR_CASH: 271 + SI_FOOD_AGI_CASH: 272 + SI_FOOD_VIT_CASH: 273 + SI_FOOD_DEX_CASH: 274 + SI_FOOD_INT_CASH: 275 + SI_FOOD_LUK_CASH: 276 + SI_MER_FLEE: 277 + SI_MER_ATK: 278 + SI_MER_HP: 279 + SI_MER_SP: 280 + SI_MER_HIT: 281 + SI_SLOWCAST: 282 + SI_CRITICALWOUND: 286 + SI_MOVHASTE_HORSE: 289 + SI_PROTECT_DEF: 290 + SI_PROTECT_MDEF: 291 + SI_HEALPLUS: 292 + SI_S_LIFEPOTION: 293 + SI_L_LIFEPOTION: 294 + SI_CRITICALPERCENT: 295 + SI_PLUSAVOIDVALUE: 296 + SI_ATKER_ASPD: 297 + SI_TARGET_ASPD: 298 + SI_ATKER_MOVESPEED: 299 + SI_ATKER_BLOOD: 300 + SI_TARGET_BLOOD: 301 + SI_ARMOR_PROPERTY: 302 + SI_HELLPOWER: 304 + SI_STEAMPACK: 305 + SI_INVINCIBLE: 311 + SI_CASH_PLUSONLYJOBEXP: 312 + SI_PARTYFLEE: 313 + SI_ANGEL_PROTECT: 314 + SI_ENCHANTBLADE: 316 + SI_DEATHBOUND: 317 + SI_REFRESH: 318 + SI_GIANTGROWTH: 319 + SI_STONEHARDSKIN: 320 + SI_VITALITYACTIVATION: 321 + SI_FIGHTINGSPIRIT: 322 + SI_ABUNDANCE: 323 + SI_REUSE_MILLENNIUMSHIELD: 324 + SI_REUSE_CRUSHSTRIKE: 325 + SI_REUSE_REFRESH: 326 + SI_REUSE_STORMBLAST: 327 + SI_VENOMIMPRESS: 328 + SI_EPICLESIS: 329 + SI_ORATIO: 330 + SI_LAUDAAGNUS: 331 + SI_LAUDARAMUS: 332 + SI_CLOAKINGEXCEED: 333 + SI_HALLUCINATIONWALK: 334 + SI_HALLUCINATIONWALK_POSTDELAY: 335 + SI_RENOVATIO: 336 + SI_WEAPONBLOCKING: 337 + SI_WEAPONBLOCKING_POSTDELAY: 338 + SI_ROLLINGCUTTER: 339 + SI_EXPIATIO: 340 + SI_POISONINGWEAPON: 341 + SI_TOXIN: 342 + SI_PARALYSE: 343 + SI_VENOMBLEED: 344 + SI_MAGICMUSHROOM: 345 + SI_DEATHHURT: 346 + SI_PYREXIA: 347 + SI_OBLIVIONCURSE: 348 + SI_LEECHESEND: 349 + SI_DUPLELIGHT: 350 + SI_FROSTMISTY: 351 + SI_FEARBREEZE: 352 + SI_ELECTRICSHOCKER: 353 + SI_MARSHOFABYSS: 354 + SI_RECOGNIZEDSPELL: 355 + SI_STASIS: 356 + SI_WUGRIDER: 357 + SI_WUGDASH: 358 + SI_WUGBITE: 359 + SI_CAMOUFLAGE: 360 + SI_ACCELERATION: 361 + SI_HOVERING: 362 + SI_SPHERE_1: 363 + SI_SPHERE_2: 364 + SI_SPHERE_3: 365 + SI_SPHERE_4: 366 + SI_SPHERE_5: 367 + SI_MVPCARD_TAOGUNKA: 368 + SI_MVPCARD_MISTRESS: 369 + SI_MVPCARD_ORCHERO: 370 + SI_MVPCARD_ORCLORD: 371 + SI_OVERHEAT_LIMITPOINT: 372 + SI_OVERHEAT: 373 + SI_SHAPESHIFT: 374 + SI_INFRAREDSCAN: 375 + SI_MAGNETICFIELD: 376 + SI_NEUTRALBARRIER: 377 + SI_NEUTRALBARRIER_MASTER: 378 + SI_STEALTHFIELD: 379 + SI_STEALTHFIELD_MASTER: 380 + SI_MANU_ATK: 381 + SI_MANU_DEF: 382 + SI_SPL_ATK: 383 + SI_SPL_DEF: 384 + SI_REPRODUCE: 385 + SI_MANU_MATK: 386 + SI_SPL_MATK: 387 + SI_STR_SCROLL: 388 + SI_INT_SCROLL: 389 + SI_LG_REFLECTDAMAGE: 390 + SI_FORCEOFVANGUARD: 391 + SI_BUCHEDENOEL: 392 + SI_AUTOSHADOWSPELL: 393 + SI_SHADOWFORM: 394 + SI_RAID: 395 + SI_SHIELDSPELL_DEF: 396 + SI_SHIELDSPELL_MDEF: 397 + SI_SHIELDSPELL_REF: 398 + SI_BODYPAINT: 399 + SI_EXEEDBREAK: 400 + SI_ADORAMUS: 401 + SI_PRESTIGE: 402 + SI_INVISIBILITY: 403 + SI_DEADLYINFECT: 404 + SI_BANDING: 405 + SI_EARTHDRIVE: 406 + SI_INSPIRATION: 407 + SI_ENERVATION: 408 + SI_GROOMY: 409 + SI_RAISINGDRAGON: 410 + SI_IGNORANCE: 411 + SI_LAZINESS: 412 + SI_LIGHTNINGWALK: 413 + SI_ACARAJE: 414 + SI_UNLUCKY: 415 + SI_CURSEDCIRCLE_ATKER: 416 + SI_CURSEDCIRCLE_TARGET: 417 + SI_WEAKNESS: 418 + SI_CRESCENTELBOW: 419 + SI_NOEQUIPACCESSARY: 420 + SI_STRIPACCESSARY: 421 + SI_MANHOLE: 422 + SI_POPECOOKIE: 423 + SI_FALLENEMPIRE: 424 + SI_GENTLETOUCH_ENERGYGAIN: 425 + SI_GENTLETOUCH_CHANGE: 426 + SI_GENTLETOUCH_REVITALIZE: 427 + SI_BLOODYLUST: 428 + SI_SWINGDANCE: 429 + SI_SYMPHONYOFLOVERS: 430 + SI_PROPERTYWALK: 431 + SI_SPELLFIST: 432 + SI_NETHERWORLD: 433 + SI_SIREN: 434 + SI_DEEPSLEEP: 435 + SI_SIRCLEOFNATURE: 436 + SI_COLD: 437 + SI_GLOOMYDAY: 438 + SI_SONG_OF_MANA: 439 + SI_CLOUDKILL: 440 + SI_DANCEWITHWUG: 441 + SI_RUSHWINDMILL: 442 + SI_ECHOSONG: 443 + SI_HARMONIZE: 444 + SI_STRIKING: 445 + SI_MOONLITSERENADE: 447 + SI_SATURDAYNIGHTFEVER: 448 + SI_SITDOWN_FORCE: 449 + SI_ANALYZE: 450 + SI_LERADSDEW: 451 + SI_MELODYOFSINK: 452 + SI_WARCRYOFBEYOND: 453 + SI_UNLIMITEDHUMMINGVOICE: 454 + SI_SPELLBOOK1: 455 + SI_SPELLBOOK2: 456 + SI_SPELLBOOK3: 457 + SI_FREEZE_SP: 458 + SI_GN_TRAINING_SWORD: 459 + SI_GN_REMODELING_CART: 460 + SI_CARTSBOOST: 461 + SI_FIXEDCASTINGTM_REDUCE: 462 + SI_THORNTRAP: 463 + SI_BLOODSUCKER: 464 + SI_SPORE_EXPLOSION: 465 + SI_DEMONIC_FIRE: 466 + SI_FIRE_EXPANSION_SMOKE_POWDER: 467 + SI_FIRE_EXPANSION_TEAR_GAS: 468 + SI_BLOCKING_PLAY: 469 + SI_MANDRAGORA: 470 + SI_ACTIVATE: 471 + SI_SECRAMENT: 472 + SI_ASSUMPTIO2: 473 + SI_TK_SEVENWIND: 474 + SI_LIMIT_ODINS_RECALL: 475 + SI_STOMACHACHE: 476 + SI_MYSTERIOUS_POWDER: 477 + SI_MELON_BOMB: 478 + SI_BANANA_BOMB_SITDOWN_POSTDELAY: 479 + SI_PROMOTE_HEALTH_RESERCH: 480 + SI_ENERGY_DRINK_RESERCH: 481 + SI_EXTRACT_WHITE_POTION_Z: 482 + SI_VITATA_500: 483 + SI_EXTRACT_SALAMINE_JUICE: 484 + SI_BOOST500: 485 + SI_FULL_SWING_K: 486 + SI_MANA_PLUS: 487 + SI_MUSTLE_M: 488 + SI_LIFE_FORCE_F: 489 + SI_VACUUM_EXTREME: 490 + SI_SAVAGE_STEAK: 491 + SI_COCKTAIL_WARG_BLOOD: 492 + SI_MINOR_BBQ: 493 + SI_SIROMA_ICE_TEA: 494 + SI_DROCERA_HERB_STEAMED: 495 + SI_PUTTI_TAILS_NOODLES: 496 + SI_BANANA_BOMB: 497 + SI_SUMMON_AGNI: 498 + SI_SPELLBOOK4: 499 + SI_SPELLBOOK5: 500 + SI_SPELLBOOK6: 501 + SI_SPELLBOOK7: 502 + SI_ELEMENTAL_AGGRESSIVE: 503 + SI_RETURN_TO_ELDICASTES: 504 + SI_BANDING_DEFENCE: 505 + SI_SKELSCROLL: 506 + SI_DISTRUCTIONSCROLL: 507 + SI_ROYALSCROLL: 508 + SI_IMMUNITYSCROLL: 509 + SI_MYSTICSCROLL: 510 + SI_BATTLESCROLL: 511 + SI_ARMORSCROLL: 512 + SI_FREYJASCROLL: 513 + SI_SOULSCROLL: 514 + SI_CIRCLE_OF_FIRE: 515 + SI_CIRCLE_OF_FIRE_OPTION: 516 + SI_FIRE_CLOAK: 517 + SI_FIRE_CLOAK_OPTION: 518 + SI_WATER_SCREEN: 519 + SI_WATER_SCREEN_OPTION: 520 + SI_WATER_DROP: 521 + SI_WATER_DROP_OPTION: 522 + SI_WIND_STEP: 523 + SI_WIND_STEP_OPTION: 524 + SI_WIND_CURTAIN: 525 + SI_WIND_CURTAIN_OPTION: 526 + SI_WATER_BARRIER: 527 + SI_ZEPHYR: 528 + SI_SOLID_SKIN: 529 + SI_SOLID_SKIN_OPTION: 530 + SI_STONE_SHIELD: 531 + SI_STONE_SHIELD_OPTION: 532 + SI_POWER_OF_GAIA: 533 + SI_PYROTECHNIC: 539 + SI_PYROTECHNIC_OPTION: 540 + SI_HEATER: 541 + SI_HEATER_OPTION: 542 + SI_TROPIC: 543 + SI_TROPIC_OPTION: 544 + SI_AQUAPLAY: 545 + SI_AQUAPLAY_OPTION: 546 + SI_COOLER: 547 + SI_COOLER_OPTION: 548 + SI_CHILLY_AIR: 549 + SI_CHILLY_AIR_OPTION: 550 + SI_GUST: 551 + SI_GUST_OPTION: 552 + SI_BLAST: 553 + SI_BLAST_OPTION: 554 + SI_WILD_STORM: 555 + SI_WILD_STORM_OPTION: 556 + SI_PETROLOGY: 557 + SI_PETROLOGY_OPTION: 558 + SI_CURSED_SOIL: 559 + SI_CURSED_SOIL_OPTION: 560 + SI_UPHEAVAL: 561 + SI_UPHEAVAL_OPTION: 562 + SI_TIDAL_WEAPON: 563 + SI_TIDAL_WEAPON_OPTION: 564 + SI_ROCK_CRUSHER: 565 + SI_ROCK_CRUSHER_ATK: 566 + SI_FIRE_INSIGNIA: 567 + SI_WATER_INSIGNIA: 568 + SI_WIND_INSIGNIA: 569 + SI_EARTH_INSIGNIA: 570 + SI_EQUIPED_FLOOR: 571 + SI_GUARDIAN_RECALL: 572 + SI_MORA_BUFF: 573 + SI_REUSE_LIMIT_G: 574 + SI_REUSE_LIMIT_H: 575 + SI_NEEDLE_OF_PARALYZE: 576 + SI_PAIN_KILLER: 577 + SI_G_LIFEPOTION: 578 + SI_VITALIZE_POTION: 579 + SI_LIGHT_OF_REGENE: 580 + SI_OVERED_BOOST: 581 + SI_SILENT_BREEZE: 582 + SI_ODINS_POWER: 583 + SI_STYLE_CHANGE: 584 + SI_SONIC_CLAW_POSTDELAY: 585 + SI_SILVERVEIN_RUSH_POSTDELAY: 596 + SI_MIDNIGHT_FRENZY_POSTDELAY: 597 + SI_GOLDENE_FERSE: 598 + SI_ANGRIFFS_MODUS: 599 + SI_TINDER_BREAKER: 600 + SI_TINDER_BREAKER_POSTDELAY: 601 + SI_CBC: 602 + SI_CBC_POSTDELAY: 603 + SI_EQC: 604 + SI_MAGMA_FLOW: 605 + SI_GRANITIC_ARMOR: 606 + SI_PYROCLASTIC: 607 + SI_VOLCANIC_ASH: 608 + SI_SPIRITS_SAVEINFO1: 609 + SI_SPIRITS_SAVEINFO2: 610 + SI_MAGIC_CANDY: 611 + SI_SEARCH_STORE_INFO: 612 + SI_ALL_RIDING: 613 + SI_ALL_RIDING_REUSE_LIMIT: 614 + SI_MACRO: 615 + SI_MACRO_POSTDELAY: 616 + SI_BEER_BOTTLE_CAP: 617 + SI_OVERLAPEXPUP: 618 + SI_PC_IZ_DUN05: 619 + SI_CRUSHSTRIKE: 620 + SI_MONSTER_TRANSFORM: 621 + SI_SIT: 622 + SI_ONAIR: 623 + SI_MTF_ASPD: 624 + SI_MTF_RANGEATK: 625 + SI_MTF_MATK: 626 + SI_MTF_MLEATKED: 627 + SI_MTF_CRIDAMAGE: 628 + SI_REUSE_LIMIT_MTF: 629 + SI_MACRO_PERMIT: 630 + SI_MACRO_PLAY: 631 + SI_SKF_CAST: 632 + SI_SKF_ASPD: 633 + SI_SKF_ATK: 634 + SI_SKF_MATK: 635 + SI_REWARD_PLUSONLYJOBEXP: 636 + SI_HANDICAPSTATE_NORECOVER: 637 + SI_SET_NUM_DEF: 638 + SI_SET_NUM_MDEF: 639 + SI_SET_PER_DEF: 640 + SI_SET_PER_MDEF: 641 + SI_PARTYBOOKING_SEARCH_DEALY: 642 + SI_PARTYBOOKING_REGISTER_DEALY: 643 + SI_PERIOD_TIME_CHECK_DETECT_SKILL: 644 + SI_KO_JYUMONJIKIRI: 645 + SI_MEIKYOUSISUI: 646 + SI_ATTHASTE_CASH: 647 + SI_EQUIPPED_DIVINE_ARMOR: 648 + SI_EQUIPPED_HOLY_ARMOR: 649 + SI_2011RWC: 650 + SI_KYOUGAKU: 651 + SI_IZAYOI: 652 + SI_ZENKAI: 653 + SI_KG_KAGEHUMI: 654 + SI_KYOMU: 655 + SI_KAGEMUSYA: 656 + SI_ZANGETSU: 657 + SI_PHI_DEMON: 658 + SI_GENSOU: 659 + SI_AKAITSUKI: 660 + SI_TETANY: 661 + SI_GM_BATTLE: 662 + SI_GM_BATTLE2: 663 + SI_2011RWC_SCROLL: 664 + SI_ACTIVE_MONSTER_TRANSFORM: 665 + SI_MYSTICPOWDER: 666 + SI_ECLAGE_RECALL: 667 + SI_ENTRY_QUEUE_APPLY_DELAY: 668 + SI_REUSE_LIMIT_ECL: 669 + SI_M_LIFEPOTION: 670 + SI_ENTRY_QUEUE_NOTIFY_ADMISSION_TIME_OUT: 671 + SI_UNKNOWN_NAME: 672 + SI_ON_PUSH_CART: 673 + SI_HAT_EFFECT: 674 + SI_FLOWER_LEAF: 675 + SI_RAY_OF_PROTECTION: 676 + SI_GLASTHEIM_ATK: 677 + SI_GLASTHEIM_DEF: 678 + SI_GLASTHEIM_HEAL: 679 + SI_GLASTHEIM_HIDDEN: 680 + SI_GLASTHEIM_STATE: 681 + SI_GLASTHEIM_ITEMDEF: 682 + SI_GLASTHEIM_HPSP: 683 + SI_HOMUN_SKILL_POSTDELAY: 684 + SI_ALMIGHTY: 685 + SI_GVG_GIANT: 686 + SI_GVG_GOLEM: 687 + SI_GVG_STUN: 688 + SI_GVG_STONE: 689 + SI_GVG_FREEZ: 690 + SI_GVG_SLEEP: 691 + SI_GVG_CURSE: 692 + SI_GVG_SILENCE: 693 + SI_GVG_BLIND: 694 + SI_CLIENT_ONLY_EQUIP_ARROW: 695 + SI_CLAN_INFO: 696 + SI_JP_EVENT01: 697 + SI_JP_EVENT02: 698 + SI_JP_EVENT03: 699 + SI_JP_EVENT04: 700 + SI_TELEPORT_FIXEDCASTINGDELAY: 701 + SI_GEFFEN_MAGIC1: 702 + SI_GEFFEN_MAGIC2: 703 + SI_GEFFEN_MAGIC3: 704 + SI_QUEST_BUFF1: 705 + SI_QUEST_BUFF2: 706 + SI_QUEST_BUFF3: 707 + SI_REUSE_LIMIT_RECALL: 708 + SI_SAVEPOSITION: 709 + SI_HANDICAPSTATE_ICEEXPLO: 710 + SI_FENRIR_CARD: 711 + SI_REUSE_LIMIT_ASPD_POTION: 712 + SI_MAXPAIN: 713 + SI_PC_STOP: 714 + SI_FRIGG_SONG: 715 + SI_OFFERTORIUM: 716 + SI_TELEKINESIS_INTENSE: 717 + SI_MOONSTAR: 718 + SI_STRANGELIGHTS: 719 + SI_FULL_THROTTLE: 720 + SI_REBOUND: 721 + SI_UNLIMIT: 722 + SI_KINGS_GRACE: 723 + SI_ITEM_ATKMAX: 724 + SI_ITEM_ATKMIN: 725 + SI_ITEM_MATKMAX: 726 + SI_ITEM_MATKMIN: 727 + SI_SUPER_STAR: 728 + SI_HIGH_RANKER: 729 + SI_DARKCROW: 730 + SI_2013_VALENTINE1: 731 + SI_2013_VALENTINE2: 732 + SI_2013_VALENTINE3: 733 + SI_ILLUSIONDOPING: 734 + SI_CHILL: 736 + SI_BURNT: 737 + SI_FLASHCOMBO: 740 + SI_CUP_OF_BOZA: 751 + SI_B_TRAP: 752 + SI_E_CHAIN: 753 + SI_E_QD_SHOT_READY: 754 + SI_C_MARKER: 755 + SI_H_MINE: 756 + SI_H_MINE_SPLASH: 757 + SI_P_ALTER: 758 + SI_HEAT_BARREL: 759 + SI_ANTI_M_BLAST: 760 + SI_SLUGSHOT: 761 + SI_SWORDCLAN: 762 + SI_ARCWANDCLAN: 763 + SI_GOLDENMACECLAN: 764 + SI_CROSSBOWCLAN: 765 + SI_PACKING_ENVELOPE1: 766 + SI_PACKING_ENVELOPE2: 767 + SI_PACKING_ENVELOPE3: 768 + SI_PACKING_ENVELOPE4: 769 + SI_PACKING_ENVELOPE5: 770 + SI_PACKING_ENVELOPE6: 771 + SI_PACKING_ENVELOPE7: 772 + SI_PACKING_ENVELOPE8: 773 + SI_PACKING_ENVELOPE9: 774 + SI_PACKING_ENVELOPE10: 775 + SI_GLASTHEIM_TRANS: 776 + SI_HEAT_BARREL_AFTER: 778 + SI_DECORATION_OF_MUSIC: 779 + SI_MTF_MHP: 793 + SI_MTF_MSP: 794 + SI_MTF_PUMPKIN: 795 + SI_MTF_HITFLEE: 796 + SI_FLOWERSMOKE: 822 + SI_FSTONE: 823 + SI_DAILYSENDMAILCNT: 824 + SI_LJOSALFAR: 826 + SI_HAPPINESS_STAR: 849 + SI_DRESS_UP: 856 + SI_MAPLE_FALLS: 857 + SI_MERMAID_LONGING: 863 + SI_MAGICAL_FEATHER: 864 + SI_TIME_ACCESSORY: 872 + SI_SU_STOOP: 893 + SI_CATNIPPOWDER: 894 + SI_BLOSSOM_FLUTTERING: 895 + SI_SV_ROOTTWIST: 896 + SI_RESIST_PROPERTY_WATER: 908 + SI_RESIST_PROPERTY_GROUND: 909 + SI_RESIST_PROPERTY_FIRE: 910 + SI_RESIST_PROPERTY_WIND: 911 + SI_BITESCAR: 917 + SI_ARCLOUSEDASH: 918 + SI_TUNAPARTY: 919 + SI_SHRIMP: 920 + SI_FRESHSHRIMP: 921 + SI_SUHIDE: 933 + SI_SPRITEMABLE: 937 } diff --git a/db/sc_config.conf b/db/sc_config.conf index abc73e793..809722043 100644 --- a/db/sc_config.conf +++ b/db/sc_config.conf @@ -50,6 +50,7 @@ SC_PROVOKE: { Flags: { Debuff: true } + Icon: "SI_PROVOKE" } SC_ENDURE: { Flags: { @@ -57,38 +58,45 @@ SC_ENDURE: { NoDispelReset: true Buff: true } + Icon: "SI_ENDURE" } SC_HIDING: { Flags: { NoDispelReset: true } + Icon: "SI_HIDING" } SC_CLOAKING: { Flags: { NoSave: true NoDispelReset: true } + Icon: "SI_CLOAKING" } SC_TWOHANDQUICKEN: { Flags: { NoClearanceReset: true Buff: true } + Icon: "SI_TWOHANDQUICKEN" } SC_CONCENTRATION: { Flags: { Buff: true } + Icon: "SI_CONCENTRATION" } SC_ENCHANTPOISON: { Flags: { Buff: true } + Icon: "SI_ENCHANTPOISON" } SC_POISONREACT: { Flags: { Buff: true } + Icon: "SI_POISONREACT" } SC_QUAGMIRE: { Flags: { @@ -96,51 +104,60 @@ SC_QUAGMIRE: { NoClearanceReset: true Debuff: true } + Icon: "SI_QUAGMIRE" } SC_ANGELUS: { Flags: { Buff: true } + Icon: "SI_ANGELUS" } SC_BLESSING: { Flags: { Buff: true NoMadoReset: true } + Icon: "SI_BLESSING" } SC_INC_AGI: { Flags: { Buff: true NoMadoReset: true } + Icon: "SI_INC_AGI" } SC_DEC_AGI: { Flags: { NoSave: true Debuff: true } + Icon: "SI_DEC_AGI" } SC_SLOWPOISON: { Flags: { NoClearanceReset: true Buff: true } + Icon: "SI_SLOWPOISON" } SC_IMPOSITIO: { Flags: { Buff: true } + Icon: "SI_IMPOSITIO" } SC_SUFFRAGIUM: { Flags: { Buff: true } + Icon: "SI_SUFFRAGIUM" } SC_ASPERSIO: { Flags: { Buff: true NoMadoReset: true } + Icon: "SI_ASPERSIO" } SC_BENEDICTIO: { Flags: { @@ -148,48 +165,57 @@ SC_BENEDICTIO: { NoClearanceReset: true Buff: true } + Icon: "SI_BENEDICTIO" } SC_KYRIE: { Flags: { Buff: true } + Icon: "SI_KYRIE" } SC_MAGNIFICAT: { Flags: { NoSave: true Buff: true } + Icon: "SI_MAGNIFICAT" } SC_GLORIA: { Flags: { Buff: true } + Icon: "SI_GLORIA" } SC_LEXAETERNA: { Flags: { NoSave: true Buff: true } + Icon: "SI_LEXAETERNA" } SC_ADRENALINE: { Flags: { Buff: true } + Icon: "SI_ADRENALINE" } SC_WEAPONPERFECT: { Flags: { Buff: true } + Icon: "SI_WEAPONPERFECT" } SC_OVERTHRUST: { Flags: { Buff: true } + Icon: "SI_OVERTHRUST" } SC_MAXIMIZEPOWER: { Flags: { Buff: true } + Icon: "SI_MAXIMIZE" } SC_TRICKDEAD: { Flags: { @@ -197,33 +223,39 @@ SC_TRICKDEAD: { NoClearanceReset: true Buff: true } + Icon: "SI_TRICKDEAD" } SC_SHOUT: { Flags: { Buff: true } + Icon: "SI_SHOUT" } SC_ENERGYCOAT: { Flags: { Buff: true } + Icon: "SI_ENERGYCOAT" } SC_ATTHASTE_POTION1: { Flags: { NoClearanceReset: true Buff: true } + Icon: "SI_ATTHASTE_POTION1" } SC_ATTHASTE_POTION2: { Flags: { NoClearanceReset: true Buff: true } + Icon: "SI_ATTHASTE_POTION2" } SC_ATTHASTE_POTION3: { Flags: { Buff: true } + Icon: "SI_ATTHASTE_POTION3" } SC_MOVHASTE_POTION: { Flags: { @@ -231,6 +263,7 @@ SC_MOVHASTE_POTION: { NoClearanceReset: true Buff: true } + Icon: "SI_MOVHASTE_POTION" } SC_BARRIER: { Flags: { @@ -244,6 +277,7 @@ SC_NOEQUIPWEAPON: { NoClearanceReset: true Buff: true } + Icon: "SI_NOEQUIPWEAPON" } SC_NOEQUIPSHIELD: { Flags: { @@ -252,6 +286,7 @@ SC_NOEQUIPSHIELD: { NoClearanceReset: true Buff: true } + Icon: "SI_NOEQUIPSHIELD" } SC_NOEQUIPARMOR: { Flags: { @@ -260,6 +295,7 @@ SC_NOEQUIPARMOR: { NoClearanceReset: true Buff: true } + Icon: "SI_NOEQUIPARMOR" } SC_NOEQUIPHELM: { Flags: { @@ -268,6 +304,7 @@ SC_NOEQUIPHELM: { NoClearanceReset: true Buff: true } + Icon: "SI_NOEQUIPHELM" } SC_PROTECTWEAPON: { Flags: { @@ -275,6 +312,7 @@ SC_PROTECTWEAPON: { NoClearanceReset: true Buff: true } + Icon: "SI_PROTECTWEAPON" } SC_PROTECTSHIELD: { Flags: { @@ -282,6 +320,7 @@ SC_PROTECTSHIELD: { NoClearanceReset: true Buff: true } + Icon: "SI_PROTECTSHIELD" } SC_PROTECTARMOR: { Flags: { @@ -289,6 +328,7 @@ SC_PROTECTARMOR: { NoClearanceReset: true Buff: true } + Icon: "SI_PROTECTARMOR" } SC_PROTECTHELM: { Flags: { @@ -296,18 +336,21 @@ SC_PROTECTHELM: { NoClearanceReset: true Buff: true } + Icon: "SI_PROTECTHELM" } SC_AUTOGUARD: { Flags: { NoClearanceReset: true Buff: true } + Icon: "SI_AUTOGUARD" } SC_REFLECTSHIELD: { Flags: { NoClearanceReset: true Buff: true } + Icon: "SI_REFLECTSHIELD" } SC_DEVOTION: { Flags: { @@ -320,11 +363,13 @@ SC_PROVIDENCE: { NoSave: true Buff: true } + Icon: "SI_PROVIDENCE" } SC_DEFENDER: { Flags: { Buff: true } + Icon: "SI_DEFENDER" } SC_MAGICROD: { Flags: { @@ -339,11 +384,13 @@ SC_AUTOSPELL: { NoDispelReset: true Buff: true } + Icon: "SI_AUTOSPELL" } SC_SPEARQUICKEN: { Flags: { Buff: true } + Icon: "SI_SPEARQUICKEN" } SC_BLADESTOP: { Flags: { @@ -358,12 +405,14 @@ SC_EXPLOSIONSPIRITS: { NoClearanceReset: true Buff: true } + Icon: "SI_EXPLOSIONSPIRITS" } SC_STEELBODY: { Flags: { NoSave: true Buff: true } + Icon: "SI_STEELBODY" } SC_PROPERTYFIRE: { Flags: { @@ -372,6 +421,7 @@ SC_PROPERTYFIRE: { NoClearanceReset: true Buff: true } + Icon: "SI_PROPERTYFIRE" } SC_PROPERTYWATER: { Flags: { @@ -380,6 +430,7 @@ SC_PROPERTYWATER: { NoClearanceReset: true Buff: true } + Icon: "SI_PROPERTYWATER" } SC_PROPERTYWIND: { Flags: { @@ -388,6 +439,7 @@ SC_PROPERTYWIND: { NoClearanceReset: true Buff: true } + Icon: "SI_PROPERTYWIND" } SC_PROPERTYGROUND: { Flags: { @@ -396,6 +448,7 @@ SC_PROPERTYGROUND: { NoClearanceReset: true Buff: true } + Icon: "SI_PROPERTYGROUND" } SC_STOP: { Flags: { @@ -403,6 +456,7 @@ SC_STOP: { NoClearanceReset: true Buff: true } + Icon: "SI_STOP" } SC_PROPERTYUNDEAD: { Flags: { @@ -410,12 +464,14 @@ SC_PROPERTYUNDEAD: { NoClearanceReset: true Buff: true } + Icon: "SI_PROPERTYUNDEAD" } SC_AURABLADE: { Flags: { NoSave: true Buff: true } + Icon: "SI_AURABLADE" } SC_PARRYING: { Flags: { @@ -423,12 +479,14 @@ SC_PARRYING: { NoClearanceReset: true Buff: true } + Icon: "SI_PARRYING" } SC_LKCONCENTRATION: { Flags: { NoSave: true Buff: true } + Icon: "SI_LKCONCENTRATION" } SC_TENSIONRELAX: { Flags: { @@ -436,12 +494,14 @@ SC_TENSIONRELAX: { NoClearanceReset: true Buff: true } + Icon: "SI_TENSIONRELAX" } SC_BERSERK: { Flags: { NoSave: true Buff: true } + Icon: "SI_BERSERK" } SC_SACRIFICE: { Flags: { @@ -474,6 +534,7 @@ SC_ASSUMPTIO: { Flags: { Buff: true } + Icon: "SI_ASSUMPTIO" } SC_BASILICA: { Flags: { @@ -488,6 +549,7 @@ SC_VOLCANO: { NoClearanceReset: true Buff: true } + Icon: "SI_GROUNDMAGIC" } SC_DELUGE: { Flags: { @@ -495,6 +557,7 @@ SC_DELUGE: { NoClearanceReset: true Buff: true } + Icon: "SI_GROUNDMAGIC" } SC_VIOLENTGALE: { Flags: { @@ -502,12 +565,14 @@ SC_VIOLENTGALE: { NoClearanceReset: true Buff: true } + Icon: "SI_GROUNDMAGIC" } SC_MAGICPOWER: { Flags: { NoSave: true Buff: true } + Icon: "SI_MAGICPOWER" } SC_EDP: { Flags: { @@ -516,18 +581,21 @@ SC_EDP: { NoDispelReset: true Buff: true } + Icon: "SI_EDP" } SC_TRUESIGHT: { Flags: { NoSave: true Buff: true } + Icon: "SI_TRUESIGHT" } SC_WINDWALK: { Flags: { NoSave: true Buff: true } + Icon: "SI_WINDWALK" } SC_MELTDOWN: { Flags: { @@ -536,6 +604,7 @@ SC_MELTDOWN: { NoDispelReset: true Buff: true } + Icon: "SI_MELTDOWN" } SC_CARTBOOST: { Flags: { @@ -544,6 +613,7 @@ SC_CARTBOOST: { NoDispelReset: true Buff: true } + Icon: "SI_CARTBOOST" } SC_BLOODING: { Flags: { @@ -551,6 +621,7 @@ SC_BLOODING: { NoClearanceReset: true Buff: true } + Icon: "SI_BLOODING" } SC_JOINTBEAT: { Flags: { @@ -558,6 +629,7 @@ SC_JOINTBEAT: { NoClearanceReset: true Debuff: true } + Icon: "SI_JOINTBEAT" } SC_MINDBREAKER: { Flags: { @@ -601,6 +673,7 @@ SC_RUN: { NoClearanceReset: true Buff: true } + Icon: "SI_RUN" } SC_STRUP: { Flags: { @@ -608,6 +681,7 @@ SC_STRUP: { NoClearanceReset: true Buff: true } + Icon: "SI_STRUP" } SC_PROPERTYDARK: { Flags: { @@ -615,12 +689,14 @@ SC_PROPERTYDARK: { NoClearanceReset: true Buff: true } + Icon: "SI_PROPERTYDARK" } SC_ADRENALINE2: { Flags: { NoSave: true Buff: true } + Icon: "SI_ADRENALINE2" } SC_PROPERTYTELEKINESIS: { Flags: { @@ -628,6 +704,7 @@ SC_PROPERTYTELEKINESIS: { NoClearanceReset: true Buff: true } + Icon: "SI_PROPERTYTELEKINESIS" } SC_SOULLINK: { Flags: { @@ -635,6 +712,7 @@ SC_SOULLINK: { NoClearanceReset: true Buff: true } + Icon: "SI_SOULLINK" } SC_PLUSATTACKPOWER: { Flags: { @@ -642,6 +720,7 @@ SC_PLUSATTACKPOWER: { Buff: true NoMadoReset: true } + Icon: "SI_PLUSATTACKPOWER" } SC_PLUSMAGICPOWER: { Flags: { @@ -649,6 +728,7 @@ SC_PLUSMAGICPOWER: { Buff: true NoMadoReset: true } + Icon: "SI_PLUSMAGICPOWER" } SC_KAITE: { Flags: { @@ -656,6 +736,7 @@ SC_KAITE: { NoClearanceReset: true Buff: true } + Icon: "SI_KAITE" } SC_KAAHI: { Flags: { @@ -663,6 +744,7 @@ SC_KAAHI: { NoClearanceReset: true Buff: true } + Icon: "SI_KAAHI" } SC_KAUPE: { Flags: { @@ -670,6 +752,7 @@ SC_KAUPE: { NoClearanceReset: true Buff: true } + Icon: "SI_KAUPE" } SC_ONEHANDQUICKEN: { Flags: { @@ -677,12 +760,14 @@ SC_ONEHANDQUICKEN: { NoClearanceReset: true Buff: true } + Icon: "SI_ONEHANDQUICKEN" } SC_PRESERVE: { Flags: { NoSave: true Buff: true } + Icon: "SI_PRESERVE" } SC_CHASEWALK: { Flags: { @@ -695,6 +780,7 @@ SC_CHASEWALK2: { NoClearanceReset: true Buff: true } + Icon: "SI_INCSTR" } SC_MOVESLOW_POTION: { Flags: { @@ -702,6 +788,7 @@ SC_MOVESLOW_POTION: { NoClearanceReset: true Buff: true } + Icon: "SI_MOVESLOW_POTION" } SC_DOUBLECASTING: { Flags: { @@ -709,6 +796,7 @@ SC_DOUBLECASTING: { NoClearanceReset: true Buff: true } + Icon: "SI_DOUBLECASTING" } SC_GRAVITATION: { Flags: { @@ -722,6 +810,7 @@ SC_OVERTHRUSTMAX: { NoSave: true Buff: true } + Icon: "SI_OVERTHRUSTMAX" } SC_TAROTCARD: { Flags: { @@ -729,6 +818,7 @@ SC_TAROTCARD: { NoClearanceReset: true Debuff: true } + Icon: "SI_TAROTCARD" } SC_CR_SHRINK: { Flags: { @@ -737,6 +827,7 @@ SC_CR_SHRINK: { NoDispelReset: true Buff: true } + Icon: "SI_CR_SHRINK" } SC_WZ_SIGHTBLASTER: { Flags: { @@ -745,6 +836,7 @@ SC_WZ_SIGHTBLASTER: { NoDispelReset: true Buff: true } + Icon: "SI_WZ_SIGHTBLASTER" } SC_RG_CCONFINE_M: { Flags: { @@ -754,6 +846,7 @@ SC_RG_CCONFINE_M: { NoClearanceReset: true Buff: true } + Icon: "SI_RG_CCONFINE_M" } SC_RG_CCONFINE_S: { Flags: { @@ -763,6 +856,7 @@ SC_RG_CCONFINE_S: { NoClearanceReset: true Buff: true } + Icon: "SI_RG_CCONFINE_S" } SC_NJ_UTSUSEMI: { Flags: { @@ -770,6 +864,7 @@ SC_NJ_UTSUSEMI: { NoClearanceReset: true Buff: true } + Icon: "SI_NJ_UTSUSEMI" } SC_NJ_BUNSINJYUTSU: { Flags: { @@ -777,6 +872,7 @@ SC_NJ_BUNSINJYUTSU: { NoClearanceReset: true Buff: true } + Icon: "SI_NJ_BUNSINJYUTSU" } SC_NJ_SUITON: { Flags: { @@ -786,6 +882,7 @@ SC_NJ_SUITON: { NoClearanceReset: true Debuff: true } + Icon: "SI_NJ_SUITON" } SC_FOOD_STR: { Flags: { @@ -794,6 +891,7 @@ SC_FOOD_STR: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_STR" } SC_FOOD_AGI: { Flags: { @@ -802,6 +900,7 @@ SC_FOOD_AGI: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_AGI" } SC_FOOD_VIT: { Flags: { @@ -810,6 +909,7 @@ SC_FOOD_VIT: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_VIT" } SC_FOOD_DEX: { Flags: { @@ -818,6 +918,7 @@ SC_FOOD_DEX: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_DEX" } SC_FOOD_INT: { Flags: { @@ -826,6 +927,7 @@ SC_FOOD_INT: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_INT" } SC_FOOD_LUK: { Flags: { @@ -834,6 +936,7 @@ SC_FOOD_LUK: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_LUK" } SC_FOOD_BASICAVOIDANCE: { Flags: { @@ -841,6 +944,7 @@ SC_FOOD_BASICAVOIDANCE: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_BASICAVOIDANCE" } SC_FOOD_BASICHIT: { Flags: { @@ -848,12 +952,14 @@ SC_FOOD_BASICHIT: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_BASICHIT" } SC_FOOD_CRITICALSUCCESSVALUE: { Flags: { NoClearanceReset: true Buff: true } + Icon: "SI_FOOD_CRITICALSUCCESSVALUE" } SC_CASH_PLUSEXP: { Flags: { @@ -863,6 +969,7 @@ SC_CASH_PLUSEXP: { Buff: true NoMadoReset: true } + Icon: "SI_CASH_PLUSEXP" } SC_CASH_DEATHPENALTY: { Flags: { @@ -872,6 +979,7 @@ SC_CASH_DEATHPENALTY: { Buff: true NoMadoReset: true } + Icon: "SI_CASH_DEATHPENALTY" } SC_CASH_RECEIVEITEM: { Flags: { @@ -881,6 +989,7 @@ SC_CASH_RECEIVEITEM: { Buff: true NoMadoReset: true } + Icon: "SI_CASH_RECEIVEITEM" } SC_CASH_BOSS_ALARM: { Flags: { @@ -890,6 +999,7 @@ SC_CASH_BOSS_ALARM: { Buff: true NoMadoReset: true } + Icon: "SI_CASH_BOSS_ALARM" } SC_FOOD_STR_CASH: { Flags: { @@ -899,6 +1009,7 @@ SC_FOOD_STR_CASH: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_STR_CASH" } SC_FOOD_AGI_CASH: { Flags: { @@ -908,6 +1019,7 @@ SC_FOOD_AGI_CASH: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_AGI_CASH" } SC_FOOD_VIT_CASH: { Flags: { @@ -917,6 +1029,7 @@ SC_FOOD_VIT_CASH: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_VIT_CASH" } SC_FOOD_DEX_CASH: { Flags: { @@ -926,6 +1039,7 @@ SC_FOOD_DEX_CASH: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_DEX_CASH" } SC_FOOD_INT_CASH: { Flags: { @@ -935,6 +1049,7 @@ SC_FOOD_INT_CASH: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_INT_CASH" } SC_FOOD_LUK_CASH: { Flags: { @@ -944,6 +1059,7 @@ SC_FOOD_LUK_CASH: { Buff: true NoMadoReset: true } + Icon: "SI_FOOD_LUK_CASH" } SC_SAVAGE_STEAK: { Flags: { @@ -951,6 +1067,7 @@ SC_SAVAGE_STEAK: { NoClearanceReset: true NoMadoReset: true } + Icon: "SI_SAVAGE_STEAK" } SC_COCKTAIL_WARG_BLOOD: { Flags: { @@ -958,6 +1075,7 @@ SC_COCKTAIL_WARG_BLOOD: { NoClearanceReset: true NoMadoReset: true } + Icon: "SI_COCKTAIL_WARG_BLOOD" } SC_MINOR_BBQ: { Flags: { @@ -965,6 +1083,7 @@ SC_MINOR_BBQ: { NoClearanceReset: true NoMadoReset: true } + Icon: "SI_MINOR_BBQ" } SC_SIROMA_ICE_TEA: { Flags: { @@ -972,6 +1091,7 @@ SC_SIROMA_ICE_TEA: { NoClearanceReset: true NoMadoReset: true } + Icon: "SI_SIROMA_ICE_TEA" } SC_DROCERA_HERB_STEAMED: { Flags: { @@ -979,6 +1099,7 @@ SC_DROCERA_HERB_STEAMED: { NoClearanceReset: true NoMadoReset: true } + Icon: "SI_DROCERA_HERB_STEAMED" } SC_PUTTI_TAILS_NOODLES: { Flags: { @@ -986,36 +1107,42 @@ SC_PUTTI_TAILS_NOODLES: { NoClearanceReset: true NoMadoReset: true } + Icon: "SI_PUTTI_TAILS_NOODLES" } SC_MELON_BOMB: { Flags: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_MELON_BOMB" } SC_BANANA_BOMB_SITDOWN_POSTDELAY: { Flags: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_BANANA_BOMB_SITDOWN_POSTDELAY" } SC_BANANA_BOMB: { Flags: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_BANANA_BOMB" } SC_PROMOTE_HEALTH_RESERCH: { Flags: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_PROMOTE_HEALTH_RESERCH" } SC_ENERGY_DRINK_RESERCH: { Flags: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_ENERGY_DRINK_RESERCH" } SC_EXTRACT_WHITE_POTION_Z: { Flags: { @@ -1071,6 +1198,7 @@ SC_MER_FLEE: { NoClearanceReset: true Buff: true } + Icon: "SI_MER_FLEE" } SC_MER_ATK: { Flags: { @@ -1078,6 +1206,7 @@ SC_MER_ATK: { NoClearanceReset: true Buff: true } + Icon: "SI_MER_ATK" } SC_MER_HP: { Flags: { @@ -1085,6 +1214,7 @@ SC_MER_HP: { NoClearanceReset: true Buff: true } + Icon: "SI_MER_HP" } SC_MER_SP: { Flags: { @@ -1092,6 +1222,7 @@ SC_MER_SP: { NoClearanceReset: true Buff: true } + Icon: "SI_MER_SP" } SC_MER_HIT: { Flags: { @@ -1099,6 +1230,7 @@ SC_MER_HIT: { NoClearanceReset: true Buff: true } + Icon: "SI_MER_HIT" } SC_SLOWCAST: { Flags: { @@ -1108,6 +1240,7 @@ SC_SLOWCAST: { NoClearanceReset: true Buff: true } + Icon: "SI_SLOWCAST" } SC_CRITICALWOUND: { Flags: { @@ -1116,6 +1249,7 @@ SC_CRITICALWOUND: { NoDispelReset: true Buff: true } + Icon: "SI_CRITICALWOUND" } SC_MOVHASTE_HORSE: { Flags: { @@ -1125,6 +1259,7 @@ SC_MOVHASTE_HORSE: { NoClearanceReset: true Buff: true } + Icon: "SI_MOVHASTE_HORSE" } SC_PROTECT_DEF: { Flags: { @@ -1132,6 +1267,7 @@ SC_PROTECT_DEF: { NoClearanceReset: true Buff: true } + Icon: "SI_PROTECT_DEF" } SC_PROTECT_MDEF: { Flags: { @@ -1139,6 +1275,7 @@ SC_PROTECT_MDEF: { NoClearanceReset: true Buff: true } + Icon: "SI_PROTECT_MDEF" } SC_HEALPLUS: { Flags: { @@ -1147,6 +1284,7 @@ SC_HEALPLUS: { Buff: true NoMadoReset: true } + Icon: "SI_HEALPLUS" } SC_S_LIFEPOTION: { Flags: { @@ -1155,6 +1293,7 @@ SC_S_LIFEPOTION: { Buff: true NoMadoReset: true } + Icon: "SI_S_LIFEPOTION" } SC_L_LIFEPOTION: { Flags: { @@ -1163,6 +1302,7 @@ SC_L_LIFEPOTION: { Buff: true NoMadoReset: true } + Icon: "SI_L_LIFEPOTION" } SC_CRITICALPERCENT: { Flags: { @@ -1171,6 +1311,7 @@ SC_CRITICALPERCENT: { Buff: true NoMadoReset: true } + Icon: "SI_CRITICALPERCENT" } SC_PLUSAVOIDVALUE: { Flags: { @@ -1179,6 +1320,7 @@ SC_PLUSAVOIDVALUE: { Buff: true NoMadoReset: true } + Icon: "SI_PLUSAVOIDVALUE" } SC_ATKER_ASPD: { Flags: { @@ -1186,6 +1328,7 @@ SC_ATKER_ASPD: { NoClearanceReset: true Buff: true } + Icon: "SI_ATKER_ASPD" } SC_TARGET_ASPD: { Flags: { @@ -1194,6 +1337,7 @@ SC_TARGET_ASPD: { Buff: true NoMadoReset: true } + Icon: "SI_TARGET_ASPD" } SC_ATKER_MOVESPEED: { Flags: { @@ -1201,6 +1345,7 @@ SC_ATKER_MOVESPEED: { NoClearanceReset: true Buff: true } + Icon: "SI_ATKER_MOVESPEED" } SC_ATKER_BLOOD: { Flags: { @@ -1208,6 +1353,7 @@ SC_ATKER_BLOOD: { NoClearanceReset: true Buff: true } + Icon: "SI_ATKER_BLOOD" } SC_TARGET_BLOOD: { Flags: { @@ -1216,6 +1362,7 @@ SC_TARGET_BLOOD: { NoClearanceReset: true Buff: true } + Icon: "SI_TARGET_BLOOD" } SC_ARMOR_PROPERTY: { Flags: { @@ -1224,6 +1371,7 @@ SC_ARMOR_PROPERTY: { NoClearanceReset: true Buff: true } + Icon: "SI_ARMOR_PROPERTY" } SC_HELLPOWER: { Flags: { @@ -1232,6 +1380,7 @@ SC_HELLPOWER: { NoClearanceReset: true Buff: true } + Icon: "SI_HELLPOWER" } SC_STEAMPACK: { Flags: { @@ -1240,6 +1389,7 @@ SC_STEAMPACK: { Debuff: true NoMadoReset: true } + Icon: "SI_STEAMPACK" } SC_CASH_PLUSONLYJOBEXP: { Flags: { @@ -1249,23 +1399,27 @@ SC_CASH_PLUSONLYJOBEXP: { Buff: true NoMadoReset: true } + Icon: "SI_CASH_PLUSONLYJOBEXP" } SC_PARTYFLEE: { Flags: { NoClearanceReset: true Buff: true } + Icon: "SI_PARTYFLEE" } SC_ANGEL_PROTECT: { Flags: { NoClearanceReset: true Buff: true } + Icon: "SI_ANGEL_PROTECT" } SC_ENCHANTBLADE: { Flags: { Buff: true } + Icon: "SI_ENCHANTBLADE" } SC_DEATHBOUND: { Flags: { @@ -1274,6 +1428,7 @@ SC_DEATHBOUND: { NoClearanceReset: true Buff: true } + Icon: "SI_DEATHBOUND" } SC_REFRESH: { Flags: { @@ -1281,12 +1436,14 @@ SC_REFRESH: { NoDispelReset: true Buff: true } + Icon: "SI_REFRESH" } SC_GIANTGROWTH: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_GIANTGROWTH" } SC_STONEHARDSKIN: { Flags: { @@ -1295,24 +1452,28 @@ SC_STONEHARDSKIN: { NoDispelReset: true Buff: true } + Icon: "SI_STONEHARDSKIN" } SC_VITALITYACTIVATION: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_VITALITYACTIVATION" } SC_FIGHTINGSPIRIT: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_FIGHTINGSPIRIT" } SC_ABUNDANCE: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_ABUNDANCE" } SC_EPICLESIS: { Flags: { @@ -1321,6 +1482,7 @@ SC_EPICLESIS: { NoClearanceReset: true Buff: true } + Icon: "SI_EPICLESIS" } SC_ORATIO: { Visible: true @@ -1328,18 +1490,21 @@ SC_ORATIO: { NoDispelReset: true Buff: true } + Icon: "SI_ORATIO" } SC_LAUDAAGNUS: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_LAUDAAGNUS" } SC_LAUDARAMUS: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_LAUDARAMUS" } SC_CLOAKINGEXCEED: { Flags: { @@ -1348,6 +1513,7 @@ SC_CLOAKINGEXCEED: { NoClearanceReset: true Buff: true } + Icon: "SI_CLOAKINGEXCEED" } SC_HALLUCINATIONWALK: { Visible: true @@ -1356,6 +1522,7 @@ SC_HALLUCINATIONWALK: { NoClearanceReset: true Buff: true } + Icon: "SI_HALLUCINATIONWALK" } SC_HALLUCINATIONWALK_POSTDELAY: { Flags: { @@ -1365,12 +1532,14 @@ SC_HALLUCINATIONWALK_POSTDELAY: { NoClearanceReset: true Buff: true } + Icon: "SI_HALLUCINATIONWALK_POSTDELAY" } SC_RENOVATIO: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_RENOVATIO" } SC_WEAPONBLOCKING: { Flags: { @@ -1378,6 +1547,7 @@ SC_WEAPONBLOCKING: { NoClearanceReset: true Buff: true } + Icon: "SI_WEAPONBLOCKING" } SC_ROLLINGCUTTER: { Visible: true @@ -1387,12 +1557,14 @@ SC_ROLLINGCUTTER: { NoClearanceReset: true Buff: true } + Icon: "SI_ROLLINGCUTTER" } SC_EXPIATIO: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_EXPIATIO" } SC_POISONINGWEAPON: { Flags: { @@ -1400,54 +1572,63 @@ SC_POISONINGWEAPON: { NoClearanceReset: true Buff: true } + Icon: "SI_POISONINGWEAPON" } SC_TOXIN: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_TOXIN" } SC_PARALYSE: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_PARALYSE" } SC_VENOMBLEED: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_VENOMBLEED" } SC_MAGICMUSHROOM: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_MAGICMUSHROOM" } SC_DEATHHURT: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_DEATHHURT" } SC_PYREXIA: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_PYREXIA" } SC_OBLIVIONCURSE: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_OBLIVIONCURSE" } SC_LEECHESEND: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_LEECHESEND" } SC_DUPLELIGHT: { Visible: true @@ -1455,6 +1636,7 @@ SC_DUPLELIGHT: { NoDispelReset: true Buff: true } + Icon: "SI_DUPLELIGHT" } SC_FEARBREEZE: { Flags: { @@ -1462,6 +1644,7 @@ SC_FEARBREEZE: { NoClearanceReset: true Buff: true } + Icon: "SI_FEARBREEZE" } SC_ELECTRICSHOCKER: { Flags: { @@ -1470,18 +1653,21 @@ SC_ELECTRICSHOCKER: { NoClearanceReset: true Buff: true } + Icon: "SI_ELECTRICSHOCKER" } SC_MARSHOFABYSS: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_MARSHOFABYSS" } SC_RECOGNIZEDSPELL: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_RECOGNIZEDSPELL" } SC_WUGDASH: { Flags: { @@ -1490,6 +1676,7 @@ SC_WUGDASH: { NoClearanceReset: true Buff: true } + Icon: "SI_WUGDASH" } SC_WUGBITE: { Flags: { @@ -1507,6 +1694,7 @@ SC_CAMOUFLAGE: { NoClearanceReset: true Buff: true } + Icon: "SI_CAMOUFLAGE" } SC_ACCELERATION: { Flags: { @@ -1514,6 +1702,7 @@ SC_ACCELERATION: { NoClearanceReset: true Buff: true } + Icon: "SI_ACCELERATION" } SC_HOVERING: { Flags: { @@ -1521,6 +1710,7 @@ SC_HOVERING: { NoClearanceReset: true Buff: true } + Icon: "SI_HOVERING" } SC_SUMMON1: { Visible: true @@ -1528,6 +1718,7 @@ SC_SUMMON1: { NoClearanceReset: true Buff: true } + Icon: "SI_SPHERE_1" } SC_SUMMON2: { Visible: true @@ -1535,6 +1726,7 @@ SC_SUMMON2: { NoClearanceReset: true Buff: true } + Icon: "SI_SPHERE_2" } SC_SUMMON3: { Visible: true @@ -1542,6 +1734,7 @@ SC_SUMMON3: { NoClearanceReset: true Buff: true } + Icon: "SI_SPHERE_3" } SC_SUMMON4: { Visible: true @@ -1549,6 +1742,7 @@ SC_SUMMON4: { NoClearanceReset: true Buff: true } + Icon: "SI_SPHERE_4" } SC_SUMMON5: { Visible: true @@ -1556,6 +1750,7 @@ SC_SUMMON5: { NoClearanceReset: true Buff: true } + Icon: "SI_SPHERE_5" } SC_MVPCARD_TAOGUNKA: { Flags: { @@ -1564,6 +1759,7 @@ SC_MVPCARD_TAOGUNKA: { Buff: true Debuff: true } + Icon: "SI_MVPCARD_TAOGUNKA" } SC_MVPCARD_MISTRESS: { Flags: { @@ -1572,6 +1768,7 @@ SC_MVPCARD_MISTRESS: { Buff: true Debuff: true } + Icon: "SI_MVPCARD_MISTRESS" } SC_MVPCARD_ORCHERO: { Flags: { @@ -1580,6 +1777,7 @@ SC_MVPCARD_ORCHERO: { Buff: true Debuff: true } + Icon: "SI_MVPCARD_ORCHERO" } SC_MVPCARD_ORCLORD: { Flags: { @@ -1588,6 +1786,7 @@ SC_MVPCARD_ORCLORD: { Buff: true Debuff: true } + Icon: "SI_MVPCARD_ORCLORD" } SC_OVERHEAT_LIMITPOINT: { Flags: { @@ -1595,6 +1794,7 @@ SC_OVERHEAT_LIMITPOINT: { NoClearanceReset: true Buff: true } + Icon: "SI_OVERHEAT_LIMITPOINT" } SC_OVERHEAT: { Flags: { @@ -1602,6 +1802,7 @@ SC_OVERHEAT: { NoClearanceReset: true Buff: true } + Icon: "SI_OVERHEAT" } SC_SHAPESHIFT: { Flags: { @@ -1609,6 +1810,7 @@ SC_SHAPESHIFT: { NoClearanceReset: true Buff: true } + Icon: "SI_SHAPESHIFT" } SC_INFRAREDSCAN: { Flags: { @@ -1616,6 +1818,7 @@ SC_INFRAREDSCAN: { NoClearanceReset: true Buff: true } + Icon: "SI_INFRAREDSCAN" } SC_MAGNETICFIELD: { Flags: { @@ -1624,6 +1827,7 @@ SC_MAGNETICFIELD: { NoClearanceReset: true Buff: true } + Icon: "SI_MAGNETICFIELD" } SC_NEUTRALBARRIER: { Flags: { @@ -1632,6 +1836,7 @@ SC_NEUTRALBARRIER: { NoClearanceReset: true Buff: true } + Icon: "SI_NEUTRALBARRIER" } SC_NEUTRALBARRIER_MASTER: { Flags: { @@ -1640,6 +1845,7 @@ SC_NEUTRALBARRIER_MASTER: { NoClearanceReset: true Buff: true } + Icon: "SI_NEUTRALBARRIER_MASTER" } SC_STEALTHFIELD_MASTER: { Flags: { @@ -1648,6 +1854,7 @@ SC_STEALTHFIELD_MASTER: { NoClearanceReset: true Buff: true } + Icon: "SI_STEALTHFIELD_MASTER" } SC_MANU_ATK: { Flags: { @@ -1655,6 +1862,7 @@ SC_MANU_ATK: { NoClearanceReset: true Buff: true } + Icon: "SI_MANU_ATK" } SC_MANU_DEF: { Flags: { @@ -1662,6 +1870,7 @@ SC_MANU_DEF: { NoClearanceReset: true Buff: true } + Icon: "SI_MANU_DEF" } SC_SPL_ATK: { Flags: { @@ -1669,6 +1878,7 @@ SC_SPL_ATK: { NoClearanceReset: true Buff: true } + Icon: "SI_SPL_ATK" } SC_SPL_DEF: { Flags: { @@ -1676,6 +1886,7 @@ SC_SPL_DEF: { NoClearanceReset: true Buff: true } + Icon: "SI_SPL_DEF" } SC__REPRODUCE: { Flags: { @@ -1683,6 +1894,7 @@ SC__REPRODUCE: { NoClearanceReset: true Buff: true } + Icon: "SI_REPRODUCE" } SC_MANU_MATK: { Flags: { @@ -1690,6 +1902,7 @@ SC_MANU_MATK: { NoClearanceReset: true Buff: true } + Icon: "SI_MANU_MATK" } SC_SPL_MATK: { Flags: { @@ -1697,6 +1910,7 @@ SC_SPL_MATK: { NoClearanceReset: true Buff: true } + Icon: "SI_SPL_MATK" } SC_STR_SCROLL: { Flags: { @@ -1706,6 +1920,7 @@ SC_STR_SCROLL: { Buff: true Debuff: true } + Icon: "SI_STR_SCROLL" } SC_INT_SCROLL: { Flags: { @@ -1715,6 +1930,7 @@ SC_INT_SCROLL: { Buff: true Debuff: true } + Icon: "SI_INT_SCROLL" } SC_FORCEOFVANGUARD: { Flags: { @@ -1722,6 +1938,7 @@ SC_FORCEOFVANGUARD: { NoClearanceReset: true Buff: true } + Icon: "SI_FORCEOFVANGUARD" } SC_BUCHEDENOEL: { Flags: { @@ -1730,11 +1947,13 @@ SC_BUCHEDENOEL: { Buff: true Debuff: true } + Icon: "SI_BUCHEDENOEL" } SC__AUTOSHADOWSPELL: { Flags: { Buff: true } + Icon: "SI_AUTOSHADOWSPELL" } SC__SHADOWFORM: { Visible: true @@ -1744,6 +1963,7 @@ SC__SHADOWFORM: { NoClearanceReset: true Buff: true } + Icon: "SI_SHADOWFORM" } SC_RAID: { Flags: { @@ -1756,22 +1976,26 @@ SC_SHIELDSPELL_DEF: { Flags: { Buff: true } + Icon: "SI_SHIELDSPELL_DEF" } SC_SHIELDSPELL_MDEF: { Flags: { Buff: true } + Icon: "SI_SHIELDSPELL_MDEF" } SC_SHIELDSPELL_REF: { Flags: { Buff: true } + Icon: "SI_SHIELDSPELL_REF" } SC__BODYPAINT: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_BODYPAINT" } SC_EXEEDBREAK: { Flags: { @@ -1779,16 +2003,19 @@ SC_EXEEDBREAK: { NoClearanceReset: true Buff: true } + Icon: "SI_EXEEDBREAK" } SC_ADORAMUS: { Flags: { Buff: true } + Icon: "SI_ADORAMUS" } SC_PRESTIGE: { Flags: { Buff: true } + Icon: "SI_PRESTIGE" } SC__INVISIBILITY: { Flags: { @@ -1797,12 +2024,14 @@ SC__INVISIBILITY: { NoClearanceReset: true Buff: true } + Icon: "SI_INVISIBILITY" } SC__DEADLYINFECT: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_DEADLYINFECT" } SC_BANDING: { Visible: true @@ -1811,6 +2040,7 @@ SC_BANDING: { NoClearanceReset: true Buff: true } + Icon: "SI_BANDING" } SC_BANDING_DEFENCE: { Flags: { @@ -1818,12 +2048,14 @@ SC_BANDING_DEFENCE: { NoClearanceReset: true Buff: true } + Icon: "SI_BANDING_DEFENCE" } SC_EARTHDRIVE: { Flags: { NoDispelReset: true Buff: true } + Icon: "SI_EARTHDRIVE" } SC_INSPIRATION: { Flags: { @@ -1831,16 +2063,19 @@ SC_INSPIRATION: { NoClearanceReset: true Buff: true } + Icon: "SI_INSPIRATION" } SC__ENERVATION: { Flags: { Buff: true } + Icon: "SI_ENERVATION" } SC__GROOMY: { Flags: { Buff: true } + Icon: "SI_GROOMY" } SC_RAISINGDRAGON: { Flags: { @@ -1849,16 +2084,19 @@ SC_RAISINGDRAGON: { NoClearanceReset: true Buff: true } + Icon: "SI_RAISINGDRAGON" } SC__IGNORANCE: { Flags: { Buff: true } + Icon: "SI_IGNORANCE" } SC__LAZINESS: { Flags: { Buff: true } + Icon: "SI_LAZINESS" } SC_LIGHTNINGWALK: { Flags: { @@ -1866,17 +2104,20 @@ SC_LIGHTNINGWALK: { NoClearanceReset: true Buff: true } + Icon: "SI_LIGHTNINGWALK" } SC_ACARAJE: { Flags: { NoClearanceReset: true Buff: true } + Icon: "SI_ACARAJE" } SC__UNLUCKY: { Flags: { Buff: true } + Icon: "SI_UNLUCKY" } SC_CURSEDCIRCLE_ATKER: { Visible: true @@ -1885,6 +2126,7 @@ SC_CURSEDCIRCLE_ATKER: { NoClearanceReset: true Buff: true } + Icon: "SI_CURSEDCIRCLE_ATKER" } SC_CURSEDCIRCLE_TARGET: { Visible: true @@ -1893,11 +2135,13 @@ SC_CURSEDCIRCLE_TARGET: { NoClearanceReset: true Buff: true } + Icon: "SI_CURSEDCIRCLE_TARGET" } SC__WEAKNESS: { Flags: { Buff: true } + Icon: "SI_WEAKNESS" } SC_CRESCENTELBOW: { Flags: { @@ -1905,6 +2149,7 @@ SC_CRESCENTELBOW: { NoClearanceReset: true Buff: true } + Icon: "SI_CRESCENTELBOW" } SC__STRIPACCESSARY: { Flags: { @@ -1912,6 +2157,7 @@ SC__STRIPACCESSARY: { NoClearanceReset: true Buff: true } + Icon: "SI_STRIPACCESSARY" } SC__MANHOLE: { Flags: { @@ -1921,6 +2167,7 @@ SC__MANHOLE: { Buff: true NoMadoReset: true } + Icon: "SI_MANHOLE" } SC__BLOODYLUST: { Flags: { @@ -1933,6 +2180,7 @@ SC_SWING: { NoClearanceReset: true Buff: true } + Icon: "SI_SWINGDANCE" } SC_SYMPHONY_LOVE: { Flags: { @@ -1940,27 +2188,32 @@ SC_SYMPHONY_LOVE: { NoClearanceReset: true Buff: true } + Icon: "SI_SYMPHONYOFLOVERS" } SC_PROPERTYWALK: { Flags: { NoSave: true Buff: true } + Icon: "SI_PROPERTYWALK" } SC_SPELLFIST: { Flags: { Buff: true } + Icon: "SI_SPELLFIST" } SC_NETHERWORLD: { Flags: { Buff: true } + Icon: "SI_NETHERWORLD" } SC_SIREN: { Flags: { Buff: true } + Icon: "SI_SIREN" } SC_DEEP_SLEEP: { Visible: true @@ -1968,16 +2221,19 @@ SC_DEEP_SLEEP: { NoSave: true Debuff: true } + Icon: "SI_DEEPSLEEP" } SC_SIRCLEOFNATURE: { Flags: { Buff: true } + Icon: "SI_SIRCLEOFNATURE" } SC_GLOOMYDAY: { Flags: { Buff: true } + Icon: "SI_GLOOMYDAY" } SC_GLOOMYDAY_SK: { Flags: { @@ -1988,11 +2244,13 @@ SC_SONG_OF_MANA: { Flags: { Buff: true } + Icon: "SI_SONG_OF_MANA" } SC_DANCE_WITH_WUG: { Flags: { Buff: true } + Icon: "SI_DANCEWITHWUG" } SC_RUSH_WINDMILL: { Flags: { @@ -2000,6 +2258,7 @@ SC_RUSH_WINDMILL: { NoClearanceReset: true Buff: true } + Icon: "SI_RUSHWINDMILL" } SC_ECHOSONG: { Flags: { @@ -2007,11 +2266,13 @@ SC_ECHOSONG: { NoClearanceReset: true Buff: true } + Icon: "SI_ECHOSONG" } SC_HARMONIZE: { Flags: { Buff: true } + Icon: "SI_HARMONIZE" } SC_MOONLIT_SERENADE: { Flags: { @@ -2019,11 +2280,13 @@ SC_MOONLIT_SERENADE: { NoClearanceReset: true Buff: true } + Icon: "SI_MOONLITSERENADE" } SC_SATURDAY_NIGHT_FEVER: { Flags: { Buff: true } + Icon: "SI_SATURDAYNIGHTFEVER" } SC_SITDOWN_FORCE: { Flags: { @@ -2038,6 +2301,7 @@ SC_ANALYZE: { NoClearanceReset: true Buff: true } + Icon: "SI_ANALYZE" } SC_LERADS_DEW: { Flags: { @@ -2045,6 +2309,7 @@ SC_LERADS_DEW: { NoClearanceReset: true Buff: true } + Icon: "SI_LERADSDEW" } SC_MELODYOFSINK: { Flags: { @@ -2052,6 +2317,7 @@ SC_MELODYOFSINK: { NoClearanceReset: true Buff: true } + Icon: "SI_MELODYOFSINK" } SC_BEYOND_OF_WARCRY: { Flags: { @@ -2059,6 +2325,7 @@ SC_BEYOND_OF_WARCRY: { NoClearanceReset: true Buff: true } + Icon: "SI_WARCRYOFBEYOND" } SC_UNLIMITED_HUMMING_VOICE: { Flags: { @@ -2066,6 +2333,7 @@ SC_UNLIMITED_HUMMING_VOICE: { NoClearanceReset: true Buff: true } + Icon: "SI_UNLIMITEDHUMMINGVOICE" } SC_WARMER: { Flags: { @@ -2077,83 +2345,99 @@ SC_VENOMIMPRESS: { Flags: { NoDispelReset: true } + Icon: "SI_VENOMIMPRESS" } SC_FROSTMISTY: { Visible: true Flags: { Debuff: true } + Icon: "SI_FROSTMISTY" } SC_STOMACHACHE: { Flags: { Debuff: true } + Icon: "SI_STOMACHACHE" } SC_MYSTERIOUS_POWDER: { Flags: { Debuff: true } + Icon: "SI_MYSTERIOUS_POWDER" } SC_WATER_BARRIER: { Flags: { NoSave: true } + Icon: "SI_WATER_BARRIER" } SC_ZEPHYR: { Flags: { NoSave: true } + Icon: "SI_ZEPHYR" } SC_POWER_OF_GAIA: { Flags: { NoSave: true } + Icon: "SI_POWER_OF_GAIA" } SC_FIRE_INSIGNIA: { Flags: { NoSave: true } + Icon: "SI_FIRE_INSIGNIA" } SC_WATER_INSIGNIA: { Flags: { NoSave: true } + Icon: "SI_WATER_INSIGNIA" } SC_WIND_INSIGNIA: { Flags: { NoSave: true } + Icon: "SI_WIND_INSIGNIA" } SC_EARTH_INSIGNIA: { Flags: { NoSave: true } + Icon: "SI_EARTH_INSIGNIA" } SC_MORA_BUFF: { Flags: { NoSave: true } + Icon: "SI_MORA_BUFF" } SC_NEEDLE_OF_PARALYZE: { Flags: { NoDeathReset: true } + Icon: "SI_NEEDLE_OF_PARALYZE" } SC_PAIN_KILLER: { Flags: { NoDeathReset: true } + Icon: "SI_PAIN_KILLER" } SC_G_LIFEPOTION: { Flags: { NoDispelReset: true NoMadoReset: true } + Icon: "SI_G_LIFEPOTION" } SC_LIGHT_OF_REGENE: { Flags: { NoDeathReset: true } + Icon: "SI_LIGHT_OF_REGENE" } SC_MAGIC_CANDY: { Flags: { @@ -2162,6 +2446,7 @@ SC_MAGIC_CANDY: { Buff: true NoMadoReset: true } + Icon: "SI_MAGIC_CANDY" } SC_MONSTER_TRANSFORM: { Visible: true @@ -2169,6 +2454,7 @@ SC_MONSTER_TRANSFORM: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_MONSTER_TRANSFORM" } SC_MTF_ASPD: { Flags: { @@ -2205,18 +2491,21 @@ SC_FULL_THROTTLE: { NoSave: true Buff: true } + Icon: "SI_FULL_THROTTLE" } SC_REBOUND: { Flags: { NoSave: true Buff: true } + Icon: "SI_REBOUND" } SC_TELEKINESIS_INTENSE: { Flags: { NoSave: true Buff: true } + Icon: "SI_TELEKINESIS_INTENSE" } SC_SKELSCROLL: { Flags: { @@ -2287,6 +2576,7 @@ SC_QUEST_BUFF1: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_QUEST_BUFF1" } SC_QUEST_BUFF2: { Flags: { @@ -2294,6 +2584,7 @@ SC_QUEST_BUFF2: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_QUEST_BUFF2" } SC_QUEST_BUFF3: { Flags: { @@ -2301,6 +2592,7 @@ SC_QUEST_BUFF3: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_QUEST_BUFF3" } SC_GEFFEN_MAGIC1: { Flags: { @@ -2308,6 +2600,7 @@ SC_GEFFEN_MAGIC1: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_GEFFEN_MAGIC1" } SC_GEFFEN_MAGIC2: { Flags: { @@ -2315,6 +2608,7 @@ SC_GEFFEN_MAGIC2: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_GEFFEN_MAGIC2" } SC_GEFFEN_MAGIC3: { Flags: { @@ -2322,18 +2616,21 @@ SC_GEFFEN_MAGIC3: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_GEFFEN_MAGIC3" } SC_OVERLAPEXPUP: { Flags: { NoDispelReset: true NoClearanceReset: true } + Icon: "SI_OVERLAPEXPUP" } SC_M_LIFEPOTION: { Flags: { NoDispelReset: true NoMadoReset: true } + Icon: "SI_M_LIFEPOTION" } SC_LEADERSHIP: { Flags: { @@ -2341,6 +2638,7 @@ SC_LEADERSHIP: { NoDispelReset: true NoClearanceReset: true NoMadoReset: true + NoAllReset: true } } SC_GLORYWOUNDS: { @@ -2349,6 +2647,7 @@ SC_GLORYWOUNDS: { NoDispelReset: true NoClearanceReset: true NoMadoReset: true + NoAllReset: true } } SC_SOULCOLD: { @@ -2357,6 +2656,7 @@ SC_SOULCOLD: { NoDispelReset: true NoClearanceReset: true NoMadoReset: true + NoAllReset: true } } SC_HAWKEYES: { @@ -2365,6 +2665,7 @@ SC_HAWKEYES: { NoDispelReset: true NoClearanceReset: true NoMadoReset: true + NoAllReset: true } } SC_GDSKILL_REGENERATION: { @@ -2389,6 +2690,7 @@ SC_WEIGHTOVER50: { NoMadoReset: true NoAllReset: true } + Icon: "SI_WEIGHTOVER50" } SC_WEIGHTOVER90: { Flags: { @@ -2399,6 +2701,7 @@ SC_WEIGHTOVER90: { NoMadoReset: true NoAllReset: true } + Icon: "SI_WEIGHTOVER90" } SC_WEDDING: { Flags: { @@ -2448,6 +2751,7 @@ SC_EARTHSCROLL: { NoClearanceReset: true NoMadoReset: true } + Icon: "SI_EARTHSCROLL" } SC_STORMKICK_READY: { Flags: { @@ -2456,6 +2760,7 @@ SC_STORMKICK_READY: { NoClearanceReset: true NoMadoReset: true } + Icon: "SI_STORMKICK_ON" } SC_DOWNKICK_READY: { Flags: { @@ -2464,6 +2769,7 @@ SC_DOWNKICK_READY: { NoClearanceReset: true NoMadoReset: true } + Icon: "SI_DOWNKICK_ON" } SC_COUNTERKICK_READY: { Flags: { @@ -2472,6 +2778,7 @@ SC_COUNTERKICK_READY: { NoClearanceReset: true NoMadoReset: true } + Icon: "SI_COUNTER_ON" } SC_TURNKICK_READY: { Flags: { @@ -2480,6 +2787,7 @@ SC_TURNKICK_READY: { NoClearanceReset: true NoMadoReset: true } + Icon: "SI_TURNKICK_ON" } SC_DODGE_READY: { Flags: { @@ -2488,6 +2796,7 @@ SC_DODGE_READY: { NoClearanceReset: true NoMadoReset: true } + Icon: "SI_DODGE_ON" } SC_JAILED: { Flags: { @@ -2601,16 +2910,19 @@ SC_PUSH_CART: { NoMadoReset: true NoAllReset: true } + Icon: "SI_ON_PUSH_CART" } SC_COLD: { Visible: true Flags: { } + Icon: "SI_COLD" } SC_BLOOD_SUCKER: { Visible: true Flags: { } + Icon: "SI_BLOODSUCKER" } SC_MOONSTAR: { Visible: true @@ -2622,6 +2934,7 @@ SC_MOONSTAR: { NoMadoReset: true NoAllReset: true } + Icon: "SI_MOONSTAR" } SC_SUPER_STAR: { Visible: true @@ -2633,6 +2946,7 @@ SC_SUPER_STAR: { NoMadoReset: true NoAllReset: true } + Icon: "SI_SUPER_STAR" } SC_STRANGELIGHTS: { Visible: true @@ -2644,6 +2958,7 @@ SC_STRANGELIGHTS: { NoMadoReset: true NoAllReset: true } + Icon: "SI_STRANGELIGHTS" } SC_DECORATION_OF_MUSIC: { Visible: true @@ -2655,6 +2970,7 @@ SC_DECORATION_OF_MUSIC: { NoMadoReset: true NoAllReset: true } + Icon: "SI_DECORATION_OF_MUSIC" } SC_LJOSALFAR: { Visible: true @@ -2666,6 +2982,7 @@ SC_LJOSALFAR: { NoMadoReset: true NoAllReset: true } + Icon: "SI_LJOSALFAR" } SC_MERMAID_LONGING: { Visible: true @@ -2677,6 +2994,7 @@ SC_MERMAID_LONGING: { NoMadoReset: true NoAllReset: true } + Icon: "SI_MERMAID_LONGING" } SC_HAT_EFFECT: { Visible: true @@ -2688,6 +3006,7 @@ SC_HAT_EFFECT: { NoMadoReset: true NoAllReset: true } + Icon: "SI_HAT_EFFECT" } SC_FLOWERSMOKE: { Visible: true @@ -2699,6 +3018,7 @@ SC_FLOWERSMOKE: { NoMadoReset: true NoAllReset: true } + Icon: "SI_FLOWERSMOKE" } SC_FSTONE: { Visible: true @@ -2710,6 +3030,7 @@ SC_FSTONE: { NoMadoReset: true NoAllReset: true } + Icon: "SI_FSTONE" } SC_HAPPINESS_STAR: { Visible: true @@ -2721,6 +3042,7 @@ SC_HAPPINESS_STAR: { NoMadoReset: true NoAllReset: true } + Icon: "SI_HAPPINESS_STAR" } SC_MAPLE_FALLS: { Visible: true @@ -2732,6 +3054,7 @@ SC_MAPLE_FALLS: { NoMadoReset: true NoAllReset: true } + Icon: "SI_MAPLE_FALLS" } SC_TIME_ACCESSORY: { Visible: true @@ -2743,6 +3066,7 @@ SC_TIME_ACCESSORY: { NoMadoReset: true NoAllReset: true } + Icon: "SI_TIME_ACCESSORY" } SC_MAGICAL_FEATHER: { Visible: true @@ -2754,6 +3078,7 @@ SC_MAGICAL_FEATHER: { NoMadoReset: true NoAllReset: true } + Icon: "SI_MAGICAL_FEATHER" } SC_BLOSSOM_FLUTTERING: { Visible: true @@ -2765,6 +3090,7 @@ SC_BLOSSOM_FLUTTERING: { NoMadoReset: true NoAllReset: true } + Icon: "SI_BLOSSOM_FLUTTERING" } SC_SPRITEMABLE: { Flags: { @@ -2774,11 +3100,13 @@ SC_SPRITEMABLE: { NoMadoReset: true NoAllReset: true } + Icon: "SI_SPRITEMABLE" } SC_BITESCAR: { Flags: { NoDispelReset: true } + Icon: "SI_BITESCAR" } SC_CLAN_INFO: { Visible: true @@ -2790,6 +3118,7 @@ SC_CLAN_INFO: { NoMadoReset: true NoAllReset: true } + Icon: "SI_CLAN_INFO" } SC_ALL_RIDING: { Visible: true @@ -2799,6 +3128,7 @@ SC_ALL_RIDING: { NoClearanceReset: true NoAllReset: true } + Icon: "SI_ALL_RIDING" } SC_DAILYSENDMAILCNT: { Visible: true @@ -2809,4 +3139,461 @@ SC_DAILYSENDMAILCNT: { NoMadoReset: true NoAllReset: true } + Icon: "SI_DAILYSENDMAILCNT" +} +SC_ATTHASTE_INFINITY: { + Icon: "SI_ATTHASTE_INFINITY" +} +SC_PYROCLASTIC: { + Icon: "SI_PYROCLASTIC" +} +SC_VACUUM_EXTREME: { + Icon: "SI_VACUUM_EXTREME" +} +SC_MOON_COMFORT: { + Icon: "SI_MOON_COMFORT" +} +SC_OFFERTORIUM: { + Icon: "SI_OFFERTORIUM" +} +SC_WIND_STEP: { + Icon: "SI_WIND_STEP" +} +SC_STEALTHFIELD: { + Icon: "SI_STEALTHFIELD" +} +SC_INVINCIBLE: { + Icon: "SI_INVINCIBLE" +} +SC_CURSED_SOIL: { + Icon: "SI_CURSED_SOIL" +} +SC_RIDING: { + Icon: "SI_RIDING" +} +SC_GRANITIC_ARMOR: { + Icon: "SI_GRANITIC_ARMOR" +} +SC_CURSED_SOIL_OPTION: { + Icon: "SI_CURSED_SOIL_OPTION" +} +SC_MOVHASTE_INFINITY: { + Icon: "SI_MOVHASTE_INFINITY" +} +SC_GOLDENE_FERSE: { + Icon: "SI_GOLDENE_FERSE" +} +SC_GS_ACCURACY: { + Icon: "SI_GS_ACCURACY" +} +SC_GENSOU: { + Icon: "SI_GENSOU" +} +SC_MAGMA_FLOW: { + Icon: "SI_MAGMA_FLOW" +} +SC_SHRIMP: { + Icon: "SI_SHRIMP" +} +SC_SPELLBOOK1: { + Icon: "SI_SPELLBOOK1" +} +SC_UNLIMIT: { + Icon: "SI_UNLIMIT" +} +SC_AQUAPLAY_OPTION: { + Icon: "SI_AQUAPLAY_OPTION" +} +SC_GS_GATLINGFEVER: { + Icon: "SI_GS_GATLINGFEVER" +} +SC_ROCK_CRUSHER_ATK: { + Icon: "SI_ROCK_CRUSHER_ATK" +} +SC_HEATER_OPTION: { + Icon: "SI_HEATER_OPTION" +} +SC_FALLENEMPIRE: { + Icon: "SI_FALLENEMPIRE" +} +SC_MANDRAGORA: { + Icon: "SI_MANDRAGORA" +} +SC_ANKLESNARE: { + Icon: "SI_ANKLESNARE" +} +SC_KAIZEL: { + Icon: "SI_KAIZEL" +} +SC_DC_WINKCHARM: { + Icon: "SI_DC_WINKCHARM" +} +SC_WUGRIDER: { + Icon: "SI_WUGRIDER" +} +SC_SPELLBOOK7: { + Icon: "SI_SPELLBOOK7" +} +SC_CATNIPPOWDER: { + Icon: "SI_CATNIPPOWDER" +} +SC_TIDAL_WEAPON_OPTION: { + Icon: "SI_TIDAL_WEAPON_OPTION" +} +SC_ANGRIFFS_MODUS: { + Icon: "SI_ANGRIFFS_MODUS" +} +SC_AUTOBERSERK: { + Icon: "SI_AUTOBERSERK" +} +SC_CRUCIS: { + Icon: "SI_CRUCIS" +} +SC_SECRAMENT: { + Icon: "SI_SECRAMENT" +} +SC_CRUSHSTRIKE: { + Icon: "SI_CRUSHSTRIKE" +} +SC_SPELLBOOK3: { + Icon: "SI_SPELLBOOK3" +} +SC_BLAST: { + Icon: "SI_BLAST" +} +SC_IZAYOI: { + Icon: "SI_IZAYOI" +} +SC_ODINS_POWER: { + Icon: "SI_ODINS_POWER" +} +SC_TING: { + Icon: "SI_TING" +} +SC_SIT: { + Icon: "SI_SIT" +} +SC_GS_MADNESSCANCEL: { + Icon: "SI_GS_MADNESSCANCEL" +} +SC_SV_ROOTTWIST: { + Icon: "SI_SV_ROOTTWIST" +} +SC_COOLER: { + Icon: "SI_COOLER" +} +SC_WIND_STEP_OPTION: { + Icon: "SI_WIND_STEP_OPTION" +} +SC_RESIST_PROPERTY_GROUND: { + Icon: "SI_RESIST_PROPERTY_GROUND" +} +SC_ILLUSIONDOPING: { + Icon: "SI_ILLUSIONDOPING" +} +SC_KO_JYUMONJIKIRI: { + Icon: "SI_KO_JYUMONJIKIRI" +} +SC_PHI_DEMON: { + Icon: "SI_PHI_DEMON" +} +SC_KYOUGAKU: { + Icon: "SI_KYOUGAKU" +} +SC_KAGEMUSYA: { + Icon: "SI_KAGEMUSYA" +} +SC_SPELLBOOK6: { + Icon: "SI_SPELLBOOK6" +} +SC_BLAST_OPTION: { + Icon: "SI_BLAST_OPTION" +} +SC_DARKCROW: { + Icon: "SI_DARKCROW" +} +SC_PYROTECHNIC: { + Icon: "SI_PYROTECHNIC" +} +SC_STAR_COMFORT: { + Icon: "SI_STAR_COMFORT" +} +SC_LG_REFLECTDAMAGE: { + Icon: "SI_LG_REFLECTDAMAGE" +} +SC_GENTLETOUCH_REVITALIZE: { + Icon: "SI_GENTLETOUCH_REVITALIZE" +} +SC_HEATER: { + Icon: "SI_HEATER" +} +SC_CIRCLE_OF_FIRE_OPTION: { + Icon: "SI_CIRCLE_OF_FIRE_OPTION" +} +SC_ROCK_CRUSHER: { + Icon: "SI_ROCK_CRUSHER" +} +SC_MOON: { + Icon: "SI_MOON" +} +SC_PETROLOGY: { + Icon: "SI_PETROLOGY" +} +SC_SUN_COMFORT: { + Icon: "SI_SUN_COMFORT" +} +SC_TROPIC_OPTION: { + Icon: "SI_TROPIC_OPTION" +} +SC_ARCLOUSEDASH: { + Icon: "SI_ARCLOUSEDASH" +} +SC_STRIKING: { + Icon: "SI_STRIKING" +} +SC_AQUAPLAY: { + Icon: "SI_AQUAPLAY" +} +SC_WATER_DROP: { + Icon: "SI_WATER_DROP" +} +SC_GM_BATTLE2: { + Icon: "SI_GM_BATTLE2" +} +SC_BROKENWEAPON: { + Icon: "SI_BROKENWEAPON" +} +SC_CUP_OF_BOZA: { + Icon: "SI_CUP_OF_BOZA" +} +SC_FRIGG_SONG: { + Icon: "SI_FRIGG_SONG" +} +SC_POSTDELAY: { + Icon: "SI_POSTDELAY" +} +SC_BROKENARMOR: { + Icon: "SI_BROKENARMOR" +} +SC_DRESS_UP: { + Icon: "SI_DRESS_UP" +} +SC_2011RWC: { + Icon: "SI_2011RWC" +} +SC_WATER_SCREEN_OPTION: { + Icon: "SI_WATER_SCREEN_OPTION" +} +SC_FIRE_CLOAK: { + Icon: "SI_FIRE_CLOAK" +} +SC_FALCON: { + Icon: "SI_FALCON" +} +SC_ZENKAI: { + Icon: "SI_ZENKAI" +} +SC_CLAIRVOYANCE: { + Icon: "SI_CLAIRVOYANCE" +} +SC_STONE_SHIELD: { + Icon: "SI_STONE_SHIELD" +} +SC_FIRE_EXPANSION_TEAR_GAS: { + Icon: "SI_FIRE_EXPANSION_TEAR_GAS" +} +SC_ZANGETSU: { + Icon: "SI_ZANGETSU" +} +SC_RESIST_PROPERTY_WIND: { + Icon: "SI_RESIST_PROPERTY_WIND" +} +SC_FLASHCOMBO: { + Icon: "SI_FLASHCOMBO" +} +SC_GUST_OPTION: { + Icon: "SI_GUST_OPTION" +} +SC_GENTLETOUCH_ENERGYGAIN: { + Icon: "SI_GENTLETOUCH_ENERGYGAIN" +} +SC_PYROTECHNIC_OPTION: { + Icon: "SI_PYROTECHNIC_OPTION" +} +SC_CIRCLE_OF_FIRE: { + Icon: "SI_CIRCLE_OF_FIRE" +} +SC_DEVIL1: { + Icon: "SI_DEVIL1" +} +SC_GS_ADJUSTMENT: { + Icon: "SI_GS_ADJUSTMENT" +} +SC_SPELLBOOK5: { + Icon: "SI_SPELLBOOK5" +} +SC_UPHEAVAL_OPTION: { + Icon: "SI_UPHEAVAL_OPTION" +} +SC_SUHIDE: { + Icon: "SI_SUHIDE" +} +SC_NJ_NEN: { + Icon: "SI_NJ_NEN" +} +SC_VOLCANIC_ASH: { + Icon: "SI_VOLCANIC_ASH" +} +SC_KYOMU: { + Icon: "SI_KYOMU" +} +SC_WILD_STORM: { + Icon: "SI_WILD_STORM" +} +SC_PETROLOGY_OPTION: { + Icon: "SI_PETROLOGY_OPTION" +} +SC_SPELLBOOK2: { + Icon: "SI_SPELLBOOK2" +} +SC_MYSTICPOWDER: { + Icon: "SI_MYSTICPOWDER" +} +SC_RESIST_PROPERTY_FIRE: { + Icon: "SI_RESIST_PROPERTY_FIRE" +} +SC_COOLER_OPTION: { + Icon: "SI_COOLER_OPTION" +} +SC_TROPIC: { + Icon: "SI_TROPIC" +} +SC_UPHEAVAL: { + Icon: "SI_UPHEAVAL" +} +SC_GENTLETOUCH_CHANGE: { + Icon: "SI_GENTLETOUCH_CHANGE" +} +SC_WATER_DROP_OPTION: { + Icon: "SI_WATER_DROP_OPTION" +} +SC_CHILLY_AIR_OPTION: { + Icon: "SI_CHILLY_AIR_OPTION" +} +SC_FENRIR_CARD: { + Icon: "SI_FENRIR_CARD" +} +SC_CLIENT_ONLY_EQUIP_ARROW: { + Icon: "SI_CLIENT_ONLY_EQUIP_ARROW" +} +SC_STASIS: { + Icon: "SI_STASIS" +} +SC_KINGS_GRACE: { + Icon: "SI_KINGS_GRACE" +} +SC_OVERED_BOOST: { + Icon: "SI_OVERED_BOOST" +} +SC_AKAITSUKI: { + Icon: "SI_AKAITSUKI" +} +SC_MARIONETTE: { + Icon: "SI_MARIONETTE" +} +SC_WIND_CURTAIN: { + Icon: "SI_WIND_CURTAIN" +} +SC_ON_PUSH_CART: { + Icon: "SI_ON_PUSH_CART" +} +SC_SPELLBOOK4: { + Icon: "SI_SPELLBOOK4" +} +SC_ILLUSION: { + Icon: "SI_ILLUSION" +} +SC_WIND_CURTAIN_OPTION: { + Icon: "SI_WIND_CURTAIN_OPTION" +} +SC_SU_STOOP: { + Icon: "SI_SU_STOOP" +} +SC_SOLID_SKIN_OPTION: { + Icon: "SI_SOLID_SKIN_OPTION" +} +SC_TUNAPARTY: { + Icon: "SI_TUNAPARTY" +} +SC_RESIST_PROPERTY_WATER: { + Icon: "SI_RESIST_PROPERTY_WATER" +} +SC_KG_KAGEHUMI: { + Icon: "SI_KG_KAGEHUMI" +} +SC_SMA_READY: { + Icon: "SI_SMA_READY" +} +SC_FIRE_CLOAK_OPTION: { + Icon: "SI_FIRE_CLOAK_OPTION" +} +SC_WATER_SCREEN: { + Icon: "SI_WATER_SCREEN" +} +SC_GM_BATTLE: { + Icon: "SI_GM_BATTLE" +} +SC_GUST: { + Icon: "SI_GUST" +} +SC_SOLID_SKIN: { + Icon: "SI_SOLID_SKIN" +} +SC_CHILLY_AIR: { + Icon: "SI_CHILLY_AIR" +} +SC_MEIKYOUSISUI: { + Icon: "SI_MEIKYOUSISUI" +} +SC_FIRE_EXPANSION_SMOKE_POWDER: { + Icon: "SI_FIRE_EXPANSION_SMOKE_POWDER" +} +SC_MARIONETTE_MASTER: { + Icon: "SI_MARIONETTE_MASTER" +} +SC_FRESHSHRIMP: { + Icon: "SI_FRESHSHRIMP" +} +SC_STONE_SHIELD_OPTION: { + Icon: "SI_STONE_SHIELD_OPTION" +} +SC_SWORDREJECT: { + Icon: "SI_SWORDREJECT" +} +SC_WILD_STORM_OPTION: { + Icon: "SI_WILD_STORM_OPTION" +} +SC_BABY: { + Icon: "SI_PROTECTEXP" +} +SC_EXTREMITYFIST2: { + Icon: "SI_EXTREMITYFIST" +} +SC_GN_CARTBOOST: { + Icon: "SI_CARTSBOOST" +} +SC_MIRACLE: { + Icon: "SI_SOULLINK" +} +SC_POISON: { + Icon: "SI_CLOUDKILL" +} +SC_SILENCE: { + Icon: "SI_SILENT_BREEZE" +} +SC_THORNS_TRAP: { + Icon: "SI_THORNTRAP" +} +SC_WARM: { + Icon: "SI_SG_SUN_WARM" } diff --git a/src/map/atcommand.c b/src/map/atcommand.c index f57583cfc..3684c1d9f 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2477,7 +2477,7 @@ ACMD(displaystatus) if( flag == 0 ) clif->sc_end(&sd->bl,sd->bl.id,AREA,type); else - clif->status_change(&sd->bl, type, flag, tick, val1, val2, val3); + clif->status_change(&sd->bl, type, BL_PC, flag, tick, val1, val2, val3); return true; } diff --git a/src/map/battle.c b/src/map/battle.c index 7fb5355e6..2b1b34d1a 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6457,7 +6457,7 @@ static enum damage_lv battle_weapon_attack(struct block_list *src, struct block_ skill->castend_type(type, src, target, r_skill, r_lv, tick, flag); sd->state.autocast = 0; sd->ud.canact_tick = tick + skill->delay_fix(src, r_skill, r_lv); - clif->status_change(src, SI_POSTDELAY, 1, skill->delay_fix(src, r_skill, r_lv), 0, 0, 1); + clif->status_change(src, status->get_sc_icon(SC_POSTDELAY), status->get_sc_relevant_bl_types(SC_POSTDELAY), 1, skill->delay_fix(src, r_skill, r_lv), 0, 0, 1); } } diff --git a/src/map/clif.c b/src/map/clif.c index 9f30408e4..0034ae28e 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1586,7 +1586,8 @@ static bool clif_spawn(struct block_list *bl) if (sd->bg_id != 0 && map->list[sd->bl.m].flag.battleground) clif->sendbgemblem_area(sd); for (i = 0; i < sd->sc_display_count; i++) { - clif->sc_continue(&sd->bl, sd->bl.id,AREA,status->dbs->IconChangeTable[sd->sc_display[i]->type],sd->sc_display[i]->val1,sd->sc_display[i]->val2,sd->sc_display[i]->val3); + clif->sc_continue(&sd->bl, sd->bl.id, AREA, status->get_sc_icon(sd->sc_display[i]->type), sd->sc_display[i]->val1, sd->sc_display[i]->val2, sd->sc_display[i]->val3); + } if (sd->charm_type != CHARM_TYPE_NONE && sd->charm_count > 0) clif->spiritcharm(sd); @@ -1612,7 +1613,7 @@ static bool clif_spawn(struct block_list *bl) else if (nd->size == SZ_MEDIUM) clif->specialeffect(&nd->bl,421,AREA); if (nd->clan_id > 0) - clif->sc_load(&nd->bl, nd->bl.id, AREA, status->dbs->IconChangeTable[SC_CLAN_INFO], 0, nd->clan_id, 0); + clif->sc_load(&nd->bl, nd->bl.id, AREA, status->get_sc_icon(SC_CLAN_INFO), 0, nd->clan_id, 0); } break; case BL_PET: @@ -3873,7 +3874,7 @@ static void clif_arrowequip(struct map_session_data *sd, int val) nullpo_retv(sd); #if PACKETVER >= 20121128 - clif->status_change(&sd->bl, SI_CLIENT_ONLY_EQUIP_ARROW, 1, INVALID_TIMER, 0, 0, 0); + clif->status_change(&sd->bl, status->get_sc_icon(SC_CLIENT_ONLY_EQUIP_ARROW), status->get_sc_relevant_bl_types(SC_CLIENT_ONLY_EQUIP_ARROW), 1, INVALID_TIMER, 0, 0, 0); #endif fd=sd->fd; WFIFOHEAD(fd, packet_len(0x013c)); @@ -4676,7 +4677,7 @@ static void clif_getareachar_pc(struct map_session_data *sd, struct map_session_ clif->charm_single(sd->fd, dstsd); for( i = 0; i < dstsd->sc_display_count; i++ ) { - clif->sc_continue(&sd->bl,dstsd->bl.id,SELF,status->dbs->IconChangeTable[dstsd->sc_display[i]->type],dstsd->sc_display[i]->val1,dstsd->sc_display[i]->val2,dstsd->sc_display[i]->val3); + clif->sc_continue(&sd->bl, dstsd->bl.id, SELF, status->get_sc_icon(dstsd->sc_display[i]->type), dstsd->sc_display[i]->val1, dstsd->sc_display[i]->val2, dstsd->sc_display[i]->val3); } if( (sd->status.party_id && dstsd->status.party_id == sd->status.party_id) || //Party-mate, or hpdisp setting. (sd->bg_id && sd->bg_id == dstsd->bg_id) || //BattleGround @@ -4757,7 +4758,7 @@ static void clif_getareachar_unit(struct map_session_data *sd, struct block_list else if (nd->size == SZ_MEDIUM) clif->specialeffect_single(bl,421,sd->fd); if (nd->clan_id > 0) - clif->sc_load(&nd->bl, nd->bl.id, AREA, status->dbs->IconChangeTable[SC_CLAN_INFO], 0, nd->clan_id, 0); + clif->sc_load(&nd->bl, nd->bl.id, AREA, status->get_sc_icon(SC_CLAN_INFO), 0, nd->clan_id, 0); } break; case BL_MOB: @@ -6041,7 +6042,7 @@ static void clif_cooking_list(struct map_session_data *sd, int trigger, uint16 s } } -static void clif_status_change_notick(struct block_list *bl, int type, int flag, int tick, int total_tick, int val1, int val2, int val3) +static void clif_status_change_notick(struct block_list *bl, int type, int relevant_bl, int flag, int tick, int total_tick, int val1, int val2, int val3) { struct packet_sc_notick p; struct map_session_data *sd; @@ -6051,7 +6052,7 @@ static void clif_status_change_notick(struct block_list *bl, int type, int flag, if (type == SI_BLANK) //It shows nothing on the client... return; - if (!(status->type2relevant_bl_types(type)&bl->type)) // only send status changes that actually matter to the client + if (!(relevant_bl & bl->type)) // only send status changes that actually matter to the client return; sd = BL_CAST(BL_PC, bl); @@ -6070,7 +6071,7 @@ static void clif_status_change_notick(struct block_list *bl, int type, int flag, /// 08ff .L .W .L { .L }*3 (PACKETVER >= 20111108) /// 0983 .W .L .B .L .L { .L }*3 (PACKETVER >= 20120618) /// 0984 .L .W .L .L { .L }*3 (PACKETVER >= 20120618) -static void clif_status_change_sub(struct block_list *bl, int type, int flag, int tick, int total_tick, int val1, int val2, int val3) +static void clif_status_change_sub(struct block_list *bl, int type, int relevant_bl, int flag, int tick, int total_tick, int val1, int val2, int val3) { struct packet_status_change p; struct map_session_data *sd; @@ -6080,7 +6081,7 @@ static void clif_status_change_sub(struct block_list *bl, int type, int flag, in nullpo_retv(bl); - if (!(status->type2relevant_bl_types(type)&bl->type)) // only send status changes that actually matter to the client + if (!(relevant_bl & bl->type)) // only send status changes that actually matter to the client return; if ( tick < 0 ) @@ -6107,9 +6108,9 @@ static void clif_status_change_sub(struct block_list *bl, int type, int flag, in /// Notifies clients of a status change. /// @see clif_status_change_sub -static void clif_status_change(struct block_list *bl, int type, int flag, int total_tick, int val1, int val2, int val3) +static void clif_status_change(struct block_list *bl, int type, int relevant_bl, int flag, int total_tick, int val1, int val2, int val3) { - clif->status_change_sub(bl, type, flag, total_tick, total_tick, val1, val2, val3); + clif->status_change_sub(bl, type, relevant_bl, flag, total_tick, total_tick, val1, val2, val3); } /// Send message (modified by [Yor]) (ZC_NOTIFY_PLAYERCHAT). @@ -10681,11 +10682,11 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd) clif->initialstatus(sd); if (pc_isfalcon(sd)) - clif->status_change(&sd->bl, SI_FALCON, 1, 0, 0, 0, 0); + clif->status_change(&sd->bl, status->get_sc_icon(SC_FALCON), status->get_sc_relevant_bl_types(SC_FALCON), 1, 0, 0, 0, 0); if (pc_isridingpeco(sd) || pc_isridingdragon(sd)) - clif->status_change(&sd->bl, SI_RIDING, 1, 0, 0, 0, 0); + clif->status_change(&sd->bl, status->get_sc_icon(SC_RIDING), status->get_sc_relevant_bl_types(SC_RIDING), 1, 0, 0, 0, 0); else if (pc_isridingwug(sd)) - clif->status_change(&sd->bl, SI_WUGRIDER, 1, 0, 0, 0, 0); + clif->status_change(&sd->bl, status->get_sc_icon(SC_WUGRIDER), status->get_sc_relevant_bl_types(SC_WUGRIDER), 1, 0, 0, 0, 0); if(sd->status.manner < 0) sc_start(NULL,&sd->bl,SC_NOCHAT,100,0,0); @@ -10709,7 +10710,7 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd) if (map->night_flag && map->list[sd->bl.m].flag.nightenabled) { sd->state.night = 1; - clif->status_change(&sd->bl, SI_SKE, 1, 0, 0, 0, 0); + clif->status_change(&sd->bl, status->get_sc_icon(SC_SKE), status->get_sc_relevant_bl_types(SC_SKE), 1, 0, 0, 0, 0); } // Notify everyone that this char logged in [Skotlex]. @@ -10761,11 +10762,11 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd) //Display night. if( !sd->state.night ) { sd->state.night = 1; - clif->status_change(&sd->bl, SI_SKE, 1, 0, 0, 0, 0); + clif->status_change(&sd->bl, status->get_sc_icon(SC_SKE), status->get_sc_relevant_bl_types(SC_SKE), 1, 0, 0, 0, 0); } } else if( sd->state.night ) { //Clear night display. sd->state.night = 0; - clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_SKE); + clif->sc_end(&sd->bl, sd->bl.id, SELF, status->get_sc_icon(SC_SKE)); } if( map->list[sd->bl.m].flag.battleground ) { @@ -10813,7 +10814,7 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd) npc->script_event(sd, NPCE_LOADMAP); if (pc->checkskill(sd, SG_DEVIL) && !pc->nextjobexp(sd)) //blindness [Komurka] - clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_DEVIL1); + clif->sc_end(&sd->bl, sd->bl.id, SELF, status->get_sc_icon(SC_DEVIL1)); if (sd->sc.opt2) //Client loses these on warp. clif->changeoption(&sd->bl); diff --git a/src/map/clif.h b/src/map/clif.h index 0dfc00c01..4bbf36247 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -902,8 +902,8 @@ struct clif_interface { void (*cooking_list) (struct map_session_data *sd, int trigger, uint16 skill_id, int qty, int list_type); void (*autospell) (struct map_session_data *sd,uint16 skill_lv); void (*combo_delay) (struct block_list *bl,int wait); - void (*status_change) (struct block_list *bl, int type, int flag, int total_tick, int val1, int val2, int val3); - void (*status_change_sub) (struct block_list *bl, int type, int flag, int tick, int total_tick, int val1, int val2, int val3); + void (*status_change) (struct block_list *bl, int relevant_bl, int type, int flag, int total_tick, int val1, int val2, int val3); + void (*status_change_sub) (struct block_list *bl, int type, int relevant_bl, int flag, int tick, int total_tick, int val1, int val2, int val3); void (*insert_card) (struct map_session_data *sd,int idx_equip,int idx_card,int flag); void (*inventoryList) (struct map_session_data *sd); void (*inventoryItems) (struct map_session_data *sd, enum inventory_type type); diff --git a/src/map/constants.inc b/src/map/constants.inc deleted file mode 100644 index 355e2a825..000000000 --- a/src/map/constants.inc +++ /dev/null @@ -1,1029 +0,0 @@ - script->constdb_comment("Status Icons"); - - script->set_constant("SI_BLANK", SI_BLANK, false, false); - - script->set_constant("SI_PROVOKE", SI_PROVOKE, false, false); - script->set_constant("SI_ENDURE", SI_ENDURE, false, false); - script->set_constant("SI_TWOHANDQUICKEN", SI_TWOHANDQUICKEN, false, false); - script->set_constant("SI_CONCENTRATION", SI_CONCENTRATION, false, false); - script->set_constant("SI_HIDING", SI_HIDING, false, false); - script->set_constant("SI_CLOAKING", SI_CLOAKING, false, false); - script->set_constant("SI_ENCHANTPOISON", SI_ENCHANTPOISON, false, false); - script->set_constant("SI_POISONREACT", SI_POISONREACT, false, false); - script->set_constant("SI_QUAGMIRE", SI_QUAGMIRE, false, false); - script->set_constant("SI_ANGELUS", SI_ANGELUS, false, false); - script->set_constant("SI_BLESSING", SI_BLESSING, false, false); - script->set_constant("SI_CRUCIS", SI_CRUCIS, false, false); - script->set_constant("SI_INC_AGI", SI_INC_AGI, false, false); - script->set_constant("SI_DEC_AGI", SI_DEC_AGI, false, false); - script->set_constant("SI_SLOWPOISON", SI_SLOWPOISON, false, false); - script->set_constant("SI_IMPOSITIO", SI_IMPOSITIO, false, false); - script->set_constant("SI_SUFFRAGIUM", SI_SUFFRAGIUM, false, false); - script->set_constant("SI_ASPERSIO", SI_ASPERSIO, false, false); - script->set_constant("SI_BENEDICTIO", SI_BENEDICTIO, false, false); - script->set_constant("SI_KYRIE", SI_KYRIE, false, false); - script->set_constant("SI_MAGNIFICAT", SI_MAGNIFICAT, false, false); - script->set_constant("SI_GLORIA", SI_GLORIA, false, false); - script->set_constant("SI_LEXAETERNA", SI_LEXAETERNA, false, false); - script->set_constant("SI_ADRENALINE", SI_ADRENALINE, false, false); - script->set_constant("SI_WEAPONPERFECT", SI_WEAPONPERFECT, false, false); - script->set_constant("SI_OVERTHRUST", SI_OVERTHRUST, false, false); - script->set_constant("SI_MAXIMIZE", SI_MAXIMIZE, false, false); - script->set_constant("SI_RIDING", SI_RIDING, false, false); - script->set_constant("SI_FALCON", SI_FALCON, false, false); - script->set_constant("SI_TRICKDEAD", SI_TRICKDEAD, false, false); - script->set_constant("SI_SHOUT", SI_SHOUT, false, false); - script->set_constant("SI_ENERGYCOAT", SI_ENERGYCOAT, false, false); - script->set_constant("SI_BROKENARMOR", SI_BROKENARMOR, false, false); - script->set_constant("SI_BROKENWEAPON", SI_BROKENWEAPON, false, false); - script->set_constant("SI_ILLUSION", SI_ILLUSION, false, false); - script->set_constant("SI_WEIGHTOVER50", SI_WEIGHTOVER50, false, false); - script->set_constant("SI_WEIGHTOVER90", SI_WEIGHTOVER90, false, false); - script->set_constant("SI_ATTHASTE_POTION1", SI_ATTHASTE_POTION1, false, false); - script->set_constant("SI_ATTHASTE_POTION2", SI_ATTHASTE_POTION2, false, false); - script->set_constant("SI_ATTHASTE_POTION3", SI_ATTHASTE_POTION3, false, false); - script->set_constant("SI_ATTHASTE_INFINITY", SI_ATTHASTE_INFINITY, false, false); - script->set_constant("SI_MOVHASTE_POTION", SI_MOVHASTE_POTION, false, false); - script->set_constant("SI_MOVHASTE_INFINITY", SI_MOVHASTE_INFINITY, false, false); - //script->set_constant("SI_AUTOCOUNTER", SI_AUTOCOUNTER, false, false); - //script->set_constant("SI_SPLASHER", SI_SPLASHER, false, false); - script->set_constant("SI_ANKLESNARE", SI_ANKLESNARE, false, false); - script->set_constant("SI_POSTDELAY", SI_POSTDELAY, false, false); - //script->set_constant("SI_NOACTION", SI_NOACTION, false, false); - //script->set_constant("SI_IMPOSSIBLEPICKUP", SI_IMPOSSIBLEPICKUP, false, false); - //script->set_constant("SI_BARRIER", SI_BARRIER, false, false); - - script->set_constant("SI_NOEQUIPWEAPON", SI_NOEQUIPWEAPON, false, false); - script->set_constant("SI_NOEQUIPSHIELD", SI_NOEQUIPSHIELD, false, false); - script->set_constant("SI_NOEQUIPARMOR", SI_NOEQUIPARMOR, false, false); - script->set_constant("SI_NOEQUIPHELM", SI_NOEQUIPHELM, false, false); - script->set_constant("SI_PROTECTWEAPON", SI_PROTECTWEAPON, false, false); - script->set_constant("SI_PROTECTSHIELD", SI_PROTECTSHIELD, false, false); - script->set_constant("SI_PROTECTARMOR", SI_PROTECTARMOR, false, false); - script->set_constant("SI_PROTECTHELM", SI_PROTECTHELM, false, false); - script->set_constant("SI_AUTOGUARD", SI_AUTOGUARD, false, false); - script->set_constant("SI_REFLECTSHIELD", SI_REFLECTSHIELD, false, false); - //script->set_constant("SI_DEVOTION", SI_DEVOTION, false, false); - script->set_constant("SI_PROVIDENCE", SI_PROVIDENCE, false, false); - script->set_constant("SI_DEFENDER", SI_DEFENDER, false, false); - //script->set_constant("SI_MAGICROD", SI_MAGICROD, false, false); - //script->set_constant("SI_WEAPONPROPERTY", SI_WEAPONPROPERTY, false, false); - script->set_constant("SI_AUTOSPELL", SI_AUTOSPELL, false, false); - //script->set_constant("SI_SPECIALZONE", SI_SPECIALZONE, false, false); - //script->set_constant("SI_MASK", SI_MASK, false, false); - script->set_constant("SI_SPEARQUICKEN", SI_SPEARQUICKEN, false, false); - //script->set_constant("SI_BDPLAYING", SI_BDPLAYING, false, false); - //script->set_constant("SI_WHISTLE", SI_WHISTLE, false, false); - //script->set_constant("SI_ASSASSINCROSS", SI_ASSASSINCROSS, false, false); - //script->set_constant("SI_POEMBRAGI", SI_POEMBRAGI, false, false); - //script->set_constant("SI_APPLEIDUN", SI_APPLEIDUN, false, false); - //script->set_constant("SI_HUMMING", SI_HUMMING, false, false); - //script->set_constant("SI_DONTFORGETME", SI_DONTFORGETME, false, false); - //script->set_constant("SI_FORTUNEKISS", SI_FORTUNEKISS, false, false); - //script->set_constant("SI_SERVICEFORYOU", SI_SERVICEFORYOU, false, false); - //script->set_constant("SI_RICHMANKIM", SI_RICHMANKIM, false, false); - //script->set_constant("SI_ETERNALCHAOS", SI_ETERNALCHAOS, false, false); - //script->set_constant("SI_DRUMBATTLEFIELD", SI_DRUMBATTLEFIELD, false, false); - //script->set_constant("SI_RINGNIBELUNGEN", SI_RINGNIBELUNGEN, false, false); - //script->set_constant("SI_ROKISWEIL", SI_ROKISWEIL, false, false); - //script->set_constant("SI_INTOABYSS", SI_INTOABYSS, false, false); - //script->set_constant("SI_SIEGFRIED", SI_SIEGFRIED, false, false); - //script->set_constant("SI_BLADESTOP", SI_BLADESTOP, false, false); - script->set_constant("SI_EXPLOSIONSPIRITS", SI_EXPLOSIONSPIRITS, false, false); - script->set_constant("SI_STEELBODY", SI_STEELBODY, false, false); - script->set_constant("SI_EXTREMITYFIST", SI_EXTREMITYFIST, false, false); - //script->set_constant("SI_COMBOATTACK", SI_COMBOATTACK, false, false); - script->set_constant("SI_PROPERTYFIRE", SI_PROPERTYFIRE, false, false); - script->set_constant("SI_PROPERTYWATER", SI_PROPERTYWATER, false, false); - script->set_constant("SI_PROPERTYWIND", SI_PROPERTYWIND, false, false); - script->set_constant("SI_PROPERTYGROUND", SI_PROPERTYGROUND, false, false); - //script->set_constant("SI_MAGICATTACK", SI_MAGICATTACK, false, false); - script->set_constant("SI_STOP", SI_STOP, false, false); - //script->set_constant("SI_WEAPONBRAKER", SI_WEAPONBRAKER, false, false); - script->set_constant("SI_PROPERTYUNDEAD", SI_PROPERTYUNDEAD, false, false); - //script->set_constant("SI_POWERUP", SI_POWERUP, false, false); - //script->set_constant("SI_AGIUP", SI_AGIUP, false, false); - - //script->set_constant("SI_SIEGEMODE", SI_SIEGEMODE, false, false); - //script->set_constant("SI_INVISIBLE", SI_INVISIBLE, false, false); - //script->set_constant("SI_STATUSONE", SI_STATUSONE, false, false); - script->set_constant("SI_AURABLADE", SI_AURABLADE, false, false); - script->set_constant("SI_PARRYING", SI_PARRYING, false, false); - script->set_constant("SI_LKCONCENTRATION", SI_LKCONCENTRATION, false, false); - script->set_constant("SI_TENSIONRELAX", SI_TENSIONRELAX, false, false); - script->set_constant("SI_BERSERK", SI_BERSERK, false, false); - //script->set_constant("SI_SACRIFICE", SI_SACRIFICE, false, false); - //script->set_constant("SI_GOSPEL", SI_GOSPEL, false, false); - script->set_constant("SI_ASSUMPTIO", SI_ASSUMPTIO, false, false); - //script->set_constant("SI_BASILICA", SI_BASILICA, false, false); - script->set_constant("SI_GROUNDMAGIC", SI_GROUNDMAGIC, false, false); - script->set_constant("SI_MAGICPOWER", SI_MAGICPOWER, false, false); - script->set_constant("SI_EDP", SI_EDP, false, false); - script->set_constant("SI_TRUESIGHT", SI_TRUESIGHT, false, false); - script->set_constant("SI_WINDWALK", SI_WINDWALK, false, false); - script->set_constant("SI_MELTDOWN", SI_MELTDOWN, false, false); - script->set_constant("SI_CARTBOOST", SI_CARTBOOST, false, false); - //script->set_constant("SI_CHASEWALK", SI_CHASEWALK, false, false); - script->set_constant("SI_SWORDREJECT", SI_SWORDREJECT, false, false); - script->set_constant("SI_MARIONETTE_MASTER", SI_MARIONETTE_MASTER, false, false); - script->set_constant("SI_MARIONETTE", SI_MARIONETTE, false, false); - script->set_constant("SI_MOON", SI_MOON, false, false); - script->set_constant("SI_BLOODING", SI_BLOODING, false, false); - script->set_constant("SI_JOINTBEAT", SI_JOINTBEAT, false, false); - //script->set_constant("SI_MINDBREAKER", SI_MINDBREAKER, false, false); - //script->set_constant("SI_MEMORIZE", SI_MEMORIZE, false, false); - //script->set_constant("SI_FOGWALL", SI_FOGWALL, false, false); - //script->set_constant("SI_SPIDERWEB", SI_SPIDERWEB, false, false); - script->set_constant("SI_PROTECTEXP", SI_PROTECTEXP, false, false); - //script->set_constant("SI_SUB_WEAPONPROPERTY", SI_SUB_WEAPONPROPERTY, false, false); - script->set_constant("SI_AUTOBERSERK", SI_AUTOBERSERK, false, false); - script->set_constant("SI_RUN", SI_RUN, false, false); - script->set_constant("SI_TING", SI_TING, false, false); - script->set_constant("SI_STORMKICK_ON", SI_STORMKICK_ON, false, false); - script->set_constant("SI_STORMKICK_READY", SI_STORMKICK_READY, false, false); - script->set_constant("SI_DOWNKICK_ON", SI_DOWNKICK_ON, false, false); - script->set_constant("SI_DOWNKICK_READY", SI_DOWNKICK_READY, false, false); - script->set_constant("SI_TURNKICK_ON", SI_TURNKICK_ON, false, false); - script->set_constant("SI_TURNKICK_READY", SI_TURNKICK_READY, false, false); - script->set_constant("SI_COUNTER_ON", SI_COUNTER_ON, false, false); - script->set_constant("SI_COUNTER_READY", SI_COUNTER_READY, false, false); - script->set_constant("SI_DODGE_ON", SI_DODGE_ON, false, false); - script->set_constant("SI_DODGE_READY", SI_DODGE_READY, false, false); - script->set_constant("SI_STRUP", SI_STRUP, false, false); - script->set_constant("SI_PROPERTYDARK", SI_PROPERTYDARK, false, false); - script->set_constant("SI_ADRENALINE2", SI_ADRENALINE2, false, false); - script->set_constant("SI_PROPERTYTELEKINESIS", SI_PROPERTYTELEKINESIS, false, false); - script->set_constant("SI_SOULLINK", SI_SOULLINK, false, false); - - script->set_constant("SI_PLUSATTACKPOWER", SI_PLUSATTACKPOWER, false, false); - script->set_constant("SI_PLUSMAGICPOWER", SI_PLUSMAGICPOWER, false, false); - script->set_constant("SI_DEVIL1", SI_DEVIL1, false, false); - script->set_constant("SI_KAITE", SI_KAITE, false, false); - //script->set_constant("SI_SWOO", SI_SWOO, false, false); - //script->set_constant("SI_STAR2", SI_STAR2, false, false); - script->set_constant("SI_KAIZEL", SI_KAIZEL, false, false); - script->set_constant("SI_KAAHI", SI_KAAHI, false, false); - script->set_constant("SI_KAUPE", SI_KAUPE, false, false); - script->set_constant("SI_SMA_READY", SI_SMA_READY, false, false); - script->set_constant("SI_SKE", SI_SKE, false, false); - script->set_constant("SI_ONEHANDQUICKEN", SI_ONEHANDQUICKEN, false, false); - //script->set_constant("SI_FRIEND", SI_FRIEND, false, false); - //script->set_constant("SI_FRIENDUP", SI_FRIENDUP, false, false); - //script->set_constant("SI_SG_WARM", SI_SG_WARM, false, false); - script->set_constant("SI_SG_SUN_WARM", SI_SG_SUN_WARM, false, false); - //script->set_constant("SI_SG_MOON_WARM", SI_SG_MOON_WARM, false, false); - //script->set_constant("SI_SG_STAR_WARM", SI_SG_STAR_WARM, false, false); - //script->set_constant("SI_EMOTION", SI_EMOTION, false, false); - script->set_constant("SI_SUN_COMFORT", SI_SUN_COMFORT, false, false); - script->set_constant("SI_MOON_COMFORT", SI_MOON_COMFORT, false, false); - script->set_constant("SI_STAR_COMFORT", SI_STAR_COMFORT, false, false); - //script->set_constant("SI_EXPUP", SI_EXPUP, false, false); - //script->set_constant("SI_GDSKILL_BATTLEORDER", SI_GDSKILL_BATTLEORDER, false, false); - //script->set_constant("SI_GDSKILL_REGENERATION", SI_GDSKILL_REGENERATION, false, false); - //script->set_constant("SI_GDSKILL_POSTDELAY", SI_GDSKILL_POSTDELAY, false, false); - //script->set_constant("SI_RESISTHANDICAP", SI_RESISTHANDICAP, false, false); - //script->set_constant("SI_MAXHPPERCENT", SI_MAXHPPERCENT, false, false); - //script->set_constant("SI_MAXSPPERCENT", SI_MAXSPPERCENT, false, false); - //script->set_constant("SI_DEFENCE", SI_DEFENCE, false, false); - //script->set_constant("SI_SLOWDOWN", SI_SLOWDOWN, false, false); - script->set_constant("SI_PRESERVE", SI_PRESERVE, false, false); - script->set_constant("SI_INCSTR", SI_INCSTR, false, false); - //script->set_constant("SI_NOT_EXTREMITYFIST", SI_NOT_EXTREMITYFIST, false, false); - script->set_constant("SI_CLAIRVOYANCE", SI_CLAIRVOYANCE, false, false); - script->set_constant("SI_MOVESLOW_POTION", SI_MOVESLOW_POTION, false, false); - script->set_constant("SI_DOUBLECASTING", SI_DOUBLECASTING, false, false); - //script->set_constant("SI_GRAVITATION", SI_GRAVITATION, false, false); - script->set_constant("SI_OVERTHRUSTMAX", SI_OVERTHRUSTMAX, false, false); - //script->set_constant("SI_LONGING", SI_LONGING, false, false); - //script->set_constant("SI_HERMODE", SI_HERMODE, false, false); - script->set_constant("SI_TAROTCARD", SI_TAROTCARD, false, false); - //script->set_constant("SI_HLIF_AVOID", SI_HLIF_AVOID, false, false); - //script->set_constant("SI_HFLI_FLEET", SI_HFLI_FLEET, false, false); - //script->set_constant("SI_HFLI_SPEED", SI_HFLI_SPEED, false, false); - //script->set_constant("SI_HLIF_CHANGE", SI_HLIF_CHANGE, false, false); - //script->set_constant("SI_HAMI_BLOODLUST", SI_HAMI_BLOODLUST, false, false); - script->set_constant("SI_CR_SHRINK", SI_CR_SHRINK, false, false); - script->set_constant("SI_WZ_SIGHTBLASTER", SI_WZ_SIGHTBLASTER, false, false); - script->set_constant("SI_DC_WINKCHARM", SI_DC_WINKCHARM, false, false); - - script->set_constant("SI_RG_CCONFINE_M", SI_RG_CCONFINE_M, false, false); - script->set_constant("SI_RG_CCONFINE_S", SI_RG_CCONFINE_S, false, false); - //script->set_constant("SI_DISABLEMOVE", SI_DISABLEMOVE, false, false); - script->set_constant("SI_GS_MADNESSCANCEL", SI_GS_MADNESSCANCEL, false, false); - script->set_constant("SI_GS_GATLINGFEVER", SI_GS_GATLINGFEVER, false, false); - script->set_constant("SI_EARTHSCROLL", SI_EARTHSCROLL, false, false); - script->set_constant("SI_NJ_UTSUSEMI", SI_NJ_UTSUSEMI, false, false); - script->set_constant("SI_NJ_BUNSINJYUTSU", SI_NJ_BUNSINJYUTSU, false, false); - script->set_constant("SI_NJ_NEN", SI_NJ_NEN, false, false); - script->set_constant("SI_GS_ADJUSTMENT", SI_GS_ADJUSTMENT, false, false); - script->set_constant("SI_GS_ACCURACY", SI_GS_ACCURACY, false, false); - script->set_constant("SI_NJ_SUITON", SI_NJ_SUITON, false, false); - //script->set_constant("SI_PET", SI_PET, false, false); - //script->set_constant("SI_MENTAL", SI_MENTAL, false, false); - //script->set_constant("SI_EXPMEMORY", SI_EXPMEMORY, false, false); - //script->set_constant("SI_PERFORMANCE", SI_PERFORMANCE, false, false); - //script->set_constant("SI_GAIN", SI_GAIN, false, false); - //script->set_constant("SI_GRIFFON", SI_GRIFFON, false, false); - //script->set_constant("SI_DRIFT", SI_DRIFT, false, false); - //script->set_constant("SI_WALLSHIFT", SI_WALLSHIFT, false, false); - //script->set_constant("SI_REINCARNATION", SI_REINCARNATION, false, false); - //script->set_constant("SI_PATTACK", SI_PATTACK, false, false); - //script->set_constant("SI_PSPEED", SI_PSPEED, false, false); - //script->set_constant("SI_PDEFENSE", SI_PDEFENSE, false, false); - //script->set_constant("SI_PCRITICAL", SI_PCRITICAL, false, false); - //script->set_constant("SI_RANKING", SI_RANKING, false, false); - //script->set_constant("SI_PTRIPLE", SI_PTRIPLE, false, false); - //script->set_constant("SI_DENERGY", SI_DENERGY, false, false); - //script->set_constant("SI_WAVE1", SI_WAVE1, false, false); - //script->set_constant("SI_WAVE2", SI_WAVE2, false, false); - //script->set_constant("SI_WAVE3", SI_WAVE3, false, false); - //script->set_constant("SI_WAVE4", SI_WAVE4, false, false); - //script->set_constant("SI_DAURA", SI_DAURA, false, false); - //script->set_constant("SI_DFREEZER", SI_DFREEZER, false, false); - //script->set_constant("SI_DPUNISH", SI_DPUNISH, false, false); - //script->set_constant("SI_DBARRIER", SI_DBARRIER, false, false); - //script->set_constant("SI_DWARNING", SI_DWARNING, false, false); - //script->set_constant("SI_MOUSEWHEEL", SI_MOUSEWHEEL, false, false); - //script->set_constant("SI_DGAUGE", SI_DGAUGE, false, false); - //script->set_constant("SI_DACCEL", SI_DACCEL, false, false); - //script->set_constant("SI_DBLOCK", SI_DBLOCK, false, false); - script->set_constant("SI_FOOD_STR", SI_FOOD_STR, false, false); - script->set_constant("SI_FOOD_AGI", SI_FOOD_AGI, false, false); - script->set_constant("SI_FOOD_VIT", SI_FOOD_VIT, false, false); - script->set_constant("SI_FOOD_DEX", SI_FOOD_DEX, false, false); - script->set_constant("SI_FOOD_INT", SI_FOOD_INT, false, false); - script->set_constant("SI_FOOD_LUK", SI_FOOD_LUK, false, false); - script->set_constant("SI_FOOD_BASICAVOIDANCE", SI_FOOD_BASICAVOIDANCE, false, false); - script->set_constant("SI_FOOD_BASICHIT", SI_FOOD_BASICHIT, false, false); - script->set_constant("SI_FOOD_CRITICALSUCCESSVALUE", SI_FOOD_CRITICALSUCCESSVALUE, false, false); - - script->set_constant("SI_CASH_PLUSEXP", SI_CASH_PLUSEXP, false, false); - script->set_constant("SI_CASH_DEATHPENALTY", SI_CASH_DEATHPENALTY, false, false); - script->set_constant("SI_CASH_RECEIVEITEM", SI_CASH_RECEIVEITEM, false, false); - script->set_constant("SI_CASH_BOSS_ALARM", SI_CASH_BOSS_ALARM, false, false); - //script->set_constant("SI_DA_ENERGY", SI_DA_ENERGY, false, false); - //script->set_constant("SI_DA_FIRSTSLOT", SI_DA_FIRSTSLOT, false, false); - //script->set_constant("SI_DA_HEADDEF", SI_DA_HEADDEF, false, false); - //script->set_constant("SI_DA_SPACE", SI_DA_SPACE, false, false); - //script->set_constant("SI_DA_TRANSFORM", SI_DA_TRANSFORM, false, false); - //script->set_constant("SI_DA_ITEMREBUILD", SI_DA_ITEMREBUILD, false, false); - //script->set_constant("SI_DA_ILLUSION", SI_DA_ILLUSION, false, false); - //script->set_constant("SI_DA_DARKPOWER", SI_DA_DARKPOWER, false, false); - //script->set_constant("SI_DA_EARPLUG", SI_DA_EARPLUG, false, false); - //script->set_constant("SI_DA_CONTRACT", SI_DA_CONTRACT, false, false); - //script->set_constant("SI_DA_BLACK", SI_DA_BLACK, false, false); - //script->set_constant("SI_DA_MAGICCART", SI_DA_MAGICCART, false, false); - //script->set_constant("SI_CRYSTAL", SI_CRYSTAL, false, false); - //script->set_constant("SI_DA_REBUILD", SI_DA_REBUILD, false, false); - //script->set_constant("SI_DA_EDARKNESS", SI_DA_EDARKNESS, false, false); - //script->set_constant("SI_DA_EGUARDIAN", SI_DA_EGUARDIAN, false, false); - //script->set_constant("SI_DA_TIMEOUT", SI_DA_TIMEOUT, false, false); - script->set_constant("SI_FOOD_STR_CASH", SI_FOOD_STR_CASH, false, false); - script->set_constant("SI_FOOD_AGI_CASH", SI_FOOD_AGI_CASH, false, false); - script->set_constant("SI_FOOD_VIT_CASH", SI_FOOD_VIT_CASH, false, false); - script->set_constant("SI_FOOD_DEX_CASH", SI_FOOD_DEX_CASH, false, false); - script->set_constant("SI_FOOD_INT_CASH", SI_FOOD_INT_CASH, false, false); - script->set_constant("SI_FOOD_LUK_CASH", SI_FOOD_LUK_CASH, false, false); - script->set_constant("SI_MER_FLEE", SI_MER_FLEE, false, false); - script->set_constant("SI_MER_ATK", SI_MER_ATK, false, false); - script->set_constant("SI_MER_HP", SI_MER_HP, false, false); - script->set_constant("SI_MER_SP", SI_MER_SP, false, false); - script->set_constant("SI_MER_HIT", SI_MER_HIT, false, false); - script->set_constant("SI_SLOWCAST", SI_SLOWCAST, false, false); - //script->set_constant("SI_MAGICMIRROR", SI_MAGICMIRROR, false, false); - //script->set_constant("SI_STONESKIN", SI_STONESKIN, false, false); - //script->set_constant("SI_ANTIMAGIC", SI_ANTIMAGIC, false, false); - script->set_constant("SI_CRITICALWOUND", SI_CRITICALWOUND, false, false); - //script->set_constant("SI_NPC_DEFENDER", SI_NPC_DEFENDER, false, false); - //script->set_constant("SI_NOACTION_WAIT", SI_NOACTION_WAIT, false, false); - script->set_constant("SI_MOVHASTE_HORSE", SI_MOVHASTE_HORSE, false, false); - script->set_constant("SI_PROTECT_DEF", SI_PROTECT_DEF, false, false); - script->set_constant("SI_PROTECT_MDEF", SI_PROTECT_MDEF, false, false); - script->set_constant("SI_HEALPLUS", SI_HEALPLUS, false, false); - script->set_constant("SI_S_LIFEPOTION", SI_S_LIFEPOTION, false, false); - script->set_constant("SI_L_LIFEPOTION", SI_L_LIFEPOTION, false, false); - script->set_constant("SI_CRITICALPERCENT", SI_CRITICALPERCENT, false, false); - script->set_constant("SI_PLUSAVOIDVALUE", SI_PLUSAVOIDVALUE, false, false); - script->set_constant("SI_ATKER_ASPD", SI_ATKER_ASPD, false, false); - script->set_constant("SI_TARGET_ASPD", SI_TARGET_ASPD, false, false); - script->set_constant("SI_ATKER_MOVESPEED", SI_ATKER_MOVESPEED, false, false); - - script->set_constant("SI_ATKER_BLOOD", SI_ATKER_BLOOD, false, false); - script->set_constant("SI_TARGET_BLOOD", SI_TARGET_BLOOD, false, false); - script->set_constant("SI_ARMOR_PROPERTY", SI_ARMOR_PROPERTY, false, false); - //script->set_constant("SI_REUSE_LIMIT_A", SI_REUSE_LIMIT_A, false, false); - script->set_constant("SI_HELLPOWER", SI_HELLPOWER, false, false); - script->set_constant("SI_STEAMPACK", SI_STEAMPACK, false, false); - //script->set_constant("SI_REUSE_LIMIT_B", SI_REUSE_LIMIT_B, false, false); - //script->set_constant("SI_REUSE_LIMIT_C", SI_REUSE_LIMIT_C, false, false); - //script->set_constant("SI_REUSE_LIMIT_D", SI_REUSE_LIMIT_D, false, false); - //script->set_constant("SI_REUSE_LIMIT_E", SI_REUSE_LIMIT_E, false, false); - //script->set_constant("SI_REUSE_LIMIT_F", SI_REUSE_LIMIT_F, false, false); - script->set_constant("SI_INVINCIBLE", SI_INVINCIBLE, false, false); - script->set_constant("SI_CASH_PLUSONLYJOBEXP", SI_CASH_PLUSONLYJOBEXP, false, false); - script->set_constant("SI_PARTYFLEE", SI_PARTYFLEE, false, false); - script->set_constant("SI_ANGEL_PROTECT", SI_ANGEL_PROTECT, false, false); - //script->set_constant("SI_ENDURE_MDEF", SI_ENDURE_MDEF, false, false); - script->set_constant("SI_ENCHANTBLADE", SI_ENCHANTBLADE, false, false); - script->set_constant("SI_DEATHBOUND", SI_DEATHBOUND, false, false); - script->set_constant("SI_REFRESH", SI_REFRESH, false, false); - script->set_constant("SI_GIANTGROWTH", SI_GIANTGROWTH, false, false); - script->set_constant("SI_STONEHARDSKIN", SI_STONEHARDSKIN, false, false); - script->set_constant("SI_VITALITYACTIVATION", SI_VITALITYACTIVATION, false, false); - script->set_constant("SI_FIGHTINGSPIRIT", SI_FIGHTINGSPIRIT, false, false); - script->set_constant("SI_ABUNDANCE", SI_ABUNDANCE, false, false); - script->set_constant("SI_REUSE_MILLENNIUMSHIELD", SI_REUSE_MILLENNIUMSHIELD, false, false); - script->set_constant("SI_REUSE_CRUSHSTRIKE", SI_REUSE_CRUSHSTRIKE, false, false); - script->set_constant("SI_REUSE_REFRESH", SI_REUSE_REFRESH, false, false); - script->set_constant("SI_REUSE_STORMBLAST", SI_REUSE_STORMBLAST, false, false); - script->set_constant("SI_VENOMIMPRESS", SI_VENOMIMPRESS, false, false); - script->set_constant("SI_EPICLESIS", SI_EPICLESIS, false, false); - script->set_constant("SI_ORATIO", SI_ORATIO, false, false); - script->set_constant("SI_LAUDAAGNUS", SI_LAUDAAGNUS, false, false); - script->set_constant("SI_LAUDARAMUS", SI_LAUDARAMUS, false, false); - script->set_constant("SI_CLOAKINGEXCEED", SI_CLOAKINGEXCEED, false, false); - script->set_constant("SI_HALLUCINATIONWALK", SI_HALLUCINATIONWALK, false, false); - script->set_constant("SI_HALLUCINATIONWALK_POSTDELAY", SI_HALLUCINATIONWALK_POSTDELAY, false, false); - script->set_constant("SI_RENOVATIO", SI_RENOVATIO, false, false); - script->set_constant("SI_WEAPONBLOCKING", SI_WEAPONBLOCKING, false, false); - script->set_constant("SI_WEAPONBLOCKING_POSTDELAY", SI_WEAPONBLOCKING_POSTDELAY, false, false); - script->set_constant("SI_ROLLINGCUTTER", SI_ROLLINGCUTTER, false, false); - script->set_constant("SI_EXPIATIO", SI_EXPIATIO, false, false); - script->set_constant("SI_POISONINGWEAPON", SI_POISONINGWEAPON, false, false); - script->set_constant("SI_TOXIN", SI_TOXIN, false, false); - script->set_constant("SI_PARALYSE", SI_PARALYSE, false, false); - script->set_constant("SI_VENOMBLEED", SI_VENOMBLEED, false, false); - script->set_constant("SI_MAGICMUSHROOM", SI_MAGICMUSHROOM, false, false); - script->set_constant("SI_DEATHHURT", SI_DEATHHURT, false, false); - script->set_constant("SI_PYREXIA", SI_PYREXIA, false, false); - script->set_constant("SI_OBLIVIONCURSE", SI_OBLIVIONCURSE, false, false); - script->set_constant("SI_LEECHESEND", SI_LEECHESEND, false, false); - - script->set_constant("SI_DUPLELIGHT", SI_DUPLELIGHT, false, false); - script->set_constant("SI_FROSTMISTY", SI_FROSTMISTY, false, false); - script->set_constant("SI_FEARBREEZE", SI_FEARBREEZE, false, false); - script->set_constant("SI_ELECTRICSHOCKER", SI_ELECTRICSHOCKER, false, false); - script->set_constant("SI_MARSHOFABYSS", SI_MARSHOFABYSS, false, false); - script->set_constant("SI_RECOGNIZEDSPELL", SI_RECOGNIZEDSPELL, false, false); - script->set_constant("SI_STASIS", SI_STASIS, false, false); - script->set_constant("SI_WUGRIDER", SI_WUGRIDER, false, false); - script->set_constant("SI_WUGDASH", SI_WUGDASH, false, false); - script->set_constant("SI_WUGBITE", SI_WUGBITE, false, false); - script->set_constant("SI_CAMOUFLAGE", SI_CAMOUFLAGE, false, false); - script->set_constant("SI_ACCELERATION", SI_ACCELERATION, false, false); - script->set_constant("SI_HOVERING", SI_HOVERING, false, false); - script->set_constant("SI_SPHERE_1", SI_SPHERE_1, false, false); - script->set_constant("SI_SPHERE_2", SI_SPHERE_2, false, false); - script->set_constant("SI_SPHERE_3", SI_SPHERE_3, false, false); - script->set_constant("SI_SPHERE_4", SI_SPHERE_4, false, false); - script->set_constant("SI_SPHERE_5", SI_SPHERE_5, false, false); - script->set_constant("SI_MVPCARD_TAOGUNKA", SI_MVPCARD_TAOGUNKA, false, false); - script->set_constant("SI_MVPCARD_MISTRESS", SI_MVPCARD_MISTRESS, false, false); - script->set_constant("SI_MVPCARD_ORCHERO", SI_MVPCARD_ORCHERO, false, false); - script->set_constant("SI_MVPCARD_ORCLORD", SI_MVPCARD_ORCLORD, false, false); - script->set_constant("SI_OVERHEAT_LIMITPOINT", SI_OVERHEAT_LIMITPOINT, false, false); - script->set_constant("SI_OVERHEAT", SI_OVERHEAT, false, false); - script->set_constant("SI_SHAPESHIFT", SI_SHAPESHIFT, false, false); - script->set_constant("SI_INFRAREDSCAN", SI_INFRAREDSCAN, false, false); - script->set_constant("SI_MAGNETICFIELD", SI_MAGNETICFIELD, false, false); - script->set_constant("SI_NEUTRALBARRIER", SI_NEUTRALBARRIER, false, false); - script->set_constant("SI_NEUTRALBARRIER_MASTER", SI_NEUTRALBARRIER_MASTER, false, false); - script->set_constant("SI_STEALTHFIELD", SI_STEALTHFIELD, false, false); - script->set_constant("SI_STEALTHFIELD_MASTER", SI_STEALTHFIELD_MASTER, false, false); - script->set_constant("SI_MANU_ATK", SI_MANU_ATK, false, false); - script->set_constant("SI_MANU_DEF", SI_MANU_DEF, false, false); - script->set_constant("SI_SPL_ATK", SI_SPL_ATK, false, false); - script->set_constant("SI_SPL_DEF", SI_SPL_DEF, false, false); - script->set_constant("SI_REPRODUCE", SI_REPRODUCE, false, false); - script->set_constant("SI_MANU_MATK", SI_MANU_MATK, false, false); - script->set_constant("SI_SPL_MATK", SI_SPL_MATK, false, false); - script->set_constant("SI_STR_SCROLL", SI_STR_SCROLL, false, false); - script->set_constant("SI_INT_SCROLL", SI_INT_SCROLL, false, false); - script->set_constant("SI_LG_REFLECTDAMAGE", SI_LG_REFLECTDAMAGE, false, false); - script->set_constant("SI_FORCEOFVANGUARD", SI_FORCEOFVANGUARD, false, false); - script->set_constant("SI_BUCHEDENOEL", SI_BUCHEDENOEL, false, false); - script->set_constant("SI_AUTOSHADOWSPELL", SI_AUTOSHADOWSPELL, false, false); - script->set_constant("SI_SHADOWFORM", SI_SHADOWFORM, false, false); - script->set_constant("SI_RAID", SI_RAID, false, false); - script->set_constant("SI_SHIELDSPELL_DEF", SI_SHIELDSPELL_DEF, false, false); - script->set_constant("SI_SHIELDSPELL_MDEF", SI_SHIELDSPELL_MDEF, false, false); - script->set_constant("SI_SHIELDSPELL_REF", SI_SHIELDSPELL_REF, false, false); - script->set_constant("SI_BODYPAINT", SI_BODYPAINT, false, false); - - script->set_constant("SI_EXEEDBREAK", SI_EXEEDBREAK, false, false); - script->set_constant("SI_ADORAMUS", SI_ADORAMUS, false, false); - script->set_constant("SI_PRESTIGE", SI_PRESTIGE, false, false); - script->set_constant("SI_INVISIBILITY", SI_INVISIBILITY, false, false); - script->set_constant("SI_DEADLYINFECT", SI_DEADLYINFECT, false, false); - script->set_constant("SI_BANDING", SI_BANDING, false, false); - script->set_constant("SI_EARTHDRIVE", SI_EARTHDRIVE, false, false); - script->set_constant("SI_INSPIRATION", SI_INSPIRATION, false, false); - script->set_constant("SI_ENERVATION", SI_ENERVATION, false, false); - script->set_constant("SI_GROOMY", SI_GROOMY, false, false); - script->set_constant("SI_RAISINGDRAGON", SI_RAISINGDRAGON, false, false); - script->set_constant("SI_IGNORANCE", SI_IGNORANCE, false, false); - script->set_constant("SI_LAZINESS", SI_LAZINESS, false, false); - script->set_constant("SI_LIGHTNINGWALK", SI_LIGHTNINGWALK, false, false); - script->set_constant("SI_ACARAJE", SI_ACARAJE, false, false); - script->set_constant("SI_UNLUCKY", SI_UNLUCKY, false, false); - script->set_constant("SI_CURSEDCIRCLE_ATKER", SI_CURSEDCIRCLE_ATKER, false, false); - script->set_constant("SI_CURSEDCIRCLE_TARGET", SI_CURSEDCIRCLE_TARGET, false, false); - script->set_constant("SI_WEAKNESS", SI_WEAKNESS, false, false); - script->set_constant("SI_CRESCENTELBOW", SI_CRESCENTELBOW, false, false); - script->set_constant("SI_NOEQUIPACCESSARY", SI_NOEQUIPACCESSARY, false, false); - script->set_constant("SI_STRIPACCESSARY", SI_STRIPACCESSARY, false, false); - script->set_constant("SI_MANHOLE", SI_MANHOLE, false, false); - script->set_constant("SI_POPECOOKIE", SI_POPECOOKIE, false, false); - script->set_constant("SI_FALLENEMPIRE", SI_FALLENEMPIRE, false, false); - script->set_constant("SI_GENTLETOUCH_ENERGYGAIN", SI_GENTLETOUCH_ENERGYGAIN, false, false); - script->set_constant("SI_GENTLETOUCH_CHANGE", SI_GENTLETOUCH_CHANGE, false, false); - script->set_constant("SI_GENTLETOUCH_REVITALIZE", SI_GENTLETOUCH_REVITALIZE, false, false); - script->set_constant("SI_BLOODYLUST", SI_BLOODYLUST, false, false); - script->set_constant("SI_SWINGDANCE", SI_SWINGDANCE, false, false); - script->set_constant("SI_SYMPHONYOFLOVERS", SI_SYMPHONYOFLOVERS, false, false); - script->set_constant("SI_PROPERTYWALK", SI_PROPERTYWALK, false, false); - script->set_constant("SI_SPELLFIST", SI_SPELLFIST, false, false); - script->set_constant("SI_NETHERWORLD", SI_NETHERWORLD, false, false); - script->set_constant("SI_SIREN", SI_SIREN, false, false); - script->set_constant("SI_DEEPSLEEP", SI_DEEPSLEEP, false, false); - script->set_constant("SI_SIRCLEOFNATURE", SI_SIRCLEOFNATURE, false, false); - script->set_constant("SI_COLD", SI_COLD, false, false); - script->set_constant("SI_GLOOMYDAY", SI_GLOOMYDAY, false, false); - script->set_constant("SI_SONG_OF_MANA", SI_SONG_OF_MANA, false, false); - script->set_constant("SI_CLOUDKILL", SI_CLOUDKILL, false, false); - script->set_constant("SI_DANCEWITHWUG", SI_DANCEWITHWUG, false, false); - script->set_constant("SI_RUSHWINDMILL", SI_RUSHWINDMILL, false, false); - script->set_constant("SI_ECHOSONG", SI_ECHOSONG, false, false); - script->set_constant("SI_HARMONIZE", SI_HARMONIZE, false, false); - script->set_constant("SI_STRIKING", SI_STRIKING, false, false); - //script->set_constant("SI_WARMER", SI_WARMER, false, false); - script->set_constant("SI_MOONLITSERENADE", SI_MOONLITSERENADE, false, false); - script->set_constant("SI_SATURDAYNIGHTFEVER", SI_SATURDAYNIGHTFEVER, false, false); - script->set_constant("SI_SITDOWN_FORCE", SI_SITDOWN_FORCE, false, false); - - script->set_constant("SI_ANALYZE", SI_ANALYZE, false, false); - script->set_constant("SI_LERADSDEW", SI_LERADSDEW, false, false); - script->set_constant("SI_MELODYOFSINK", SI_MELODYOFSINK, false, false); - script->set_constant("SI_WARCRYOFBEYOND", SI_WARCRYOFBEYOND, false, false); - script->set_constant("SI_UNLIMITEDHUMMINGVOICE", SI_UNLIMITEDHUMMINGVOICE, false, false); - script->set_constant("SI_SPELLBOOK1", SI_SPELLBOOK1, false, false); - script->set_constant("SI_SPELLBOOK2", SI_SPELLBOOK2, false, false); - script->set_constant("SI_SPELLBOOK3", SI_SPELLBOOK3, false, false); - script->set_constant("SI_FREEZE_SP", SI_FREEZE_SP, false, false); - script->set_constant("SI_GN_TRAINING_SWORD", SI_GN_TRAINING_SWORD, false, false); - script->set_constant("SI_GN_REMODELING_CART", SI_GN_REMODELING_CART, false, false); - script->set_constant("SI_CARTSBOOST", SI_CARTSBOOST, false, false); - script->set_constant("SI_FIXEDCASTINGTM_REDUCE", SI_FIXEDCASTINGTM_REDUCE, false, false); - script->set_constant("SI_THORNTRAP", SI_THORNTRAP, false, false); - script->set_constant("SI_BLOODSUCKER", SI_BLOODSUCKER, false, false); - script->set_constant("SI_SPORE_EXPLOSION", SI_SPORE_EXPLOSION, false, false); - script->set_constant("SI_DEMONIC_FIRE", SI_DEMONIC_FIRE, false, false); - script->set_constant("SI_FIRE_EXPANSION_SMOKE_POWDER", SI_FIRE_EXPANSION_SMOKE_POWDER, false, false); - script->set_constant("SI_FIRE_EXPANSION_TEAR_GAS", SI_FIRE_EXPANSION_TEAR_GAS, false, false); - script->set_constant("SI_BLOCKING_PLAY", SI_BLOCKING_PLAY, false, false); - script->set_constant("SI_MANDRAGORA", SI_MANDRAGORA, false, false); - script->set_constant("SI_ACTIVATE", SI_ACTIVATE, false, false); - script->set_constant("SI_SECRAMENT", SI_SECRAMENT, false, false); - script->set_constant("SI_ASSUMPTIO2", SI_ASSUMPTIO2, false, false); - script->set_constant("SI_TK_SEVENWIND", SI_TK_SEVENWIND, false, false); - script->set_constant("SI_LIMIT_ODINS_RECALL", SI_LIMIT_ODINS_RECALL, false, false); - script->set_constant("SI_STOMACHACHE", SI_STOMACHACHE, false, false); - script->set_constant("SI_MYSTERIOUS_POWDER", SI_MYSTERIOUS_POWDER, false, false); - script->set_constant("SI_MELON_BOMB", SI_MELON_BOMB, false, false); - script->set_constant("SI_BANANA_BOMB_SITDOWN_POSTDELAY", SI_BANANA_BOMB_SITDOWN_POSTDELAY, false, false); - script->set_constant("SI_PROMOTE_HEALTH_RESERCH", SI_PROMOTE_HEALTH_RESERCH, false, false); - script->set_constant("SI_ENERGY_DRINK_RESERCH", SI_ENERGY_DRINK_RESERCH, false, false); - script->set_constant("SI_EXTRACT_WHITE_POTION_Z", SI_EXTRACT_WHITE_POTION_Z, false, false); - script->set_constant("SI_VITATA_500", SI_VITATA_500, false, false); - script->set_constant("SI_EXTRACT_SALAMINE_JUICE", SI_EXTRACT_SALAMINE_JUICE, false, false); - script->set_constant("SI_BOOST500", SI_BOOST500, false, false); - script->set_constant("SI_FULL_SWING_K", SI_FULL_SWING_K, false, false); - script->set_constant("SI_MANA_PLUS", SI_MANA_PLUS, false, false); - script->set_constant("SI_MUSTLE_M", SI_MUSTLE_M, false, false); - script->set_constant("SI_LIFE_FORCE_F", SI_LIFE_FORCE_F, false, false); - script->set_constant("SI_VACUUM_EXTREME", SI_VACUUM_EXTREME, false, false); - script->set_constant("SI_SAVAGE_STEAK", SI_SAVAGE_STEAK, false, false); - script->set_constant("SI_COCKTAIL_WARG_BLOOD", SI_COCKTAIL_WARG_BLOOD, false, false); - script->set_constant("SI_MINOR_BBQ", SI_MINOR_BBQ, false, false); - script->set_constant("SI_SIROMA_ICE_TEA", SI_SIROMA_ICE_TEA, false, false); - script->set_constant("SI_DROCERA_HERB_STEAMED", SI_DROCERA_HERB_STEAMED, false, false); - script->set_constant("SI_PUTTI_TAILS_NOODLES", SI_PUTTI_TAILS_NOODLES, false, false); - script->set_constant("SI_BANANA_BOMB", SI_BANANA_BOMB, false, false); - script->set_constant("SI_SUMMON_AGNI", SI_SUMMON_AGNI, false, false); - script->set_constant("SI_SPELLBOOK4", SI_SPELLBOOK4, false, false); - - script->set_constant("SI_SPELLBOOK5", SI_SPELLBOOK5, false, false); - script->set_constant("SI_SPELLBOOK6", SI_SPELLBOOK6, false, false); - script->set_constant("SI_SPELLBOOK7", SI_SPELLBOOK7, false, false); - script->set_constant("SI_ELEMENTAL_AGGRESSIVE", SI_ELEMENTAL_AGGRESSIVE, false, false); - script->set_constant("SI_RETURN_TO_ELDICASTES", SI_RETURN_TO_ELDICASTES, false, false); - script->set_constant("SI_BANDING_DEFENCE", SI_BANDING_DEFENCE, false, false); - script->set_constant("SI_SKELSCROLL", SI_SKELSCROLL, false, false); - script->set_constant("SI_DISTRUCTIONSCROLL", SI_DISTRUCTIONSCROLL, false, false); - script->set_constant("SI_ROYALSCROLL", SI_ROYALSCROLL, false, false); - script->set_constant("SI_IMMUNITYSCROLL", SI_IMMUNITYSCROLL, false, false); - script->set_constant("SI_MYSTICSCROLL", SI_MYSTICSCROLL, false, false); - script->set_constant("SI_BATTLESCROLL", SI_BATTLESCROLL, false, false); - script->set_constant("SI_ARMORSCROLL", SI_ARMORSCROLL, false, false); - script->set_constant("SI_FREYJASCROLL", SI_FREYJASCROLL, false, false); - script->set_constant("SI_SOULSCROLL", SI_SOULSCROLL, false, false); - script->set_constant("SI_CIRCLE_OF_FIRE", SI_CIRCLE_OF_FIRE, false, false); - script->set_constant("SI_CIRCLE_OF_FIRE_OPTION", SI_CIRCLE_OF_FIRE_OPTION, false, false); - script->set_constant("SI_FIRE_CLOAK", SI_FIRE_CLOAK, false, false); - script->set_constant("SI_FIRE_CLOAK_OPTION", SI_FIRE_CLOAK_OPTION, false, false); - script->set_constant("SI_WATER_SCREEN", SI_WATER_SCREEN, false, false); - script->set_constant("SI_WATER_SCREEN_OPTION", SI_WATER_SCREEN_OPTION, false, false); - script->set_constant("SI_WATER_DROP", SI_WATER_DROP, false, false); - script->set_constant("SI_WATER_DROP_OPTION", SI_WATER_DROP_OPTION, false, false); - script->set_constant("SI_WIND_STEP", SI_WIND_STEP, false, false); - script->set_constant("SI_WIND_STEP_OPTION", SI_WIND_STEP_OPTION, false, false); - script->set_constant("SI_WIND_CURTAIN", SI_WIND_CURTAIN, false, false); - script->set_constant("SI_WIND_CURTAIN_OPTION", SI_WIND_CURTAIN_OPTION, false, false); - script->set_constant("SI_WATER_BARRIER", SI_WATER_BARRIER, false, false); - script->set_constant("SI_ZEPHYR", SI_ZEPHYR, false, false); - script->set_constant("SI_SOLID_SKIN", SI_SOLID_SKIN, false, false); - script->set_constant("SI_SOLID_SKIN_OPTION", SI_SOLID_SKIN_OPTION, false, false); - script->set_constant("SI_STONE_SHIELD", SI_STONE_SHIELD, false, false); - script->set_constant("SI_STONE_SHIELD_OPTION", SI_STONE_SHIELD_OPTION, false, false); - script->set_constant("SI_POWER_OF_GAIA", SI_POWER_OF_GAIA, false, false); - //script->set_constant("SI_EL_WAIT", SI_EL_WAIT, false, false); - //script->set_constant("SI_EL_PASSIVE", SI_EL_PASSIVE, false, false); - //script->set_constant("SI_EL_DEFENSIVE", SI_EL_DEFENSIVE, false, false); - //script->set_constant("SI_EL_OFFENSIVE", SI_EL_OFFENSIVE, false, false); - //script->set_constant("SI_EL_COST", SI_EL_COST, false, false); - script->set_constant("SI_PYROTECHNIC", SI_PYROTECHNIC, false, false); - script->set_constant("SI_PYROTECHNIC_OPTION", SI_PYROTECHNIC_OPTION, false, false); - script->set_constant("SI_HEATER", SI_HEATER, false, false); - script->set_constant("SI_HEATER_OPTION", SI_HEATER_OPTION, false, false); - script->set_constant("SI_TROPIC", SI_TROPIC, false, false); - script->set_constant("SI_TROPIC_OPTION", SI_TROPIC_OPTION, false, false); - script->set_constant("SI_AQUAPLAY", SI_AQUAPLAY, false, false); - script->set_constant("SI_AQUAPLAY_OPTION", SI_AQUAPLAY_OPTION, false, false); - script->set_constant("SI_COOLER", SI_COOLER, false, false); - script->set_constant("SI_COOLER_OPTION", SI_COOLER_OPTION, false, false); - script->set_constant("SI_CHILLY_AIR", SI_CHILLY_AIR, false, false); - - script->set_constant("SI_CHILLY_AIR_OPTION", SI_CHILLY_AIR_OPTION, false, false); - script->set_constant("SI_GUST", SI_GUST, false, false); - script->set_constant("SI_GUST_OPTION", SI_GUST_OPTION, false, false); - script->set_constant("SI_BLAST", SI_BLAST, false, false); - script->set_constant("SI_BLAST_OPTION", SI_BLAST_OPTION, false, false); - script->set_constant("SI_WILD_STORM", SI_WILD_STORM, false, false); - script->set_constant("SI_WILD_STORM_OPTION", SI_WILD_STORM_OPTION, false, false); - script->set_constant("SI_PETROLOGY", SI_PETROLOGY, false, false); - script->set_constant("SI_PETROLOGY_OPTION", SI_PETROLOGY_OPTION, false, false); - script->set_constant("SI_CURSED_SOIL", SI_CURSED_SOIL, false, false); - script->set_constant("SI_CURSED_SOIL_OPTION", SI_CURSED_SOIL_OPTION, false, false); - script->set_constant("SI_UPHEAVAL", SI_UPHEAVAL, false, false); - script->set_constant("SI_UPHEAVAL_OPTION", SI_UPHEAVAL_OPTION, false, false); - script->set_constant("SI_TIDAL_WEAPON", SI_TIDAL_WEAPON, false, false); - script->set_constant("SI_TIDAL_WEAPON_OPTION", SI_TIDAL_WEAPON_OPTION, false, false); - script->set_constant("SI_ROCK_CRUSHER", SI_ROCK_CRUSHER, false, false); - script->set_constant("SI_ROCK_CRUSHER_ATK", SI_ROCK_CRUSHER_ATK, false, false); - script->set_constant("SI_FIRE_INSIGNIA", SI_FIRE_INSIGNIA, false, false); - script->set_constant("SI_WATER_INSIGNIA", SI_WATER_INSIGNIA, false, false); - script->set_constant("SI_WIND_INSIGNIA", SI_WIND_INSIGNIA, false, false); - script->set_constant("SI_EARTH_INSIGNIA", SI_EARTH_INSIGNIA, false, false); - script->set_constant("SI_EQUIPED_FLOOR", SI_EQUIPED_FLOOR, false, false); - script->set_constant("SI_GUARDIAN_RECALL", SI_GUARDIAN_RECALL, false, false); - script->set_constant("SI_MORA_BUFF", SI_MORA_BUFF, false, false); - script->set_constant("SI_REUSE_LIMIT_G", SI_REUSE_LIMIT_G, false, false); - script->set_constant("SI_REUSE_LIMIT_H", SI_REUSE_LIMIT_H, false, false); - script->set_constant("SI_NEEDLE_OF_PARALYZE", SI_NEEDLE_OF_PARALYZE, false, false); - script->set_constant("SI_PAIN_KILLER", SI_PAIN_KILLER, false, false); - script->set_constant("SI_G_LIFEPOTION", SI_G_LIFEPOTION, false, false); - script->set_constant("SI_VITALIZE_POTION", SI_VITALIZE_POTION, false, false); - script->set_constant("SI_LIGHT_OF_REGENE", SI_LIGHT_OF_REGENE, false, false); - script->set_constant("SI_OVERED_BOOST", SI_OVERED_BOOST, false, false); - script->set_constant("SI_SILENT_BREEZE", SI_SILENT_BREEZE, false, false); - script->set_constant("SI_ODINS_POWER", SI_ODINS_POWER, false, false); - script->set_constant("SI_STYLE_CHANGE", SI_STYLE_CHANGE, false, false); - script->set_constant("SI_SONIC_CLAW_POSTDELAY", SI_SONIC_CLAW_POSTDELAY, false, false); - // 586 - // 587 - // 588 - // 589 - // 590 - // 591 - // 592 - // 593 - // 594 - // 595 - script->set_constant("SI_SILVERVEIN_RUSH_POSTDELAY", SI_SILVERVEIN_RUSH_POSTDELAY, false, false); - script->set_constant("SI_MIDNIGHT_FRENZY_POSTDELAY", SI_MIDNIGHT_FRENZY_POSTDELAY, false, false); - script->set_constant("SI_GOLDENE_FERSE", SI_GOLDENE_FERSE, false, false); - script->set_constant("SI_ANGRIFFS_MODUS", SI_ANGRIFFS_MODUS, false, false); - - script->set_constant("SI_TINDER_BREAKER", SI_TINDER_BREAKER, false, false); - script->set_constant("SI_TINDER_BREAKER_POSTDELAY", SI_TINDER_BREAKER_POSTDELAY, false, false); - script->set_constant("SI_CBC", SI_CBC, false, false); - script->set_constant("SI_CBC_POSTDELAY", SI_CBC_POSTDELAY, false, false); - script->set_constant("SI_EQC", SI_EQC, false, false); - script->set_constant("SI_MAGMA_FLOW", SI_MAGMA_FLOW, false, false); - script->set_constant("SI_GRANITIC_ARMOR", SI_GRANITIC_ARMOR, false, false); - script->set_constant("SI_PYROCLASTIC", SI_PYROCLASTIC, false, false); - script->set_constant("SI_VOLCANIC_ASH", SI_VOLCANIC_ASH, false, false); - script->set_constant("SI_SPIRITS_SAVEINFO1", SI_SPIRITS_SAVEINFO1, false, false); - script->set_constant("SI_SPIRITS_SAVEINFO2", SI_SPIRITS_SAVEINFO2, false, false); - script->set_constant("SI_MAGIC_CANDY", SI_MAGIC_CANDY, false, false); - script->set_constant("SI_SEARCH_STORE_INFO", SI_SEARCH_STORE_INFO, false, false); - script->set_constant("SI_ALL_RIDING", SI_ALL_RIDING, false, false); - script->set_constant("SI_ALL_RIDING_REUSE_LIMIT", SI_ALL_RIDING_REUSE_LIMIT, false, false); - script->set_constant("SI_MACRO", SI_MACRO, false, false); - script->set_constant("SI_MACRO_POSTDELAY", SI_MACRO_POSTDELAY, false, false); - script->set_constant("SI_BEER_BOTTLE_CAP", SI_BEER_BOTTLE_CAP, false, false); - script->set_constant("SI_OVERLAPEXPUP", SI_OVERLAPEXPUP, false, false); - script->set_constant("SI_PC_IZ_DUN05", SI_PC_IZ_DUN05, false, false); - script->set_constant("SI_CRUSHSTRIKE", SI_CRUSHSTRIKE, false, false); - script->set_constant("SI_MONSTER_TRANSFORM", SI_MONSTER_TRANSFORM, false, false); - script->set_constant("SI_SIT", SI_SIT, false, false); - script->set_constant("SI_ONAIR", SI_ONAIR, false, false); - script->set_constant("SI_MTF_ASPD", SI_MTF_ASPD, false, false); - script->set_constant("SI_MTF_RANGEATK", SI_MTF_RANGEATK, false, false); - script->set_constant("SI_MTF_MATK", SI_MTF_MATK, false, false); - script->set_constant("SI_MTF_MLEATKED", SI_MTF_MLEATKED, false, false); - script->set_constant("SI_MTF_CRIDAMAGE", SI_MTF_CRIDAMAGE, false, false); - script->set_constant("SI_REUSE_LIMIT_MTF", SI_REUSE_LIMIT_MTF, false, false); - script->set_constant("SI_MACRO_PERMIT", SI_MACRO_PERMIT, false, false); - script->set_constant("SI_MACRO_PLAY", SI_MACRO_PLAY, false, false); - script->set_constant("SI_SKF_CAST", SI_SKF_CAST, false, false); - script->set_constant("SI_SKF_ASPD", SI_SKF_ASPD, false, false); - script->set_constant("SI_SKF_ATK", SI_SKF_ATK, false, false); - script->set_constant("SI_SKF_MATK", SI_SKF_MATK, false, false); - script->set_constant("SI_REWARD_PLUSONLYJOBEXP", SI_REWARD_PLUSONLYJOBEXP, false, false); - script->set_constant("SI_HANDICAPSTATE_NORECOVER", SI_HANDICAPSTATE_NORECOVER, false, false); - script->set_constant("SI_SET_NUM_DEF", SI_SET_NUM_DEF, false, false); - script->set_constant("SI_SET_NUM_MDEF", SI_SET_NUM_MDEF, false, false); - script->set_constant("SI_SET_PER_DEF", SI_SET_PER_DEF, false, false); - script->set_constant("SI_SET_PER_MDEF", SI_SET_PER_MDEF, false, false); - script->set_constant("SI_PARTYBOOKING_SEARCH_DEALY", SI_PARTYBOOKING_SEARCH_DEALY, false, false); - script->set_constant("SI_PARTYBOOKING_REGISTER_DEALY", SI_PARTYBOOKING_REGISTER_DEALY, false, false); - script->set_constant("SI_PERIOD_TIME_CHECK_DETECT_SKILL", SI_PERIOD_TIME_CHECK_DETECT_SKILL, false, false); - script->set_constant("SI_KO_JYUMONJIKIRI", SI_KO_JYUMONJIKIRI, false, false); - script->set_constant("SI_MEIKYOUSISUI", SI_MEIKYOUSISUI, false, false); - script->set_constant("SI_ATTHASTE_CASH", SI_ATTHASTE_CASH, false, false); - script->set_constant("SI_EQUIPPED_DIVINE_ARMOR", SI_EQUIPPED_DIVINE_ARMOR, false, false); - script->set_constant("SI_EQUIPPED_HOLY_ARMOR", SI_EQUIPPED_HOLY_ARMOR, false, false); - - script->set_constant("SI_2011RWC", SI_2011RWC, false, false); - script->set_constant("SI_KYOUGAKU", SI_KYOUGAKU, false, false); - script->set_constant("SI_IZAYOI", SI_IZAYOI, false, false); - script->set_constant("SI_ZENKAI", SI_ZENKAI, false, false); - script->set_constant("SI_KG_KAGEHUMI", SI_KG_KAGEHUMI, false, false); - script->set_constant("SI_KYOMU", SI_KYOMU, false, false); - script->set_constant("SI_KAGEMUSYA", SI_KAGEMUSYA, false, false); - script->set_constant("SI_ZANGETSU", SI_ZANGETSU, false, false); - script->set_constant("SI_PHI_DEMON", SI_PHI_DEMON, false, false); - script->set_constant("SI_GENSOU", SI_GENSOU, false, false); - script->set_constant("SI_AKAITSUKI", SI_AKAITSUKI, false, false); - script->set_constant("SI_TETANY", SI_TETANY, false, false); - script->set_constant("SI_GM_BATTLE", SI_GM_BATTLE, false, false); - script->set_constant("SI_GM_BATTLE2", SI_GM_BATTLE2, false, false); - script->set_constant("SI_2011RWC_SCROLL", SI_2011RWC_SCROLL, false, false); - script->set_constant("SI_ACTIVE_MONSTER_TRANSFORM", SI_ACTIVE_MONSTER_TRANSFORM, false, false); - script->set_constant("SI_MYSTICPOWDER", SI_MYSTICPOWDER, false, false); - script->set_constant("SI_ECLAGE_RECALL", SI_ECLAGE_RECALL, false, false); - script->set_constant("SI_ENTRY_QUEUE_APPLY_DELAY", SI_ENTRY_QUEUE_APPLY_DELAY, false, false); - script->set_constant("SI_REUSE_LIMIT_ECL", SI_REUSE_LIMIT_ECL, false, false); - script->set_constant("SI_M_LIFEPOTION", SI_M_LIFEPOTION, false, false); - script->set_constant("SI_ENTRY_QUEUE_NOTIFY_ADMISSION_TIME_OUT", SI_ENTRY_QUEUE_NOTIFY_ADMISSION_TIME_OUT, false, false); - script->set_constant("SI_UNKNOWN_NAME", SI_UNKNOWN_NAME, false, false); - script->set_constant("SI_ON_PUSH_CART", SI_ON_PUSH_CART, false, false); - script->set_constant("SI_HAT_EFFECT", SI_HAT_EFFECT, false, false); - script->set_constant("SI_FLOWER_LEAF", SI_FLOWER_LEAF, false, false); - script->set_constant("SI_RAY_OF_PROTECTION", SI_RAY_OF_PROTECTION, false, false); - script->set_constant("SI_GLASTHEIM_ATK", SI_GLASTHEIM_ATK, false, false); - script->set_constant("SI_GLASTHEIM_DEF", SI_GLASTHEIM_DEF, false, false); - script->set_constant("SI_GLASTHEIM_HEAL", SI_GLASTHEIM_HEAL, false, false); - script->set_constant("SI_GLASTHEIM_HIDDEN", SI_GLASTHEIM_HIDDEN, false, false); - script->set_constant("SI_GLASTHEIM_STATE", SI_GLASTHEIM_STATE, false, false); - script->set_constant("SI_GLASTHEIM_ITEMDEF", SI_GLASTHEIM_ITEMDEF, false, false); - script->set_constant("SI_GLASTHEIM_HPSP", SI_GLASTHEIM_HPSP, false, false); - script->set_constant("SI_HOMUN_SKILL_POSTDELAY", SI_HOMUN_SKILL_POSTDELAY, false, false); - script->set_constant("SI_ALMIGHTY", SI_ALMIGHTY, false, false); - script->set_constant("SI_GVG_GIANT", SI_GVG_GIANT, false, false); - script->set_constant("SI_GVG_GOLEM", SI_GVG_GOLEM, false, false); - script->set_constant("SI_GVG_STUN", SI_GVG_STUN, false, false); - script->set_constant("SI_GVG_STONE", SI_GVG_STONE, false, false); - script->set_constant("SI_GVG_FREEZ", SI_GVG_FREEZ, false, false); - script->set_constant("SI_GVG_SLEEP", SI_GVG_SLEEP, false, false); - script->set_constant("SI_GVG_CURSE", SI_GVG_CURSE, false, false); - script->set_constant("SI_GVG_SILENCE", SI_GVG_SILENCE, false, false); - script->set_constant("SI_GVG_BLIND", SI_GVG_BLIND, false, false); - script->set_constant("SI_CLIENT_ONLY_EQUIP_ARROW", SI_CLIENT_ONLY_EQUIP_ARROW, false, false); - script->set_constant("SI_CLAN_INFO", SI_CLAN_INFO, false, false); - script->set_constant("SI_JP_EVENT01", SI_JP_EVENT01, false, false); - script->set_constant("SI_JP_EVENT02", SI_JP_EVENT02, false, false); - script->set_constant("SI_JP_EVENT03", SI_JP_EVENT03, false, false); - - script->set_constant("SI_JP_EVENT04", SI_JP_EVENT04, false, false); - script->set_constant("SI_TELEPORT_FIXEDCASTINGDELAY", SI_TELEPORT_FIXEDCASTINGDELAY, false, false); - script->set_constant("SI_GEFFEN_MAGIC1", SI_GEFFEN_MAGIC1, false, false); - script->set_constant("SI_GEFFEN_MAGIC2", SI_GEFFEN_MAGIC2, false, false); - script->set_constant("SI_GEFFEN_MAGIC3", SI_GEFFEN_MAGIC3, false, false); - script->set_constant("SI_QUEST_BUFF1", SI_QUEST_BUFF1, false, false); - script->set_constant("SI_QUEST_BUFF2", SI_QUEST_BUFF2, false, false); - script->set_constant("SI_QUEST_BUFF3", SI_QUEST_BUFF3, false, false); - script->set_constant("SI_REUSE_LIMIT_RECALL", SI_REUSE_LIMIT_RECALL, false, false); - script->set_constant("SI_SAVEPOSITION", SI_SAVEPOSITION, false, false); - script->set_constant("SI_HANDICAPSTATE_ICEEXPLO", SI_HANDICAPSTATE_ICEEXPLO, false, false); - script->set_constant("SI_FENRIR_CARD", SI_FENRIR_CARD, false, false); - script->set_constant("SI_REUSE_LIMIT_ASPD_POTION", SI_REUSE_LIMIT_ASPD_POTION, false, false); - script->set_constant("SI_MAXPAIN", SI_MAXPAIN, false, false); - script->set_constant("SI_PC_STOP", SI_PC_STOP, false, false); - script->set_constant("SI_FRIGG_SONG", SI_FRIGG_SONG, false, false); - script->set_constant("SI_OFFERTORIUM", SI_OFFERTORIUM, false, false); - script->set_constant("SI_TELEKINESIS_INTENSE", SI_TELEKINESIS_INTENSE, false, false); - script->set_constant("SI_MOONSTAR", SI_MOONSTAR, false, false); - script->set_constant("SI_STRANGELIGHTS", SI_STRANGELIGHTS, false, false); - script->set_constant("SI_FULL_THROTTLE", SI_FULL_THROTTLE, false, false); - script->set_constant("SI_REBOUND", SI_REBOUND, false, false); - script->set_constant("SI_UNLIMIT", SI_UNLIMIT, false, false); - script->set_constant("SI_KINGS_GRACE", SI_KINGS_GRACE, false, false); - script->set_constant("SI_ITEM_ATKMAX", SI_ITEM_ATKMAX, false, false); - script->set_constant("SI_ITEM_ATKMIN", SI_ITEM_ATKMIN, false, false); - script->set_constant("SI_ITEM_MATKMAX", SI_ITEM_MATKMAX, false, false); - script->set_constant("SI_ITEM_MATKMIN", SI_ITEM_MATKMIN, false, false); - script->set_constant("SI_SUPER_STAR", SI_SUPER_STAR, false, false); - script->set_constant("SI_HIGH_RANKER", SI_HIGH_RANKER, false, false); - script->set_constant("SI_DARKCROW", SI_DARKCROW, false, false); - script->set_constant("SI_2013_VALENTINE1", SI_2013_VALENTINE1, false, false); - script->set_constant("SI_2013_VALENTINE2", SI_2013_VALENTINE2, false, false); - script->set_constant("SI_2013_VALENTINE3", SI_2013_VALENTINE3, false, false); - script->set_constant("SI_ILLUSIONDOPING", SI_ILLUSIONDOPING, false, false); - //script->set_constant("SI_WIDEWEB", SI_WIDEWEB, false, false); - script->set_constant("SI_CHILL", SI_CHILL, false, false); - script->set_constant("SI_BURNT", SI_BURNT, false, false); - //script->set_constant("SI_PCCAFE_PLAY_TIME", SI_PCCAFE_PLAY_TIME, false, false); - //script->set_constant("SI_TWISTED_TIME", SI_TWISTED_TIME, false, false); - script->set_constant("SI_FLASHCOMBO", SI_FLASHCOMBO, false, false); - //script->set_constant("SI_JITTER_BUFF1", SI_JITTER_BUFF1, false, false); - //script->set_constant("SI_JITTER_BUFF2", SI_JITTER_BUFF2, false, false); - //script->set_constant("SI_JITTER_BUFF3", SI_JITTER_BUFF3, false, false); - //script->set_constant("SI_JITTER_BUFF4", SI_JITTER_BUFF4, false, false); - //script->set_constant("SI_JITTER_BUFF5", SI_JITTER_BUFF5, false, false); - //script->set_constant("SI_JITTER_BUFF6", SI_JITTER_BUFF6, false, false); - //script->set_constant("SI_JITTER_BUFF7", SI_JITTER_BUFF7, false, false); - //script->set_constant("SI_JITTER_BUFF8", SI_JITTER_BUFF8, false, false); - //script->set_constant("SI_JITTER_BUFF9", SI_JITTER_BUFF9, false, false); - - //script->set_constant("SI_JITTER_BUFF10", SI_JITTER_BUFF10, false, false); - script->set_constant("SI_CUP_OF_BOZA", SI_CUP_OF_BOZA, false, false); - script->set_constant("SI_B_TRAP", SI_B_TRAP, false, false); - script->set_constant("SI_E_CHAIN", SI_E_CHAIN, false, false); - script->set_constant("SI_E_QD_SHOT_READY", SI_E_QD_SHOT_READY, false, false); - script->set_constant("SI_C_MARKER", SI_C_MARKER, false, false); - script->set_constant("SI_H_MINE", SI_H_MINE, false, false); - script->set_constant("SI_H_MINE_SPLASH", SI_H_MINE_SPLASH, false, false); - script->set_constant("SI_P_ALTER", SI_P_ALTER, false, false); - script->set_constant("SI_HEAT_BARREL", SI_HEAT_BARREL, false, false); - script->set_constant("SI_ANTI_M_BLAST", SI_ANTI_M_BLAST, false, false); - script->set_constant("SI_SLUGSHOT", SI_SLUGSHOT, false, false); - script->set_constant("SI_SWORDCLAN", SI_SWORDCLAN, false, false); - script->set_constant("SI_ARCWANDCLAN", SI_ARCWANDCLAN, false, false); - script->set_constant("SI_GOLDENMACECLAN", SI_GOLDENMACECLAN, false, false); - script->set_constant("SI_CROSSBOWCLAN", SI_CROSSBOWCLAN, false, false); - script->set_constant("SI_PACKING_ENVELOPE1", SI_PACKING_ENVELOPE1, false, false); - script->set_constant("SI_PACKING_ENVELOPE2", SI_PACKING_ENVELOPE2, false, false); - script->set_constant("SI_PACKING_ENVELOPE3", SI_PACKING_ENVELOPE3, false, false); - script->set_constant("SI_PACKING_ENVELOPE4", SI_PACKING_ENVELOPE4, false, false); - script->set_constant("SI_PACKING_ENVELOPE5", SI_PACKING_ENVELOPE5, false, false); - script->set_constant("SI_PACKING_ENVELOPE6", SI_PACKING_ENVELOPE6, false, false); - script->set_constant("SI_PACKING_ENVELOPE7", SI_PACKING_ENVELOPE7, false, false); - script->set_constant("SI_PACKING_ENVELOPE8", SI_PACKING_ENVELOPE8, false, false); - script->set_constant("SI_PACKING_ENVELOPE9", SI_PACKING_ENVELOPE9, false, false); - script->set_constant("SI_PACKING_ENVELOPE10", SI_PACKING_ENVELOPE10, false, false); - script->set_constant("SI_GLASTHEIM_TRANS", SI_GLASTHEIM_TRANS, false, false); - //script->set_constant("SI_ZONGZI_POUCH_TRANS", SI_ZONGZI_POUCH_TRANS, false, false); - script->set_constant("SI_HEAT_BARREL_AFTER", SI_HEAT_BARREL_AFTER, false, false); - script->set_constant("SI_DECORATION_OF_MUSIC", SI_DECORATION_OF_MUSIC, false, false); - //script->set_constant("SI_OVERSEAEXPUP", SI_OVERSEAEXPUP, false, false); - //script->set_constant("SI_CLOWN_N_GYPSY_CARD", SI_CLOWN_N_GYPSY_CARD, false, false); - //script->set_constant("SI_OPEN_NPC_MARKET", SI_OPEN_NPC_MARKET, false, false); - //script->set_constant("SI_BEEF_RIB_STEW", SI_BEEF_RIB_STEW, false, false); - //script->set_constant("SI_PORK_RIB_STEW", SI_PORK_RIB_STEW, false, false); - //script->set_constant("SI_CHUSEOK_MONDAY", SI_CHUSEOK_MONDAY, false, false); - //script->set_constant("SI_CHUSEOK_TUESDAY", SI_CHUSEOK_TUESDAY, false, false); - //script->set_constant("SI_CHUSEOK_WEDNESDAY", SI_CHUSEOK_WEDNESDAY, false, false); - //script->set_constant("SI_CHUSEOK_THURSDAY", SI_CHUSEOK_THURSDAY, false, false); - //script->set_constant("SI_CHUSEOK_FRIDAY", SI_CHUSEOK_FRIDAY, false, false); - //script->set_constant("SI_CHUSEOK_WEEKEND", SI_CHUSEOK_WEEKEND, false, false); - //script->set_constant("SI_ALL_LIGHTGUARD", SI_ALL_LIGHTGUARD, false, false); - //script->set_constant("SI_ALL_LIGHTGUARD_COOL_TIME", SI_ALL_LIGHTGUARD_COOL_TIME, false, false); - script->set_constant("SI_MTF_MHP", SI_MTF_MHP, false, false); - script->set_constant("SI_MTF_MSP", SI_MTF_MSP, false, false); - script->set_constant("SI_MTF_PUMPKIN", SI_MTF_PUMPKIN, false, false); - script->set_constant("SI_MTF_HITFLEE", SI_MTF_HITFLEE, false, false); - //script->set_constant("SI_MTF_CRIDAMAGE2", SI_MTF_CRIDAMAGE2, false, false); - //script->set_constant("SI_MTF_SPDRAIN", SI_MTF_SPDRAIN, false, false); - //script->set_constant("SI_ACUO_MINT_GUM", SI_ACUO_MINT_GUM, false, false); - - //script->set_constant("SI_S_HEALPOTION", SI_S_HEALPOTION, false, false); - //script->set_constant("SI_REUSE_LIMIT_S_HEAL_POTION", SI_REUSE_LIMIT_S_HEAL_POTION, false, false); - //script->set_constant("SI_PLAYTIME_STATISTICS", SI_PLAYTIME_STATISTICS, false, false); - //script->set_constant("SI_GN_CHANGEMATERIAL_OPERATOR", SI_GN_CHANGEMATERIAL_OPERATOR, false, false); - //script->set_constant("SI_GN_MIX_COOKING_OPERATOR", SI_GN_MIX_COOKING_OPERATOR, false, false); - //script->set_constant("SI_GN_MAKEBOMB_OPERATOR", SI_GN_MAKEBOMB_OPERATOR, false, false); - //script->set_constant("SI_GN_S_PHARMACY_OPERATOR", SI_GN_S_PHARMACY_OPERATOR, false, false); - //script->set_constant("SI_SO_EL_ANALYSIS_DISASSEMBLY_OPERATOR", SI_SO_EL_ANALYSIS_DISASSEMBLY_OPERATOR, false, false); - //script->set_constant("SI_SO_EL_ANALYSIS_COMBINATION_OPERATOR", SI_SO_EL_ANALYSIS_COMBINATION_OPERATOR, false, false); - //script->set_constant("SI_NC_MAGICDECOY_OPERATOR", SI_NC_MAGICDECOY_OPERATOR, false, false); - //script->set_constant("SI_GUILD_STORAGE", SI_GUILD_STORAGE, false, false); - //script->set_constant("SI_GC_POISONINGWEAPON_OPERATOR", SI_GC_POISONINGWEAPON_OPERATOR, false, false); - //script->set_constant("SI_WS_WEAPONREFINE_OPERATOR", SI_WS_WEAPONREFINE_OPERATOR, false, false); - //script->set_constant("SI_BS_REPAIRWEAPON_OPERATOR", SI_BS_REPAIRWEAPON_OPERATOR, false, false); - //script->set_constant("SI_GET_MAILBOX", SI_GET_MAILBOX, false, false); - //script->set_constant("SI_JUMPINGCLAN", SI_JUMPINGCLAN, false, false); - //script->set_constant("SI_JP_OTP", SI_JP_OTP, false, false); - //script->set_constant("SI_HANDICAPTOLERANCE_LEVELGAP", SI_HANDICAPTOLERANCE_LEVELGAP, false, false); - //script->set_constant("SI_MTF_RANGEATK2", SI_MTF_RANGEATK2, false, false); - //script->set_constant("SI_MTF_ASPD2", SI_MTF_ASPD2, false, false); - //script->set_constant("SI_MTF_MATK2", SI_MTF_MATK2, false, false); - //script->set_constant("SI_SHOW_NPCHPBAR", SI_SHOW_NPCHPBAR, false, false); - script->set_constant("SI_FLOWERSMOKE", SI_FLOWERSMOKE, false, false); - script->set_constant("SI_FSTONE", SI_FSTONE, false, false); - //script->set_constant("SI_DAILYSENDMAILCNT", SI_DAILYSENDMAILCNT, false, false); - //script->set_constant("SI_QSCARABA", SI_QSCARABA, false, false); - script->set_constant("SI_LJOSALFAR", SI_LJOSALFAR, false, false); - //script->set_constant("SI_PAD_READER_KNIGHT", SI_PAD_READER_KNIGHT, false, false); - //script->set_constant("SI_PAD_READER_CRUSADER", SI_PAD_READER_CRUSADER, false, false); - //script->set_constant("SI_PAD_READER_BLACKSMITH", SI_PAD_READER_BLACKSMITH, false, false); - //script->set_constant("SI_PAD_READER_ALCHEMIST", SI_PAD_READER_ALCHEMIST, false, false); - //script->set_constant("SI_PAD_READER_ASSASSIN", SI_PAD_READER_ASSASSIN, false, false); - //script->set_constant("SI_PAD_READER_ROGUE", SI_PAD_READER_ROGUE, false, false); - //script->set_constant("SI_PAD_READER_WIZARD", SI_PAD_READER_WIZARD, false, false); - //script->set_constant("SI_PAD_READER_SAGE", SI_PAD_READER_SAGE, false, false); - //script->set_constant("SI_PAD_READER_PRIEST", SI_PAD_READER_PRIEST, false, false); - //script->set_constant("SI_PAD_READER_MONK", SI_PAD_READER_MONK, false, false); - //script->set_constant("SI_PAD_READER_HUNTER", SI_PAD_READER_HUNTER, false, false); - //script->set_constant("SI_PAD_READER_BARD", SI_PAD_READER_BARD, false, false); - //script->set_constant("SI_PAD_READER_DANCER", SI_PAD_READER_DANCER, false, false); - //script->set_constant("SI_PAD_READER_TAEKWON", SI_PAD_READER_TAEKWON, false, false); - //script->set_constant("SI_PAD_READER_NINJA", SI_PAD_READER_NINJA, false, false); - //script->set_constant("SI_PAD_READER_GUNSLINGER", SI_PAD_READER_GUNSLINGER, false, false); - //script->set_constant("SI_PAD_READER_SUPERNOVICE", SI_PAD_READER_SUPERNOVICE, false, false); - //script->set_constant("SI_ESSENCE_OF_TIME", SI_ESSENCE_OF_TIME, false, false); - //script->set_constant("SI_MINIGAME_ROULETTE", SI_MINIGAME_ROULETTE, false, false); - //script->set_constant("SI_MINIGAME_GOLD_POINT", SI_MINIGAME_GOLD_POINT, false, false); - //script->set_constant("SI_MINIGAME_SILVER_POINT", SI_MINIGAME_SILVER_POINT, false, false); - //script->set_constant("SI_MINIGAME_BRONZE_POINT", SI_MINIGAME_BRONZE_POINT, false, false); - script->set_constant("SI_HAPPINESS_STAR", SI_HAPPINESS_STAR, false, false); - - //script->set_constant("SI_SUMMEREVENT01", SI_SUMMEREVENT01, false, false); - //script->set_constant("SI_SUMMEREVENT02", SI_SUMMEREVENT02, false, false); - //script->set_constant("SI_SUMMEREVENT03", SI_SUMMEREVENT03, false, false); - //script->set_constant("SI_SUMMEREVENT04", SI_SUMMEREVENT04, false, false); - //script->set_constant("SI_SUMMEREVENT05", SI_SUMMEREVENT05, false, false); - //script->set_constant("SI_MINIGAME_ROULETTE_BONUS_ITEM", SI_MINIGAME_ROULETTE_BONUS_ITEM, false, false); - //script->set_constant("SI_DRESS_UP", SI_DRESS_UP, false, false); - script->set_constant("SI_MAPLE_FALLS", SI_MAPLE_FALLS, false, false); - //script->set_constant("SI_ALL_NIFLHEIM_RECALL", SI_ALL_NIFLHEIM_RECALL, false, false); - // 859 - //script->set_constant("SI_MTF_MARIONETTE", SI_MTF_MARIONETTE, false, false); - //script->set_constant("SI_MTF_LUDE", SI_MTF_LUDE, false, false); - //script->set_constant("SI_MTF_CRUISER", SI_MTF_CRUISER, false, false); - script->set_constant("SI_MERMAID_LONGING", SI_MERMAID_LONGING, false, false); - script->set_constant("SI_MAGICAL_FEATHER", SI_MAGICAL_FEATHER, false, false); - //script->set_constant("SI_DRACULA_CARD", SI_DRACULA_CARD, false, false); - // 866 - //script->set_constant("SI_LIMIT_POWER_BOOSTER", SI_LIMIT_POWER_BOOSTER, false, false); - // 868 - // 869 - // 870 - // 871 - script->set_constant("SI_TIME_ACCESSORY", SI_TIME_ACCESSORY, false, false); - //script->set_constant("SI_EP16_DEF", SI_EP16_DEF, false, false); - //script->set_constant("SI_NORMAL_ATKED_SP", SI_NORMAL_ATKED_SP, false, false); - //script->set_constant("SI_BODYSTATE_STONECURSE", SI_BODYSTATE_STONECURSE, false, false); - //script->set_constant("SI_BODYSTATE_FREEZING", SI_BODYSTATE_FREEZING, false, false); - //script->set_constant("SI_BODYSTATE_STUN", SI_BODYSTATE_STUN, false, false); - //script->set_constant("SI_BODYSTATE_SLEEP", SI_BODYSTATE_SLEEP, false, false); - //script->set_constant("SI_BODYSTATE_UNDEAD", SI_BODYSTATE_UNDEAD, false, false); - //script->set_constant("SI_BODYSTATE_STONECURSE_ING", SI_BODYSTATE_STONECURSE_ING, false, false); - //script->set_constant("SI_BODYSTATE_BURNNING", SI_BODYSTATE_BURNNING, false, false); - //script->set_constant("SI_BODYSTATE_IMPRISON", SI_BODYSTATE_IMPRISON, false, false); - //script->set_constant("SI_HEALTHSTATE_POISON", SI_HEALTHSTATE_POISON, false, false); - //script->set_constant("SI_HEALTHSTATE_CURSE", SI_HEALTHSTATE_CURSE, false, false); - //script->set_constant("SI_HEALTHSTATE_SILENCE", SI_HEALTHSTATE_SILENCE, false, false); - //script->set_constant("SI_HEALTHSTATE_CONFUSION", SI_HEALTHSTATE_CONFUSION, false, false); - //script->set_constant("SI_HEALTHSTATE_BLIND", SI_HEALTHSTATE_BLIND, false, false); - //script->set_constant("SI_HEALTHSTATE_ANGELUS", SI_HEALTHSTATE_ANGELUS, false, false); - //script->set_constant("SI_HEALTHSTATE_BLOODING", SI_HEALTHSTATE_BLOODING, false, false); - //script->set_constant("SI_HEALTHSTATE_HEAVYPOISON", SI_HEALTHSTATE_HEAVYPOISON, false, false); - //script->set_constant("SI_HEALTHSTATE_FEAR", SI_HEALTHSTATE_FEAR, false, false); - //script->set_constant("SI_CHERRY_BLOSSOM_CAKE", SI_CHERRY_BLOSSOM_CAKE, false, false); - script->set_constant("SI_SU_STOOP", SI_SU_STOOP, false, false); - script->set_constant("SI_CATNIPPOWDER", SI_CATNIPPOWDER, false, false); - script->set_constant("SI_BLOSSOM_FLUTTERING", SI_BLOSSOM_FLUTTERING, false, false); - script->set_constant("SI_SV_ROOTTWIST", SI_SV_ROOTTWIST, false, false); - //script->set_constant("SI_ATTACK_PROPERTY_NOTHING", SI_ATTACK_PROPERTY_NOTHING, false, false); - //script->set_constant("SI_ATTACK_PROPERTY_WATER", SI_ATTACK_PROPERTY_WATER, false, false); - //script->set_constant("SI_ATTACK_PROPERTY_GROUND", SI_ATTACK_PROPERTY_GROUND, false, false); - - //script->set_constant("SI_ATTACK_PROPERTY_FIRE", SI_ATTACK_PROPERTY_FIRE, false, false); - //script->set_constant("SI_ATTACK_PROPERTY_WIND", SI_ATTACK_PROPERTY_WIND, false, false); - //script->set_constant("SI_ATTACK_PROPERTY_POISON", SI_ATTACK_PROPERTY_POISON, false, false); - //script->set_constant("SI_ATTACK_PROPERTY_SAINT", SI_ATTACK_PROPERTY_SAINT, false, false); - //script->set_constant("SI_ATTACK_PROPERTY_DARKNESS", SI_ATTACK_PROPERTY_DARKNESS, false, false); - //script->set_constant("SI_ATTACK_PROPERTY_TELEKINESIS", SI_ATTACK_PROPERTY_TELEKINESIS, false, false); - //script->set_constant("SI_ATTACK_PROPERTY_UNDEAD", SI_ATTACK_PROPERTY_UNDEAD, false, false); - //script->set_constant("SI_RESIST_PROPERTY_NOTHING", SI_RESIST_PROPERTY_NOTHING, false, false); - //script->set_constant("SI_RESIST_PROPERTY_WATER", SI_RESIST_PROPERTY_WATER, false, false); - //script->set_constant("SI_RESIST_PROPERTY_GROUND", SI_RESIST_PROPERTY_GROUND, false, false); - //script->set_constant("SI_RESIST_PROPERTY_FIRE", SI_RESIST_PROPERTY_FIRE, false, false); - //script->set_constant("SI_RESIST_PROPERTY_WIND", SI_RESIST_PROPERTY_WIND, false, false); - //script->set_constant("SI_RESIST_PROPERTY_POISON", SI_RESIST_PROPERTY_POISON, false, false); - //script->set_constant("SI_RESIST_PROPERTY_SAINT", SI_RESIST_PROPERTY_SAINT, false, false); - //script->set_constant("SI_RESIST_PROPERTY_DARKNESS", SI_RESIST_PROPERTY_DARKNESS, false, false); - //script->set_constant("SI_RESIST_PROPERTY_TELEKINESIS", SI_RESIST_PROPERTY_TELEKINESIS, false, false); - //script->set_constant("SI_RESIST_PROPERTY_UNDEAD", SI_RESIST_PROPERTY_UNDEAD, false, false); - script->set_constant("SI_BITESCAR", SI_BITESCAR, false, false); - script->set_constant("SI_ARCLOUSEDASH", SI_ARCLOUSEDASH, false, false); - script->set_constant("SI_TUNAPARTY", SI_TUNAPARTY, false, false); - script->set_constant("SI_SHRIMP", SI_SHRIMP, false, false); - script->set_constant("SI_FRESHSHRIMP", SI_FRESHSHRIMP, false, false); - //script->set_constant("SI_PERIOD_RECEIVEITEM", SI_PERIOD_RECEIVEITEM, false, false); - //script->set_constant("SI_PERIOD_PLUSEXP", SI_PERIOD_PLUSEXP, false, false); - //script->set_constant("SI_PERIOD_PLUSJOBEXP", SI_PERIOD_PLUSJOBEXP, false, false); - //script->set_constant("SI_RUNEHELM", SI_RUNEHELM, false, false); - //script->set_constant("SI_HELM_VERKANA", SI_HELM_VERKANA, false, false); - //script->set_constant("SI_HELM_RHYDO", SI_HELM_RHYDO, false, false); - //script->set_constant("SI_HELM_TURISUS", SI_HELM_TURISUS, false, false); - //script->set_constant("SI_HELM_HAGALAS", SI_HELM_HAGALAS, false, false); - //script->set_constant("SI_HELM_ISIA", SI_HELM_ISIA, false, false); - //script->set_constant("SI_HELM_ASIR", SI_HELM_ASIR, false, false); - //script->set_constant("SI_HELM_URJ", SI_HELM_URJ, false, false); - script->set_constant("SI_SUHIDE", SI_SUHIDE, false, false); - // 934 - //script->set_constant("SI_DORAM_BUF_01", SI_DORAM_BUF_01, false, false); - //script->set_constant("SI_DORAM_BUF_02", SI_DORAM_BUF_02, false, false); - script->set_constant("SI_SPRITEMABLE", SI_SPRITEMABLE, false, false); - //script->set_constant("SI_AID_PERIOD_RECEIVEITEM", SI_AID_PERIOD_RECEIVEITEM, false, false); - //script->set_constant("SI_AID_PERIOD_PLUSEXP", SI_AID_PERIOD_PLUSEXP, false, false); - //script->set_constant("SI_AID_PERIOD_PLUSJOBEXP", SI_AID_PERIOD_PLUSJOBEXP, false, false); - //script->set_constant("SI_AID_PERIOD_DEADPENALTY", SI_AID_PERIOD_DEADPENALTY, false, false); - //script->set_constant("SI_AID_PERIOD_ADDSTOREITEMCOUNT", SI_AID_PERIOD_ADDSTOREITEMCOUNT, false, false); - // 943 - // 944 - // 945 - // 946 - // 947 - // 948 - // 949 - //script->set_constant("SI_HISS", SI_HISS, false, false); - // 951 - //script->set_constant("SI_NYANGGRASS", SI_NYANGGRASS, false, false); - //script->set_constant("SI_CHATTERING", SI_CHATTERING, false, false); - // 954 - // 955 - // 956 - // 957 - // 958 - // 959 - // 960 - //script->set_constant("SI_GROOMING", SI_GROOMING, false, false); - //script->set_constant("SI_PROTECTIONOFSHRIMP", SI_PROTECTIONOFSHRIMP, false, false); - //script->set_constant("SI_EP16_2_BUFF_SS", SI_EP16_2_BUFF_SS, false, false); - //script->set_constant("SI_EP16_2_BUFF_SC", SI_EP16_2_BUFF_SC, false, false); - //script->set_constant("SI_EP16_2_BUFF_AC", SI_EP16_2_BUFF_AC, false, false); - //script->set_constant("SI_GS_MAGICAL_BULLET", SI_GS_MAGICAL_BULLET, false, false); - // 967 - // 968 - // 969 - // 970 - // 971 - // 972 - // 973 - // 974 - // 975 - //script->set_constant("SI_FALLEN_ANGEL", SI_FALLEN_ANGEL, false, false); - // 977 - // 978 - //script->set_constant("SI_BLAZE_BEAD", SI_BLAZE_BEAD, false, false); - //script->set_constant("SI_FROZEN_BEAD", SI_FROZEN_BEAD, false, false); - //script->set_constant("SI_BREEZE_BEAD", SI_BREEZE_BEAD, false, false); - // 982 - //script->set_constant("SI_AID_PERIOD_RECEIVEITEM_2ND", SI_AID_PERIOD_RECEIVEITEM_2ND, false, false); - //script->set_constant("SI_AID_PERIOD_PLUSEXP_2ND", SI_AID_PERIOD_PLUSEXP_2ND, false, false); - //script->set_constant("SI_AID_PERIOD_PLUSJOBEXP_2ND", SI_AID_PERIOD_PLUSJOBEXP_2ND, false, false); - //script->set_constant("SI_PRONTERA_JP", SI_PRONTERA_JP, false, false); - // 987 - //script->set_constant("SI_GLOOM_CARD", SI_GLOOM_CARD, false, false); - //script->set_constant("SI_PHARAOH_CARD", SI_PHARAOH_CARD, false, false); - //script->set_constant("SI_KIEL_CARD", SI_KIEL_CARD, false, false); - // 991 - //script->set_constant("SI_CHEERUP", SI_CHEERUP, false, false); - // 993 - // 994 - //script->set_constant("SI_S_MANAPOTION", SI_S_MANAPOTION, false, false); - //script->set_constant("SI_M_DEFSCROLL", SI_M_DEFSCROLL, false, false); - // 997 - // 998 - // 999 - //script->set_constant("SI_AS_RAGGED_GOLEM_CARD", SI_AS_RAGGED_GOLEM_CARD, false, false); - //script->set_constant("SI_LHZ_DUN_N1", SI_LHZ_DUN_N1, false, false); - //script->set_constant("SI_LHZ_DUN_N2", SI_LHZ_DUN_N2, false, false); - //script->set_constant("SI_LHZ_DUN_N3", SI_LHZ_DUN_N3, false, false); - //script->set_constant("SI_LHZ_DUN_N4", SI_LHZ_DUN_N4, false, false); - - script->set_constant("SI_MAX", SI_MAX, false, false); diff --git a/src/map/pc.c b/src/map/pc.c index a8ff661e8..cbb14c778 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2839,7 +2839,7 @@ static int pc_bonus(struct map_session_data *sd, int type, int val) case SP_INTRAVISION: // Maya Purple Card effect allowing to see Hiding/Cloaking people [DracoRPG] if(sd->state.lr_flag != 2) { sd->special_state.intravision = 1; - clif->status_change(&sd->bl, SI_CLAIRVOYANCE, 1, 0, 0, 0, 0); + clif->status_change(&sd->bl, status->get_sc_icon(SC_CLAIRVOYANCE), status->get_sc_relevant_bl_types(SC_CLAIRVOYANCE), 1, 0, 0, 0, 0); } break; case SP_NO_KNOCKBACK: @@ -6916,7 +6916,7 @@ static int pc_checkjoblevelup(struct map_session_data *sd) status_calc_pc(sd,SCO_FORCE); clif->misceffect(&sd->bl,1); if (pc->checkskill(sd, SG_DEVIL) && !pc->nextjobexp(sd)) - clif->status_change(&sd->bl,SI_DEVIL1, 1, 0, 0, 0, 1); //Permanent blind effect from SG_DEVIL. + clif->status_change(&sd->bl, status->get_sc_icon(SC_DEVIL1), status->get_sc_relevant_bl_types(SC_DEVIL1), 1, 0, 0, 0, 1); //Permanent blind effect from SG_DEVIL. npc->script_event(sd, NPCE_JOBLVUP); @@ -7686,7 +7686,7 @@ static int pc_resetskill(struct map_session_data *sd, int flag) return 0; if( pc->checkskill(sd, SG_DEVIL) && !pc->nextjobexp(sd) ) //Remove perma blindness due to skill-reset. [Skotlex] - clif->sc_end(&sd->bl, sd->bl.id, SELF, SI_DEVIL1); + clif->sc_end(&sd->bl, sd->bl.id, SELF, status->get_sc_icon(SC_DEVIL1)); i = sd->sc.option; if( i&OPTION_RIDING && pc->checkskill(sd, KN_RIDING) ) i &= ~OPTION_RIDING; @@ -8056,7 +8056,7 @@ static int pc_dead(struct map_session_data *sd, struct block_list *src) /* e.g. not killed through pc->damage */ if( pc_issit(sd) ) { - clif->sc_end(&sd->bl,sd->bl.id,SELF,SI_SIT); + clif->sc_end(&sd->bl, sd->bl.id, SELF, status->get_sc_icon(SC_SIT)); } pc_setdead(sd); @@ -9155,11 +9155,11 @@ static int pc_setoption(struct map_session_data *sd, int type) if( (type&OPTION_RIDING && !(p_type&OPTION_RIDING)) || (type&OPTION_DRAGON && !(p_type&OPTION_DRAGON) && pc->checkskill(sd,RK_DRAGONTRAINING) > 0) ) { // Mounting - clif->sc_load(&sd->bl,sd->bl.id,AREA,SI_RIDING, 0, 0, 0); + clif->sc_load(&sd->bl, sd->bl.id, AREA, status->get_sc_icon(SC_RIDING), 0, 0, 0); status_calc_pc(sd,SCO_NONE); } else if( (!(type&OPTION_RIDING) && p_type&OPTION_RIDING) || (!(type&OPTION_DRAGON) && p_type&OPTION_DRAGON) ) { // Dismount - clif->sc_end(&sd->bl,sd->bl.id,AREA,SI_RIDING); + clif->sc_end(&sd->bl, sd->bl.id, AREA, status->get_sc_icon(SC_RIDING)); status_calc_pc(sd,SCO_NONE); } @@ -9179,15 +9179,15 @@ static int pc_setoption(struct map_session_data *sd, int type) #endif if (type&OPTION_FALCON && !(p_type&OPTION_FALCON)) //Falcon ON - clif->sc_load(&sd->bl,sd->bl.id,AREA,SI_FALCON, 0, 0, 0); + clif->sc_load(&sd->bl, sd->bl.id, AREA, status->get_sc_icon(SC_FALCON), 0, 0, 0); else if (!(type&OPTION_FALCON) && p_type&OPTION_FALCON) //Falcon OFF - clif->sc_end(&sd->bl,sd->bl.id,AREA,SI_FALCON); + clif->sc_end(&sd->bl, sd->bl.id, AREA, status->get_sc_icon(SC_FALCON)); if( type&OPTION_WUGRIDER && !(p_type&OPTION_WUGRIDER) ) { // Mounting - clif->sc_load(&sd->bl,sd->bl.id,AREA,SI_WUGRIDER, 0, 0, 0); + clif->sc_load(&sd->bl, sd->bl.id, AREA, status->get_sc_icon(SC_WUGRIDER), 0, 0, 0); status_calc_pc(sd,SCO_NONE); } else if( !(type&OPTION_WUGRIDER) && p_type&OPTION_WUGRIDER ) { // Dismount - clif->sc_end(&sd->bl,sd->bl.id,AREA,SI_WUGRIDER); + clif->sc_end(&sd->bl, sd->bl.id, AREA, status->get_sc_icon(SC_WUGRIDER)); status_calc_pc(sd,SCO_NONE); } @@ -9275,7 +9275,7 @@ static int pc_setcart(struct map_session_data *sd, int type) clif->cartList(sd); clif->updatestatus(sd, SP_CARTINFO); sc_start(NULL,&sd->bl, SC_PUSH_CART, 100, type, 0); - clif->sc_load(&sd->bl, sd->bl.id, AREA, SI_ON_PUSH_CART, type, 0, 0); + clif->sc_load(&sd->bl, sd->bl.id, AREA, status->get_sc_icon(SC_ON_PUSH_CART), type, 0, 0); if( sd->sc.data[SC_PUSH_CART] )/* forcefully update */ sd->sc.data[SC_PUSH_CART]->val1 = type; break; @@ -10913,7 +10913,7 @@ static int pc_daynight_timer_sub(struct map_session_data *sd, va_list ap) { nullpo_ret(sd); if (sd->state.night != map->night_flag && map->list[sd->bl.m].flag.nightenabled) { //Night/day state does not match. - clif->status_change(&sd->bl, SI_SKE, map->night_flag, 0, 0, 0, 0); //New night effect by dynamix [Skotlex] + clif->status_change(&sd->bl, status->get_sc_icon(SC_SKE), status->get_sc_relevant_bl_types(SC_SKE), map->night_flag, 0, 0, 0, 0); //New night effect by dynamix [Skotlex] sd->state.night = map->night_flag; return 1; } @@ -10966,7 +10966,7 @@ static void pc_setstand(struct map_session_data *sd) nullpo_retv(sd); status_change_end(&sd->bl, SC_TENSIONRELAX, INVALID_TIMER); - clif->sc_end(&sd->bl,sd->bl.id,SELF,SI_SIT); + clif->sc_end(&sd->bl, sd->bl.id, SELF, status->get_sc_icon(SC_SIT)); //Reset sitting tick. sd->ssregen.tick.hp = sd->ssregen.tick.sp = 0; if (pc_isdead(sd)) { diff --git a/src/map/script.c b/src/map/script.c index bd0fbb611..6139b22d8 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -25462,7 +25462,7 @@ static BUILDIN(clan_master) } nd->clan_id = clan_id; - clif->sc_load(&nd->bl, nd->bl.id, AREA, status->dbs->IconChangeTable[SC_CLAN_INFO], 0, clan_id, 0); + clif->sc_load(&nd->bl, nd->bl.id, AREA, status->get_sc_icon(SC_CLAN_INFO), 0, clan_id, 0); script_pushint(st, true); return true; @@ -27245,7 +27245,6 @@ static void script_hardcoded_constants(void) script->set_constant("RENEWAL_ASPD", 0, false, false); #endif script->constdb_comment(NULL); -#include "constants.inc" } /** diff --git a/src/map/skill.c b/src/map/skill.c index 7451fbf41..17cc83033 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2043,7 +2043,7 @@ static int skill_additional_effect(struct block_list *src, struct block_list *bl if (DIFF_TICK(ud->canact_tick, tick + rate) < 0){ ud->canact_tick = tick+rate; if ( battle_config.display_status_timers ) - clif->status_change(src, SI_POSTDELAY, 1, rate, 0, 0, 0); + clif->status_change(src, status->get_sc_icon(SC_POSTDELAY), status->get_sc_relevant_bl_types(SC_POSTDELAY), 1, rate, 0, 0, 0); } } } @@ -2129,7 +2129,7 @@ static int skill_additional_effect(struct block_list *src, struct block_list *bl if (DIFF_TICK(ud->canact_tick, tick + rate) < 0){ ud->canact_tick = tick+rate; if (battle_config.display_status_timers) - clif->status_change(src, SI_POSTDELAY, 1, rate, 0, 0, 0); + clif->status_change(src, status->get_sc_icon(SC_POSTDELAY), status->get_sc_relevant_bl_types(SC_POSTDELAY), 1, rate, 0, 0, 0); } } } @@ -2470,7 +2470,7 @@ static int skill_counter_additional_effect(struct block_list *src, struct block_ if (DIFF_TICK(ud->canact_tick, tick + rate) < 0){ ud->canact_tick = tick+rate; if (battle_config.display_status_timers) - clif->status_change(bl, SI_POSTDELAY, 1, rate, 0, 0, 0); + clif->status_change(bl, status->get_sc_icon(SC_POSTDELAY), status->get_sc_relevant_bl_types(SC_POSTDELAY), 1, rate, 0, 0, 0); } } } @@ -5168,7 +5168,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl skill->castend_type(skill->get_casttype(spell_skill_id), src, bl, spell_skill_id, spell_skill_lv, tick, 0); sd->ud.canact_tick = tick + skill->delay_fix(src, spell_skill_id, spell_skill_lv); - clif->status_change(src, SI_POSTDELAY, 1, skill->delay_fix(src, spell_skill_id, spell_skill_lv), 0, 0, 0); + clif->status_change(src, status->get_sc_icon(SC_POSTDELAY), status->get_sc_relevant_bl_types(SC_POSTDELAY), 1, skill->delay_fix(src, spell_skill_id, spell_skill_lv), 0, 0, 0); cooldown = skill->get_cooldown(spell_skill_id, spell_skill_lv); for (i = 0; i < ARRAYLENGTH(sd->skillcooldown) && sd->skillcooldown[i].id; i++) { @@ -5782,7 +5782,7 @@ static int skill_castend_id(int tid, int64 tick, int id, intptr_t data) skill->blockpc_start(sd, ud->skill_id, cooldown); } if( battle_config.display_status_timers && sd ) - clif->status_change(src, SI_POSTDELAY, 1, skill->delay_fix(src, ud->skill_id, ud->skill_lv), 0, 0, 0); + clif->status_change(src, status->get_sc_icon(SC_POSTDELAY), status->get_sc_relevant_bl_types(SC_POSTDELAY), 1, skill->delay_fix(src, ud->skill_id, ud->skill_lv), 0, 0, 0); if( sd ) { switch( ud->skill_id ) @@ -10783,7 +10783,7 @@ static int skill_castend_pos(int tid, int64 tick, int id, intptr_t data) skill->blockpc_start(sd, ud->skill_id, cooldown); } if( battle_config.display_status_timers && sd ) - clif->status_change(src, SI_POSTDELAY, 1, skill->delay_fix(src, ud->skill_id, ud->skill_lv), 0, 0, 0); + clif->status_change(src, status->get_sc_icon(SC_POSTDELAY), status->get_sc_relevant_bl_types(SC_POSTDELAY), 1, skill->delay_fix(src, ud->skill_id, ud->skill_lv), 0, 0, 0); #if 0 if (sd) { switch (ud->skill_id) { @@ -16413,9 +16413,9 @@ static int skill_sit(struct map_session_data *sd, int type) } if( type ) { - clif->sc_load(&sd->bl,sd->bl.id,SELF,SI_SIT,0,0,0); + clif->sc_load(&sd->bl, sd->bl.id, SELF, status->get_sc_icon(SC_SIT), 0, 0, 0); } else { - clif->sc_end(&sd->bl,sd->bl.id,SELF,SI_SIT); + clif->sc_end(&sd->bl, sd->bl.id, SELF, status->get_sc_icon(SC_SIT)); } if (!flag) return 0; diff --git a/src/map/status.c b/src/map/status.c index 1d856a4a3..a99e31f56 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -115,20 +115,27 @@ static unsigned int status_sc2scb_flag(sc_type sc) /** * Returns the bl types which require a status change packet to be sent for a given client status identifier. - * @param type The client-side status identifier to look up (see enum si_type) + * @param type status identifier to look up (see enum sc_type) * @return The bl types relevant to the type (see enum bl_type) */ -static int status_type2relevant_bl_types(int type) +static int status_get_sc_relevant_bl_types(enum sc_type type) { - if( type < 0 || type >= SI_MAX ) { - ShowError("status_type2relevant_bl_types: Unsupported type %d\n", type); + if (type < 0 || type >= SC_MAX) { + ShowError("status_get_sc_relevant_bl_types: Unsupported type %d\n", type); return BL_NUL; } - return status->dbs->RelevantBLTypes[type]; + return status->dbs->IconChangeTable[type].relevant_bl_types; } -static void status_set_sc(uint16 skill_id, sc_type sc, int icon, unsigned int flag) +static int status_get_sc_icon(enum sc_type type) +{ + Assert_retr(SI_BLANK, type >= SC_NONE && type < SC_MAX); + + return status->dbs->IconChangeTable[type].id; +} + +static void status_set_sc(uint16 skill_id, sc_type sc, unsigned int flag) { uint16 idx; if( (idx = skill->get_index(skill_id)) == 0 ) { @@ -142,8 +149,6 @@ static void status_set_sc(uint16 skill_id, sc_type sc, int icon, unsigned int fl if( status->dbs->SkillChangeTable[sc] == 0 ) status->dbs->SkillChangeTable[sc] = skill_id; - if( status->dbs->IconChangeTable[sc] == SI_BLANK ) - status->dbs->IconChangeTable[sc] = icon; status->dbs->ChangeFlagTable[sc] |= flag; if( status->dbs->Skill2SCTable[idx] == SC_NONE ) @@ -152,103 +157,102 @@ static void status_set_sc(uint16 skill_id, sc_type sc, int icon, unsigned int fl static void initChangeTables(void) { -#define add_sc(skill,sc) status->set_sc((skill),(sc),SI_BLANK,SCB_NONE) +#define add_sc(skill,sc) status->set_sc((skill),(sc),SCB_NONE) // indicates that the status displays a visual effect for the affected unit, and should be sent to the client for all supported units -#define set_sc_with_vfx(skill, sc, icon, flag) do { status->set_sc((skill), (sc), (icon), (flag)); if((icon) < SI_MAX) status->dbs->RelevantBLTypes[(icon)] |= BL_SCEFFECT; } while(0) +#define set_sc_with_vfx(skill, sc, flag) do { status->set_sc((skill), (sc), (flag)); status->dbs->IconChangeTable[sc].relevant_bl_types |= BL_SCEFFECT; } while(0) int i; - for (i = 0; i < SC_MAX; i++) - status->dbs->IconChangeTable[i] = SI_BLANK; - for (i = 0; i < MAX_SKILL_DB; i++) status->dbs->Skill2SCTable[i] = SC_NONE; - for (i = 0; i < SI_MAX; i++) - status->dbs->RelevantBLTypes[i] = BL_PC; + for (i = 0; i < SC_MAX; i++) { + status->dbs->IconChangeTable[i].id = SI_BLANK; + status->dbs->IconChangeTable[i].relevant_bl_types = BL_PC; + } memset(status->dbs->SkillChangeTable, 0, sizeof(status->dbs->SkillChangeTable)); memset(status->dbs->ChangeFlagTable, 0, sizeof(status->dbs->ChangeFlagTable)); memset(status->dbs->DisplayType, 0, sizeof(status->dbs->DisplayType)); //First we define the skill for common ailments. These are used in skill_additional_effect through sc cards. [Skotlex] - status->set_sc( NPC_PETRIFYATTACK , SC_STONE , SI_BLANK , SCB_DEF_ELE|SCB_DEF|SCB_MDEF ); - status->set_sc( NPC_WIDEFREEZE , SC_FREEZE , SI_BLANK , SCB_DEF_ELE|SCB_DEF|SCB_MDEF ); - status->set_sc( NPC_STUNATTACK , SC_STUN , SI_BLANK , SCB_NONE ); - status->set_sc( NPC_SLEEPATTACK , SC_SLEEP , SI_BLANK , SCB_NONE ); - status->set_sc( NPC_POISON , SC_POISON , SI_BLANK , SCB_DEF2|SCB_REGEN ); - status->set_sc( NPC_CURSEATTACK , SC_CURSE , SI_BLANK , SCB_LUK|SCB_BATK|SCB_WATK|SCB_SPEED ); - status->set_sc( NPC_SILENCEATTACK , SC_SILENCE , SI_BLANK , SCB_NONE ); - status->set_sc( NPC_WIDECONFUSE , SC_CONFUSION , SI_BLANK , SCB_NONE ); - status->set_sc( NPC_BLINDATTACK , SC_BLIND , SI_BLANK , SCB_HIT|SCB_FLEE ); - status->set_sc( NPC_BLEEDING , SC_BLOODING , SI_BLOODING , SCB_REGEN ); - status->set_sc( NPC_POISON , SC_DPOISON , SI_BLANK , SCB_DEF2|SCB_REGEN ); + status->set_sc( NPC_PETRIFYATTACK , SC_STONE , SCB_DEF_ELE|SCB_DEF|SCB_MDEF ); + status->set_sc( NPC_WIDEFREEZE , SC_FREEZE , SCB_DEF_ELE|SCB_DEF|SCB_MDEF ); + status->set_sc( NPC_STUNATTACK , SC_STUN , SCB_NONE ); + status->set_sc( NPC_SLEEPATTACK , SC_SLEEP , SCB_NONE ); + status->set_sc( NPC_POISON , SC_POISON , SCB_DEF2|SCB_REGEN ); + status->set_sc( NPC_CURSEATTACK , SC_CURSE , SCB_LUK|SCB_BATK|SCB_WATK|SCB_SPEED ); + status->set_sc( NPC_SILENCEATTACK , SC_SILENCE , SCB_NONE ); + status->set_sc( NPC_WIDECONFUSE , SC_CONFUSION , SCB_NONE ); + status->set_sc( NPC_BLINDATTACK , SC_BLIND , SCB_HIT|SCB_FLEE ); + status->set_sc( NPC_BLEEDING , SC_BLOODING , SCB_REGEN ); + status->set_sc( NPC_POISON , SC_DPOISON , SCB_DEF2|SCB_REGEN ); //The main status definitions add_sc( SM_BASH , SC_STUN ); - status->set_sc( SM_PROVOKE , SC_PROVOKE , SI_PROVOKE , SCB_DEF|SCB_DEF2|SCB_BATK|SCB_WATK ); + status->set_sc( SM_PROVOKE , SC_PROVOKE , SCB_DEF|SCB_DEF2|SCB_BATK|SCB_WATK ); add_sc( SM_MAGNUM , SC_SUB_WEAPONPROPERTY ); - status->set_sc( SM_ENDURE , SC_ENDURE , SI_ENDURE , SCB_MDEF|SCB_DSPD ); + status->set_sc( SM_ENDURE , SC_ENDURE , SCB_MDEF|SCB_DSPD ); add_sc( MG_SIGHT , SC_SIGHT ); add_sc( MG_SAFETYWALL , SC_SAFETYWALL ); add_sc( MG_FROSTDIVER , SC_FREEZE ); add_sc( MG_STONECURSE , SC_STONE ); add_sc( AL_RUWACH , SC_RUWACH ); add_sc( AL_PNEUMA , SC_PNEUMA ); - status->set_sc( AL_INCAGI , SC_INC_AGI , SI_INC_AGI , SCB_AGI|SCB_SPEED ); - status->set_sc( AL_DECAGI , SC_DEC_AGI , SI_DEC_AGI , SCB_AGI|SCB_SPEED ); - status->set_sc( AL_CRUCIS , SC_CRUCIS , SI_CRUCIS , SCB_DEF ); - status->set_sc( AL_ANGELUS , SC_ANGELUS , SI_ANGELUS , SCB_DEF2 ); - status->set_sc( AL_BLESSING , SC_BLESSING , SI_BLESSING , SCB_STR|SCB_INT|SCB_DEX ); - status->set_sc( AC_CONCENTRATION , SC_CONCENTRATION , SI_CONCENTRATION , SCB_AGI|SCB_DEX ); - status->set_sc( TF_HIDING , SC_HIDING , SI_HIDING , SCB_SPEED ); + status->set_sc( AL_INCAGI , SC_INC_AGI , SCB_AGI|SCB_SPEED ); + status->set_sc( AL_DECAGI , SC_DEC_AGI , SCB_AGI|SCB_SPEED ); + status->set_sc( AL_CRUCIS , SC_CRUCIS , SCB_DEF ); + status->set_sc( AL_ANGELUS , SC_ANGELUS , SCB_DEF2 ); + status->set_sc( AL_BLESSING , SC_BLESSING , SCB_STR|SCB_INT|SCB_DEX ); + status->set_sc( AC_CONCENTRATION , SC_CONCENTRATION , SCB_AGI|SCB_DEX ); + status->set_sc( TF_HIDING , SC_HIDING , SCB_SPEED ); add_sc( TF_POISON , SC_POISON ); - status->set_sc( KN_TWOHANDQUICKEN , SC_TWOHANDQUICKEN , SI_TWOHANDQUICKEN , SCB_ASPD ); + status->set_sc( KN_TWOHANDQUICKEN , SC_TWOHANDQUICKEN , SCB_ASPD ); add_sc( KN_AUTOCOUNTER , SC_AUTOCOUNTER ); - status->set_sc( PR_IMPOSITIO , SC_IMPOSITIO , SI_IMPOSITIO , + status->set_sc( PR_IMPOSITIO , SC_IMPOSITIO , #ifdef RENEWAL SCB_NONE ); #else SCB_WATK ); #endif - status->set_sc( PR_SUFFRAGIUM , SC_SUFFRAGIUM , SI_SUFFRAGIUM , SCB_NONE ); - status->set_sc( PR_ASPERSIO , SC_ASPERSIO , SI_ASPERSIO , SCB_ATK_ELE ); - status->set_sc( PR_BENEDICTIO , SC_BENEDICTIO , SI_BENEDICTIO , SCB_DEF_ELE ); - status->set_sc( PR_SLOWPOISON , SC_SLOWPOISON , SI_SLOWPOISON , SCB_REGEN ); - status->set_sc( PR_KYRIE , SC_KYRIE , SI_KYRIE , SCB_NONE ); - status->set_sc( PR_MAGNIFICAT , SC_MAGNIFICAT , SI_MAGNIFICAT , SCB_REGEN ); - status->set_sc( PR_GLORIA , SC_GLORIA , SI_GLORIA , SCB_LUK ); + status->set_sc( PR_SUFFRAGIUM , SC_SUFFRAGIUM , SCB_NONE ); + status->set_sc( PR_ASPERSIO , SC_ASPERSIO , SCB_ATK_ELE ); + status->set_sc( PR_BENEDICTIO , SC_BENEDICTIO , SCB_DEF_ELE ); + status->set_sc( PR_SLOWPOISON , SC_SLOWPOISON , SCB_REGEN ); + status->set_sc( PR_KYRIE , SC_KYRIE , SCB_NONE ); + status->set_sc( PR_MAGNIFICAT , SC_MAGNIFICAT , SCB_REGEN ); + status->set_sc( PR_GLORIA , SC_GLORIA , SCB_LUK ); add_sc( PR_LEXDIVINA , SC_SILENCE ); - status->set_sc( PR_LEXAETERNA , SC_LEXAETERNA , SI_LEXAETERNA , SCB_NONE ); + status->set_sc( PR_LEXAETERNA , SC_LEXAETERNA , SCB_NONE ); add_sc( WZ_METEOR , SC_STUN ); add_sc( WZ_VERMILION , SC_BLIND ); add_sc( WZ_FROSTNOVA , SC_FREEZE ); add_sc( WZ_STORMGUST , SC_FREEZE ); - status->set_sc( WZ_QUAGMIRE , SC_QUAGMIRE , SI_QUAGMIRE , SCB_AGI|SCB_DEX|SCB_ASPD|SCB_SPEED ); - status->set_sc( BS_ADRENALINE , SC_ADRENALINE , SI_ADRENALINE , SCB_ASPD ); - status->set_sc( BS_WEAPONPERFECT , SC_WEAPONPERFECT , SI_WEAPONPERFECT, SCB_NONE ); - status->set_sc( BS_OVERTHRUST , SC_OVERTHRUST , SI_OVERTHRUST , SCB_NONE ); - status->set_sc( BS_MAXIMIZE , SC_MAXIMIZEPOWER , SI_MAXIMIZE , SCB_REGEN ); + status->set_sc( WZ_QUAGMIRE , SC_QUAGMIRE , SCB_AGI|SCB_DEX|SCB_ASPD|SCB_SPEED ); + status->set_sc( BS_ADRENALINE , SC_ADRENALINE , SCB_ASPD ); + status->set_sc( BS_WEAPONPERFECT , SC_WEAPONPERFECT , SCB_NONE ); + status->set_sc( BS_OVERTHRUST , SC_OVERTHRUST , SCB_NONE ); + status->set_sc( BS_MAXIMIZE , SC_MAXIMIZEPOWER , SCB_REGEN ); add_sc( HT_LANDMINE , SC_STUN ); - status->set_sc( HT_ANKLESNARE , SC_ANKLESNARE , SI_ANKLESNARE , SCB_NONE ); + status->set_sc( HT_ANKLESNARE , SC_ANKLESNARE , SCB_NONE ); add_sc( HT_SANDMAN , SC_SLEEP ); add_sc( HT_FLASHER , SC_BLIND ); add_sc( HT_FREEZINGTRAP , SC_FREEZE ); - status->set_sc( AS_CLOAKING , SC_CLOAKING , SI_CLOAKING , SCB_CRI|SCB_SPEED ); + status->set_sc( AS_CLOAKING , SC_CLOAKING , SCB_CRI|SCB_SPEED ); add_sc( AS_SONICBLOW , SC_STUN ); - status->set_sc( AS_ENCHANTPOISON , SC_ENCHANTPOISON , SI_ENCHANTPOISON, SCB_ATK_ELE ); - status->set_sc( AS_POISONREACT , SC_POISONREACT , SI_POISONREACT , SCB_NONE ); + status->set_sc( AS_ENCHANTPOISON , SC_ENCHANTPOISON , SCB_ATK_ELE ); + status->set_sc( AS_POISONREACT , SC_POISONREACT , SCB_NONE ); add_sc( AS_VENOMDUST , SC_POISON ); add_sc( AS_SPLASHER , SC_SPLASHER ); - status->set_sc( NV_TRICKDEAD , SC_TRICKDEAD , SI_TRICKDEAD , SCB_REGEN ); - status->set_sc( SM_AUTOBERSERK , SC_AUTOBERSERK , SI_AUTOBERSERK , SCB_NONE ); + status->set_sc( NV_TRICKDEAD , SC_TRICKDEAD , SCB_REGEN ); + status->set_sc( SM_AUTOBERSERK , SC_AUTOBERSERK , SCB_NONE ); add_sc( TF_SPRINKLESAND , SC_BLIND ); add_sc( TF_THROWSTONE , SC_STUN ); - status->set_sc( MC_LOUD , SC_SHOUT , SI_SHOUT , SCB_STR ); - status->set_sc( MG_ENERGYCOAT , SC_ENERGYCOAT , SI_ENERGYCOAT , SCB_NONE ); - status->set_sc( NPC_EMOTION , SC_MODECHANGE , SI_BLANK , SCB_MODE ); + status->set_sc( MC_LOUD , SC_SHOUT , SCB_STR ); + status->set_sc( MG_ENERGYCOAT , SC_ENERGYCOAT , SCB_NONE ); + status->set_sc( NPC_EMOTION , SC_MODECHANGE , SCB_MODE ); add_sc( NPC_EMOTION_ON , SC_MODECHANGE ); - status->set_sc( NPC_ATTRICHANGE , SC_ARMOR_PROPERTY , SI_ARMOR_PROPERTY , SCB_DEF_ELE ); + status->set_sc( NPC_ATTRICHANGE , SC_ARMOR_PROPERTY , SCB_DEF_ELE ); add_sc( NPC_CHANGEWATER , SC_ARMOR_PROPERTY ); add_sc( NPC_CHANGEGROUND , SC_ARMOR_PROPERTY ); add_sc( NPC_CHANGEFIRE , SC_ARMOR_PROPERTY ); @@ -265,184 +269,184 @@ static void initChangeTables(void) add_sc( NPC_CURSEATTACK , SC_CURSE ); add_sc( NPC_SLEEPATTACK , SC_SLEEP ); add_sc( NPC_MAGICALATTACK , SC_MAGICALATTACK ); - status->set_sc( NPC_KEEPING , SC_KEEPING , SI_BLANK , SCB_DEF ); + status->set_sc( NPC_KEEPING , SC_KEEPING , SCB_DEF ); add_sc( NPC_DARKBLESSING , SC_COMA ); - status->set_sc( NPC_BARRIER , SC_BARRIER , SI_BLANK , SCB_MDEF|SCB_DEF ); + status->set_sc( NPC_BARRIER , SC_BARRIER , SCB_MDEF|SCB_DEF ); add_sc( NPC_DEFENDER , SC_ARMOR ); add_sc( NPC_LICK , SC_STUN ); - status->set_sc( NPC_HALLUCINATION , SC_ILLUSION , SI_ILLUSION , SCB_NONE ); + status->set_sc( NPC_HALLUCINATION , SC_ILLUSION , SCB_NONE ); add_sc( NPC_REBIRTH , SC_REBIRTH ); add_sc( RG_RAID , SC_STUN ); #ifdef RENEWAL add_sc( RG_RAID , SC_RAID ); add_sc( RG_BACKSTAP , SC_STUN ); #endif - status->set_sc( RG_STRIPWEAPON , SC_NOEQUIPWEAPON , SI_NOEQUIPWEAPON , SCB_WATK ); - status->set_sc( RG_STRIPSHIELD , SC_NOEQUIPSHIELD , SI_NOEQUIPSHIELD , SCB_DEF ); - status->set_sc( RG_STRIPARMOR , SC_NOEQUIPARMOR , SI_NOEQUIPARMOR , SCB_VIT ); - status->set_sc( RG_STRIPHELM , SC_NOEQUIPHELM , SI_NOEQUIPHELM , SCB_INT ); + status->set_sc( RG_STRIPWEAPON , SC_NOEQUIPWEAPON , SCB_WATK ); + status->set_sc( RG_STRIPSHIELD , SC_NOEQUIPSHIELD , SCB_DEF ); + status->set_sc( RG_STRIPARMOR , SC_NOEQUIPARMOR , SCB_VIT ); + status->set_sc( RG_STRIPHELM , SC_NOEQUIPHELM , SCB_INT ); add_sc( AM_ACIDTERROR , SC_BLOODING ); - status->set_sc( AM_CP_WEAPON , SC_PROTECTWEAPON , SI_PROTECTWEAPON , SCB_NONE ); - status->set_sc( AM_CP_SHIELD , SC_PROTECTSHIELD , SI_PROTECTSHIELD , SCB_NONE ); - status->set_sc( AM_CP_ARMOR , SC_PROTECTARMOR , SI_PROTECTARMOR , SCB_NONE ); - status->set_sc( AM_CP_HELM , SC_PROTECTHELM , SI_PROTECTHELM , SCB_NONE ); - status->set_sc( CR_AUTOGUARD , SC_AUTOGUARD , SI_AUTOGUARD , SCB_NONE ); + status->set_sc( AM_CP_WEAPON , SC_PROTECTWEAPON , SCB_NONE ); + status->set_sc( AM_CP_SHIELD , SC_PROTECTSHIELD , SCB_NONE ); + status->set_sc( AM_CP_ARMOR , SC_PROTECTARMOR , SCB_NONE ); + status->set_sc( AM_CP_HELM , SC_PROTECTHELM , SCB_NONE ); + status->set_sc( CR_AUTOGUARD , SC_AUTOGUARD , SCB_NONE ); add_sc( CR_SHIELDCHARGE , SC_STUN ); - status->set_sc( CR_REFLECTSHIELD , SC_REFLECTSHIELD , SI_REFLECTSHIELD , SCB_NONE ); + status->set_sc( CR_REFLECTSHIELD , SC_REFLECTSHIELD , SCB_NONE ); add_sc( CR_HOLYCROSS , SC_BLIND ); add_sc( CR_GRANDCROSS , SC_BLIND ); add_sc( CR_DEVOTION , SC_DEVOTION ); - status->set_sc( CR_PROVIDENCE , SC_PROVIDENCE , SI_PROVIDENCE , SCB_ALL ); - status->set_sc( CR_DEFENDER , SC_DEFENDER , SI_DEFENDER , SCB_SPEED|SCB_ASPD ); - status->set_sc( CR_SPEARQUICKEN , SC_SPEARQUICKEN , SI_SPEARQUICKEN , SCB_ASPD|SCB_CRI|SCB_FLEE ); - status->set_sc( MO_STEELBODY , SC_STEELBODY , SI_STEELBODY , SCB_DEF|SCB_MDEF|SCB_ASPD|SCB_SPEED ); + status->set_sc( CR_PROVIDENCE , SC_PROVIDENCE , SCB_ALL ); + status->set_sc( CR_DEFENDER , SC_DEFENDER , SCB_SPEED|SCB_ASPD ); + status->set_sc( CR_SPEARQUICKEN , SC_SPEARQUICKEN , SCB_ASPD|SCB_CRI|SCB_FLEE ); + status->set_sc( MO_STEELBODY , SC_STEELBODY , SCB_DEF|SCB_MDEF|SCB_ASPD|SCB_SPEED ); add_sc( MO_BLADESTOP , SC_BLADESTOP_WAIT ); add_sc( MO_BLADESTOP , SC_BLADESTOP ); - status->set_sc( MO_EXPLOSIONSPIRITS , SC_EXPLOSIONSPIRITS, SI_EXPLOSIONSPIRITS, SCB_CRI|SCB_REGEN ); - status->set_sc( MO_EXTREMITYFIST , SC_EXTREMITYFIST , SI_BLANK , SCB_REGEN ); + status->set_sc( MO_EXPLOSIONSPIRITS , SC_EXPLOSIONSPIRITS, SCB_CRI|SCB_REGEN ); + status->set_sc( MO_EXTREMITYFIST , SC_EXTREMITYFIST , SCB_REGEN ); #ifdef RENEWAL - status->set_sc( MO_EXTREMITYFIST , SC_EXTREMITYFIST2 , SI_EXTREMITYFIST , SCB_NONE ); + status->set_sc( MO_EXTREMITYFIST , SC_EXTREMITYFIST2 , SCB_NONE ); #endif add_sc( SA_MAGICROD , SC_MAGICROD ); - status->set_sc( SA_AUTOSPELL , SC_AUTOSPELL , SI_AUTOSPELL , SCB_NONE ); - status->set_sc( SA_FLAMELAUNCHER , SC_PROPERTYFIRE , SI_PROPERTYFIRE , SCB_ATK_ELE ); - status->set_sc( SA_FROSTWEAPON , SC_PROPERTYWATER , SI_PROPERTYWATER , SCB_ATK_ELE ); - status->set_sc( SA_LIGHTNINGLOADER , SC_PROPERTYWIND , SI_PROPERTYWIND , SCB_ATK_ELE ); - status->set_sc( SA_SEISMICWEAPON , SC_PROPERTYGROUND , SI_PROPERTYGROUND , SCB_ATK_ELE ); - status->set_sc( SA_VOLCANO , SC_VOLCANO , SI_GROUNDMAGIC , SCB_WATK ); - status->set_sc( SA_DELUGE , SC_DELUGE , SI_GROUNDMAGIC , SCB_MAXHP ); - status->set_sc( SA_VIOLENTGALE , SC_VIOLENTGALE , SI_GROUNDMAGIC , SCB_FLEE ); + status->set_sc( SA_AUTOSPELL , SC_AUTOSPELL , SCB_NONE ); + status->set_sc( SA_FLAMELAUNCHER , SC_PROPERTYFIRE , SCB_ATK_ELE ); + status->set_sc( SA_FROSTWEAPON , SC_PROPERTYWATER , SCB_ATK_ELE ); + status->set_sc( SA_LIGHTNINGLOADER , SC_PROPERTYWIND , SCB_ATK_ELE ); + status->set_sc( SA_SEISMICWEAPON , SC_PROPERTYGROUND , SCB_ATK_ELE ); + status->set_sc( SA_VOLCANO , SC_VOLCANO , SCB_WATK ); + status->set_sc( SA_DELUGE , SC_DELUGE , SCB_MAXHP ); + status->set_sc( SA_VIOLENTGALE , SC_VIOLENTGALE , SCB_FLEE ); add_sc( SA_REVERSEORCISH , SC_ORCISH ); add_sc( SA_COMA , SC_COMA ); - status->set_sc( BD_ENCORE , SC_DANCING , SI_BLANK , SCB_SPEED|SCB_REGEN ); + status->set_sc( BD_ENCORE , SC_DANCING , SCB_SPEED|SCB_REGEN ); add_sc( BD_RICHMANKIM , SC_RICHMANKIM ); - status->set_sc( BD_ETERNALCHAOS , SC_ETERNALCHAOS , SI_BLANK , SCB_DEF2 ); - status->set_sc( BD_DRUMBATTLEFIELD , SC_DRUMBATTLE , SI_BLANK , SCB_WATK|SCB_DEF ); - status->set_sc( BD_RINGNIBELUNGEN , SC_NIBELUNGEN , SI_BLANK , SCB_WATK ); + status->set_sc( BD_ETERNALCHAOS , SC_ETERNALCHAOS , SCB_DEF2 ); + status->set_sc( BD_DRUMBATTLEFIELD , SC_DRUMBATTLE , SCB_WATK|SCB_DEF ); + status->set_sc( BD_RINGNIBELUNGEN , SC_NIBELUNGEN , SCB_WATK ); add_sc( BD_ROKISWEIL , SC_ROKISWEIL ); add_sc( BD_INTOABYSS , SC_INTOABYSS ); - status->set_sc( BD_SIEGFRIED , SC_SIEGFRIED , SI_BLANK , SCB_ALL ); + status->set_sc( BD_SIEGFRIED , SC_SIEGFRIED , SCB_ALL ); add_sc( BA_FROSTJOKER , SC_FREEZE ); - status->set_sc( BA_WHISTLE , SC_WHISTLE , SI_BLANK , SCB_FLEE|SCB_FLEE2 ); - status->set_sc( BA_ASSASSINCROSS , SC_ASSNCROS , SI_BLANK , SCB_ASPD ); + status->set_sc( BA_WHISTLE , SC_WHISTLE , SCB_FLEE|SCB_FLEE2 ); + status->set_sc( BA_ASSASSINCROSS , SC_ASSNCROS , SCB_ASPD ); add_sc( BA_POEMBRAGI , SC_POEMBRAGI ); - status->set_sc( BA_APPLEIDUN , SC_APPLEIDUN , SI_BLANK , SCB_MAXHP ); + status->set_sc( BA_APPLEIDUN , SC_APPLEIDUN , SCB_MAXHP ); add_sc( DC_SCREAM , SC_STUN ); - status->set_sc( DC_HUMMING , SC_HUMMING , SI_BLANK , SCB_HIT ); - status->set_sc( DC_DONTFORGETME , SC_DONTFORGETME , SI_BLANK , SCB_SPEED|SCB_ASPD ); - status->set_sc( DC_FORTUNEKISS , SC_FORTUNE , SI_BLANK , SCB_CRI ); - status->set_sc( DC_SERVICEFORYOU , SC_SERVICEFORYOU , SI_BLANK , SCB_ALL ); + status->set_sc( DC_HUMMING , SC_HUMMING , SCB_HIT ); + status->set_sc( DC_DONTFORGETME , SC_DONTFORGETME , SCB_SPEED|SCB_ASPD ); + status->set_sc( DC_FORTUNEKISS , SC_FORTUNE , SCB_CRI ); + status->set_sc( DC_SERVICEFORYOU , SC_SERVICEFORYOU , SCB_ALL ); add_sc( NPC_DARKCROSS , SC_BLIND ); add_sc( NPC_GRANDDARKNESS , SC_BLIND ); - status->set_sc( NPC_STOP , SC_STOP , SI_STOP , SCB_NONE ); - status->set_sc( NPC_WEAPONBRAKER , SC_BROKENWEAPON , SI_BROKENWEAPON , SCB_NONE ); - status->set_sc( NPC_ARMORBRAKE , SC_BROKENARMOR , SI_BROKENARMOR , SCB_NONE ); - status->set_sc( NPC_CHANGEUNDEAD , SC_PROPERTYUNDEAD , SI_PROPERTYUNDEAD , SCB_DEF_ELE ); - status->set_sc( NPC_POWERUP , SC_INCHITRATE , SI_BLANK , SCB_HIT ); - status->set_sc( NPC_AGIUP , SC_INCFLEERATE , SI_BLANK , SCB_FLEE ); + status->set_sc( NPC_STOP , SC_STOP , SCB_NONE ); + status->set_sc( NPC_WEAPONBRAKER , SC_BROKENWEAPON , SCB_NONE ); + status->set_sc( NPC_ARMORBRAKE , SC_BROKENARMOR , SCB_NONE ); + status->set_sc( NPC_CHANGEUNDEAD , SC_PROPERTYUNDEAD , SCB_DEF_ELE ); + status->set_sc( NPC_POWERUP , SC_INCHITRATE , SCB_HIT ); + status->set_sc( NPC_AGIUP , SC_INCFLEERATE , SCB_FLEE ); add_sc( NPC_INVISIBLE , SC_CLOAKING ); - status->set_sc( LK_AURABLADE , SC_AURABLADE , SI_AURABLADE , SCB_NONE ); - status->set_sc( LK_PARRYING , SC_PARRYING , SI_PARRYING , SCB_NONE ); + status->set_sc( LK_AURABLADE , SC_AURABLADE , SCB_NONE ); + status->set_sc( LK_PARRYING , SC_PARRYING , SCB_NONE ); #ifndef RENEWAL - status->set_sc( LK_CONCENTRATION , SC_LKCONCENTRATION , SI_LKCONCENTRATION , SCB_BATK|SCB_WATK|SCB_HIT|SCB_DEF|SCB_DEF2); + status->set_sc( LK_CONCENTRATION , SC_LKCONCENTRATION , SCB_BATK|SCB_WATK|SCB_HIT|SCB_DEF|SCB_DEF2); #else - status->set_sc( LK_CONCENTRATION , SC_LKCONCENTRATION , SI_LKCONCENTRATION , SCB_HIT|SCB_DEF); + status->set_sc( LK_CONCENTRATION , SC_LKCONCENTRATION , SCB_HIT|SCB_DEF); #endif - status->set_sc( LK_TENSIONRELAX , SC_TENSIONRELAX , SI_TENSIONRELAX , SCB_REGEN ); - status->set_sc( LK_BERSERK , SC_BERSERK , SI_BERSERK , SCB_DEF|SCB_DEF2|SCB_MDEF|SCB_MDEF2|SCB_FLEE|SCB_SPEED|SCB_ASPD|SCB_MAXHP|SCB_REGEN ); - status->set_sc( HP_ASSUMPTIO , SC_ASSUMPTIO , SI_ASSUMPTIO , SCB_NONE ); + status->set_sc( LK_TENSIONRELAX , SC_TENSIONRELAX , SCB_REGEN ); + status->set_sc( LK_BERSERK , SC_BERSERK , SCB_DEF|SCB_DEF2|SCB_MDEF|SCB_MDEF2|SCB_FLEE|SCB_SPEED|SCB_ASPD|SCB_MAXHP|SCB_REGEN ); + status->set_sc( HP_ASSUMPTIO , SC_ASSUMPTIO , SCB_NONE ); add_sc( HP_BASILICA , SC_BASILICA ); - status->set_sc( HW_MAGICPOWER , SC_MAGICPOWER , SI_MAGICPOWER , SCB_MATK ); + status->set_sc( HW_MAGICPOWER , SC_MAGICPOWER , SCB_MATK ); add_sc( PA_SACRIFICE , SC_SACRIFICE ); - status->set_sc( PA_GOSPEL , SC_GOSPEL , SI_BLANK , SCB_SPEED|SCB_ASPD ); + status->set_sc( PA_GOSPEL , SC_GOSPEL , SCB_SPEED|SCB_ASPD ); add_sc( PA_GOSPEL , SC_SCRESIST ); add_sc( CH_TIGERFIST , SC_STOP ); - status->set_sc( ASC_EDP , SC_EDP , SI_EDP , SCB_NONE ); - status->set_sc( SN_SIGHT , SC_TRUESIGHT , SI_TRUESIGHT , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK|SCB_CRI|SCB_HIT ); - status->set_sc( SN_WINDWALK , SC_WINDWALK , SI_WINDWALK , SCB_FLEE|SCB_SPEED ); - status->set_sc( WS_MELTDOWN , SC_MELTDOWN , SI_MELTDOWN , SCB_NONE ); - status->set_sc( WS_CARTBOOST , SC_CARTBOOST , SI_CARTBOOST , SCB_SPEED ); - status->set_sc( ST_CHASEWALK , SC_CHASEWALK , SI_BLANK , SCB_SPEED ); - status->set_sc( ST_REJECTSWORD , SC_SWORDREJECT , SI_SWORDREJECT , SCB_NONE ); + status->set_sc( ASC_EDP , SC_EDP , SCB_NONE ); + status->set_sc( SN_SIGHT , SC_TRUESIGHT , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK|SCB_CRI|SCB_HIT ); + status->set_sc( SN_WINDWALK , SC_WINDWALK , SCB_FLEE|SCB_SPEED ); + status->set_sc( WS_MELTDOWN , SC_MELTDOWN , SCB_NONE ); + status->set_sc( WS_CARTBOOST , SC_CARTBOOST , SCB_SPEED ); + status->set_sc( ST_CHASEWALK , SC_CHASEWALK , SCB_SPEED ); + status->set_sc( ST_REJECTSWORD , SC_SWORDREJECT , SCB_NONE ); add_sc( ST_REJECTSWORD , SC_AUTOCOUNTER ); - status->set_sc( CG_MARIONETTE , SC_MARIONETTE_MASTER , SI_MARIONETTE_MASTER , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); - status->set_sc( CG_MARIONETTE , SC_MARIONETTE , SI_MARIONETTE , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); + status->set_sc( CG_MARIONETTE , SC_MARIONETTE_MASTER , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); + status->set_sc( CG_MARIONETTE , SC_MARIONETTE , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); add_sc( LK_SPIRALPIERCE , SC_STOP ); add_sc( LK_HEADCRUSH , SC_BLOODING ); - status->set_sc( LK_JOINTBEAT , SC_JOINTBEAT , SI_JOINTBEAT , SCB_BATK|SCB_DEF2|SCB_SPEED|SCB_ASPD ); + status->set_sc( LK_JOINTBEAT , SC_JOINTBEAT , SCB_BATK|SCB_DEF2|SCB_SPEED|SCB_ASPD ); add_sc( HW_NAPALMVULCAN , SC_CURSE ); - status->set_sc( PF_MINDBREAKER , SC_MINDBREAKER , SI_BLANK , SCB_MATK|SCB_MDEF2 ); + status->set_sc( PF_MINDBREAKER , SC_MINDBREAKER , SCB_MATK|SCB_MDEF2 ); add_sc( PF_MEMORIZE , SC_MEMORIZE ); add_sc( PF_FOGWALL , SC_FOGWALL ); - status->set_sc( PF_SPIDERWEB , SC_SPIDERWEB , SI_BLANK , SCB_FLEE ); - status->set_sc( WE_BABY , SC_BABY , SI_PROTECTEXP , SCB_NONE ); - status->set_sc( TK_RUN , SC_RUN , SI_RUN , SCB_SPEED|SCB_DSPD ); - status->set_sc( TK_RUN , SC_STRUP , SI_STRUP , SCB_STR ); - status->set_sc( TK_READYSTORM , SC_STORMKICK_READY , SI_STORMKICK_ON , SCB_NONE ); - status->set_sc( TK_READYDOWN , SC_DOWNKICK_READY , SI_DOWNKICK_ON , SCB_NONE ); + status->set_sc( PF_SPIDERWEB , SC_SPIDERWEB , SCB_FLEE ); + status->set_sc( WE_BABY , SC_BABY , SCB_NONE ); + status->set_sc( TK_RUN , SC_RUN , SCB_SPEED|SCB_DSPD ); + status->set_sc( TK_RUN , SC_STRUP , SCB_STR ); + status->set_sc( TK_READYSTORM , SC_STORMKICK_READY , SCB_NONE ); + status->set_sc( TK_READYDOWN , SC_DOWNKICK_READY , SCB_NONE ); add_sc( TK_DOWNKICK , SC_STUN ); - status->set_sc( TK_READYTURN , SC_TURNKICK_READY , SI_TURNKICK_ON , SCB_NONE ); - status->set_sc( TK_READYCOUNTER , SC_COUNTERKICK_READY , SI_COUNTER_ON , SCB_NONE ); - status->set_sc( TK_DODGE , SC_DODGE_READY , SI_DODGE_ON , SCB_NONE ); - status->set_sc( TK_SPTIME , SC_EARTHSCROLL , SI_EARTHSCROLL , SCB_NONE ); + status->set_sc( TK_READYTURN , SC_TURNKICK_READY , SCB_NONE ); + status->set_sc( TK_READYCOUNTER , SC_COUNTERKICK_READY , SCB_NONE ); + status->set_sc( TK_DODGE , SC_DODGE_READY , SCB_NONE ); + status->set_sc( TK_SPTIME , SC_EARTHSCROLL , SCB_NONE ); add_sc( TK_SEVENWIND , SC_TK_SEVENWIND ); - status->set_sc( TK_SEVENWIND , SC_PROPERTYTELEKINESIS , SI_PROPERTYTELEKINESIS , SCB_ATK_ELE ); - status->set_sc( TK_SEVENWIND , SC_PROPERTYDARK , SI_PROPERTYDARK , SCB_ATK_ELE ); - status->set_sc( SG_SUN_WARM , SC_WARM , SI_SG_SUN_WARM , SCB_NONE ); + status->set_sc( TK_SEVENWIND , SC_PROPERTYTELEKINESIS , SCB_ATK_ELE ); + status->set_sc( TK_SEVENWIND , SC_PROPERTYDARK , SCB_ATK_ELE ); + status->set_sc( SG_SUN_WARM , SC_WARM , SCB_NONE ); add_sc( SG_MOON_WARM , SC_WARM ); add_sc( SG_STAR_WARM , SC_WARM ); - status->set_sc( SG_SUN_COMFORT , SC_SUN_COMFORT , SI_SUN_COMFORT , SCB_DEF2 ); - status->set_sc( SG_MOON_COMFORT , SC_MOON_COMFORT , SI_MOON_COMFORT , SCB_FLEE ); - status->set_sc( SG_STAR_COMFORT , SC_STAR_COMFORT , SI_STAR_COMFORT , SCB_ASPD ); + status->set_sc( SG_SUN_COMFORT , SC_SUN_COMFORT , SCB_DEF2 ); + status->set_sc( SG_MOON_COMFORT , SC_MOON_COMFORT , SCB_FLEE ); + status->set_sc( SG_STAR_COMFORT , SC_STAR_COMFORT , SCB_ASPD ); add_sc( SG_FRIEND , SC_SKILLRATE_UP ); - status->set_sc( SG_KNOWLEDGE , SC_KNOWLEDGE , SI_BLANK , SCB_ALL ); - status->set_sc( SG_FUSION , SC_FUSION , SI_BLANK , SCB_SPEED ); - status->set_sc( BS_ADRENALINE2 , SC_ADRENALINE2 , SI_ADRENALINE2 , SCB_ASPD ); - status->set_sc( SL_KAIZEL , SC_KAIZEL , SI_KAIZEL , SCB_NONE ); - status->set_sc( SL_KAAHI , SC_KAAHI , SI_KAAHI , SCB_NONE ); - status->set_sc( SL_KAUPE , SC_KAUPE , SI_KAUPE , SCB_NONE ); - status->set_sc( SL_KAITE , SC_KAITE , SI_KAITE , SCB_NONE ); + status->set_sc( SG_KNOWLEDGE , SC_KNOWLEDGE , SCB_ALL ); + status->set_sc( SG_FUSION , SC_FUSION , SCB_SPEED ); + status->set_sc( BS_ADRENALINE2 , SC_ADRENALINE2 , SCB_ASPD ); + status->set_sc( SL_KAIZEL , SC_KAIZEL , SCB_NONE ); + status->set_sc( SL_KAAHI , SC_KAAHI , SCB_NONE ); + status->set_sc( SL_KAUPE , SC_KAUPE , SCB_NONE ); + status->set_sc( SL_KAITE , SC_KAITE , SCB_NONE ); add_sc( SL_STUN , SC_STUN ); - status->set_sc( SL_SWOO , SC_SWOO , SI_BLANK , SCB_SPEED ); - status->set_sc( SL_SKE , SC_SKE , SI_BLANK , SCB_BATK|SCB_WATK|SCB_DEF|SCB_DEF2 ); - status->set_sc( SL_SKA , SC_SKA , SI_BLANK , SCB_DEF|SCB_MDEF|SCB_ASPD ); - status->set_sc( SL_SMA , SC_SMA_READY , SI_SMA_READY , SCB_NONE ); - status->set_sc( SM_SELFPROVOKE , SC_PROVOKE , SI_PROVOKE , SCB_DEF|SCB_DEF2|SCB_BATK|SCB_WATK ); - status->set_sc( ST_PRESERVE , SC_PRESERVE , SI_PRESERVE , SCB_NONE ); - status->set_sc( PF_DOUBLECASTING , SC_DOUBLECASTING , SI_DOUBLECASTING , SCB_NONE ); - status->set_sc( HW_GRAVITATION , SC_GRAVITATION , SI_BLANK , SCB_ASPD ); + status->set_sc( SL_SWOO , SC_SWOO , SCB_SPEED ); + status->set_sc( SL_SKE , SC_SKE , SCB_BATK|SCB_WATK|SCB_DEF|SCB_DEF2 ); + status->set_sc( SL_SKA , SC_SKA , SCB_DEF|SCB_MDEF|SCB_ASPD ); + status->set_sc( SL_SMA , SC_SMA_READY , SCB_NONE ); + status->set_sc( SM_SELFPROVOKE , SC_PROVOKE , SCB_DEF|SCB_DEF2|SCB_BATK|SCB_WATK ); + status->set_sc( ST_PRESERVE , SC_PRESERVE , SCB_NONE ); + status->set_sc( PF_DOUBLECASTING , SC_DOUBLECASTING , SCB_NONE ); + status->set_sc( HW_GRAVITATION , SC_GRAVITATION , SCB_ASPD ); add_sc( WS_CARTTERMINATION , SC_STUN ); - status->set_sc( WS_OVERTHRUSTMAX , SC_OVERTHRUSTMAX , SI_OVERTHRUSTMAX , SCB_NONE ); - status->set_sc( CG_LONGINGFREEDOM , SC_LONGING , SI_BLANK , SCB_SPEED|SCB_ASPD ); + status->set_sc( WS_OVERTHRUSTMAX , SC_OVERTHRUSTMAX , SCB_NONE ); + status->set_sc( CG_LONGINGFREEDOM , SC_LONGING , SCB_SPEED|SCB_ASPD ); add_sc( CG_HERMODE , SC_HERMODE ); - status->set_sc( CG_TAROTCARD , SC_TAROTCARD , SI_TAROTCARD , SCB_NONE ); - status->set_sc( ITEM_ENCHANTARMS , SC_ENCHANTARMS , SI_BLANK , SCB_ATK_ELE ); - status->set_sc( SL_HIGH , SC_SOULLINK , SI_SOULLINK , SCB_ALL ); - status->set_sc( KN_ONEHAND , SC_ONEHANDQUICKEN , SI_ONEHANDQUICKEN , SCB_ASPD ); - status->set_sc( GS_FLING , SC_FLING , SI_BLANK , SCB_DEF|SCB_DEF2 ); + status->set_sc( CG_TAROTCARD , SC_TAROTCARD , SCB_NONE ); + status->set_sc( ITEM_ENCHANTARMS , SC_ENCHANTARMS , SCB_ATK_ELE ); + status->set_sc( SL_HIGH , SC_SOULLINK , SCB_ALL ); + status->set_sc( KN_ONEHAND , SC_ONEHANDQUICKEN , SCB_ASPD ); + status->set_sc( GS_FLING , SC_FLING , SCB_DEF|SCB_DEF2 ); add_sc( GS_CRACKER , SC_STUN ); add_sc( GS_DISARM , SC_NOEQUIPWEAPON ); add_sc( GS_PIERCINGSHOT , SC_BLOODING ); - status->set_sc( GS_MADNESSCANCEL , SC_GS_MADNESSCANCEL , SI_GS_MADNESSCANCEL , SCB_ASPD + status->set_sc( GS_MADNESSCANCEL , SC_GS_MADNESSCANCEL , SCB_ASPD #ifndef RENEWAL |SCB_BATK ); #else ); #endif - status->set_sc( GS_ADJUSTMENT , SC_GS_ADJUSTMENT , SI_GS_ADJUSTMENT , SCB_HIT|SCB_FLEE ); - status->set_sc( GS_INCREASING , SC_GS_ACCURACY , SI_GS_ACCURACY , SCB_AGI|SCB_DEX|SCB_HIT ); - status->set_sc( GS_GATLINGFEVER , SC_GS_GATLINGFEVER , SI_GS_GATLINGFEVER , SCB_FLEE|SCB_SPEED|SCB_ASPD + status->set_sc( GS_ADJUSTMENT , SC_GS_ADJUSTMENT , SCB_HIT|SCB_FLEE ); + status->set_sc( GS_INCREASING , SC_GS_ACCURACY , SCB_AGI|SCB_DEX|SCB_HIT ); + status->set_sc( GS_GATLINGFEVER , SC_GS_GATLINGFEVER , SCB_FLEE|SCB_SPEED|SCB_ASPD #ifndef RENEWAL |SCB_BATK ); #else ); #endif - status->set_sc( NJ_TATAMIGAESHI , SC_NJ_TATAMIGAESHI , SI_BLANK , SCB_NONE ); - status->set_sc( NJ_SUITON , SC_NJ_SUITON , SI_NJ_SUITON , SCB_AGI|SCB_SPEED ); + status->set_sc( NJ_TATAMIGAESHI , SC_NJ_TATAMIGAESHI , SCB_NONE ); + status->set_sc( NJ_SUITON , SC_NJ_SUITON , SCB_AGI|SCB_SPEED ); add_sc( NJ_HYOUSYOURAKU , SC_FREEZE ); - status->set_sc( NJ_NEN , SC_NJ_NEN , SI_NJ_NEN , SCB_STR|SCB_INT ); - status->set_sc( NJ_UTSUSEMI , SC_NJ_UTSUSEMI , SI_NJ_UTSUSEMI , SCB_NONE ); - status->set_sc( NJ_BUNSINJYUTSU , SC_NJ_BUNSINJYUTSU , SI_NJ_BUNSINJYUTSU , SCB_DYE ); + status->set_sc( NJ_NEN , SC_NJ_NEN , SCB_STR|SCB_INT ); + status->set_sc( NJ_UTSUSEMI , SC_NJ_UTSUSEMI , SCB_NONE ); + status->set_sc( NJ_BUNSINJYUTSU , SC_NJ_BUNSINJYUTSU , SCB_DYE ); add_sc( NPC_ICEBREATH , SC_FREEZE ); add_sc( NPC_ACIDBREATH , SC_POISON ); @@ -456,202 +460,202 @@ static void initChangeTables(void) add_sc( NPC_WIDESIGHT , SC_SIGHT ); add_sc( NPC_EVILLAND , SC_BLIND ); add_sc( NPC_MAGICMIRROR , SC_MAGICMIRROR ); - status->set_sc( NPC_SLOWCAST , SC_SLOWCAST , SI_SLOWCAST , SCB_NONE ); - status->set_sc( NPC_CRITICALWOUND , SC_CRITICALWOUND , SI_CRITICALWOUND , SCB_NONE ); - status->set_sc( NPC_STONESKIN , SC_STONESKIN , SI_BLANK , SCB_DEF|SCB_MDEF ); + status->set_sc( NPC_SLOWCAST , SC_SLOWCAST , SCB_NONE ); + status->set_sc( NPC_CRITICALWOUND , SC_CRITICALWOUND , SCB_NONE ); + status->set_sc( NPC_STONESKIN , SC_STONESKIN , SCB_DEF|SCB_MDEF ); add_sc( NPC_ANTIMAGIC , SC_STONESKIN ); add_sc( NPC_WIDECURSE , SC_CURSE ); add_sc( NPC_WIDESTUN , SC_STUN ); - status->set_sc( NPC_HELLPOWER , SC_HELLPOWER , SI_HELLPOWER , SCB_NONE ); - status->set_sc( NPC_WIDEHELLDIGNITY , SC_HELLPOWER , SI_HELLPOWER , SCB_NONE ); - status->set_sc( NPC_INVINCIBLE , SC_INVINCIBLE , SI_INVINCIBLE , SCB_SPEED ); - status->set_sc( NPC_INVINCIBLEOFF , SC_INVINCIBLEOFF , SI_BLANK , SCB_SPEED ); + status->set_sc( NPC_HELLPOWER , SC_HELLPOWER , SCB_NONE ); + status->set_sc( NPC_WIDEHELLDIGNITY , SC_HELLPOWER , SCB_NONE ); + status->set_sc( NPC_INVINCIBLE , SC_INVINCIBLE , SCB_SPEED ); + status->set_sc( NPC_INVINCIBLEOFF , SC_INVINCIBLEOFF , SCB_SPEED ); - status->set_sc( CASH_BLESSING , SC_BLESSING , SI_BLESSING , SCB_STR|SCB_INT|SCB_DEX ); - status->set_sc( CASH_INCAGI , SC_INC_AGI , SI_INC_AGI , SCB_AGI|SCB_SPEED ); - status->set_sc( CASH_ASSUMPTIO , SC_ASSUMPTIO , SI_ASSUMPTIO , SCB_NONE ); + status->set_sc( CASH_BLESSING , SC_BLESSING , SCB_STR|SCB_INT|SCB_DEX ); + status->set_sc( CASH_INCAGI , SC_INC_AGI , SCB_AGI|SCB_SPEED ); + status->set_sc( CASH_ASSUMPTIO , SC_ASSUMPTIO , SCB_NONE ); - status->set_sc( ALL_PARTYFLEE , SC_PARTYFLEE , SI_PARTYFLEE , SCB_NONE ); - status->set_sc( ALL_ODINS_POWER , SC_ODINS_POWER , SI_ODINS_POWER , SCB_WATK | SCB_MATK | SCB_MDEF | SCB_DEF); + status->set_sc( ALL_PARTYFLEE , SC_PARTYFLEE , SCB_NONE ); + status->set_sc( ALL_ODINS_POWER , SC_ODINS_POWER , SCB_WATK | SCB_MATK | SCB_MDEF | SCB_DEF); - status->set_sc( CR_SHRINK , SC_CR_SHRINK , SI_CR_SHRINK , SCB_NONE ); - status->set_sc( RG_CLOSECONFINE , SC_RG_CCONFINE_S , SI_RG_CCONFINE_S , SCB_NONE ); - status->set_sc( RG_CLOSECONFINE , SC_RG_CCONFINE_M , SI_RG_CCONFINE_M , SCB_FLEE ); - status->set_sc( WZ_SIGHTBLASTER , SC_WZ_SIGHTBLASTER , SI_WZ_SIGHTBLASTER , SCB_NONE ); - status->set_sc( DC_WINKCHARM , SC_DC_WINKCHARM , SI_DC_WINKCHARM , SCB_NONE ); + status->set_sc( CR_SHRINK , SC_CR_SHRINK , SCB_NONE ); + status->set_sc( RG_CLOSECONFINE , SC_RG_CCONFINE_S , SCB_NONE ); + status->set_sc( RG_CLOSECONFINE , SC_RG_CCONFINE_M , SCB_FLEE ); + status->set_sc( WZ_SIGHTBLASTER , SC_WZ_SIGHTBLASTER , SCB_NONE ); + status->set_sc( DC_WINKCHARM , SC_DC_WINKCHARM , SCB_NONE ); add_sc( MO_BALKYOUNG , SC_STUN ); add_sc( SA_ELEMENTWATER , SC_ARMOR_PROPERTY ); add_sc( SA_ELEMENTFIRE , SC_ARMOR_PROPERTY ); add_sc( SA_ELEMENTGROUND , SC_ARMOR_PROPERTY ); add_sc( SA_ELEMENTWIND , SC_ARMOR_PROPERTY ); - status->set_sc( HLIF_AVOID , SC_HLIF_AVOID , SI_BLANK , SCB_SPEED ); - status->set_sc( HLIF_CHANGE , SC_HLIF_CHANGE , SI_BLANK , SCB_VIT|SCB_INT ); - status->set_sc( HFLI_FLEET , SC_HLIF_FLEET , SI_BLANK , SCB_ASPD|SCB_BATK|SCB_WATK ); - status->set_sc( HFLI_SPEED , SC_HLIF_SPEED , SI_BLANK , SCB_FLEE ); - status->set_sc( HAMI_DEFENCE , SC_HAMI_DEFENCE , SI_BLANK , SCB_DEF ); - status->set_sc( HAMI_BLOODLUST , SC_HAMI_BLOODLUST , SI_BLANK , SCB_BATK|SCB_WATK ); + status->set_sc( HLIF_AVOID , SC_HLIF_AVOID , SCB_SPEED ); + status->set_sc( HLIF_CHANGE , SC_HLIF_CHANGE , SCB_VIT|SCB_INT ); + status->set_sc( HFLI_FLEET , SC_HLIF_FLEET , SCB_ASPD|SCB_BATK|SCB_WATK ); + status->set_sc( HFLI_SPEED , SC_HLIF_SPEED , SCB_FLEE ); + status->set_sc( HAMI_DEFENCE , SC_HAMI_DEFENCE , SCB_DEF ); + status->set_sc( HAMI_BLOODLUST , SC_HAMI_BLOODLUST , SCB_BATK|SCB_WATK ); // Homunculus S - status->set_sc( MH_LIGHT_OF_REGENE , SC_LIGHT_OF_REGENE , SI_LIGHT_OF_REGENE , SCB_NONE ); - status->set_sc( MH_OVERED_BOOST , SC_OVERED_BOOST , SI_OVERED_BOOST , SCB_FLEE|SCB_ASPD|SCB_DEF ); + status->set_sc( MH_LIGHT_OF_REGENE , SC_LIGHT_OF_REGENE , SCB_NONE ); + status->set_sc( MH_OVERED_BOOST , SC_OVERED_BOOST , SCB_FLEE|SCB_ASPD|SCB_DEF ); add_sc(MH_STAHL_HORN, SC_STUN); - status->set_sc(MH_ANGRIFFS_MODUS, SC_ANGRIFFS_MODUS, SI_ANGRIFFS_MODUS, SCB_BATK | SCB_DEF | SCB_FLEE | SCB_MAXHP); - status->set_sc(MH_GOLDENE_FERSE, SC_GOLDENE_FERSE, SI_GOLDENE_FERSE, SCB_ASPD|SCB_MAXHP); + status->set_sc(MH_ANGRIFFS_MODUS, SC_ANGRIFFS_MODUS, SCB_BATK | SCB_DEF | SCB_FLEE | SCB_MAXHP); + status->set_sc(MH_GOLDENE_FERSE, SC_GOLDENE_FERSE, SCB_ASPD|SCB_MAXHP); add_sc( MH_STEINWAND, SC_SAFETYWALL ); - status->set_sc(MH_VOLCANIC_ASH, SC_VOLCANIC_ASH, SI_VOLCANIC_ASH, SCB_DEF|SCB_DEF2|SCB_HIT|SCB_BATK|SCB_FLEE); - status->set_sc(MH_GRANITIC_ARMOR, SC_GRANITIC_ARMOR, SI_GRANITIC_ARMOR, SCB_NONE); - status->set_sc(MH_MAGMA_FLOW, SC_MAGMA_FLOW, SI_MAGMA_FLOW, SCB_NONE); - status->set_sc(MH_PYROCLASTIC, SC_PYROCLASTIC, SI_PYROCLASTIC, SCB_BATK|SCB_ATK_ELE); + status->set_sc(MH_VOLCANIC_ASH, SC_VOLCANIC_ASH, SCB_DEF|SCB_DEF2|SCB_HIT|SCB_BATK|SCB_FLEE); + status->set_sc(MH_GRANITIC_ARMOR, SC_GRANITIC_ARMOR, SCB_NONE); + status->set_sc(MH_MAGMA_FLOW, SC_MAGMA_FLOW, SCB_NONE); + status->set_sc(MH_PYROCLASTIC, SC_PYROCLASTIC, SCB_BATK|SCB_ATK_ELE); add_sc(MH_LAVA_SLIDE, SC_BURNING); - status->set_sc(MH_NEEDLE_OF_PARALYZE, SC_NEEDLE_OF_PARALYZE, SI_NEEDLE_OF_PARALYZE, SCB_DEF2); + status->set_sc(MH_NEEDLE_OF_PARALYZE, SC_NEEDLE_OF_PARALYZE, SCB_DEF2); add_sc(MH_POISON_MIST, SC_BLIND); - status->set_sc(MH_PAIN_KILLER, SC_PAIN_KILLER, SI_PAIN_KILLER, SCB_ASPD); + status->set_sc(MH_PAIN_KILLER, SC_PAIN_KILLER, SCB_ASPD); - status->set_sc( MH_SILENT_BREEZE , SC_SILENCE , SI_SILENT_BREEZE , SCB_NONE ); + status->set_sc( MH_SILENT_BREEZE , SC_SILENCE , SCB_NONE ); add_sc( MH_STYLE_CHANGE , SC_STYLE_CHANGE); - status->set_sc( MH_TINDER_BREAKER , SC_RG_CCONFINE_S , SI_RG_CCONFINE_S , SCB_NONE ); - status->set_sc( MH_TINDER_BREAKER , SC_RG_CCONFINE_M , SI_RG_CCONFINE_M , SCB_FLEE ); + status->set_sc( MH_TINDER_BREAKER , SC_RG_CCONFINE_S , SCB_NONE ); + status->set_sc( MH_TINDER_BREAKER , SC_RG_CCONFINE_M , SCB_FLEE ); add_sc( MER_CRASH , SC_STUN ); - status->set_sc( MER_PROVOKE , SC_PROVOKE , SI_PROVOKE , SCB_DEF|SCB_DEF2|SCB_BATK|SCB_WATK ); + status->set_sc( MER_PROVOKE , SC_PROVOKE , SCB_DEF|SCB_DEF2|SCB_BATK|SCB_WATK ); add_sc( MS_MAGNUM , SC_SUB_WEAPONPROPERTY ); add_sc( MER_SIGHT , SC_SIGHT ); - status->set_sc( MER_DECAGI , SC_DEC_AGI , SI_DEC_AGI , SCB_AGI|SCB_SPEED ); - status->set_sc( MER_MAGNIFICAT , SC_MAGNIFICAT , SI_MAGNIFICAT , SCB_REGEN ); + status->set_sc( MER_DECAGI , SC_DEC_AGI , SCB_AGI|SCB_SPEED ); + status->set_sc( MER_MAGNIFICAT , SC_MAGNIFICAT , SCB_REGEN ); add_sc( MER_LEXDIVINA , SC_SILENCE ); add_sc( MA_LANDMINE , SC_STUN ); add_sc( MA_SANDMAN , SC_SLEEP ); add_sc( MA_FREEZINGTRAP , SC_FREEZE ); - status->set_sc( MER_AUTOBERSERK , SC_AUTOBERSERK , SI_AUTOBERSERK , SCB_NONE ); - status->set_sc( ML_AUTOGUARD , SC_AUTOGUARD , SI_AUTOGUARD , SCB_NONE ); - status->set_sc( MS_REFLECTSHIELD , SC_REFLECTSHIELD , SI_REFLECTSHIELD , SCB_NONE ); - status->set_sc( ML_DEFENDER , SC_DEFENDER , SI_DEFENDER , SCB_SPEED|SCB_ASPD ); - status->set_sc( MS_PARRYING , SC_PARRYING , SI_PARRYING , SCB_NONE ); - status->set_sc( MS_BERSERK , SC_BERSERK , SI_BERSERK , SCB_DEF|SCB_DEF2|SCB_MDEF|SCB_MDEF2|SCB_FLEE|SCB_SPEED|SCB_ASPD|SCB_MAXHP|SCB_REGEN ); + status->set_sc( MER_AUTOBERSERK , SC_AUTOBERSERK , SCB_NONE ); + status->set_sc( ML_AUTOGUARD , SC_AUTOGUARD , SCB_NONE ); + status->set_sc( MS_REFLECTSHIELD , SC_REFLECTSHIELD , SCB_NONE ); + status->set_sc( ML_DEFENDER , SC_DEFENDER , SCB_SPEED|SCB_ASPD ); + status->set_sc( MS_PARRYING , SC_PARRYING , SCB_NONE ); + status->set_sc( MS_BERSERK , SC_BERSERK , SCB_DEF|SCB_DEF2|SCB_MDEF|SCB_MDEF2|SCB_FLEE|SCB_SPEED|SCB_ASPD|SCB_MAXHP|SCB_REGEN ); add_sc( ML_SPIRALPIERCE , SC_STOP ); - status->set_sc( MER_QUICKEN , SC_MER_QUICKEN , SI_BLANK , SCB_ASPD ); + status->set_sc( MER_QUICKEN , SC_MER_QUICKEN , SCB_ASPD ); add_sc( ML_DEVOTION , SC_DEVOTION ); - status->set_sc( MER_KYRIE , SC_KYRIE , SI_KYRIE , SCB_NONE ); - status->set_sc( MER_BLESSING , SC_BLESSING , SI_BLESSING , SCB_STR|SCB_INT|SCB_DEX ); - status->set_sc( MER_INCAGI , SC_INC_AGI , SI_INC_AGI , SCB_AGI|SCB_SPEED ); + status->set_sc( MER_KYRIE , SC_KYRIE , SCB_NONE ); + status->set_sc( MER_BLESSING , SC_BLESSING , SCB_STR|SCB_INT|SCB_DEX ); + status->set_sc( MER_INCAGI , SC_INC_AGI , SCB_AGI|SCB_SPEED ); - status->set_sc( GD_LEADERSHIP , SC_LEADERSHIP , SI_BLANK , SCB_STR ); - status->set_sc( GD_GLORYWOUNDS , SC_GLORYWOUNDS , SI_BLANK , SCB_VIT ); - status->set_sc( GD_SOULCOLD , SC_SOULCOLD , SI_BLANK , SCB_AGI ); - status->set_sc( GD_HAWKEYES , SC_HAWKEYES , SI_BLANK , SCB_DEX ); + status->set_sc( GD_LEADERSHIP , SC_LEADERSHIP , SCB_STR ); + status->set_sc( GD_GLORYWOUNDS , SC_GLORYWOUNDS , SCB_VIT ); + status->set_sc( GD_SOULCOLD , SC_SOULCOLD , SCB_AGI ); + status->set_sc( GD_HAWKEYES , SC_HAWKEYES , SCB_DEX ); - status->set_sc( GD_BATTLEORDER , SC_GDSKILL_BATTLEORDER , SI_BLANK , SCB_STR|SCB_INT|SCB_DEX ); - status->set_sc( GD_REGENERATION , SC_GDSKILL_REGENERATION , SI_BLANK , SCB_REGEN ); + status->set_sc( GD_BATTLEORDER , SC_GDSKILL_BATTLEORDER , SCB_STR|SCB_INT|SCB_DEX ); + status->set_sc( GD_REGENERATION , SC_GDSKILL_REGENERATION , SCB_REGEN ); /** * Rune Knight **/ - status->set_sc( RK_ENCHANTBLADE , SC_ENCHANTBLADE , SI_ENCHANTBLADE , SCB_NONE ); - status->set_sc( RK_DRAGONHOWLING , SC_FEAR , SI_BLANK , SCB_FLEE|SCB_HIT ); - status->set_sc( RK_DEATHBOUND , SC_DEATHBOUND , SI_DEATHBOUND , SCB_NONE ); - status->set_sc( RK_WINDCUTTER , SC_FEAR , SI_BLANK , SCB_FLEE|SCB_HIT ); + status->set_sc( RK_ENCHANTBLADE , SC_ENCHANTBLADE , SCB_NONE ); + status->set_sc( RK_DRAGONHOWLING , SC_FEAR , SCB_FLEE|SCB_HIT ); + status->set_sc( RK_DEATHBOUND , SC_DEATHBOUND , SCB_NONE ); + status->set_sc( RK_WINDCUTTER , SC_FEAR , SCB_FLEE|SCB_HIT ); add_sc( RK_DRAGONBREATH , SC_BURNING ); - status->set_sc( RK_MILLENNIUMSHIELD , SC_MILLENNIUMSHIELD , SI_BLANK , SCB_NONE ); - status->set_sc( RK_REFRESH , SC_REFRESH , SI_REFRESH , SCB_NONE ); - status->set_sc( RK_GIANTGROWTH , SC_GIANTGROWTH , SI_GIANTGROWTH , SCB_STR ); - status->set_sc( RK_STONEHARDSKIN , SC_STONEHARDSKIN , SI_STONEHARDSKIN , SCB_NONE ); - status->set_sc( RK_VITALITYACTIVATION, SC_VITALITYACTIVATION, SI_VITALITYACTIVATION, SCB_REGEN ); - status->set_sc( RK_FIGHTINGSPIRIT , SC_FIGHTINGSPIRIT , SI_FIGHTINGSPIRIT , SCB_WATK|SCB_ASPD ); - status->set_sc( RK_ABUNDANCE , SC_ABUNDANCE , SI_ABUNDANCE , SCB_NONE ); - status->set_sc( RK_CRUSHSTRIKE , SC_CRUSHSTRIKE , SI_CRUSHSTRIKE , SCB_NONE ); + status->set_sc( RK_MILLENNIUMSHIELD , SC_MILLENNIUMSHIELD , SCB_NONE ); + status->set_sc( RK_REFRESH , SC_REFRESH , SCB_NONE ); + status->set_sc( RK_GIANTGROWTH , SC_GIANTGROWTH , SCB_STR ); + status->set_sc( RK_STONEHARDSKIN , SC_STONEHARDSKIN , SCB_NONE ); + status->set_sc( RK_VITALITYACTIVATION, SC_VITALITYACTIVATION, SCB_REGEN ); + status->set_sc( RK_FIGHTINGSPIRIT , SC_FIGHTINGSPIRIT , SCB_WATK|SCB_ASPD ); + status->set_sc( RK_ABUNDANCE , SC_ABUNDANCE , SCB_NONE ); + status->set_sc( RK_CRUSHSTRIKE , SC_CRUSHSTRIKE , SCB_NONE ); add_sc( RK_DRAGONBREATH_WATER, SC_FROSTMISTY ); /** * GC Guillotine Cross **/ - set_sc_with_vfx( GC_VENOMIMPRESS , SC_VENOMIMPRESS , SI_VENOMIMPRESS , SCB_NONE ); - status->set_sc( GC_POISONINGWEAPON , SC_POISONINGWEAPON , SI_POISONINGWEAPON , SCB_NONE ); - status->set_sc( GC_WEAPONBLOCKING , SC_WEAPONBLOCKING , SI_WEAPONBLOCKING , SCB_NONE ); - status->set_sc( GC_CLOAKINGEXCEED , SC_CLOAKINGEXCEED , SI_CLOAKINGEXCEED , SCB_SPEED ); - status->set_sc( GC_HALLUCINATIONWALK , SC_HALLUCINATIONWALK, SI_HALLUCINATIONWALK, SCB_FLEE ); - status->set_sc( GC_ROLLINGCUTTER , SC_ROLLINGCUTTER , SI_ROLLINGCUTTER , SCB_NONE ); - set_sc_with_vfx( GC_DARKCROW , SC_DARKCROW , SI_DARKCROW , SCB_NONE ); + set_sc_with_vfx( GC_VENOMIMPRESS , SC_VENOMIMPRESS , SCB_NONE ); + status->set_sc( GC_POISONINGWEAPON , SC_POISONINGWEAPON , SCB_NONE ); + status->set_sc( GC_WEAPONBLOCKING , SC_WEAPONBLOCKING , SCB_NONE ); + status->set_sc( GC_CLOAKINGEXCEED , SC_CLOAKINGEXCEED , SCB_SPEED ); + status->set_sc( GC_HALLUCINATIONWALK , SC_HALLUCINATIONWALK, SCB_FLEE ); + status->set_sc( GC_ROLLINGCUTTER , SC_ROLLINGCUTTER , SCB_NONE ); + set_sc_with_vfx( GC_DARKCROW , SC_DARKCROW , SCB_NONE ); /** * Arch Bishop **/ - status->set_sc( AB_ADORAMUS , SC_ADORAMUS , SI_ADORAMUS , SCB_AGI|SCB_SPEED ); + status->set_sc( AB_ADORAMUS , SC_ADORAMUS , SCB_AGI|SCB_SPEED ); add_sc( AB_CLEMENTIA , SC_BLESSING ); add_sc( AB_CANTO , SC_INC_AGI ); - status->set_sc( AB_EPICLESIS , SC_EPICLESIS , SI_EPICLESIS , SCB_MAXHP ); + status->set_sc( AB_EPICLESIS , SC_EPICLESIS , SCB_MAXHP ); add_sc( AB_PRAEFATIO , SC_KYRIE ); - set_sc_with_vfx( AB_ORATIO , SC_ORATIO , SI_ORATIO , SCB_NONE ); - status->set_sc( AB_LAUDAAGNUS , SC_LAUDAAGNUS , SI_LAUDAAGNUS , SCB_VIT ); - status->set_sc( AB_LAUDARAMUS , SC_LAUDARAMUS , SI_LAUDARAMUS , SCB_LUK ); - status->set_sc( AB_RENOVATIO , SC_RENOVATIO , SI_RENOVATIO , SCB_REGEN ); - status->set_sc( AB_EXPIATIO , SC_EXPIATIO , SI_EXPIATIO , SCB_ATK_ELE ); - status->set_sc( AB_DUPLELIGHT , SC_DUPLELIGHT , SI_DUPLELIGHT , SCB_NONE ); - status->set_sc( AB_SECRAMENT , SC_SECRAMENT , SI_SECRAMENT , SCB_NONE ); - status->set_sc( AB_OFFERTORIUM , SC_OFFERTORIUM , SI_OFFERTORIUM , SCB_NONE ); + set_sc_with_vfx( AB_ORATIO , SC_ORATIO , SCB_NONE ); + status->set_sc( AB_LAUDAAGNUS , SC_LAUDAAGNUS , SCB_VIT ); + status->set_sc( AB_LAUDARAMUS , SC_LAUDARAMUS , SCB_LUK ); + status->set_sc( AB_RENOVATIO , SC_RENOVATIO , SCB_REGEN ); + status->set_sc( AB_EXPIATIO , SC_EXPIATIO , SCB_ATK_ELE ); + status->set_sc( AB_DUPLELIGHT , SC_DUPLELIGHT , SCB_NONE ); + status->set_sc( AB_SECRAMENT , SC_SECRAMENT , SCB_NONE ); + status->set_sc( AB_OFFERTORIUM , SC_OFFERTORIUM , SCB_NONE ); /** * Warlock **/ add_sc( WL_WHITEIMPRISON , SC_WHITEIMPRISON ); - set_sc_with_vfx( WL_FROSTMISTY , SC_FROSTMISTY , SI_FROSTMISTY , SCB_ASPD|SCB_SPEED|SCB_DEF ); - status->set_sc( WL_MARSHOFABYSS , SC_MARSHOFABYSS , SI_MARSHOFABYSS , SCB_SPEED|SCB_FLEE|SCB_AGI|SCB_DEX ); - status->set_sc(WL_RECOGNIZEDSPELL , SC_RECOGNIZEDSPELL , SI_RECOGNIZEDSPELL , SCB_MATK); - status->set_sc( WL_STASIS , SC_STASIS , SI_STASIS , SCB_NONE ); - status->set_sc( WL_TELEKINESIS_INTENSE, SC_TELEKINESIS_INTENSE , SI_TELEKINESIS_INTENSE , SCB_MATK ); + set_sc_with_vfx( WL_FROSTMISTY , SC_FROSTMISTY , SCB_ASPD|SCB_SPEED|SCB_DEF ); + status->set_sc( WL_MARSHOFABYSS , SC_MARSHOFABYSS , SCB_SPEED|SCB_FLEE|SCB_AGI|SCB_DEX ); + status->set_sc(WL_RECOGNIZEDSPELL , SC_RECOGNIZEDSPELL , SCB_MATK); + status->set_sc( WL_STASIS , SC_STASIS , SCB_NONE ); + status->set_sc( WL_TELEKINESIS_INTENSE, SC_TELEKINESIS_INTENSE , SCB_MATK ); /** * Ranger **/ - status->set_sc( RA_FEARBREEZE , SC_FEARBREEZE , SI_FEARBREEZE , SCB_NONE ); - status->set_sc( RA_ELECTRICSHOCKER , SC_ELECTRICSHOCKER , SI_ELECTRICSHOCKER , SCB_NONE ); - status->set_sc( RA_WUGDASH , SC_WUGDASH , SI_WUGDASH , SCB_SPEED ); - status->set_sc( RA_CAMOUFLAGE , SC_CAMOUFLAGE , SI_CAMOUFLAGE , SCB_SPEED ); + status->set_sc( RA_FEARBREEZE , SC_FEARBREEZE , SCB_NONE ); + status->set_sc( RA_ELECTRICSHOCKER , SC_ELECTRICSHOCKER , SCB_NONE ); + status->set_sc( RA_WUGDASH , SC_WUGDASH , SCB_SPEED ); + status->set_sc( RA_CAMOUFLAGE , SC_CAMOUFLAGE , SCB_SPEED ); add_sc( RA_MAGENTATRAP , SC_ARMOR_PROPERTY ); add_sc( RA_COBALTTRAP , SC_ARMOR_PROPERTY ); add_sc( RA_MAIZETRAP , SC_ARMOR_PROPERTY ); add_sc( RA_VERDURETRAP , SC_ARMOR_PROPERTY ); add_sc( RA_FIRINGTRAP , SC_BURNING ); add_sc( RA_ICEBOUNDTRAP , SC_FROSTMISTY ); - status->set_sc( RA_UNLIMIT , SC_UNLIMIT , SI_UNLIMIT , SCB_DEF|SCB_DEF2|SCB_MDEF|SCB_MDEF2 ); + status->set_sc( RA_UNLIMIT , SC_UNLIMIT , SCB_DEF|SCB_DEF2|SCB_MDEF|SCB_MDEF2 ); /** * Mechanic **/ - status->set_sc( NC_ACCELERATION , SC_ACCELERATION , SI_ACCELERATION , SCB_SPEED ); - status->set_sc( NC_HOVERING , SC_HOVERING , SI_HOVERING , SCB_SPEED ); - status->set_sc( NC_SHAPESHIFT , SC_SHAPESHIFT , SI_SHAPESHIFT , SCB_DEF_ELE ); - status->set_sc( NC_INFRAREDSCAN , SC_INFRAREDSCAN , SI_INFRAREDSCAN , SCB_FLEE ); - status->set_sc( NC_ANALYZE , SC_ANALYZE , SI_ANALYZE , SCB_DEF|SCB_DEF2|SCB_MDEF|SCB_MDEF2 ); - status->set_sc( NC_MAGNETICFIELD , SC_MAGNETICFIELD , SI_MAGNETICFIELD , SCB_NONE ); - status->set_sc( NC_NEUTRALBARRIER , SC_NEUTRALBARRIER , SI_NEUTRALBARRIER , SCB_DEF|SCB_MDEF ); - status->set_sc( NC_STEALTHFIELD , SC_STEALTHFIELD , SI_STEALTHFIELD , SCB_NONE ); + status->set_sc( NC_ACCELERATION , SC_ACCELERATION , SCB_SPEED ); + status->set_sc( NC_HOVERING , SC_HOVERING , SCB_SPEED ); + status->set_sc( NC_SHAPESHIFT , SC_SHAPESHIFT , SCB_DEF_ELE ); + status->set_sc( NC_INFRAREDSCAN , SC_INFRAREDSCAN , SCB_FLEE ); + status->set_sc( NC_ANALYZE , SC_ANALYZE , SCB_DEF|SCB_DEF2|SCB_MDEF|SCB_MDEF2 ); + status->set_sc( NC_MAGNETICFIELD , SC_MAGNETICFIELD , SCB_NONE ); + status->set_sc( NC_NEUTRALBARRIER , SC_NEUTRALBARRIER , SCB_DEF|SCB_MDEF ); + status->set_sc( NC_STEALTHFIELD , SC_STEALTHFIELD , SCB_NONE ); /** * Royal Guard **/ - status->set_sc( LG_REFLECTDAMAGE , SC_LG_REFLECTDAMAGE , SI_LG_REFLECTDAMAGE, SCB_NONE ); - status->set_sc( LG_FORCEOFVANGUARD , SC_FORCEOFVANGUARD , SI_FORCEOFVANGUARD , SCB_MAXHP ); - status->set_sc( LG_EXEEDBREAK , SC_EXEEDBREAK , SI_EXEEDBREAK , SCB_NONE ); - status->set_sc( LG_PRESTIGE , SC_PRESTIGE , SI_PRESTIGE , SCB_DEF ); - status->set_sc( LG_BANDING , SC_BANDING , SI_BANDING , SCB_DEF2|SCB_WATK );// Renewal: atk2 & def2 - status->set_sc( LG_PIETY , SC_BENEDICTIO , SI_BENEDICTIO , SCB_DEF_ELE ); - status->set_sc( LG_EARTHDRIVE , SC_EARTHDRIVE , SI_EARTHDRIVE , SCB_DEF|SCB_ASPD ); - status->set_sc( LG_INSPIRATION , SC_INSPIRATION , SI_INSPIRATION , SCB_MAXHP|SCB_WATK|SCB_HIT|SCB_VIT|SCB_AGI|SCB_STR|SCB_DEX|SCB_INT|SCB_LUK); - status->set_sc( LG_KINGS_GRACE , SC_KINGS_GRACE , SI_KINGS_GRACE , SCB_NONE ); + status->set_sc( LG_REFLECTDAMAGE , SC_LG_REFLECTDAMAGE , SCB_NONE ); + status->set_sc( LG_FORCEOFVANGUARD , SC_FORCEOFVANGUARD , SCB_MAXHP ); + status->set_sc( LG_EXEEDBREAK , SC_EXEEDBREAK , SCB_NONE ); + status->set_sc( LG_PRESTIGE , SC_PRESTIGE , SCB_DEF ); + status->set_sc( LG_BANDING , SC_BANDING , SCB_DEF2|SCB_WATK );// Renewal: atk2 & def2 + status->set_sc( LG_PIETY , SC_BENEDICTIO , SCB_DEF_ELE ); + status->set_sc( LG_EARTHDRIVE , SC_EARTHDRIVE , SCB_DEF|SCB_ASPD ); + status->set_sc( LG_INSPIRATION , SC_INSPIRATION , SCB_MAXHP|SCB_WATK|SCB_HIT|SCB_VIT|SCB_AGI|SCB_STR|SCB_DEX|SCB_INT|SCB_LUK); + status->set_sc( LG_KINGS_GRACE , SC_KINGS_GRACE , SCB_NONE ); /** * Shadow Chaser **/ - status->set_sc( SC_REPRODUCE , SC__REPRODUCE , SI_REPRODUCE , SCB_NONE ); - status->set_sc( SC_AUTOSHADOWSPELL , SC__AUTOSHADOWSPELL, SI_AUTOSHADOWSPELL , SCB_NONE ); - status->set_sc( SC_SHADOWFORM , SC__SHADOWFORM , SI_SHADOWFORM , SCB_NONE ); - status->set_sc( SC_BODYPAINT , SC__BODYPAINT , SI_BODYPAINT , SCB_ASPD ); - status->set_sc( SC_INVISIBILITY , SC__INVISIBILITY , SI_INVISIBILITY , SCB_ASPD|SCB_CRI|SCB_ATK_ELE ); - status->set_sc( SC_DEADLYINFECT , SC__DEADLYINFECT , SI_DEADLYINFECT , SCB_NONE ); - status->set_sc( SC_ENERVATION , SC__ENERVATION , SI_ENERVATION , SCB_BATK ); - status->set_sc( SC_GROOMY , SC__GROOMY , SI_GROOMY , SCB_ASPD|SCB_HIT|SCB_SPEED ); - status->set_sc( SC_IGNORANCE , SC__IGNORANCE , SI_IGNORANCE , SCB_NONE ); - status->set_sc( SC_LAZINESS , SC__LAZINESS , SI_LAZINESS , SCB_FLEE ); - status->set_sc( SC_UNLUCKY , SC__UNLUCKY , SI_UNLUCKY , SCB_CRI|SCB_FLEE2 ); - status->set_sc( SC_WEAKNESS , SC__WEAKNESS , SI_WEAKNESS , SCB_FLEE2|SCB_MAXHP ); - status->set_sc( SC_STRIPACCESSARY , SC__STRIPACCESSARY , SI_STRIPACCESSARY , SCB_DEX|SCB_INT|SCB_LUK ); - set_sc_with_vfx( SC_MANHOLE , SC__MANHOLE , SI_MANHOLE , SCB_NONE ); + status->set_sc( SC_REPRODUCE , SC__REPRODUCE , SCB_NONE ); + status->set_sc( SC_AUTOSHADOWSPELL , SC__AUTOSHADOWSPELL, SCB_NONE ); + status->set_sc( SC_SHADOWFORM , SC__SHADOWFORM , SCB_NONE ); + status->set_sc( SC_BODYPAINT , SC__BODYPAINT , SCB_ASPD ); + status->set_sc( SC_INVISIBILITY , SC__INVISIBILITY , SCB_ASPD|SCB_CRI|SCB_ATK_ELE ); + status->set_sc( SC_DEADLYINFECT , SC__DEADLYINFECT , SCB_NONE ); + status->set_sc( SC_ENERVATION , SC__ENERVATION , SCB_BATK ); + status->set_sc( SC_GROOMY , SC__GROOMY , SCB_ASPD|SCB_HIT|SCB_SPEED ); + status->set_sc( SC_IGNORANCE , SC__IGNORANCE , SCB_NONE ); + status->set_sc( SC_LAZINESS , SC__LAZINESS , SCB_FLEE ); + status->set_sc( SC_UNLUCKY , SC__UNLUCKY , SCB_CRI|SCB_FLEE2 ); + status->set_sc( SC_WEAKNESS , SC__WEAKNESS , SCB_FLEE2|SCB_MAXHP ); + status->set_sc( SC_STRIPACCESSARY , SC__STRIPACCESSARY , SCB_DEX|SCB_INT|SCB_LUK ); + set_sc_with_vfx( SC_MANHOLE , SC__MANHOLE , SCB_NONE ); add_sc( SC_CHAOSPANIC , SC__CHAOS ); add_sc( SC_MAELSTROM , SC__MAELSTROM ); add_sc( SC_BLOODYLUST , SC_BERSERK ); @@ -661,131 +665,131 @@ static void initChangeTables(void) **/ add_sc( SR_DRAGONCOMBO , SC_STUN ); add_sc( SR_EARTHSHAKER , SC_STUN ); - status->set_sc( SR_FALLENEMPIRE , SC_FALLENEMPIRE , SI_FALLENEMPIRE , SCB_NONE ); - status->set_sc( SR_CRESCENTELBOW , SC_CRESCENTELBOW , SI_CRESCENTELBOW , SCB_NONE ); - set_sc_with_vfx( SR_CURSEDCIRCLE , SC_CURSEDCIRCLE_TARGET, SI_CURSEDCIRCLE_TARGET , SCB_NONE ); - status->set_sc( SR_LIGHTNINGWALK , SC_LIGHTNINGWALK , SI_LIGHTNINGWALK , SCB_NONE ); - status->set_sc( SR_RAISINGDRAGON , SC_RAISINGDRAGON , SI_RAISINGDRAGON , SCB_REGEN|SCB_MAXHP|SCB_MAXSP ); - status->set_sc( SR_GENTLETOUCH_ENERGYGAIN, SC_GENTLETOUCH_ENERGYGAIN , SI_GENTLETOUCH_ENERGYGAIN, SCB_NONE ); - status->set_sc( SR_GENTLETOUCH_CHANGE , SC_GENTLETOUCH_CHANGE , SI_GENTLETOUCH_CHANGE , SCB_ASPD|SCB_MDEF|SCB_MAXHP ); - status->set_sc( SR_GENTLETOUCH_REVITALIZE, SC_GENTLETOUCH_REVITALIZE , SI_GENTLETOUCH_REVITALIZE, SCB_MAXHP|SCB_DEF2|SCB_REGEN ); - status->set_sc( SR_FLASHCOMBO , SC_FLASHCOMBO , SI_FLASHCOMBO , SCB_WATK ); + status->set_sc( SR_FALLENEMPIRE , SC_FALLENEMPIRE , SCB_NONE ); + status->set_sc( SR_CRESCENTELBOW , SC_CRESCENTELBOW , SCB_NONE ); + set_sc_with_vfx( SR_CURSEDCIRCLE , SC_CURSEDCIRCLE_TARGET, SCB_NONE ); + status->set_sc( SR_LIGHTNINGWALK , SC_LIGHTNINGWALK , SCB_NONE ); + status->set_sc( SR_RAISINGDRAGON , SC_RAISINGDRAGON , SCB_REGEN|SCB_MAXHP|SCB_MAXSP ); + status->set_sc( SR_GENTLETOUCH_ENERGYGAIN, SC_GENTLETOUCH_ENERGYGAIN , SCB_NONE ); + status->set_sc( SR_GENTLETOUCH_CHANGE , SC_GENTLETOUCH_CHANGE , SCB_ASPD|SCB_MDEF|SCB_MAXHP ); + status->set_sc( SR_GENTLETOUCH_REVITALIZE, SC_GENTLETOUCH_REVITALIZE , SCB_MAXHP|SCB_DEF2|SCB_REGEN ); + status->set_sc( SR_FLASHCOMBO , SC_FLASHCOMBO , SCB_WATK ); /** * Wanderer / Minstrel **/ - status->set_sc( WA_SWING_DANCE , SC_SWING , SI_SWINGDANCE , SCB_SPEED|SCB_ASPD ); - status->set_sc( WA_SYMPHONY_OF_LOVER , SC_SYMPHONY_LOVE , SI_SYMPHONYOFLOVERS , SCB_MDEF ); - status->set_sc( WA_MOONLIT_SERENADE , SC_MOONLIT_SERENADE , SI_MOONLITSERENADE , SCB_MATK ); - status->set_sc( MI_RUSH_WINDMILL , SC_RUSH_WINDMILL , SI_RUSHWINDMILL , SCB_WATK ); - status->set_sc( MI_ECHOSONG , SC_ECHOSONG , SI_ECHOSONG , SCB_DEF2 ); - status->set_sc( MI_HARMONIZE , SC_HARMONIZE , SI_HARMONIZE , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); - set_sc_with_vfx(WM_POEMOFNETHERWORLD, SC_NETHERWORLD , SI_NETHERWORLD , SCB_NONE); - set_sc_with_vfx( WM_VOICEOFSIREN , SC_SIREN , SI_SIREN , SCB_NONE ); - set_sc_with_vfx( WM_LULLABY_DEEPSLEEP , SC_DEEP_SLEEP , SI_DEEPSLEEP , SCB_NONE ); - status->set_sc( WM_SIRCLEOFNATURE , SC_SIRCLEOFNATURE , SI_SIRCLEOFNATURE , SCB_NONE ); - status->set_sc( WM_GLOOMYDAY , SC_GLOOMYDAY , SI_GLOOMYDAY , SCB_FLEE|SCB_ASPD ); - status->set_sc( WM_SONG_OF_MANA , SC_SONG_OF_MANA , SI_SONG_OF_MANA , SCB_NONE ); - status->set_sc( WM_DANCE_WITH_WUG , SC_DANCE_WITH_WUG , SI_DANCEWITHWUG , SCB_ASPD ); - status->set_sc( WM_SATURDAY_NIGHT_FEVER , SC_SATURDAY_NIGHT_FEVER , SI_SATURDAYNIGHTFEVER , SCB_BATK|SCB_DEF|SCB_FLEE|SCB_REGEN ); - status->set_sc( WM_LERADS_DEW , SC_LERADS_DEW , SI_LERADSDEW , SCB_MAXHP ); - status->set_sc( WM_MELODYOFSINK , SC_MELODYOFSINK , SI_MELODYOFSINK , SCB_INT ); - status->set_sc( WM_BEYOND_OF_WARCRY , SC_BEYOND_OF_WARCRY , SI_WARCRYOFBEYOND , SCB_STR|SCB_CRI|SCB_MAXHP ); - status->set_sc( WM_UNLIMITED_HUMMING_VOICE, SC_UNLIMITED_HUMMING_VOICE, SI_UNLIMITEDHUMMINGVOICE, SCB_NONE ); - status->set_sc( WM_FRIGG_SONG , SC_FRIGG_SONG , SI_FRIGG_SONG , SCB_MAXHP ); + status->set_sc( WA_SWING_DANCE , SC_SWING , SCB_SPEED|SCB_ASPD ); + status->set_sc( WA_SYMPHONY_OF_LOVER , SC_SYMPHONY_LOVE , SCB_MDEF ); + status->set_sc( WA_MOONLIT_SERENADE , SC_MOONLIT_SERENADE , SCB_MATK ); + status->set_sc( MI_RUSH_WINDMILL , SC_RUSH_WINDMILL , SCB_WATK ); + status->set_sc( MI_ECHOSONG , SC_ECHOSONG , SCB_DEF2 ); + status->set_sc( MI_HARMONIZE , SC_HARMONIZE , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); + set_sc_with_vfx(WM_POEMOFNETHERWORLD, SC_NETHERWORLD , SCB_NONE); + set_sc_with_vfx( WM_VOICEOFSIREN , SC_SIREN , SCB_NONE ); + set_sc_with_vfx( WM_LULLABY_DEEPSLEEP , SC_DEEP_SLEEP , SCB_NONE ); + status->set_sc( WM_SIRCLEOFNATURE , SC_SIRCLEOFNATURE , SCB_NONE ); + status->set_sc( WM_GLOOMYDAY , SC_GLOOMYDAY , SCB_FLEE|SCB_ASPD ); + status->set_sc( WM_SONG_OF_MANA , SC_SONG_OF_MANA , SCB_NONE ); + status->set_sc( WM_DANCE_WITH_WUG , SC_DANCE_WITH_WUG , SCB_ASPD ); + status->set_sc( WM_SATURDAY_NIGHT_FEVER , SC_SATURDAY_NIGHT_FEVER , SCB_BATK|SCB_DEF|SCB_FLEE|SCB_REGEN ); + status->set_sc( WM_LERADS_DEW , SC_LERADS_DEW , SCB_MAXHP ); + status->set_sc( WM_MELODYOFSINK , SC_MELODYOFSINK , SCB_INT ); + status->set_sc( WM_BEYOND_OF_WARCRY , SC_BEYOND_OF_WARCRY , SCB_STR|SCB_CRI|SCB_MAXHP ); + status->set_sc( WM_UNLIMITED_HUMMING_VOICE, SC_UNLIMITED_HUMMING_VOICE, SCB_NONE ); + status->set_sc( WM_FRIGG_SONG , SC_FRIGG_SONG , SCB_MAXHP ); /** * Sorcerer **/ - status->set_sc( SO_FIREWALK , SC_PROPERTYWALK , SI_PROPERTYWALK , SCB_NONE ); - status->set_sc( SO_ELECTRICWALK , SC_PROPERTYWALK , SI_PROPERTYWALK , SCB_NONE ); - status->set_sc( SO_SPELLFIST , SC_SPELLFIST , SI_SPELLFIST , SCB_NONE ); - set_sc_with_vfx( SO_DIAMONDDUST , SC_COLD , SI_COLD , SCB_NONE ); // it does show the snow icon on mobs but doesn't affect it. - status->set_sc( SO_CLOUD_KILL , SC_POISON , SI_CLOUDKILL , SCB_NONE ); - status->set_sc( SO_STRIKING , SC_STRIKING , SI_STRIKING , SCB_WATK|SCB_CRI ); + status->set_sc( SO_FIREWALK , SC_PROPERTYWALK , SCB_NONE ); + status->set_sc( SO_ELECTRICWALK , SC_PROPERTYWALK , SCB_NONE ); + status->set_sc( SO_SPELLFIST , SC_SPELLFIST , SCB_NONE ); + set_sc_with_vfx( SO_DIAMONDDUST , SC_COLD , SCB_NONE ); // it does show the snow icon on mobs but doesn't affect it. + status->set_sc( SO_CLOUD_KILL , SC_POISON , SCB_NONE ); + status->set_sc( SO_STRIKING , SC_STRIKING , SCB_WATK|SCB_CRI ); add_sc( SO_WARMER , SC_WARMER ); // At the moment, no icon on officials - status->set_sc( SO_VACUUM_EXTREME , SC_VACUUM_EXTREME , SI_VACUUM_EXTREME , SCB_NONE ); - status->set_sc( SO_ARRULLO , SC_DEEP_SLEEP , SI_DEEPSLEEP , SCB_NONE ); - status->set_sc( SO_FIRE_INSIGNIA , SC_FIRE_INSIGNIA , SI_FIRE_INSIGNIA , SCB_MATK | SCB_BATK | SCB_WATK | SCB_ATK_ELE | SCB_REGEN ); - status->set_sc( SO_WATER_INSIGNIA , SC_WATER_INSIGNIA , SI_WATER_INSIGNIA , SCB_WATK | SCB_ATK_ELE | SCB_REGEN ); - status->set_sc( SO_WIND_INSIGNIA , SC_WIND_INSIGNIA , SI_WIND_INSIGNIA , SCB_WATK | SCB_ATK_ELE | SCB_REGEN ); - status->set_sc( SO_EARTH_INSIGNIA , SC_EARTH_INSIGNIA , SI_EARTH_INSIGNIA , SCB_MDEF|SCB_DEF|SCB_MAXHP|SCB_MAXSP|SCB_WATK | SCB_ATK_ELE | SCB_REGEN ); + status->set_sc( SO_VACUUM_EXTREME , SC_VACUUM_EXTREME , SCB_NONE ); + status->set_sc( SO_ARRULLO , SC_DEEP_SLEEP , SCB_NONE ); + status->set_sc( SO_FIRE_INSIGNIA , SC_FIRE_INSIGNIA , SCB_MATK | SCB_BATK | SCB_WATK | SCB_ATK_ELE | SCB_REGEN ); + status->set_sc( SO_WATER_INSIGNIA , SC_WATER_INSIGNIA , SCB_WATK | SCB_ATK_ELE | SCB_REGEN ); + status->set_sc( SO_WIND_INSIGNIA , SC_WIND_INSIGNIA , SCB_WATK | SCB_ATK_ELE | SCB_REGEN ); + status->set_sc( SO_EARTH_INSIGNIA , SC_EARTH_INSIGNIA , SCB_MDEF|SCB_DEF|SCB_MAXHP|SCB_MAXSP|SCB_WATK | SCB_ATK_ELE | SCB_REGEN ); add_sc( SO_ELEMENTAL_SHIELD , SC_SAFETYWALL ); /** * Genetic **/ - status->set_sc( GN_CARTBOOST , SC_GN_CARTBOOST, SI_CARTSBOOST , SCB_SPEED ); - status->set_sc( GN_THORNS_TRAP , SC_THORNS_TRAP , SI_THORNTRAP , SCB_NONE ); - set_sc_with_vfx( GN_BLOOD_SUCKER , SC_BLOOD_SUCKER , SI_BLOODSUCKER , SCB_NONE ); - status->set_sc( GN_WALLOFTHORN , SC_STOP , SI_BLANK , SCB_NONE ); - status->set_sc( GN_FIRE_EXPANSION_SMOKE_POWDER, SC_FIRE_EXPANSION_SMOKE_POWDER , SI_FIRE_EXPANSION_SMOKE_POWDER, SCB_NONE ); - status->set_sc( GN_FIRE_EXPANSION_TEAR_GAS , SC_FIRE_EXPANSION_TEAR_GAS , SI_FIRE_EXPANSION_TEAR_GAS , SCB_NONE ); - status->set_sc( GN_MANDRAGORA , SC_MANDRAGORA , SI_MANDRAGORA , SCB_INT ); + status->set_sc( GN_CARTBOOST , SC_GN_CARTBOOST, SCB_SPEED ); + status->set_sc( GN_THORNS_TRAP , SC_THORNS_TRAP , SCB_NONE ); + set_sc_with_vfx( GN_BLOOD_SUCKER , SC_BLOOD_SUCKER , SCB_NONE ); + status->set_sc( GN_WALLOFTHORN , SC_STOP , SCB_NONE ); + status->set_sc( GN_FIRE_EXPANSION_SMOKE_POWDER, SC_FIRE_EXPANSION_SMOKE_POWDER , SCB_NONE ); + status->set_sc( GN_FIRE_EXPANSION_TEAR_GAS , SC_FIRE_EXPANSION_TEAR_GAS , SCB_NONE ); + status->set_sc( GN_MANDRAGORA , SC_MANDRAGORA , SCB_INT ); /** * Summoner */ - status->set_sc(SU_HIDE, SC_SUHIDE, SI_SUHIDE, SCB_SPEED); + status->set_sc(SU_HIDE, SC_SUHIDE, SCB_SPEED); add_sc(SU_SCRATCH, SC_BLOODING); - status->set_sc(SU_STOOP, SC_SU_STOOP, SI_SU_STOOP, SCB_NONE); - status->set_sc(SU_FRESHSHRIMP, SC_FRESHSHRIMP, SI_FRESHSHRIMP, SCB_NONE); + status->set_sc(SU_STOOP, SC_SU_STOOP, SCB_NONE); + status->set_sc(SU_FRESHSHRIMP, SC_FRESHSHRIMP, SCB_NONE); add_sc(SU_SV_STEMSPEAR, SC_BLOODING); - status->set_sc(SU_CN_POWDERING, SC_CATNIPPOWDER, SI_CATNIPPOWDER, SCB_WATK | SCB_SPEED | SCB_REGEN); + status->set_sc(SU_CN_POWDERING, SC_CATNIPPOWDER, SCB_WATK | SCB_SPEED | SCB_REGEN); add_sc(SU_CN_METEOR, SC_CURSE); - set_sc_with_vfx(SU_SV_ROOTTWIST, SC_SV_ROOTTWIST, SI_SV_ROOTTWIST, SCB_NONE); + set_sc_with_vfx(SU_SV_ROOTTWIST, SC_SV_ROOTTWIST, SCB_NONE); add_sc(SU_SCAROFTAROU, SC_STUN ); - status->set_sc(SU_SCAROFTAROU, SC_BITESCAR, SI_BITESCAR, SCB_NONE); - status->set_sc(SU_ARCLOUSEDASH, SC_ARCLOUSEDASH, SI_ARCLOUSEDASH, SCB_AGI | SCB_SPEED); + status->set_sc(SU_SCAROFTAROU, SC_BITESCAR, SCB_NONE); + status->set_sc(SU_ARCLOUSEDASH, SC_ARCLOUSEDASH, SCB_AGI | SCB_SPEED); add_sc(SU_LUNATICCARROTBEAT, SC_STUN); - status->set_sc(SU_TUNAPARTY, SC_TUNAPARTY, SI_TUNAPARTY, SCB_NONE); - status->set_sc(SU_BUNCHOFSHRIMP, SC_SHRIMP, SI_SHRIMP, SCB_BATK | SCB_MATK); + status->set_sc(SU_TUNAPARTY, SC_TUNAPARTY, SCB_NONE); + status->set_sc(SU_BUNCHOFSHRIMP, SC_SHRIMP, SCB_BATK | SCB_MATK); // Elemental Spirit summoner's 'side' status changes. - status->set_sc( EL_CIRCLE_OF_FIRE , SC_CIRCLE_OF_FIRE_OPTION, SI_CIRCLE_OF_FIRE_OPTION, SCB_NONE ); - status->set_sc( EL_FIRE_CLOAK , SC_FIRE_CLOAK_OPTION , SI_FIRE_CLOAK_OPTION , SCB_ALL ); - status->set_sc( EL_WATER_SCREEN , SC_WATER_SCREEN_OPTION , SI_WATER_SCREEN_OPTION , SCB_NONE ); - status->set_sc( EL_WATER_DROP , SC_WATER_DROP_OPTION , SI_WATER_DROP_OPTION , SCB_ALL ); - status->set_sc( EL_WATER_BARRIER , SC_WATER_BARRIER , SI_WATER_BARRIER , SCB_WATK|SCB_FLEE ); - status->set_sc( EL_WIND_STEP , SC_WIND_STEP_OPTION , SI_WIND_STEP_OPTION , SCB_SPEED|SCB_FLEE ); - status->set_sc( EL_WIND_CURTAIN , SC_WIND_CURTAIN_OPTION , SI_WIND_CURTAIN_OPTION , SCB_ALL ); - status->set_sc( EL_ZEPHYR , SC_ZEPHYR , SI_ZEPHYR , SCB_FLEE ); - status->set_sc( EL_SOLID_SKIN , SC_SOLID_SKIN_OPTION , SI_SOLID_SKIN_OPTION , SCB_DEF|SCB_MAXHP ); - status->set_sc( EL_STONE_SHIELD , SC_STONE_SHIELD_OPTION , SI_STONE_SHIELD_OPTION , SCB_ALL ); - status->set_sc( EL_POWER_OF_GAIA , SC_POWER_OF_GAIA , SI_POWER_OF_GAIA , SCB_MAXHP|SCB_DEF|SCB_SPEED ); - status->set_sc( EL_PYROTECHNIC , SC_PYROTECHNIC_OPTION , SI_PYROTECHNIC_OPTION , SCB_WATK ); - status->set_sc( EL_HEATER , SC_HEATER_OPTION , SI_HEATER_OPTION , SCB_WATK ); - status->set_sc( EL_TROPIC , SC_TROPIC_OPTION , SI_TROPIC_OPTION , SCB_WATK ); - status->set_sc( EL_AQUAPLAY , SC_AQUAPLAY_OPTION , SI_AQUAPLAY_OPTION , SCB_MATK ); - status->set_sc( EL_COOLER , SC_COOLER_OPTION , SI_COOLER_OPTION , SCB_MATK ); - status->set_sc( EL_CHILLY_AIR , SC_CHILLY_AIR_OPTION , SI_CHILLY_AIR_OPTION , SCB_MATK ); - status->set_sc( EL_GUST , SC_GUST_OPTION , SI_GUST_OPTION , SCB_ASPD ); - status->set_sc( EL_BLAST , SC_BLAST_OPTION , SI_BLAST_OPTION , SCB_ASPD ); - status->set_sc( EL_WILD_STORM , SC_WILD_STORM_OPTION , SI_WILD_STORM_OPTION , SCB_ASPD ); - status->set_sc( EL_PETROLOGY , SC_PETROLOGY_OPTION , SI_PETROLOGY_OPTION , SCB_MAXHP ); - status->set_sc( EL_CURSED_SOIL , SC_CURSED_SOIL_OPTION , SI_CURSED_SOIL_OPTION , SCB_MAXHP ); - status->set_sc( EL_UPHEAVAL , SC_UPHEAVAL_OPTION , SI_UPHEAVAL_OPTION , SCB_MAXHP ); - status->set_sc( EL_TIDAL_WEAPON , SC_TIDAL_WEAPON_OPTION , SI_TIDAL_WEAPON_OPTION , SCB_ALL ); - status->set_sc( EL_ROCK_CRUSHER , SC_ROCK_CRUSHER , SI_ROCK_CRUSHER , SCB_DEF ); - status->set_sc( EL_ROCK_CRUSHER_ATK, SC_ROCK_CRUSHER_ATK , SI_ROCK_CRUSHER_ATK , SCB_SPEED ); + status->set_sc( EL_CIRCLE_OF_FIRE , SC_CIRCLE_OF_FIRE_OPTION, SCB_NONE ); + status->set_sc( EL_FIRE_CLOAK , SC_FIRE_CLOAK_OPTION , SCB_ALL ); + status->set_sc( EL_WATER_SCREEN , SC_WATER_SCREEN_OPTION , SCB_NONE ); + status->set_sc( EL_WATER_DROP , SC_WATER_DROP_OPTION , SCB_ALL ); + status->set_sc( EL_WATER_BARRIER , SC_WATER_BARRIER , SCB_WATK|SCB_FLEE ); + status->set_sc( EL_WIND_STEP , SC_WIND_STEP_OPTION , SCB_SPEED|SCB_FLEE ); + status->set_sc( EL_WIND_CURTAIN , SC_WIND_CURTAIN_OPTION , SCB_ALL ); + status->set_sc( EL_ZEPHYR , SC_ZEPHYR , SCB_FLEE ); + status->set_sc( EL_SOLID_SKIN , SC_SOLID_SKIN_OPTION , SCB_DEF|SCB_MAXHP ); + status->set_sc( EL_STONE_SHIELD , SC_STONE_SHIELD_OPTION , SCB_ALL ); + status->set_sc( EL_POWER_OF_GAIA , SC_POWER_OF_GAIA , SCB_MAXHP|SCB_DEF|SCB_SPEED ); + status->set_sc( EL_PYROTECHNIC , SC_PYROTECHNIC_OPTION , SCB_WATK ); + status->set_sc( EL_HEATER , SC_HEATER_OPTION , SCB_WATK ); + status->set_sc( EL_TROPIC , SC_TROPIC_OPTION , SCB_WATK ); + status->set_sc( EL_AQUAPLAY , SC_AQUAPLAY_OPTION , SCB_MATK ); + status->set_sc( EL_COOLER , SC_COOLER_OPTION , SCB_MATK ); + status->set_sc( EL_CHILLY_AIR , SC_CHILLY_AIR_OPTION , SCB_MATK ); + status->set_sc( EL_GUST , SC_GUST_OPTION , SCB_ASPD ); + status->set_sc( EL_BLAST , SC_BLAST_OPTION , SCB_ASPD ); + status->set_sc( EL_WILD_STORM , SC_WILD_STORM_OPTION , SCB_ASPD ); + status->set_sc( EL_PETROLOGY , SC_PETROLOGY_OPTION , SCB_MAXHP ); + status->set_sc( EL_CURSED_SOIL , SC_CURSED_SOIL_OPTION , SCB_MAXHP ); + status->set_sc( EL_UPHEAVAL , SC_UPHEAVAL_OPTION , SCB_MAXHP ); + status->set_sc( EL_TIDAL_WEAPON , SC_TIDAL_WEAPON_OPTION , SCB_ALL ); + status->set_sc( EL_ROCK_CRUSHER , SC_ROCK_CRUSHER , SCB_DEF ); + status->set_sc( EL_ROCK_CRUSHER_ATK, SC_ROCK_CRUSHER_ATK , SCB_SPEED ); add_sc( KO_YAMIKUMO , SC_HIDING ); - set_sc_with_vfx( KO_JYUMONJIKIRI , SC_KO_JYUMONJIKIRI , SI_KO_JYUMONJIKIRI , SCB_NONE ); + set_sc_with_vfx( KO_JYUMONJIKIRI , SC_KO_JYUMONJIKIRI , SCB_NONE ); add_sc( KO_MAKIBISHI , SC_STUN ); - status->set_sc( KO_MEIKYOUSISUI , SC_MEIKYOUSISUI , SI_MEIKYOUSISUI , SCB_NONE ); - status->set_sc( KO_KYOUGAKU , SC_KYOUGAKU , SI_KYOUGAKU , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); + status->set_sc( KO_MEIKYOUSISUI , SC_MEIKYOUSISUI , SCB_NONE ); + status->set_sc( KO_KYOUGAKU , SC_KYOUGAKU , SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); add_sc( KO_JYUSATSU , SC_CURSE ); - status->set_sc( KO_ZENKAI , SC_ZENKAI , SI_ZENKAI , SCB_NONE ); - status->set_sc( KO_IZAYOI , SC_IZAYOI , SI_IZAYOI , SCB_MATK ); - status->set_sc( KG_KYOMU , SC_KYOMU , SI_KYOMU , SCB_NONE ); - status->set_sc( KG_KAGEMUSYA , SC_KAGEMUSYA , SI_KAGEMUSYA , SCB_NONE ); - status->set_sc( KG_KAGEHUMI , SC_KG_KAGEHUMI , SI_KG_KAGEHUMI , SCB_NONE ); - status->set_sc( OB_ZANGETSU , SC_ZANGETSU , SI_ZANGETSU , SCB_MATK|SCB_BATK ); - set_sc_with_vfx( OB_AKAITSUKI, SC_AKAITSUKI , SI_AKAITSUKI , SCB_NONE ); - status->set_sc( OB_OBOROGENSOU , SC_GENSOU , SI_GENSOU , SCB_NONE ); + status->set_sc( KO_ZENKAI , SC_ZENKAI , SCB_NONE ); + status->set_sc( KO_IZAYOI , SC_IZAYOI , SCB_MATK ); + status->set_sc( KG_KYOMU , SC_KYOMU , SCB_NONE ); + status->set_sc( KG_KAGEMUSYA , SC_KAGEMUSYA , SCB_NONE ); + status->set_sc( KG_KAGEHUMI , SC_KG_KAGEHUMI , SCB_NONE ); + status->set_sc( OB_ZANGETSU , SC_ZANGETSU , SCB_MATK|SCB_BATK ); + set_sc_with_vfx( OB_AKAITSUKI, SC_AKAITSUKI , SCB_NONE ); + status->set_sc( OB_OBOROGENSOU , SC_GENSOU , SCB_NONE ); - status->set_sc( ALL_FULL_THROTTLE , SC_FULL_THROTTLE , SI_FULL_THROTTLE , SCB_SPEED|SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); + status->set_sc( ALL_FULL_THROTTLE , SC_FULL_THROTTLE , SCB_SPEED|SCB_STR|SCB_AGI|SCB_VIT|SCB_INT|SCB_DEX|SCB_LUK ); add_sc( ALL_REVERSEORCISH , SC_ORCISH ); - status->set_sc( ALL_ANGEL_PROTECT , SC_ANGEL_PROTECT , SI_ANGEL_PROTECT , SCB_REGEN ); + status->set_sc( ALL_ANGEL_PROTECT , SC_ANGEL_PROTECT , SCB_REGEN ); add_sc( NPC_WIDEHEALTHFEAR , SC_FEAR ); add_sc( NPC_WIDEBODYBURNNING , SC_BURNING ); @@ -794,7 +798,7 @@ static void initChangeTables(void) add_sc( NPC_WIDE_DEEP_SLEEP , SC_DEEP_SLEEP ); add_sc( NPC_WIDESIREN , SC_SIREN ); - set_sc_with_vfx( GN_ILLUSIONDOPING , SC_ILLUSIONDOPING , SI_ILLUSIONDOPING , SCB_HIT ); + set_sc_with_vfx( GN_ILLUSIONDOPING , SC_ILLUSIONDOPING , SCB_HIT ); // Storing the target job rather than simply SC_SOULLINK simplifies code later on. status->dbs->Skill2SCTable[SL_ALCHEMIST] = (sc_type)MAPID_ALCHEMIST, @@ -813,220 +817,6 @@ static void initChangeTables(void) status->dbs->Skill2SCTable[SL_HUNTER] = (sc_type)MAPID_HUNTER, status->dbs->Skill2SCTable[SL_SOULLINKER] = (sc_type)MAPID_SOUL_LINKER, - // Status that don't have a skill associated. - status->dbs->IconChangeTable[SC_WEIGHTOVER50] = SI_WEIGHTOVER50; - status->dbs->IconChangeTable[SC_WEIGHTOVER90] = SI_WEIGHTOVER90; - status->dbs->IconChangeTable[SC_ATTHASTE_POTION1] = SI_ATTHASTE_POTION1; - status->dbs->IconChangeTable[SC_ATTHASTE_POTION2] = SI_ATTHASTE_POTION2; - status->dbs->IconChangeTable[SC_ATTHASTE_POTION3] = SI_ATTHASTE_POTION3; - status->dbs->IconChangeTable[SC_MOVHASTE_POTION] = SI_MOVHASTE_POTION; - status->dbs->IconChangeTable[SC_ATTHASTE_INFINITY] = SI_ATTHASTE_INFINITY; - status->dbs->IconChangeTable[SC_MOVHASTE_HORSE] = SI_MOVHASTE_HORSE; - status->dbs->IconChangeTable[SC_MOVHASTE_INFINITY] = SI_MOVHASTE_INFINITY; - status->dbs->IconChangeTable[SC_MOVESLOW_POTION] = SI_MOVESLOW_POTION; - status->dbs->IconChangeTable[SC_CHASEWALK2] = SI_INCSTR; - status->dbs->IconChangeTable[SC_MIRACLE] = SI_SOULLINK; - status->dbs->IconChangeTable[SC_CLAIRVOYANCE] = SI_CLAIRVOYANCE; - status->dbs->IconChangeTable[SC_FOOD_STR] = SI_FOOD_STR; - status->dbs->IconChangeTable[SC_FOOD_AGI] = SI_FOOD_AGI; - status->dbs->IconChangeTable[SC_FOOD_VIT] = SI_FOOD_VIT; - status->dbs->IconChangeTable[SC_FOOD_INT] = SI_FOOD_INT; - status->dbs->IconChangeTable[SC_FOOD_DEX] = SI_FOOD_DEX; - status->dbs->IconChangeTable[SC_FOOD_LUK] = SI_FOOD_LUK; - status->dbs->IconChangeTable[SC_FOOD_BASICAVOIDANCE]= SI_FOOD_BASICAVOIDANCE; - status->dbs->IconChangeTable[SC_FOOD_BASICHIT] = SI_FOOD_BASICHIT; - status->dbs->IconChangeTable[SC_MANU_ATK] = SI_MANU_ATK; - status->dbs->IconChangeTable[SC_MANU_DEF] = SI_MANU_DEF; - status->dbs->IconChangeTable[SC_SPL_ATK] = SI_SPL_ATK; - status->dbs->IconChangeTable[SC_SPL_DEF] = SI_SPL_DEF; - status->dbs->IconChangeTable[SC_MANU_MATK] = SI_MANU_MATK; - status->dbs->IconChangeTable[SC_SPL_MATK] = SI_SPL_MATK; - status->dbs->IconChangeTable[SC_PLUSATTACKPOWER] = SI_PLUSATTACKPOWER; - status->dbs->IconChangeTable[SC_PLUSMAGICPOWER] = SI_PLUSMAGICPOWER; - status->dbs->IconChangeTable[SC_FOOD_CRITICALSUCCESSVALUE] = SI_FOOD_CRITICALSUCCESSVALUE; - status->dbs->IconChangeTable[SC_MORA_BUFF] = SI_MORA_BUFF; - status->dbs->IconChangeTable[SC_BUCHEDENOEL] = SI_BUCHEDENOEL; - status->dbs->IconChangeTable[SC_PHI_DEMON] = SI_PHI_DEMON; - - // Cash Items - status->dbs->IconChangeTable[SC_FOOD_STR_CASH] = SI_FOOD_STR_CASH; - status->dbs->IconChangeTable[SC_FOOD_AGI_CASH] = SI_FOOD_AGI_CASH; - status->dbs->IconChangeTable[SC_FOOD_VIT_CASH] = SI_FOOD_VIT_CASH; - status->dbs->IconChangeTable[SC_FOOD_DEX_CASH] = SI_FOOD_DEX_CASH; - status->dbs->IconChangeTable[SC_FOOD_INT_CASH] = SI_FOOD_INT_CASH; - status->dbs->IconChangeTable[SC_FOOD_LUK_CASH] = SI_FOOD_LUK_CASH; - status->dbs->IconChangeTable[SC_CASH_PLUSEXP] = SI_CASH_PLUSEXP; - status->dbs->IconChangeTable[SC_CASH_RECEIVEITEM] = SI_CASH_RECEIVEITEM; - status->dbs->IconChangeTable[SC_CASH_PLUSONLYJOBEXP] = SI_CASH_PLUSONLYJOBEXP; - status->dbs->IconChangeTable[SC_CASH_DEATHPENALTY] = SI_CASH_DEATHPENALTY; - status->dbs->IconChangeTable[SC_CASH_BOSS_ALARM] = SI_CASH_BOSS_ALARM; - status->dbs->IconChangeTable[SC_PROTECT_DEF] = SI_PROTECT_DEF; - status->dbs->IconChangeTable[SC_PROTECT_MDEF] = SI_PROTECT_MDEF; - status->dbs->IconChangeTable[SC_CRITICALPERCENT] = SI_CRITICALPERCENT; - status->dbs->IconChangeTable[SC_PLUSAVOIDVALUE] = SI_PLUSAVOIDVALUE; - status->dbs->IconChangeTable[SC_HEALPLUS] = SI_HEALPLUS; - status->dbs->IconChangeTable[SC_S_LIFEPOTION] = SI_S_LIFEPOTION; - status->dbs->IconChangeTable[SC_L_LIFEPOTION] = SI_L_LIFEPOTION; - status->dbs->IconChangeTable[SC_ATKER_BLOOD] = SI_ATKER_BLOOD; - status->dbs->IconChangeTable[SC_TARGET_BLOOD] = SI_TARGET_BLOOD; - status->dbs->IconChangeTable[SC_ACARAJE] = SI_ACARAJE; - status->dbs->IconChangeTable[SC_TARGET_ASPD] = SI_TARGET_ASPD; - status->dbs->IconChangeTable[SC_ATKER_ASPD] = SI_ATKER_ASPD; - status->dbs->IconChangeTable[SC_ATKER_MOVESPEED] = SI_ATKER_MOVESPEED; - status->dbs->IconChangeTable[SC_CUP_OF_BOZA] = SI_CUP_OF_BOZA; - status->dbs->IconChangeTable[SC_OVERLAPEXPUP] = SI_OVERLAPEXPUP; - status->dbs->IconChangeTable[SC_GM_BATTLE] = SI_GM_BATTLE; - status->dbs->IconChangeTable[SC_GM_BATTLE2] = SI_GM_BATTLE2; - status->dbs->IconChangeTable[SC_2011RWC] = SI_2011RWC; - status->dbs->IconChangeTable[SC_STR_SCROLL] = SI_STR_SCROLL; - status->dbs->IconChangeTable[SC_INT_SCROLL] = SI_INT_SCROLL; - status->dbs->IconChangeTable[SC_STEAMPACK] = SI_STEAMPACK; - status->dbs->IconChangeTable[SC_MAGIC_CANDY] = SI_MAGIC_CANDY; - status->dbs->IconChangeTable[SC_M_LIFEPOTION] = SI_M_LIFEPOTION; - status->dbs->IconChangeTable[SC_G_LIFEPOTION] = SI_G_LIFEPOTION; - status->dbs->IconChangeTable[SC_MYSTICPOWDER] = SI_MYSTICPOWDER; - - // Eden Crystal Synthesis - status->dbs->IconChangeTable[SC_QUEST_BUFF1] = SI_QUEST_BUFF1; - status->dbs->IconChangeTable[SC_QUEST_BUFF2] = SI_QUEST_BUFF2; - status->dbs->IconChangeTable[SC_QUEST_BUFF3] = SI_QUEST_BUFF3; - - // Geffen Magic Tournament - status->dbs->IconChangeTable[SC_GEFFEN_MAGIC1] = SI_GEFFEN_MAGIC1; - status->dbs->IconChangeTable[SC_GEFFEN_MAGIC2] = SI_GEFFEN_MAGIC2; - status->dbs->IconChangeTable[SC_GEFFEN_MAGIC3] = SI_GEFFEN_MAGIC3; - status->dbs->IconChangeTable[SC_FENRIR_CARD] = SI_FENRIR_CARD; - - // MVP Scrolls - status->dbs->IconChangeTable[SC_MVPCARD_TAOGUNKA] = SI_MVPCARD_TAOGUNKA; - status->dbs->IconChangeTable[SC_MVPCARD_MISTRESS] = SI_MVPCARD_MISTRESS; - status->dbs->IconChangeTable[SC_MVPCARD_ORCHERO] = SI_MVPCARD_ORCHERO; - status->dbs->IconChangeTable[SC_MVPCARD_ORCLORD] = SI_MVPCARD_ORCLORD; - - // Mercenary Bonus Effects - status->dbs->IconChangeTable[SC_MER_FLEE] = SI_MER_FLEE; - status->dbs->IconChangeTable[SC_MER_ATK] = SI_MER_ATK; - status->dbs->IconChangeTable[SC_MER_HP] = SI_MER_HP; - status->dbs->IconChangeTable[SC_MER_SP] = SI_MER_SP; - status->dbs->IconChangeTable[SC_MER_HIT] = SI_MER_HIT; - - // Warlock Spheres - status->dbs->IconChangeTable[SC_SUMMON1] = SI_SPHERE_1; - status->dbs->IconChangeTable[SC_SUMMON2] = SI_SPHERE_2; - status->dbs->IconChangeTable[SC_SUMMON3] = SI_SPHERE_3; - status->dbs->IconChangeTable[SC_SUMMON4] = SI_SPHERE_4; - status->dbs->IconChangeTable[SC_SUMMON5] = SI_SPHERE_5; - - // Warlock Preserved spells - status->dbs->IconChangeTable[SC_SPELLBOOK1] = SI_SPELLBOOK1; - status->dbs->IconChangeTable[SC_SPELLBOOK2] = SI_SPELLBOOK2; - status->dbs->IconChangeTable[SC_SPELLBOOK3] = SI_SPELLBOOK3; - status->dbs->IconChangeTable[SC_SPELLBOOK4] = SI_SPELLBOOK4; - status->dbs->IconChangeTable[SC_SPELLBOOK5] = SI_SPELLBOOK5; - status->dbs->IconChangeTable[SC_SPELLBOOK6] = SI_SPELLBOOK6; - status->dbs->IconChangeTable[SC_SPELLBOOK7] = SI_SPELLBOOK7; - - // Mechanic status icon - status->dbs->IconChangeTable[SC_NEUTRALBARRIER_MASTER] = SI_NEUTRALBARRIER_MASTER; - status->dbs->IconChangeTable[SC_STEALTHFIELD_MASTER] = SI_STEALTHFIELD_MASTER; - status->dbs->IconChangeTable[SC_OVERHEAT] = SI_OVERHEAT; - status->dbs->IconChangeTable[SC_OVERHEAT_LIMITPOINT] = SI_OVERHEAT_LIMITPOINT; - - // Guillotine Cross status icons - status->dbs->IconChangeTable[SC_HALLUCINATIONWALK_POSTDELAY] = SI_HALLUCINATIONWALK_POSTDELAY; - status->dbs->IconChangeTable[SC_TOXIN] = SI_TOXIN; - status->dbs->IconChangeTable[SC_PARALYSE] = SI_PARALYSE; - status->dbs->IconChangeTable[SC_VENOMBLEED] = SI_VENOMBLEED; - status->dbs->IconChangeTable[SC_MAGICMUSHROOM] = SI_MAGICMUSHROOM; - status->dbs->IconChangeTable[SC_DEATHHURT] = SI_DEATHHURT; - status->dbs->IconChangeTable[SC_PYREXIA] = SI_PYREXIA; - status->dbs->IconChangeTable[SC_OBLIVIONCURSE] = SI_OBLIVIONCURSE; - status->dbs->IconChangeTable[SC_LEECHESEND] = SI_LEECHESEND; - - // Royal Guard status icons - status->dbs->IconChangeTable[SC_SHIELDSPELL_DEF] = SI_SHIELDSPELL_DEF; - status->dbs->IconChangeTable[SC_SHIELDSPELL_MDEF] = SI_SHIELDSPELL_MDEF; - status->dbs->IconChangeTable[SC_SHIELDSPELL_REF] = SI_SHIELDSPELL_REF; - status->dbs->IconChangeTable[SC_BANDING_DEFENCE] = SI_BANDING_DEFENCE; - - // Sura status icon - status->dbs->IconChangeTable[SC_CURSEDCIRCLE_ATKER] = SI_CURSEDCIRCLE_ATKER; - - // Genetics Food items / Throwable items status icons - status->dbs->IconChangeTable[SC_SAVAGE_STEAK] = SI_SAVAGE_STEAK; - status->dbs->IconChangeTable[SC_COCKTAIL_WARG_BLOOD] = SI_COCKTAIL_WARG_BLOOD; - status->dbs->IconChangeTable[SC_MINOR_BBQ] = SI_MINOR_BBQ; - status->dbs->IconChangeTable[SC_SIROMA_ICE_TEA] = SI_SIROMA_ICE_TEA; - status->dbs->IconChangeTable[SC_DROCERA_HERB_STEAMED] = SI_DROCERA_HERB_STEAMED; - status->dbs->IconChangeTable[SC_PUTTI_TAILS_NOODLES] = SI_PUTTI_TAILS_NOODLES; - status->dbs->IconChangeTable[SC_BOOST500] |= SI_BOOST500; - status->dbs->IconChangeTable[SC_FULL_SWING_K] |= SI_FULL_SWING_K; - status->dbs->IconChangeTable[SC_MANA_PLUS] |= SI_MANA_PLUS; - status->dbs->IconChangeTable[SC_MUSTLE_M] |= SI_MUSTLE_M; - status->dbs->IconChangeTable[SC_LIFE_FORCE_F] |= SI_LIFE_FORCE_F; - status->dbs->IconChangeTable[SC_EXTRACT_WHITE_POTION_Z] |= SI_EXTRACT_WHITE_POTION_Z; - status->dbs->IconChangeTable[SC_VITATA_500] |= SI_VITATA_500; - status->dbs->IconChangeTable[SC_EXTRACT_SALAMINE_JUICE] |= SI_EXTRACT_SALAMINE_JUICE; - status->dbs->IconChangeTable[SC_STOMACHACHE] = SI_STOMACHACHE; - status->dbs->IconChangeTable[SC_MYSTERIOUS_POWDER] = SI_MYSTERIOUS_POWDER; - status->dbs->IconChangeTable[SC_MELON_BOMB] = SI_MELON_BOMB; - status->dbs->IconChangeTable[SC_BANANA_BOMB] = SI_BANANA_BOMB; - status->dbs->IconChangeTable[SC_BANANA_BOMB_SITDOWN_POSTDELAY] = SI_BANANA_BOMB_SITDOWN_POSTDELAY; - status->dbs->IconChangeTable[SC_PROMOTE_HEALTH_RESERCH] = SI_PROMOTE_HEALTH_RESERCH; - status->dbs->IconChangeTable[SC_ENERGY_DRINK_RESERCH] = SI_ENERGY_DRINK_RESERCH; - - // Elemental Spirit's 'side' status change icons. - status->dbs->IconChangeTable[SC_CIRCLE_OF_FIRE] = SI_CIRCLE_OF_FIRE; - status->dbs->IconChangeTable[SC_FIRE_CLOAK] = SI_FIRE_CLOAK; - status->dbs->IconChangeTable[SC_WATER_SCREEN] = SI_WATER_SCREEN; - status->dbs->IconChangeTable[SC_WATER_DROP] = SI_WATER_DROP; - status->dbs->IconChangeTable[SC_WIND_STEP] = SI_WIND_STEP; - status->dbs->IconChangeTable[SC_WIND_CURTAIN] = SI_WIND_CURTAIN; - status->dbs->IconChangeTable[SC_SOLID_SKIN] = SI_SOLID_SKIN; - status->dbs->IconChangeTable[SC_STONE_SHIELD] = SI_STONE_SHIELD; - status->dbs->IconChangeTable[SC_PYROTECHNIC] = SI_PYROTECHNIC; - status->dbs->IconChangeTable[SC_HEATER] = SI_HEATER; - status->dbs->IconChangeTable[SC_TROPIC] = SI_TROPIC; - status->dbs->IconChangeTable[SC_AQUAPLAY] = SI_AQUAPLAY; - status->dbs->IconChangeTable[SC_COOLER] = SI_COOLER; - status->dbs->IconChangeTable[SC_CHILLY_AIR] = SI_CHILLY_AIR; - status->dbs->IconChangeTable[SC_GUST] = SI_GUST; - status->dbs->IconChangeTable[SC_BLAST] = SI_BLAST; - status->dbs->IconChangeTable[SC_WILD_STORM] = SI_WILD_STORM; - status->dbs->IconChangeTable[SC_PETROLOGY] = SI_PETROLOGY; - status->dbs->IconChangeTable[SC_CURSED_SOIL] = SI_CURSED_SOIL; - status->dbs->IconChangeTable[SC_UPHEAVAL] = SI_UPHEAVAL; - status->dbs->IconChangeTable[SC_PUSH_CART] = SI_ON_PUSH_CART; - status->dbs->IconChangeTable[SC_REBOUND] = SI_REBOUND; - status->dbs->IconChangeTable[SC_ALL_RIDING] = SI_ALL_RIDING; - status->dbs->IconChangeTable[SC_MONSTER_TRANSFORM] = SI_MONSTER_TRANSFORM; - - // Costumes - status->dbs->IconChangeTable[SC_DRESS_UP] = SI_DRESS_UP; - status->dbs->IconChangeTable[SC_MOONSTAR] = SI_MOONSTAR; - status->dbs->IconChangeTable[SC_SUPER_STAR] = SI_SUPER_STAR; - status->dbs->IconChangeTable[SC_STRANGELIGHTS] = SI_STRANGELIGHTS; - status->dbs->IconChangeTable[SC_DECORATION_OF_MUSIC] = SI_DECORATION_OF_MUSIC; - status->dbs->IconChangeTable[SC_LJOSALFAR] = SI_LJOSALFAR; - status->dbs->IconChangeTable[SC_MERMAID_LONGING] = SI_MERMAID_LONGING; - status->dbs->IconChangeTable[SC_HAT_EFFECT] = SI_HAT_EFFECT; - status->dbs->IconChangeTable[SC_FLOWERSMOKE] = SI_FLOWERSMOKE; - status->dbs->IconChangeTable[SC_FSTONE] = SI_FSTONE; - status->dbs->IconChangeTable[SC_HAPPINESS_STAR] = SI_HAPPINESS_STAR; - status->dbs->IconChangeTable[SC_MAPLE_FALLS] = SI_MAPLE_FALLS; - status->dbs->IconChangeTable[SC_TIME_ACCESSORY] = SI_TIME_ACCESSORY; - status->dbs->IconChangeTable[SC_MAGICAL_FEATHER] = SI_MAGICAL_FEATHER; - status->dbs->IconChangeTable[SC_BLOSSOM_FLUTTERING] = SI_BLOSSOM_FLUTTERING; - - // Summoner - status->dbs->IconChangeTable[SC_SPRITEMABLE] = SI_SPRITEMABLE; - - // Clan System - status->dbs->IconChangeTable[SC_CLAN_INFO] = SI_CLAN_INFO; - - // RoDEX - status->dbs->IconChangeTable[SC_DAILYSENDMAILCNT] = SI_DAILYSENDMAILCNT; - // Other SC which are not necessarily associated to skills. status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION1] |= SCB_ASPD; status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION2] |= SCB_ASPD; @@ -1206,8 +996,6 @@ static void initChangeTables(void) status->dbs->ChangeFlagTable[SC_MAGICAL_FEATHER] |= SCB_NONE; status->dbs->ChangeFlagTable[SC_BLOSSOM_FLUTTERING] |= SCB_NONE; - if( !battle_config.display_hallucination ) //Disable Hallucination. - status->dbs->IconChangeTable[SC_ILLUSION] = SI_BLANK; #undef add_sc #undef set_sc_with_vfx } @@ -2483,7 +2271,7 @@ static int status_calc_pc_(struct map_session_data *sd, enum e_status_calc_opt o memset(ZEROED_BLOCK_POS(&(sd->left_weapon)), 0, ZEROED_BLOCK_SIZE(&(sd->left_weapon))); if (sd->special_state.intravision && !sd->sc.data[SC_CLAIRVOYANCE]) //Clear intravision as long as nothing else is using it - clif->sc_end(&sd->bl,sd->bl.id,SELF,SI_CLAIRVOYANCE); + clif->sc_end(&sd->bl, sd->bl.id, SELF, status->get_sc_icon(SC_CLAIRVOYANCE)); memset(&sd->special_state,0,sizeof(sd->special_state)); @@ -8178,7 +7966,7 @@ static int status_change_start_sub(struct block_list *src, struct block_list *bl //val3 : Brings the skill_lv (merged into val1 here) //val4 : Partner if (val1 == CG_MOONLIT) - clif->status_change(bl,SI_MOON,1,total_tick,0, 0, 0); + clif->status_change(bl, status->get_sc_icon(SC_MOON), status->get_sc_relevant_bl_types(SC_MOON), 1, total_tick, 0, 0, 0); val1|= (val3<<16); val3 = total_tick/1000; //Tick duration tick_time = 1000; // [GodLesZ] tick time @@ -8849,7 +8637,12 @@ static int status_change_start_sub(struct block_list *src, struct block_list *bl val2 = 10*val1; //% of life to be revived with break; case SC_ARMORPROPERTY: - clif->status_change(bl, (val1 > 0 ? SI_RESIST_PROPERTY_WATER : (val2 > 0 ? SI_RESIST_PROPERTY_GROUND : (val3 > 0 ? SI_RESIST_PROPERTY_FIRE : (val4 > 0 ? SI_RESIST_PROPERTY_WIND : SI_BLANK)))), 1, total_tick, 0, 0, 0); + { + int ele = (val1 > 0 ? SC_RESIST_PROPERTY_WATER : + (val2 > 0 ? SC_RESIST_PROPERTY_GROUND : + (val3 > 0 ? SC_RESIST_PROPERTY_FIRE : + (val4 > 0 ? SC_RESIST_PROPERTY_WIND : SI_BLANK)))); + clif->status_change(bl, status->get_sc_icon(ele), status->get_sc_relevant_bl_types(ele), 1, total_tick, 0, 0, 0); break; // case SC_ARMOR_RESIST: // Mod your resistance against elements: @@ -8859,7 +8652,7 @@ static int status_change_start_sub(struct block_list *src, struct block_list *bl //Place here SCs that have no SCB_* data, no skill associated, no ICON //associated, and yet are not wrong/unknown. [Skotlex] //break; - + } case SC_MER_FLEE: case SC_MER_ATK: case SC_MER_HIT: @@ -9674,7 +9467,7 @@ static int status_change_start_sub(struct block_list *src, struct block_list *bl if (!(flag & SCFLAG_LOADED)) tick = total_tick; // When starting a new SC (not loading), its remaining duration is the same as the total if(!(flag & SCFLAG_NOICON) && !(flag & SCFLAG_LOADED && status->dbs->DisplayType[type])) - clif->status_change_sub(bl, status->dbs->IconChangeTable[type], 1, tick, total_tick, (val_flag & 1) ? val1 : 1, (val_flag & 2) ? val2 : 0, (val_flag & 4) ? val3 : 0); + clif->status_change_sub(bl, status->get_sc_icon(type), status->get_sc_relevant_bl_types(type), 1, tick, total_tick, (val_flag & 1) ? val1 : 1, (val_flag & 2) ? val2 : 0, (val_flag & 4) ? val3 : 0); /** * used as temporary storage for scs with interval ticks, so that the actual duration is sent to the client first. @@ -9807,7 +9600,7 @@ static int status_change_start_sub(struct block_list *src, struct block_list *bl static bool status_change_start_unknown_sc(struct block_list *src, struct block_list *bl, enum sc_type type, int calc_flag, int rate, int val1, int val2, int val3, int val4, int total_tick, int flag) { Assert_retr(false, type >= SC_NONE && type < SC_MAX); - if (calc_flag == SCB_NONE && status->dbs->SkillChangeTable[type] == 0 && status->dbs->IconChangeTable[type] == 0) { + if (calc_flag == SCB_NONE && status->dbs->SkillChangeTable[type] == 0 && status->get_sc_icon(type) == SI_BLANK) { //Status change with no calc, no icon, and no skill associated...? ShowError("UnknownStatusChange [%d]\n", type); return true; @@ -10975,7 +10768,7 @@ static int status_change_end_(struct block_list *bl, enum sc_type type, int tid, } if ((sce->val1&0xFFFF) == CG_MOONLIT) - clif->sc_end(bl,bl->id,AREA,SI_MOON); + clif->sc_end(bl, bl->id, AREA, status->get_sc_icon(SC_MOON)); status_change_end(bl, SC_LONGING, INVALID_TIMER); } @@ -11472,7 +11265,7 @@ static int status_change_end_(struct block_list *bl, enum sc_type type, int tid, #endif //On Aegis, when turning off a status change, first goes the sc packet, then the option packet. - clif->sc_end(bl,bl->id,AREA,status->dbs->IconChangeTable[type]); + clif->sc_end(bl, bl->id, AREA, status->get_sc_icon(type)); if( opt_flag&8 ) //bugreport:681 clif->changeoption2(bl); @@ -13447,6 +13240,10 @@ static bool status_read_scdb_libconfig(void) ++count; } + // @TODO: find a better way of handling this + if (!battle_config.display_hallucination) //Disable Hallucination. + status->dbs->IconChangeTable[SC_ILLUSION].id = SI_BLANK; + libconfig->destroy(&status_conf); ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filepath); return true; @@ -13473,9 +13270,9 @@ static bool status_read_scdb_libconfig_sub(struct config_setting_t *it, int idx, status->read_scdb_libconfig_sub_flag(fg, status_id, source); if (itemdb->lookup_const(it, "Icon", &i32) && i32 >= 0) - status->dbs->IconChangeTable[status_id] = i32; + status->dbs->IconChangeTable[status_id].id = i32; else - status->dbs->IconChangeTable[status_id] = SI_BLANK; + status->dbs->IconChangeTable[status_id].id = SI_BLANK; return true; } @@ -13629,8 +13426,9 @@ void status_defaults(void) status->skill2sc = status_skill2sc; status->sc2skill = status_sc2skill; status->sc2scb_flag = status_sc2scb_flag; - status->type2relevant_bl_types = status_type2relevant_bl_types; + status->get_sc_relevant_bl_types = status_get_sc_relevant_bl_types; status->get_sc_type = status_get_sc_type; + status->get_sc_icon = status_get_sc_icon; status->damage = status_damage; //Define for standard HP/SP skill-related cost triggers (mobs require no HP/SP to use skills) diff --git a/src/map/status.h b/src/map/status.h index e2280e409..6aaaace03 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -837,6 +837,21 @@ typedef enum sc_type { // Clan System SC_CLAN_INFO, + + SC_SIT, + SC_MOON, + SC_TING, + SC_DEVIL1, + SC_RIDING, + SC_FALCON, + SC_WUGRIDER, + SC_POSTDELAY, + SC_ON_PUSH_CART, + SC_RESIST_PROPERTY_WATER, + SC_RESIST_PROPERTY_GROUND, + SC_RESIST_PROPERTY_FIRE, + SC_RESIST_PROPERTY_WIND, + SC_CLIENT_ONLY_EQUIP_ARROW, #ifndef SC_MAX SC_MAX, //Automatically updated max, used in for's to check we are within bounds. #endif @@ -844,1034 +859,7 @@ typedef enum sc_type { /// Official status change ids, used to display status icons in the client. enum si_type { - SI_BLANK = -1, - - SI_PROVOKE = 0, - SI_ENDURE = 1, - SI_TWOHANDQUICKEN = 2, - SI_CONCENTRATION = 3, - SI_HIDING = 4, - SI_CLOAKING = 5, - SI_ENCHANTPOISON = 6, - SI_POISONREACT = 7, - SI_QUAGMIRE = 8, - SI_ANGELUS = 9, - SI_BLESSING = 10, - SI_CRUCIS = 11, - SI_INC_AGI = 12, - SI_DEC_AGI = 13, - SI_SLOWPOISON = 14, - SI_IMPOSITIO = 15, - SI_SUFFRAGIUM = 16, - SI_ASPERSIO = 17, - SI_BENEDICTIO = 18, - SI_KYRIE = 19, - SI_MAGNIFICAT = 20, - SI_GLORIA = 21, - SI_LEXAETERNA = 22, - SI_ADRENALINE = 23, - SI_WEAPONPERFECT = 24, - SI_OVERTHRUST = 25, - SI_MAXIMIZE = 26, - SI_RIDING = 27, - SI_FALCON = 28, - SI_TRICKDEAD = 29, - SI_SHOUT = 30, - SI_ENERGYCOAT = 31, - SI_BROKENARMOR = 32, - SI_BROKENWEAPON = 33, - SI_ILLUSION = 34, - SI_WEIGHTOVER50 = 35, - SI_WEIGHTOVER90 = 36, - SI_ATTHASTE_POTION1 = 37, - SI_ATTHASTE_POTION2 = 38, - SI_ATTHASTE_POTION3 = 39, - SI_ATTHASTE_INFINITY = 40, - SI_MOVHASTE_POTION = 41, - SI_MOVHASTE_INFINITY = 42, - //SI_AUTOCOUNTER = 43, - //SI_SPLASHER = 44, - SI_ANKLESNARE = 45, - SI_POSTDELAY = 46, - //SI_NOACTION = 47, - //SI_IMPOSSIBLEPICKUP = 48, - //SI_BARRIER = 49, - - SI_NOEQUIPWEAPON = 50, - SI_NOEQUIPSHIELD = 51, - SI_NOEQUIPARMOR = 52, - SI_NOEQUIPHELM = 53, - SI_PROTECTWEAPON = 54, - SI_PROTECTSHIELD = 55, - SI_PROTECTARMOR = 56, - SI_PROTECTHELM = 57, - SI_AUTOGUARD = 58, - SI_REFLECTSHIELD = 59, - //SI_DEVOTION = 60, - SI_PROVIDENCE = 61, - SI_DEFENDER = 62, - //SI_MAGICROD = 63, - //SI_WEAPONPROPERTY = 64, - SI_AUTOSPELL = 65, - //SI_SPECIALZONE = 66, - //SI_MASK = 67, - SI_SPEARQUICKEN = 68, - //SI_BDPLAYING = 69, - //SI_WHISTLE = 70, - //SI_ASSASSINCROSS = 71, - //SI_POEMBRAGI = 72, - //SI_APPLEIDUN = 73, - //SI_HUMMING = 74, - //SI_DONTFORGETME = 75, - //SI_FORTUNEKISS = 76, - //SI_SERVICEFORYOU = 77, - //SI_RICHMANKIM = 78, - //SI_ETERNALCHAOS = 79, - //SI_DRUMBATTLEFIELD = 80, - //SI_RINGNIBELUNGEN = 81, - //SI_ROKISWEIL = 82, - //SI_INTOABYSS = 83, - //SI_SIEGFRIED = 84, - //SI_BLADESTOP = 85, - SI_EXPLOSIONSPIRITS = 86, - SI_STEELBODY = 87, - SI_EXTREMITYFIST = 88, - //SI_COMBOATTACK = 89, - SI_PROPERTYFIRE = 90, - SI_PROPERTYWATER = 91, - SI_PROPERTYWIND = 92, - SI_PROPERTYGROUND = 93, - //SI_MAGICATTACK = 94, - SI_STOP = 95, - //SI_WEAPONBRAKER = 96, - SI_PROPERTYUNDEAD = 97, - //SI_POWERUP = 98, - //SI_AGIUP = 99, - - //SI_SIEGEMODE = 100, - //SI_INVISIBLE = 101, - //SI_STATUSONE = 102, - SI_AURABLADE = 103, - SI_PARRYING = 104, - SI_LKCONCENTRATION = 105, - SI_TENSIONRELAX = 106, - SI_BERSERK = 107, - //SI_SACRIFICE = 108, - //SI_GOSPEL = 109, - SI_ASSUMPTIO = 110, - //SI_BASILICA = 111, - SI_GROUNDMAGIC = 112, - SI_MAGICPOWER = 113, - SI_EDP = 114, - SI_TRUESIGHT = 115, - SI_WINDWALK = 116, - SI_MELTDOWN = 117, - SI_CARTBOOST = 118, - //SI_CHASEWALK = 119, - SI_SWORDREJECT = 120, - SI_MARIONETTE_MASTER = 121, - SI_MARIONETTE = 122, - SI_MOON = 123, - SI_BLOODING = 124, - SI_JOINTBEAT = 125, - //SI_MINDBREAKER = 126, - //SI_MEMORIZE = 127, - //SI_FOGWALL = 128, - //SI_SPIDERWEB = 129, - SI_PROTECTEXP = 130, - //SI_SUB_WEAPONPROPERTY = 131, - SI_AUTOBERSERK = 132, - SI_RUN = 133, - SI_TING = 134, - SI_STORMKICK_ON = 135, - SI_STORMKICK_READY = 136, - SI_DOWNKICK_ON = 137, - SI_DOWNKICK_READY = 138, - SI_TURNKICK_ON = 139, - SI_TURNKICK_READY = 140, - SI_COUNTER_ON = 141, - SI_COUNTER_READY = 142, - SI_DODGE_ON = 143, - SI_DODGE_READY = 144, - SI_STRUP = 145, - SI_PROPERTYDARK = 146, - SI_ADRENALINE2 = 147, - SI_PROPERTYTELEKINESIS = 148, - SI_SOULLINK = 149, - - SI_PLUSATTACKPOWER = 150, - SI_PLUSMAGICPOWER = 151, - SI_DEVIL1 = 152, - SI_KAITE = 153, - //SI_SWOO = 154, - //SI_STAR2 = 155, - SI_KAIZEL = 156, - SI_KAAHI = 157, - SI_KAUPE = 158, - SI_SMA_READY = 159, - SI_SKE = 160, - SI_ONEHANDQUICKEN = 161, - //SI_FRIEND = 162, - //SI_FRIENDUP = 163, - //SI_SG_WARM = 164, - SI_SG_SUN_WARM = 165, - //SI_SG_MOON_WARM = 166, // The three show the exact same display: ultra red character (165, 166, 167) - //SI_SG_STAR_WARM = 167, - //SI_EMOTION = 168, - SI_SUN_COMFORT = 169, - SI_MOON_COMFORT = 170, - SI_STAR_COMFORT = 171, - //SI_EXPUP = 172, - //SI_GDSKILL_BATTLEORDER = 173, - //SI_GDSKILL_REGENERATION = 174, - //SI_GDSKILL_POSTDELAY = 175, - //SI_RESISTHANDICAP = 176, - //SI_MAXHPPERCENT = 177, - //SI_MAXSPPERCENT = 178, - //SI_DEFENCE = 179, - //SI_SLOWDOWN = 180, - SI_PRESERVE = 181, - SI_INCSTR = 182, - //SI_NOT_EXTREMITYFIST = 183, - SI_CLAIRVOYANCE = 184, - SI_MOVESLOW_POTION = 185, - SI_DOUBLECASTING = 186, - //SI_GRAVITATION = 187, - SI_OVERTHRUSTMAX = 188, - //SI_LONGING = 189, - //SI_HERMODE = 190, - SI_TAROTCARD = 191, // the icon allows no doubt... but what is it really used for ?? [DracoRPG] - //SI_HLIF_AVOID = 192, - //SI_HFLI_FLEET = 193, - //SI_HFLI_SPEED = 194, - //SI_HLIF_CHANGE = 195, - //SI_HAMI_BLOODLUST = 196, - SI_CR_SHRINK = 197, - SI_WZ_SIGHTBLASTER = 198, - SI_DC_WINKCHARM = 199, - - SI_RG_CCONFINE_M = 200, - SI_RG_CCONFINE_S = 201, - //SI_DISABLEMOVE = 202, - SI_GS_MADNESSCANCEL = 203, //[blackhole89] - SI_GS_GATLINGFEVER = 204, - SI_EARTHSCROLL = 205, - SI_NJ_UTSUSEMI = 206, - SI_NJ_BUNSINJYUTSU = 207, - SI_NJ_NEN = 208, - SI_GS_ADJUSTMENT = 209, - SI_GS_ACCURACY = 210, - SI_NJ_SUITON = 211, - //SI_PET = 212, - //SI_MENTAL = 213, - //SI_EXPMEMORY = 214, - //SI_PERFORMANCE = 215, - //SI_GAIN = 216, - //SI_GRIFFON = 217, - //SI_DRIFT = 218, - //SI_WALLSHIFT = 219, - //SI_REINCARNATION = 220, - //SI_PATTACK = 221, - //SI_PSPEED = 222, - //SI_PDEFENSE = 223, - //SI_PCRITICAL = 224, - //SI_RANKING = 225, - //SI_PTRIPLE = 226, - //SI_DENERGY = 227, - //SI_WAVE1 = 228, - //SI_WAVE2 = 229, - //SI_WAVE3 = 230, - //SI_WAVE4 = 231, - //SI_DAURA = 232, - //SI_DFREEZER = 233, - //SI_DPUNISH = 234, - //SI_DBARRIER = 235, - //SI_DWARNING = 236, - //SI_MOUSEWHEEL = 237, - //SI_DGAUGE = 238, - //SI_DACCEL = 239, - //SI_DBLOCK = 240, - SI_FOOD_STR = 241, - SI_FOOD_AGI = 242, - SI_FOOD_VIT = 243, - SI_FOOD_DEX = 244, - SI_FOOD_INT = 245, - SI_FOOD_LUK = 246, - SI_FOOD_BASICAVOIDANCE = 247, - SI_FOOD_BASICHIT = 248, - SI_FOOD_CRITICALSUCCESSVALUE = 249, - - SI_CASH_PLUSEXP = 250, - SI_CASH_DEATHPENALTY = 251, - SI_CASH_RECEIVEITEM = 252, - SI_CASH_BOSS_ALARM = 253, - //SI_DA_ENERGY = 254, - //SI_DA_FIRSTSLOT = 255, - //SI_DA_HEADDEF = 256, - //SI_DA_SPACE = 257, - //SI_DA_TRANSFORM = 258, - //SI_DA_ITEMREBUILD = 259, - //SI_DA_ILLUSION = 260, // All mobs display as Turtle General - //SI_DA_DARKPOWER = 261, - //SI_DA_EARPLUG = 262, - //SI_DA_CONTRACT = 263, // Bio Mob effect on you and SI_TRICKDEAD icon - //SI_DA_BLACK = 264, // For short time blurry screen - //SI_DA_MAGICCART = 265, - //SI_CRYSTAL = 266, - //SI_DA_REBUILD = 267, - //SI_DA_EDARKNESS = 268, - //SI_DA_EGUARDIAN = 269, - //SI_DA_TIMEOUT = 270, - SI_FOOD_STR_CASH = 271, - SI_FOOD_AGI_CASH = 272, - SI_FOOD_VIT_CASH = 273, - SI_FOOD_DEX_CASH = 274, - SI_FOOD_INT_CASH = 275, - SI_FOOD_LUK_CASH = 276, - SI_MER_FLEE = 277, - SI_MER_ATK = 278, - SI_MER_HP = 279, - SI_MER_SP = 280, - SI_MER_HIT = 281, - SI_SLOWCAST = 282, - //SI_MAGICMIRROR = 283, - //SI_STONESKIN = 284, - //SI_ANTIMAGIC = 285, - SI_CRITICALWOUND = 286, - //SI_NPC_DEFENDER = 287, - //SI_NOACTION_WAIT = 288, - SI_MOVHASTE_HORSE = 289, - SI_PROTECT_DEF = 290, - SI_PROTECT_MDEF = 291, - SI_HEALPLUS = 292, - SI_S_LIFEPOTION = 293, - SI_L_LIFEPOTION = 294, - SI_CRITICALPERCENT = 295, - SI_PLUSAVOIDVALUE = 296, - SI_ATKER_ASPD = 297, - SI_TARGET_ASPD = 298, - SI_ATKER_MOVESPEED = 299, - - SI_ATKER_BLOOD = 300, - SI_TARGET_BLOOD = 301, - SI_ARMOR_PROPERTY = 302, - //SI_REUSE_LIMIT_A = 303, - SI_HELLPOWER = 304, - SI_STEAMPACK = 305, - //SI_REUSE_LIMIT_B = 306, - //SI_REUSE_LIMIT_C = 307, - //SI_REUSE_LIMIT_D = 308, - //SI_REUSE_LIMIT_E = 309, - //SI_REUSE_LIMIT_F = 310, - SI_INVINCIBLE = 311, - SI_CASH_PLUSONLYJOBEXP = 312, - SI_PARTYFLEE = 313, - SI_ANGEL_PROTECT = 314, - //SI_ENDURE_MDEF = 315, - SI_ENCHANTBLADE = 316, - SI_DEATHBOUND = 317, - SI_REFRESH = 318, - SI_GIANTGROWTH = 319, - SI_STONEHARDSKIN = 320, - SI_VITALITYACTIVATION = 321, - SI_FIGHTINGSPIRIT = 322, - SI_ABUNDANCE = 323, - SI_REUSE_MILLENNIUMSHIELD = 324, - SI_REUSE_CRUSHSTRIKE = 325, - SI_REUSE_REFRESH = 326, - SI_REUSE_STORMBLAST = 327, - SI_VENOMIMPRESS = 328, - SI_EPICLESIS = 329, - SI_ORATIO = 330, - SI_LAUDAAGNUS = 331, - SI_LAUDARAMUS = 332, - SI_CLOAKINGEXCEED = 333, - SI_HALLUCINATIONWALK = 334, - SI_HALLUCINATIONWALK_POSTDELAY = 335, - SI_RENOVATIO = 336, - SI_WEAPONBLOCKING = 337, - SI_WEAPONBLOCKING_POSTDELAY = 338, - SI_ROLLINGCUTTER = 339, - SI_EXPIATIO = 340, - SI_POISONINGWEAPON = 341, - SI_TOXIN = 342, - SI_PARALYSE = 343, - SI_VENOMBLEED = 344, - SI_MAGICMUSHROOM = 345, - SI_DEATHHURT = 346, - SI_PYREXIA = 347, - SI_OBLIVIONCURSE = 348, - SI_LEECHESEND = 349, - - SI_DUPLELIGHT = 350, - SI_FROSTMISTY = 351, - SI_FEARBREEZE = 352, - SI_ELECTRICSHOCKER = 353, - SI_MARSHOFABYSS = 354, - SI_RECOGNIZEDSPELL = 355, - SI_STASIS = 356, - SI_WUGRIDER = 357, - SI_WUGDASH = 358, - SI_WUGBITE = 359, - SI_CAMOUFLAGE = 360, - SI_ACCELERATION = 361, - SI_HOVERING = 362, - SI_SPHERE_1 = 363, - SI_SPHERE_2 = 364, - SI_SPHERE_3 = 365, - SI_SPHERE_4 = 366, - SI_SPHERE_5 = 367, - SI_MVPCARD_TAOGUNKA = 368, - SI_MVPCARD_MISTRESS = 369, - SI_MVPCARD_ORCHERO = 370, - SI_MVPCARD_ORCLORD = 371, - SI_OVERHEAT_LIMITPOINT = 372, - SI_OVERHEAT = 373, - SI_SHAPESHIFT = 374, - SI_INFRAREDSCAN = 375, - SI_MAGNETICFIELD = 376, - SI_NEUTRALBARRIER = 377, - SI_NEUTRALBARRIER_MASTER = 378, - SI_STEALTHFIELD = 379, - SI_STEALTHFIELD_MASTER = 380, - SI_MANU_ATK = 381, - SI_MANU_DEF = 382, - SI_SPL_ATK = 383, - SI_SPL_DEF = 384, - SI_REPRODUCE = 385, - SI_MANU_MATK = 386, - SI_SPL_MATK = 387, - SI_STR_SCROLL = 388, - SI_INT_SCROLL = 389, - SI_LG_REFLECTDAMAGE = 390, - SI_FORCEOFVANGUARD = 391, - SI_BUCHEDENOEL = 392, - SI_AUTOSHADOWSPELL = 393, - SI_SHADOWFORM = 394, - SI_RAID = 395, - SI_SHIELDSPELL_DEF = 396, - SI_SHIELDSPELL_MDEF = 397, - SI_SHIELDSPELL_REF = 398, - SI_BODYPAINT = 399, - - SI_EXEEDBREAK = 400, - SI_ADORAMUS = 401, - SI_PRESTIGE = 402, - SI_INVISIBILITY = 403, - SI_DEADLYINFECT = 404, - SI_BANDING = 405, - SI_EARTHDRIVE = 406, - SI_INSPIRATION = 407, - SI_ENERVATION = 408, - SI_GROOMY = 409, - SI_RAISINGDRAGON = 410, - SI_IGNORANCE = 411, - SI_LAZINESS = 412, - SI_LIGHTNINGWALK = 413, - SI_ACARAJE = 414, - SI_UNLUCKY = 415, - SI_CURSEDCIRCLE_ATKER = 416, - SI_CURSEDCIRCLE_TARGET = 417, - SI_WEAKNESS = 418, - SI_CRESCENTELBOW = 419, - SI_NOEQUIPACCESSARY = 420, - SI_STRIPACCESSARY = 421, - SI_MANHOLE = 422, - SI_POPECOOKIE = 423, - SI_FALLENEMPIRE = 424, - SI_GENTLETOUCH_ENERGYGAIN = 425, - SI_GENTLETOUCH_CHANGE = 426, - SI_GENTLETOUCH_REVITALIZE = 427, - SI_BLOODYLUST = 428, - SI_SWINGDANCE = 429, - SI_SYMPHONYOFLOVERS = 430, - SI_PROPERTYWALK = 431, - SI_SPELLFIST = 432, - SI_NETHERWORLD = 433, - SI_SIREN = 434, - SI_DEEPSLEEP = 435, - SI_SIRCLEOFNATURE = 436, - SI_COLD = 437, - SI_GLOOMYDAY = 438, - SI_SONG_OF_MANA = 439, - SI_CLOUDKILL = 440, - SI_DANCEWITHWUG = 441, - SI_RUSHWINDMILL = 442, - SI_ECHOSONG = 443, - SI_HARMONIZE = 444, - SI_STRIKING = 445, - //SI_WARMER = 446, - SI_MOONLITSERENADE = 447, - SI_SATURDAYNIGHTFEVER = 448, - SI_SITDOWN_FORCE = 449, - - SI_ANALYZE = 450, - SI_LERADSDEW = 451, - SI_MELODYOFSINK = 452, - SI_WARCRYOFBEYOND = 453, - SI_UNLIMITEDHUMMINGVOICE = 454, - SI_SPELLBOOK1 = 455, - SI_SPELLBOOK2 = 456, - SI_SPELLBOOK3 = 457, - SI_FREEZE_SP = 458, - SI_GN_TRAINING_SWORD = 459, - SI_GN_REMODELING_CART = 460, - SI_CARTSBOOST = 461, - SI_FIXEDCASTINGTM_REDUCE = 462, - SI_THORNTRAP = 463, - SI_BLOODSUCKER = 464, - SI_SPORE_EXPLOSION = 465, - SI_DEMONIC_FIRE = 466, - SI_FIRE_EXPANSION_SMOKE_POWDER = 467, - SI_FIRE_EXPANSION_TEAR_GAS = 468, - SI_BLOCKING_PLAY = 469, - SI_MANDRAGORA = 470, - SI_ACTIVATE = 471, - SI_SECRAMENT = 472, - SI_ASSUMPTIO2 = 473, - SI_TK_SEVENWIND = 474, - SI_LIMIT_ODINS_RECALL = 475, - SI_STOMACHACHE = 476, - SI_MYSTERIOUS_POWDER = 477, - SI_MELON_BOMB = 478, - SI_BANANA_BOMB_SITDOWN_POSTDELAY = 479, - SI_PROMOTE_HEALTH_RESERCH = 480, - SI_ENERGY_DRINK_RESERCH = 481, - SI_EXTRACT_WHITE_POTION_Z = 482, - SI_VITATA_500 = 483, - SI_EXTRACT_SALAMINE_JUICE = 484, - SI_BOOST500 = 485, - SI_FULL_SWING_K = 486, - SI_MANA_PLUS = 487, - SI_MUSTLE_M = 488, - SI_LIFE_FORCE_F = 489, - SI_VACUUM_EXTREME = 490, - SI_SAVAGE_STEAK = 491, - SI_COCKTAIL_WARG_BLOOD = 492, - SI_MINOR_BBQ = 493, - SI_SIROMA_ICE_TEA = 494, - SI_DROCERA_HERB_STEAMED = 495, - SI_PUTTI_TAILS_NOODLES = 496, - SI_BANANA_BOMB = 497, - SI_SUMMON_AGNI = 498, - SI_SPELLBOOK4 = 499, - - SI_SPELLBOOK5 = 500, - SI_SPELLBOOK6 = 501, - SI_SPELLBOOK7 = 502, - SI_ELEMENTAL_AGGRESSIVE = 503, - SI_RETURN_TO_ELDICASTES = 504, - SI_BANDING_DEFENCE = 505, - SI_SKELSCROLL = 506, - SI_DISTRUCTIONSCROLL = 507, - SI_ROYALSCROLL = 508, - SI_IMMUNITYSCROLL = 509, - SI_MYSTICSCROLL = 510, - SI_BATTLESCROLL = 511, - SI_ARMORSCROLL = 512, - SI_FREYJASCROLL = 513, - SI_SOULSCROLL = 514, - SI_CIRCLE_OF_FIRE = 515, - SI_CIRCLE_OF_FIRE_OPTION = 516, - SI_FIRE_CLOAK = 517, - SI_FIRE_CLOAK_OPTION = 518, - SI_WATER_SCREEN = 519, - SI_WATER_SCREEN_OPTION = 520, - SI_WATER_DROP = 521, - SI_WATER_DROP_OPTION = 522, - SI_WIND_STEP = 523, - SI_WIND_STEP_OPTION = 524, - SI_WIND_CURTAIN = 525, - SI_WIND_CURTAIN_OPTION = 526, - SI_WATER_BARRIER = 527, - SI_ZEPHYR = 528, - SI_SOLID_SKIN = 529, - SI_SOLID_SKIN_OPTION = 530, - SI_STONE_SHIELD = 531, - SI_STONE_SHIELD_OPTION = 532, - SI_POWER_OF_GAIA = 533, - //SI_EL_WAIT = 534, - //SI_EL_PASSIVE = 535, - //SI_EL_DEFENSIVE = 536, - //SI_EL_OFFENSIVE = 537, - //SI_EL_COST = 538, - SI_PYROTECHNIC = 539, - SI_PYROTECHNIC_OPTION = 540, - SI_HEATER = 541, - SI_HEATER_OPTION = 542, - SI_TROPIC = 543, - SI_TROPIC_OPTION = 544, - SI_AQUAPLAY = 545, - SI_AQUAPLAY_OPTION = 546, - SI_COOLER = 547, - SI_COOLER_OPTION = 548, - SI_CHILLY_AIR = 549, - - SI_CHILLY_AIR_OPTION = 550, - SI_GUST = 551, - SI_GUST_OPTION = 552, - SI_BLAST = 553, - SI_BLAST_OPTION = 554, - SI_WILD_STORM = 555, - SI_WILD_STORM_OPTION = 556, - SI_PETROLOGY = 557, - SI_PETROLOGY_OPTION = 558, - SI_CURSED_SOIL = 559, - SI_CURSED_SOIL_OPTION = 560, - SI_UPHEAVAL = 561, - SI_UPHEAVAL_OPTION = 562, - SI_TIDAL_WEAPON = 563, - SI_TIDAL_WEAPON_OPTION = 564, - SI_ROCK_CRUSHER = 565, - SI_ROCK_CRUSHER_ATK = 566, - SI_FIRE_INSIGNIA = 567, - SI_WATER_INSIGNIA = 568, - SI_WIND_INSIGNIA = 569, - SI_EARTH_INSIGNIA = 570, - SI_EQUIPED_FLOOR = 571, - SI_GUARDIAN_RECALL = 572, - SI_MORA_BUFF = 573, - SI_REUSE_LIMIT_G = 574, - SI_REUSE_LIMIT_H = 575, - SI_NEEDLE_OF_PARALYZE = 576, - SI_PAIN_KILLER = 577, - SI_G_LIFEPOTION = 578, - SI_VITALIZE_POTION = 579, - SI_LIGHT_OF_REGENE = 580, - SI_OVERED_BOOST = 581, - SI_SILENT_BREEZE = 582, - SI_ODINS_POWER = 583, - SI_STYLE_CHANGE = 584, - SI_SONIC_CLAW_POSTDELAY = 585, - //SI_ = 586, - //SI_ = 587, - //SI_ = 588, - //SI_ = 589, - //SI_ = 590, - //SI_ = 591, - //SI_ = 592, - //SI_ = 593, - //SI_ = 594, - //SI_ = 595, - SI_SILVERVEIN_RUSH_POSTDELAY = 596, - SI_MIDNIGHT_FRENZY_POSTDELAY = 597, - SI_GOLDENE_FERSE = 598, - SI_ANGRIFFS_MODUS = 599, - - SI_TINDER_BREAKER = 600, - SI_TINDER_BREAKER_POSTDELAY = 601, - SI_CBC = 602, - SI_CBC_POSTDELAY = 603, - SI_EQC = 604, - SI_MAGMA_FLOW = 605, - SI_GRANITIC_ARMOR = 606, - SI_PYROCLASTIC = 607, - SI_VOLCANIC_ASH = 608, - SI_SPIRITS_SAVEINFO1 = 609, - SI_SPIRITS_SAVEINFO2 = 610, - SI_MAGIC_CANDY = 611, - SI_SEARCH_STORE_INFO = 612, - SI_ALL_RIDING = 613, - SI_ALL_RIDING_REUSE_LIMIT = 614, - SI_MACRO = 615, - SI_MACRO_POSTDELAY = 616, - SI_BEER_BOTTLE_CAP = 617, - SI_OVERLAPEXPUP = 618, - SI_PC_IZ_DUN05 = 619, - SI_CRUSHSTRIKE = 620, - SI_MONSTER_TRANSFORM = 621, - SI_SIT = 622, - SI_ONAIR = 623, - SI_MTF_ASPD = 624, - SI_MTF_RANGEATK = 625, - SI_MTF_MATK = 626, - SI_MTF_MLEATKED = 627, - SI_MTF_CRIDAMAGE = 628, - SI_REUSE_LIMIT_MTF = 629, - SI_MACRO_PERMIT = 630, - SI_MACRO_PLAY = 631, - SI_SKF_CAST = 632, - SI_SKF_ASPD = 633, - SI_SKF_ATK = 634, - SI_SKF_MATK = 635, - SI_REWARD_PLUSONLYJOBEXP = 636, - SI_HANDICAPSTATE_NORECOVER = 637, - SI_SET_NUM_DEF = 638, - SI_SET_NUM_MDEF = 639, - SI_SET_PER_DEF = 640, - SI_SET_PER_MDEF = 641, - SI_PARTYBOOKING_SEARCH_DEALY = 642, - SI_PARTYBOOKING_REGISTER_DEALY = 643, - SI_PERIOD_TIME_CHECK_DETECT_SKILL = 644, - SI_KO_JYUMONJIKIRI = 645, - SI_MEIKYOUSISUI = 646, - SI_ATTHASTE_CASH = 647, - SI_EQUIPPED_DIVINE_ARMOR = 648, - SI_EQUIPPED_HOLY_ARMOR = 649, - - SI_2011RWC = 650, - SI_KYOUGAKU = 651, - SI_IZAYOI = 652, - SI_ZENKAI = 653, - SI_KG_KAGEHUMI = 654, - SI_KYOMU = 655, - SI_KAGEMUSYA = 656, - SI_ZANGETSU = 657, - SI_PHI_DEMON = 658, - SI_GENSOU = 659, - SI_AKAITSUKI = 660, - SI_TETANY = 661, - SI_GM_BATTLE = 662, - SI_GM_BATTLE2 = 663, - SI_2011RWC_SCROLL = 664, - SI_ACTIVE_MONSTER_TRANSFORM = 665, - SI_MYSTICPOWDER = 666, - SI_ECLAGE_RECALL = 667, - SI_ENTRY_QUEUE_APPLY_DELAY = 668, - SI_REUSE_LIMIT_ECL = 669, - SI_M_LIFEPOTION = 670, - SI_ENTRY_QUEUE_NOTIFY_ADMISSION_TIME_OUT = 671, - SI_UNKNOWN_NAME = 672, - SI_ON_PUSH_CART = 673, - SI_HAT_EFFECT = 674, - SI_FLOWER_LEAF = 675, - SI_RAY_OF_PROTECTION = 676, - SI_GLASTHEIM_ATK = 677, - SI_GLASTHEIM_DEF = 678, - SI_GLASTHEIM_HEAL = 679, - SI_GLASTHEIM_HIDDEN = 680, - SI_GLASTHEIM_STATE = 681, - SI_GLASTHEIM_ITEMDEF = 682, - SI_GLASTHEIM_HPSP = 683, - SI_HOMUN_SKILL_POSTDELAY = 684, - SI_ALMIGHTY = 685, - SI_GVG_GIANT = 686, - SI_GVG_GOLEM = 687, - SI_GVG_STUN = 688, - SI_GVG_STONE = 689, - SI_GVG_FREEZ = 690, - SI_GVG_SLEEP = 691, - SI_GVG_CURSE = 692, - SI_GVG_SILENCE = 693, - SI_GVG_BLIND = 694, - SI_CLIENT_ONLY_EQUIP_ARROW = 695, - SI_CLAN_INFO = 696, - SI_JP_EVENT01 = 697, - SI_JP_EVENT02 = 698, - SI_JP_EVENT03 = 699, - - SI_JP_EVENT04 = 700, - SI_TELEPORT_FIXEDCASTINGDELAY = 701, - SI_GEFFEN_MAGIC1 = 702, - SI_GEFFEN_MAGIC2 = 703, - SI_GEFFEN_MAGIC3 = 704, - SI_QUEST_BUFF1 = 705, - SI_QUEST_BUFF2 = 706, - SI_QUEST_BUFF3 = 707, - SI_REUSE_LIMIT_RECALL = 708, - SI_SAVEPOSITION = 709, - SI_HANDICAPSTATE_ICEEXPLO = 710, - SI_FENRIR_CARD = 711, - SI_REUSE_LIMIT_ASPD_POTION = 712, - SI_MAXPAIN = 713, - SI_PC_STOP = 714, - SI_FRIGG_SONG = 715, - SI_OFFERTORIUM = 716, - SI_TELEKINESIS_INTENSE = 717, - SI_MOONSTAR = 718, - SI_STRANGELIGHTS = 719, - SI_FULL_THROTTLE = 720, - SI_REBOUND = 721, - SI_UNLIMIT = 722, - SI_KINGS_GRACE = 723, - SI_ITEM_ATKMAX = 724, - SI_ITEM_ATKMIN = 725, - SI_ITEM_MATKMAX = 726, - SI_ITEM_MATKMIN = 727, - SI_SUPER_STAR = 728, - SI_HIGH_RANKER = 729, - SI_DARKCROW = 730, - SI_2013_VALENTINE1 = 731, - SI_2013_VALENTINE2 = 732, - SI_2013_VALENTINE3 = 733, - SI_ILLUSIONDOPING = 734, - //SI_WIDEWEB = 735, - SI_CHILL = 736, - SI_BURNT = 737, - //SI_PCCAFE_PLAY_TIME = 738, - //SI_TWISTED_TIME = 739, - SI_FLASHCOMBO = 740, - //SI_JITTER_BUFF1 = 741, - //SI_JITTER_BUFF2 = 742, - //SI_JITTER_BUFF3 = 743, - //SI_JITTER_BUFF4 = 744, - //SI_JITTER_BUFF5 = 745, - //SI_JITTER_BUFF6 = 746, - //SI_JITTER_BUFF7 = 747, - //SI_JITTER_BUFF8 = 748, - //SI_JITTER_BUFF9 = 749, - - //SI_JITTER_BUFF10 = 750, - SI_CUP_OF_BOZA = 751, - SI_B_TRAP = 752, - SI_E_CHAIN = 753, - SI_E_QD_SHOT_READY = 754, - SI_C_MARKER = 755, - SI_H_MINE = 756, - SI_H_MINE_SPLASH = 757, - SI_P_ALTER = 758, - SI_HEAT_BARREL = 759, - SI_ANTI_M_BLAST = 760, - SI_SLUGSHOT = 761, - SI_SWORDCLAN = 762, - SI_ARCWANDCLAN = 763, - SI_GOLDENMACECLAN = 764, - SI_CROSSBOWCLAN = 765, - SI_PACKING_ENVELOPE1 = 766, - SI_PACKING_ENVELOPE2 = 767, - SI_PACKING_ENVELOPE3 = 768, - SI_PACKING_ENVELOPE4 = 769, - SI_PACKING_ENVELOPE5 = 770, - SI_PACKING_ENVELOPE6 = 771, - SI_PACKING_ENVELOPE7 = 772, - SI_PACKING_ENVELOPE8 = 773, - SI_PACKING_ENVELOPE9 = 774, - SI_PACKING_ENVELOPE10 = 775, - SI_GLASTHEIM_TRANS = 776, - //SI_ZONGZI_POUCH_TRANS = 777, - SI_HEAT_BARREL_AFTER = 778, - SI_DECORATION_OF_MUSIC = 779, - //SI_OVERSEAEXPUP = 780, - //SI_CLOWN_N_GYPSY_CARD = 781, - //SI_OPEN_NPC_MARKET = 782, - //SI_BEEF_RIB_STEW = 783, - //SI_PORK_RIB_STEW = 784, - //SI_CHUSEOK_MONDAY = 785, - //SI_CHUSEOK_TUESDAY = 786, - //SI_CHUSEOK_WEDNESDAY = 787, - //SI_CHUSEOK_THURSDAY = 788, - //SI_CHUSEOK_FRIDAY = 789, - //SI_CHUSEOK_WEEKEND = 790, - //SI_ALL_LIGHTGUARD = 791, - //SI_ALL_LIGHTGUARD_COOL_TIME = 792, - SI_MTF_MHP = 793, - SI_MTF_MSP = 794, - SI_MTF_PUMPKIN = 795, - SI_MTF_HITFLEE = 796, - //SI_MTF_CRIDAMAGE2 = 797, - //SI_MTF_SPDRAIN = 798, - //SI_ACUO_MINT_GUM = 799, - - //SI_S_HEALPOTION = 800, - //SI_REUSE_LIMIT_S_HEAL_POTION = 801, - //SI_PLAYTIME_STATISTICS = 802, - //SI_GN_CHANGEMATERIAL_OPERATOR = 803, - //SI_GN_MIX_COOKING_OPERATOR = 804, - //SI_GN_MAKEBOMB_OPERATOR = 805, - //SI_GN_S_PHARMACY_OPERATOR = 806, - //SI_SO_EL_ANALYSIS_DISASSEMBLY_OPERATOR = 807, - //SI_SO_EL_ANALYSIS_COMBINATION_OPERATOR = 808, - //SI_NC_MAGICDECOY_OPERATOR = 809, - //SI_GUILD_STORAGE = 810, - //SI_GC_POISONINGWEAPON_OPERATOR = 811, - //SI_WS_WEAPONREFINE_OPERATOR = 812, - //SI_BS_REPAIRWEAPON_OPERATOR = 813, - //SI_GET_MAILBOX = 814, - //SI_JUMPINGCLAN = 815, - //SI_JP_OTP = 816, - //SI_HANDICAPTOLERANCE_LEVELGAP = 817, - //SI_MTF_RANGEATK2 = 818, - //SI_MTF_ASPD2 = 819, - //SI_MTF_MATK2 = 820, - //SI_SHOW_NPCHPBAR = 821, - SI_FLOWERSMOKE = 822, - SI_FSTONE = 823, - SI_DAILYSENDMAILCNT = 824, - //SI_QSCARABA = 825, - SI_LJOSALFAR = 826, - //SI_PAD_READER_KNIGHT = 827, - //SI_PAD_READER_CRUSADER = 828, - //SI_PAD_READER_BLACKSMITH = 829, - //SI_PAD_READER_ALCHEMIST = 830, - //SI_PAD_READER_ASSASSIN = 831, - //SI_PAD_READER_ROGUE = 832, - //SI_PAD_READER_WIZARD = 833, - //SI_PAD_READER_SAGE = 834, - //SI_PAD_READER_PRIEST = 835, - //SI_PAD_READER_MONK = 836, - //SI_PAD_READER_HUNTER = 837, - //SI_PAD_READER_BARD = 838, - //SI_PAD_READER_DANCER = 839, - //SI_PAD_READER_TAEKWON = 840, - //SI_PAD_READER_NINJA = 841, - //SI_PAD_READER_GUNSLINGER = 842, - //SI_PAD_READER_SUPERNOVICE = 843, - //SI_ESSENCE_OF_TIME = 844, - //SI_MINIGAME_ROULETTE = 845, - //SI_MINIGAME_GOLD_POINT = 846, - //SI_MINIGAME_SILVER_POINT = 847, - //SI_MINIGAME_BRONZE_POINT = 848, - SI_HAPPINESS_STAR = 849, - - //SI_SUMMEREVENT01 = 850, - //SI_SUMMEREVENT02 = 851, - //SI_SUMMEREVENT03 = 852, - //SI_SUMMEREVENT04 = 853, - //SI_SUMMEREVENT05 = 854, - //SI_MINIGAME_ROULETTE_BONUS_ITEM = 855, - SI_DRESS_UP = 856, - SI_MAPLE_FALLS = 857, - //SI_ALL_NIFLHEIM_RECALL = 858, - //SI_ = 859, - //SI_MTF_MARIONETTE = 860, - //SI_MTF_LUDE = 861, - //SI_MTF_CRUISER = 862, - SI_MERMAID_LONGING = 863, - SI_MAGICAL_FEATHER = 864, - //SI_DRACULA_CARD = 865, - //SI_ = 866, - //SI_LIMIT_POWER_BOOSTER = 867, - //SI_ = 868, - //SI_ = 869, - //SI_ = 870, - //SI_ = 871, - SI_TIME_ACCESSORY = 872, - //SI_EP16_DEF = 873, - //SI_NORMAL_ATKED_SP = 874, - //SI_BODYSTATE_STONECURSE = 875, - //SI_BODYSTATE_FREEZING = 876, - //SI_BODYSTATE_STUN = 877, - //SI_BODYSTATE_SLEEP = 878, - //SI_BODYSTATE_UNDEAD = 879, - //SI_BODYSTATE_STONECURSE_ING = 880, - //SI_BODYSTATE_BURNNING = 881, - //SI_BODYSTATE_IMPRISON = 882, - //SI_HEALTHSTATE_POISON = 883, - //SI_HEALTHSTATE_CURSE = 884, - //SI_HEALTHSTATE_SILENCE = 885, - //SI_HEALTHSTATE_CONFUSION = 886, - //SI_HEALTHSTATE_BLIND = 887, - //SI_HEALTHSTATE_ANGELUS = 888, - //SI_HEALTHSTATE_BLOODING = 889, - //SI_HEALTHSTATE_HEAVYPOISON = 890, - //SI_HEALTHSTATE_FEAR = 891, - //SI_CHERRY_BLOSSOM_CAKE = 892, - SI_SU_STOOP = 893, - SI_CATNIPPOWDER = 894, - SI_BLOSSOM_FLUTTERING = 895, - SI_SV_ROOTTWIST = 896, - //SI_ATTACK_PROPERTY_NOTHING = 897, - //SI_ATTACK_PROPERTY_WATER = 898, - //SI_ATTACK_PROPERTY_GROUND = 899, - - //SI_ATTACK_PROPERTY_FIRE = 900, - //SI_ATTACK_PROPERTY_WIND = 901, - //SI_ATTACK_PROPERTY_POISON = 902, - //SI_ATTACK_PROPERTY_SAINT = 903, - //SI_ATTACK_PROPERTY_DARKNESS = 904, - //SI_ATTACK_PROPERTY_TELEKINESIS = 905, - //SI_ATTACK_PROPERTY_UNDEAD = 906, - //SI_RESIST_PROPERTY_NOTHING = 907, - SI_RESIST_PROPERTY_WATER = 908, - SI_RESIST_PROPERTY_GROUND = 909, - SI_RESIST_PROPERTY_FIRE = 910, - SI_RESIST_PROPERTY_WIND = 911, - //SI_RESIST_PROPERTY_POISON = 912, - //SI_RESIST_PROPERTY_SAINT = 913, - //SI_RESIST_PROPERTY_DARKNESS = 914, - //SI_RESIST_PROPERTY_TELEKINESIS = 915, - //SI_RESIST_PROPERTY_UNDEAD = 916, - SI_BITESCAR = 917, - SI_ARCLOUSEDASH = 918, - SI_TUNAPARTY = 919, - SI_SHRIMP = 920, - SI_FRESHSHRIMP = 921, - //SI_PERIOD_RECEIVEITEM = 922, - //SI_PERIOD_PLUSEXP = 923, - //SI_PERIOD_PLUSJOBEXP = 924, - //SI_RUNEHELM = 925, - //SI_HELM_VERKANA = 926, - //SI_HELM_RHYDO = 927, - //SI_HELM_TURISUS = 928, - //SI_HELM_HAGALAS = 929, - //SI_HELM_ISIA = 930, - //SI_HELM_ASIR = 931, - //SI_HELM_URJ = 932, - SI_SUHIDE = 933, - //SI_ = 934, - //SI_DORAM_BUF_01 = 935, - //SI_DORAM_BUF_02 = 936, - SI_SPRITEMABLE = 937, - //SI_AID_PERIOD_RECEIVEITEM = 938, - //SI_AID_PERIOD_PLUSEXP = 939, - //SI_AID_PERIOD_PLUSJOBEXP = 940, - //SI_AID_PERIOD_DEADPENALTY = 941, - //SI_AID_PERIOD_ADDSTOREITEMCOUNT = 942, - //SI_ = 943, - //SI_ = 944, - //SI_ = 945, - //SI_ = 946, - //SI_ = 947, - //SI_ = 948, - //SI_ = 949, - //SI_HISS = 950, - //SI_ = 951, - //SI_NYANGGRASS = 952, - //SI_CHATTERING = 953, - //SI_ = 954, - //SI_ = 955, - //SI_ = 956, - //SI_ = 957, - //SI_ = 958, - //SI_ = 959, - //SI_ = 960, - //SI_GROOMING = 961, - //SI_PROTECTIONOFSHRIMP = 962, - //SI_EP16_2_BUFF_SS = 963, - //SI_EP16_2_BUFF_SC = 964, - //SI_EP16_2_BUFF_AC = 965, - //SI_GS_MAGICAL_BULLET = 966, - //SI_ = 967, - //SI_ = 968, - //SI_ = 969, - //SI_ = 970, - //SI_ = 971, - //SI_ = 972, - //SI_ = 973, - //SI_ = 974, - //SI_ = 975, - //SI_FALLEN_ANGEL = 976, - //SI_ = 977, - //SI_ = 978, - //SI_BLAZE_BEAD = 979, - //SI_FROZEN_BEAD = 980, - //SI_BREEZE_BEAD = 981, - //SI_ = 982, - //SI_AID_PERIOD_RECEIVEITEM_2ND = 983, - //SI_AID_PERIOD_PLUSEXP_2ND = 984, - //SI_AID_PERIOD_PLUSJOBEXP_2ND = 985, - //SI_PRONTERA_JP = 986, - //SI_ = 987, - //SI_GLOOM_CARD = 988, - //SI_PHARAOH_CARD = 989, - //SI_KIEL_CARD = 990, - //SI_ = 991, - //SI_CHEERUP = 992, - //SI_ = 993, - //SI_ = 994, - //SI_S_MANAPOTION = 995, - //SI_M_DEFSCROLL = 996, - //SI_ = 997, - //SI_ = 998, - //SI_ = 999, - //SI_AS_RAGGED_GOLEM_CARD = 1000, - //SI_LHZ_DUN_N1 = 1001, - //SI_LHZ_DUN_N2 = 1002, - //SI_LHZ_DUN_N3 = 1003, - //SI_LHZ_DUN_N4 = 1004, -#ifndef SI_MAX - SI_MAX, -#endif + SI_BLANK = -1, }; // JOINTBEAT stackable ailments @@ -2235,10 +1223,12 @@ BEGIN_ZEROED_BLOCK; /* Everything within this block will be memset to 0 when sta int SP_table[CLASS_COUNT][MAX_LEVEL + 1]; int aspd_base[CLASS_COUNT][MAX_SINGLE_WEAPON_TYPE+1]; // +1 for RENEWAL_ASPD sc_type Skill2SCTable[MAX_SKILL_DB]; // skill -> status - int IconChangeTable[SC_MAX]; // status -> "icon" (icon is a bit of a misnomer, since there exist values with no icon associated) + struct { + int id; + int relevant_bl_types; + } IconChangeTable[SC_MAX]; unsigned int ChangeFlagTable[SC_MAX]; // status -> flags int SkillChangeTable[SC_MAX]; // status -> skill - int RelevantBLTypes[SI_MAX]; // "icon" -> enum bl_type (for clif->status_change to identify for which bl types to send packets) bool DisplayType[SC_MAX]; /* */ int atkmods[3][MAX_SINGLE_WEAPON_TYPE];//ATK weapon modification for size (size_fix.txt) @@ -2273,8 +1263,9 @@ struct status_interface { sc_type (*skill2sc) (int skill_id); int (*sc2skill) (sc_type sc); unsigned int (*sc2scb_flag) (sc_type sc); - int (*type2relevant_bl_types) (int type); + int (*get_sc_relevant_bl_types) (sc_type type); int (*get_sc_type) (sc_type idx); + int (*get_sc_icon) (sc_type type); int (*damage) (struct block_list *src,struct block_list *target,int64 hp,int64 sp, int walkdelay, int flag); //Define for standard HP/SP skill-related cost triggers (mobs require no HP/SP to use skills) int (*charge) (struct block_list* bl, int64 hp, int64 sp); @@ -2395,7 +1386,7 @@ struct status_interface { bool (*read_scdb_libconfig_sub_flag_additional) (struct config_setting_t *it, int type, const char *source); void (*read_job_db) (void); void (*read_job_db_sub) (int idx, const char *name, struct config_setting_t *jdb); - void (*set_sc) (uint16 skill_id, sc_type sc, int icon, unsigned int flag); + void (*set_sc) (uint16 skill_id, sc_type sc, unsigned int flag); void (*copy) (struct status_data *a, const struct status_data *b); int (*base_matk_min) (const struct status_data *st); int (*base_matk_max) (const struct status_data *st); diff --git a/src/map/unit.c b/src/map/unit.c index 1e9433eaf..e7ac6d24f 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -661,7 +661,7 @@ static void unit_run_hit(struct block_list *bl, struct status_change *sc, struct lv = sc->data[type]->val1; //If you can't run forward, you must be next to a wall, so bounce back. [Skotlex] if( type == SC_RUN ) - clif->sc_load(bl,bl->id,AREA,SI_TING,0,0,0); + clif->sc_load(bl, bl->id, AREA, status->get_sc_icon(SC_TING), 0, 0, 0); ud = unit->bl2ud(bl); nullpo_retv(ud); @@ -673,7 +673,7 @@ static void unit_run_hit(struct block_list *bl, struct status_change *sc, struct if (lv > 0) skill->blown(bl, bl, skill->get_blewcount(TK_RUN, lv), unit->getdir(bl), 0); clif->fixpos(bl); //Why is a clif->slide (skill->blown) AND a fixpos needed? Ask Aegis. - clif->sc_end(bl, bl->id, AREA, SI_TING); + clif->sc_end(bl, bl->id, AREA, status->get_sc_icon(SC_TING)); } else if (sd) { clif->fixpos(bl); skill->castend_damage_id(bl, &sd->bl, RA_WUGDASH, lv, timer->gettick(), SD_LEVEL); -- cgit v1.2.3-70-g09d2 From e6199edca8ad4eee32b7e34318f99f365d8520db Mon Sep 17 00:00:00 2001 From: Ridley Date: Wed, 8 Jan 2020 01:21:21 +0100 Subject: Adding PCBLOCK_NPC to setpcblock script command --- doc/constants.md | 1 + doc/script_commands.txt | 1 + src/map/clif.c | 6 ++++-- src/map/pc.h | 1 + src/map/script.c | 7 +++++++ src/map/script.h | 21 +++++++++++---------- src/map/unit.c | 6 ++++-- 7 files changed, 29 insertions(+), 14 deletions(-) (limited to 'src/map/unit.c') diff --git a/doc/constants.md b/doc/constants.md index bc2a16f52..257696c4e 100644 --- a/doc/constants.md +++ b/doc/constants.md @@ -5085,6 +5085,7 @@ - `PCBLOCK_IMMUNE`: 32 - `PCBLOCK_SITSTAND`: 64 - `PCBLOCK_COMMANDS`: 128 +- `PCBLOCK_NPC`: 256 ### private airship responds diff --git a/doc/script_commands.txt b/doc/script_commands.txt index b55afb0f2..6fb050af3 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -6541,6 +6541,7 @@ The listed are a bit mask of the following: PCBLOCK_IMMUNE PCBLOCK_SITSTAND PCBLOCK_COMMANDS + PCBLOCK_NPC Examples: diff --git a/src/map/clif.c b/src/map/clif.c index 31fb00c37..a3aabb08d 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -11467,7 +11467,9 @@ static void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action { struct npc_data *nd = map->id2nd(target_id); if (nd != NULL) { - npc->click(sd, nd); + if (sd->block_action.npc == 0) { // *pcblock script command + npc->click(sd, nd); + } return; } @@ -11942,7 +11944,7 @@ static void clif_parse_NpcClicked(int fd, struct map_session_data *sd) clif->clearunit_area(&sd->bl,CLR_DEAD); return; } - if (sd->npc_id || sd->state.workinprogress & 2) { + if (sd->npc_id > 0 || (sd->state.workinprogress & 2) == 2 || sd->block_action.npc == 1) { // *pcblock script command #if PACKETVER >= 20110308 clif->msgtable(sd, MSG_BUSY); #else diff --git a/src/map/pc.h b/src/map/pc.h index 7a42be5be..9fe83662d 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -635,6 +635,7 @@ END_ZEROED_BLOCK; unsigned immune : 1; unsigned sitstand : 1; unsigned commands : 1; + unsigned npc : 1; } block_action; /* Achievement System */ diff --git a/src/map/script.c b/src/map/script.c index 396d084a3..b1f3af14c 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -19126,6 +19126,9 @@ static BUILDIN(setpcblock) if ((type & PCBLOCK_COMMANDS) != 0) sd->block_action.commands = state; + if ((type & PCBLOCK_NPC) != 0) + sd->block_action.npc = state; + return true; } @@ -19163,6 +19166,9 @@ static BUILDIN(checkpcblock) if (sd->block_action.commands != 0) retval |= PCBLOCK_COMMANDS; + if (sd->block_action.npc != 0) + retval |= PCBLOCK_NPC; + script_pushint(st, retval); return true; } @@ -27228,6 +27234,7 @@ static void script_hardcoded_constants(void) script->set_constant("PCBLOCK_IMMUNE", PCBLOCK_IMMUNE, false, false); script->set_constant("PCBLOCK_SITSTAND", PCBLOCK_SITSTAND, false, false); script->set_constant("PCBLOCK_COMMANDS", PCBLOCK_COMMANDS, false, false); + script->set_constant("PCBLOCK_NPC", PCBLOCK_NPC, false, false); script->constdb_comment("private airship responds"); script->set_constant("P_AIRSHIP_NONE", P_AIRSHIP_NONE, false, false); diff --git a/src/map/script.h b/src/map/script.h index 1cec02b97..7bcb5298c 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -529,16 +529,17 @@ enum script_petinfo_types { * Player blocking actions related flags. */ enum pcblock_action_flag { - PCBLOCK_NONE = 0x00, - PCBLOCK_MOVE = 0x01, - PCBLOCK_ATTACK = 0x02, - PCBLOCK_SKILL = 0x04, - PCBLOCK_USEITEM = 0x08, - PCBLOCK_CHAT = 0x10, - PCBLOCK_IMMUNE = 0x20, - PCBLOCK_SITSTAND = 0x40, - PCBLOCK_COMMANDS = 0x80, - PCBLOCK_ALL = 0xFF, + PCBLOCK_NONE = 0x000, + PCBLOCK_MOVE = 0x001, + PCBLOCK_ATTACK = 0x002, + PCBLOCK_SKILL = 0x004, + PCBLOCK_USEITEM = 0x008, + PCBLOCK_CHAT = 0x010, + PCBLOCK_IMMUNE = 0x020, + PCBLOCK_SITSTAND = 0x040, + PCBLOCK_COMMANDS = 0x080, + PCBLOCK_NPC = 0x100, + PCBLOCK_ALL = 0x1FF, }; /** diff --git a/src/map/unit.c b/src/map/unit.c index b9176fa69..d7d95c57b 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1932,8 +1932,10 @@ static int unit_attack(struct block_list *src, int target_id, int continuous) if (src->type == BL_PC) { struct map_session_data *sd = BL_UCAST(BL_PC, src); - if( target->type == BL_NPC ) { // monster npcs [Valaris] - npc->click(sd, BL_UCAST(BL_NPC, target)); // submitted by leinsirk10 [Celest] + if (target->type == BL_NPC) { // monster npcs [Valaris] + if (sd->block_action.npc == 0) { // *pcblock script command + npc->click(sd, BL_UCAST(BL_NPC, target)); // submitted by leinsirk10 [Celest] + } return 0; } if( pc_is90overweight(sd) || pc_isridingwug(sd) ) { // overweight or mounted on warg - stop attacking -- cgit v1.2.3-70-g09d2 From da14478a8c0c616a6aa5481694c550143bc9b9f3 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 13 Jan 2020 03:24:07 +0100 Subject: Update copyright headers for year 2020 Signed-off-by: Haru --- 3rdparty/libconfig/Makefile.in | 4 +- 3rdparty/libconfig/extra/doc/libconfig.texi | 2 +- 3rdparty/libconfig/extra/gen/grammar.y | 4 +- 3rdparty/libconfig/extra/gen/scanner.l | 4 +- 3rdparty/libconfig/libconfig.c | 4 +- 3rdparty/libconfig/libconfig.h | 4 +- 3rdparty/libconfig/parsectx.h | 4 +- 3rdparty/libconfig/scanctx.c | 4 +- 3rdparty/libconfig/scanctx.h | 4 +- 3rdparty/libconfig/scanner.c | 4 +- 3rdparty/libconfig/strbuf.c | 4 +- 3rdparty/libconfig/strbuf.h | 4 +- 3rdparty/libconfig/wincompat.h | 4 +- 3rdparty/mt19937ar/Makefile.in | 4 +- Makefile.in | 4 +- conf/char/char-server.conf | 2 +- conf/clans.conf | 2 +- conf/common/inter-server.conf | 2 +- conf/common/map-index.conf | 2 +- conf/common/socket.conf | 2 +- conf/global/console.conf | 2 +- conf/global/sql_connection.conf | 2 +- conf/import-tmpl/battle.conf | 2 +- conf/import-tmpl/char-server.conf | 2 +- conf/import-tmpl/inter-server.conf | 2 +- conf/import-tmpl/login-server.conf | 2 +- conf/import-tmpl/logs.conf | 2 +- conf/import-tmpl/map-server.conf | 2 +- conf/import-tmpl/script.conf | 2 +- conf/import-tmpl/socket.conf | 2 +- conf/login/login-server.conf | 2 +- conf/map/battle.conf | 2 +- conf/map/battle/battle.conf | 2 +- conf/map/battle/battleground.conf | 2 +- conf/map/battle/client.conf | 2 +- conf/map/battle/drops.conf | 2 +- conf/map/battle/exp.conf | 2 +- conf/map/battle/feature.conf | 2 +- conf/map/battle/gm.conf | 2 +- conf/map/battle/guild.conf | 2 +- conf/map/battle/homunc.conf | 2 +- conf/map/battle/items.conf | 2 +- conf/map/battle/limits.conf | 2 +- conf/map/battle/misc.conf | 2 +- conf/map/battle/monster.conf | 2 +- conf/map/battle/party.conf | 2 +- conf/map/battle/pet.conf | 2 +- conf/map/battle/player.conf | 2 +- conf/map/battle/skill.conf | 2 +- conf/map/battle/status.conf | 2 +- conf/map/logs.conf | 2 +- conf/map/map-server.conf | 2 +- conf/map/maps.conf | 2 +- conf/map/script.conf | 2 +- configure.ac | 4 +- db/achievement_rank_db.conf | 2 +- db/attendance_db.conf | 4 +- db/cashshop_db.conf | 2 +- db/castle_db.conf | 4 +- db/clans.conf | 2 +- db/constants.conf | 2 +- db/item_db2.conf | 2 +- db/item_options.conf | 2 +- db/mob_db2.conf | 2 +- db/mob_skill_db2.conf | 2 +- db/option_drop_groups.conf | 2 +- db/pet_db2.conf | 2 +- db/pre-re/achievement_db.conf | 2 +- db/pre-re/exp_group_db.conf | 2 +- db/pre-re/item_chain.conf | 2 +- db/pre-re/item_combo_db.conf | 2 +- db/pre-re/item_db.conf | 2 +- db/pre-re/item_group.conf | 2 +- db/pre-re/item_lapineddukddak.conf | 4 +- db/pre-re/item_packages.conf | 2 +- db/pre-re/job_db.conf | 2 +- db/pre-re/map_zone_db.conf | 4 +- db/pre-re/mob_db.conf | 2 +- db/pre-re/mob_skill_db.conf | 2 +- db/pre-re/pet_db.conf | 2 +- db/pre-re/refine_db.conf | 2 +- db/pre-re/skill_db.conf | 2 +- db/pre-re/skill_tree.conf | 2 +- db/quest_db.conf | 2 +- db/re/achievement_db.conf | 2 +- db/re/exp_group_db.conf | 2 +- db/re/item_chain.conf | 2 +- db/re/item_combo_db.conf | 2 +- db/re/item_db.conf | 2 +- db/re/item_group.conf | 2 +- db/re/item_lapineddukddak.conf | 4 +- db/re/item_packages.conf | 2 +- db/re/job_db.conf | 2 +- db/re/map_zone_db.conf | 4 +- db/re/mob_db.conf | 2 +- db/re/mob_skill_db.conf | 2 +- db/re/pet_db.conf | 2 +- db/re/refine_db.conf | 2 +- db/re/skill_db.conf | 2 +- db/re/skill_tree.conf | 2 +- db/roulette_db.conf | 2 +- db/sc_config.conf | 2 +- db/stylist_db.conf | 4 +- db/translations.conf | 2 +- db2sql.bat | 2 +- doc/effect_list.md | 2 +- doc/item_bonus.md | 2 +- doc/mob_db_mode_list.md | 2 +- doc/permissions.md | 2 +- doc/quest_variables.md | 2 +- npc/MOTD.txt | 2 +- npc/airports/airships.txt | 4 +- npc/airports/einbroch.txt | 6 +-- npc/airports/hugel.txt | 2 +- npc/airports/izlude.txt | 6 +-- npc/airports/lighthalzen.txt | 6 +-- npc/airports/rachel.txt | 6 +-- npc/airports/yuno.txt | 6 +-- npc/battleground/bg_common.txt | 6 +-- npc/battleground/flavius/flavius01.txt | 8 ++-- npc/battleground/flavius/flavius02.txt | 8 ++-- npc/battleground/flavius/flavius_enter.txt | 4 +- npc/battleground/kvm/kvm01.txt | 4 +- npc/battleground/kvm/kvm02.txt | 6 +-- npc/battleground/kvm/kvm03.txt | 6 +-- npc/battleground/kvm/kvm_enter.txt | 4 +- npc/battleground/kvm/kvm_item_pay.txt | 4 +- npc/battleground/tierra/tierra01.txt | 8 ++-- npc/battleground/tierra/tierra02.txt | 8 ++-- npc/battleground/tierra/tierra_enter.txt | 4 +- npc/cities/alberta.txt | 12 +++--- npc/cities/aldebaran.txt | 18 ++++----- npc/cities/amatsu.txt | 32 +++++++-------- npc/cities/ayothaya.txt | 16 ++++---- npc/cities/comodo.txt | 22 +++++------ npc/cities/einbech.txt | 16 ++++---- npc/cities/einbroch.txt | 18 ++++----- npc/cities/geffen.txt | 22 +++++------ npc/cities/gonryun.txt | 18 ++++----- npc/cities/hugel.txt | 20 +++++----- npc/cities/izlude.txt | 22 +++++------ npc/cities/jawaii.txt | 20 +++++----- npc/cities/lighthalzen.txt | 28 ++++++------- npc/cities/louyang.txt | 30 +++++++------- npc/cities/lutie.txt | 16 ++++---- npc/cities/manuk.txt | 4 +- npc/cities/morocc.txt | 16 ++++---- npc/cities/moscovia.txt | 6 +-- npc/cities/niflheim.txt | 22 +++++------ npc/cities/payon.txt | 20 +++++----- npc/cities/prontera.txt | 14 +++---- npc/cities/rachel.txt | 12 +++--- npc/cities/splendide.txt | 4 +- npc/cities/umbala.txt | 22 +++++------ npc/cities/veins.txt | 8 ++-- npc/cities/yuno.txt | 14 +++---- npc/dev/ci_test.txt | 4 +- npc/dev/test.txt | 4 +- npc/events/MemorialDay_2008.txt | 4 +- npc/events/RWC_2011.txt | 4 +- npc/events/RWC_2012.txt | 4 +- npc/events/StPatrick_2008.txt | 8 ++-- npc/events/bossnia.txt | 6 +-- npc/events/children_week.txt | 4 +- npc/events/christmas_2005.txt | 8 ++-- npc/events/christmas_2008.txt | 4 +- npc/events/dumplingfestival.txt | 6 +-- npc/events/easter_2008.txt | 6 +-- npc/events/easter_2010.txt | 4 +- npc/events/event_skill_reset.txt | 6 +-- npc/events/gdevent_aru.txt | 6 +-- npc/events/gdevent_sch.txt | 6 +-- npc/events/god_se_festival.txt | 6 +-- npc/events/halloween_2006.txt | 8 ++-- npc/events/halloween_2008.txt | 4 +- npc/events/halloween_2009.txt | 6 +-- npc/events/idul_fitri.txt | 6 +-- npc/events/lunar_2008.txt | 4 +- npc/events/nguild/nguild_dunsw.txt | 6 +-- npc/events/nguild/nguild_ev_agit.txt | 8 ++-- npc/events/nguild/nguild_flags.txt | 8 ++-- npc/events/nguild/nguild_guardians.txt | 4 +- npc/events/nguild/nguild_kafras.txt | 8 ++-- npc/events/nguild/nguild_managers.txt | 6 +-- npc/events/nguild/nguild_treas.txt | 10 ++--- npc/events/nguild/nguild_warper.txt | 4 +- npc/events/twintowers.txt | 14 +++---- npc/events/valentinesday.txt | 6 +-- npc/events/valentinesday_2009.txt | 6 +-- npc/events/valentinesday_2012.txt | 6 +-- npc/events/whiteday.txt | 4 +- npc/events/xmas.txt | 14 +++---- npc/instances/EndlessTower.txt | 10 ++--- npc/instances/NydhoggsNest.txt | 6 +-- npc/instances/OrcsMemory.txt | 6 +-- npc/instances/SealedShrine.txt | 10 ++--- npc/jobs/1-1e/gunslinger.txt | 24 +++++------ npc/jobs/1-1e/ninja.txt | 14 +++---- npc/jobs/1-1e/taekwon.txt | 10 ++--- npc/jobs/2-1/assassin.txt | 30 +++++++------- npc/jobs/2-1/blacksmith.txt | 28 ++++++------- npc/jobs/2-1/hunter.txt | 28 ++++++------- npc/jobs/2-1/knight.txt | 22 +++++------ npc/jobs/2-1/priest.txt | 18 ++++----- npc/jobs/2-1/wizard.txt | 26 ++++++------ npc/jobs/2-1a/AssassinCross.txt | 8 ++-- npc/jobs/2-1a/HighPriest.txt | 8 ++-- npc/jobs/2-1a/HighWizard.txt | 8 ++-- npc/jobs/2-1a/LordKnight.txt | 8 ++-- npc/jobs/2-1a/Sniper.txt | 8 ++-- npc/jobs/2-1a/WhiteSmith.txt | 8 ++-- npc/jobs/2-1e/StarGladiator.txt | 12 +++--- npc/jobs/2-2/alchemist.txt | 16 ++++---- npc/jobs/2-2/bard.txt | 14 +++---- npc/jobs/2-2/crusader.txt | 24 +++++------ npc/jobs/2-2/dancer.txt | 26 ++++++------ npc/jobs/2-2/monk.txt | 22 +++++------ npc/jobs/2-2/rogue.txt | 20 +++++----- npc/jobs/2-2/sage.txt | 20 +++++----- npc/jobs/2-2a/Champion.txt | 8 ++-- npc/jobs/2-2a/Clown.txt | 10 ++--- npc/jobs/2-2a/Creator.txt | 12 +++--- npc/jobs/2-2a/Gypsy.txt | 8 ++-- npc/jobs/2-2a/Paladin.txt | 8 ++-- npc/jobs/2-2a/Professor.txt | 8 ++-- npc/jobs/2-2a/Stalker.txt | 8 ++-- npc/jobs/2-2e/SoulLinker.txt | 14 +++---- npc/jobs/novice/supernovice.txt | 14 +++---- npc/jobs/valkyrie.txt | 18 ++++----- npc/kafras/cool_event_corp.txt | 12 +++--- npc/kafras/dts_warper.txt | 12 +++--- npc/kafras/functions_kafras.txt | 40 +++++++++---------- npc/kafras/kafras.txt | 18 ++++----- npc/mapflag/battleground.txt | 4 +- npc/mapflag/gvg.txt | 6 +-- npc/mapflag/jail.txt | 6 +-- npc/mapflag/night.txt | 4 +- npc/mapflag/nightmare.txt | 6 +-- npc/mapflag/nobranch.txt | 12 +++--- npc/mapflag/noexp.txt | 14 +++---- npc/mapflag/noicewall.txt | 10 ++--- npc/mapflag/noloot.txt | 6 +-- npc/mapflag/nomemo.txt | 18 ++++----- npc/mapflag/nopenalty.txt | 10 ++--- npc/mapflag/nopvp.txt | 4 +- npc/mapflag/noreturn.txt | 14 +++---- npc/mapflag/nosave.txt | 8 ++-- npc/mapflag/noskill.txt | 8 ++-- npc/mapflag/noteleport.txt | 10 ++--- npc/mapflag/notomb.txt | 4 +- npc/mapflag/novending.txt | 4 +- npc/mapflag/nowarp.txt | 6 +-- npc/mapflag/nowarpto.txt | 6 +-- npc/mapflag/partylock.txt | 6 +-- npc/mapflag/private_airship.txt | 2 +- npc/mapflag/pvp.txt | 6 +-- npc/mapflag/pvp_noguild.txt | 6 +-- npc/mapflag/pvp_noparty.txt | 6 +-- npc/mapflag/reset.txt | 4 +- npc/mapflag/skillduration.txt | 2 +- npc/mapflag/skillmodifier.txt | 2 +- npc/mapflag/town.txt | 4 +- npc/mapflag/zone.txt | 4 +- npc/merchants/advanced_refiner.txt | 10 ++--- npc/merchants/alchemist.txt | 18 ++++----- npc/merchants/ammo_boxes.txt | 18 ++++----- npc/merchants/ammo_dealer.txt | 16 ++++---- npc/merchants/buying_shops.txt | 6 +-- npc/merchants/cash_hair.txt | 4 +- npc/merchants/cash_trader.txt | 4 +- npc/merchants/cashheadgear_dye.txt | 6 +-- npc/merchants/clothes_dyer.txt | 14 +++---- npc/merchants/coin_exchange.txt | 10 ++--- npc/merchants/dye_maker.txt | 14 +++---- npc/merchants/elemental_trader.txt | 12 +++--- npc/merchants/enchan_arm.txt | 8 ++-- npc/merchants/gemstone.txt | 6 +-- npc/merchants/hair_dyer.txt | 10 ++--- npc/merchants/hair_style.txt | 14 +++---- npc/merchants/hd_refine.txt | 4 +- npc/merchants/icecream.txt | 10 ++--- npc/merchants/inn.txt | 18 ++++----- npc/merchants/kunai_maker.txt | 16 ++++---- npc/merchants/milk_trader.txt | 8 ++-- npc/merchants/novice_exchange.txt | 12 +++--- npc/merchants/old_pharmacist.txt | 10 ++--- npc/merchants/quivers.txt | 10 ++--- npc/merchants/refine.txt | 46 +++++++++++----------- npc/merchants/renters.txt | 20 +++++----- npc/merchants/shops.txt | 38 +++++++++--------- npc/merchants/socket_enchant.txt | 26 ++++++------ npc/merchants/socket_enchant2.txt | 8 ++-- npc/merchants/wander_pet_food.txt | 6 +-- npc/mobs/citycleaners.txt | 12 +++--- npc/mobs/jail.txt | 4 +- npc/mobs/pvp.txt | 4 +- npc/mobs/towns.txt | 4 +- npc/other/CashShop_Functions.txt | 8 ++-- npc/other/Global_Functions.txt | 18 ++++----- npc/other/acolyte_warp.txt | 4 +- npc/other/arena/arena_aco.txt | 8 ++-- npc/other/arena/arena_lvl50.txt | 8 ++-- npc/other/arena/arena_lvl60.txt | 10 ++--- npc/other/arena/arena_lvl70.txt | 8 ++-- npc/other/arena/arena_lvl80.txt | 8 ++-- npc/other/arena/arena_party.txt | 12 +++--- npc/other/arena/arena_point.txt | 4 +- npc/other/arena/arena_room.txt | 8 ++-- npc/other/auction.txt | 6 +-- npc/other/books.txt | 4 +- npc/other/bulletin_boards.txt | 16 ++++---- npc/other/card_trader.txt | 6 +-- npc/other/comodo_gambling.txt | 24 +++++------ npc/other/divorce.txt | 12 +++--- npc/other/fortune.txt | 4 +- npc/other/gm_npcs.txt | 4 +- npc/other/guildpvp.txt | 6 +-- npc/other/gympass.txt | 8 ++-- npc/other/hugel_bingo.txt | 12 +++--- npc/other/inventory_expansion.txt | 4 +- npc/other/item_merge.txt | 4 +- npc/other/mail.txt | 12 +++--- npc/other/marriage.txt | 6 +-- npc/other/mercenary_rent.txt | 8 ++-- npc/other/monster_museum.txt | 14 +++---- npc/other/monster_race.txt | 10 ++--- npc/other/msg_boards.txt | 16 ++++---- npc/other/poring_war.txt | 12 +++--- npc/other/powernpc.txt | 8 ++-- npc/other/private_airship.txt | 4 +- npc/other/pvp.txt | 12 +++--- npc/other/turbo_track.txt | 12 +++--- npc/pre-re/airports/izlude.txt | 4 +- npc/pre-re/cities/alberta.txt | 4 +- npc/pre-re/cities/izlude.txt | 4 +- npc/pre-re/cities/jawaii.txt | 4 +- npc/pre-re/cities/yuno.txt | 4 +- npc/pre-re/guides/guides_alberta.txt | 14 +++---- npc/pre-re/guides/guides_aldebaran.txt | 18 ++++----- npc/pre-re/guides/guides_amatsu.txt | 8 ++-- npc/pre-re/guides/guides_ayothaya.txt | 6 +-- npc/pre-re/guides/guides_comodo.txt | 10 ++--- npc/pre-re/guides/guides_einbroch.txt | 12 +++--- npc/pre-re/guides/guides_geffen.txt | 14 +++---- npc/pre-re/guides/guides_gonryun.txt | 6 +-- npc/pre-re/guides/guides_hugel.txt | 8 ++-- npc/pre-re/guides/guides_izlude.txt | 14 +++---- npc/pre-re/guides/guides_juno.txt | 16 ++++---- npc/pre-re/guides/guides_lighthalzen.txt | 8 ++-- npc/pre-re/guides/guides_louyang.txt | 8 ++-- npc/pre-re/guides/guides_morroc.txt | 12 +++--- npc/pre-re/guides/guides_moscovia.txt | 4 +- npc/pre-re/guides/guides_niflheim.txt | 6 +-- npc/pre-re/guides/guides_payon.txt | 16 ++++---- npc/pre-re/guides/guides_prontera.txt | 16 ++++---- npc/pre-re/guides/guides_rachel.txt | 6 +-- npc/pre-re/guides/guides_umbala.txt | 12 +++--- npc/pre-re/guides/guides_veins.txt | 4 +- npc/pre-re/jobs/1-1/acolyte.txt | 14 +++---- npc/pre-re/jobs/1-1/archer.txt | 10 ++--- npc/pre-re/jobs/1-1/mage.txt | 16 ++++---- npc/pre-re/jobs/1-1/merchant.txt | 14 +++---- npc/pre-re/jobs/1-1/swordman.txt | 22 +++++------ npc/pre-re/jobs/1-1/thief.txt | 12 +++--- npc/pre-re/jobs/1-1e/taekwon.txt | 2 +- npc/pre-re/jobs/novice/novice.txt | 20 +++++----- npc/pre-re/kafras/kafras.txt | 4 +- npc/pre-re/mapflag/gvg.txt | 2 +- npc/pre-re/merchants/ammo_boxes.txt | 4 +- npc/pre-re/merchants/ammo_dealer.txt | 4 +- npc/pre-re/merchants/shops.txt | 8 ++-- npc/pre-re/mobs/citycleaners.txt | 4 +- npc/pre-re/mobs/dungeons/abbey.txt | 6 +-- npc/pre-re/mobs/dungeons/abyss.txt | 10 ++--- npc/pre-re/mobs/dungeons/alde_dun.txt | 8 ++-- npc/pre-re/mobs/dungeons/ama_dun.txt | 8 ++-- npc/pre-re/mobs/dungeons/anthell.txt | 8 ++-- npc/pre-re/mobs/dungeons/ayo_dun.txt | 12 +++--- npc/pre-re/mobs/dungeons/beach_dun.txt | 8 ++-- npc/pre-re/mobs/dungeons/c_tower.txt | 6 +-- npc/pre-re/mobs/dungeons/ein_dun.txt | 12 +++--- npc/pre-re/mobs/dungeons/gef_dun.txt | 8 ++-- npc/pre-re/mobs/dungeons/gefenia.txt | 10 ++--- npc/pre-re/mobs/dungeons/glastheim.txt | 12 +++--- npc/pre-re/mobs/dungeons/gld_dun.txt | 8 ++-- npc/pre-re/mobs/dungeons/gld_dunSE.txt | 6 +-- npc/pre-re/mobs/dungeons/gon_dun.txt | 8 ++-- npc/pre-re/mobs/dungeons/ice_dun.txt | 8 ++-- npc/pre-re/mobs/dungeons/in_sphinx.txt | 8 ++-- npc/pre-re/mobs/dungeons/iz_dun.txt | 6 +-- npc/pre-re/mobs/dungeons/juperos.txt | 16 ++++---- npc/pre-re/mobs/dungeons/kh_dun.txt | 8 ++-- npc/pre-re/mobs/dungeons/lhz_dun.txt | 20 +++++----- npc/pre-re/mobs/dungeons/lou_dun.txt | 8 ++-- npc/pre-re/mobs/dungeons/mag_dun.txt | 8 ++-- npc/pre-re/mobs/dungeons/mjo_dun.txt | 6 +-- npc/pre-re/mobs/dungeons/moc_pryd.txt | 8 ++-- npc/pre-re/mobs/dungeons/mosk_dun.txt | 10 ++--- npc/pre-re/mobs/dungeons/nyd_dun.txt | 4 +- npc/pre-re/mobs/dungeons/odin.txt | 10 ++--- npc/pre-re/mobs/dungeons/orcsdun.txt | 6 +-- npc/pre-re/mobs/dungeons/pay_dun.txt | 8 ++-- npc/pre-re/mobs/dungeons/prt_maze.txt | 8 ++-- npc/pre-re/mobs/dungeons/prt_sew.txt | 8 ++-- npc/pre-re/mobs/dungeons/ra_san.txt | 8 ++-- npc/pre-re/mobs/dungeons/tha_t.txt | 10 ++--- npc/pre-re/mobs/dungeons/thor_v.txt | 6 +-- npc/pre-re/mobs/dungeons/treasure.txt | 8 ++-- npc/pre-re/mobs/dungeons/tur_dun.txt | 6 +-- npc/pre-re/mobs/dungeons/um_dun.txt | 6 +-- npc/pre-re/mobs/dungeons/xmas_dun.txt | 8 ++-- npc/pre-re/mobs/dungeons/yggdrasil.txt | 8 ++-- npc/pre-re/mobs/fields/amatsu.txt | 8 ++-- npc/pre-re/mobs/fields/ayothaya.txt | 12 +++--- npc/pre-re/mobs/fields/comodo.txt | 6 +-- npc/pre-re/mobs/fields/einbroch.txt | 14 +++---- npc/pre-re/mobs/fields/geffen.txt | 10 ++--- npc/pre-re/mobs/fields/gonryun.txt | 6 +-- npc/pre-re/mobs/fields/hugel.txt | 12 +++--- npc/pre-re/mobs/fields/lighthalzen.txt | 14 +++---- npc/pre-re/mobs/fields/louyang.txt | 10 ++--- npc/pre-re/mobs/fields/lutie.txt | 8 ++-- npc/pre-re/mobs/fields/manuk.txt | 8 ++-- npc/pre-re/mobs/fields/mjolnir.txt | 6 +-- npc/pre-re/mobs/fields/morocc.txt | 10 ++--- npc/pre-re/mobs/fields/moscovia.txt | 6 +-- npc/pre-re/mobs/fields/niflheim.txt | 14 +++---- npc/pre-re/mobs/fields/payon.txt | 8 ++-- npc/pre-re/mobs/fields/prontera.txt | 8 ++-- npc/pre-re/mobs/fields/rachel.txt | 10 ++--- npc/pre-re/mobs/fields/splendide.txt | 8 ++-- npc/pre-re/mobs/fields/umbala.txt | 6 +-- npc/pre-re/mobs/fields/veins.txt | 8 ++-- npc/pre-re/mobs/fields/yuno.txt | 18 ++++----- npc/pre-re/other/bulletin_boards.txt | 4 +- npc/pre-re/other/mercenary_rent.txt | 4 +- npc/pre-re/other/msg_boards.txt | 4 +- npc/pre-re/other/pvp.txt | 4 +- npc/pre-re/other/resetskill.txt | 4 +- npc/pre-re/other/turbo_track.txt | 4 +- npc/pre-re/quests/collection/quest_alligator.txt | 4 +- npc/pre-re/quests/collection/quest_caramel.txt | 4 +- npc/pre-re/quests/collection/quest_coco.txt | 4 +- npc/pre-re/quests/collection/quest_creamy.txt | 4 +- npc/pre-re/quests/collection/quest_demonpungus.txt | 4 +- .../quests/collection/quest_disguiseloliruri.txt | 4 +- npc/pre-re/quests/collection/quest_dokebi.txt | 4 +- npc/pre-re/quests/collection/quest_dryad.txt | 4 +- npc/pre-re/quests/collection/quest_fabre.txt | 4 +- npc/pre-re/quests/collection/quest_frilldora.txt | 4 +- npc/pre-re/quests/collection/quest_goat.txt | 4 +- npc/pre-re/quests/collection/quest_golem.txt | 4 +- npc/pre-re/quests/collection/quest_hode.txt | 4 +- npc/pre-re/quests/collection/quest_leafcat.txt | 4 +- npc/pre-re/quests/collection/quest_mantis.txt | 4 +- npc/pre-re/quests/collection/quest_pecopeco.txt | 4 +- npc/pre-re/quests/collection/quest_pupa.txt | 4 +- npc/pre-re/quests/collection/quest_zhupolong.txt | 4 +- npc/pre-re/quests/first_class/tu_archer.txt | 4 +- npc/pre-re/quests/monstertamers.txt | 4 +- npc/pre-re/quests/mrsmile.txt | 4 +- npc/pre-re/quests/quests_13_1.txt | 4 +- npc/pre-re/quests/quests_izlude.txt | 4 +- npc/pre-re/quests/quests_lighthalzen.txt | 4 +- npc/pre-re/quests/quests_nameless.txt | 4 +- npc/pre-re/quests/quests_payon.txt | 4 +- npc/pre-re/quests/quests_veins.txt | 4 +- npc/pre-re/quests/skills/novice_skills.txt | 14 +++---- npc/pre-re/scripts.conf | 4 +- npc/pre-re/scripts_jobs.conf | 4 +- npc/pre-re/scripts_main.conf | 4 +- npc/pre-re/scripts_mapflags.conf | 2 +- npc/pre-re/scripts_monsters.conf | 4 +- npc/pre-re/scripts_warps.conf | 4 +- npc/pre-re/warps/cities/izlude.txt | 8 ++-- npc/pre-re/warps/cities/rachel.txt | 10 ++--- npc/pre-re/warps/cities/yggdrasil.txt | 4 +- npc/pre-re/warps/fields/com_fild.txt | 6 +-- npc/pre-re/warps/fields/geffen_fild.txt | 4 +- npc/pre-re/warps/fields/hugel_fild.txt | 8 ++-- npc/pre-re/warps/fields/morroc_fild.txt | 8 ++-- npc/pre-re/warps/fields/payon_fild.txt | 6 +-- npc/pre-re/warps/fields/prontera_fild.txt | 8 ++-- npc/pre-re/warps/fields/rachel_fild.txt | 6 +-- npc/pre-re/warps/fields/veins_fild.txt | 8 ++-- npc/pre-re/warps/fields/yuno_fild.txt | 6 +-- npc/pre-re/warps/other/arena.txt | 4 +- npc/pre-re/warps/other/sign.txt | 6 +-- npc/quests/bard_quest.txt | 12 +++--- npc/quests/bunnyband.txt | 12 +++--- npc/quests/cooking_quest.txt | 14 +++---- npc/quests/counteragent_mixture.txt | 14 +++---- npc/quests/dandelion_request.txt | 6 +-- npc/quests/doomed_swords.txt | 8 ++-- npc/quests/doomed_swords_quest.txt | 4 +- npc/quests/eye_of_hellion.txt | 14 +++---- npc/quests/first_class/tu_acolyte.txt | 16 ++++---- npc/quests/first_class/tu_archer.txt | 14 +++---- npc/quests/first_class/tu_ma_th01.txt | 8 ++-- npc/quests/first_class/tu_magician01.txt | 12 +++--- npc/quests/first_class/tu_merchant.txt | 10 ++--- npc/quests/first_class/tu_sword.txt | 14 +++---- npc/quests/first_class/tu_thief01.txt | 14 +++---- npc/quests/guildrelay.txt | 4 +- npc/quests/gunslinger_quests.txt | 12 +++--- npc/quests/juice_maker.txt | 12 +++--- npc/quests/kiel_hyre_quest.txt | 20 +++++----- npc/quests/lvl4_weapon_quest.txt | 16 ++++---- npc/quests/mage_solution.txt | 8 ++-- npc/quests/monstertamers.txt | 16 ++++---- npc/quests/mrsmile.txt | 12 +++--- npc/quests/newgears/2004_headgears.txt | 8 ++-- npc/quests/newgears/2005_headgears.txt | 12 +++--- npc/quests/newgears/2006_headgears.txt | 10 ++--- npc/quests/newgears/2008_headgears.txt | 6 +-- npc/quests/newgears/2010_headgears.txt | 4 +- npc/quests/ninja_quests.txt | 6 +-- npc/quests/obb_quest.txt | 10 ++--- npc/quests/okolnir.txt | 10 ++--- npc/quests/partyrelay.txt | 6 +-- npc/quests/quests_13_1.txt | 16 ++++---- npc/quests/quests_13_2.txt | 12 +++--- npc/quests/quests_airship.txt | 16 ++++---- npc/quests/quests_alberta.txt | 16 ++++---- npc/quests/quests_aldebaran.txt | 10 ++--- npc/quests/quests_amatsu.txt | 18 ++++----- npc/quests/quests_ayothaya.txt | 20 +++++----- npc/quests/quests_comodo.txt | 14 +++---- npc/quests/quests_ein.txt | 26 ++++++------ npc/quests/quests_geffen.txt | 14 +++---- npc/quests/quests_gonryun.txt | 8 ++-- npc/quests/quests_hugel.txt | 12 +++--- npc/quests/quests_izlude.txt | 10 ++--- npc/quests/quests_juperos.txt | 14 +++---- npc/quests/quests_lighthalzen.txt | 26 ++++++------ npc/quests/quests_louyang.txt | 18 ++++----- npc/quests/quests_lutie.txt | 10 ++--- npc/quests/quests_morocc.txt | 16 ++++---- npc/quests/quests_moscovia.txt | 18 ++++----- npc/quests/quests_nameless.txt | 12 +++--- npc/quests/quests_niflheim.txt | 14 +++---- npc/quests/quests_payon.txt | 12 +++--- npc/quests/quests_prontera.txt | 18 ++++----- npc/quests/quests_rachel.txt | 6 +-- npc/quests/quests_umbala.txt | 16 ++++---- npc/quests/quests_veins.txt | 10 ++--- npc/quests/quests_yuno.txt | 18 ++++----- npc/quests/seals/brisingamen_seal.txt | 14 +++---- npc/quests/seals/god_global.txt | 8 ++-- npc/quests/seals/god_weapon_creation.txt | 10 ++--- npc/quests/seals/megingard_seal.txt | 16 ++++---- npc/quests/seals/mjolnir_seal.txt | 16 ++++---- npc/quests/seals/seal_status.txt | 6 +-- npc/quests/seals/sleipnir_seal.txt | 8 ++-- npc/quests/skills/acolyte_skills.txt | 14 +++---- npc/quests/skills/alchemist_skills.txt | 14 +++---- npc/quests/skills/archer_skills.txt | 20 +++++----- npc/quests/skills/assassin_skills.txt | 10 ++--- npc/quests/skills/bard_skills.txt | 10 ++--- npc/quests/skills/blacksmith_skills.txt | 12 +++--- npc/quests/skills/crusader_skills.txt | 10 ++--- npc/quests/skills/dancer_skills.txt | 12 +++--- npc/quests/skills/hunter_skills.txt | 12 +++--- npc/quests/skills/knight_skills.txt | 12 +++--- npc/quests/skills/mage_skills.txt | 16 ++++---- npc/quests/skills/merchant_skills.txt | 18 ++++----- npc/quests/skills/monk_skills.txt | 12 +++--- npc/quests/skills/priest_skills.txt | 10 ++--- npc/quests/skills/rogue_skills.txt | 14 +++---- npc/quests/skills/sage_skills.txt | 14 +++---- npc/quests/skills/swordman_skills.txt | 20 +++++----- npc/quests/skills/thief_skills.txt | 18 ++++----- npc/quests/skills/wizard_skills.txt | 12 +++--- npc/quests/thana_quest.txt | 6 +-- npc/quests/the_sign_quest.txt | 18 ++++----- npc/re/airports/izlude.txt | 6 +-- npc/re/battleground/bg_common.txt | 6 +-- npc/re/cities/alberta.txt | 4 +- npc/re/cities/brasilis.txt | 8 ++-- npc/re/cities/dewata.txt | 12 +++--- npc/re/cities/dicastes.txt | 12 +++--- npc/re/cities/eclage.txt | 4 +- npc/re/cities/izlude.txt | 6 +-- npc/re/cities/jawaii.txt | 8 ++-- npc/re/cities/malangdo.txt | 6 +-- npc/re/cities/malaya.txt | 6 +-- npc/re/cities/mora.txt | 8 ++-- npc/re/cities/yuno.txt | 4 +- npc/re/events/christmas_2013.txt | 4 +- npc/re/events/halloween_2013.txt | 6 +-- npc/re/events/halloween_2014.txt | 10 ++--- npc/re/guides/guides_alberta.txt | 6 +-- npc/re/guides/guides_aldebaran.txt | 6 +-- npc/re/guides/guides_amatsu.txt | 6 +-- npc/re/guides/guides_ayothaya.txt | 8 ++-- npc/re/guides/guides_brasilis.txt | 6 +-- npc/re/guides/guides_comodo.txt | 6 +-- npc/re/guides/guides_dewata.txt | 8 ++-- npc/re/guides/guides_dicastes.txt | 8 ++-- npc/re/guides/guides_eclage.txt | 4 +- npc/re/guides/guides_einbroch.txt | 6 +-- npc/re/guides/guides_geffen.txt | 6 +-- npc/re/guides/guides_gonryun.txt | 6 +-- npc/re/guides/guides_hugel.txt | 6 +-- npc/re/guides/guides_izlude.txt | 8 ++-- npc/re/guides/guides_juno.txt | 6 +-- npc/re/guides/guides_lighthalzen.txt | 6 +-- npc/re/guides/guides_louyang.txt | 6 +-- npc/re/guides/guides_lutie.txt | 6 +-- npc/re/guides/guides_malaya.txt | 4 +- npc/re/guides/guides_mora.txt | 4 +- npc/re/guides/guides_morroc.txt | 6 +-- npc/re/guides/guides_moscovia.txt | 6 +-- npc/re/guides/guides_niflheim.txt | 6 +-- npc/re/guides/guides_payon.txt | 6 +-- npc/re/guides/guides_prontera.txt | 6 +-- npc/re/guides/guides_rachel.txt | 6 +-- npc/re/guides/guides_umbala.txt | 6 +-- npc/re/guides/guides_veins.txt | 6 +-- npc/re/guides/navigation.txt | 4 +- npc/re/instances/BakonawaLake.txt | 4 +- npc/re/instances/BangungotHospital.txt | 4 +- npc/re/instances/BuwayaCave.txt | 4 +- npc/re/instances/EclageInterior.txt | 4 +- npc/re/instances/HazyForest.txt | 4 +- npc/re/instances/MalangdoCulvert.txt | 6 +-- npc/re/instances/OldGlastHeim.txt | 12 +++--- npc/re/instances/WolfchevLaboratory.txt | 6 +-- npc/re/instances/ghost_palace.txt | 6 +-- npc/re/instances/octopus_cave.txt | 6 +-- npc/re/instances/saras_memory.txt | 6 +-- npc/re/jobs/1-1/acolyte.txt | 8 ++-- npc/re/jobs/1-1/archer.txt | 8 ++-- npc/re/jobs/1-1/mage.txt | 8 ++-- npc/re/jobs/1-1/merchant.txt | 8 ++-- npc/re/jobs/1-1/swordman.txt | 8 ++-- npc/re/jobs/1-1/thief.txt | 8 ++-- npc/re/jobs/1-1e/taekwon.txt | 2 +- npc/re/jobs/2e/kagerou_oboro.txt | 10 ++--- npc/re/jobs/3-1/archbishop.txt | 12 +++--- npc/re/jobs/3-1/guillotine_cross.txt | 8 ++-- npc/re/jobs/3-1/mechanic.txt | 10 ++--- npc/re/jobs/3-1/ranger.txt | 10 ++--- npc/re/jobs/3-1/rune_knight.txt | 10 ++--- npc/re/jobs/3-1/warlock.txt | 12 +++--- npc/re/jobs/3-2/genetic.txt | 14 +++---- npc/re/jobs/3-2/minstrel.txt | 10 ++--- npc/re/jobs/3-2/royal_guard.txt | 8 ++-- npc/re/jobs/3-2/shadow_chaser.txt | 12 +++--- npc/re/jobs/3-2/sorcerer.txt | 8 ++-- npc/re/jobs/3-2/sura.txt | 12 +++--- npc/re/jobs/3-2/wanderer.txt | 12 +++--- npc/re/jobs/novice/academy.txt | 6 +-- npc/re/jobs/novice/novice.txt | 8 ++-- npc/re/jobs/novice/supernovice_ex.txt | 4 +- npc/re/jobs/repair.txt | 6 +-- npc/re/kafras/kafras.txt | 12 +++--- npc/re/mapflag/gvg.txt | 2 +- npc/re/mapflag/zone.txt | 4 +- npc/re/merchants/3rd_trader.txt | 8 ++-- npc/re/merchants/advanced_refiner.txt | 4 +- npc/re/merchants/alchemist.txt | 8 ++-- npc/re/merchants/ammo_boxes.txt | 4 +- npc/re/merchants/ammo_dealer.txt | 4 +- npc/re/merchants/blessed_refiner.txt | 4 +- npc/re/merchants/card_separation.txt | 6 +-- npc/re/merchants/catalog.txt | 8 ++-- npc/re/merchants/coin_exchange.txt | 10 ++--- npc/re/merchants/diamond.txt | 4 +- npc/re/merchants/enchan_ko.txt | 4 +- npc/re/merchants/enchan_mal.txt | 6 +-- npc/re/merchants/enchan_mora.txt | 8 ++-- npc/re/merchants/enchan_upg.txt | 6 +-- npc/re/merchants/flute.txt | 10 ++--- npc/re/merchants/hd_refiner.txt | 4 +- npc/re/merchants/inn.txt | 6 +-- npc/re/merchants/ninja_craftsman.txt | 4 +- npc/re/merchants/quivers.txt | 8 ++-- npc/re/merchants/refine.txt | 6 +-- npc/re/merchants/renters.txt | 10 ++--- npc/re/merchants/shadow_refiner.txt | 2 +- npc/re/merchants/shops.txt | 18 ++++----- npc/re/merchants/ticket_refiner.txt | 4 +- npc/re/mobs/champion.txt | 4 +- npc/re/mobs/citycleaners.txt | 4 +- npc/re/mobs/dungeons/abbey.txt | 6 +-- npc/re/mobs/dungeons/abyss.txt | 10 ++--- npc/re/mobs/dungeons/alde_dun.txt | 8 ++-- npc/re/mobs/dungeons/ama_dun.txt | 8 ++-- npc/re/mobs/dungeons/anthell.txt | 8 ++-- npc/re/mobs/dungeons/ayo_dun.txt | 12 +++--- npc/re/mobs/dungeons/beach_dun.txt | 8 ++-- npc/re/mobs/dungeons/bra_dun.txt | 4 +- npc/re/mobs/dungeons/c_tower.txt | 6 +-- npc/re/mobs/dungeons/dew_dun.txt | 6 +-- npc/re/mobs/dungeons/dic_dun.txt | 8 ++-- npc/re/mobs/dungeons/ecl_tdun.txt | 8 ++-- npc/re/mobs/dungeons/ein_dun.txt | 12 +++--- npc/re/mobs/dungeons/gef_dun.txt | 8 ++-- npc/re/mobs/dungeons/gefenia.txt | 10 ++--- npc/re/mobs/dungeons/glastheim.txt | 12 +++--- npc/re/mobs/dungeons/gld_dunSE.txt | 6 +-- npc/re/mobs/dungeons/gld_re.txt | 4 +- npc/re/mobs/dungeons/gon_dun.txt | 8 ++-- npc/re/mobs/dungeons/ice_dun.txt | 8 ++-- npc/re/mobs/dungeons/in_sphinx.txt | 8 ++-- npc/re/mobs/dungeons/iz_dun.txt | 8 ++-- npc/re/mobs/dungeons/juperos.txt | 16 ++++---- npc/re/mobs/dungeons/kh_dun.txt | 8 ++-- npc/re/mobs/dungeons/lhz_dun.txt | 22 +++++------ npc/re/mobs/dungeons/lou_dun.txt | 8 ++-- npc/re/mobs/dungeons/ma_dun.txt | 4 +- npc/re/mobs/dungeons/mag_dun.txt | 8 ++-- npc/re/mobs/dungeons/mal_dun.txt | 6 +-- npc/re/mobs/dungeons/mjo_dun.txt | 6 +-- npc/re/mobs/dungeons/moc_pryd.txt | 10 ++--- npc/re/mobs/dungeons/mosk_dun.txt | 10 ++--- npc/re/mobs/dungeons/nyd_dun.txt | 4 +- npc/re/mobs/dungeons/odin.txt | 10 ++--- npc/re/mobs/dungeons/orcsdun.txt | 6 +-- npc/re/mobs/dungeons/pay_dun.txt | 8 ++-- npc/re/mobs/dungeons/prt_maze.txt | 8 ++-- npc/re/mobs/dungeons/prt_sew.txt | 8 ++-- npc/re/mobs/dungeons/ra_san.txt | 8 ++-- npc/re/mobs/dungeons/tha_t.txt | 10 ++--- npc/re/mobs/dungeons/thor_v.txt | 6 +-- npc/re/mobs/dungeons/treasure.txt | 10 ++--- npc/re/mobs/dungeons/tur_dun.txt | 6 +-- npc/re/mobs/dungeons/xmas_dun.txt | 8 ++-- npc/re/mobs/dungeons/yggdrasil.txt | 8 ++-- npc/re/mobs/fields/amatsu.txt | 10 ++--- npc/re/mobs/fields/ayothaya.txt | 16 ++++---- npc/re/mobs/fields/bifrost.txt | 6 +-- npc/re/mobs/fields/brasilis.txt | 4 +- npc/re/mobs/fields/comodo.txt | 8 ++-- npc/re/mobs/fields/dewata.txt | 6 +-- npc/re/mobs/fields/dicastes.txt | 4 +- npc/re/mobs/fields/eclage.txt | 10 ++--- npc/re/mobs/fields/einbroch.txt | 18 ++++----- npc/re/mobs/fields/geffen.txt | 10 ++--- npc/re/mobs/fields/gonryun.txt | 10 ++--- npc/re/mobs/fields/hugel.txt | 16 ++++---- npc/re/mobs/fields/lighthalzen.txt | 16 ++++---- npc/re/mobs/fields/louyang.txt | 14 +++---- npc/re/mobs/fields/lutie.txt | 10 ++--- npc/re/mobs/fields/malaya.txt | 4 +- npc/re/mobs/fields/manuk.txt | 8 ++-- npc/re/mobs/fields/mjolnir.txt | 8 ++-- npc/re/mobs/fields/morocc.txt | 10 ++--- npc/re/mobs/fields/moscovia.txt | 10 ++--- npc/re/mobs/fields/niflheim.txt | 16 ++++---- npc/re/mobs/fields/payon.txt | 8 ++-- npc/re/mobs/fields/prontera.txt | 10 ++--- npc/re/mobs/fields/rachel.txt | 14 +++---- npc/re/mobs/fields/splendide.txt | 8 ++-- npc/re/mobs/fields/umbala.txt | 8 ++-- npc/re/mobs/fields/veins.txt | 12 +++--- npc/re/mobs/fields/yuno.txt | 22 +++++------ npc/re/mobs/int_land.txt | 2 +- npc/re/mobs/towns.txt | 4 +- npc/re/other/bulletin_boards.txt | 4 +- npc/re/other/clans.txt | 2 +- npc/re/other/dimensional_gap.txt | 6 +-- npc/re/other/mail.txt | 4 +- npc/re/other/mercenary_rent.txt | 8 ++-- npc/re/other/pvp.txt | 4 +- npc/re/other/resetskill.txt | 4 +- npc/re/other/stone_change.txt | 4 +- npc/re/other/turbo_track.txt | 4 +- npc/re/quests/cupet.txt | 4 +- npc/re/quests/eden/100-110.txt | 6 +-- npc/re/quests/eden/11-25.txt | 8 ++-- npc/re/quests/eden/111-120.txt | 6 +-- npc/re/quests/eden/121-130.txt | 6 +-- npc/re/quests/eden/131-140.txt | 6 +-- npc/re/quests/eden/26-40.txt | 8 ++-- npc/re/quests/eden/41-55.txt | 8 ++-- npc/re/quests/eden/56-70.txt | 10 ++--- npc/re/quests/eden/71-85.txt | 8 ++-- npc/re/quests/eden/86-90.txt | 8 ++-- npc/re/quests/eden/91-99.txt | 8 ++-- npc/re/quests/eden/eden_common.txt | 10 ++--- npc/re/quests/eden/eden_iro.txt | 8 ++-- npc/re/quests/eden/eden_quests.txt | 10 ++--- npc/re/quests/eden/eden_service.txt | 6 +-- npc/re/quests/eden/eden_tutorial.txt | 4 +- npc/re/quests/first_class/tu_archer.txt | 4 +- npc/re/quests/homun_s.txt | 6 +-- npc/re/quests/magic_books.txt | 8 ++-- npc/re/quests/monstertamers.txt | 4 +- npc/re/quests/mrsmile.txt | 8 ++-- npc/re/quests/newgears/2012_headgears.txt | 6 +-- npc/re/quests/pile_bunker.txt | 8 ++-- npc/re/quests/quests_13_1.txt | 4 +- npc/re/quests/quests_aldebaran.txt | 6 +-- npc/re/quests/quests_brasilis.txt | 10 ++--- npc/re/quests/quests_dewata.txt | 10 ++--- npc/re/quests/quests_dicastes.txt | 16 ++++---- npc/re/quests/quests_eclage.txt | 4 +- npc/re/quests/quests_glastheim.txt | 4 +- npc/re/quests/quests_izlude.txt | 8 ++-- npc/re/quests/quests_lighthalzen.txt | 4 +- npc/re/quests/quests_malangdo.txt | 6 +-- npc/re/quests/quests_malaya.txt | 10 ++--- npc/re/quests/quests_mora.txt | 4 +- npc/re/quests/quests_morocc.txt | 4 +- npc/re/quests/quests_nameless.txt | 4 +- npc/re/quests/quests_payon.txt | 4 +- npc/re/quests/quests_veins.txt | 4 +- npc/re/scripts.conf | 4 +- npc/re/scripts_jobs.conf | 4 +- npc/re/scripts_main.conf | 4 +- npc/re/scripts_mapflags.conf | 4 +- npc/re/scripts_monsters.conf | 4 +- npc/re/scripts_warps.conf | 4 +- npc/re/scripts_woe.conf | 4 +- npc/re/warps/cities/brasilis.txt | 10 ++--- npc/re/warps/cities/dewata.txt | 8 ++-- npc/re/warps/cities/dicastes.txt | 8 ++-- npc/re/warps/cities/eclage.txt | 8 ++-- npc/re/warps/cities/izlude.txt | 16 ++++---- npc/re/warps/cities/malangdo.txt | 6 +-- npc/re/warps/cities/malaya.txt | 8 ++-- npc/re/warps/cities/rachel.txt | 10 ++--- npc/re/warps/cities/yggdrasil.txt | 4 +- npc/re/warps/dungeons/bra_dun.txt | 4 +- npc/re/warps/dungeons/dic_dun.txt | 8 ++-- npc/re/warps/dungeons/ecl_dun.txt | 6 +-- npc/re/warps/dungeons/iz_dun.txt | 8 ++-- npc/re/warps/dungeons/moc_pryd.txt | 4 +- npc/re/warps/fields/bif_fild.txt | 6 +-- npc/re/warps/fields/bra_fild.txt | 4 +- npc/re/warps/fields/com_fild.txt | 6 +-- npc/re/warps/fields/dic_fild.txt | 8 ++-- npc/re/warps/fields/geffen_fild.txt | 4 +- npc/re/warps/fields/hugel_fild.txt | 8 ++-- npc/re/warps/fields/morroc_fild.txt | 10 ++--- npc/re/warps/fields/payon_fild.txt | 6 +-- npc/re/warps/fields/prontera_fild.txt | 12 +++--- npc/re/warps/fields/rachel_fild.txt | 6 +-- npc/re/warps/fields/veins_fild.txt | 8 ++-- npc/re/warps/fields/yuno_fild.txt | 6 +-- npc/re/warps/guildcastles.txt | 4 +- npc/re/warps/other/arena.txt | 4 +- npc/re/warps/other/dimensional_gap.txt | 2 +- npc/re/warps/other/jobquests.txt | 6 +-- npc/re/warps/other/paradise.txt | 4 +- npc/re/warps/other/s_workshop.txt | 6 +-- npc/re/warps/other/sign.txt | 6 +-- npc/re/woe-fe/invest_main.txt | 4 +- npc/re/woe-fe/invest_npc.txt | 4 +- npc/scripts.conf | 4 +- npc/scripts_custom.conf | 4 +- npc/scripts_dev.conf | 2 +- npc/scripts_jobs.conf | 4 +- npc/scripts_mapflags.conf | 4 +- npc/scripts_monsters.conf | 4 +- npc/scripts_removed.conf | 2 +- npc/scripts_warps.conf | 4 +- npc/scripts_woe.conf | 4 +- npc/warps/cities/alberta.txt | 6 +-- npc/warps/cities/aldebaran.txt | 10 ++--- npc/warps/cities/amatsu.txt | 10 ++--- npc/warps/cities/ayothaya.txt | 14 +++---- npc/warps/cities/comodo.txt | 8 ++-- npc/warps/cities/einbech.txt | 8 ++-- npc/warps/cities/einbroch.txt | 16 ++++---- npc/warps/cities/geffen.txt | 8 ++-- npc/warps/cities/gonryun.txt | 6 +-- npc/warps/cities/hugel.txt | 16 ++++---- npc/warps/cities/lighthalzen.txt | 16 ++++---- npc/warps/cities/louyang.txt | 16 ++++---- npc/warps/cities/lutie.txt | 8 ++-- npc/warps/cities/manuk.txt | 4 +- npc/warps/cities/mid_camp.txt | 10 ++--- npc/warps/cities/morroc.txt | 8 ++-- npc/warps/cities/moscovia.txt | 6 +-- npc/warps/cities/nameless.txt | 8 ++-- npc/warps/cities/niflheim.txt | 8 ++-- npc/warps/cities/payon.txt | 16 ++++---- npc/warps/cities/prontera.txt | 12 +++--- npc/warps/cities/splendide.txt | 4 +- npc/warps/cities/umbala.txt | 12 +++--- npc/warps/cities/veins.txt | 10 ++--- npc/warps/cities/yuno.txt | 12 +++--- npc/warps/dungeons/abbey.txt | 4 +- npc/warps/dungeons/abyss.txt | 6 +-- npc/warps/dungeons/alde_dun.txt | 10 ++--- npc/warps/dungeons/ama_dun.txt | 6 +-- npc/warps/dungeons/anthell.txt | 12 +++--- npc/warps/dungeons/ayo_dun.txt | 10 ++--- npc/warps/dungeons/beach_dun.txt | 6 +-- npc/warps/dungeons/c_tower.txt | 6 +-- npc/warps/dungeons/ein_dun.txt | 10 ++--- npc/warps/dungeons/gef_dun.txt | 6 +-- npc/warps/dungeons/gon_dun.txt | 6 +-- npc/warps/dungeons/ice_dun.txt | 6 +-- npc/warps/dungeons/in_sphinx.txt | 6 +-- npc/warps/dungeons/iz_dun.txt | 6 +-- npc/warps/dungeons/juperos.txt | 16 ++++---- npc/warps/dungeons/kh_dun.txt | 8 ++-- npc/warps/dungeons/lhz_dun.txt | 16 ++++---- npc/warps/dungeons/lou_dun.txt | 6 +-- npc/warps/dungeons/mag_dun.txt | 4 +- npc/warps/dungeons/mjo_dun.txt | 4 +- npc/warps/dungeons/moc_pryd.txt | 6 +-- npc/warps/dungeons/mosk_dun.txt | 6 +-- npc/warps/dungeons/odin.txt | 12 +++--- npc/warps/dungeons/orcsdun.txt | 4 +- npc/warps/dungeons/pay_dun.txt | 6 +-- npc/warps/dungeons/prt_maze.txt | 6 +-- npc/warps/dungeons/ra_san.txt | 6 +-- npc/warps/dungeons/tha_t.txt | 6 +-- npc/warps/dungeons/thor_v.txt | 6 +-- npc/warps/dungeons/treasure.txt | 6 +-- npc/warps/dungeons/tur_dun.txt | 6 +-- npc/warps/dungeons/um_dun.txt | 10 ++--- npc/warps/dungeons/xmas_dun.txt | 6 +-- npc/warps/fields/abyss_warper.txt | 14 +++---- npc/warps/fields/amatsu_fild.txt | 6 +-- npc/warps/fields/ein_fild.txt | 10 ++--- npc/warps/fields/gefenia.txt | 8 ++-- npc/warps/fields/glastheim.txt | 10 ++--- npc/warps/fields/jawaii.txt | 10 ++--- npc/warps/fields/lhalzen_fild.txt | 10 ++--- npc/warps/fields/lutie_fild.txt | 6 +-- npc/warps/fields/man_fild.txt | 4 +- npc/warps/fields/mtmjolnir.txt | 10 ++--- npc/warps/fields/spl_fild.txt | 4 +- npc/warps/fields/umbala_fild.txt | 6 +-- npc/warps/guildcastles.txt | 16 ++++---- npc/warps/other/airplane.txt | 18 ++++----- npc/warps/other/arena.txt | 10 ++--- npc/warps/other/god.txt | 6 +-- npc/warps/other/jobquests.txt | 12 +++--- npc/warps/other/kiel.txt | 6 +-- npc/warps/other/other.txt | 4 +- npc/warps/pvp.txt | 8 ++-- npc/woe-fe/agit_controller.txt | 20 +++++----- npc/woe-fe/agit_main.txt | 12 +++--- npc/woe-fe/aldeg_cas01.txt | 6 +-- npc/woe-fe/aldeg_cas02.txt | 6 +-- npc/woe-fe/aldeg_cas03.txt | 6 +-- npc/woe-fe/aldeg_cas04.txt | 6 +-- npc/woe-fe/aldeg_cas05.txt | 6 +-- npc/woe-fe/gefg_cas01.txt | 6 +-- npc/woe-fe/gefg_cas02.txt | 6 +-- npc/woe-fe/gefg_cas03.txt | 6 +-- npc/woe-fe/gefg_cas04.txt | 6 +-- npc/woe-fe/gefg_cas05.txt | 6 +-- npc/woe-fe/payg_cas01.txt | 6 +-- npc/woe-fe/payg_cas02.txt | 8 ++-- npc/woe-fe/payg_cas03.txt | 6 +-- npc/woe-fe/payg_cas04.txt | 8 ++-- npc/woe-fe/payg_cas05.txt | 6 +-- npc/woe-fe/prtg_cas01.txt | 6 +-- npc/woe-fe/prtg_cas02.txt | 6 +-- npc/woe-fe/prtg_cas03.txt | 6 +-- npc/woe-fe/prtg_cas04.txt | 6 +-- npc/woe-fe/prtg_cas05.txt | 6 +-- npc/woe-fe/trs_rp.txt | 6 +-- npc/woe-se/agit_main_se.txt | 12 +++--- npc/woe-se/agit_start_se.txt | 4 +- npc/woe-se/arug_cas01.txt | 4 +- npc/woe-se/arug_cas02.txt | 4 +- npc/woe-se/arug_cas03.txt | 4 +- npc/woe-se/arug_cas04.txt | 4 +- npc/woe-se/arug_cas05.txt | 4 +- npc/woe-se/guild_flags.txt | 4 +- npc/woe-se/schg_cas01.txt | 4 +- npc/woe-se/schg_cas02.txt | 4 +- npc/woe-se/schg_cas03.txt | 4 +- npc/woe-se/schg_cas04.txt | 4 +- npc/woe-se/schg_cas05.txt | 4 +- script-checker | 4 +- script-checker.bat | 2 +- sql-files/item_db.sql | 2 +- sql-files/item_db2.sql | 2 +- sql-files/item_db_re.sql | 2 +- sql-files/logs.sql | 4 +- sql-files/main.sql | 4 +- sql-files/mob_db.sql | 2 +- sql-files/mob_db2.sql | 2 +- sql-files/mob_db_re.sql | 2 +- sql-files/mob_skill_db.sql | 2 +- sql-files/mob_skill_db2.sql | 2 +- sql-files/mob_skill_db_re.sql | 2 +- sql-files/tools/convert_engine_innodb.sql | 4 +- sql-files/tools/convert_engine_myisam.sql | 4 +- sql-files/tools/convert_passwords.sql | 4 +- sql-files/upgrades/2013-02-14--16-15.sql | 2 +- sql-files/upgrades/2013-02-15--18-06.sql | 2 +- sql-files/upgrades/2013-03-05--01-05.sql | 2 +- sql-files/upgrades/2013-03-06--00-00.sql | 4 +- sql-files/upgrades/2013-03-09--01-56.sql | 2 +- sql-files/upgrades/2013-03-27--18-35.sql | 2 +- sql-files/upgrades/2013-04-16--01-24.sql | 2 +- sql-files/upgrades/2013-04-16--02-15.sql | 2 +- sql-files/upgrades/2013-10-09--21-38.sql | 2 +- sql-files/upgrades/2013-10-10--16-36.sql | 2 +- sql-files/upgrades/2013-10-27--16-47.sql | 2 +- sql-files/upgrades/2013-10-30--19-53.sql | 2 +- sql-files/upgrades/2013-10-30--21-12.sql | 2 +- sql-files/upgrades/2013-10-31--07-49.sql | 2 +- sql-files/upgrades/2013-11-09--00-03.sql | 2 +- sql-files/upgrades/2013-11-15--00-06.sql | 4 +- sql-files/upgrades/2013-11-15--19-57.sql | 2 +- sql-files/upgrades/2013-11-16--07-49.sql | 2 +- sql-files/upgrades/2013-11-18--08-23.sql | 4 +- sql-files/upgrades/2013-12-24--00-15.sql | 2 +- sql-files/upgrades/2014-01-04--16-47.sql | 2 +- sql-files/upgrades/2014-01-06--17-22.sql | 2 +- sql-files/upgrades/2014-02-19--17-57.sql | 2 +- sql-files/upgrades/2014-03-25--23-57.sql | 2 +- sql-files/upgrades/2014-04-07--22-04.sql | 2 +- sql-files/upgrades/2014-04-26--10-00.sql | 2 +- sql-files/upgrades/2014-05-17--00-06.sql | 2 +- sql-files/upgrades/2014-09-01--16-53.sql | 2 +- sql-files/upgrades/2014-11-03--00-45.sql | 2 +- sql-files/upgrades/2015-07-02--18-14.sql | 2 +- sql-files/upgrades/2015-07-08--13-08.sql | 2 +- sql-files/upgrades/2015-08-27--20-42.sql | 2 +- sql-files/upgrades/2015-12-16--12-57.sql | 2 +- sql-files/upgrades/2015-12-17--15-58.sql | 2 +- sql-files/upgrades/2016-03-10--22-18.sql | 2 +- sql-files/upgrades/2016-07-08--02-42.sql | 2 +- sql-files/upgrades/2016-07-08--02-51.sql | 2 +- sql-files/upgrades/2016-10-03--20-27.sql | 2 +- sql-files/upgrades/2016-10-26--10-29.sql | 2 +- sql-files/upgrades/2017-03-02--11-40.sql | 2 +- sql-files/upgrades/2017-03-15--14-29.sql | 2 +- sql-files/upgrades/2017-06-04--15-04.sql | 2 +- sql-files/upgrades/2017-06-04--15-05.sql | 2 +- sql-files/upgrades/2018-03-10--04-06.sql | 2 +- sql-files/upgrades/2018-06-03--00-10.sql | 2 +- sql-files/upgrades/2018-06-03--17-16.sql | 2 +- sql-files/upgrades/2018-06-05--12-02.sql | 2 +- sql-files/upgrades/2018-07-24--03-23.sql | 2 +- sql-files/upgrades/2018-09-01--05-22.sql | 2 +- sql-files/upgrades/2018-12-14--01-02.sql | 2 +- sql-files/upgrades/2018-12-29--07-51.sql | 2 +- sql-files/upgrades/2019-04-08--21-52.sql | 2 +- sql-files/upgrades/2019-04-25--02-12.sql | 2 +- sql-files/upgrades/2019-05-09--18-07.sql | 2 +- sql-files/upgrades/2019-08-08--19-43.sql | 2 +- sql-files/upgrades/2019-10-05--19-01.sql | 2 +- sql-files/upgrades/2019-10-12--14-21.sql | 2 +- sql-files/upgrades/2019-11-22--23-58.sql | 2 +- sql-files/upgrades/eAthena-logs-upgrade.sql | 2 +- sql-files/upgrades/eAthena-main-upgrade.sql | 2 +- sql-files/upgrades/rAthena-logs-upgrade.sql | 2 +- sql-files/upgrades/rAthena-main-upgrade.sql | 2 +- src/char/HPMchar.c | 2 +- src/char/HPMchar.h | 2 +- src/char/Makefile.in | 4 +- src/char/char.c | 4 +- src/char/char.h | 4 +- src/char/geoip.c | 4 +- src/char/geoip.h | 4 +- src/char/int_achievement.c | 2 +- src/char/int_achievement.h | 2 +- src/char/int_auction.c | 4 +- src/char/int_auction.h | 4 +- src/char/int_clan.c | 2 +- src/char/int_clan.h | 2 +- src/char/int_elemental.c | 4 +- src/char/int_elemental.h | 4 +- src/char/int_guild.c | 4 +- src/char/int_guild.h | 4 +- src/char/int_homun.c | 4 +- src/char/int_homun.h | 4 +- src/char/int_mail.c | 4 +- src/char/int_mail.h | 4 +- src/char/int_mercenary.c | 4 +- src/char/int_mercenary.h | 4 +- src/char/int_party.c | 4 +- src/char/int_party.h | 4 +- src/char/int_pet.c | 4 +- src/char/int_pet.h | 4 +- src/char/int_quest.c | 4 +- src/char/int_quest.h | 4 +- src/char/int_rodex.c | 2 +- src/char/int_rodex.h | 2 +- src/char/int_storage.c | 4 +- src/char/int_storage.h | 4 +- src/char/inter.c | 4 +- src/char/inter.h | 4 +- src/char/loginif.c | 4 +- src/char/loginif.h | 4 +- src/char/mapif.c | 4 +- src/char/mapif.h | 2 +- src/char/packets_hc_struct.h | 2 +- src/char/pincode.c | 4 +- src/char/pincode.h | 4 +- src/common/HPM.c | 2 +- src/common/HPM.h | 2 +- src/common/HPMDataCheck.h | 2 +- src/common/HPMSymbols.inc.h | 2 +- src/common/HPMi.h | 2 +- src/common/Makefile.in | 4 +- src/common/atomic.h | 4 +- src/common/cbasetypes.h | 2 +- src/common/conf.c | 4 +- src/common/conf.h | 4 +- src/common/console.c | 4 +- src/common/console.h | 2 +- src/common/core.c | 4 +- src/common/core.h | 4 +- src/common/db.c | 4 +- src/common/db.h | 4 +- src/common/des.c | 4 +- src/common/des.h | 4 +- src/common/ers.c | 4 +- src/common/ers.h | 4 +- src/common/grfio.c | 4 +- src/common/grfio.h | 4 +- src/common/hercules.h | 2 +- src/common/mapindex.c | 4 +- src/common/mapindex.h | 4 +- src/common/md5calc.c | 4 +- src/common/md5calc.h | 4 +- src/common/memmgr.c | 4 +- src/common/memmgr.h | 4 +- src/common/mmo.h | 4 +- src/common/mutex.c | 4 +- src/common/mutex.h | 4 +- src/common/nullpo.c | 4 +- src/common/nullpo.h | 4 +- src/common/packets.c | 2 +- src/common/packets.h | 2 +- src/common/packets/packets2003_len_main.h | 4 +- src/common/packets/packets2003_len_sak.h | 4 +- src/common/packets/packets2004_len_ad.h | 4 +- src/common/packets/packets2004_len_main.h | 4 +- src/common/packets/packets2004_len_sak.h | 4 +- src/common/packets/packets2005_len_ad.h | 4 +- src/common/packets/packets2005_len_main.h | 4 +- src/common/packets/packets2005_len_sak.h | 4 +- src/common/packets/packets2006_len_ad.h | 4 +- src/common/packets/packets2006_len_main.h | 4 +- src/common/packets/packets2006_len_sak.h | 4 +- src/common/packets/packets2007_len_ad.h | 4 +- src/common/packets/packets2007_len_main.h | 4 +- src/common/packets/packets2007_len_sak.h | 4 +- src/common/packets/packets2008_len_ad.h | 4 +- src/common/packets/packets2008_len_main.h | 4 +- src/common/packets/packets2008_len_re.h | 4 +- src/common/packets/packets2008_len_sak.h | 4 +- src/common/packets/packets2009_len_main.h | 4 +- src/common/packets/packets2009_len_re.h | 4 +- src/common/packets/packets2009_len_sak.h | 4 +- src/common/packets/packets2010_len_main.h | 4 +- src/common/packets/packets2010_len_re.h | 4 +- src/common/packets/packets2011_len_main.h | 4 +- src/common/packets/packets2011_len_re.h | 4 +- src/common/packets/packets2012_len_main.h | 4 +- src/common/packets/packets2012_len_re.h | 4 +- src/common/packets/packets2013_len_main.h | 4 +- src/common/packets/packets2013_len_re.h | 4 +- src/common/packets/packets2014_len_main.h | 4 +- src/common/packets/packets2014_len_re.h | 4 +- src/common/packets/packets2015_len_main.h | 4 +- src/common/packets/packets2015_len_re.h | 4 +- src/common/packets/packets2016_len_main.h | 4 +- src/common/packets/packets2016_len_re.h | 4 +- src/common/packets/packets2017_len_main.h | 4 +- src/common/packets/packets2017_len_re.h | 4 +- src/common/packets/packets2017_len_zero.h | 4 +- src/common/packets/packets2018_len_main.h | 4 +- src/common/packets/packets2018_len_re.h | 4 +- src/common/packets/packets2018_len_zero.h | 4 +- src/common/packets/packets2019_len_main.h | 4 +- src/common/packets/packets2019_len_re.h | 4 +- src/common/packets/packets2019_len_zero.h | 4 +- src/common/packets/packets2020_len_main.h | 4 +- src/common/packets/packets2020_len_re.h | 4 +- src/common/packets/packets_len_ad.h | 4 +- src/common/packets/packets_len_main.h | 4 +- src/common/packets/packets_len_re.h | 4 +- src/common/packets/packets_len_sak.h | 4 +- src/common/packets/packets_len_zero.h | 4 +- src/common/packets_len.h | 2 +- src/common/packetsstatic_len.h | 2 +- src/common/random.c | 4 +- src/common/random.h | 4 +- src/common/showmsg.c | 4 +- src/common/showmsg.h | 4 +- src/common/socket.c | 4 +- src/common/socket.h | 4 +- src/common/spinlock.h | 4 +- src/common/sql.c | 4 +- src/common/sql.h | 4 +- src/common/strlib.c | 4 +- src/common/strlib.h | 4 +- src/common/sysinfo.c | 4 +- src/common/sysinfo.h | 4 +- src/common/thread.c | 4 +- src/common/thread.h | 4 +- src/common/timer.c | 4 +- src/common/timer.h | 4 +- src/common/utils.c | 4 +- src/common/utils.h | 4 +- src/common/winapi.h | 4 +- src/config/classes/general.h | 4 +- src/config/const.h | 4 +- src/config/core.h | 4 +- src/config/renewal.h | 4 +- src/config/secure.h | 4 +- src/login/HPMlogin.c | 2 +- src/login/HPMlogin.h | 2 +- src/login/Makefile.in | 4 +- src/login/account.c | 4 +- src/login/account.h | 4 +- src/login/ipban.c | 4 +- src/login/ipban.h | 4 +- src/login/lclif.c | 2 +- src/login/lclif.h | 2 +- src/login/lclif.p.h | 2 +- src/login/login.c | 4 +- src/login/login.h | 4 +- src/login/loginlog.c | 4 +- src/login/loginlog.h | 4 +- src/login/packets_ac_struct.h | 2 +- src/login/packets_ca_struct.h | 2 +- src/map/HPMmap.c | 2 +- src/map/HPMmap.h | 2 +- src/map/Makefile.in | 4 +- src/map/achievement.c | 2 +- src/map/achievement.h | 2 +- src/map/atcommand.c | 4 +- src/map/atcommand.h | 4 +- src/map/battle.c | 4 +- src/map/battle.h | 4 +- src/map/battleground.c | 4 +- src/map/battleground.h | 4 +- src/map/buyingstore.c | 4 +- src/map/buyingstore.h | 4 +- src/map/channel.c | 2 +- src/map/channel.h | 2 +- src/map/chat.c | 4 +- src/map/chat.h | 4 +- src/map/chrif.c | 4 +- src/map/chrif.h | 4 +- src/map/clan.c | 2 +- src/map/clan.h | 2 +- src/map/clif.c | 4 +- src/map/clif.h | 4 +- src/map/date.c | 4 +- src/map/date.h | 4 +- src/map/duel.c | 4 +- src/map/duel.h | 4 +- src/map/elemental.c | 4 +- src/map/elemental.h | 4 +- src/map/guild.c | 4 +- src/map/guild.h | 4 +- src/map/homunculus.c | 4 +- src/map/homunculus.h | 4 +- src/map/instance.c | 4 +- src/map/instance.h | 4 +- src/map/intif.c | 4 +- src/map/intif.h | 4 +- src/map/irc-bot.c | 2 +- src/map/irc-bot.h | 2 +- src/map/itemdb.c | 4 +- src/map/itemdb.h | 4 +- src/map/log.c | 4 +- src/map/log.h | 4 +- src/map/mail.c | 4 +- src/map/mail.h | 4 +- src/map/map.c | 4 +- src/map/map.h | 4 +- src/map/mapdefines.h | 4 +- src/map/mapreg.h | 4 +- src/map/mapreg_sql.c | 4 +- src/map/mercenary.c | 4 +- src/map/mercenary.h | 4 +- src/map/messages.h | 4 +- src/map/messages_ad.h | 4 +- src/map/messages_main.h | 4 +- src/map/messages_re.h | 4 +- src/map/messages_sak.h | 4 +- src/map/messages_zero.h | 4 +- src/map/mob.c | 4 +- src/map/mob.h | 4 +- src/map/npc.c | 4 +- src/map/npc.h | 4 +- src/map/npc_chat.c | 4 +- src/map/packets.h | 2 +- src/map/packets_keys_main.h | 4 +- src/map/packets_keys_zero.h | 4 +- src/map/packets_shuffle_main.h | 4 +- src/map/packets_shuffle_re.h | 4 +- src/map/packets_shuffle_zero.h | 4 +- src/map/packets_struct.h | 2 +- src/map/party.c | 4 +- src/map/party.h | 4 +- src/map/path.c | 4 +- src/map/path.h | 4 +- src/map/pc.c | 4 +- src/map/pc.h | 4 +- src/map/pc_groups.c | 4 +- src/map/pc_groups.h | 4 +- src/map/pet.c | 4 +- src/map/pet.h | 4 +- src/map/quest.c | 4 +- src/map/quest.h | 4 +- src/map/refine.c | 2 +- src/map/refine.h | 2 +- src/map/refine.p.h | 2 +- src/map/rodex.c | 2 +- src/map/rodex.h | 2 +- src/map/script.c | 4 +- src/map/script.h | 4 +- src/map/searchstore.c | 4 +- src/map/searchstore.h | 4 +- src/map/skill.c | 4 +- src/map/skill.h | 4 +- src/map/status.c | 4 +- src/map/status.h | 4 +- src/map/storage.c | 4 +- src/map/storage.h | 4 +- src/map/stylist.c | 2 +- src/map/stylist.h | 2 +- src/map/trade.c | 4 +- src/map/trade.h | 4 +- src/map/unit.c | 4 +- src/map/unit.h | 4 +- src/map/vending.c | 4 +- src/map/vending.h | 4 +- src/plugins/HPMHooking.c | 2 +- src/plugins/HPMHooking.h | 2 +- src/plugins/HPMHooking/HPMHooking.Defs.inc | 2 +- .../HPMHooking/HPMHooking_char.HPMHooksCore.inc | 2 +- .../HPMHooking/HPMHooking_char.HookingPoints.inc | 2 +- src/plugins/HPMHooking/HPMHooking_char.Hooks.inc | 2 +- src/plugins/HPMHooking/HPMHooking_char.sources.inc | 2 +- .../HPMHooking/HPMHooking_login.HPMHooksCore.inc | 2 +- .../HPMHooking/HPMHooking_login.HookingPoints.inc | 2 +- src/plugins/HPMHooking/HPMHooking_login.Hooks.inc | 2 +- .../HPMHooking/HPMHooking_login.sources.inc | 2 +- .../HPMHooking/HPMHooking_map.HPMHooksCore.inc | 2 +- .../HPMHooking/HPMHooking_map.HookingPoints.inc | 2 +- src/plugins/HPMHooking/HPMHooking_map.Hooks.inc | 2 +- src/plugins/HPMHooking/HPMHooking_map.sources.inc | 2 +- src/plugins/Makefile.in | 2 +- src/plugins/constdb2doc.c | 4 +- src/plugins/db2sql.c | 4 +- src/plugins/dbghelpplug.c | 4 +- src/plugins/generate-translations.c | 4 +- src/plugins/mapcache.c | 2 +- src/plugins/sample.c | 2 +- src/plugins/script_mapquit.c | 2 +- src/test/Makefile.in | 4 +- src/test/test_libconfig.c | 4 +- src/test/test_spinlock.c | 4 +- sysinfogen.sh | 4 +- tools/HPMHookGen/HPMDataCheckGen.pl | 4 +- tools/HPMHookGen/HPMHookGen.pl | 4 +- tools/HPMHookGen/Makefile.in | 4 +- tools/Script-Checker.applescript | 2 +- tools/check-doc | 2 +- tools/ci/retry.sh | 4 +- tools/ci/travis.sh | 2 +- tools/configconverter.pl | 4 +- tools/constdbconverter.pl | 4 +- tools/doxygen/Makefile.in | 2 +- tools/item_merge.lua | 2 +- tools/itemcombodbconverter.py | 4 +- tools/itemdb_jobmask_converter.pl | 2 +- tools/itemdbconverter.pl | 2 +- tools/mobavailconverter.py | 2 +- tools/mobdbconvall.sh | 2 +- tools/mobdbconverter.py | 4 +- tools/mobskilldbconverter.py | 4 +- tools/petdbconverter.py | 8 ++-- tools/petevolutionconverter.py | 4 +- tools/questdbconverter.pl | 2 +- tools/scconfigconverter.py | 4 +- tools/skilldbconverter.php | 7 ++-- tools/utils/common.py | 4 +- tools/utils/libconf.py | 2 +- tools/validateinterfaces.py | 4 +- 1382 files changed, 4587 insertions(+), 4586 deletions(-) (limited to 'src/map/unit.c') diff --git a/3rdparty/libconfig/Makefile.in b/3rdparty/libconfig/Makefile.in index 690dc90bf..67047739e 100644 --- a/3rdparty/libconfig/Makefile.in +++ b/3rdparty/libconfig/Makefile.in @@ -1,8 +1,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team -# Copyright (C) Athena Dev Teams +# Copyright (C) 2012-2020 Hercules Dev Team +# Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/3rdparty/libconfig/extra/doc/libconfig.texi b/3rdparty/libconfig/extra/doc/libconfig.texi index 9441dc2ac..017face9b 100644 --- a/3rdparty/libconfig/extra/doc/libconfig.texi +++ b/3rdparty/libconfig/extra/doc/libconfig.texi @@ -36,7 +36,7 @@ @page @vskip 0pt plus 1filll -Copyright @copyright{} 2005-2014 Mark A Lindner +Copyright @copyright{} 2005-2014 Mark A Lindner Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice diff --git a/3rdparty/libconfig/extra/gen/grammar.y b/3rdparty/libconfig/extra/gen/grammar.y index 31b600e78..5d9f02c2d 100644 --- a/3rdparty/libconfig/extra/gen/grammar.y +++ b/3rdparty/libconfig/extra/gen/grammar.y @@ -1,8 +1,8 @@ /* -*- mode: C -*- */ /* ---------------------------------------------------------------------------- libconfig - A library for processing structured configuration files - Copyright (C) 2013-2018 Hercules Dev Team - Copyright (C) 2005-2014 Mark A Lindner + Copyright (C) 2013-2020 Hercules Dev Team + Copyright (C) 2005-2014 Mark A Lindner This file is part of libconfig. diff --git a/3rdparty/libconfig/extra/gen/scanner.l b/3rdparty/libconfig/extra/gen/scanner.l index 1c99bcb77..f57e1c275 100644 --- a/3rdparty/libconfig/extra/gen/scanner.l +++ b/3rdparty/libconfig/extra/gen/scanner.l @@ -1,8 +1,8 @@ /* -*- mode: C -*- */ /* -------------------------------------------------------------------------- libconfig - A library for processing structured configuration files - Copyright (C) 2013-2018 Hercules Dev Team - Copyright (C) 2005-2014 Mark A Lindner + Copyright (C) 2013-2020 Hercules Dev Team + Copyright (C) 2005-2014 Mark A Lindner This file is part of libconfig. diff --git a/3rdparty/libconfig/libconfig.c b/3rdparty/libconfig/libconfig.c index da7ae048e..533145ac4 100644 --- a/3rdparty/libconfig/libconfig.c +++ b/3rdparty/libconfig/libconfig.c @@ -1,7 +1,7 @@ /* ---------------------------------------------------------------------------- libconfig - A library for processing structured configuration files - Copyright (C) 2013-2018 Hercules Dev Team - Copyright (C) 2005-2014 Mark A Lindner + Copyright (C) 2013-2020 Hercules Dev Team + Copyright (C) 2005-2014 Mark A Lindner This file is part of libconfig. diff --git a/3rdparty/libconfig/libconfig.h b/3rdparty/libconfig/libconfig.h index d465bb236..5662968a7 100644 --- a/3rdparty/libconfig/libconfig.h +++ b/3rdparty/libconfig/libconfig.h @@ -1,7 +1,7 @@ /* ---------------------------------------------------------------------------- libconfig - A library for processing structured configuration files - Copyright (C) 2013-2018 Hercules Dev Team - Copyright (C) 2005-2014 Mark A Lindner + Copyright (C) 2013-2020 Hercules Dev Team + Copyright (C) 2005-2014 Mark A Lindner This file is part of libconfig. diff --git a/3rdparty/libconfig/parsectx.h b/3rdparty/libconfig/parsectx.h index 865fa5912..4e6219bf6 100644 --- a/3rdparty/libconfig/parsectx.h +++ b/3rdparty/libconfig/parsectx.h @@ -1,7 +1,7 @@ /* ---------------------------------------------------------------------------- libconfig - A library for processing structured configuration files - Copyright (C) 2013-2018 Hercules Dev Team - Copyright (C) 2005-2014 Mark A Lindner + Copyright (C) 2013-2020 Hercules Dev Team + Copyright (C) 2005-2014 Mark A Lindner This file is part of libconfig. diff --git a/3rdparty/libconfig/scanctx.c b/3rdparty/libconfig/scanctx.c index fc1e10618..de09916df 100644 --- a/3rdparty/libconfig/scanctx.c +++ b/3rdparty/libconfig/scanctx.c @@ -1,7 +1,7 @@ /* ---------------------------------------------------------------------------- libconfig - A library for processing structured configuration files - Copyright (C) 2013-2018 Hercules Dev Team - Copyright (C) 2005-2014 Mark A Lindner + Copyright (C) 2013-2020 Hercules Dev Team + Copyright (C) 2005-2014 Mark A Lindner This file is part of libconfig. diff --git a/3rdparty/libconfig/scanctx.h b/3rdparty/libconfig/scanctx.h index 97d4ee56f..2f78e8bf3 100644 --- a/3rdparty/libconfig/scanctx.h +++ b/3rdparty/libconfig/scanctx.h @@ -1,7 +1,7 @@ /* ---------------------------------------------------------------------------- libconfig - A library for processing structured configuration files - Copyright (C) 2013-2018 Hercules Dev Team - Copyright (C) 2005-2014 Mark A Lindner + Copyright (C) 2013-2020 Hercules Dev Team + Copyright (C) 2005-2014 Mark A Lindner This file is part of libconfig. diff --git a/3rdparty/libconfig/scanner.c b/3rdparty/libconfig/scanner.c index bed223ba6..1914142c4 100644 --- a/3rdparty/libconfig/scanner.c +++ b/3rdparty/libconfig/scanner.c @@ -551,8 +551,8 @@ static const flex_int32_t yy_rule_can_match_eol[46] = /* -*- mode: C -*- */ /* -------------------------------------------------------------------------- libconfig - A library for processing structured configuration files - Copyright (C) 2013-2018 Hercules Dev Team - Copyright (C) 2005-2014 Mark A Lindner + Copyright (C) 2013-2020 Hercules Dev Team + Copyright (C) 2005-2014 Mark A Lindner This file is part of libconfig. diff --git a/3rdparty/libconfig/strbuf.c b/3rdparty/libconfig/strbuf.c index 7610dad0f..53684181c 100644 --- a/3rdparty/libconfig/strbuf.c +++ b/3rdparty/libconfig/strbuf.c @@ -1,7 +1,7 @@ /* ---------------------------------------------------------------------------- libconfig - A library for processing structured configuration files - Copyright (C) 2013-2018 Hercules Dev Team - Copyright (C) 2005-2014 Mark A Lindner + Copyright (C) 2013-2020 Hercules Dev Team + Copyright (C) 2005-2014 Mark A Lindner This file is part of libconfig. diff --git a/3rdparty/libconfig/strbuf.h b/3rdparty/libconfig/strbuf.h index 474a502cb..b7375e958 100644 --- a/3rdparty/libconfig/strbuf.h +++ b/3rdparty/libconfig/strbuf.h @@ -1,7 +1,7 @@ /* ---------------------------------------------------------------------------- libconfig - A library for processing structured configuration files - Copyright (C) 2013-2018 Hercules Dev Team - Copyright (C) 2005-2014 Mark A Lindner + Copyright (C) 2013-2020 Hercules Dev Team + Copyright (C) 2005-2014 Mark A Lindner This file is part of libconfig. diff --git a/3rdparty/libconfig/wincompat.h b/3rdparty/libconfig/wincompat.h index 8ac7a916f..f0719ea5f 100644 --- a/3rdparty/libconfig/wincompat.h +++ b/3rdparty/libconfig/wincompat.h @@ -1,7 +1,7 @@ /* ---------------------------------------------------------------------------- libconfig - A library for processing structured configuration files - Copyright (C) 2013-2018 Hercules Dev Team - Copyright (C) 2005-2014 Mark A Lindner + Copyright (C) 2013-2020 Hercules Dev Team + Copyright (C) 2005-2014 Mark A Lindner This file is part of libconfig. diff --git a/3rdparty/mt19937ar/Makefile.in b/3rdparty/mt19937ar/Makefile.in index fde5e88f5..683300fd9 100644 --- a/3rdparty/mt19937ar/Makefile.in +++ b/3rdparty/mt19937ar/Makefile.in @@ -1,8 +1,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team -# Copyright (C) Athena Dev Teams +# Copyright (C) 2012-2020 Hercules Dev Team +# Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Makefile.in b/Makefile.in index e85c1bb96..5378a5b67 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team -# Copyright (C) Athena Dev Teams +# Copyright (C) 2012-2020 Hercules Dev Team +# Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/conf/char/char-server.conf b/conf/char/char-server.conf index e3d0fd8c0..a8918e705 100644 --- a/conf/char/char-server.conf +++ b/conf/char/char-server.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/clans.conf b/conf/clans.conf index 82211fce0..75cfb8984 100644 --- a/conf/clans.conf +++ b/conf/clans.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2017-2019 Hercules Dev Team +//= Copyright (C) 2017-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/common/inter-server.conf b/conf/common/inter-server.conf index d45657dca..5bec34d44 100644 --- a/conf/common/inter-server.conf +++ b/conf/common/inter-server.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/common/map-index.conf b/conf/common/map-index.conf index b3a1b4e8f..63ee2e495 100644 --- a/conf/common/map-index.conf +++ b/conf/common/map-index.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/common/socket.conf b/conf/common/socket.conf index eb7d494b4..fe171336a 100644 --- a/conf/common/socket.conf +++ b/conf/common/socket.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/global/console.conf b/conf/global/console.conf index 266b301b2..4865fd9b7 100644 --- a/conf/global/console.conf +++ b/conf/global/console.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/global/sql_connection.conf b/conf/global/sql_connection.conf index 7b1a2b97b..7a8932f33 100644 --- a/conf/global/sql_connection.conf +++ b/conf/global/sql_connection.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/import-tmpl/battle.conf b/conf/import-tmpl/battle.conf index ff05022c2..7facb0c74 100644 --- a/conf/import-tmpl/battle.conf +++ b/conf/import-tmpl/battle.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/import-tmpl/char-server.conf b/conf/import-tmpl/char-server.conf index 3162a31ad..b31920a94 100644 --- a/conf/import-tmpl/char-server.conf +++ b/conf/import-tmpl/char-server.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/import-tmpl/inter-server.conf b/conf/import-tmpl/inter-server.conf index 9cd3932f5..7ccb2c0a3 100644 --- a/conf/import-tmpl/inter-server.conf +++ b/conf/import-tmpl/inter-server.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/import-tmpl/login-server.conf b/conf/import-tmpl/login-server.conf index c8f1f8546..5e8195d34 100644 --- a/conf/import-tmpl/login-server.conf +++ b/conf/import-tmpl/login-server.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/import-tmpl/logs.conf b/conf/import-tmpl/logs.conf index 47e5a665a..d42e24dea 100644 --- a/conf/import-tmpl/logs.conf +++ b/conf/import-tmpl/logs.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/import-tmpl/map-server.conf b/conf/import-tmpl/map-server.conf index 11e4356ba..f235a4429 100644 --- a/conf/import-tmpl/map-server.conf +++ b/conf/import-tmpl/map-server.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/import-tmpl/script.conf b/conf/import-tmpl/script.conf index 042644ff1..204d1a0c1 100644 --- a/conf/import-tmpl/script.conf +++ b/conf/import-tmpl/script.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/import-tmpl/socket.conf b/conf/import-tmpl/socket.conf index 57806f21e..a73aabf4f 100644 --- a/conf/import-tmpl/socket.conf +++ b/conf/import-tmpl/socket.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/login/login-server.conf b/conf/login/login-server.conf index 22e927c5e..a7a30c83d 100644 --- a/conf/login/login-server.conf +++ b/conf/login/login-server.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle.conf b/conf/map/battle.conf index dd47db755..bbcc5cd02 100644 --- a/conf/map/battle.conf +++ b/conf/map/battle.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/battle.conf b/conf/map/battle/battle.conf index eafb5ec9b..c85d0182d 100644 --- a/conf/map/battle/battle.conf +++ b/conf/map/battle/battle.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/battleground.conf b/conf/map/battle/battleground.conf index 08c7fcd8a..9fe58efe0 100644 --- a/conf/map/battle/battleground.conf +++ b/conf/map/battle/battleground.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf index 355df2baa..5601dbc9e 100644 --- a/conf/map/battle/client.conf +++ b/conf/map/battle/client.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/drops.conf b/conf/map/battle/drops.conf index d37aba455..bc6a226f6 100644 --- a/conf/map/battle/drops.conf +++ b/conf/map/battle/drops.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/exp.conf b/conf/map/battle/exp.conf index 54b2ec4e0..172959fd0 100644 --- a/conf/map/battle/exp.conf +++ b/conf/map/battle/exp.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/feature.conf b/conf/map/battle/feature.conf index 0cb293d60..0d2ab8397 100644 --- a/conf/map/battle/feature.conf +++ b/conf/map/battle/feature.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/gm.conf b/conf/map/battle/gm.conf index 32e407866..bd5cfbef7 100644 --- a/conf/map/battle/gm.conf +++ b/conf/map/battle/gm.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/guild.conf b/conf/map/battle/guild.conf index 2cb74c2dd..781f6555b 100644 --- a/conf/map/battle/guild.conf +++ b/conf/map/battle/guild.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/homunc.conf b/conf/map/battle/homunc.conf index f2ed4d8d7..3884552c2 100644 --- a/conf/map/battle/homunc.conf +++ b/conf/map/battle/homunc.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/items.conf b/conf/map/battle/items.conf index 0dd990e0a..4788d7b30 100644 --- a/conf/map/battle/items.conf +++ b/conf/map/battle/items.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/limits.conf b/conf/map/battle/limits.conf index 78498219e..b987026ea 100644 --- a/conf/map/battle/limits.conf +++ b/conf/map/battle/limits.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/misc.conf b/conf/map/battle/misc.conf index f2bd00429..cc2abc16c 100644 --- a/conf/map/battle/misc.conf +++ b/conf/map/battle/misc.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/monster.conf b/conf/map/battle/monster.conf index 389bdc5c7..fb19a6f76 100644 --- a/conf/map/battle/monster.conf +++ b/conf/map/battle/monster.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/party.conf b/conf/map/battle/party.conf index 79230eac4..e27a709fd 100644 --- a/conf/map/battle/party.conf +++ b/conf/map/battle/party.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/pet.conf b/conf/map/battle/pet.conf index f3c6fc12f..fa0057564 100644 --- a/conf/map/battle/pet.conf +++ b/conf/map/battle/pet.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/player.conf b/conf/map/battle/player.conf index 0762b1f54..b691f7343 100644 --- a/conf/map/battle/player.conf +++ b/conf/map/battle/player.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/skill.conf b/conf/map/battle/skill.conf index 0cc63662c..a40b52124 100644 --- a/conf/map/battle/skill.conf +++ b/conf/map/battle/skill.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/battle/status.conf b/conf/map/battle/status.conf index 8ba761992..8e9fe779c 100644 --- a/conf/map/battle/status.conf +++ b/conf/map/battle/status.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/logs.conf b/conf/map/logs.conf index 18450b2fe..a672eb2f3 100644 --- a/conf/map/logs.conf +++ b/conf/map/logs.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/map-server.conf b/conf/map/map-server.conf index dbb343748..c720c28e2 100644 --- a/conf/map/map-server.conf +++ b/conf/map/map-server.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 644ced6bb..64299c731 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/conf/map/script.conf b/conf/map/script.conf index 802ce2538..fc4f26965 100644 --- a/conf/map/script.conf +++ b/conf/map/script.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2019 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/configure.ac b/configure.ac index ec9e35cfe..74ee37cd0 100644 --- a/configure.ac +++ b/configure.ac @@ -4,8 +4,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team -# Copyright (C) Athena Dev Teams +# Copyright (C) 2012-2020 Hercules Dev Team +# Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/db/achievement_rank_db.conf b/db/achievement_rank_db.conf index e19194fad..6b8155438 100644 --- a/db/achievement_rank_db.conf +++ b/db/achievement_rank_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/attendance_db.conf b/db/attendance_db.conf index f63ceed53..58e61f763 100644 --- a/db/attendance_db.conf +++ b/db/attendance_db.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team -//= Copyright (C) 2018 Asheraf +//= Copyright (C) 2018-2020 Hercules Dev Team +//= Copyright (C) 2018 Asheraf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/cashshop_db.conf b/db/cashshop_db.conf index c92eeface..4401a26b3 100644 --- a/db/cashshop_db.conf +++ b/db/cashshop_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/castle_db.conf b/db/castle_db.conf index c50d04c48..4e83b7148 100644 --- a/db/castle_db.conf +++ b/db/castle_db.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2019 Hercules Dev Team -//= Copyright (C) 2019 Asheraf +//= Copyright (C) 2019-2020 Hercules Dev Team +//= Copyright (C) 2019 Asheraf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/clans.conf b/db/clans.conf index 93257f470..7b28bca90 100644 --- a/db/clans.conf +++ b/db/clans.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2017 Hercules Dev Team +//= Copyright (C) 2017-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/constants.conf b/db/constants.conf index f87e60ee0..f76f2ea6a 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team +//= Copyright (C) 2016-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/item_db2.conf b/db/item_db2.conf index ed673c5ea..4bcda494d 100644 --- a/db/item_db2.conf +++ b/db/item_db2.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2018 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/item_options.conf b/db/item_options.conf index 95e2316ae..e705d80b5 100644 --- a/db/item_options.conf +++ b/db/item_options.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2017 Hercules Dev Team +//= Copyright (C) 2017-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/mob_db2.conf b/db/mob_db2.conf index bd8379030..8cc1a1459 100644 --- a/db/mob_db2.conf +++ b/db/mob_db2.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team +//= Copyright (C) 2015-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/mob_skill_db2.conf b/db/mob_skill_db2.conf index 77d353610..6a732ff2d 100644 --- a/db/mob_skill_db2.conf +++ b/db/mob_skill_db2.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/option_drop_groups.conf b/db/option_drop_groups.conf index b293be19a..726811ac5 100644 --- a/db/option_drop_groups.conf +++ b/db/option_drop_groups.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pet_db2.conf b/db/pet_db2.conf index 34a6130e4..d6862da32 100644 --- a/db/pet_db2.conf +++ b/db/pet_db2.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/achievement_db.conf b/db/pre-re/achievement_db.conf index db63ed4a8..e8d3ee31f 100644 --- a/db/pre-re/achievement_db.conf +++ b/db/pre-re/achievement_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/exp_group_db.conf b/db/pre-re/exp_group_db.conf index 9ebb94e3c..aa710e41c 100644 --- a/db/pre-re/exp_group_db.conf +++ b/db/pre-re/exp_group_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/item_chain.conf b/db/pre-re/item_chain.conf index b00447bb2..075a8d34a 100644 --- a/db/pre-re/item_chain.conf +++ b/db/pre-re/item_chain.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/item_combo_db.conf b/db/pre-re/item_combo_db.conf index e2ed5d486..61e6ad1d4 100644 --- a/db/pre-re/item_combo_db.conf +++ b/db/pre-re/item_combo_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2019 Hercules Dev Team +//= Copyright (C) 2019-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index 8be95353c..7d9708f81 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2018 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf index d2d9c61d8..ebf79bd4d 100644 --- a/db/pre-re/item_group.conf +++ b/db/pre-re/item_group.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/item_lapineddukddak.conf b/db/pre-re/item_lapineddukddak.conf index 2b58bc075..af45e0504 100644 --- a/db/pre-re/item_lapineddukddak.conf +++ b/db/pre-re/item_lapineddukddak.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018-2019 Hercules Dev Team -//= Copyright (C) 2018-2019 Asheraf +//= Copyright (C) 2018-2020 Hercules Dev Team +//= Copyright (C) 2018-2019 Asheraf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/item_packages.conf b/db/pre-re/item_packages.conf index 8e421be53..6da6f1bfe 100644 --- a/db/pre-re/item_packages.conf +++ b/db/pre-re/item_packages.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/job_db.conf b/db/pre-re/job_db.conf index af8cabf9a..a48a4bc6a 100644 --- a/db/pre-re/job_db.conf +++ b/db/pre-re/job_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team +//= Copyright (C) 2015-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf index b8797a6d3..6d7827dd6 100644 --- a/db/pre-re/map_zone_db.conf +++ b/db/pre-re/map_zone_db.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) 2013 Ind +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) 2013 Ind //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf index 70edd12e9..45592ad90 100644 --- a/db/pre-re/mob_db.conf +++ b/db/pre-re/mob_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team +//= Copyright (C) 2015-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/mob_skill_db.conf b/db/pre-re/mob_skill_db.conf index e375754d9..11af05e98 100644 --- a/db/pre-re/mob_skill_db.conf +++ b/db/pre-re/mob_skill_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/pet_db.conf b/db/pre-re/pet_db.conf index 91f9cb8e8..112ce54eb 100644 --- a/db/pre-re/pet_db.conf +++ b/db/pre-re/pet_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/refine_db.conf b/db/pre-re/refine_db.conf index 725b8c225..051e5c39d 100644 --- a/db/pre-re/refine_db.conf +++ b/db/pre-re/refine_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team +//= Copyright (C) 2015-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf index 0660ce01d..4cd451e7f 100644 --- a/db/pre-re/skill_db.conf +++ b/db/pre-re/skill_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2017 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf index 00fc6c915..dff312c18 100644 --- a/db/pre-re/skill_tree.conf +++ b/db/pre-re/skill_tree.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/quest_db.conf b/db/quest_db.conf index 516c2e70a..adf425405 100644 --- a/db/quest_db.conf +++ b/db/quest_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team +//= Copyright (C) 2015-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/achievement_db.conf b/db/re/achievement_db.conf index e54a1d924..76c2bd9cb 100644 --- a/db/re/achievement_db.conf +++ b/db/re/achievement_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/exp_group_db.conf b/db/re/exp_group_db.conf index c59d8e77d..924a5f258 100644 --- a/db/re/exp_group_db.conf +++ b/db/re/exp_group_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/item_chain.conf b/db/re/item_chain.conf index b00447bb2..075a8d34a 100644 --- a/db/re/item_chain.conf +++ b/db/re/item_chain.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/item_combo_db.conf b/db/re/item_combo_db.conf index 66e553c32..31630546a 100644 --- a/db/re/item_combo_db.conf +++ b/db/re/item_combo_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2019 Hercules Dev Team +//= Copyright (C) 2019-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 4996e587c..d06c02279 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2018 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/item_group.conf b/db/re/item_group.conf index 7646059af..21397a11a 100644 --- a/db/re/item_group.conf +++ b/db/re/item_group.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/item_lapineddukddak.conf b/db/re/item_lapineddukddak.conf index 018be95ac..ef6991882 100644 --- a/db/re/item_lapineddukddak.conf +++ b/db/re/item_lapineddukddak.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018-2019 Hercules Dev Team -//= Copyright (C) 2018-2019 Asheraf +//= Copyright (C) 2018-2020 Hercules Dev Team +//= Copyright (C) 2018-2019 Asheraf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/item_packages.conf b/db/re/item_packages.conf index 468d47a26..383edaf91 100644 --- a/db/re/item_packages.conf +++ b/db/re/item_packages.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/job_db.conf b/db/re/job_db.conf index 21ba3f4cc..0c2be034d 100644 --- a/db/re/job_db.conf +++ b/db/re/job_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team +//= Copyright (C) 2015-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf index 42391a6f0..2f2312b99 100644 --- a/db/re/map_zone_db.conf +++ b/db/re/map_zone_db.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) 2013 Ind +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) 2013 Ind //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf index 89bcffb3e..c0c726f25 100644 --- a/db/re/mob_db.conf +++ b/db/re/mob_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team +//= Copyright (C) 2015-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf index 4d06ebef4..624970c5f 100644 --- a/db/re/mob_skill_db.conf +++ b/db/re/mob_skill_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/pet_db.conf b/db/re/pet_db.conf index a28da61ff..fc4496125 100644 --- a/db/re/pet_db.conf +++ b/db/re/pet_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/refine_db.conf b/db/re/refine_db.conf index c83f71334..db6e64868 100644 --- a/db/re/refine_db.conf +++ b/db/re/refine_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team +//= Copyright (C) 2015-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index 0fc15c9d1..8866f1742 100644 --- a/db/re/skill_db.conf +++ b/db/re/skill_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2017 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf index e9feb2111..7ddfdce4f 100644 --- a/db/re/skill_tree.conf +++ b/db/re/skill_tree.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/roulette_db.conf b/db/roulette_db.conf index 8f4e38a88..1ab309d58 100644 --- a/db/roulette_db.conf +++ b/db/roulette_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2015 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/sc_config.conf b/db/sc_config.conf index 7f40db709..1d8f50e1c 100644 --- a/db/sc_config.conf +++ b/db/sc_config.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2019 Hercules Dev Team +//= Copyright (C) 2019-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/stylist_db.conf b/db/stylist_db.conf index fde32a7da..4db0b5fb1 100644 --- a/db/stylist_db.conf +++ b/db/stylist_db.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team -//= Copyright (C) 2018 Asheraf +//= Copyright (C) 2018-2020 Hercules Dev Team +//= Copyright (C) 2018 Asheraf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db/translations.conf b/db/translations.conf index 72288ea63..aee83228e 100644 --- a/db/translations.conf +++ b/db/translations.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team +//= Copyright (C) 2015-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/db2sql.bat b/db2sql.bat index 9bad06ef2..cf781f703 100644 --- a/db2sql.bat +++ b/db2sql.bat @@ -3,7 +3,7 @@ REM This file is part of Hercules. REM http://herc.ws - http://github.com/HerculesWS/Hercules REM -REM Copyright (C) 2013-2015 Hercules Dev Team +REM Copyright (C) 2013-2020 Hercules Dev Team REM REM Hercules is free software: you can redistribute it and/or modify REM it under the terms of the GNU General Public License as published by diff --git a/doc/effect_list.md b/doc/effect_list.md index b16839d41..be749d070 100644 --- a/doc/effect_list.md +++ b/doc/effect_list.md @@ -5,7 +5,7 @@ A list of client-side effects sorted by ID in ascending order. > This file is part of Hercules. > http://herc.ws - http://github.com/HerculesWS/Hercules > -> Copyright (C) 2012-2018 Hercules Dev Team +> Copyright (C) 2012-2020 Hercules Dev Team > Copyright (C) Athena Dev Teams > > Hercules is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/doc/item_bonus.md b/doc/item_bonus.md index 7c8547456..e39b7b51f 100644 --- a/doc/item_bonus.md +++ b/doc/item_bonus.md @@ -5,7 +5,7 @@ > This file is part of Hercules. > http://herc.ws - http://github.com/HerculesWS/Hercules > -> Copyright (C) 2012-2018 Hercules Dev Team +> Copyright (C) 2012-2020 Hercules Dev Team > Copyright (C) Athena Dev Teams > > Hercules is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/doc/mob_db_mode_list.md b/doc/mob_db_mode_list.md index a8ad4fa0a..618e07b19 100644 --- a/doc/mob_db_mode_list.md +++ b/doc/mob_db_mode_list.md @@ -5,7 +5,7 @@ > This file is part of Hercules. > http://herc.ws - http://github.com/HerculesWS/Hercules > -> Copyright (C) 2012-2018 Hercules Dev Team +> Copyright (C) 2012-2020 Hercules Dev Team > Copyright (C) Athena Dev Teams > > Hercules is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/doc/permissions.md b/doc/permissions.md index a8794ecae..db5c6fa4b 100644 --- a/doc/permissions.md +++ b/doc/permissions.md @@ -5,7 +5,7 @@ A list of player group permission, configured in `conf/groups.conf`. > This file is part of Hercules. > http://herc.ws - http://github.com/HerculesWS/Hercules > -> Copyright (C) 2012-2018 Hercules Dev Team +> Copyright (C) 2012-2020 Hercules Dev Team > Copyright (C) Athena Dev Teams > > Hercules is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/doc/quest_variables.md b/doc/quest_variables.md index 2f8922c41..b568f0e9c 100644 --- a/doc/quest_variables.md +++ b/doc/quest_variables.md @@ -5,7 +5,7 @@ > This file is part of Hercules. > http://herc.ws - http://github.com/HerculesWS/Hercules > -> Copyright (C) 2012-2018 Hercules Dev Team +> Copyright (C) 2012-2020 Hercules Dev Team > Copyright (C) Athena Dev Teams > > Hercules is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/npc/MOTD.txt b/npc/MOTD.txt index 280ac8854..44aa1dc0f 100644 --- a/npc/MOTD.txt +++ b/npc/MOTD.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index 75708d167..47fed63cc 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/airports/einbroch.txt b/npc/airports/einbroch.txt index 62ba62b8e..e4f79c131 100644 --- a/npc/airports/einbroch.txt +++ b/npc/airports/einbroch.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Muad_Dib -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Muad_Dib +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/airports/hugel.txt b/npc/airports/hugel.txt index 9be356836..f94d03f61 100644 --- a/npc/airports/hugel.txt +++ b/npc/airports/hugel.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/airports/izlude.txt b/npc/airports/izlude.txt index ddcc4541c..b699e8c11 100644 --- a/npc/airports/izlude.txt +++ b/npc/airports/izlude.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/airports/lighthalzen.txt b/npc/airports/lighthalzen.txt index 80842aa9d..58a972254 100644 --- a/npc/airports/lighthalzen.txt +++ b/npc/airports/lighthalzen.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Muad_Dib -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Muad_Dib +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/airports/rachel.txt b/npc/airports/rachel.txt index 91db25d7e..7b067a05e 100644 --- a/npc/airports/rachel.txt +++ b/npc/airports/rachel.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/airports/yuno.txt b/npc/airports/yuno.txt index 6ae5b1657..722f20baf 100644 --- a/npc/airports/yuno.txt +++ b/npc/airports/yuno.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Muad_Dib -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Muad_Dib +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt index 4c9f3c307..d1c9f0ca3 100644 --- a/npc/battleground/bg_common.txt +++ b/npc/battleground/bg_common.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt index ee8ac5cb3..0fc04f0e9 100644 --- a/npc/battleground/flavius/flavius01.txt +++ b/npc/battleground/flavius/flavius01.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt index 69a54017b..abaaf0605 100644 --- a/npc/battleground/flavius/flavius02.txt +++ b/npc/battleground/flavius/flavius02.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/battleground/flavius/flavius_enter.txt b/npc/battleground/flavius/flavius_enter.txt index 974a0dab0..c6cc0d707 100644 --- a/npc/battleground/flavius/flavius_enter.txt +++ b/npc/battleground/flavius/flavius_enter.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt index d0b3d16be..63f68bd23 100644 --- a/npc/battleground/kvm/kvm01.txt +++ b/npc/battleground/kvm/kvm01.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt index a64dbf536..b1bbeb496 100644 --- a/npc/battleground/kvm/kvm02.txt +++ b/npc/battleground/kvm/kvm02.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Ai4rei -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Ai4rei +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt index 954fd7b49..27d4697f2 100644 --- a/npc/battleground/kvm/kvm03.txt +++ b/npc/battleground/kvm/kvm03.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Ai4rei -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Ai4rei +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/battleground/kvm/kvm_enter.txt b/npc/battleground/kvm/kvm_enter.txt index 2ee4a7c5d..8754a6cc7 100644 --- a/npc/battleground/kvm/kvm_enter.txt +++ b/npc/battleground/kvm/kvm_enter.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt index e6ef623b5..44ddb83df 100644 --- a/npc/battleground/kvm/kvm_item_pay.txt +++ b/npc/battleground/kvm/kvm_item_pay.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt index bdf41b0bd..298e07fcf 100644 --- a/npc/battleground/tierra/tierra01.txt +++ b/npc/battleground/tierra/tierra01.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt index abdb50a3f..6fe5dd922 100644 --- a/npc/battleground/tierra/tierra02.txt +++ b/npc/battleground/tierra/tierra02.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/battleground/tierra/tierra_enter.txt b/npc/battleground/tierra/tierra_enter.txt index c3a04719f..dfada7dc3 100644 --- a/npc/battleground/tierra/tierra_enter.txt +++ b/npc/battleground/tierra/tierra_enter.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index abac7b76a..ca1c91547 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) DZeroX +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) DZeroX //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index bd74a8971..c6fe6f5ed 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) DZeroX -//= Copyright (C) Evera -//= Copyright (C) Silent -//= Copyright (C) massdriller -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) DZeroX +//= Copyright (C) Evera +//= Copyright (C) Silent +//= Copyright (C) massdriller +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index fd3e66629..31ae513b8 100644 --- a/npc/cities/amatsu.txt +++ b/npc/cities/amatsu.txt @@ -9,22 +9,22 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Evera -//= Copyright (C) Silent -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Skotlex -//= Copyright (C) Nexon -//= Copyright (C) Lupus -//= Copyright (C) massdriller -//= Copyright (C) Darkchild -//= Copyright (C) Valaris -//= Copyright (C) dj -//= Copyright (C) Makenshi +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Evera +//= Copyright (C) Silent +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Skotlex +//= Copyright (C) Nexon +//= Copyright (C) Lupus +//= Copyright (C) massdriller +//= Copyright (C) Darkchild +//= Copyright (C) Valaris +//= Copyright (C) dj +//= Copyright (C) Makenshi //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt index 79e3f8c13..2b5fe4446 100644 --- a/npc/cities/ayothaya.txt +++ b/npc/cities/ayothaya.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Evera -//= Copyright (C) Silent -//= Copyright (C) MasterOfMuppets -//= Copyright (C) ZoDIaC +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Evera +//= Copyright (C) Silent +//= Copyright (C) MasterOfMuppets +//= Copyright (C) ZoDIaC //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt index d60278abd..f960ab23c 100644 --- a/npc/cities/comodo.txt +++ b/npc/cities/comodo.txt @@ -9,17 +9,17 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Evera -//= Copyright (C) Silent -//= Copyright (C) Nexon -//= Copyright (C) massdriller -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Evera +//= Copyright (C) Silent +//= Copyright (C) Nexon +//= Copyright (C) massdriller +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt index 33ba55ee0..417337165 100644 --- a/npc/cities/einbech.txt +++ b/npc/cities/einbech.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DZeroX -//= Copyright (C) Evera -//= Copyright (C) Silent -//= Copyright (C) Lupus -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DZeroX +//= Copyright (C) Evera +//= Copyright (C) Silent +//= Copyright (C) Lupus +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt index c16dbfeff..02a7e5547 100644 --- a/npc/cities/einbroch.txt +++ b/npc/cities/einbroch.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DZeroX -//= Copyright (C) Samuray22 -//= Copyright (C) Evera -//= Copyright (C) Silent -//= Copyright (C) erKURITA -//= Copyright (C) Komurka -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DZeroX +//= Copyright (C) Samuray22 +//= Copyright (C) Evera +//= Copyright (C) Silent +//= Copyright (C) erKURITA +//= Copyright (C) Komurka +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index 2bc972c70..c48e69ba1 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -9,17 +9,17 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) DeadlySilence -//= Copyright (C) Samuray22 -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Evera -//= Copyright (C) Musashiden -//= Copyright (C) Silent -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Nexon -//= Copyright (C) massdriller +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) DeadlySilence +//= Copyright (C) Samuray22 +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Evera +//= Copyright (C) Musashiden +//= Copyright (C) Silent +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Nexon +//= Copyright (C) massdriller //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt index a6d43deaa..8dd65b1ef 100644 --- a/npc/cities/gonryun.txt +++ b/npc/cities/gonryun.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) x[tsk] -//= Copyright (C) Lupus -//= Copyright (C) Toms -//= Copyright (C) Silent -//= Copyright (C) Nexon -//= Copyright (C) KarLaeda +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) x[tsk] +//= Copyright (C) Lupus +//= Copyright (C) Toms +//= Copyright (C) Silent +//= Copyright (C) Nexon +//= Copyright (C) KarLaeda //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt index 6a02a4901..5f90aedee 100644 --- a/npc/cities/hugel.txt +++ b/npc/cities/hugel.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DZeroX -//= Copyright (C) SinSloth -//= Copyright (C) Playtester -//= Copyright (C) Munin -//= Copyright (C) erKURITA -//= Copyright (C) Poki#3 -//= Copyright (C) vicious_pucca +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DZeroX +//= Copyright (C) SinSloth +//= Copyright (C) Playtester +//= Copyright (C) Munin +//= Copyright (C) erKURITA +//= Copyright (C) Poki#3 +//= Copyright (C) vicious_pucca //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt index 7ee10f320..150226d05 100644 --- a/npc/cities/izlude.txt +++ b/npc/cities/izlude.txt @@ -9,17 +9,17 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Paradox924X -//= Copyright (C) Evera -//= Copyright (C) Silent -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Silentdragon -//= Copyright (C) Nexon -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Paradox924X +//= Copyright (C) Evera +//= Copyright (C) Silent +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Silentdragon +//= Copyright (C) Nexon +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 7e117b45c..f9feb6f80 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) Evera -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Nexon -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DNett123 -//= Copyright (C) jAthena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) Evera +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Nexon +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DNett123 +//= Copyright (C) jAthena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index 88f117747..9c5f61b58 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -9,20 +9,20 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Gepard -//= Copyright (C) $ephiroth -//= Copyright (C) SinSloth -//= Copyright (C) KarLaeda -//= Copyright (C) Lupus -//= Copyright (C) Toms -//= Copyright (C) Silent -//= Copyright (C) Musashiden -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Alan -//= Copyright (C) Au{R}oN -//= Copyright (C) erKURITA +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Gepard +//= Copyright (C) $ephiroth +//= Copyright (C) SinSloth +//= Copyright (C) KarLaeda +//= Copyright (C) Lupus +//= Copyright (C) Toms +//= Copyright (C) Silent +//= Copyright (C) Musashiden +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Alan +//= Copyright (C) Au{R}oN +//= Copyright (C) erKURITA //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt index b4cfcb8ea..9dae2f03e 100644 --- a/npc/cities/louyang.txt +++ b/npc/cities/louyang.txt @@ -9,21 +9,21 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Celest -//= Copyright (C) Dino9021 -//= Copyright (C) Mass Zero -//= Copyright (C) SinSloth -//= Copyright (C) Evera -//= Copyright (C) Silent -//= Copyright (C) Nexon -//= Copyright (C) Lupus -//= Copyright (C) Vidar +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Celest +//= Copyright (C) Dino9021 +//= Copyright (C) Mass Zero +//= Copyright (C) SinSloth +//= Copyright (C) Evera +//= Copyright (C) Silent +//= Copyright (C) Nexon +//= Copyright (C) Lupus +//= Copyright (C) Vidar //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt index 9f57cc2dc..3c0270dd6 100644 --- a/npc/cities/lutie.txt +++ b/npc/cities/lutie.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) DZeroX -//= Copyright (C) Nexon -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) DZeroX +//= Copyright (C) Nexon +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/manuk.txt b/npc/cities/manuk.txt index db096a6bb..b70027d79 100644 --- a/npc/cities/manuk.txt +++ b/npc/cities/manuk.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt index e4400e7af..242a9f9cc 100644 --- a/npc/cities/morocc.txt +++ b/npc/cities/morocc.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lupus -//= Copyright (C) Silent -//= Copyright (C) Vicious_Pucca -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Nexon -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lupus +//= Copyright (C) Silent +//= Copyright (C) Vicious_Pucca +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Nexon +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt index c0029a91d..8bd4e3774 100644 --- a/npc/cities/moscovia.txt +++ b/npc/cities/moscovia.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt index 92e57f434..603c8cbbd 100644 --- a/npc/cities/niflheim.txt +++ b/npc/cities/niflheim.txt @@ -9,17 +9,17 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Evera -//= Copyright (C) Silent -//= Copyright (C) Vicious_Pucca -//= Copyright (C) Nexon -//= Copyright (C) Lupus -//= Copyright (C) Celest -//= Copyright (C) PKGINGO -//= Copyright (C) Dizzy -//= Copyright (C) Fyrien +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Evera +//= Copyright (C) Silent +//= Copyright (C) Vicious_Pucca +//= Copyright (C) Nexon +//= Copyright (C) Lupus +//= Copyright (C) Celest +//= Copyright (C) PKGINGO +//= Copyright (C) Dizzy +//= Copyright (C) Fyrien //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt index 132ce7331..1d95c7565 100644 --- a/npc/cities/payon.txt +++ b/npc/cities/payon.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Evera -//= Copyright (C) Silent -//= Copyright (C) Nexon -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DracoRPG -//= Copyright (C) Darkchild -//= Copyright (C) Muad Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Evera +//= Copyright (C) Silent +//= Copyright (C) Nexon +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DracoRPG +//= Copyright (C) Darkchild +//= Copyright (C) Muad Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt index bbe6716e7..feff36c6f 100644 --- a/npc/cities/prontera.txt +++ b/npc/cities/prontera.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Silent -//= Copyright (C) MasterOfMuppets -//= Copyright (C) massdriller -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Silent +//= Copyright (C) MasterOfMuppets +//= Copyright (C) massdriller +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt index 2fbb92f05..82716045d 100644 --- a/npc/cities/rachel.txt +++ b/npc/cities/rachel.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Harp -//= Copyright (C) Tsuyuki +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Harp +//= Copyright (C) Tsuyuki //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/splendide.txt b/npc/cities/splendide.txt index d49f50ada..858edc42f 100644 --- a/npc/cities/splendide.txt +++ b/npc/cities/splendide.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt index a8127c372..2dbaafed8 100644 --- a/npc/cities/umbala.txt +++ b/npc/cities/umbala.txt @@ -9,17 +9,17 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Toms -//= Copyright (C) Evera -//= Copyright (C) Lance -//= Copyright (C) massdriller -//= Copyright (C) Lupus -//= Copyright (C) Darkchild -//= Copyright (C) Muad Dib -//= Copyright (C) Fusion Dev Team -//= Copyright (C) jAthena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Toms +//= Copyright (C) Evera +//= Copyright (C) Lance +//= Copyright (C) massdriller +//= Copyright (C) Lupus +//= Copyright (C) Darkchild +//= Copyright (C) Muad Dib +//= Copyright (C) Fusion Dev Team +//= Copyright (C) jAthena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/veins.txt b/npc/cities/veins.txt index 5323a2af5..26e52b77e 100644 --- a/npc/cities/veins.txt +++ b/npc/cities/veins.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt index 944f5e9ae..17f585f74 100644 --- a/npc/cities/yuno.txt +++ b/npc/cities/yuno.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) massdriller -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 -//= Copyright (C) KitsuneStarwind +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) massdriller +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 +//= Copyright (C) KitsuneStarwind //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/dev/ci_test.txt b/npc/dev/ci_test.txt index c55c87e5b..9299daa9a 100644 --- a/npc/dev/ci_test.txt +++ b/npc/dev/ci_test.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) 2014 Haru +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) 2014 Haru //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/dev/test.txt b/npc/dev/test.txt index a867a09b2..a9e78489a 100644 --- a/npc/dev/test.txt +++ b/npc/dev/test.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2017 Hercules Dev Team -//= Copyright (C) 2013-2017 Haru +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) 2013-2020 Haru //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt index b87bba5f2..0988c80ed 100644 --- a/npc/events/MemorialDay_2008.txt +++ b/npc/events/MemorialDay_2008.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/RWC_2011.txt b/npc/events/RWC_2011.txt index 1fc15bba5..3dab7d174 100644 --- a/npc/events/RWC_2011.txt +++ b/npc/events/RWC_2011.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/RWC_2012.txt b/npc/events/RWC_2012.txt index ae1ded057..2096a3ff4 100644 --- a/npc/events/RWC_2012.txt +++ b/npc/events/RWC_2012.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/StPatrick_2008.txt b/npc/events/StPatrick_2008.txt index 323792344..7cba485d2 100644 --- a/npc/events/StPatrick_2008.txt +++ b/npc/events/StPatrick_2008.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/bossnia.txt b/npc/events/bossnia.txt index b1a061a0c..497ed75d0 100644 --- a/npc/events/bossnia.txt +++ b/npc/events/bossnia.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/children_week.txt b/npc/events/children_week.txt index 2cb654cd8..b1de95c4b 100644 --- a/npc/events/children_week.txt +++ b/npc/events/children_week.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt index cba1581e0..06af14184 100644 --- a/npc/events/christmas_2005.txt +++ b/npc/events/christmas_2005.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Paradox924X -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Brainstorm +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Paradox924X +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Brainstorm //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt index 6d8621545..864d67723 100644 --- a/npc/events/christmas_2008.txt +++ b/npc/events/christmas_2008.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt index 9f5ac381a..ea6d1f7dc 100644 --- a/npc/events/dumplingfestival.txt +++ b/npc/events/dumplingfestival.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lupus -//= Copyright (C) Massdriller +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lupus +//= Copyright (C) Massdriller //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/easter_2008.txt b/npc/events/easter_2008.txt index a2d6a2155..953ea9d12 100644 --- a/npc/events/easter_2008.txt +++ b/npc/events/easter_2008.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt index 154fb95c5..27e63ad5f 100644 --- a/npc/events/easter_2010.txt +++ b/npc/events/easter_2010.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index 0f01a3b98..4493c2e05 100644 --- a/npc/events/event_skill_reset.txt +++ b/npc/events/event_skill_reset.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lupus -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lupus +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index 95174071e..dc93b1b84 100644 --- a/npc/events/gdevent_aru.txt +++ b/npc/events/gdevent_aru.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index 77fd964d1..8385cfab8 100644 --- a/npc/events/gdevent_sch.txt +++ b/npc/events/gdevent_sch.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index 11a6160fc..22c489242 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt index 6f954c299..41cb5f1e3 100644 --- a/npc/events/halloween_2006.txt +++ b/npc/events/halloween_2006.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Brainstorm +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Brainstorm //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt index 66fe73c33..93708a437 100644 --- a/npc/events/halloween_2008.txt +++ b/npc/events/halloween_2008.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt index 532e04b2e..514426c3a 100644 --- a/npc/events/halloween_2009.txt +++ b/npc/events/halloween_2009.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lupus -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lupus +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt index 50996c07d..93899cc77 100644 --- a/npc/events/idul_fitri.txt +++ b/npc/events/idul_fitri.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/lunar_2008.txt b/npc/events/lunar_2008.txt index 7a560e58a..1e229200e 100644 --- a/npc/events/lunar_2008.txt +++ b/npc/events/lunar_2008.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt index 291b08db3..8cb7c578d 100644 --- a/npc/events/nguild/nguild_dunsw.txt +++ b/npc/events/nguild/nguild_dunsw.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt index 81adc89d4..91b28d73e 100644 --- a/npc/events/nguild/nguild_ev_agit.txt +++ b/npc/events/nguild/nguild_ev_agit.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt index 91ca46c87..c0a1389cd 100644 --- a/npc/events/nguild/nguild_flags.txt +++ b/npc/events/nguild/nguild_flags.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/nguild/nguild_guardians.txt b/npc/events/nguild/nguild_guardians.txt index 2598776f3..fb7a7ba09 100644 --- a/npc/events/nguild/nguild_guardians.txt +++ b/npc/events/nguild/nguild_guardians.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt index 7dfd14036..cd91efa42 100644 --- a/npc/events/nguild/nguild_kafras.txt +++ b/npc/events/nguild/nguild_kafras.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt index 93fe8b92c..0e49e7efa 100644 --- a/npc/events/nguild/nguild_managers.txt +++ b/npc/events/nguild/nguild_managers.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt index 8bfa184c5..a2f1d3ada 100644 --- a/npc/events/nguild/nguild_treas.txt +++ b/npc/events/nguild/nguild_treas.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) brianluau -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) brianluau +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/nguild/nguild_warper.txt b/npc/events/nguild/nguild_warper.txt index a2e2faed1..9cc5428d9 100644 --- a/npc/events/nguild/nguild_warper.txt +++ b/npc/events/nguild/nguild_warper.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/twintowers.txt b/npc/events/twintowers.txt index 0d9ede6f8..0dabe4a8e 100644 --- a/npc/events/twintowers.txt +++ b/npc/events/twintowers.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) ultramage -//= Copyright (C) Silent -//= Copyright (C) Lupus -//= Copyright (C) massdriller -//= Copyright (C) sEiKaN -//= Copyright (C) Akaru +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) ultramage +//= Copyright (C) Silent +//= Copyright (C) Lupus +//= Copyright (C) massdriller +//= Copyright (C) sEiKaN +//= Copyright (C) Akaru //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt index 89979e166..3698dfb7c 100644 --- a/npc/events/valentinesday.txt +++ b/npc/events/valentinesday.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib (Prometheus Project) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib (Prometheus Project) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index 919f4255f..14b97c30e 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lupus -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lupus +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/valentinesday_2012.txt b/npc/events/valentinesday_2012.txt index 0b240180f..2b07efd9c 100644 --- a/npc/events/valentinesday_2012.txt +++ b/npc/events/valentinesday_2012.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Rikimaru +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Rikimaru //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt index b7bae2d97..32153a363 100644 --- a/npc/events/whiteday.txt +++ b/npc/events/whiteday.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Muad_Dib (Prometheus Project) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Muad_Dib (Prometheus Project) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt index 7419bc4bc..6d22f5b95 100644 --- a/npc/events/xmas.txt +++ b/npc/events/xmas.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Kayla -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) shadowlady +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Kayla +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) shadowlady //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index 4353de224..3cfa7a00e 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Gepard -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Gepard +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt index ebaf70f92..f39f48e93 100644 --- a/npc/instances/NydhoggsNest.txt +++ b/npc/instances/NydhoggsNest.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt index 383786696..a9ab68be7 100644 --- a/npc/instances/OrcsMemory.txt +++ b/npc/instances/OrcsMemory.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index 1c4f4b9d8..b4873a593 100644 --- a/npc/instances/SealedShrine.txt +++ b/npc/instances/SealedShrine.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Gepard -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Gepard +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt index 1369a209b..5c13d3de9 100644 --- a/npc/jobs/1-1e/gunslinger.txt +++ b/npc/jobs/1-1e/gunslinger.txt @@ -9,18 +9,18 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) ultramage -//= Copyright (C) Playtester -//= Copyright (C) KarLaeda -//= Copyright (C) CBMaster -//= Copyright (C) Lupus -//= Copyright (C) Kisuka -//= Copyright (C) erKURITA -//= Copyright (C) RockmanEXE +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) ultramage +//= Copyright (C) Playtester +//= Copyright (C) KarLaeda +//= Copyright (C) CBMaster +//= Copyright (C) Lupus +//= Copyright (C) Kisuka +//= Copyright (C) erKURITA +//= Copyright (C) RockmanEXE //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt index 8911b5795..a1a0cc690 100644 --- a/npc/jobs/1-1e/ninja.txt +++ b/npc/jobs/1-1e/ninja.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) SinSloth -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Kisuka -//= Copyright (C) Legionaire +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) SinSloth +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Kisuka +//= Copyright (C) Legionaire //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt index 80f3ba0ea..95e2e12f1 100644 --- a/npc/jobs/1-1e/taekwon.txt +++ b/npc/jobs/1-1e/taekwon.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Kisuka -//= Copyright (C) Samuray22 -//= Copyright (C) Tsuyuki +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Kisuka +//= Copyright (C) Samuray22 +//= Copyright (C) Tsuyuki //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index fcc1c4c98..c6bdfc6be 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -9,21 +9,21 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) JayPee -//= Copyright (C) Kisuka -//= Copyright (C) brianluau -//= Copyright (C) Zephyrus -//= Copyright (C) Zephyrus_cr -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Toms -//= Copyright (C) Silent -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Pgro Team (OwNaGe) -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) JayPee +//= Copyright (C) Kisuka +//= Copyright (C) brianluau +//= Copyright (C) Zephyrus +//= Copyright (C) Zephyrus_cr +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Toms +//= Copyright (C) Silent +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Pgro Team (OwNaGe) +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index 8b1c9e9d3..c87a43c5c 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -9,20 +9,20 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) Yommy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Silent -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 -//= Copyright (C) celest -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 -//= Copyright (C) Komurka -//= Copyright (C) yoshiki -//= Copyright (C) EREMES THE CANIVALIZER(Aegis) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) Yommy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Silent +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 +//= Copyright (C) celest +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 +//= Copyright (C) Komurka +//= Copyright (C) yoshiki +//= Copyright (C) EREMES THE CANIVALIZER(Aegis) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 76b3c4b39..4ee344a7b 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -9,20 +9,20 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vali -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) FlavioJS -//= Copyright (C) Silent -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 -//= Copyright (C) celest -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 -//= Copyright (C) yoshiki -//= Copyright (C) EREMES THE CANIVALIZER (Aegis) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vali +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) FlavioJS +//= Copyright (C) Silent +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 +//= Copyright (C) celest +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 +//= Copyright (C) yoshiki +//= Copyright (C) EREMES THE CANIVALIZER (Aegis) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index f75d0ea46..51d052fd5 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -9,17 +9,17 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Vali -//= Copyright (C) Kisuka -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 -//= Copyright (C) PGRO TEAM (Aegis) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Vali +//= Copyright (C) Kisuka +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 +//= Copyright (C) PGRO TEAM (Aegis) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt index fa33215d6..2f544e78a 100644 --- a/npc/jobs/2-1/priest.txt +++ b/npc/jobs/2-1/priest.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) KarLaeda -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 -//= Copyright (C) Pgro Team (OwNaGe)(Aegis) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) KarLaeda +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 +//= Copyright (C) Pgro Team (OwNaGe)(Aegis) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index 08f2177d4..3814e1880 100644 --- a/npc/jobs/2-1/wizard.txt +++ b/npc/jobs/2-1/wizard.txt @@ -9,19 +9,19 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Vali -//= Copyright (C) Kisuka -//= Copyright (C) SoulBlaker -//= Copyright (C) Yommy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Zairik -//= Copyright (C) Vicious -//= Copyright (C) Silentdragon -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 -//= Copyright (C) yoshiki +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Vali +//= Copyright (C) Kisuka +//= Copyright (C) SoulBlaker +//= Copyright (C) Yommy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Zairik +//= Copyright (C) Vicious +//= Copyright (C) Silentdragon +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 +//= Copyright (C) yoshiki //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt index deb940dd2..6030f0372 100644 --- a/npc/jobs/2-1a/AssassinCross.txt +++ b/npc/jobs/2-1a/AssassinCross.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt index 1b53a8732..359323b20 100644 --- a/npc/jobs/2-1a/HighPriest.txt +++ b/npc/jobs/2-1a/HighPriest.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt index 511d620f4..48e9d1b7c 100644 --- a/npc/jobs/2-1a/HighWizard.txt +++ b/npc/jobs/2-1a/HighWizard.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt index da60caa92..04925806a 100644 --- a/npc/jobs/2-1a/LordKnight.txt +++ b/npc/jobs/2-1a/LordKnight.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt index f026ad30f..1a99dc48e 100644 --- a/npc/jobs/2-1a/Sniper.txt +++ b/npc/jobs/2-1a/Sniper.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt index d8166cbab..512e39826 100644 --- a/npc/jobs/2-1a/WhiteSmith.txt +++ b/npc/jobs/2-1a/WhiteSmith.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt index 9963eaf48..7a9c54afc 100644 --- a/npc/jobs/2-1e/StarGladiator.txt +++ b/npc/jobs/2-1e/StarGladiator.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Samuray22 -//= Copyright (C) Celestria +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Samuray22 +//= Copyright (C) Celestria //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index 3db39f11c..4111c2d6a 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 -//= Copyright (C) Darkchild -//= Copyright (C) nestor_zulueta (Fusion) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 +//= Copyright (C) Darkchild +//= Copyright (C) nestor_zulueta (Fusion) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt index d75ec7458..c70d0e597 100644 --- a/npc/jobs/2-2/bard.txt +++ b/npc/jobs/2-2/bard.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Vicious -//= Copyright (C) Samuray22 -//= Copyright (C) Lupus -//= Copyright (C) Muad_Dib(The Prometheus Project) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Vicious +//= Copyright (C) Samuray22 +//= Copyright (C) Lupus +//= Copyright (C) Muad_Dib(The Prometheus Project) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index b806d12c3..f554e8c05 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -9,18 +9,18 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Samuray22 -//= Copyright (C) Vicious -//= Copyright (C) DracoRPG -//= Copyright (C) massdriller -//= Copyright (C) Komurka -//= Copyright (C) Lupus -//= Copyright (C) Shin -//= Copyright (C) Black Dragon +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Samuray22 +//= Copyright (C) Vicious +//= Copyright (C) DracoRPG +//= Copyright (C) massdriller +//= Copyright (C) Komurka +//= Copyright (C) Lupus +//= Copyright (C) Shin +//= Copyright (C) Black Dragon //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index f0ff55d94..f795ac49d 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -9,19 +9,19 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) Brainstorm -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Skotlex -//= Copyright (C) Lance -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Fredzilla -//= Copyright (C) Athena -//= Copyright (C) Kalen +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) Brainstorm +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Skotlex +//= Copyright (C) Lance +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Fredzilla +//= Copyright (C) Athena +//= Copyright (C) Kalen //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 631da5f7d..015d90cb8 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -9,17 +9,17 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Silent -//= Copyright (C) Vicious -//= Copyright (C) Zephiris -//= Copyright (C) Yor -//= Copyright (C) Lupus -//= Copyright (C) Celest -//= Copyright (C) Dino9021 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Silent +//= Copyright (C) Vicious +//= Copyright (C) Zephiris +//= Copyright (C) Yor +//= Copyright (C) Lupus +//= Copyright (C) Celest +//= Copyright (C) Dino9021 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 656b9eed4..67cea1516 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Brainstorm -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Silent -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Brainstorm +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Silent +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 49245e1ed..c8e214777 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Brainstorm -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) KarLaeda -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Darkchild -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Brainstorm +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) KarLaeda +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Darkchild +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt index ef543c8bc..4fc970420 100644 --- a/npc/jobs/2-2a/Champion.txt +++ b/npc/jobs/2-2a/Champion.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt index b8f8f2ce0..ff23610db 100644 --- a/npc/jobs/2-2a/Clown.txt +++ b/npc/jobs/2-2a/Clown.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt index 97e571bf4..9773eb570 100644 --- a/npc/jobs/2-2a/Creator.txt +++ b/npc/jobs/2-2a/Creator.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Haru -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Haru +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2a/Gypsy.txt b/npc/jobs/2-2a/Gypsy.txt index fc4a42166..01b9d6066 100644 --- a/npc/jobs/2-2a/Gypsy.txt +++ b/npc/jobs/2-2a/Gypsy.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2a/Paladin.txt b/npc/jobs/2-2a/Paladin.txt index 2d208ed65..d4dcd2bd7 100644 --- a/npc/jobs/2-2a/Paladin.txt +++ b/npc/jobs/2-2a/Paladin.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt index 009b2d80d..46d380787 100644 --- a/npc/jobs/2-2a/Professor.txt +++ b/npc/jobs/2-2a/Professor.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2a/Stalker.txt b/npc/jobs/2-2a/Stalker.txt index 511d26435..005d0cad0 100644 --- a/npc/jobs/2-2a/Stalker.txt +++ b/npc/jobs/2-2a/Stalker.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt index 6fc4e3aaa..28d9d4b93 100644 --- a/npc/jobs/2-2e/SoulLinker.txt +++ b/npc/jobs/2-2e/SoulLinker.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Samuray22 -//= Copyright (C) Celestria +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Samuray22 +//= Copyright (C) Celestria //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt index ebe4ef8e2..b1428c685 100644 --- a/npc/jobs/novice/supernovice.txt +++ b/npc/jobs/novice/supernovice.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) Lupus -//= Copyright (C) Darkchild +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) Lupus +//= Copyright (C) Darkchild //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt index 71bbb75ac..7962f03ec 100644 --- a/npc/jobs/valkyrie.txt +++ b/npc/jobs/valkyrie.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Silent -//= Copyright (C) Vicious -//= Copyright (C) Silentdragon -//= Copyright (C) Mass Zero -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Poki -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Silent +//= Copyright (C) Vicious +//= Copyright (C) Silentdragon +//= Copyright (C) Mass Zero +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Poki +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/kafras/cool_event_corp.txt b/npc/kafras/cool_event_corp.txt index 2a892fb07..249d1ab71 100644 --- a/npc/kafras/cool_event_corp.txt +++ b/npc/kafras/cool_event_corp.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Haru -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Gepard +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Haru +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Gepard //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt index 057429ae0..c8b4083da 100644 --- a/npc/kafras/dts_warper.txt +++ b/npc/kafras/dts_warper.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Silent -//= Copyright (C) Evera +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Silent +//= Copyright (C) Evera //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 10a4ca0e0..ecbdc1f45 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -9,26 +9,26 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Haru -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Daegaladh -//= Copyright (C) brianluau -//= Copyright (C) Kisuka -//= Copyright (C) Evera -//= Copyright (C) erKURITA -//= Copyright (C) Silentdragon -//= Copyright (C) Nexon -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 -//= Copyright (C) Lupu -//= Copyright (C) Syrus22 -//= Copyright (C) Darkchild -//= Copyright (C) Darlskies +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Haru +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Daegaladh +//= Copyright (C) brianluau +//= Copyright (C) Kisuka +//= Copyright (C) Evera +//= Copyright (C) erKURITA +//= Copyright (C) Silentdragon +//= Copyright (C) Nexon +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 +//= Copyright (C) Lupu +//= Copyright (C) Syrus22 +//= Copyright (C) Darkchild +//= Copyright (C) Darlskies //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt index 29b1b02da..b91d2d989 100644 --- a/npc/kafras/kafras.txt +++ b/npc/kafras/kafras.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Lupus -//= Copyright (C) Evera -//= Copyright (C) Samuray22 -//= Copyright (C) kobra_k88 -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Lupus +//= Copyright (C) Evera +//= Copyright (C) Samuray22 +//= Copyright (C) kobra_k88 +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/battleground.txt b/npc/mapflag/battleground.txt index 5b25b7227..d62b5e6e6 100644 --- a/npc/mapflag/battleground.txt +++ b/npc/mapflag/battleground.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Epoque +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Epoque //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/gvg.txt b/npc/mapflag/gvg.txt index b30ff1340..34b4a3beb 100644 --- a/npc/mapflag/gvg.txt +++ b/npc/mapflag/gvg.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/jail.txt b/npc/mapflag/jail.txt index 0aff7412d..c5f0712cd 100644 --- a/npc/mapflag/jail.txt +++ b/npc/mapflag/jail.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/night.txt b/npc/mapflag/night.txt index a7a7a771f..3e421bf13 100644 --- a/npc/mapflag/night.txt +++ b/npc/mapflag/night.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Skotlex +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Skotlex //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/nightmare.txt b/npc/mapflag/nightmare.txt index 94fb9c791..c983ca83c 100644 --- a/npc/mapflag/nightmare.txt +++ b/npc/mapflag/nightmare.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/nobranch.txt b/npc/mapflag/nobranch.txt index 4ad59ad67..4007c8203 100644 --- a/npc/mapflag/nobranch.txt +++ b/npc/mapflag/nobranch.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) massdriller +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) massdriller //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/noexp.txt b/npc/mapflag/noexp.txt index 66863f0bd..a32960a83 100644 --- a/npc/mapflag/noexp.txt +++ b/npc/mapflag/noexp.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lorky -//= Copyright (C) massdriller -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lorky +//= Copyright (C) massdriller +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/noicewall.txt b/npc/mapflag/noicewall.txt index 195bec2bb..cc2e363ed 100644 --- a/npc/mapflag/noicewall.txt +++ b/npc/mapflag/noicewall.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/noloot.txt b/npc/mapflag/noloot.txt index d3895ce79..89f107cea 100644 --- a/npc/mapflag/noloot.txt +++ b/npc/mapflag/noloot.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Epoque -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Epoque +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/nomemo.txt b/npc/mapflag/nomemo.txt index 662bf4c05..548f1563e 100644 --- a/npc/mapflag/nomemo.txt +++ b/npc/mapflag/nomemo.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Epoque -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Gepard -//= Copyright (C) Yommy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) Lupus -//= Copyright (C) Nova +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Epoque +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Gepard +//= Copyright (C) Yommy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) Lupus +//= Copyright (C) Nova //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/nopenalty.txt b/npc/mapflag/nopenalty.txt index 583730f16..3e2db33f7 100644 --- a/npc/mapflag/nopenalty.txt +++ b/npc/mapflag/nopenalty.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Epoque -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Epoque +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/nopvp.txt b/npc/mapflag/nopvp.txt index 41127332b..6da518ad4 100644 --- a/npc/mapflag/nopvp.txt +++ b/npc/mapflag/nopvp.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/noreturn.txt b/npc/mapflag/noreturn.txt index a606926c3..4e5bf0286 100644 --- a/npc/mapflag/noreturn.txt +++ b/npc/mapflag/noreturn.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) Skotlex -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) Skotlex +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/nosave.txt b/npc/mapflag/nosave.txt index 8137e500b..1a7ecad0d 100644 --- a/npc/mapflag/nosave.txt +++ b/npc/mapflag/nosave.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/noskill.txt b/npc/mapflag/noskill.txt index ae492def1..b8fe06afb 100644 --- a/npc/mapflag/noskill.txt +++ b/npc/mapflag/noskill.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/noteleport.txt b/npc/mapflag/noteleport.txt index b80498f89..537781075 100644 --- a/npc/mapflag/noteleport.txt +++ b/npc/mapflag/noteleport.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Lupus -//= Copyright (C) Nova +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Lupus +//= Copyright (C) Nova //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/notomb.txt b/npc/mapflag/notomb.txt index a56f60112..37ba5f224 100644 --- a/npc/mapflag/notomb.txt +++ b/npc/mapflag/notomb.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) CairoLee +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) CairoLee //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/novending.txt b/npc/mapflag/novending.txt index 0047b0cb1..dce168f2d 100644 --- a/npc/mapflag/novending.txt +++ b/npc/mapflag/novending.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Epoque +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Epoque //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/nowarp.txt b/npc/mapflag/nowarp.txt index 4682f1d8d..99c4d06e0 100644 --- a/npc/mapflag/nowarp.txt +++ b/npc/mapflag/nowarp.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/nowarpto.txt b/npc/mapflag/nowarpto.txt index 783dc8cc9..2b6c4084c 100644 --- a/npc/mapflag/nowarpto.txt +++ b/npc/mapflag/nowarpto.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/partylock.txt b/npc/mapflag/partylock.txt index 1aa9d4991..11adbaedb 100644 --- a/npc/mapflag/partylock.txt +++ b/npc/mapflag/partylock.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/private_airship.txt b/npc/mapflag/private_airship.txt index 4258f486d..aad8c453b 100644 --- a/npc/mapflag/private_airship.txt +++ b/npc/mapflag/private_airship.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= Copyright (C) Asheraf //= //= Hercules is free software: you can redistribute it and/or modify diff --git a/npc/mapflag/pvp.txt b/npc/mapflag/pvp.txt index 7f671b49a..0d31e95da 100644 --- a/npc/mapflag/pvp.txt +++ b/npc/mapflag/pvp.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/pvp_noguild.txt b/npc/mapflag/pvp_noguild.txt index b7305c16f..30e562c9a 100644 --- a/npc/mapflag/pvp_noguild.txt +++ b/npc/mapflag/pvp_noguild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/pvp_noparty.txt b/npc/mapflag/pvp_noparty.txt index f948a1db7..8479958b4 100644 --- a/npc/mapflag/pvp_noparty.txt +++ b/npc/mapflag/pvp_noparty.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/reset.txt b/npc/mapflag/reset.txt index 21a0b04f8..4cd70a0fa 100644 --- a/npc/mapflag/reset.txt +++ b/npc/mapflag/reset.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Daegaladh +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/skillduration.txt b/npc/mapflag/skillduration.txt index e11278b44..0d58d370d 100644 --- a/npc/mapflag/skillduration.txt +++ b/npc/mapflag/skillduration.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/skillmodifier.txt b/npc/mapflag/skillmodifier.txt index 7354f4656..cfd88d750 100644 --- a/npc/mapflag/skillmodifier.txt +++ b/npc/mapflag/skillmodifier.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/town.txt b/npc/mapflag/town.txt index 463b7390c..18f4648c2 100644 --- a/npc/mapflag/town.txt +++ b/npc/mapflag/town.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Epoque +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Epoque //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mapflag/zone.txt b/npc/mapflag/zone.txt index b90116911..5244139b7 100644 --- a/npc/mapflag/zone.txt +++ b/npc/mapflag/zone.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Ind +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Ind //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt index ec263e192..7f7eed4d6 100644 --- a/npc/merchants/advanced_refiner.txt +++ b/npc/merchants/advanced_refiner.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Yommy -//= Copyright (C) Zephyrus -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Yommy +//= Copyright (C) Zephyrus +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index cdfdd06fc..ac855f7cb 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Lupus -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Lupus +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt index aef74f81f..b4cee6f41 100644 --- a/npc/merchants/ammo_boxes.txt +++ b/npc/merchants/ammo_boxes.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Lupus -//= Copyright (C) ultramage -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Lupus +//= Copyright (C) ultramage +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt index 313f54653..bf33281b8 100644 --- a/npc/merchants/ammo_dealer.txt +++ b/npc/merchants/ammo_dealer.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Kisuka -//= Copyright (C) Lupus -//= Copyright (C) Legionaire -//= Copyright (C) Paradox924X -//= Copyright (C) Playtester +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Kisuka +//= Copyright (C) Lupus +//= Copyright (C) Legionaire +//= Copyright (C) Paradox924X +//= Copyright (C) Playtester //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt index ff368d910..d1b460e74 100644 --- a/npc/merchants/buying_shops.txt +++ b/npc/merchants/buying_shops.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt index eecdc985b..1b9802e11 100644 --- a/npc/merchants/cash_hair.txt +++ b/npc/merchants/cash_hair.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/cash_trader.txt b/npc/merchants/cash_trader.txt index 5dcefa2c6..61e94528f 100644 --- a/npc/merchants/cash_trader.txt +++ b/npc/merchants/cash_trader.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt index 63d0e2bc0..656c63de9 100644 --- a/npc/merchants/cashheadgear_dye.txt +++ b/npc/merchants/cashheadgear_dye.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Xantara -//= Copyright (C) Maud_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Xantara +//= Copyright (C) Maud_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt index 4204f600f..b85d9e43b 100644 --- a/npc/merchants/clothes_dyer.txt +++ b/npc/merchants/clothes_dyer.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Playtester -//= Copyright (C) Poki#3 -//= Copyright (C) Nexon -//= Copyright (C) Lupus -//= Copyright (C) Usnul +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Playtester +//= Copyright (C) Poki#3 +//= Copyright (C) Nexon +//= Copyright (C) Lupus +//= Copyright (C) Usnul //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt index e0f72ca57..4d9355533 100644 --- a/npc/merchants/coin_exchange.txt +++ b/npc/merchants/coin_exchange.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Gepard +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Gepard //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt index 260a7c852..4d9e7ff2b 100644 --- a/npc/merchants/dye_maker.txt +++ b/npc/merchants/dye_maker.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) ultramage -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nexon -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) ultramage +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nexon +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt index bad49b4b2..f631c7367 100644 --- a/npc/merchants/elemental_trader.txt +++ b/npc/merchants/elemental_trader.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt index 434fabdb5..120f9dbab 100644 --- a/npc/merchants/enchan_arm.txt +++ b/npc/merchants/enchan_arm.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Daegaladh -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Daegaladh +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt index 44be2569c..e6365c5d8 100644 --- a/npc/merchants/gemstone.txt +++ b/npc/merchants/gemstone.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt index bd07727fb..424945261 100644 --- a/npc/merchants/hair_dyer.txt +++ b/npc/merchants/hair_dyer.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt index fd6cc1b96..d6f1536bd 100644 --- a/npc/merchants/hair_style.txt +++ b/npc/merchants/hair_style.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Silent -//= Copyright (C) Nexon -//= Copyright (C) Kisuka -//= Copyright (C) Samuray22 -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Silent +//= Copyright (C) Nexon +//= Copyright (C) Kisuka +//= Copyright (C) Samuray22 +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/hd_refine.txt b/npc/merchants/hd_refine.txt index 1a5a43621..fe6b60d7b 100644 --- a/npc/merchants/hd_refine.txt +++ b/npc/merchants/hd_refine.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt index 99da2fc18..c12cb7ecd 100644 --- a/npc/merchants/icecream.txt +++ b/npc/merchants/icecream.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Kisuka -//= Copyright (C) KOOK SWU +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Kisuka +//= Copyright (C) KOOK SWU //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index 89265093f..b89f95491 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) erKURITA -//= Copyright (C) kobra_k88 -//= Copyright (C) Playtester -//= Copyright (C) Darkchild +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) erKURITA +//= Copyright (C) kobra_k88 +//= Copyright (C) Playtester +//= Copyright (C) Darkchild //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt index 05d322ec6..7c9e3700c 100644 --- a/npc/merchants/kunai_maker.txt +++ b/npc/merchants/kunai_maker.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) ultramage -//= Copyright (C) Playtester -//= Copyright (C) erKURITA +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) ultramage +//= Copyright (C) Playtester +//= Copyright (C) erKURITA //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt index ff87c68d5..00f0a4abe 100644 --- a/npc/merchants/milk_trader.txt +++ b/npc/merchants/milk_trader.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt index 7e023588d..da3b008ee 100644 --- a/npc/merchants/novice_exchange.txt +++ b/npc/merchants/novice_exchange.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Team -//= Copyright (C) eAthena Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) KarLaeda -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Team +//= Copyright (C) eAthena Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) KarLaeda +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt index f87f55d83..f8fac475e 100644 --- a/npc/merchants/old_pharmacist.txt +++ b/npc/merchants/old_pharmacist.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) DZeroX +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) DZeroX //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt index 984d182fe..51f927299 100644 --- a/npc/merchants/quivers.txt +++ b/npc/merchants/quivers.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Nexon -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Muad_Dib (Prometheus Project) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Nexon +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Muad_Dib (Prometheus Project) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 87b5270a8..975226fa1 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -9,29 +9,29 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Xantara -//= Copyright (C) Paradox924X -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) Silent -//= Copyright (C) Kargha -//= Copyright (C) Playtester -//= Copyright (C) DracoRPG -//= Copyright (C) Poki#3 -//= Copyright (C) Nexon -//= Copyright (C) dafide18 -//= Copyright (C) massdriller -//= Copyright (C) shadowlady -//= Copyright (C) Shinigami -//= Copyright (C) Darkchild -//= Copyright (C) kobra_k88 -//= Copyright (C) Lupus -//= Copyright (C) Skotlex -//= Copyright (C) dafide18 -//= Copyright (C) Syrus22 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Xantara +//= Copyright (C) Paradox924X +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) Silent +//= Copyright (C) Kargha +//= Copyright (C) Playtester +//= Copyright (C) DracoRPG +//= Copyright (C) Poki#3 +//= Copyright (C) Nexon +//= Copyright (C) dafide18 +//= Copyright (C) massdriller +//= Copyright (C) shadowlady +//= Copyright (C) Shinigami +//= Copyright (C) Darkchild +//= Copyright (C) kobra_k88 +//= Copyright (C) Lupus +//= Copyright (C) Skotlex +//= Copyright (C) dafide18 +//= Copyright (C) Syrus22 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index 93e8b2661..201fb2d06 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Daegaladh -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Poki#3 -//= Copyright (C) Komurka -//= Copyright (C) Nexon -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Daegaladh +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Poki#3 +//= Copyright (C) Komurka +//= Copyright (C) Nexon +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index b215bd6d8..4c4442724 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -9,25 +9,25 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Yommy -//= Copyright (C) Streusel -//= Copyright (C) Euphy -//= Copyright (C) Spre -//= Copyright (C) Kenpachi -//= Copyright (C) Masao -//= Copyright (C) tr0n -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Evera -//= Copyright (C) Musashiden -//= Copyright (C) erKURITA -//= Copyright (C) Poki#3 -//= Copyright (C) Lupus -//= Copyright (C) Yor -//= Copyright (C) MasterOfMuppets -//= Copyright (C) celest -//= Copyright (C) Darkchild -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Yommy +//= Copyright (C) Streusel +//= Copyright (C) Euphy +//= Copyright (C) Spre +//= Copyright (C) Kenpachi +//= Copyright (C) Masao +//= Copyright (C) tr0n +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Evera +//= Copyright (C) Musashiden +//= Copyright (C) erKURITA +//= Copyright (C) Poki#3 +//= Copyright (C) Lupus +//= Copyright (C) Yor +//= Copyright (C) MasterOfMuppets +//= Copyright (C) celest +//= Copyright (C) Darkchild +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index 599d41564..a67b80b46 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -9,19 +9,19 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Gepard -//= Copyright (C) Kisuka -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) ultramage -//= Copyright (C) SinSloth -//= Copyright (C) Evera -//= Copyright (C) Toms -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Gepard +//= Copyright (C) Kisuka +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) ultramage +//= Copyright (C) SinSloth +//= Copyright (C) Evera +//= Copyright (C) Toms +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt index 29573970d..9745ff062 100644 --- a/npc/merchants/socket_enchant2.txt +++ b/npc/merchants/socket_enchant2.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Gepard +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Gepard //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/merchants/wander_pet_food.txt b/npc/merchants/wander_pet_food.txt index 598430932..0f405698a 100644 --- a/npc/merchants/wander_pet_food.txt +++ b/npc/merchants/wander_pet_food.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mobs/citycleaners.txt b/npc/mobs/citycleaners.txt index 2fe65e9c7..07e54dd32 100644 --- a/npc/mobs/citycleaners.txt +++ b/npc/mobs/citycleaners.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Playtester -//= Copyright (C) Komurka -//= Copyright (C) MasterOfMuppets -//= Copyright (C) massdriller +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Playtester +//= Copyright (C) Komurka +//= Copyright (C) MasterOfMuppets +//= Copyright (C) massdriller //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mobs/jail.txt b/npc/mobs/jail.txt index 39157742a..2c4f6efcc 100644 --- a/npc/mobs/jail.txt +++ b/npc/mobs/jail.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mobs/pvp.txt b/npc/mobs/pvp.txt index fb62f38ee..64b9a3226 100644 --- a/npc/mobs/pvp.txt +++ b/npc/mobs/pvp.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/mobs/towns.txt b/npc/mobs/towns.txt index 6df669166..09cfa11f6 100644 --- a/npc/mobs/towns.txt +++ b/npc/mobs/towns.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 5b957f9f2..c3d8098ea 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -336,4 +336,4 @@ function script F_CashReduceStat { statusup2 .@type, .@amount; return; -} \ No newline at end of file +} diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt index e3741b495..81e511ac2 100644 --- a/npc/other/Global_Functions.txt +++ b/npc/other/Global_Functions.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) AnnieRuru -//= Copyright (C) Emistry -//= Copyright (C) Euphy -//= Copyright (C) Paradox924X -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Evera -//= Copyright (C) kobra_k88 -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) AnnieRuru +//= Copyright (C) Emistry +//= Copyright (C) Euphy +//= Copyright (C) Paradox924X +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Evera +//= Copyright (C) kobra_k88 +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/acolyte_warp.txt b/npc/other/acolyte_warp.txt index 256c2d802..bb44bd8e3 100644 --- a/npc/other/acolyte_warp.txt +++ b/npc/other/acolyte_warp.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt index 99971eecd..2f6c0a023 100644 --- a/npc/other/arena/arena_aco.txt +++ b/npc/other/arena/arena_aco.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt index 32bd12178..3e44c1b30 100644 --- a/npc/other/arena/arena_lvl50.txt +++ b/npc/other/arena/arena_lvl50.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt index 30734f043..2282cf9fa 100644 --- a/npc/other/arena/arena_lvl60.txt +++ b/npc/other/arena/arena_lvl60.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt index 9a0c26aa3..1b7adfe05 100644 --- a/npc/other/arena/arena_lvl70.txt +++ b/npc/other/arena/arena_lvl70.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt index 3bb1cf43a..ef3627651 100644 --- a/npc/other/arena/arena_lvl80.txt +++ b/npc/other/arena/arena_lvl80.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index f3362687d..0f1ce3670 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Inkfish -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Inkfish +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt index c2ef52e6a..5ff3ab75f 100644 --- a/npc/other/arena/arena_point.txt +++ b/npc/other/arena/arena_point.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt index b70ce7e4c..93f55245a 100644 --- a/npc/other/arena/arena_room.txt +++ b/npc/other/arena/arena_room.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/auction.txt b/npc/other/auction.txt index 76e1a6042..4e86272ae 100644 --- a/npc/other/auction.txt +++ b/npc/other/auction.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/books.txt b/npc/other/books.txt index 919da1ca8..f3ab8ec94 100644 --- a/npc/other/books.txt +++ b/npc/other/books.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt index e1e0ce519..a6e885e3e 100644 --- a/npc/other/bulletin_boards.txt +++ b/npc/other/bulletin_boards.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Silent -//= Copyright (C) Kayla -//= Copyright (C) Nexon -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Silent +//= Copyright (C) Kayla +//= Copyright (C) Nexon +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/card_trader.txt b/npc/other/card_trader.txt index 1fca99440..79d746cf2 100644 --- a/npc/other/card_trader.txt +++ b/npc/other/card_trader.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Elias (og2) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Elias (og2) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt index dab52fbbc..1c9494e4a 100644 --- a/npc/other/comodo_gambling.txt +++ b/npc/other/comodo_gambling.txt @@ -9,18 +9,18 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Paradox924X -//= Copyright (C) ultramage -//= Copyright (C) Lupus -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Zefris -//= Copyright (C) Cypress -//= Copyright (C) Reddozen +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Paradox924X +//= Copyright (C) ultramage +//= Copyright (C) Lupus +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Zefris +//= Copyright (C) Cypress +//= Copyright (C) Reddozen //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt index f490df2f9..419b770c0 100644 --- a/npc/other/divorce.txt +++ b/npc/other/divorce.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) LightFighter -//= Copyright (C) Scriptor -//= Copyright (C) Perkka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) LightFighter +//= Copyright (C) Scriptor +//= Copyright (C) Perkka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt index c3bec40f3..4482cda18 100644 --- a/npc/other/fortune.txt +++ b/npc/other/fortune.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/gm_npcs.txt b/npc/other/gm_npcs.txt index b4ee7028e..6bcd2bcb5 100644 --- a/npc/other/gm_npcs.txt +++ b/npc/other/gm_npcs.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/guildpvp.txt b/npc/other/guildpvp.txt index 5eda61387..4dae87d3a 100644 --- a/npc/other/guildpvp.txt +++ b/npc/other/guildpvp.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/gympass.txt b/npc/other/gympass.txt index 50f7b18f7..da7ee3b74 100644 --- a/npc/other/gympass.txt +++ b/npc/other/gympass.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt index bf64d7105..be9d37db8 100644 --- a/npc/other/hugel_bingo.txt +++ b/npc/other/hugel_bingo.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) Samuray22 -//= Copyright (C) Yommy -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) Samuray22 +//= Copyright (C) Yommy +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/inventory_expansion.txt b/npc/other/inventory_expansion.txt index 8a5ac5e6c..c9589eb25 100644 --- a/npc/other/inventory_expansion.txt +++ b/npc/other/inventory_expansion.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team -//= Copyright (C) 4144 +//= Copyright (C) 2018-2020 Hercules Dev Team +//= Copyright (C) 4144 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/item_merge.txt b/npc/other/item_merge.txt index 6f7a9f0e5..666e7998e 100644 --- a/npc/other/item_merge.txt +++ b/npc/other/item_merge.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/mail.txt b/npc/other/mail.txt index 63b53bf24..f6922cc4d 100644 --- a/npc/other/mail.txt +++ b/npc/other/mail.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Daegaladh -//= Copyright (C) Elias -//= Copyright (C) Zephyrus -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Daegaladh +//= Copyright (C) Elias +//= Copyright (C) Zephyrus +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index 42c817957..6d30e935e 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt index cc7364bf4..fd7b311af 100644 --- a/npc/other/mercenary_rent.txt +++ b/npc/other/mercenary_rent.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Zephyrus -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Zephyrus +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/monster_museum.txt b/npc/other/monster_museum.txt index 0788289c2..46db32590 100644 --- a/npc/other/monster_museum.txt +++ b/npc/other/monster_museum.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Paradox924X -//= Copyright (C) Samuray22 -//= Copyright (C) Haplo -//= Copyright (C) Lance -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Muad_Dib (The Prometheus Project) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Paradox924X +//= Copyright (C) Samuray22 +//= Copyright (C) Haplo +//= Copyright (C) Lance +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Muad_Dib (The Prometheus Project) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt index 84087fb6d..87f0210b4 100644 --- a/npc/other/monster_race.txt +++ b/npc/other/monster_race.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Capuche -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Capuche +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt index 7daad4cba..777ab837e 100644 --- a/npc/other/msg_boards.txt +++ b/npc/other/msg_boards.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) SinSloth -//= Copyright (C) Silent -//= Copyright (C) Nexon -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) SinSloth +//= Copyright (C) Silent +//= Copyright (C) Nexon +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index 326c601be..94d5df0d1 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Slim -//= Copyright (C) CalciumKid -//= Copyright (C) 5511 -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Slim +//= Copyright (C) CalciumKid +//= Copyright (C) 5511 +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt index b784507e6..1af6bd426 100644 --- a/npc/other/powernpc.txt +++ b/npc/other/powernpc.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) KarLeada +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) KarLeada //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/private_airship.txt b/npc/other/private_airship.txt index e650e4b96..5c994ff27 100644 --- a/npc/other/private_airship.txt +++ b/npc/other/private_airship.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team -//= Copyright (C) Asheraf +//= Copyright (C) 2018-2020 Hercules Dev Team +//= Copyright (C) Asheraf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 6978d49d2..cb6547cc7 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Elias (og2) -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Elias (og2) +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt index 948f190ba..0bd95d831 100644 --- a/npc/other/turbo_track.txt +++ b/npc/other/turbo_track.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Elias -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Elias +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/airports/izlude.txt b/npc/pre-re/airports/izlude.txt index 975399268..0f3def54a 100644 --- a/npc/pre-re/airports/izlude.txt +++ b/npc/pre-re/airports/izlude.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/cities/alberta.txt b/npc/pre-re/cities/alberta.txt index df983808a..3816faf9e 100644 --- a/npc/pre-re/cities/alberta.txt +++ b/npc/pre-re/cities/alberta.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/cities/izlude.txt b/npc/pre-re/cities/izlude.txt index 1656f2212..535b3f2d4 100644 --- a/npc/pre-re/cities/izlude.txt +++ b/npc/pre-re/cities/izlude.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Daegaladh +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/cities/jawaii.txt b/npc/pre-re/cities/jawaii.txt index 37a77bc7e..8e3b2ec77 100644 --- a/npc/pre-re/cities/jawaii.txt +++ b/npc/pre-re/cities/jawaii.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Daegaladh +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/cities/yuno.txt b/npc/pre-re/cities/yuno.txt index a14740557..e462de719 100644 --- a/npc/pre-re/cities/yuno.txt +++ b/npc/pre-re/cities/yuno.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_alberta.txt b/npc/pre-re/guides/guides_alberta.txt index c3cac4750..8b22c8ae3 100644 --- a/npc/pre-re/guides/guides_alberta.txt +++ b/npc/pre-re/guides/guides_alberta.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) erKURITA -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) erKURITA +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_aldebaran.txt b/npc/pre-re/guides/guides_aldebaran.txt index d5cdde68e..64714105c 100644 --- a/npc/pre-re/guides/guides_aldebaran.txt +++ b/npc/pre-re/guides/guides_aldebaran.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Samuray22 -//= Copyright (C) Silent -//= Copyright (C) erKURITA -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Samuray22 +//= Copyright (C) Silent +//= Copyright (C) erKURITA +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt index 3409b71ae..1c6196b3f 100644 --- a/npc/pre-re/guides/guides_amatsu.txt +++ b/npc/pre-re/guides/guides_amatsu.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Silent -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Silent +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_ayothaya.txt b/npc/pre-re/guides/guides_ayothaya.txt index ace3a84bf..5b41f68d7 100644 --- a/npc/pre-re/guides/guides_ayothaya.txt +++ b/npc/pre-re/guides/guides_ayothaya.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) MasterOfMuppets -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) MasterOfMuppets +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_comodo.txt b/npc/pre-re/guides/guides_comodo.txt index a53f8ec72..697436db2 100644 --- a/npc/pre-re/guides/guides_comodo.txt +++ b/npc/pre-re/guides/guides_comodo.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_einbroch.txt b/npc/pre-re/guides/guides_einbroch.txt index 1f9f1f3fc..e3369a67e 100644 --- a/npc/pre-re/guides/guides_einbroch.txt +++ b/npc/pre-re/guides/guides_einbroch.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Silent -//= Copyright (C) erKURITA -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Muad_dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Silent +//= Copyright (C) erKURITA +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Muad_dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_geffen.txt b/npc/pre-re/guides/guides_geffen.txt index 5558eeca2..de6b9640b 100644 --- a/npc/pre-re/guides/guides_geffen.txt +++ b/npc/pre-re/guides/guides_geffen.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) Silent -//= Copyright (C) Poki#3 -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) Silent +//= Copyright (C) Poki#3 +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_gonryun.txt b/npc/pre-re/guides/guides_gonryun.txt index c6f3ff863..1024af148 100644 --- a/npc/pre-re/guides/guides_gonryun.txt +++ b/npc/pre-re/guides/guides_gonryun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_hugel.txt b/npc/pre-re/guides/guides_hugel.txt index 262a21483..cd6831404 100644 --- a/npc/pre-re/guides/guides_hugel.txt +++ b/npc/pre-re/guides/guides_hugel.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Silent -//= Copyright (C) L0ne_W0lf -//= Copyright (C) erKURITA +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Silent +//= Copyright (C) L0ne_W0lf +//= Copyright (C) erKURITA //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_izlude.txt b/npc/pre-re/guides/guides_izlude.txt index 3087210aa..43d8dd34f 100644 --- a/npc/pre-re/guides/guides_izlude.txt +++ b/npc/pre-re/guides/guides_izlude.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) erKURITA -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) erKURITA +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_juno.txt b/npc/pre-re/guides/guides_juno.txt index f39511ed9..22e595ea0 100644 --- a/npc/pre-re/guides/guides_juno.txt +++ b/npc/pre-re/guides/guides_juno.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Silent -//= Copyright (C) Musashiden -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 -//= Copyright (C) usul -//= Copyright (C) KitsuneStarwind +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Silent +//= Copyright (C) Musashiden +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 +//= Copyright (C) usul +//= Copyright (C) KitsuneStarwind //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_lighthalzen.txt b/npc/pre-re/guides/guides_lighthalzen.txt index 25ea062be..9b4b6636a 100644 --- a/npc/pre-re/guides/guides_lighthalzen.txt +++ b/npc/pre-re/guides/guides_lighthalzen.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Silent -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Silent +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_louyang.txt b/npc/pre-re/guides/guides_louyang.txt index 855e44498..84872545f 100644 --- a/npc/pre-re/guides/guides_louyang.txt +++ b/npc/pre-re/guides/guides_louyang.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Athena -//= Copyright (C) Tsuyuki +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Athena +//= Copyright (C) Tsuyuki //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt index 6ea77bcc5..1b6a4a1a7 100644 --- a/npc/pre-re/guides/guides_morroc.txt +++ b/npc/pre-re/guides/guides_morroc.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) Silent -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) Silent +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_moscovia.txt b/npc/pre-re/guides/guides_moscovia.txt index f7c9d2c05..8ecaa386b 100644 --- a/npc/pre-re/guides/guides_moscovia.txt +++ b/npc/pre-re/guides/guides_moscovia.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_niflheim.txt b/npc/pre-re/guides/guides_niflheim.txt index 5b0548800..0bf57d7b2 100644 --- a/npc/pre-re/guides/guides_niflheim.txt +++ b/npc/pre-re/guides/guides_niflheim.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_payon.txt b/npc/pre-re/guides/guides_payon.txt index 955497cf8..5d46e3dc0 100644 --- a/npc/pre-re/guides/guides_payon.txt +++ b/npc/pre-re/guides/guides_payon.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Silent -//= Copyright (C) erKURITA -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) Darkchild -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Silent +//= Copyright (C) erKURITA +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) Darkchild +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_prontera.txt b/npc/pre-re/guides/guides_prontera.txt index a4d1d2e1f..628706e67 100644 --- a/npc/pre-re/guides/guides_prontera.txt +++ b/npc/pre-re/guides/guides_prontera.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) Silent -//= Copyright (C) erKURITA -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) Silent +//= Copyright (C) erKURITA +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_rachel.txt b/npc/pre-re/guides/guides_rachel.txt index 08b7ca1bb..49d22b30d 100644 --- a/npc/pre-re/guides/guides_rachel.txt +++ b/npc/pre-re/guides/guides_rachel.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_umbala.txt b/npc/pre-re/guides/guides_umbala.txt index c2b6c509c..9111c5b7c 100644 --- a/npc/pre-re/guides/guides_umbala.txt +++ b/npc/pre-re/guides/guides_umbala.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) erKURITA -//= Copyright (C) Lupus -//= Copyright (C) Dizzy -//= Copyright (C) Celest -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) erKURITA +//= Copyright (C) Lupus +//= Copyright (C) Dizzy +//= Copyright (C) Celest +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/guides/guides_veins.txt b/npc/pre-re/guides/guides_veins.txt index 120519f1c..db733b63b 100644 --- a/npc/pre-re/guides/guides_veins.txt +++ b/npc/pre-re/guides/guides_veins.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt index a796763bb..9dfeed289 100644 --- a/npc/pre-re/jobs/1-1/acolyte.txt +++ b/npc/pre-re/jobs/1-1/acolyte.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Samuray22 -//= Copyright (C) massdriller -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Samuray22 +//= Copyright (C) massdriller +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt index fc8bf42c4..08045eff9 100644 --- a/npc/pre-re/jobs/1-1/archer.txt +++ b/npc/pre-re/jobs/1-1/archer.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) massdriller -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) massdriller +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 684c7335e..c155c6612 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) Samuray22 -//= Copyright (C) massdriller -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) Samuray22 +//= Copyright (C) massdriller +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index b6ce65b3d..6600db152 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Silent -//= Copyright (C) massdriller -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Silent +//= Copyright (C) massdriller +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt index bedd7b622..551c37e4a 100644 --- a/npc/pre-re/jobs/1-1/swordman.txt +++ b/npc/pre-re/jobs/1-1/swordman.txt @@ -9,17 +9,17 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Yommy -//= Copyright (C) ultramage -//= Copyright (C) L0ne_W0lf -//= Copyright (C) KarLaeda -//= Copyright (C) Silent -//= Copyright (C) massdriller -//= Copyright (C) Fredzilla -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Yommy +//= Copyright (C) ultramage +//= Copyright (C) L0ne_W0lf +//= Copyright (C) KarLaeda +//= Copyright (C) Silent +//= Copyright (C) massdriller +//= Copyright (C) Fredzilla +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt index a99c4700f..a3181d830 100644 --- a/npc/pre-re/jobs/1-1/thief.txt +++ b/npc/pre-re/jobs/1-1/thief.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) massdriller -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) massdriller +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/jobs/1-1e/taekwon.txt b/npc/pre-re/jobs/1-1e/taekwon.txt index e97cb204d..f3df23876 100644 --- a/npc/pre-re/jobs/1-1e/taekwon.txt +++ b/npc/pre-re/jobs/1-1e/taekwon.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt index bbae29988..5a084176e 100644 --- a/npc/pre-re/jobs/novice/novice.txt +++ b/npc/pre-re/jobs/novice/novice.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Kisuka -//= Copyright (C) Samuray22 -//= Copyright (C) Lupus -//= Copyright (C) Toms -//= Copyright (C) Silent -//= Copyright (C) Vicious -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Dr.Evil +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Kisuka +//= Copyright (C) Samuray22 +//= Copyright (C) Lupus +//= Copyright (C) Toms +//= Copyright (C) Silent +//= Copyright (C) Vicious +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Dr.Evil //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/kafras/kafras.txt b/npc/pre-re/kafras/kafras.txt index f921a0256..e6d65e324 100644 --- a/npc/pre-re/kafras/kafras.txt +++ b/npc/pre-re/kafras/kafras.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Daegaladh +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mapflag/gvg.txt b/npc/pre-re/mapflag/gvg.txt index 39be0ee7b..0466d24cc 100644 --- a/npc/pre-re/mapflag/gvg.txt +++ b/npc/pre-re/mapflag/gvg.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2017 Hercules Dev Team +//= Copyright (C) 2017-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/merchants/ammo_boxes.txt b/npc/pre-re/merchants/ammo_boxes.txt index 7ac527f89..3d40189e5 100644 --- a/npc/pre-re/merchants/ammo_boxes.txt +++ b/npc/pre-re/merchants/ammo_boxes.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/merchants/ammo_dealer.txt b/npc/pre-re/merchants/ammo_dealer.txt index 185caa24c..8d89ff839 100644 --- a/npc/pre-re/merchants/ammo_dealer.txt +++ b/npc/pre-re/merchants/ammo_dealer.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt index f5dd954f8..cfcc82e8f 100644 --- a/npc/pre-re/merchants/shops.txt +++ b/npc/pre-re/merchants/shops.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Frost -//= Copyright (C) Streusel -//= Copyright (C) Daegaladh +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Frost +//= Copyright (C) Streusel +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/citycleaners.txt b/npc/pre-re/mobs/citycleaners.txt index ec388e804..39e31d226 100644 --- a/npc/pre-re/mobs/citycleaners.txt +++ b/npc/pre-re/mobs/citycleaners.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/abbey.txt b/npc/pre-re/mobs/dungeons/abbey.txt index 9aa1873ae..8d90786bb 100644 --- a/npc/pre-re/mobs/dungeons/abbey.txt +++ b/npc/pre-re/mobs/dungeons/abbey.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/abyss.txt b/npc/pre-re/mobs/dungeons/abyss.txt index 9efe548f5..a8d6281c7 100644 --- a/npc/pre-re/mobs/dungeons/abyss.txt +++ b/npc/pre-re/mobs/dungeons/abyss.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Nexon -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Nexon +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/alde_dun.txt b/npc/pre-re/mobs/dungeons/alde_dun.txt index ba69711f9..70c5aea15 100644 --- a/npc/pre-re/mobs/dungeons/alde_dun.txt +++ b/npc/pre-re/mobs/dungeons/alde_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/ama_dun.txt b/npc/pre-re/mobs/dungeons/ama_dun.txt index b0d069825..42f08b319 100644 --- a/npc/pre-re/mobs/dungeons/ama_dun.txt +++ b/npc/pre-re/mobs/dungeons/ama_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/anthell.txt b/npc/pre-re/mobs/dungeons/anthell.txt index e253ad799..d6852177f 100644 --- a/npc/pre-re/mobs/dungeons/anthell.txt +++ b/npc/pre-re/mobs/dungeons/anthell.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/ayo_dun.txt b/npc/pre-re/mobs/dungeons/ayo_dun.txt index fc87a8217..b02920127 100644 --- a/npc/pre-re/mobs/dungeons/ayo_dun.txt +++ b/npc/pre-re/mobs/dungeons/ayo_dun.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Ishizu -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Ishizu +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/beach_dun.txt b/npc/pre-re/mobs/dungeons/beach_dun.txt index d17854b27..935ec2403 100644 --- a/npc/pre-re/mobs/dungeons/beach_dun.txt +++ b/npc/pre-re/mobs/dungeons/beach_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/c_tower.txt b/npc/pre-re/mobs/dungeons/c_tower.txt index ac6f45928..a15f08404 100644 --- a/npc/pre-re/mobs/dungeons/c_tower.txt +++ b/npc/pre-re/mobs/dungeons/c_tower.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/ein_dun.txt b/npc/pre-re/mobs/dungeons/ein_dun.txt index 41a13c135..d5ccef93e 100644 --- a/npc/pre-re/mobs/dungeons/ein_dun.txt +++ b/npc/pre-re/mobs/dungeons/ein_dun.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/gef_dun.txt b/npc/pre-re/mobs/dungeons/gef_dun.txt index 92288bf86..26a458ebd 100644 --- a/npc/pre-re/mobs/dungeons/gef_dun.txt +++ b/npc/pre-re/mobs/dungeons/gef_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/gefenia.txt b/npc/pre-re/mobs/dungeons/gefenia.txt index c6ec26d13..f3ce277ec 100644 --- a/npc/pre-re/mobs/dungeons/gefenia.txt +++ b/npc/pre-re/mobs/dungeons/gefenia.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/glastheim.txt b/npc/pre-re/mobs/dungeons/glastheim.txt index fd29cfa88..dda37cb8e 100644 --- a/npc/pre-re/mobs/dungeons/glastheim.txt +++ b/npc/pre-re/mobs/dungeons/glastheim.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/gld_dun.txt b/npc/pre-re/mobs/dungeons/gld_dun.txt index c92351288..a5ad2eb20 100644 --- a/npc/pre-re/mobs/dungeons/gld_dun.txt +++ b/npc/pre-re/mobs/dungeons/gld_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Gepard -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Gepard +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/gld_dunSE.txt b/npc/pre-re/mobs/dungeons/gld_dunSE.txt index 399b36a64..b7157b801 100644 --- a/npc/pre-re/mobs/dungeons/gld_dunSE.txt +++ b/npc/pre-re/mobs/dungeons/gld_dunSE.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/gon_dun.txt b/npc/pre-re/mobs/dungeons/gon_dun.txt index f4494a0e6..4e6b8d4e7 100644 --- a/npc/pre-re/mobs/dungeons/gon_dun.txt +++ b/npc/pre-re/mobs/dungeons/gon_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/ice_dun.txt b/npc/pre-re/mobs/dungeons/ice_dun.txt index 54b0ba7f2..c24147807 100644 --- a/npc/pre-re/mobs/dungeons/ice_dun.txt +++ b/npc/pre-re/mobs/dungeons/ice_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/in_sphinx.txt b/npc/pre-re/mobs/dungeons/in_sphinx.txt index 48e3047b5..69edf440e 100644 --- a/npc/pre-re/mobs/dungeons/in_sphinx.txt +++ b/npc/pre-re/mobs/dungeons/in_sphinx.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/iz_dun.txt b/npc/pre-re/mobs/dungeons/iz_dun.txt index d57b66702..daa973f19 100644 --- a/npc/pre-re/mobs/dungeons/iz_dun.txt +++ b/npc/pre-re/mobs/dungeons/iz_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/juperos.txt b/npc/pre-re/mobs/dungeons/juperos.txt index ea003c183..5730bd1ce 100644 --- a/npc/pre-re/mobs/dungeons/juperos.txt +++ b/npc/pre-re/mobs/dungeons/juperos.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) The Prometheus Project -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) The Prometheus Project +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/kh_dun.txt b/npc/pre-re/mobs/dungeons/kh_dun.txt index 70f1acdd0..36c06f618 100644 --- a/npc/pre-re/mobs/dungeons/kh_dun.txt +++ b/npc/pre-re/mobs/dungeons/kh_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/lhz_dun.txt b/npc/pre-re/mobs/dungeons/lhz_dun.txt index 725fbe2fe..489e696c9 100644 --- a/npc/pre-re/mobs/dungeons/lhz_dun.txt +++ b/npc/pre-re/mobs/dungeons/lhz_dun.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Poki#3 -//= Copyright (C) Skotlex -//= Copyright (C) The Prometheus Project -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Poki#3 +//= Copyright (C) Skotlex +//= Copyright (C) The Prometheus Project +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/lou_dun.txt b/npc/pre-re/mobs/dungeons/lou_dun.txt index e5b41e3f5..996207fae 100644 --- a/npc/pre-re/mobs/dungeons/lou_dun.txt +++ b/npc/pre-re/mobs/dungeons/lou_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/mag_dun.txt b/npc/pre-re/mobs/dungeons/mag_dun.txt index 4997edd79..5815e5e7b 100644 --- a/npc/pre-re/mobs/dungeons/mag_dun.txt +++ b/npc/pre-re/mobs/dungeons/mag_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/mjo_dun.txt b/npc/pre-re/mobs/dungeons/mjo_dun.txt index 2fa454e69..760d03a15 100644 --- a/npc/pre-re/mobs/dungeons/mjo_dun.txt +++ b/npc/pre-re/mobs/dungeons/mjo_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/moc_pryd.txt b/npc/pre-re/mobs/dungeons/moc_pryd.txt index b8a473e1d..616587bb8 100644 --- a/npc/pre-re/mobs/dungeons/moc_pryd.txt +++ b/npc/pre-re/mobs/dungeons/moc_pryd.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/mosk_dun.txt b/npc/pre-re/mobs/dungeons/mosk_dun.txt index db6c4d9a6..b99654115 100644 --- a/npc/pre-re/mobs/dungeons/mosk_dun.txt +++ b/npc/pre-re/mobs/dungeons/mosk_dun.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/nyd_dun.txt b/npc/pre-re/mobs/dungeons/nyd_dun.txt index d7de231df..4ce3f1fd7 100644 --- a/npc/pre-re/mobs/dungeons/nyd_dun.txt +++ b/npc/pre-re/mobs/dungeons/nyd_dun.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/odin.txt b/npc/pre-re/mobs/dungeons/odin.txt index 0cc6d4e3d..b58d5c99a 100644 --- a/npc/pre-re/mobs/dungeons/odin.txt +++ b/npc/pre-re/mobs/dungeons/odin.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/orcsdun.txt b/npc/pre-re/mobs/dungeons/orcsdun.txt index 1a04cc395..34fe51679 100644 --- a/npc/pre-re/mobs/dungeons/orcsdun.txt +++ b/npc/pre-re/mobs/dungeons/orcsdun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/pay_dun.txt b/npc/pre-re/mobs/dungeons/pay_dun.txt index fe3187b92..7afa747b3 100644 --- a/npc/pre-re/mobs/dungeons/pay_dun.txt +++ b/npc/pre-re/mobs/dungeons/pay_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/prt_maze.txt b/npc/pre-re/mobs/dungeons/prt_maze.txt index 9e89ed740..fb9289f62 100644 --- a/npc/pre-re/mobs/dungeons/prt_maze.txt +++ b/npc/pre-re/mobs/dungeons/prt_maze.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/prt_sew.txt b/npc/pre-re/mobs/dungeons/prt_sew.txt index d99e2db30..049d3e2f6 100644 --- a/npc/pre-re/mobs/dungeons/prt_sew.txt +++ b/npc/pre-re/mobs/dungeons/prt_sew.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/ra_san.txt b/npc/pre-re/mobs/dungeons/ra_san.txt index a588e448e..fa6c0a005 100644 --- a/npc/pre-re/mobs/dungeons/ra_san.txt +++ b/npc/pre-re/mobs/dungeons/ra_san.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/tha_t.txt b/npc/pre-re/mobs/dungeons/tha_t.txt index 9ecddf0bb..162827d0d 100644 --- a/npc/pre-re/mobs/dungeons/tha_t.txt +++ b/npc/pre-re/mobs/dungeons/tha_t.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Playtester -//= Copyright (C) Nexon -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Playtester +//= Copyright (C) Nexon +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/thor_v.txt b/npc/pre-re/mobs/dungeons/thor_v.txt index ea652cfc6..04e5a134e 100644 --- a/npc/pre-re/mobs/dungeons/thor_v.txt +++ b/npc/pre-re/mobs/dungeons/thor_v.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/treasure.txt b/npc/pre-re/mobs/dungeons/treasure.txt index 1f807ff65..3d8bcbbf1 100644 --- a/npc/pre-re/mobs/dungeons/treasure.txt +++ b/npc/pre-re/mobs/dungeons/treasure.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/tur_dun.txt b/npc/pre-re/mobs/dungeons/tur_dun.txt index ee55d7bae..6f9b6f1cd 100644 --- a/npc/pre-re/mobs/dungeons/tur_dun.txt +++ b/npc/pre-re/mobs/dungeons/tur_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/um_dun.txt b/npc/pre-re/mobs/dungeons/um_dun.txt index 5ef0367aa..6b062356a 100644 --- a/npc/pre-re/mobs/dungeons/um_dun.txt +++ b/npc/pre-re/mobs/dungeons/um_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/xmas_dun.txt b/npc/pre-re/mobs/dungeons/xmas_dun.txt index 47ed55da7..5cb2fe626 100644 --- a/npc/pre-re/mobs/dungeons/xmas_dun.txt +++ b/npc/pre-re/mobs/dungeons/xmas_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/dungeons/yggdrasil.txt b/npc/pre-re/mobs/dungeons/yggdrasil.txt index 90d9057ef..b78a93f4a 100644 --- a/npc/pre-re/mobs/dungeons/yggdrasil.txt +++ b/npc/pre-re/mobs/dungeons/yggdrasil.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) DracoRPG -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) DracoRPG +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/amatsu.txt b/npc/pre-re/mobs/fields/amatsu.txt index e6c4426c9..73510588a 100644 --- a/npc/pre-re/mobs/fields/amatsu.txt +++ b/npc/pre-re/mobs/fields/amatsu.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/ayothaya.txt b/npc/pre-re/mobs/fields/ayothaya.txt index d032d2856..6894f9a15 100644 --- a/npc/pre-re/mobs/fields/ayothaya.txt +++ b/npc/pre-re/mobs/fields/ayothaya.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) VP -//= Copyright (C) Lupus -//= Copyright (C) Ishizu -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) VP +//= Copyright (C) Lupus +//= Copyright (C) Ishizu +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/comodo.txt b/npc/pre-re/mobs/fields/comodo.txt index 33463e354..335302e97 100644 --- a/npc/pre-re/mobs/fields/comodo.txt +++ b/npc/pre-re/mobs/fields/comodo.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/einbroch.txt b/npc/pre-re/mobs/fields/einbroch.txt index d08a29a84..ba15a1ae0 100644 --- a/npc/pre-re/mobs/fields/einbroch.txt +++ b/npc/pre-re/mobs/fields/einbroch.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/geffen.txt b/npc/pre-re/mobs/fields/geffen.txt index d388cd4a8..c29f44542 100644 --- a/npc/pre-re/mobs/fields/geffen.txt +++ b/npc/pre-re/mobs/fields/geffen.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/gonryun.txt b/npc/pre-re/mobs/fields/gonryun.txt index 752001667..f833a75cc 100644 --- a/npc/pre-re/mobs/fields/gonryun.txt +++ b/npc/pre-re/mobs/fields/gonryun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/hugel.txt b/npc/pre-re/mobs/fields/hugel.txt index 0977a757d..d9b9a3674 100644 --- a/npc/pre-re/mobs/fields/hugel.txt +++ b/npc/pre-re/mobs/fields/hugel.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/lighthalzen.txt b/npc/pre-re/mobs/fields/lighthalzen.txt index 7f8d88daf..d121463d5 100644 --- a/npc/pre-re/mobs/fields/lighthalzen.txt +++ b/npc/pre-re/mobs/fields/lighthalzen.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Poki#3 -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Poki#3 +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/louyang.txt b/npc/pre-re/mobs/fields/louyang.txt index 1a77c1801..77bd05398 100644 --- a/npc/pre-re/mobs/fields/louyang.txt +++ b/npc/pre-re/mobs/fields/louyang.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Evera -//= Copyright (C) Lorri +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Evera +//= Copyright (C) Lorri //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/lutie.txt b/npc/pre-re/mobs/fields/lutie.txt index 7fbff3416..21f081c5b 100644 --- a/npc/pre-re/mobs/fields/lutie.txt +++ b/npc/pre-re/mobs/fields/lutie.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/manuk.txt b/npc/pre-re/mobs/fields/manuk.txt index 30986f879..82bfc7e4d 100644 --- a/npc/pre-re/mobs/fields/manuk.txt +++ b/npc/pre-re/mobs/fields/manuk.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) scriptor -//= Copyright (C) alexx -//= Copyright (C) MaC +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) scriptor +//= Copyright (C) alexx +//= Copyright (C) MaC //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/mjolnir.txt b/npc/pre-re/mobs/fields/mjolnir.txt index f98aa1f7d..20c440491 100644 --- a/npc/pre-re/mobs/fields/mjolnir.txt +++ b/npc/pre-re/mobs/fields/mjolnir.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/morocc.txt b/npc/pre-re/mobs/fields/morocc.txt index 317e28f77..7ff121832 100644 --- a/npc/pre-re/mobs/fields/morocc.txt +++ b/npc/pre-re/mobs/fields/morocc.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/moscovia.txt b/npc/pre-re/mobs/fields/moscovia.txt index a6dec7354..bab917ef9 100644 --- a/npc/pre-re/mobs/fields/moscovia.txt +++ b/npc/pre-re/mobs/fields/moscovia.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/niflheim.txt b/npc/pre-re/mobs/fields/niflheim.txt index 3c9cc5fe0..11b9caf1d 100644 --- a/npc/pre-re/mobs/fields/niflheim.txt +++ b/npc/pre-re/mobs/fields/niflheim.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) DracoRPG -//= Copyright (C) Lupus -//= Copyright (C) shadow -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) DracoRPG +//= Copyright (C) Lupus +//= Copyright (C) shadow +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/payon.txt b/npc/pre-re/mobs/fields/payon.txt index d8a490bcf..55c0b775e 100644 --- a/npc/pre-re/mobs/fields/payon.txt +++ b/npc/pre-re/mobs/fields/payon.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/prontera.txt b/npc/pre-re/mobs/fields/prontera.txt index 28b8c30e7..5c10fc884 100644 --- a/npc/pre-re/mobs/fields/prontera.txt +++ b/npc/pre-re/mobs/fields/prontera.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/rachel.txt b/npc/pre-re/mobs/fields/rachel.txt index 7c2e58494..a6b80b98b 100644 --- a/npc/pre-re/mobs/fields/rachel.txt +++ b/npc/pre-re/mobs/fields/rachel.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Sepheus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Sepheus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/splendide.txt b/npc/pre-re/mobs/fields/splendide.txt index a59c9dc3e..d40d9b93d 100644 --- a/npc/pre-re/mobs/fields/splendide.txt +++ b/npc/pre-re/mobs/fields/splendide.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) scriptor -//= Copyright (C) alexx -//= Copyright (C) MaC +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) scriptor +//= Copyright (C) alexx +//= Copyright (C) MaC //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/umbala.txt b/npc/pre-re/mobs/fields/umbala.txt index 09d26315c..29d7b7e40 100644 --- a/npc/pre-re/mobs/fields/umbala.txt +++ b/npc/pre-re/mobs/fields/umbala.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Darkchild +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Darkchild //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/veins.txt b/npc/pre-re/mobs/fields/veins.txt index 30f313737..6241dfc1e 100644 --- a/npc/pre-re/mobs/fields/veins.txt +++ b/npc/pre-re/mobs/fields/veins.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Gepard -//= Copyright (C) Playtester -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Gepard +//= Copyright (C) Playtester +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/mobs/fields/yuno.txt b/npc/pre-re/mobs/fields/yuno.txt index 30e4f088b..6cf357a97 100644 --- a/npc/pre-re/mobs/fields/yuno.txt +++ b/npc/pre-re/mobs/fields/yuno.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Darkchild -//= Copyright (C) Muad_Dib -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Darkchild +//= Copyright (C) Muad_Dib +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/other/bulletin_boards.txt b/npc/pre-re/other/bulletin_boards.txt index 93c27f8f2..9380d574c 100644 --- a/npc/pre-re/other/bulletin_boards.txt +++ b/npc/pre-re/other/bulletin_boards.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt index e92818d52..d6c9ff61e 100644 --- a/npc/pre-re/other/mercenary_rent.txt +++ b/npc/pre-re/other/mercenary_rent.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Daegaladh +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/other/msg_boards.txt b/npc/pre-re/other/msg_boards.txt index fbcaf2749..f80844eab 100644 --- a/npc/pre-re/other/msg_boards.txt +++ b/npc/pre-re/other/msg_boards.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/other/pvp.txt b/npc/pre-re/other/pvp.txt index 2882cf9cb..3cde32b01 100644 --- a/npc/pre-re/other/pvp.txt +++ b/npc/pre-re/other/pvp.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/other/resetskill.txt b/npc/pre-re/other/resetskill.txt index 46e35e541..cca778957 100644 --- a/npc/pre-re/other/resetskill.txt +++ b/npc/pre-re/other/resetskill.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/other/turbo_track.txt b/npc/pre-re/other/turbo_track.txt index 6115b8d18..26cb2e0fc 100644 --- a/npc/pre-re/other/turbo_track.txt +++ b/npc/pre-re/other/turbo_track.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_alligator.txt b/npc/pre-re/quests/collection/quest_alligator.txt index 428eb21ad..2bee7197c 100644 --- a/npc/pre-re/quests/collection/quest_alligator.txt +++ b/npc/pre-re/quests/collection/quest_alligator.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_caramel.txt b/npc/pre-re/quests/collection/quest_caramel.txt index 675b6afc1..461210d00 100644 --- a/npc/pre-re/quests/collection/quest_caramel.txt +++ b/npc/pre-re/quests/collection/quest_caramel.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_coco.txt b/npc/pre-re/quests/collection/quest_coco.txt index 2ed6f7087..73e153802 100644 --- a/npc/pre-re/quests/collection/quest_coco.txt +++ b/npc/pre-re/quests/collection/quest_coco.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_creamy.txt b/npc/pre-re/quests/collection/quest_creamy.txt index 41c9f26ca..6fe4d07b7 100644 --- a/npc/pre-re/quests/collection/quest_creamy.txt +++ b/npc/pre-re/quests/collection/quest_creamy.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_demonpungus.txt b/npc/pre-re/quests/collection/quest_demonpungus.txt index f3218c317..757e1f87a 100644 --- a/npc/pre-re/quests/collection/quest_demonpungus.txt +++ b/npc/pre-re/quests/collection/quest_demonpungus.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt index 7a09ee06c..33249c9ba 100644 --- a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt +++ b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_dokebi.txt b/npc/pre-re/quests/collection/quest_dokebi.txt index ebfb9b2eb..e9908244d 100644 --- a/npc/pre-re/quests/collection/quest_dokebi.txt +++ b/npc/pre-re/quests/collection/quest_dokebi.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_dryad.txt b/npc/pre-re/quests/collection/quest_dryad.txt index 0466c9693..9ffad9240 100644 --- a/npc/pre-re/quests/collection/quest_dryad.txt +++ b/npc/pre-re/quests/collection/quest_dryad.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_fabre.txt b/npc/pre-re/quests/collection/quest_fabre.txt index 0a6f614ea..89e5bbae9 100644 --- a/npc/pre-re/quests/collection/quest_fabre.txt +++ b/npc/pre-re/quests/collection/quest_fabre.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt index 77958ee96..027fd76eb 100644 --- a/npc/pre-re/quests/collection/quest_frilldora.txt +++ b/npc/pre-re/quests/collection/quest_frilldora.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt index e09fd90c0..4da6744a1 100644 --- a/npc/pre-re/quests/collection/quest_goat.txt +++ b/npc/pre-re/quests/collection/quest_goat.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt index 461a26a8a..2365a0dda 100644 --- a/npc/pre-re/quests/collection/quest_golem.txt +++ b/npc/pre-re/quests/collection/quest_golem.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_hode.txt b/npc/pre-re/quests/collection/quest_hode.txt index 1e62fb4a5..c6fe231c0 100644 --- a/npc/pre-re/quests/collection/quest_hode.txt +++ b/npc/pre-re/quests/collection/quest_hode.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_leafcat.txt b/npc/pre-re/quests/collection/quest_leafcat.txt index bcea61337..edb57f40c 100644 --- a/npc/pre-re/quests/collection/quest_leafcat.txt +++ b/npc/pre-re/quests/collection/quest_leafcat.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_mantis.txt b/npc/pre-re/quests/collection/quest_mantis.txt index f1a27a10a..e0199a537 100644 --- a/npc/pre-re/quests/collection/quest_mantis.txt +++ b/npc/pre-re/quests/collection/quest_mantis.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_pecopeco.txt b/npc/pre-re/quests/collection/quest_pecopeco.txt index feebff009..64b11c1d4 100644 --- a/npc/pre-re/quests/collection/quest_pecopeco.txt +++ b/npc/pre-re/quests/collection/quest_pecopeco.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_pupa.txt b/npc/pre-re/quests/collection/quest_pupa.txt index 28b4ff67a..e0edf52bb 100644 --- a/npc/pre-re/quests/collection/quest_pupa.txt +++ b/npc/pre-re/quests/collection/quest_pupa.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/collection/quest_zhupolong.txt b/npc/pre-re/quests/collection/quest_zhupolong.txt index 87c1fc337..ca6979133 100644 --- a/npc/pre-re/quests/collection/quest_zhupolong.txt +++ b/npc/pre-re/quests/collection/quest_zhupolong.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/first_class/tu_archer.txt b/npc/pre-re/quests/first_class/tu_archer.txt index 15342037e..ac75d604f 100644 --- a/npc/pre-re/quests/first_class/tu_archer.txt +++ b/npc/pre-re/quests/first_class/tu_archer.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/monstertamers.txt b/npc/pre-re/quests/monstertamers.txt index 2222335bf..6bee8247e 100644 --- a/npc/pre-re/quests/monstertamers.txt +++ b/npc/pre-re/quests/monstertamers.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/mrsmile.txt b/npc/pre-re/quests/mrsmile.txt index f3ae95ed6..97c0037b3 100644 --- a/npc/pre-re/quests/mrsmile.txt +++ b/npc/pre-re/quests/mrsmile.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Daegaladh +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/quests_13_1.txt b/npc/pre-re/quests/quests_13_1.txt index d1b90d0d6..127e9b219 100644 --- a/npc/pre-re/quests/quests_13_1.txt +++ b/npc/pre-re/quests/quests_13_1.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/quests_izlude.txt b/npc/pre-re/quests/quests_izlude.txt index d14d50a42..99b85bd01 100644 --- a/npc/pre-re/quests/quests_izlude.txt +++ b/npc/pre-re/quests/quests_izlude.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Daegaladh +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/quests_lighthalzen.txt b/npc/pre-re/quests/quests_lighthalzen.txt index f12bf454e..05abe37a2 100644 --- a/npc/pre-re/quests/quests_lighthalzen.txt +++ b/npc/pre-re/quests/quests_lighthalzen.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Daegaladh +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/quests_nameless.txt b/npc/pre-re/quests/quests_nameless.txt index f9f3a0896..54f1a0570 100644 --- a/npc/pre-re/quests/quests_nameless.txt +++ b/npc/pre-re/quests/quests_nameless.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/quests_payon.txt b/npc/pre-re/quests/quests_payon.txt index 210e5d819..5de9d95dc 100644 --- a/npc/pre-re/quests/quests_payon.txt +++ b/npc/pre-re/quests/quests_payon.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2019 Hercules Dev Team -//= Copyright (C) JohnnyPlayy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) JohnnyPlayy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/quests_veins.txt b/npc/pre-re/quests/quests_veins.txt index 9047e14d4..92db7692a 100644 --- a/npc/pre-re/quests/quests_veins.txt +++ b/npc/pre-re/quests/quests_veins.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/quests/skills/novice_skills.txt b/npc/pre-re/quests/skills/novice_skills.txt index b15dd3d93..a3a7f8455 100644 --- a/npc/pre-re/quests/skills/novice_skills.txt +++ b/npc/pre-re/quests/skills/novice_skills.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Zopokx -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) IVBela -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Zopokx +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) IVBela +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/scripts.conf b/npc/pre-re/scripts.conf index 18cf1c32c..31895a673 100644 --- a/npc/pre-re/scripts.conf +++ b/npc/pre-re/scripts.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/scripts_jobs.conf b/npc/pre-re/scripts_jobs.conf index 14dc97eee..3057aaf5a 100644 --- a/npc/pre-re/scripts_jobs.conf +++ b/npc/pre-re/scripts_jobs.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf index dda475310..5bed2d71d 100644 --- a/npc/pre-re/scripts_main.conf +++ b/npc/pre-re/scripts_main.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/scripts_mapflags.conf b/npc/pre-re/scripts_mapflags.conf index 03c798aa6..ad48eb89b 100644 --- a/npc/pre-re/scripts_mapflags.conf +++ b/npc/pre-re/scripts_mapflags.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2017 Hercules Dev Team +//= Copyright (C) 2017-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/scripts_monsters.conf b/npc/pre-re/scripts_monsters.conf index 83ec3cc64..2a00e1a8a 100644 --- a/npc/pre-re/scripts_monsters.conf +++ b/npc/pre-re/scripts_monsters.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/scripts_warps.conf b/npc/pre-re/scripts_warps.conf index 2e4c65027..ccd5c8810 100644 --- a/npc/pre-re/scripts_warps.conf +++ b/npc/pre-re/scripts_warps.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/cities/izlude.txt b/npc/pre-re/warps/cities/izlude.txt index 0c431a2b5..c0fdcdf0d 100644 --- a/npc/pre-re/warps/cities/izlude.txt +++ b/npc/pre-re/warps/cities/izlude.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Juston84 -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Juston84 +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/cities/rachel.txt b/npc/pre-re/warps/cities/rachel.txt index a56f14c05..c5bf15a3a 100644 --- a/npc/pre-re/warps/cities/rachel.txt +++ b/npc/pre-re/warps/cities/rachel.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) erKURITA -//= Copyright (C) RockmanEXE +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) erKURITA +//= Copyright (C) RockmanEXE //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/cities/yggdrasil.txt b/npc/pre-re/warps/cities/yggdrasil.txt index e6651b65d..9ec190823 100644 --- a/npc/pre-re/warps/cities/yggdrasil.txt +++ b/npc/pre-re/warps/cities/yggdrasil.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) PKGINGO +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) PKGINGO //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/fields/com_fild.txt b/npc/pre-re/warps/fields/com_fild.txt index 2b3a94771..b25f40064 100644 --- a/npc/pre-re/warps/fields/com_fild.txt +++ b/npc/pre-re/warps/fields/com_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/fields/geffen_fild.txt b/npc/pre-re/warps/fields/geffen_fild.txt index d37eb05c6..ea1c68717 100644 --- a/npc/pre-re/warps/fields/geffen_fild.txt +++ b/npc/pre-re/warps/fields/geffen_fild.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/fields/hugel_fild.txt b/npc/pre-re/warps/fields/hugel_fild.txt index 7a0da3e4b..42d943f4f 100644 --- a/npc/pre-re/warps/fields/hugel_fild.txt +++ b/npc/pre-re/warps/fields/hugel_fild.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Sara-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Sara-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/fields/morroc_fild.txt b/npc/pre-re/warps/fields/morroc_fild.txt index 3427eb4a6..286d2cef2 100644 --- a/npc/pre-re/warps/fields/morroc_fild.txt +++ b/npc/pre-re/warps/fields/morroc_fild.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/fields/payon_fild.txt b/npc/pre-re/warps/fields/payon_fild.txt index 3e624b4ca..f8bd4d9fc 100644 --- a/npc/pre-re/warps/fields/payon_fild.txt +++ b/npc/pre-re/warps/fields/payon_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/fields/prontera_fild.txt b/npc/pre-re/warps/fields/prontera_fild.txt index 78d2c958b..036426740 100644 --- a/npc/pre-re/warps/fields/prontera_fild.txt +++ b/npc/pre-re/warps/fields/prontera_fild.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/fields/rachel_fild.txt b/npc/pre-re/warps/fields/rachel_fild.txt index 723cd1a1b..31840858d 100644 --- a/npc/pre-re/warps/fields/rachel_fild.txt +++ b/npc/pre-re/warps/fields/rachel_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/fields/veins_fild.txt b/npc/pre-re/warps/fields/veins_fild.txt index 0eabc2aed..a38565b66 100644 --- a/npc/pre-re/warps/fields/veins_fild.txt +++ b/npc/pre-re/warps/fields/veins_fild.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/fields/yuno_fild.txt b/npc/pre-re/warps/fields/yuno_fild.txt index 1be9c17ce..0950df9d8 100644 --- a/npc/pre-re/warps/fields/yuno_fild.txt +++ b/npc/pre-re/warps/fields/yuno_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Sara -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Sara +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/other/arena.txt b/npc/pre-re/warps/other/arena.txt index f9cae285b..006828d1f 100644 --- a/npc/pre-re/warps/other/arena.txt +++ b/npc/pre-re/warps/other/arena.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/warps/other/sign.txt b/npc/pre-re/warps/other/sign.txt index 08eaafe0c..8f0d81ecf 100644 --- a/npc/pre-re/warps/other/sign.txt +++ b/npc/pre-re/warps/other/sign.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt index 43ef61cbf..d59893899 100644 --- a/npc/quests/bard_quest.txt +++ b/npc/quests/bard_quest.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) SinSloth -//= Copyright (C) Lupus -//= Copyright (C) Riotblade -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) SinSloth +//= Copyright (C) Lupus +//= Copyright (C) Riotblade +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt index 9b3537312..50e26f98d 100644 --- a/npc/quests/bunnyband.txt +++ b/npc/quests/bunnyband.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index f124a07d4..23d59a2dc 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) ultramage -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) ultramage +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/counteragent_mixture.txt b/npc/quests/counteragent_mixture.txt index 4921b215c..3840ab90e 100644 --- a/npc/quests/counteragent_mixture.txt +++ b/npc/quests/counteragent_mixture.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nexon -//= Copyright (C) Darkchild -//= Copyright (C) Lupus -//= Copyright (C) Komurka -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nexon +//= Copyright (C) Darkchild +//= Copyright (C) Lupus +//= Copyright (C) Komurka +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/dandelion_request.txt b/npc/quests/dandelion_request.txt index 2f73cf769..8351871e1 100644 --- a/npc/quests/dandelion_request.txt +++ b/npc/quests/dandelion_request.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/doomed_swords.txt b/npc/quests/doomed_swords.txt index 7b0911f37..e5212c2d2 100644 --- a/npc/quests/doomed_swords.txt +++ b/npc/quests/doomed_swords.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/doomed_swords_quest.txt b/npc/quests/doomed_swords_quest.txt index 2f8ac43c1..df2c6ea0f 100644 --- a/npc/quests/doomed_swords_quest.txt +++ b/npc/quests/doomed_swords_quest.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt index 964cfb13b..de250c9ad 100644 --- a/npc/quests/eye_of_hellion.txt +++ b/npc/quests/eye_of_hellion.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) FlavioJS -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) FlavioJS +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt index 69cfb3cbf..ad972cc0e 100644 --- a/npc/quests/first_class/tu_acolyte.txt +++ b/npc/quests/first_class/tu_acolyte.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Daegaladh -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Lupus -//= Copyright (C) Jukka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Daegaladh +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Lupus +//= Copyright (C) Jukka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index 834323086..0f8aa141c 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/npc/quests/first_class/tu_archer.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Lupus -//= Copyright (C) Jukka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Lupus +//= Copyright (C) Jukka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/first_class/tu_ma_th01.txt b/npc/quests/first_class/tu_ma_th01.txt index 40137b74a..1a3a97761 100644 --- a/npc/quests/first_class/tu_ma_th01.txt +++ b/npc/quests/first_class/tu_ma_th01.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Jukka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Jukka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt index 198913b83..7a0844d99 100644 --- a/npc/quests/first_class/tu_magician01.txt +++ b/npc/quests/first_class/tu_magician01.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Lupus -//= Copyright (C) Jukka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Lupus +//= Copyright (C) Jukka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt index 56bfb7390..543ccb364 100644 --- a/npc/quests/first_class/tu_merchant.txt +++ b/npc/quests/first_class/tu_merchant.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Lupus -//= Copyright (C) Jukka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Lupus +//= Copyright (C) Jukka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt index 5c847d7cc..c50fe3a78 100644 --- a/npc/quests/first_class/tu_sword.txt +++ b/npc/quests/first_class/tu_sword.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) KirieZ -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Lupus -//= Copyright (C) Jukka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) KirieZ +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Lupus +//= Copyright (C) Jukka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/first_class/tu_thief01.txt b/npc/quests/first_class/tu_thief01.txt index 58e654122..f44f25bb7 100644 --- a/npc/quests/first_class/tu_thief01.txt +++ b/npc/quests/first_class/tu_thief01.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) SinSloth -//= Copyright (C) Lupus -//= Copyright (C) Jukka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) SinSloth +//= Copyright (C) Lupus +//= Copyright (C) Jukka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt index ec4b081fa..bf496a536 100644 --- a/npc/quests/guildrelay.txt +++ b/npc/quests/guildrelay.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt index 0c6886526..90ef6dd14 100644 --- a/npc/quests/gunslinger_quests.txt +++ b/npc/quests/gunslinger_quests.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) Lupus -//= Copyright (C) SinSloth -//= Copyright (C) Playtester +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) Lupus +//= Copyright (C) SinSloth +//= Copyright (C) Playtester //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt index 250090495..9f77cae2b 100644 --- a/npc/quests/juice_maker.txt +++ b/npc/quests/juice_maker.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lance -//= Copyright (C) kobra_k88 -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lance +//= Copyright (C) kobra_k88 +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt index d1ab7fcaf..4e4bc72f7 100644 --- a/npc/quests/kiel_hyre_quest.txt +++ b/npc/quests/kiel_hyre_quest.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth -//= Copyright (C) Lupus -//= Copyright (C) Balish -//= Copyright (C) Toms -//= Copyright (C) Playtester -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DZeroX +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth +//= Copyright (C) Lupus +//= Copyright (C) Balish +//= Copyright (C) Toms +//= Copyright (C) Playtester +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DZeroX //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt index a6a3d8e9b..c570ad186 100644 --- a/npc/quests/lvl4_weapon_quest.txt +++ b/npc/quests/lvl4_weapon_quest.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Gepard -//= Copyright (C) erKURITA -//= Copyright (C) Silent -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Reddozen -//= Copyright (C) Vicious_Pucca +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Gepard +//= Copyright (C) erKURITA +//= Copyright (C) Silent +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Reddozen +//= Copyright (C) Vicious_Pucca //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/mage_solution.txt b/npc/quests/mage_solution.txt index 7fdb2d1d8..970e5ca6f 100644 --- a/npc/quests/mage_solution.txt +++ b/npc/quests/mage_solution.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Zopokx -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Zopokx +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt index 8e55e54a3..6558012db 100644 --- a/npc/quests/monstertamers.txt +++ b/npc/quests/monstertamers.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Silent -//= Copyright (C) Lupus -//= Copyright (C) x[tsk] -//= Copyright (C) Darkchild -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Silent +//= Copyright (C) Lupus +//= Copyright (C) x[tsk] +//= Copyright (C) Darkchild +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/mrsmile.txt b/npc/quests/mrsmile.txt index a6c11b355..6bda0513e 100644 --- a/npc/quests/mrsmile.txt +++ b/npc/quests/mrsmile.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Akaru -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Akaru +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index 9e1728c65..f966c0164 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/npc/quests/newgears/2004_headgears.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Dj-Yhn +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Dj-Yhn //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt index 80cea9f6a..e0de916ef 100644 --- a/npc/quests/newgears/2005_headgears.txt +++ b/npc/quests/newgears/2005_headgears.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib -//= Copyright (C) L0ne_W0lf -//= Copyright (C) ultramage -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib +//= Copyright (C) L0ne_W0lf +//= Copyright (C) ultramage +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt index 0a90d3a0b..87418b130 100644 --- a/npc/quests/newgears/2006_headgears.txt +++ b/npc/quests/newgears/2006_headgears.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) reddozen -//= Copyright (C) DiviniaRO members +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) reddozen +//= Copyright (C) DiviniaRO members //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt index 4fdd378cf..e1ff305ed 100644 --- a/npc/quests/newgears/2008_headgears.txt +++ b/npc/quests/newgears/2008_headgears.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/newgears/2010_headgears.txt b/npc/quests/newgears/2010_headgears.txt index 16d76d5e6..46631f7b0 100644 --- a/npc/quests/newgears/2010_headgears.txt +++ b/npc/quests/newgears/2010_headgears.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt index 78f21d38b..154f69044 100644 --- a/npc/quests/ninja_quests.txt +++ b/npc/quests/ninja_quests.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Playtester +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Playtester //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt index c2b0c681c..d38f5a96d 100644 --- a/npc/quests/obb_quest.txt +++ b/npc/quests/obb_quest.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) Celesta +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) Celesta //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt index c6e0b57c7..8aee727d7 100644 --- a/npc/quests/okolnir.txt +++ b/npc/quests/okolnir.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Toshiro90 -//= Copyright (C) Joseph -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Toshiro90 +//= Copyright (C) Joseph +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt index c9d4e48f9..571e3d9fa 100644 --- a/npc/quests/partyrelay.txt +++ b/npc/quests/partyrelay.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 2c2855a8d..be52771e9 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Masao -//= Copyright (C) Euphy -//= Copyright (C) tr0n -//= Copyright (C) Slim -//= Copyright (C) Gepard -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Masao +//= Copyright (C) Euphy +//= Copyright (C) tr0n +//= Copyright (C) Slim +//= Copyright (C) Gepard +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index c3dfa5ab0..9396655e7 100644 --- a/npc/quests/quests_13_2.txt +++ b/npc/quests/quests_13_2.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Gepard -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Gepard +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt index 58fde1bdb..55ed3a7d1 100644 --- a/npc/quests/quests_airship.txt +++ b/npc/quests/quests_airship.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2017 Hercules Dev Team -//= Copyright (C) Asheraf -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) brianluau -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Samuray22 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Asheraf +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) brianluau +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Samuray22 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt index c2f726023..a9d0a3745 100644 --- a/npc/quests/quests_alberta.txt +++ b/npc/quests/quests_alberta.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DZeroX -//= Copyright (C) Evera -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DZeroX +//= Copyright (C) Evera +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt index e276622e9..67dcf4158 100644 --- a/npc/quests/quests_aldebaran.txt +++ b/npc/quests/quests_aldebaran.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Silent -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Silent +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt index 31ebb517a..3c55f91a3 100644 --- a/npc/quests/quests_amatsu.txt +++ b/npc/quests/quests_amatsu.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Gepard -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Evera -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Gepard +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Evera +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt index f196069a9..7bb5f407e 100644 --- a/npc/quests/quests_ayothaya.txt +++ b/npc/quests/quests_ayothaya.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Evera -//= Copyright (C) Silent -//= Copyright (C) Lupus -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Fredzilla +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Evera +//= Copyright (C) Silent +//= Copyright (C) Lupus +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Fredzilla //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt index d67d998a4..f4d367347 100644 --- a/npc/quests/quests_comodo.txt +++ b/npc/quests/quests_comodo.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Brainstorm -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Evera -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Brainstorm +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Evera +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt index 5c1ac9ee2..2fb9a857a 100644 --- a/npc/quests/quests_ein.txt +++ b/npc/quests/quests_ein.txt @@ -9,19 +9,19 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) Paradox924X -//= Copyright (C) Yommy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) KarLaeda -//= Copyright (C) Lupus -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Evera +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) Paradox924X +//= Copyright (C) Yommy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) KarLaeda +//= Copyright (C) Lupus +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Evera //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt index 522d96e30..cf4cd70c0 100644 --- a/npc/quests/quests_geffen.txt +++ b/npc/quests/quests_geffen.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) silent -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) silent +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt index 08b3c6803..4a7e88016 100644 --- a/npc/quests/quests_gonryun.txt +++ b/npc/quests/quests_gonryun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Paradox924X -//= Copyright (C) L0ne_W0lf -//= Copyright (C) KarLaeda +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Paradox924X +//= Copyright (C) L0ne_W0lf +//= Copyright (C) KarLaeda //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index a036cd80b..7410926ea 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_izlude.txt b/npc/quests/quests_izlude.txt index 1115e075b..c0bb7692b 100644 --- a/npc/quests/quests_izlude.txt +++ b/npc/quests/quests_izlude.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Evera -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Evera +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index 2f2bb0956..d120bfc27 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2017 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Zephyrus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Capuche +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Zephyrus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Capuche //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index a8386ed46..fe8abf473 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -9,19 +9,19 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Gepard -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lord Gywall -//= Copyright (C) Lupus -//= Copyright (C) MasterOfMupppets -//= Copyright (C) Evera -//= Copyright (C) aoa00 -//= Copyright (C) Vicious_Pucca -//= Copyright (C) Persian +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Gepard +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lord Gywall +//= Copyright (C) Lupus +//= Copyright (C) MasterOfMupppets +//= Copyright (C) Evera +//= Copyright (C) aoa00 +//= Copyright (C) Vicious_Pucca +//= Copyright (C) Persian //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index f5edbd744..9829b5389 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Paradox924X -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Lupus -//= Copyright (C) Evera +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Paradox924X +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Lupus +//= Copyright (C) Evera //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt index 4a1143c8f..3d0c4a141 100644 --- a/npc/quests/quests_lutie.txt +++ b/npc/quests/quests_lutie.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Samuray22 -//= Copyright (C) TonyMan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Samuray22 +//= Copyright (C) TonyMan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 2700244d5..1af498fa8 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Gepard -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Gepard +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index 130b497cf..3f44a9b0a 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2017 Hercules Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Gepard -//= Copyright (C) brianluau -//= Copyright (C) Kisuka -//= Copyright (C) Asheraf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Gepard +//= Copyright (C) brianluau +//= Copyright (C) Kisuka +//= Copyright (C) Asheraf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index 69c0ad902..578b82fc4 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) brianluau -//= Copyright (C) Yommy -//= Copyright (C) Koca -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) brianluau +//= Copyright (C) Yommy +//= Copyright (C) Koca +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt index 179b41f77..03c3149b4 100644 --- a/npc/quests/quests_niflheim.txt +++ b/npc/quests/quests_niflheim.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Evera +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Evera //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt index 4ffd5b802..0430fd215 100644 --- a/npc/quests/quests_payon.txt +++ b/npc/quests/quests_payon.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) Silent -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) Silent +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index f2743233b..c4b33bc54 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) SinSloth -//= Copyright (C) Samuray22 -//= Copyright (C) Evera -//= Copyright (C) Silent -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) SinSloth +//= Copyright (C) Samuray22 +//= Copyright (C) Evera +//= Copyright (C) Silent +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index a0905a3e4..9e3cbdef7 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt index e9d48c6fa..004434f34 100644 --- a/npc/quests/quests_umbala.txt +++ b/npc/quests/quests_umbala.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Team -//= Copyright (C) eAthena Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Evera -//= Copyright (C) Lupus -//= Copyright (C) sabernet09 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Team +//= Copyright (C) eAthena Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Evera +//= Copyright (C) Lupus +//= Copyright (C) sabernet09 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index a69a495be..a8c5cb46a 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Toms -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Toms +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt index b481c2267..cc53b25e6 100644 --- a/npc/quests/quests_yuno.txt +++ b/npc/quests/quests_yuno.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) akrus -//= Copyright (C) Samuray22 -//= Copyright (C) Lupus -//= Copyright (C) Darkchild -//= Copyright (C) kobra_k88 -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) akrus +//= Copyright (C) Samuray22 +//= Copyright (C) Lupus +//= Copyright (C) Darkchild +//= Copyright (C) kobra_k88 +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index cd8bd0d12..ca66eb969 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Toms -//= Copyright (C) MasterOfMuppets -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Toms +//= Copyright (C) MasterOfMuppets +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/seals/god_global.txt b/npc/quests/seals/god_global.txt index fb2b13aeb..f97c99093 100644 --- a/npc/quests/seals/god_global.txt +++ b/npc/quests/seals/god_global.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt index 037c96197..8009bd36d 100644 --- a/npc/quests/seals/god_weapon_creation.txt +++ b/npc/quests/seals/god_weapon_creation.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt index 75510d9a0..a42a70c13 100644 --- a/npc/quests/seals/megingard_seal.txt +++ b/npc/quests/seals/megingard_seal.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) brianluau -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) MasterOfMuppets -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) brianluau +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) MasterOfMuppets +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt index 746167f20..02f2b0006 100644 --- a/npc/quests/seals/mjolnir_seal.txt +++ b/npc/quests/seals/mjolnir_seal.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Zephyrus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) Lupus -//= Copyright (C) MasterOfMuppets -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Zephyrus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) Lupus +//= Copyright (C) MasterOfMuppets +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/seals/seal_status.txt b/npc/quests/seals/seal_status.txt index f8fb721d9..195873c5b 100644 --- a/npc/quests/seals/seal_status.txt +++ b/npc/quests/seals/seal_status.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt index 4450c1778..f6198009e 100644 --- a/npc/quests/seals/sleipnir_seal.txt +++ b/npc/quests/seals/sleipnir_seal.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt index 09500b4ed..05fec66ff 100644 --- a/npc/quests/skills/acolyte_skills.txt +++ b/npc/quests/skills/acolyte_skills.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Silentdragon -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Silentdragon +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt index 78cf18a25..713efdd91 100644 --- a/npc/quests/skills/alchemist_skills.txt +++ b/npc/quests/skills/alchemist_skills.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth -//= Copyright (C) DracoRPG -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth +//= Copyright (C) DracoRPG +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt index afaa6158b..8f2d50991 100644 --- a/npc/quests/skills/archer_skills.txt +++ b/npc/quests/skills/archer_skills.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Masao -//= Copyright (C) IVBela -//= Copyright (C) Silentdragon -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Masao +//= Copyright (C) IVBela +//= Copyright (C) Silentdragon +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt index 7e03eac2f..508ef88e7 100644 --- a/npc/quests/skills/assassin_skills.txt +++ b/npc/quests/skills/assassin_skills.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DracoRPG -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DracoRPG +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt index 6df565fb2..fc71467d9 100644 --- a/npc/quests/skills/bard_skills.txt +++ b/npc/quests/skills/bard_skills.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DracoRPG -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DracoRPG +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt index 9f77fb7ea..012818ff5 100644 --- a/npc/quests/skills/blacksmith_skills.txt +++ b/npc/quests/skills/blacksmith_skills.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) DracoRPG -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) DracoRPG +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt index eb17fe1f2..fc078f742 100644 --- a/npc/quests/skills/crusader_skills.txt +++ b/npc/quests/skills/crusader_skills.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) DracoRPG -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) DracoRPG +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt index 4da84d035..f0e6acbfc 100644 --- a/npc/quests/skills/dancer_skills.txt +++ b/npc/quests/skills/dancer_skills.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Yommy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DracoRPG -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Yommy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DracoRPG +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt index 488e6eaf8..f40093f9d 100644 --- a/npc/quests/skills/hunter_skills.txt +++ b/npc/quests/skills/hunter_skills.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) IVBela -//= Copyright (C) DracoRPG -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) IVBela +//= Copyright (C) DracoRPG +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt index 1230ecab9..b72565f4c 100644 --- a/npc/quests/skills/knight_skills.txt +++ b/npc/quests/skills/knight_skills.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) DracoRPG -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) DracoRPG +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt index 2749790f8..afcddd0a6 100644 --- a/npc/quests/skills/mage_skills.txt +++ b/npc/quests/skills/mage_skills.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) IVBela -//= Copyright (C) Silentdragon -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) IVBela +//= Copyright (C) Silentdragon +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt index 5b92233f1..85dff4d0a 100644 --- a/npc/quests/skills/merchant_skills.txt +++ b/npc/quests/skills/merchant_skills.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DracoRPG -//= Copyright (C) IVBela -//= Copyright (C) Silentdragon -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DracoRPG +//= Copyright (C) IVBela +//= Copyright (C) Silentdragon +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/monk_skills.txt b/npc/quests/skills/monk_skills.txt index c494511bd..5ac78154e 100644 --- a/npc/quests/skills/monk_skills.txt +++ b/npc/quests/skills/monk_skills.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DracoRPG -//= Copyright (C) Samuray22 -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DracoRPG +//= Copyright (C) Samuray22 +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/priest_skills.txt b/npc/quests/skills/priest_skills.txt index a463686da..ce391180f 100644 --- a/npc/quests/skills/priest_skills.txt +++ b/npc/quests/skills/priest_skills.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DracoRPG -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DracoRPG +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt index aafa899da..c31fc1764 100644 --- a/npc/quests/skills/rogue_skills.txt +++ b/npc/quests/skills/rogue_skills.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) DracoRPG -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) DracoRPG +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt index cb7dd81be..adc30eccc 100644 --- a/npc/quests/skills/sage_skills.txt +++ b/npc/quests/skills/sage_skills.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) 5511 -//= Copyright (C) IVBela -//= Copyright (C) DracoRPG -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) 5511 +//= Copyright (C) IVBela +//= Copyright (C) DracoRPG +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt index 6128b7fc8..a7dfcb190 100644 --- a/npc/quests/skills/swordman_skills.txt +++ b/npc/quests/skills/swordman_skills.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) IVBela -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Silentdragon -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) IVBela +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Silentdragon +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt index b69279054..d4da4ba58 100644 --- a/npc/quests/skills/thief_skills.txt +++ b/npc/quests/skills/thief_skills.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Masao -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) IVBela -//= Copyright (C) Silentdragon -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Masao +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) IVBela +//= Copyright (C) Silentdragon +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/skills/wizard_skills.txt b/npc/quests/skills/wizard_skills.txt index 31a9489f0..b9ac04fae 100644 --- a/npc/quests/skills/wizard_skills.txt +++ b/npc/quests/skills/wizard_skills.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Toms -//= Copyright (C) DracoRPG -//= Copyright (C) Reddozen -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Toms +//= Copyright (C) DracoRPG +//= Copyright (C) Reddozen +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt index 787b7a3c4..7d4193107 100644 --- a/npc/quests/thana_quest.txt +++ b/npc/quests/thana_quest.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index 003972e62..5949c3558 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) tr0n -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Kargha -//= Copyright (C) MasterOfMuppets -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) tr0n +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Kargha +//= Copyright (C) MasterOfMuppets +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/airports/izlude.txt b/npc/re/airports/izlude.txt index 1452b5814..880338c0b 100644 --- a/npc/re/airports/izlude.txt +++ b/npc/re/airports/izlude.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/battleground/bg_common.txt b/npc/re/battleground/bg_common.txt index 2c47f8ed1..61ffed531 100644 --- a/npc/re/battleground/bg_common.txt +++ b/npc/re/battleground/bg_common.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Frost +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Frost //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -33,4 +33,4 @@ //= 1.0 //========================================================================= -morocc,145,82,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit8 4_F_JOB_KNIGHT \ No newline at end of file +morocc,145,82,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit8 4_F_JOB_KNIGHT diff --git a/npc/re/cities/alberta.txt b/npc/re/cities/alberta.txt index e8ac3e499..4b1e38791 100644 --- a/npc/re/cities/alberta.txt +++ b/npc/re/cities/alberta.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt index 224918a15..f9c141b39 100644 --- a/npc/re/cities/brasilis.txt +++ b/npc/re/cities/brasilis.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index 70e60a274..b512f81be 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib -//= Copyright (C) Gennosuke Kouga +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib +//= Copyright (C) Gennosuke Kouga //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt index a00a549ac..af642d528 100644 --- a/npc/re/cities/dicastes.txt +++ b/npc/re/cities/dicastes.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) SkittleNugget -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib -//= Copyright (C) Gennosuke Kouga +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) SkittleNugget +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib +//= Copyright (C) Gennosuke Kouga //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/eclage.txt b/npc/re/cities/eclage.txt index a347b9922..3f178161b 100644 --- a/npc/re/cities/eclage.txt +++ b/npc/re/cities/eclage.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Dastgir +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Dastgir //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt index beb7cd6d9..0ffa3817b 100644 --- a/npc/re/cities/izlude.txt +++ b/npc/re/cities/izlude.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt index 9b0858569..e668ffc6c 100644 --- a/npc/re/cities/jawaii.txt +++ b/npc/re/cities/jawaii.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Daegaladh +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index 5ccb1577e..c7735af6c 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index f18bbd0af..55870361c 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) DeadlySilence -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) DeadlySilence +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt index d3f5b6ed3..660629507 100644 --- a/npc/re/cities/mora.txt +++ b/npc/re/cities/mora.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Flaid -//= Copyright (C) SuperHulk -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Flaid +//= Copyright (C) SuperHulk +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/yuno.txt b/npc/re/cities/yuno.txt index fe81450ee..44bb3efc1 100644 --- a/npc/re/cities/yuno.txt +++ b/npc/re/cities/yuno.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/events/christmas_2013.txt b/npc/re/events/christmas_2013.txt index 8ebf5879a..a3495d6b4 100644 --- a/npc/re/events/christmas_2013.txt +++ b/npc/re/events/christmas_2013.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/events/halloween_2013.txt b/npc/re/events/halloween_2013.txt index acfd60f9f..da3f67bc1 100644 --- a/npc/re/events/halloween_2013.txt +++ b/npc/re/events/halloween_2013.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Akkarin +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Akkarin //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/events/halloween_2014.txt b/npc/re/events/halloween_2014.txt index fbfb417bb..696507844 100644 --- a/npc/re/events/halloween_2014.txt +++ b/npc/re/events/halloween_2014.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) erKURITA -//= Copyright (C) Kisuka +//= Copyright (C) 2014-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) erKURITA +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_alberta.txt b/npc/re/guides/guides_alberta.txt index b15c89ddd..7fa4eff38 100644 --- a/npc/re/guides/guides_alberta.txt +++ b/npc/re/guides/guides_alberta.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_aldebaran.txt b/npc/re/guides/guides_aldebaran.txt index 8532c5f1f..bfe0b11d2 100644 --- a/npc/re/guides/guides_aldebaran.txt +++ b/npc/re/guides/guides_aldebaran.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_amatsu.txt b/npc/re/guides/guides_amatsu.txt index 2038e5e9d..02f0c9ca6 100644 --- a/npc/re/guides/guides_amatsu.txt +++ b/npc/re/guides/guides_amatsu.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_ayothaya.txt b/npc/re/guides/guides_ayothaya.txt index 6a4ce5ad2..867aacdf7 100644 --- a/npc/re/guides/guides_ayothaya.txt +++ b/npc/re/guides/guides_ayothaya.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_brasilis.txt b/npc/re/guides/guides_brasilis.txt index 1bcf51d03..ecce529d3 100644 --- a/npc/re/guides/guides_brasilis.txt +++ b/npc/re/guides/guides_brasilis.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_comodo.txt b/npc/re/guides/guides_comodo.txt index 6941273b3..665a21bfd 100644 --- a/npc/re/guides/guides_comodo.txt +++ b/npc/re/guides/guides_comodo.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_dewata.txt b/npc/re/guides/guides_dewata.txt index 00df6bf24..58d4e62f7 100644 --- a/npc/re/guides/guides_dewata.txt +++ b/npc/re/guides/guides_dewata.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Lemongrass -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Lemongrass +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_dicastes.txt b/npc/re/guides/guides_dicastes.txt index 1aa4704ca..e39e6aeb9 100644 --- a/npc/re/guides/guides_dicastes.txt +++ b/npc/re/guides/guides_dicastes.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_eclage.txt b/npc/re/guides/guides_eclage.txt index 861e42dcd..535000253 100644 --- a/npc/re/guides/guides_eclage.txt +++ b/npc/re/guides/guides_eclage.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_einbroch.txt b/npc/re/guides/guides_einbroch.txt index a2806ac91..43676b5f5 100644 --- a/npc/re/guides/guides_einbroch.txt +++ b/npc/re/guides/guides_einbroch.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_geffen.txt b/npc/re/guides/guides_geffen.txt index 50da8778d..c1e627ddf 100644 --- a/npc/re/guides/guides_geffen.txt +++ b/npc/re/guides/guides_geffen.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_gonryun.txt b/npc/re/guides/guides_gonryun.txt index 2ee4af05f..5d7069154 100644 --- a/npc/re/guides/guides_gonryun.txt +++ b/npc/re/guides/guides_gonryun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_hugel.txt b/npc/re/guides/guides_hugel.txt index 4604e9f2d..16659f930 100644 --- a/npc/re/guides/guides_hugel.txt +++ b/npc/re/guides/guides_hugel.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_izlude.txt b/npc/re/guides/guides_izlude.txt index 1bdf5a472..aa56b9f97 100644 --- a/npc/re/guides/guides_izlude.txt +++ b/npc/re/guides/guides_izlude.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_juno.txt b/npc/re/guides/guides_juno.txt index 3b6bc6c9c..379abd79f 100644 --- a/npc/re/guides/guides_juno.txt +++ b/npc/re/guides/guides_juno.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_lighthalzen.txt b/npc/re/guides/guides_lighthalzen.txt index faff34736..b3263a6c0 100644 --- a/npc/re/guides/guides_lighthalzen.txt +++ b/npc/re/guides/guides_lighthalzen.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_louyang.txt b/npc/re/guides/guides_louyang.txt index 0b773b168..93718e91e 100644 --- a/npc/re/guides/guides_louyang.txt +++ b/npc/re/guides/guides_louyang.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_lutie.txt b/npc/re/guides/guides_lutie.txt index 374c36f46..1519853b4 100644 --- a/npc/re/guides/guides_lutie.txt +++ b/npc/re/guides/guides_lutie.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_malaya.txt b/npc/re/guides/guides_malaya.txt index 38f67778f..fe9fa585b 100644 --- a/npc/re/guides/guides_malaya.txt +++ b/npc/re/guides/guides_malaya.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_mora.txt b/npc/re/guides/guides_mora.txt index 66a0ba86d..6e16421f8 100644 --- a/npc/re/guides/guides_mora.txt +++ b/npc/re/guides/guides_mora.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_morroc.txt b/npc/re/guides/guides_morroc.txt index a818624c5..6eace56ff 100644 --- a/npc/re/guides/guides_morroc.txt +++ b/npc/re/guides/guides_morroc.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_moscovia.txt b/npc/re/guides/guides_moscovia.txt index 08b1c9bd7..3511898d8 100644 --- a/npc/re/guides/guides_moscovia.txt +++ b/npc/re/guides/guides_moscovia.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_niflheim.txt b/npc/re/guides/guides_niflheim.txt index 6a5f62d22..74487c960 100644 --- a/npc/re/guides/guides_niflheim.txt +++ b/npc/re/guides/guides_niflheim.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_payon.txt b/npc/re/guides/guides_payon.txt index dfbdd6403..10654223b 100644 --- a/npc/re/guides/guides_payon.txt +++ b/npc/re/guides/guides_payon.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_prontera.txt b/npc/re/guides/guides_prontera.txt index 5937809e7..9de83adc6 100644 --- a/npc/re/guides/guides_prontera.txt +++ b/npc/re/guides/guides_prontera.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_rachel.txt b/npc/re/guides/guides_rachel.txt index 0849a8259..7f6ed689e 100644 --- a/npc/re/guides/guides_rachel.txt +++ b/npc/re/guides/guides_rachel.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_umbala.txt b/npc/re/guides/guides_umbala.txt index e8bb6b257..d01047fb3 100644 --- a/npc/re/guides/guides_umbala.txt +++ b/npc/re/guides/guides_umbala.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_veins.txt b/npc/re/guides/guides_veins.txt index 541db4a03..ebeefcf92 100644 --- a/npc/re/guides/guides_veins.txt +++ b/npc/re/guides/guides_veins.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/navigation.txt b/npc/re/guides/navigation.txt index 0ea11dab2..30b53ba17 100644 --- a/npc/re/guides/navigation.txt +++ b/npc/re/guides/navigation.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt index 5226db6cc..5243219c2 100644 --- a/npc/re/instances/BakonawaLake.txt +++ b/npc/re/instances/BakonawaLake.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt index 4af583879..e997612b5 100644 --- a/npc/re/instances/BangungotHospital.txt +++ b/npc/re/instances/BangungotHospital.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt index 1d3eddc6a..f8ebc0575 100644 --- a/npc/re/instances/BuwayaCave.txt +++ b/npc/re/instances/BuwayaCave.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/EclageInterior.txt b/npc/re/instances/EclageInterior.txt index 2b2117b93..838722706 100644 --- a/npc/re/instances/EclageInterior.txt +++ b/npc/re/instances/EclageInterior.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt index 24e03b22e..f8c1129c1 100644 --- a/npc/re/instances/HazyForest.txt +++ b/npc/re/instances/HazyForest.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt index d61509511..387aff58b 100644 --- a/npc/re/instances/MalangdoCulvert.txt +++ b/npc/re/instances/MalangdoCulvert.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index ec0efeb53..30d17ce43 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2018 Hercules Dev Team -//= Copyright (C) Ridley -//= Copyright (C) Exneval -//= Copyright (C) Euphy -//= Copyright (C) Heris -//= Copyright (C) Ziu +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Ridley +//= Copyright (C) Exneval +//= Copyright (C) Euphy +//= Copyright (C) Heris +//= Copyright (C) Ziu //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index 3bbb74ad1..48889400e 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka +//= Copyright (C) 2014-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt index a291984db..1449cca5b 100644 --- a/npc/re/instances/ghost_palace.txt +++ b/npc/re/instances/ghost_palace.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team -//= Copyright (C) Asheraf -//= Copyright (C) pengc2010 +//= Copyright (C) 2016-2020 Hercules Dev Team +//= Copyright (C) Asheraf +//= Copyright (C) pengc2010 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/octopus_cave.txt b/npc/re/instances/octopus_cave.txt index ffcf0a9fe..6b7ec4cf5 100644 --- a/npc/re/instances/octopus_cave.txt +++ b/npc/re/instances/octopus_cave.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2018 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/saras_memory.txt b/npc/re/instances/saras_memory.txt index 25c0e619b..ded506d3a 100644 --- a/npc/re/instances/saras_memory.txt +++ b/npc/re/instances/saras_memory.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2018 Hercules Dev Team -//= Copyright (C) Ridley -//= Copyright (C) Ziu +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Ridley +//= Copyright (C) Ziu //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt index dae96908b..70de529d2 100644 --- a/npc/re/jobs/1-1/acolyte.txt +++ b/npc/re/jobs/1-1/acolyte.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt index a7ef0ef10..19dc2bbf4 100644 --- a/npc/re/jobs/1-1/archer.txt +++ b/npc/re/jobs/1-1/archer.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt index 29593163b..c0571635f 100644 --- a/npc/re/jobs/1-1/mage.txt +++ b/npc/re/jobs/1-1/mage.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt index 2682e545d..b68a00c61 100644 --- a/npc/re/jobs/1-1/merchant.txt +++ b/npc/re/jobs/1-1/merchant.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt index 8dbadbd9d..f0d62365c 100644 --- a/npc/re/jobs/1-1/swordman.txt +++ b/npc/re/jobs/1-1/swordman.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt index 393b9a13c..bb68dd5f4 100644 --- a/npc/re/jobs/1-1/thief.txt +++ b/npc/re/jobs/1-1/thief.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1e/taekwon.txt b/npc/re/jobs/1-1e/taekwon.txt index 1befa3b73..d07face21 100644 --- a/npc/re/jobs/1-1e/taekwon.txt +++ b/npc/re/jobs/1-1e/taekwon.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt index f03dece93..832876c61 100644 --- a/npc/re/jobs/2e/kagerou_oboro.txt +++ b/npc/re/jobs/2e/kagerou_oboro.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Euphy -//= Copyright (C) M45T3R -//= Copyright (C) Dastgir +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Euphy +//= Copyright (C) M45T3R +//= Copyright (C) Dastgir //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index 90dadd8d1..c7e5b8a61 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Gepard -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Gepard +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 19f4ac7cf..a13afcbd9 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt index 4dcc98448..b97c27c85 100644 --- a/npc/re/jobs/3-1/mechanic.txt +++ b/npc/re/jobs/3-1/mechanic.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) JayPee -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) JayPee +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index 166a1d42e..d91a1b448 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Elias -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Elias +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index 6230746b1..333c5c129 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 13f99013b..41921e74e 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Gepard -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Gepard +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index d9fb1bce6..14f065833 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) JayPee -//= Copyright (C) Masao -//= Copyright (C) Aeomin -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) JayPee +//= Copyright (C) Masao +//= Copyright (C) Aeomin +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt index a9f30975c..a0312ab7c 100644 --- a/npc/re/jobs/3-2/minstrel.txt +++ b/npc/re/jobs/3-2/minstrel.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) JayPee -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) JayPee +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index 8924d61dd..16c8f78dd 100644 --- a/npc/re/jobs/3-2/royal_guard.txt +++ b/npc/re/jobs/3-2/royal_guard.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) brAthena -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) brAthena +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index 3b6f6bcd0..877752431 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Oshinoke -//= Copyright (C) ultragunner -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Oshinoke +//= Copyright (C) ultragunner +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt index 0af118a0d..052771c33 100644 --- a/npc/re/jobs/3-2/sorcerer.txt +++ b/npc/re/jobs/3-2/sorcerer.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index 4e0108fd8..280e6ce28 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Masao -//= Copyright (C) Gepard -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Masao +//= Copyright (C) Gepard +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index e9c88032a..0de90c3cf 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Masao -//= Copyright (C) Meyraw -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Masao +//= Copyright (C) Meyraw +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 567a28f25..f7cd335ce 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015-2016 Hercules Dev Team -//= Copyright (C) Ridley -//= Copyright (C) Kisuka +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Ridley +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index 18ba3fbe1..ed96a7524 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index 74328278f..5e362edfe 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/repair.txt b/npc/re/jobs/repair.txt index 7acd3b606..482d50d73 100644 --- a/npc/re/jobs/repair.txt +++ b/npc/re/jobs/repair.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/kafras/kafras.txt b/npc/re/kafras/kafras.txt index b9b2ff404..1d2ac3100 100644 --- a/npc/re/kafras/kafras.txt +++ b/npc/re/kafras/kafras.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Daegaladh -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Daegaladh +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mapflag/gvg.txt b/npc/re/mapflag/gvg.txt index 2e0e85f32..131a84f6c 100644 --- a/npc/re/mapflag/gvg.txt +++ b/npc/re/mapflag/gvg.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2017 Hercules Dev Team +//= Copyright (C) 2017-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mapflag/zone.txt b/npc/re/mapflag/zone.txt index 24ffce665..224b73058 100644 --- a/npc/re/mapflag/zone.txt +++ b/npc/re/mapflag/zone.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Ind +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Ind //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt index ecfe34fba..642245943 100644 --- a/npc/re/merchants/3rd_trader.txt +++ b/npc/re/merchants/3rd_trader.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Mercurial -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Mercurial +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/advanced_refiner.txt b/npc/re/merchants/advanced_refiner.txt index 5b3f69593..927ae7e68 100644 --- a/npc/re/merchants/advanced_refiner.txt +++ b/npc/re/merchants/advanced_refiner.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/alchemist.txt b/npc/re/merchants/alchemist.txt index fc38ef23a..ddd2c435a 100644 --- a/npc/re/merchants/alchemist.txt +++ b/npc/re/merchants/alchemist.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/ammo_boxes.txt b/npc/re/merchants/ammo_boxes.txt index a8a04d976..410fe68e0 100644 --- a/npc/re/merchants/ammo_boxes.txt +++ b/npc/re/merchants/ammo_boxes.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/ammo_dealer.txt b/npc/re/merchants/ammo_dealer.txt index 6b273371d..ef7e3c244 100644 --- a/npc/re/merchants/ammo_dealer.txt +++ b/npc/re/merchants/ammo_dealer.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/blessed_refiner.txt b/npc/re/merchants/blessed_refiner.txt index 6e548e25b..a9d985de3 100644 --- a/npc/re/merchants/blessed_refiner.txt +++ b/npc/re/merchants/blessed_refiner.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt index b1f6754a5..8f8fd8695 100644 --- a/npc/re/merchants/card_separation.txt +++ b/npc/re/merchants/card_separation.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt index 11f122ace..452ac99b6 100644 --- a/npc/re/merchants/catalog.txt +++ b/npc/re/merchants/catalog.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Scriptor -//= Copyright (C) skyiing +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Scriptor +//= Copyright (C) skyiing //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt index f35c722f7..0a5de5cb9 100644 --- a/npc/re/merchants/coin_exchange.txt +++ b/npc/re/merchants/coin_exchange.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt index 762e2d145..91c4d0b3c 100644 --- a/npc/re/merchants/diamond.txt +++ b/npc/re/merchants/diamond.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Z3R0 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Z3R0 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/enchan_ko.txt b/npc/re/merchants/enchan_ko.txt index 97b307ddd..b96fe103f 100644 --- a/npc/re/merchants/enchan_ko.txt +++ b/npc/re/merchants/enchan_ko.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt index e921a7336..fed154dc8 100644 --- a/npc/re/merchants/enchan_mal.txt +++ b/npc/re/merchants/enchan_mal.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index d114a3b61..297d85c6f 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) DeadlySilence -//= Copyright (C) Lemongrass -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) DeadlySilence +//= Copyright (C) Lemongrass +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/enchan_upg.txt b/npc/re/merchants/enchan_upg.txt index 3193fcf1b..6710a010d 100644 --- a/npc/re/merchants/enchan_upg.txt +++ b/npc/re/merchants/enchan_upg.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Skorm +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Skorm //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt index 98fd3789c..47dd65c50 100644 --- a/npc/re/merchants/flute.txt +++ b/npc/re/merchants/flute.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Ziu -//= Copyright (C) Muad_Dib -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Ziu +//= Copyright (C) Muad_Dib +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt index 2dcc74bae..43cdc2c01 100644 --- a/npc/re/merchants/hd_refiner.txt +++ b/npc/re/merchants/hd_refiner.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/inn.txt b/npc/re/merchants/inn.txt index d44ddd986..bd6883fbc 100644 --- a/npc/re/merchants/inn.txt +++ b/npc/re/merchants/inn.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) c +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) c //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/ninja_craftsman.txt b/npc/re/merchants/ninja_craftsman.txt index 4a3744269..4e212646c 100644 --- a/npc/re/merchants/ninja_craftsman.txt +++ b/npc/re/merchants/ninja_craftsman.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Dastgir +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Dastgir //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/quivers.txt b/npc/re/merchants/quivers.txt index ececa55a2..98297eb9c 100644 --- a/npc/re/merchants/quivers.txt +++ b/npc/re/merchants/quivers.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Muad_Dib (Prometheus Project) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Muad_Dib (Prometheus Project) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt index c0ec2131f..1a8c893b0 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt index 30d9679b0..824a6b6fb 100644 --- a/npc/re/merchants/renters.txt +++ b/npc/re/merchants/renters.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Daegaladh -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Daegaladh +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/shadow_refiner.txt b/npc/re/merchants/shadow_refiner.txt index db9668b6d..cbf6338ba 100644 --- a/npc/re/merchants/shadow_refiner.txt +++ b/npc/re/merchants/shadow_refiner.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2017 Hercules Dev Team +//= Copyright (C) 2017-2020 Hercules Dev Team //= Copyright (C) Dastgir //= Copyright (C) Smokexyz (v2.0) //= diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index 543d9cdc7..b1cbfe917 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Frost -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Streusel -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Kenpachi +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Frost +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Streusel +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Kenpachi //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/ticket_refiner.txt b/npc/re/merchants/ticket_refiner.txt index 5b69fbc38..72c1b5851 100644 --- a/npc/re/merchants/ticket_refiner.txt +++ b/npc/re/merchants/ticket_refiner.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/champion.txt b/npc/re/mobs/champion.txt index 3ee712223..bc1b9fab2 100644 --- a/npc/re/mobs/champion.txt +++ b/npc/re/mobs/champion.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) nanakiwurtz +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) nanakiwurtz //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/citycleaners.txt b/npc/re/mobs/citycleaners.txt index 1acd7f8bd..0fd41c9be 100644 --- a/npc/re/mobs/citycleaners.txt +++ b/npc/re/mobs/citycleaners.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/abbey.txt b/npc/re/mobs/dungeons/abbey.txt index a7cbda8c9..83a0b0eb8 100644 --- a/npc/re/mobs/dungeons/abbey.txt +++ b/npc/re/mobs/dungeons/abbey.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/abyss.txt b/npc/re/mobs/dungeons/abyss.txt index 42e42cd55..f7bbde415 100644 --- a/npc/re/mobs/dungeons/abyss.txt +++ b/npc/re/mobs/dungeons/abyss.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Nexon -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Nexon +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/alde_dun.txt b/npc/re/mobs/dungeons/alde_dun.txt index b00efe8c1..80316a959 100644 --- a/npc/re/mobs/dungeons/alde_dun.txt +++ b/npc/re/mobs/dungeons/alde_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ama_dun.txt b/npc/re/mobs/dungeons/ama_dun.txt index c4b025655..70de92c95 100644 --- a/npc/re/mobs/dungeons/ama_dun.txt +++ b/npc/re/mobs/dungeons/ama_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/anthell.txt b/npc/re/mobs/dungeons/anthell.txt index 81c4d4680..2e7a43be4 100644 --- a/npc/re/mobs/dungeons/anthell.txt +++ b/npc/re/mobs/dungeons/anthell.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ayo_dun.txt b/npc/re/mobs/dungeons/ayo_dun.txt index 19bb1cef4..cbb3a9557 100644 --- a/npc/re/mobs/dungeons/ayo_dun.txt +++ b/npc/re/mobs/dungeons/ayo_dun.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Ishizu -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Ishizu +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/beach_dun.txt b/npc/re/mobs/dungeons/beach_dun.txt index d75c5a924..73396bd5e 100644 --- a/npc/re/mobs/dungeons/beach_dun.txt +++ b/npc/re/mobs/dungeons/beach_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/bra_dun.txt b/npc/re/mobs/dungeons/bra_dun.txt index 816440afa..4fa434b84 100644 --- a/npc/re/mobs/dungeons/bra_dun.txt +++ b/npc/re/mobs/dungeons/bra_dun.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/c_tower.txt b/npc/re/mobs/dungeons/c_tower.txt index 274266bc9..dee704c17 100644 --- a/npc/re/mobs/dungeons/c_tower.txt +++ b/npc/re/mobs/dungeons/c_tower.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/dew_dun.txt b/npc/re/mobs/dungeons/dew_dun.txt index 746e64a46..d86def00c 100644 --- a/npc/re/mobs/dungeons/dew_dun.txt +++ b/npc/re/mobs/dungeons/dew_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/dic_dun.txt b/npc/re/mobs/dungeons/dic_dun.txt index a5ee3b5bd..24a7094d5 100644 --- a/npc/re/mobs/dungeons/dic_dun.txt +++ b/npc/re/mobs/dungeons/dic_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ecl_tdun.txt b/npc/re/mobs/dungeons/ecl_tdun.txt index 0e95c1377..a8425d303 100644 --- a/npc/re/mobs/dungeons/ecl_tdun.txt +++ b/npc/re/mobs/dungeons/ecl_tdun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Michieru -//= Copyright (C) Euphy -//= Copyright (C) refis +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Michieru +//= Copyright (C) Euphy +//= Copyright (C) refis //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ein_dun.txt b/npc/re/mobs/dungeons/ein_dun.txt index 4f7111c95..aba31dd7e 100644 --- a/npc/re/mobs/dungeons/ein_dun.txt +++ b/npc/re/mobs/dungeons/ein_dun.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/gef_dun.txt b/npc/re/mobs/dungeons/gef_dun.txt index 70d9d3ca2..8b8da1a74 100644 --- a/npc/re/mobs/dungeons/gef_dun.txt +++ b/npc/re/mobs/dungeons/gef_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/gefenia.txt b/npc/re/mobs/dungeons/gefenia.txt index 3ba50be71..0b2dbb4a9 100644 --- a/npc/re/mobs/dungeons/gefenia.txt +++ b/npc/re/mobs/dungeons/gefenia.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/glastheim.txt b/npc/re/mobs/dungeons/glastheim.txt index 693aa4a3a..2f5c29753 100644 --- a/npc/re/mobs/dungeons/glastheim.txt +++ b/npc/re/mobs/dungeons/glastheim.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/gld_dunSE.txt b/npc/re/mobs/dungeons/gld_dunSE.txt index 8d6004cc6..0220ffac3 100644 --- a/npc/re/mobs/dungeons/gld_dunSE.txt +++ b/npc/re/mobs/dungeons/gld_dunSE.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/gld_re.txt b/npc/re/mobs/dungeons/gld_re.txt index 2fc5c5507..459349351 100644 --- a/npc/re/mobs/dungeons/gld_re.txt +++ b/npc/re/mobs/dungeons/gld_re.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/gon_dun.txt b/npc/re/mobs/dungeons/gon_dun.txt index 5e694fac8..1ebeb9512 100644 --- a/npc/re/mobs/dungeons/gon_dun.txt +++ b/npc/re/mobs/dungeons/gon_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ice_dun.txt b/npc/re/mobs/dungeons/ice_dun.txt index 4e2b1b0e5..eb379ec28 100644 --- a/npc/re/mobs/dungeons/ice_dun.txt +++ b/npc/re/mobs/dungeons/ice_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/in_sphinx.txt b/npc/re/mobs/dungeons/in_sphinx.txt index 987762e22..f65612db0 100644 --- a/npc/re/mobs/dungeons/in_sphinx.txt +++ b/npc/re/mobs/dungeons/in_sphinx.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/iz_dun.txt b/npc/re/mobs/dungeons/iz_dun.txt index 01ecabc9e..f466b1a89 100644 --- a/npc/re/mobs/dungeons/iz_dun.txt +++ b/npc/re/mobs/dungeons/iz_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Chilly -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Chilly +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/juperos.txt b/npc/re/mobs/dungeons/juperos.txt index bfdce2b16..09c206a22 100644 --- a/npc/re/mobs/dungeons/juperos.txt +++ b/npc/re/mobs/dungeons/juperos.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) The Prometheus Project -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) The Prometheus Project +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/kh_dun.txt b/npc/re/mobs/dungeons/kh_dun.txt index b28fe528b..1f427392d 100644 --- a/npc/re/mobs/dungeons/kh_dun.txt +++ b/npc/re/mobs/dungeons/kh_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/lhz_dun.txt b/npc/re/mobs/dungeons/lhz_dun.txt index 3243a6e04..f0f0e520d 100644 --- a/npc/re/mobs/dungeons/lhz_dun.txt +++ b/npc/re/mobs/dungeons/lhz_dun.txt @@ -9,17 +9,17 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Chilly -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Poki#3 -//= Copyright (C) Skotlex -//= Copyright (C) The Prometheus Project -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Chilly +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Poki#3 +//= Copyright (C) Skotlex +//= Copyright (C) The Prometheus Project +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/lou_dun.txt b/npc/re/mobs/dungeons/lou_dun.txt index 0b437e723..0c1ab8ede 100644 --- a/npc/re/mobs/dungeons/lou_dun.txt +++ b/npc/re/mobs/dungeons/lou_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ma_dun.txt b/npc/re/mobs/dungeons/ma_dun.txt index 687d14cf6..982200927 100644 --- a/npc/re/mobs/dungeons/ma_dun.txt +++ b/npc/re/mobs/dungeons/ma_dun.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/mag_dun.txt b/npc/re/mobs/dungeons/mag_dun.txt index 3c0d1c3d9..754680635 100644 --- a/npc/re/mobs/dungeons/mag_dun.txt +++ b/npc/re/mobs/dungeons/mag_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/mal_dun.txt b/npc/re/mobs/dungeons/mal_dun.txt index 0717975d2..1f18dbadc 100644 --- a/npc/re/mobs/dungeons/mal_dun.txt +++ b/npc/re/mobs/dungeons/mal_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/mjo_dun.txt b/npc/re/mobs/dungeons/mjo_dun.txt index 3deb10c97..16189a2ee 100644 --- a/npc/re/mobs/dungeons/mjo_dun.txt +++ b/npc/re/mobs/dungeons/mjo_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/moc_pryd.txt b/npc/re/mobs/dungeons/moc_pryd.txt index 5ba1e1955..02a4d76d8 100644 --- a/npc/re/mobs/dungeons/moc_pryd.txt +++ b/npc/re/mobs/dungeons/moc_pryd.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/mosk_dun.txt b/npc/re/mobs/dungeons/mosk_dun.txt index 50bff21bf..e605802cf 100644 --- a/npc/re/mobs/dungeons/mosk_dun.txt +++ b/npc/re/mobs/dungeons/mosk_dun.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/nyd_dun.txt b/npc/re/mobs/dungeons/nyd_dun.txt index 5b5aeff04..7b2b89fcc 100644 --- a/npc/re/mobs/dungeons/nyd_dun.txt +++ b/npc/re/mobs/dungeons/nyd_dun.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/odin.txt b/npc/re/mobs/dungeons/odin.txt index 4fb2eba22..159fed772 100644 --- a/npc/re/mobs/dungeons/odin.txt +++ b/npc/re/mobs/dungeons/odin.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/orcsdun.txt b/npc/re/mobs/dungeons/orcsdun.txt index b893fa6c2..e67d5ca1d 100644 --- a/npc/re/mobs/dungeons/orcsdun.txt +++ b/npc/re/mobs/dungeons/orcsdun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/pay_dun.txt b/npc/re/mobs/dungeons/pay_dun.txt index a343d6cce..6dc19c835 100644 --- a/npc/re/mobs/dungeons/pay_dun.txt +++ b/npc/re/mobs/dungeons/pay_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/prt_maze.txt b/npc/re/mobs/dungeons/prt_maze.txt index c5f783554..66f731ced 100644 --- a/npc/re/mobs/dungeons/prt_maze.txt +++ b/npc/re/mobs/dungeons/prt_maze.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/prt_sew.txt b/npc/re/mobs/dungeons/prt_sew.txt index 0c8a49537..68c7cc822 100644 --- a/npc/re/mobs/dungeons/prt_sew.txt +++ b/npc/re/mobs/dungeons/prt_sew.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ra_san.txt b/npc/re/mobs/dungeons/ra_san.txt index ac01c0ef1..a388d9478 100644 --- a/npc/re/mobs/dungeons/ra_san.txt +++ b/npc/re/mobs/dungeons/ra_san.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/tha_t.txt b/npc/re/mobs/dungeons/tha_t.txt index df7391443..cc3919da6 100644 --- a/npc/re/mobs/dungeons/tha_t.txt +++ b/npc/re/mobs/dungeons/tha_t.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Playtester -//= Copyright (C) Nexon -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Playtester +//= Copyright (C) Nexon +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/thor_v.txt b/npc/re/mobs/dungeons/thor_v.txt index 246ab3d35..2d19661ba 100644 --- a/npc/re/mobs/dungeons/thor_v.txt +++ b/npc/re/mobs/dungeons/thor_v.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/treasure.txt b/npc/re/mobs/dungeons/treasure.txt index 3e42160ee..30673cfed 100644 --- a/npc/re/mobs/dungeons/treasure.txt +++ b/npc/re/mobs/dungeons/treasure.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/tur_dun.txt b/npc/re/mobs/dungeons/tur_dun.txt index 9824b1147..53bbe448e 100644 --- a/npc/re/mobs/dungeons/tur_dun.txt +++ b/npc/re/mobs/dungeons/tur_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/xmas_dun.txt b/npc/re/mobs/dungeons/xmas_dun.txt index 6fadd019e..d2154d343 100644 --- a/npc/re/mobs/dungeons/xmas_dun.txt +++ b/npc/re/mobs/dungeons/xmas_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/yggdrasil.txt b/npc/re/mobs/dungeons/yggdrasil.txt index 898a11951..c50338551 100644 --- a/npc/re/mobs/dungeons/yggdrasil.txt +++ b/npc/re/mobs/dungeons/yggdrasil.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) DracoRPG -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) DracoRPG +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/amatsu.txt b/npc/re/mobs/fields/amatsu.txt index b2b90e7c0..55834e818 100644 --- a/npc/re/mobs/fields/amatsu.txt +++ b/npc/re/mobs/fields/amatsu.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/ayothaya.txt b/npc/re/mobs/fields/ayothaya.txt index 3ef2b5456..993e46830 100644 --- a/npc/re/mobs/fields/ayothaya.txt +++ b/npc/re/mobs/fields/ayothaya.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) VP -//= Copyright (C) Lupus -//= Copyright (C) Ishizu -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) VP +//= Copyright (C) Lupus +//= Copyright (C) Ishizu +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/bifrost.txt b/npc/re/mobs/fields/bifrost.txt index 11c186722..488c72f02 100644 --- a/npc/re/mobs/fields/bifrost.txt +++ b/npc/re/mobs/fields/bifrost.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/brasilis.txt b/npc/re/mobs/fields/brasilis.txt index 946f1eaaf..e5f9413af 100644 --- a/npc/re/mobs/fields/brasilis.txt +++ b/npc/re/mobs/fields/brasilis.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/comodo.txt b/npc/re/mobs/fields/comodo.txt index 230e7875d..6726077ae 100644 --- a/npc/re/mobs/fields/comodo.txt +++ b/npc/re/mobs/fields/comodo.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/dewata.txt b/npc/re/mobs/fields/dewata.txt index 45787ef73..53778e964 100644 --- a/npc/re/mobs/fields/dewata.txt +++ b/npc/re/mobs/fields/dewata.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/dicastes.txt b/npc/re/mobs/fields/dicastes.txt index 66dc01126..99a07b9c1 100644 --- a/npc/re/mobs/fields/dicastes.txt +++ b/npc/re/mobs/fields/dicastes.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/eclage.txt b/npc/re/mobs/fields/eclage.txt index 9bec80f20..691b8ebbf 100644 --- a/npc/re/mobs/fields/eclage.txt +++ b/npc/re/mobs/fields/eclage.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Michieru -//= Copyright (C) Euphy -//= Copyright (C) refis -//= Copyright (C) Auriga +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Michieru +//= Copyright (C) Euphy +//= Copyright (C) refis +//= Copyright (C) Auriga //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/einbroch.txt b/npc/re/mobs/fields/einbroch.txt index c2f6bcb04..9535b6853 100644 --- a/npc/re/mobs/fields/einbroch.txt +++ b/npc/re/mobs/fields/einbroch.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/geffen.txt b/npc/re/mobs/fields/geffen.txt index 89f97afb3..9fc98fcac 100644 --- a/npc/re/mobs/fields/geffen.txt +++ b/npc/re/mobs/fields/geffen.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/gonryun.txt b/npc/re/mobs/fields/gonryun.txt index e388e9c14..2af78f32d 100644 --- a/npc/re/mobs/fields/gonryun.txt +++ b/npc/re/mobs/fields/gonryun.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/hugel.txt b/npc/re/mobs/fields/hugel.txt index 34a45319a..d8aba13c9 100644 --- a/npc/re/mobs/fields/hugel.txt +++ b/npc/re/mobs/fields/hugel.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/lighthalzen.txt b/npc/re/mobs/fields/lighthalzen.txt index a03cb54c3..95ba27b80 100644 --- a/npc/re/mobs/fields/lighthalzen.txt +++ b/npc/re/mobs/fields/lighthalzen.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) Poki#3 -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) Poki#3 +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/louyang.txt b/npc/re/mobs/fields/louyang.txt index 624ef34f6..4d8a5966c 100644 --- a/npc/re/mobs/fields/louyang.txt +++ b/npc/re/mobs/fields/louyang.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Evera -//= Copyright (C) Lorri +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Evera +//= Copyright (C) Lorri //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/lutie.txt b/npc/re/mobs/fields/lutie.txt index 260e3770e..51558c85e 100644 --- a/npc/re/mobs/fields/lutie.txt +++ b/npc/re/mobs/fields/lutie.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/malaya.txt b/npc/re/mobs/fields/malaya.txt index 584736414..3abc294ac 100644 --- a/npc/re/mobs/fields/malaya.txt +++ b/npc/re/mobs/fields/malaya.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/manuk.txt b/npc/re/mobs/fields/manuk.txt index 5c3af1de2..cd32e7dd8 100644 --- a/npc/re/mobs/fields/manuk.txt +++ b/npc/re/mobs/fields/manuk.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) scriptor -//= Copyright (C) alexx -//= Copyright (C) MaC +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) scriptor +//= Copyright (C) alexx +//= Copyright (C) MaC //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/mjolnir.txt b/npc/re/mobs/fields/mjolnir.txt index 103f16523..888e332f9 100644 --- a/npc/re/mobs/fields/mjolnir.txt +++ b/npc/re/mobs/fields/mjolnir.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/morocc.txt b/npc/re/mobs/fields/morocc.txt index 0c947afa3..3ab571b0f 100644 --- a/npc/re/mobs/fields/morocc.txt +++ b/npc/re/mobs/fields/morocc.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/moscovia.txt b/npc/re/mobs/fields/moscovia.txt index 12e528874..c31512854 100644 --- a/npc/re/mobs/fields/moscovia.txt +++ b/npc/re/mobs/fields/moscovia.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/niflheim.txt b/npc/re/mobs/fields/niflheim.txt index c42aba3d9..e305a413d 100644 --- a/npc/re/mobs/fields/niflheim.txt +++ b/npc/re/mobs/fields/niflheim.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) DracoRPG -//= Copyright (C) Lupus -//= Copyright (C) shadow -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) DracoRPG +//= Copyright (C) Lupus +//= Copyright (C) shadow +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/payon.txt b/npc/re/mobs/fields/payon.txt index db9759260..9b45a6869 100644 --- a/npc/re/mobs/fields/payon.txt +++ b/npc/re/mobs/fields/payon.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/prontera.txt b/npc/re/mobs/fields/prontera.txt index 2dca8a5c0..0e9a18c48 100644 --- a/npc/re/mobs/fields/prontera.txt +++ b/npc/re/mobs/fields/prontera.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/rachel.txt b/npc/re/mobs/fields/rachel.txt index e5e39de14..5e676bca9 100644 --- a/npc/re/mobs/fields/rachel.txt +++ b/npc/re/mobs/fields/rachel.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Sepheus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Sepheus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/splendide.txt b/npc/re/mobs/fields/splendide.txt index 230aa790e..767b670f5 100644 --- a/npc/re/mobs/fields/splendide.txt +++ b/npc/re/mobs/fields/splendide.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) scriptor -//= Copyright (C) alexx -//= Copyright (C) MaC +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) scriptor +//= Copyright (C) alexx +//= Copyright (C) MaC //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/umbala.txt b/npc/re/mobs/fields/umbala.txt index 7126a6e69..83803e665 100644 --- a/npc/re/mobs/fields/umbala.txt +++ b/npc/re/mobs/fields/umbala.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Darkchild +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Darkchild //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/veins.txt b/npc/re/mobs/fields/veins.txt index 09497517c..97f6c1b87 100644 --- a/npc/re/mobs/fields/veins.txt +++ b/npc/re/mobs/fields/veins.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Gepard -//= Copyright (C) Playtester -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Gepard +//= Copyright (C) Playtester +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/yuno.txt b/npc/re/mobs/fields/yuno.txt index 29b26f176..3614a98c6 100644 --- a/npc/re/mobs/fields/yuno.txt +++ b/npc/re/mobs/fields/yuno.txt @@ -9,17 +9,17 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Darkchild -//= Copyright (C) Muad_Dib -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Darkchild +//= Copyright (C) Muad_Dib +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/int_land.txt b/npc/re/mobs/int_land.txt index f204b1cb4..f917c2d51 100644 --- a/npc/re/mobs/int_land.txt +++ b/npc/re/mobs/int_land.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team +//= Copyright (C) 2016-2020 Hercules Dev Team //= Copyright (C) Ridley //= //= Hercules is free software: you can redistribute it and/or modify diff --git a/npc/re/mobs/towns.txt b/npc/re/mobs/towns.txt index 5d341fece..002ad9a87 100644 --- a/npc/re/mobs/towns.txt +++ b/npc/re/mobs/towns.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/bulletin_boards.txt b/npc/re/other/bulletin_boards.txt index 78f887e8f..51e91d473 100644 --- a/npc/re/other/bulletin_boards.txt +++ b/npc/re/other/bulletin_boards.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/clans.txt b/npc/re/other/clans.txt index f411b149d..59d183e2a 100644 --- a/npc/re/other/clans.txt +++ b/npc/re/other/clans.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2017 Hercules Dev Team +//= Copyright (C) 2017-2020 Hercules Dev Team //= Copyright (C) Ridley //= //= Hercules is free software: you can redistribute it and/or modify diff --git a/npc/re/other/dimensional_gap.txt b/npc/re/other/dimensional_gap.txt index b303f14b7..edd9d7ba0 100644 --- a/npc/re/other/dimensional_gap.txt +++ b/npc/re/other/dimensional_gap.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team -//= Copyright (C) 2016 Ridley -//= Copyright (C) 2016 Nova +//= Copyright (C) 2016-2020 Hercules Dev Team +//= Copyright (C) 2016 Ridley +//= Copyright (C) 2016 Nova //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/mail.txt b/npc/re/other/mail.txt index 34346b1d2..8826e436d 100644 --- a/npc/re/other/mail.txt +++ b/npc/re/other/mail.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/mercenary_rent.txt b/npc/re/other/mercenary_rent.txt index 8ae83f78a..336dc26db 100644 --- a/npc/re/other/mercenary_rent.txt +++ b/npc/re/other/mercenary_rent.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Daegaladh +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/pvp.txt b/npc/re/other/pvp.txt index 7f78b3e9b..6d2298744 100644 --- a/npc/re/other/pvp.txt +++ b/npc/re/other/pvp.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/resetskill.txt b/npc/re/other/resetskill.txt index 8bfb02651..6d82d3e89 100644 --- a/npc/re/other/resetskill.txt +++ b/npc/re/other/resetskill.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/stone_change.txt b/npc/re/other/stone_change.txt index 51cd65f71..336a7721a 100644 --- a/npc/re/other/stone_change.txt +++ b/npc/re/other/stone_change.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/turbo_track.txt b/npc/re/other/turbo_track.txt index 9a37ae0f0..6de9f4d20 100644 --- a/npc/re/other/turbo_track.txt +++ b/npc/re/other/turbo_track.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt index 72e1bd6c9..77d6cf6ee 100644 --- a/npc/re/quests/cupet.txt +++ b/npc/re/quests/cupet.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Z3RO +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Z3RO //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/100-110.txt b/npc/re/quests/eden/100-110.txt index 3cc47f6ef..aadca748b 100644 --- a/npc/re/quests/eden/100-110.txt +++ b/npc/re/quests/eden/100-110.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Capuche +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Capuche //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt index f65ad9090..900e62978 100644 --- a/npc/re/quests/eden/11-25.txt +++ b/npc/re/quests/eden/11-25.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/111-120.txt b/npc/re/quests/eden/111-120.txt index 4422c92c7..787950ad1 100644 --- a/npc/re/quests/eden/111-120.txt +++ b/npc/re/quests/eden/111-120.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Capuche +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Capuche //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/121-130.txt b/npc/re/quests/eden/121-130.txt index d48c71702..4b808b1b8 100644 --- a/npc/re/quests/eden/121-130.txt +++ b/npc/re/quests/eden/121-130.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Capuche +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Capuche //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/131-140.txt b/npc/re/quests/eden/131-140.txt index fa6061b42..607468142 100644 --- a/npc/re/quests/eden/131-140.txt +++ b/npc/re/quests/eden/131-140.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Capuche +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Capuche //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index 029881068..de2e64732 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt index ee32d4306..d4f70ba3f 100644 --- a/npc/re/quests/eden/41-55.txt +++ b/npc/re/quests/eden/41-55.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt index c6aeb8c15..33ecf9bdc 100644 --- a/npc/re/quests/eden/56-70.txt +++ b/npc/re/quests/eden/56-70.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt index cbb6c3e0c..5c81ef422 100644 --- a/npc/re/quests/eden/71-85.txt +++ b/npc/re/quests/eden/71-85.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt index 394970944..c0409d626 100644 --- a/npc/re/quests/eden/86-90.txt +++ b/npc/re/quests/eden/86-90.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt index 328cc4474..81f00eaea 100644 --- a/npc/re/quests/eden/91-99.txt +++ b/npc/re/quests/eden/91-99.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index 156ff1cc0..b4c45b15a 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Brian -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Brian +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index 3e5ae39fe..2012571b5 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Frost -//= Copyright (C) Euphy -//= Copyright (C) -SkittleNugget- +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Frost +//= Copyright (C) Euphy +//= Copyright (C) -SkittleNugget- //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index 6186fa018..926f4c7ab 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Capuche -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Capuche +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt index ce6efaa67..1c9d02f64 100644 --- a/npc/re/quests/eden/eden_service.txt +++ b/npc/re/quests/eden/eden_service.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/eden_tutorial.txt b/npc/re/quests/eden/eden_tutorial.txt index d544aeb0b..1f6b17574 100644 --- a/npc/re/quests/eden/eden_tutorial.txt +++ b/npc/re/quests/eden/eden_tutorial.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/first_class/tu_archer.txt b/npc/re/quests/first_class/tu_archer.txt index 519b07bf2..5a6f4a28d 100644 --- a/npc/re/quests/first_class/tu_archer.txt +++ b/npc/re/quests/first_class/tu_archer.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt index c1ee52d52..95dea2bf6 100644 --- a/npc/re/quests/homun_s.txt +++ b/npc/re/quests/homun_s.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt index bcf94c4a0..8d23f77e0 100644 --- a/npc/re/quests/magic_books.txt +++ b/npc/re/quests/magic_books.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/monstertamers.txt b/npc/re/quests/monstertamers.txt index 6464ae6fc..6781d93bb 100644 --- a/npc/re/quests/monstertamers.txt +++ b/npc/re/quests/monstertamers.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/mrsmile.txt b/npc/re/quests/mrsmile.txt index a98ac8b0e..03ecfad61 100644 --- a/npc/re/quests/mrsmile.txt +++ b/npc/re/quests/mrsmile.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Daegaladh +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt index 80df8d650..d9e8bbd22 100644 --- a/npc/re/quests/newgears/2012_headgears.txt +++ b/npc/re/quests/newgears/2012_headgears.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) -SkittleNugget- -//= Copyright (C) Euphy +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) -SkittleNugget- +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/pile_bunker.txt b/npc/re/quests/pile_bunker.txt index 5362211ab..f32897fd7 100644 --- a/npc/re/quests/pile_bunker.txt +++ b/npc/re/quests/pile_bunker.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) JayPee Mateo +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) JayPee Mateo //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_13_1.txt b/npc/re/quests/quests_13_1.txt index d29a167b1..977c28071 100644 --- a/npc/re/quests/quests_13_1.txt +++ b/npc/re/quests/quests_13_1.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_aldebaran.txt b/npc/re/quests/quests_aldebaran.txt index 336ddb1c7..65460a598 100644 --- a/npc/re/quests/quests_aldebaran.txt +++ b/npc/re/quests/quests_aldebaran.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team -//= Copyright (C) 2016 Ridley -//= Copyright (C) 2016 Aleos +//= Copyright (C) 2016-2020 Hercules Dev Team +//= Copyright (C) 2016 Ridley +//= Copyright (C) 2016 Aleos //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index 91233dbb2..debaba2e5 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Panikon -//= Copyright (C) Michieru -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Panikon +//= Copyright (C) Michieru +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index 638938d53..ac6e54622 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib -//= Copyright (C) Gennosuke Kouga +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib +//= Copyright (C) Gennosuke Kouga //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 2b10bc735..960d3a580 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Frost -//= Copyright (C) Dastgir -//= Copyright (C) Joseph -//= Copyright (C) Masao -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib -//= Copyright (C) Gennosuke Kouga +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Frost +//= Copyright (C) Dastgir +//= Copyright (C) Joseph +//= Copyright (C) Masao +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib +//= Copyright (C) Gennosuke Kouga //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index 10515dee3..9cd41566a 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Dastgir +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Dastgir //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_glastheim.txt b/npc/re/quests/quests_glastheim.txt index cc6f2dc9d..c3ec8d06d 100644 --- a/npc/re/quests/quests_glastheim.txt +++ b/npc/re/quests/quests_glastheim.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team -//= Copyright (C) 2016 Ridley +//= Copyright (C) 2016-2020 Hercules Dev Team +//= Copyright (C) 2016 Ridley //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_izlude.txt b/npc/re/quests/quests_izlude.txt index 661fb735e..bd71f9fa2 100644 --- a/npc/re/quests/quests_izlude.txt +++ b/npc/re/quests/quests_izlude.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Daegaladh +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt index 070368a23..9369f298a 100644 --- a/npc/re/quests/quests_lighthalzen.txt +++ b/npc/re/quests/quests_lighthalzen.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) AtlantisRO +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) AtlantisRO //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index f66d6ab76..0d22c9565 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 403818823..143fc07bc 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Michieru -//= Copyright (C) DeadlySilence -//= Copyright (C) Euphy -//= Copyright (C) Masao +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Michieru +//= Copyright (C) DeadlySilence +//= Copyright (C) Euphy +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 46fdcbddd..1ba417904 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_morocc.txt b/npc/re/quests/quests_morocc.txt index f88692561..08bd16769 100644 --- a/npc/re/quests/quests_morocc.txt +++ b/npc/re/quests/quests_morocc.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_nameless.txt b/npc/re/quests/quests_nameless.txt index 6d80c1c6a..440af3207 100644 --- a/npc/re/quests/quests_nameless.txt +++ b/npc/re/quests/quests_nameless.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_payon.txt b/npc/re/quests/quests_payon.txt index 70646b98c..6af5e647c 100644 --- a/npc/re/quests/quests_payon.txt +++ b/npc/re/quests/quests_payon.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2019 Hercules Dev Team -//= Copyright (C) JohnnyPlayy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) JohnnyPlayy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_veins.txt b/npc/re/quests/quests_veins.txt index 28509ef46..bcff20157 100644 --- a/npc/re/quests/quests_veins.txt +++ b/npc/re/quests/quests_veins.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf index 765f9d5e5..2499d99b2 100644 --- a/npc/re/scripts.conf +++ b/npc/re/scripts.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/scripts_jobs.conf b/npc/re/scripts_jobs.conf index 77d1532e1..f112334de 100644 --- a/npc/re/scripts_jobs.conf +++ b/npc/re/scripts_jobs.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf index 475e8d1be..1a98a9a01 100644 --- a/npc/re/scripts_main.conf +++ b/npc/re/scripts_main.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/scripts_mapflags.conf b/npc/re/scripts_mapflags.conf index 570294c47..3d448cf69 100644 --- a/npc/re/scripts_mapflags.conf +++ b/npc/re/scripts_mapflags.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/scripts_monsters.conf b/npc/re/scripts_monsters.conf index a143da36c..21ff25ce9 100644 --- a/npc/re/scripts_monsters.conf +++ b/npc/re/scripts_monsters.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/scripts_warps.conf b/npc/re/scripts_warps.conf index 683746d79..7b3f8be94 100644 --- a/npc/re/scripts_warps.conf +++ b/npc/re/scripts_warps.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/scripts_woe.conf b/npc/re/scripts_woe.conf index 957ac766d..b5b58ee62 100644 --- a/npc/re/scripts_woe.conf +++ b/npc/re/scripts_woe.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/brasilis.txt b/npc/re/warps/cities/brasilis.txt index 49e75cfe3..f54d13f29 100644 --- a/npc/re/warps/cities/brasilis.txt +++ b/npc/re/warps/cities/brasilis.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Deagaladh -//= Copyright (C) Jguy -//= Copyright (C) Protimus -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Deagaladh +//= Copyright (C) Jguy +//= Copyright (C) Protimus +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/dewata.txt b/npc/re/warps/cities/dewata.txt index f28e81383..11f2732d6 100644 --- a/npc/re/warps/cities/dewata.txt +++ b/npc/re/warps/cities/dewata.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt index 862765d9a..fdae961a6 100644 --- a/npc/re/warps/cities/dicastes.txt +++ b/npc/re/warps/cities/dicastes.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Chilly -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Chilly +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/eclage.txt b/npc/re/warps/cities/eclage.txt index 221c98f22..ee2090a2f 100644 --- a/npc/re/warps/cities/eclage.txt +++ b/npc/re/warps/cities/eclage.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt index 1e691e33b..7973b622f 100644 --- a/npc/re/warps/cities/izlude.txt +++ b/npc/re/warps/cities/izlude.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Ridley -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Masao -//= Copyright (C) Justin84 -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Ridley +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Masao +//= Copyright (C) Justin84 +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/malangdo.txt b/npc/re/warps/cities/malangdo.txt index 499793c22..080724fb5 100644 --- a/npc/re/warps/cities/malangdo.txt +++ b/npc/re/warps/cities/malangdo.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/malaya.txt b/npc/re/warps/cities/malaya.txt index 3c3e3073e..c2610665c 100644 --- a/npc/re/warps/cities/malaya.txt +++ b/npc/re/warps/cities/malaya.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Chilly +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/rachel.txt b/npc/re/warps/cities/rachel.txt index 16bf226cc..33891f69c 100644 --- a/npc/re/warps/cities/rachel.txt +++ b/npc/re/warps/cities/rachel.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) erKURITA -//= Copyright (C) RockmanEXE +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) erKURITA +//= Copyright (C) RockmanEXE //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/yggdrasil.txt b/npc/re/warps/cities/yggdrasil.txt index cdc096d10..f08802b57 100644 --- a/npc/re/warps/cities/yggdrasil.txt +++ b/npc/re/warps/cities/yggdrasil.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) PKGINGO +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) PKGINGO //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/dungeons/bra_dun.txt b/npc/re/warps/dungeons/bra_dun.txt index 7016f5549..d97fe82ba 100644 --- a/npc/re/warps/dungeons/bra_dun.txt +++ b/npc/re/warps/dungeons/bra_dun.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/dungeons/dic_dun.txt b/npc/re/warps/dungeons/dic_dun.txt index 02597e375..678d80216 100644 --- a/npc/re/warps/dungeons/dic_dun.txt +++ b/npc/re/warps/dungeons/dic_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Chilly -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Chilly +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/dungeons/ecl_dun.txt b/npc/re/warps/dungeons/ecl_dun.txt index 8a2aedae6..33c258d95 100644 --- a/npc/re/warps/dungeons/ecl_dun.txt +++ b/npc/re/warps/dungeons/ecl_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/dungeons/iz_dun.txt b/npc/re/warps/dungeons/iz_dun.txt index 9746fc0dd..4ce79d67f 100644 --- a/npc/re/warps/dungeons/iz_dun.txt +++ b/npc/re/warps/dungeons/iz_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/dungeons/moc_pryd.txt b/npc/re/warps/dungeons/moc_pryd.txt index 8daf245a8..e065f849f 100644 --- a/npc/re/warps/dungeons/moc_pryd.txt +++ b/npc/re/warps/dungeons/moc_pryd.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt index 68e3f4f7a..cdd7854b2 100644 --- a/npc/re/warps/fields/bif_fild.txt +++ b/npc/re/warps/fields/bif_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/bra_fild.txt b/npc/re/warps/fields/bra_fild.txt index 7b36f7247..0a38436bb 100644 --- a/npc/re/warps/fields/bra_fild.txt +++ b/npc/re/warps/fields/bra_fild.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Protimus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Protimus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/com_fild.txt b/npc/re/warps/fields/com_fild.txt index bb17bdc5a..f213dc0b1 100644 --- a/npc/re/warps/fields/com_fild.txt +++ b/npc/re/warps/fields/com_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/dic_fild.txt b/npc/re/warps/fields/dic_fild.txt index 22d31fed9..f05227695 100644 --- a/npc/re/warps/fields/dic_fild.txt +++ b/npc/re/warps/fields/dic_fild.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Chilly -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Chilly +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/geffen_fild.txt b/npc/re/warps/fields/geffen_fild.txt index a20d902cc..5e0e84db9 100644 --- a/npc/re/warps/fields/geffen_fild.txt +++ b/npc/re/warps/fields/geffen_fild.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/hugel_fild.txt b/npc/re/warps/fields/hugel_fild.txt index d43aa092f..8f0621450 100644 --- a/npc/re/warps/fields/hugel_fild.txt +++ b/npc/re/warps/fields/hugel_fild.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Sara-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Sara-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/morroc_fild.txt b/npc/re/warps/fields/morroc_fild.txt index 7ae6f5433..604eff6fa 100644 --- a/npc/re/warps/fields/morroc_fild.txt +++ b/npc/re/warps/fields/morroc_fild.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/payon_fild.txt b/npc/re/warps/fields/payon_fild.txt index 296d4eed3..af0783ffc 100644 --- a/npc/re/warps/fields/payon_fild.txt +++ b/npc/re/warps/fields/payon_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/prontera_fild.txt b/npc/re/warps/fields/prontera_fild.txt index fae85a402..4a3563e83 100644 --- a/npc/re/warps/fields/prontera_fild.txt +++ b/npc/re/warps/fields/prontera_fild.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/rachel_fild.txt b/npc/re/warps/fields/rachel_fild.txt index 4840ee582..36b2e8a94 100644 --- a/npc/re/warps/fields/rachel_fild.txt +++ b/npc/re/warps/fields/rachel_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/veins_fild.txt b/npc/re/warps/fields/veins_fild.txt index 04bbad754..df61c2cac 100644 --- a/npc/re/warps/fields/veins_fild.txt +++ b/npc/re/warps/fields/veins_fild.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/yuno_fild.txt b/npc/re/warps/fields/yuno_fild.txt index c87d1c3f6..a19951092 100644 --- a/npc/re/warps/fields/yuno_fild.txt +++ b/npc/re/warps/fields/yuno_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Nana -//= Copyright (C) Sara +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Nana +//= Copyright (C) Sara //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/guildcastles.txt b/npc/re/warps/guildcastles.txt index 444cc7ca5..8ee029a76 100644 --- a/npc/re/warps/guildcastles.txt +++ b/npc/re/warps/guildcastles.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/other/arena.txt b/npc/re/warps/other/arena.txt index fb0ad9a3e..b06fb68d1 100644 --- a/npc/re/warps/other/arena.txt +++ b/npc/re/warps/other/arena.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/other/dimensional_gap.txt b/npc/re/warps/other/dimensional_gap.txt index 890dc76f5..41ff9fa00 100644 --- a/npc/re/warps/other/dimensional_gap.txt +++ b/npc/re/warps/other/dimensional_gap.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team +//= Copyright (C) 2016-2020 Hercules Dev Team //= Copyright (C) Ridley //= Copyright (C) Nova //= diff --git a/npc/re/warps/other/jobquests.txt b/npc/re/warps/other/jobquests.txt index 4e12d4cff..e72c79b81 100644 --- a/npc/re/warps/other/jobquests.txt +++ b/npc/re/warps/other/jobquests.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/other/paradise.txt b/npc/re/warps/other/paradise.txt index ad3f3cf00..0536eb096 100644 --- a/npc/re/warps/other/paradise.txt +++ b/npc/re/warps/other/paradise.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/other/s_workshop.txt b/npc/re/warps/other/s_workshop.txt index 59cc2c19c..5eeb7eae5 100644 --- a/npc/re/warps/other/s_workshop.txt +++ b/npc/re/warps/other/s_workshop.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/other/sign.txt b/npc/re/warps/other/sign.txt index 39face826..b650c41b3 100644 --- a/npc/re/warps/other/sign.txt +++ b/npc/re/warps/other/sign.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/woe-fe/invest_main.txt b/npc/re/woe-fe/invest_main.txt index fc258ad2e..b40588502 100644 --- a/npc/re/woe-fe/invest_main.txt +++ b/npc/re/woe-fe/invest_main.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/woe-fe/invest_npc.txt b/npc/re/woe-fe/invest_npc.txt index 4b2d49f39..f996c345a 100644 --- a/npc/re/woe-fe/invest_npc.txt +++ b/npc/re/woe-fe/invest_npc.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/scripts.conf b/npc/scripts.conf index aa3cb23e8..086370899 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf index a5aad9767..4e346238f 100644 --- a/npc/scripts_custom.conf +++ b/npc/scripts_custom.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/scripts_dev.conf b/npc/scripts_dev.conf index 9916dcad9..d6d807a74 100644 --- a/npc/scripts_dev.conf +++ b/npc/scripts_dev.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2018 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/scripts_jobs.conf b/npc/scripts_jobs.conf index c95f9da9d..b6aeec0c6 100644 --- a/npc/scripts_jobs.conf +++ b/npc/scripts_jobs.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf index eed3c3d3d..084004244 100644 --- a/npc/scripts_mapflags.conf +++ b/npc/scripts_mapflags.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf index beab8fdf6..930c6c504 100644 --- a/npc/scripts_monsters.conf +++ b/npc/scripts_monsters.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/scripts_removed.conf b/npc/scripts_removed.conf index a4e0b5956..051115fd8 100644 --- a/npc/scripts_removed.conf +++ b/npc/scripts_removed.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2018 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf index c89d75089..4f21c7c85 100644 --- a/npc/scripts_warps.conf +++ b/npc/scripts_warps.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/scripts_woe.conf b/npc/scripts_woe.conf index 695a1a398..1a1895766 100644 --- a/npc/scripts_woe.conf +++ b/npc/scripts_woe.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/alberta.txt b/npc/warps/cities/alberta.txt index b88dc04b4..b30ec8444 100644 --- a/npc/warps/cities/alberta.txt +++ b/npc/warps/cities/alberta.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/aldebaran.txt b/npc/warps/cities/aldebaran.txt index dd96edfb1..7715811e5 100644 --- a/npc/warps/cities/aldebaran.txt +++ b/npc/warps/cities/aldebaran.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Justin84 -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Justin84 +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt index 89de14e85..7ab096c9e 100644 --- a/npc/warps/cities/amatsu.txt +++ b/npc/warps/cities/amatsu.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) erKURITA -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) erKURITA +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/ayothaya.txt b/npc/warps/cities/ayothaya.txt index 340cc3c86..e96202a21 100644 --- a/npc/warps/cities/ayothaya.txt +++ b/npc/warps/cities/ayothaya.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) erKURITA -//= Copyright (C) Lupus -//= Copyright (C) MasterOfMuppets -//= Copyright (C) massdriller -//= Copyright (C) Muad_Dib -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) erKURITA +//= Copyright (C) Lupus +//= Copyright (C) MasterOfMuppets +//= Copyright (C) massdriller +//= Copyright (C) Muad_Dib +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/comodo.txt b/npc/warps/cities/comodo.txt index f3e935ac9..00ceaa6bb 100644 --- a/npc/warps/cities/comodo.txt +++ b/npc/warps/cities/comodo.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/einbech.txt b/npc/warps/cities/einbech.txt index e66acb3a7..d2907f778 100644 --- a/npc/warps/cities/einbech.txt +++ b/npc/warps/cities/einbech.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) SSUNNY@YOUNG -//= Copyright (C) Muad Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) SSUNNY@YOUNG +//= Copyright (C) Muad Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/einbroch.txt b/npc/warps/cities/einbroch.txt index 2eaa988d9..aa8685155 100644 --- a/npc/warps/cities/einbroch.txt +++ b/npc/warps/cities/einbroch.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) erKURITA -//= Copyright (C) Vicious -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) erKURITA -//= Copyright (C) SSUNNY@YOUNG -//= Copyrught (C) Sara-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) erKURITA +//= Copyright (C) Vicious +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) erKURITA +//= Copyright (C) SSUNNY@YOUNG +//= Copyright (C) Sara-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/geffen.txt b/npc/warps/cities/geffen.txt index abe9ade40..e574fd557 100644 --- a/npc/warps/cities/geffen.txt +++ b/npc/warps/cities/geffen.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt index a3108db03..ab8cabcd9 100644 --- a/npc/warps/cities/gonryun.txt +++ b/npc/warps/cities/gonryun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/hugel.txt b/npc/warps/cities/hugel.txt index 038debce0..246ea6901 100644 --- a/npc/warps/cities/hugel.txt +++ b/npc/warps/cities/hugel.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) SinSloth -//= Copyright (C) Playtester -//= Copyright (C) erKURITA -//= Copyright (C) Er_Maqui -//= Copyright (C) Lupus -//= Copyright (C) Muad_Dib -//= Copyright (C) Sara-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) SinSloth +//= Copyright (C) Playtester +//= Copyright (C) erKURITA +//= Copyright (C) Er_Maqui +//= Copyright (C) Lupus +//= Copyright (C) Muad_Dib +//= Copyright (C) Sara-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/lighthalzen.txt b/npc/warps/cities/lighthalzen.txt index e78e10275..c5131b1c7 100644 --- a/npc/warps/cities/lighthalzen.txt +++ b/npc/warps/cities/lighthalzen.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Zephiris -//= Copyright (C) Vicious -//= Copyright (C) MasterOfMuppets -//= Copyright (C) DracoRPG -//= Copyright (C) Sara-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Zephiris +//= Copyright (C) Vicious +//= Copyright (C) MasterOfMuppets +//= Copyright (C) DracoRPG +//= Copyright (C) Sara-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/louyang.txt b/npc/warps/cities/louyang.txt index 0c1adebe1..b0525f01d 100644 --- a/npc/warps/cities/louyang.txt +++ b/npc/warps/cities/louyang.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth -//= Copyright (C) erKURITA -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth +//= Copyright (C) erKURITA +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt index 8956430b0..cd99a4e62 100644 --- a/npc/warps/cities/lutie.txt +++ b/npc/warps/cities/lutie.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/manuk.txt b/npc/warps/cities/manuk.txt index 3786ff1b6..5528332cc 100644 --- a/npc/warps/cities/manuk.txt +++ b/npc/warps/cities/manuk.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/mid_camp.txt b/npc/warps/cities/mid_camp.txt index d2d327006..413ec462c 100644 --- a/npc/warps/cities/mid_camp.txt +++ b/npc/warps/cities/mid_camp.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) brianluau -//= Copyright (C) Brainstorm -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) brianluau +//= Copyright (C) Brainstorm +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/morroc.txt b/npc/warps/cities/morroc.txt index 5a341ba35..3cea4c04b 100644 --- a/npc/warps/cities/morroc.txt +++ b/npc/warps/cities/morroc.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/moscovia.txt b/npc/warps/cities/moscovia.txt index 058e7d420..4c9d6e9c2 100644 --- a/npc/warps/cities/moscovia.txt +++ b/npc/warps/cities/moscovia.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/nameless.txt b/npc/warps/cities/nameless.txt index 39df1a9d5..b4f3f27f5 100644 --- a/npc/warps/cities/nameless.txt +++ b/npc/warps/cities/nameless.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/niflheim.txt b/npc/warps/cities/niflheim.txt index 0ebcf7c14..8e3f05af9 100644 --- a/npc/warps/cities/niflheim.txt +++ b/npc/warps/cities/niflheim.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Skotlex -//= Copyright (C) PKGINGO +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Skotlex +//= Copyright (C) PKGINGO //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/payon.txt b/npc/warps/cities/payon.txt index a87fd0062..0be00cc6e 100644 --- a/npc/warps/cities/payon.txt +++ b/npc/warps/cities/payon.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Yor -//= Copyright (C) Nana -//= Copyright (C) Darkchild -//= Copyright (C) Muad Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Yor +//= Copyright (C) Nana +//= Copyright (C) Darkchild +//= Copyright (C) Muad Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt index 8d9edb89b..cbdbc867e 100644 --- a/npc/warps/cities/prontera.txt +++ b/npc/warps/cities/prontera.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets -//= Copyright (C) shadow -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets +//= Copyright (C) shadow +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/splendide.txt b/npc/warps/cities/splendide.txt index 97b560d84..3ffbc247d 100644 --- a/npc/warps/cities/splendide.txt +++ b/npc/warps/cities/splendide.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt index 6a5c31a41..40e67a953 100644 --- a/npc/warps/cities/umbala.txt +++ b/npc/warps/cities/umbala.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana -//= Copyright (C) Akaru -//= Copyright (C) Athena -//= Copyright (C) Darkchild +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana +//= Copyright (C) Akaru +//= Copyright (C) Athena +//= Copyright (C) Darkchild //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/veins.txt b/npc/warps/cities/veins.txt index dcdc1cc61..198e71f07 100644 --- a/npc/warps/cities/veins.txt +++ b/npc/warps/cities/veins.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Zephyrus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Zephyrus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt index 02b38fbef..fd282012e 100644 --- a/npc/warps/cities/yuno.txt +++ b/npc/warps/cities/yuno.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) SinSloth -//= Copyright (C) Musashiden -//= Copyright (C) Lupus -//= Copyright (C) Nana -//= Copyright (C) Sara-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) SinSloth +//= Copyright (C) Musashiden +//= Copyright (C) Lupus +//= Copyright (C) Nana +//= Copyright (C) Sara-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/abbey.txt b/npc/warps/dungeons/abbey.txt index ffc20d7e2..037f09236 100644 --- a/npc/warps/dungeons/abbey.txt +++ b/npc/warps/dungeons/abbey.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/abyss.txt b/npc/warps/dungeons/abyss.txt index a1484d56e..567e0804b 100644 --- a/npc/warps/dungeons/abyss.txt +++ b/npc/warps/dungeons/abyss.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lupus -//= Copyright (C) Muad-Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lupus +//= Copyright (C) Muad-Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/alde_dun.txt b/npc/warps/dungeons/alde_dun.txt index e54751e2f..95b789270 100644 --- a/npc/warps/dungeons/alde_dun.txt +++ b/npc/warps/dungeons/alde_dun.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Silent -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Silent +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/ama_dun.txt b/npc/warps/dungeons/ama_dun.txt index b7377aaf2..ba8782b76 100644 --- a/npc/warps/dungeons/ama_dun.txt +++ b/npc/warps/dungeons/ama_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/anthell.txt b/npc/warps/dungeons/anthell.txt index 042a1efa4..b494625b2 100644 --- a/npc/warps/dungeons/anthell.txt +++ b/npc/warps/dungeons/anthell.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Gepard -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Silent -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Gepard +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Silent +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/ayo_dun.txt b/npc/warps/dungeons/ayo_dun.txt index f127829ac..733d6c33e 100644 --- a/npc/warps/dungeons/ayo_dun.txt +++ b/npc/warps/dungeons/ayo_dun.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Team -//= Copyright (C) eAthena Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Team +//= Copyright (C) eAthena Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/beach_dun.txt b/npc/warps/dungeons/beach_dun.txt index 020663ac2..4d745cd99 100644 --- a/npc/warps/dungeons/beach_dun.txt +++ b/npc/warps/dungeons/beach_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/c_tower.txt b/npc/warps/dungeons/c_tower.txt index c67ace2c4..371c15370 100644 --- a/npc/warps/dungeons/c_tower.txt +++ b/npc/warps/dungeons/c_tower.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/ein_dun.txt b/npc/warps/dungeons/ein_dun.txt index df1061fc2..c78261c37 100644 --- a/npc/warps/dungeons/ein_dun.txt +++ b/npc/warps/dungeons/ein_dun.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Gepard -//= Copyright (C) Vicious -//= Copyright (C) SSUNNY@YOUNG -//= Copyright (C) Sara-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Gepard +//= Copyright (C) Vicious +//= Copyright (C) SSUNNY@YOUNG +//= Copyright (C) Sara-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/gef_dun.txt b/npc/warps/dungeons/gef_dun.txt index 0913d942f..8b3c78980 100644 --- a/npc/warps/dungeons/gef_dun.txt +++ b/npc/warps/dungeons/gef_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/gon_dun.txt b/npc/warps/dungeons/gon_dun.txt index f7532f4be..b93e4c1d2 100644 --- a/npc/warps/dungeons/gon_dun.txt +++ b/npc/warps/dungeons/gon_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/ice_dun.txt b/npc/warps/dungeons/ice_dun.txt index ec6853aaa..2e6c989e9 100644 --- a/npc/warps/dungeons/ice_dun.txt +++ b/npc/warps/dungeons/ice_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/in_sphinx.txt b/npc/warps/dungeons/in_sphinx.txt index 1421fdc90..d506b87a1 100644 --- a/npc/warps/dungeons/in_sphinx.txt +++ b/npc/warps/dungeons/in_sphinx.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/iz_dun.txt b/npc/warps/dungeons/iz_dun.txt index cb3fb882d..c39e53b02 100644 --- a/npc/warps/dungeons/iz_dun.txt +++ b/npc/warps/dungeons/iz_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/juperos.txt b/npc/warps/dungeons/juperos.txt index c69d80844..1948e68f6 100644 --- a/npc/warps/dungeons/juperos.txt +++ b/npc/warps/dungeons/juperos.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Brainstorm -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Skotlex -//= Copyright (C) Lance -//= Copyright (C) Lupus -//= Copyright (C) Muad-Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Brainstorm +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Skotlex +//= Copyright (C) Lance +//= Copyright (C) Lupus +//= Copyright (C) Muad-Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/kh_dun.txt b/npc/warps/dungeons/kh_dun.txt index 288e5411f..5bbc37d30 100644 --- a/npc/warps/dungeons/kh_dun.txt +++ b/npc/warps/dungeons/kh_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Lost Kakashi +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Lost Kakashi //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/lhz_dun.txt b/npc/warps/dungeons/lhz_dun.txt index f3d45a83a..09ec91915 100644 --- a/npc/warps/dungeons/lhz_dun.txt +++ b/npc/warps/dungeons/lhz_dun.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Toms -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 -//= Copyright (C) Lupus -//= Copyright (C) Sara-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Toms +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 +//= Copyright (C) Lupus +//= Copyright (C) Sara-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/lou_dun.txt b/npc/warps/dungeons/lou_dun.txt index 73e9b3cbe..035c37a37 100644 --- a/npc/warps/dungeons/lou_dun.txt +++ b/npc/warps/dungeons/lou_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/mag_dun.txt b/npc/warps/dungeons/mag_dun.txt index 354179abe..4f4bc122b 100644 --- a/npc/warps/dungeons/mag_dun.txt +++ b/npc/warps/dungeons/mag_dun.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/mjo_dun.txt b/npc/warps/dungeons/mjo_dun.txt index 96c649b9c..ea0977587 100644 --- a/npc/warps/dungeons/mjo_dun.txt +++ b/npc/warps/dungeons/mjo_dun.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/moc_pryd.txt b/npc/warps/dungeons/moc_pryd.txt index 673c3ef94..8ee6ab944 100644 --- a/npc/warps/dungeons/moc_pryd.txt +++ b/npc/warps/dungeons/moc_pryd.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt index ed0597efa..a2752c448 100644 --- a/npc/warps/dungeons/mosk_dun.txt +++ b/npc/warps/dungeons/mosk_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/odin.txt b/npc/warps/dungeons/odin.txt index d478ea884..f20e04901 100644 --- a/npc/warps/dungeons/odin.txt +++ b/npc/warps/dungeons/odin.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) SinSloth -//= Copyright (C) Playtester -//= Copyright (C) Silent -//= Copyright (C) Poki#3 -//= Copyright (C) birkiczd +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) SinSloth +//= Copyright (C) Playtester +//= Copyright (C) Silent +//= Copyright (C) Poki#3 +//= Copyright (C) birkiczd //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/orcsdun.txt b/npc/warps/dungeons/orcsdun.txt index 4caff4b3c..fe52b3263 100644 --- a/npc/warps/dungeons/orcsdun.txt +++ b/npc/warps/dungeons/orcsdun.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/pay_dun.txt b/npc/warps/dungeons/pay_dun.txt index 145fbbb3d..0b6f64669 100644 --- a/npc/warps/dungeons/pay_dun.txt +++ b/npc/warps/dungeons/pay_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/prt_maze.txt b/npc/warps/dungeons/prt_maze.txt index ba91f5d68..a37dd3426 100644 --- a/npc/warps/dungeons/prt_maze.txt +++ b/npc/warps/dungeons/prt_maze.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/ra_san.txt b/npc/warps/dungeons/ra_san.txt index 431e69952..5ee60aa8b 100644 --- a/npc/warps/dungeons/ra_san.txt +++ b/npc/warps/dungeons/ra_san.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/tha_t.txt b/npc/warps/dungeons/tha_t.txt index 0915dacea..442e5c963 100644 --- a/npc/warps/dungeons/tha_t.txt +++ b/npc/warps/dungeons/tha_t.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) SinSloth -//= Copyright (C) Ishizu-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) SinSloth +//= Copyright (C) Ishizu-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/thor_v.txt b/npc/warps/dungeons/thor_v.txt index 260a98858..d96e8aa51 100644 --- a/npc/warps/dungeons/thor_v.txt +++ b/npc/warps/dungeons/thor_v.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/treasure.txt b/npc/warps/dungeons/treasure.txt index 6d3097984..3994d7b97 100644 --- a/npc/warps/dungeons/treasure.txt +++ b/npc/warps/dungeons/treasure.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/tur_dun.txt b/npc/warps/dungeons/tur_dun.txt index c30be07a5..fbf1245ff 100644 --- a/npc/warps/dungeons/tur_dun.txt +++ b/npc/warps/dungeons/tur_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/um_dun.txt b/npc/warps/dungeons/um_dun.txt index 28a0a1b44..5eb506d42 100644 --- a/npc/warps/dungeons/um_dun.txt +++ b/npc/warps/dungeons/um_dun.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Darkchild -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Darkchild +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/dungeons/xmas_dun.txt b/npc/warps/dungeons/xmas_dun.txt index 9d2bbf2bc..b30c4dfcb 100644 --- a/npc/warps/dungeons/xmas_dun.txt +++ b/npc/warps/dungeons/xmas_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt index fd8854234..6e25ee819 100644 --- a/npc/warps/fields/abyss_warper.txt +++ b/npc/warps/fields/abyss_warper.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth -//= Copyright (C) Lupus -//= Copyright (C) Silent -//= Copyright (C) Nexon -//= Copyright (C) erKURITA +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth +//= Copyright (C) Lupus +//= Copyright (C) Silent +//= Copyright (C) Nexon +//= Copyright (C) erKURITA //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt index 0a6721ae5..5e6a2a149 100644 --- a/npc/warps/fields/amatsu_fild.txt +++ b/npc/warps/fields/amatsu_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/fields/ein_fild.txt b/npc/warps/fields/ein_fild.txt index 37d62b765..4ebfc95a7 100644 --- a/npc/warps/fields/ein_fild.txt +++ b/npc/warps/fields/ein_fild.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Lupus -//= Copyright (C) SSUNNY@YOUNG -//= Copyright (C) Sara-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Lupus +//= Copyright (C) SSUNNY@YOUNG +//= Copyright (C) Sara-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/fields/gefenia.txt b/npc/warps/fields/gefenia.txt index 93f9cf1ce..812fc748f 100644 --- a/npc/warps/fields/gefenia.txt +++ b/npc/warps/fields/gefenia.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Nana -//= Copyright (C) Darkchild -//= Copyright (C) Muad Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Nana +//= Copyright (C) Darkchild +//= Copyright (C) Muad Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt index d806bc36e..299540344 100644 --- a/npc/warps/fields/glastheim.txt +++ b/npc/warps/fields/glastheim.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/fields/jawaii.txt b/npc/warps/fields/jawaii.txt index b41937c81..aee418478 100644 --- a/npc/warps/fields/jawaii.txt +++ b/npc/warps/fields/jawaii.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Komurka -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Darkchild -//= Copyright (C) Muad Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Komurka +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Darkchild +//= Copyright (C) Muad Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/fields/lhalzen_fild.txt b/npc/warps/fields/lhalzen_fild.txt index 6615f4369..9fc8203b9 100644 --- a/npc/warps/fields/lhalzen_fild.txt +++ b/npc/warps/fields/lhalzen_fild.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Vicious -//= Copyright (C) DracoRPG -//= Copyright (C) Sara-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Vicious +//= Copyright (C) DracoRPG +//= Copyright (C) Sara-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/fields/lutie_fild.txt b/npc/warps/fields/lutie_fild.txt index 38f60c844..a2a5b2aa6 100644 --- a/npc/warps/fields/lutie_fild.txt +++ b/npc/warps/fields/lutie_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/fields/man_fild.txt b/npc/warps/fields/man_fild.txt index 48b313b1b..2740f80aa 100644 --- a/npc/warps/fields/man_fild.txt +++ b/npc/warps/fields/man_fild.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/fields/mtmjolnir.txt b/npc/warps/fields/mtmjolnir.txt index 013576572..bbfad891e 100644 --- a/npc/warps/fields/mtmjolnir.txt +++ b/npc/warps/fields/mtmjolnir.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/fields/spl_fild.txt b/npc/warps/fields/spl_fild.txt index 6e1376334..3cea05cb3 100644 --- a/npc/warps/fields/spl_fild.txt +++ b/npc/warps/fields/spl_fild.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/fields/umbala_fild.txt b/npc/warps/fields/umbala_fild.txt index 05e4aa5ff..a30efd34f 100644 --- a/npc/warps/fields/umbala_fild.txt +++ b/npc/warps/fields/umbala_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/guildcastles.txt b/npc/warps/guildcastles.txt index ed44a9c1f..94e2e5c2a 100644 --- a/npc/warps/guildcastles.txt +++ b/npc/warps/guildcastles.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) Gepard -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Skotlex -//= Copyright (C) Yor -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) Gepard +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Skotlex +//= Copyright (C) Yor +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/other/airplane.txt b/npc/warps/other/airplane.txt index 997aacf14..dc198641a 100644 --- a/npc/warps/other/airplane.txt +++ b/npc/warps/other/airplane.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Musashiden -//= Copyright (C) Zephiris -//= Copyright (C) Vicious -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Skotlex -//= Copyright (C) Lupus -//= Copyright (C) SSUNNY@YOUNG -//= Copyright (C) Sara-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Musashiden +//= Copyright (C) Zephiris +//= Copyright (C) Vicious +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Skotlex +//= Copyright (C) Lupus +//= Copyright (C) SSUNNY@YOUNG +//= Copyright (C) Sara-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt index 09291dc5e..bdb1faf8e 100644 --- a/npc/warps/other/arena.txt +++ b/npc/warps/other/arena.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Lupus -//= Copyright (C) MasterOfMuppets -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Lupus +//= Copyright (C) MasterOfMuppets +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/other/god.txt b/npc/warps/other/god.txt index 6de222835..afd5e98d8 100644 --- a/npc/warps/other/god.txt +++ b/npc/warps/other/god.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) MasterOfMuppets -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) MasterOfMuppets +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt index 97da8ee9b..9146bbf87 100644 --- a/npc/warps/other/jobquests.txt +++ b/npc/warps/other/jobquests.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt index a0a5538da..ed2e617f4 100644 --- a/npc/warps/other/kiel.txt +++ b/npc/warps/other/kiel.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/other/other.txt b/npc/warps/other/other.txt index 69141da6a..f4b7d7964 100644 --- a/npc/warps/other/other.txt +++ b/npc/warps/other/other.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/warps/pvp.txt b/npc/warps/pvp.txt index 141db5979..a990ef8e0 100644 --- a/npc/warps/pvp.txt +++ b/npc/warps/pvp.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Timexy -//= Copyright (C) Yor -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Timexy +//= Copyright (C) Yor +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/agit_controller.txt b/npc/woe-fe/agit_controller.txt index a0e3fa290..3d9afad99 100644 --- a/npc/woe-fe/agit_controller.txt +++ b/npc/woe-fe/agit_controller.txt @@ -9,16 +9,16 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) ultramage -//= Copyright (C) KarLaeda -//= Copyright (C) Avaj -//= Copyright (C) Lupus -//= Copyright (C) kobra_k88 -//= Copyright (C) Akaru -//= Copyright (C) ho|yAnge| -//= Copyright (C) kalen +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) ultramage +//= Copyright (C) KarLaeda +//= Copyright (C) Avaj +//= Copyright (C) Lupus +//= Copyright (C) kobra_k88 +//= Copyright (C) Akaru +//= Copyright (C) ho|yAnge| +//= Copyright (C) kalen //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/agit_main.txt b/npc/woe-fe/agit_main.txt index 05789a286..cb319c590 100644 --- a/npc/woe-fe/agit_main.txt +++ b/npc/woe-fe/agit_main.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Brian -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Brian +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/aldeg_cas01.txt b/npc/woe-fe/aldeg_cas01.txt index 829e500ec..1b141cc2d 100644 --- a/npc/woe-fe/aldeg_cas01.txt +++ b/npc/woe-fe/aldeg_cas01.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/aldeg_cas02.txt b/npc/woe-fe/aldeg_cas02.txt index c4399d9ec..963610c58 100644 --- a/npc/woe-fe/aldeg_cas02.txt +++ b/npc/woe-fe/aldeg_cas02.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/aldeg_cas03.txt b/npc/woe-fe/aldeg_cas03.txt index d9abdf85f..a9337d70e 100644 --- a/npc/woe-fe/aldeg_cas03.txt +++ b/npc/woe-fe/aldeg_cas03.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/aldeg_cas04.txt b/npc/woe-fe/aldeg_cas04.txt index 8ced8e6e3..75b624e14 100644 --- a/npc/woe-fe/aldeg_cas04.txt +++ b/npc/woe-fe/aldeg_cas04.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/aldeg_cas05.txt b/npc/woe-fe/aldeg_cas05.txt index cf71dbe42..005c28c47 100644 --- a/npc/woe-fe/aldeg_cas05.txt +++ b/npc/woe-fe/aldeg_cas05.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/gefg_cas01.txt b/npc/woe-fe/gefg_cas01.txt index ab27b812a..7eb8f6d1c 100644 --- a/npc/woe-fe/gefg_cas01.txt +++ b/npc/woe-fe/gefg_cas01.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/gefg_cas02.txt b/npc/woe-fe/gefg_cas02.txt index 791f09971..29837b328 100644 --- a/npc/woe-fe/gefg_cas02.txt +++ b/npc/woe-fe/gefg_cas02.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/gefg_cas03.txt b/npc/woe-fe/gefg_cas03.txt index 42f1a6c2a..d88296791 100644 --- a/npc/woe-fe/gefg_cas03.txt +++ b/npc/woe-fe/gefg_cas03.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/gefg_cas04.txt b/npc/woe-fe/gefg_cas04.txt index 245f24df3..85905253e 100644 --- a/npc/woe-fe/gefg_cas04.txt +++ b/npc/woe-fe/gefg_cas04.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/gefg_cas05.txt b/npc/woe-fe/gefg_cas05.txt index 54624bb2e..5f2672cc2 100644 --- a/npc/woe-fe/gefg_cas05.txt +++ b/npc/woe-fe/gefg_cas05.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/payg_cas01.txt b/npc/woe-fe/payg_cas01.txt index 19dd2437e..f9fdbd139 100644 --- a/npc/woe-fe/payg_cas01.txt +++ b/npc/woe-fe/payg_cas01.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/payg_cas02.txt b/npc/woe-fe/payg_cas02.txt index 2648c1802..3c7d2fc16 100644 --- a/npc/woe-fe/payg_cas02.txt +++ b/npc/woe-fe/payg_cas02.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/payg_cas03.txt b/npc/woe-fe/payg_cas03.txt index 81050aded..4477e2cdb 100644 --- a/npc/woe-fe/payg_cas03.txt +++ b/npc/woe-fe/payg_cas03.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/payg_cas04.txt b/npc/woe-fe/payg_cas04.txt index 8eca38c38..65b9b63cc 100644 --- a/npc/woe-fe/payg_cas04.txt +++ b/npc/woe-fe/payg_cas04.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/payg_cas05.txt b/npc/woe-fe/payg_cas05.txt index d2cbe6253..fcbf04ddf 100644 --- a/npc/woe-fe/payg_cas05.txt +++ b/npc/woe-fe/payg_cas05.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/prtg_cas01.txt b/npc/woe-fe/prtg_cas01.txt index ec9d544c9..d23153597 100644 --- a/npc/woe-fe/prtg_cas01.txt +++ b/npc/woe-fe/prtg_cas01.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/prtg_cas02.txt b/npc/woe-fe/prtg_cas02.txt index fa4f6d555..b36aa8d55 100644 --- a/npc/woe-fe/prtg_cas02.txt +++ b/npc/woe-fe/prtg_cas02.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/prtg_cas03.txt b/npc/woe-fe/prtg_cas03.txt index 2b72d0976..7704ef4f0 100644 --- a/npc/woe-fe/prtg_cas03.txt +++ b/npc/woe-fe/prtg_cas03.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/prtg_cas04.txt b/npc/woe-fe/prtg_cas04.txt index 438b3a7a6..bcfe13860 100644 --- a/npc/woe-fe/prtg_cas04.txt +++ b/npc/woe-fe/prtg_cas04.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/prtg_cas05.txt b/npc/woe-fe/prtg_cas05.txt index 46fcccb1c..6f17b1ee1 100644 --- a/npc/woe-fe/prtg_cas05.txt +++ b/npc/woe-fe/prtg_cas05.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-fe/trs_rp.txt b/npc/woe-fe/trs_rp.txt index 775b0befd..be87d75e2 100644 --- a/npc/woe-fe/trs_rp.txt +++ b/npc/woe-fe/trs_rp.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Daegaladh -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Daegaladh +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/agit_main_se.txt b/npc/woe-se/agit_main_se.txt index c0304ebb8..cad0a0599 100644 --- a/npc/woe-se/agit_main_se.txt +++ b/npc/woe-se/agit_main_se.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Cookie -//= Copyright (C) Euphy -//= Copyright (C) Brian -//= Copyright (C) Zephyrus -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Cookie +//= Copyright (C) Euphy +//= Copyright (C) Brian +//= Copyright (C) Zephyrus +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/agit_start_se.txt b/npc/woe-se/agit_start_se.txt index e8d5da481..596544eaf 100644 --- a/npc/woe-se/agit_start_se.txt +++ b/npc/woe-se/agit_start_se.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/arug_cas01.txt b/npc/woe-se/arug_cas01.txt index 39615cb52..cc981317b 100644 --- a/npc/woe-se/arug_cas01.txt +++ b/npc/woe-se/arug_cas01.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/arug_cas02.txt b/npc/woe-se/arug_cas02.txt index 6e2de4438..fa0692eaa 100644 --- a/npc/woe-se/arug_cas02.txt +++ b/npc/woe-se/arug_cas02.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/arug_cas03.txt b/npc/woe-se/arug_cas03.txt index 3ab4d87f3..dc7830445 100644 --- a/npc/woe-se/arug_cas03.txt +++ b/npc/woe-se/arug_cas03.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/arug_cas04.txt b/npc/woe-se/arug_cas04.txt index ae3398e06..8b2dc6db2 100644 --- a/npc/woe-se/arug_cas04.txt +++ b/npc/woe-se/arug_cas04.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/arug_cas05.txt b/npc/woe-se/arug_cas05.txt index d1cf1bdc4..e8a27f59a 100644 --- a/npc/woe-se/arug_cas05.txt +++ b/npc/woe-se/arug_cas05.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/guild_flags.txt b/npc/woe-se/guild_flags.txt index 839690742..0faef4473 100644 --- a/npc/woe-se/guild_flags.txt +++ b/npc/woe-se/guild_flags.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/schg_cas01.txt b/npc/woe-se/schg_cas01.txt index 0c5e54386..644bd4fc9 100644 --- a/npc/woe-se/schg_cas01.txt +++ b/npc/woe-se/schg_cas01.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/schg_cas02.txt b/npc/woe-se/schg_cas02.txt index c3bb89d38..745ad7959 100644 --- a/npc/woe-se/schg_cas02.txt +++ b/npc/woe-se/schg_cas02.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/schg_cas03.txt b/npc/woe-se/schg_cas03.txt index 3bb760547..8a682d217 100644 --- a/npc/woe-se/schg_cas03.txt +++ b/npc/woe-se/schg_cas03.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/schg_cas04.txt b/npc/woe-se/schg_cas04.txt index 57744b4b7..dbf72d7bc 100644 --- a/npc/woe-se/schg_cas04.txt +++ b/npc/woe-se/schg_cas04.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/woe-se/schg_cas05.txt b/npc/woe-se/schg_cas05.txt index 3cb096dc7..a499adf3b 100644 --- a/npc/woe-se/schg_cas05.txt +++ b/npc/woe-se/schg_cas05.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/script-checker b/script-checker index 4532482bb..33bd2df94 100755 --- a/script-checker +++ b/script-checker @@ -3,8 +3,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2013-2015 Hercules Dev Team -# Copyright (C) 2013 Haru +# Copyright (C) 2013-2020 Hercules Dev Team +# Copyright (C) 2013 Haru # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/script-checker.bat b/script-checker.bat index 657687f66..8ca37cbfc 100644 --- a/script-checker.bat +++ b/script-checker.bat @@ -3,7 +3,7 @@ REM This file is part of Hercules. REM http://herc.ws - http://github.com/HerculesWS/Hercules REM -REM Copyright (C) 2013-2015 Hercules Dev Team +REM Copyright (C) 2013-2020 Hercules Dev Team REM REM Hercules is free software: you can redistribute it and/or modify REM it under the terms of the GNU General Public License as published by diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql index 97fdb654d..a0f07fc7a 100644 --- a/sql-files/item_db.sql +++ b/sql-files/item_db.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2020 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/item_db2.sql b/sql-files/item_db2.sql index 25ef1478d..ed77f2812 100644 --- a/sql-files/item_db2.sql +++ b/sql-files/item_db2.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2020 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index 8241b81ef..58d89d11e 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2020 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/logs.sql b/sql-files/logs.sql index e17241a62..499afcfdb 100644 --- a/sql-files/logs.sql +++ b/sql-files/logs.sql @@ -1,8 +1,8 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2012-2015 Hercules Dev Team --- Copyright (C) Athena Dev Teams +-- Copyright (C) 2012-2020 Hercules Dev Team +-- Copyright (C) Athena Dev Teams -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/main.sql b/sql-files/main.sql index ee268a2f7..258c7293a 100644 --- a/sql-files/main.sql +++ b/sql-files/main.sql @@ -1,8 +1,8 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2012-2016 Hercules Dev Team --- Copyright (C) Athena Dev Teams +-- Copyright (C) 2012-2020 Hercules Dev Team +-- Copyright (C) Athena Dev Teams -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/mob_db.sql b/sql-files/mob_db.sql index a5ceb0c10..2fdd722a1 100644 --- a/sql-files/mob_db.sql +++ b/sql-files/mob_db.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2020 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/mob_db2.sql b/sql-files/mob_db2.sql index 53e3c658b..a53dc651e 100644 --- a/sql-files/mob_db2.sql +++ b/sql-files/mob_db2.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2020 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/mob_db_re.sql b/sql-files/mob_db_re.sql index 739fc3df0..80f5677e3 100644 --- a/sql-files/mob_db_re.sql +++ b/sql-files/mob_db_re.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2020 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/mob_skill_db.sql b/sql-files/mob_skill_db.sql index e7096b17f..79efd48c7 100644 --- a/sql-files/mob_skill_db.sql +++ b/sql-files/mob_skill_db.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2020 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/mob_skill_db2.sql b/sql-files/mob_skill_db2.sql index 8661fb90a..2aed40cde 100644 --- a/sql-files/mob_skill_db2.sql +++ b/sql-files/mob_skill_db2.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2020 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/mob_skill_db_re.sql b/sql-files/mob_skill_db_re.sql index ef16e2949..5bdb5aec4 100644 --- a/sql-files/mob_skill_db_re.sql +++ b/sql-files/mob_skill_db_re.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2020 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/tools/convert_engine_innodb.sql b/sql-files/tools/convert_engine_innodb.sql index 266538bd8..3c291d240 100644 --- a/sql-files/tools/convert_engine_innodb.sql +++ b/sql-files/tools/convert_engine_innodb.sql @@ -1,8 +1,8 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2012-2015 Hercules Dev Team --- Copyright (C) Athena Dev Teams +-- Copyright (C) 2012-2020 Hercules Dev Team +-- Copyright (C) Athena Dev Teams -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/tools/convert_engine_myisam.sql b/sql-files/tools/convert_engine_myisam.sql index 4b527e71f..840870880 100644 --- a/sql-files/tools/convert_engine_myisam.sql +++ b/sql-files/tools/convert_engine_myisam.sql @@ -1,8 +1,8 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2012-2015 Hercules Dev Team --- Copyright (C) Athena Dev Teams +-- Copyright (C) 2012-2020 Hercules Dev Team +-- Copyright (C) Athena Dev Teams -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/tools/convert_passwords.sql b/sql-files/tools/convert_passwords.sql index 8240e4698..baa396d32 100644 --- a/sql-files/tools/convert_passwords.sql +++ b/sql-files/tools/convert_passwords.sql @@ -1,8 +1,8 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2012-2015 Hercules Dev Team --- Copyright (C) Athena Dev Teams +-- Copyright (C) 2012-2020 Hercules Dev Team +-- Copyright (C) Athena Dev Teams -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-02-14--16-15.sql b/sql-files/upgrades/2013-02-14--16-15.sql index 38b17c2ba..9ea146711 100644 --- a/sql-files/upgrades/2013-02-14--16-15.sql +++ b/sql-files/upgrades/2013-02-14--16-15.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-02-15--18-06.sql b/sql-files/upgrades/2013-02-15--18-06.sql index fc0fe58ff..338b1b7bc 100644 --- a/sql-files/upgrades/2013-02-15--18-06.sql +++ b/sql-files/upgrades/2013-02-15--18-06.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-03-05--01-05.sql b/sql-files/upgrades/2013-03-05--01-05.sql index d1f94e40e..74f0f3afc 100644 --- a/sql-files/upgrades/2013-03-05--01-05.sql +++ b/sql-files/upgrades/2013-03-05--01-05.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-03-06--00-00.sql b/sql-files/upgrades/2013-03-06--00-00.sql index 8f14b3b01..7879eb1a4 100644 --- a/sql-files/upgrades/2013-03-06--00-00.sql +++ b/sql-files/upgrades/2013-03-06--00-00.sql @@ -3,8 +3,8 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team --- Copyright (C) Athena Dev Teams +-- Copyright (C) 2013-2020 Hercules Dev Team +-- Copyright (C) Athena Dev Teams -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-03-09--01-56.sql b/sql-files/upgrades/2013-03-09--01-56.sql index 587fdb0d4..30256a9e5 100644 --- a/sql-files/upgrades/2013-03-09--01-56.sql +++ b/sql-files/upgrades/2013-03-09--01-56.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-03-27--18-35.sql b/sql-files/upgrades/2013-03-27--18-35.sql index ddf8a975a..512c6c2ee 100644 --- a/sql-files/upgrades/2013-03-27--18-35.sql +++ b/sql-files/upgrades/2013-03-27--18-35.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-04-16--01-24.sql b/sql-files/upgrades/2013-04-16--01-24.sql index 35a08e585..c30b2529e 100644 --- a/sql-files/upgrades/2013-04-16--01-24.sql +++ b/sql-files/upgrades/2013-04-16--01-24.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-04-16--02-15.sql b/sql-files/upgrades/2013-04-16--02-15.sql index d8081f7d8..160323827 100644 --- a/sql-files/upgrades/2013-04-16--02-15.sql +++ b/sql-files/upgrades/2013-04-16--02-15.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-10-09--21-38.sql b/sql-files/upgrades/2013-10-09--21-38.sql index 454569665..949eaea1a 100644 --- a/sql-files/upgrades/2013-10-09--21-38.sql +++ b/sql-files/upgrades/2013-10-09--21-38.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-10-10--16-36.sql b/sql-files/upgrades/2013-10-10--16-36.sql index 18dd92ec8..af83eb419 100644 --- a/sql-files/upgrades/2013-10-10--16-36.sql +++ b/sql-files/upgrades/2013-10-10--16-36.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-10-27--16-47.sql b/sql-files/upgrades/2013-10-27--16-47.sql index 5e52140a1..fd61ad0fc 100644 --- a/sql-files/upgrades/2013-10-27--16-47.sql +++ b/sql-files/upgrades/2013-10-27--16-47.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-10-30--19-53.sql b/sql-files/upgrades/2013-10-30--19-53.sql index 768328c7d..9febdc693 100644 --- a/sql-files/upgrades/2013-10-30--19-53.sql +++ b/sql-files/upgrades/2013-10-30--19-53.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-10-30--21-12.sql b/sql-files/upgrades/2013-10-30--21-12.sql index a60004767..70f7b76c3 100644 --- a/sql-files/upgrades/2013-10-30--21-12.sql +++ b/sql-files/upgrades/2013-10-30--21-12.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-10-31--07-49.sql b/sql-files/upgrades/2013-10-31--07-49.sql index e32370b41..295367b23 100644 --- a/sql-files/upgrades/2013-10-31--07-49.sql +++ b/sql-files/upgrades/2013-10-31--07-49.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-11-09--00-03.sql b/sql-files/upgrades/2013-11-09--00-03.sql index 62a1e2541..2809142c5 100644 --- a/sql-files/upgrades/2013-11-09--00-03.sql +++ b/sql-files/upgrades/2013-11-09--00-03.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-11-15--00-06.sql b/sql-files/upgrades/2013-11-15--00-06.sql index 62f278b7f..1ddabd246 100644 --- a/sql-files/upgrades/2013-11-15--00-06.sql +++ b/sql-files/upgrades/2013-11-15--00-06.sql @@ -4,8 +4,8 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team --- Copyright (C) 2013 Haru +-- Copyright (C) 2013-2020 Hercules Dev Team +-- Copyright (C) 2013 Haru -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-11-15--19-57.sql b/sql-files/upgrades/2013-11-15--19-57.sql index 86d63cdfe..2df3ac07b 100644 --- a/sql-files/upgrades/2013-11-15--19-57.sql +++ b/sql-files/upgrades/2013-11-15--19-57.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-11-16--07-49.sql b/sql-files/upgrades/2013-11-16--07-49.sql index 302a88120..bd9dcd87e 100644 --- a/sql-files/upgrades/2013-11-16--07-49.sql +++ b/sql-files/upgrades/2013-11-16--07-49.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-11-18--08-23.sql b/sql-files/upgrades/2013-11-18--08-23.sql index 8c917c694..24fc742f3 100644 --- a/sql-files/upgrades/2013-11-18--08-23.sql +++ b/sql-files/upgrades/2013-11-18--08-23.sql @@ -4,8 +4,8 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team --- Copyright (C) 2013 Haru +-- Copyright (C) 2013-2020 Hercules Dev Team +-- Copyright (C) 2013 Haru -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2013-12-24--00-15.sql b/sql-files/upgrades/2013-12-24--00-15.sql index 9ae0989d9..036fea7a3 100644 --- a/sql-files/upgrades/2013-12-24--00-15.sql +++ b/sql-files/upgrades/2013-12-24--00-15.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2014-01-04--16-47.sql b/sql-files/upgrades/2014-01-04--16-47.sql index 966381ab6..ed39114b9 100644 --- a/sql-files/upgrades/2014-01-04--16-47.sql +++ b/sql-files/upgrades/2014-01-04--16-47.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2014-2015 Hercules Dev Team +-- Copyright (C) 2014-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2014-01-06--17-22.sql b/sql-files/upgrades/2014-01-06--17-22.sql index 5bdbcde0b..c798923a8 100644 --- a/sql-files/upgrades/2014-01-06--17-22.sql +++ b/sql-files/upgrades/2014-01-06--17-22.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2014-2015 Hercules Dev Team +-- Copyright (C) 2014-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2014-02-19--17-57.sql b/sql-files/upgrades/2014-02-19--17-57.sql index 90cd36303..b361a028d 100644 --- a/sql-files/upgrades/2014-02-19--17-57.sql +++ b/sql-files/upgrades/2014-02-19--17-57.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2014-2015 Hercules Dev Team +-- Copyright (C) 2014-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2014-03-25--23-57.sql b/sql-files/upgrades/2014-03-25--23-57.sql index 3ce623406..9ab69aa2f 100644 --- a/sql-files/upgrades/2014-03-25--23-57.sql +++ b/sql-files/upgrades/2014-03-25--23-57.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2014-2015 Hercules Dev Team +-- Copyright (C) 2014-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2014-04-07--22-04.sql b/sql-files/upgrades/2014-04-07--22-04.sql index 67d4fc8b2..64d32f322 100644 --- a/sql-files/upgrades/2014-04-07--22-04.sql +++ b/sql-files/upgrades/2014-04-07--22-04.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2014-2015 Hercules Dev Team +-- Copyright (C) 2014-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2014-04-26--10-00.sql b/sql-files/upgrades/2014-04-26--10-00.sql index cb23bc68b..d78fd6589 100644 --- a/sql-files/upgrades/2014-04-26--10-00.sql +++ b/sql-files/upgrades/2014-04-26--10-00.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2014-2015 Hercules Dev Team +-- Copyright (C) 2014-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2014-05-17--00-06.sql b/sql-files/upgrades/2014-05-17--00-06.sql index 6ac8c1292..c78bd92cc 100644 --- a/sql-files/upgrades/2014-05-17--00-06.sql +++ b/sql-files/upgrades/2014-05-17--00-06.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2014-2015 Hercules Dev Team +-- Copyright (C) 2014-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2014-09-01--16-53.sql b/sql-files/upgrades/2014-09-01--16-53.sql index 3c77f24c3..d2f7dd411 100644 --- a/sql-files/upgrades/2014-09-01--16-53.sql +++ b/sql-files/upgrades/2014-09-01--16-53.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2014-2015 Hercules Dev Team +-- Copyright (C) 2014-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2014-11-03--00-45.sql b/sql-files/upgrades/2014-11-03--00-45.sql index a847004bb..9baf5f0a3 100644 --- a/sql-files/upgrades/2014-11-03--00-45.sql +++ b/sql-files/upgrades/2014-11-03--00-45.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2014-2015 Hercules Dev Team +-- Copyright (C) 2014-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2015-07-02--18-14.sql b/sql-files/upgrades/2015-07-02--18-14.sql index e4bbdc484..68a02e309 100644 --- a/sql-files/upgrades/2015-07-02--18-14.sql +++ b/sql-files/upgrades/2015-07-02--18-14.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2015 Hercules Dev Team +-- Copyright (C) 2015-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2015-07-08--13-08.sql b/sql-files/upgrades/2015-07-08--13-08.sql index 91c7b2638..09b72c500 100644 --- a/sql-files/upgrades/2015-07-08--13-08.sql +++ b/sql-files/upgrades/2015-07-08--13-08.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2015 Hercules Dev Team +-- Copyright (C) 2015-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2015-08-27--20-42.sql b/sql-files/upgrades/2015-08-27--20-42.sql index 5be36f899..9bc1f6b5d 100644 --- a/sql-files/upgrades/2015-08-27--20-42.sql +++ b/sql-files/upgrades/2015-08-27--20-42.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2015 Hercules Dev Team +-- Copyright (C) 2015-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2015-12-16--12-57.sql b/sql-files/upgrades/2015-12-16--12-57.sql index cc9ce799e..327d79070 100644 --- a/sql-files/upgrades/2015-12-16--12-57.sql +++ b/sql-files/upgrades/2015-12-16--12-57.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2015-2016 Hercules Dev Team +-- Copyright (C) 2015-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2015-12-17--15-58.sql b/sql-files/upgrades/2015-12-17--15-58.sql index 8d3dc51a3..78af21f77 100644 --- a/sql-files/upgrades/2015-12-17--15-58.sql +++ b/sql-files/upgrades/2015-12-17--15-58.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2015 Hercules Dev Team +-- Copyright (C) 2015-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2016-03-10--22-18.sql b/sql-files/upgrades/2016-03-10--22-18.sql index 80266bcca..bcd098465 100644 --- a/sql-files/upgrades/2016-03-10--22-18.sql +++ b/sql-files/upgrades/2016-03-10--22-18.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2015-2016 Hercules Dev Team +-- Copyright (C) 2015-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2016-07-08--02-42.sql b/sql-files/upgrades/2016-07-08--02-42.sql index 94ca7e6db..76b6c6acb 100644 --- a/sql-files/upgrades/2016-07-08--02-42.sql +++ b/sql-files/upgrades/2016-07-08--02-42.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2015-2016 Hercules Dev Team +-- Copyright (C) 2015-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2016-07-08--02-51.sql b/sql-files/upgrades/2016-07-08--02-51.sql index 8ecf1a25f..cbe786bbc 100644 --- a/sql-files/upgrades/2016-07-08--02-51.sql +++ b/sql-files/upgrades/2016-07-08--02-51.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2015-2016 Hercules Dev Team +-- Copyright (C) 2015-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2016-10-03--20-27.sql b/sql-files/upgrades/2016-10-03--20-27.sql index 6ad840e05..c6c5d9b60 100644 --- a/sql-files/upgrades/2016-10-03--20-27.sql +++ b/sql-files/upgrades/2016-10-03--20-27.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2015-2016 Hercules Dev Team +-- Copyright (C) 2015-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2016-10-26--10-29.sql b/sql-files/upgrades/2016-10-26--10-29.sql index cabd7db10..b6238c1c9 100644 --- a/sql-files/upgrades/2016-10-26--10-29.sql +++ b/sql-files/upgrades/2016-10-26--10-29.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2015-2016 Hercules Dev Team +-- Copyright (C) 2015-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2017-03-02--11-40.sql b/sql-files/upgrades/2017-03-02--11-40.sql index 30798b5df..f45cf45d2 100644 --- a/sql-files/upgrades/2017-03-02--11-40.sql +++ b/sql-files/upgrades/2017-03-02--11-40.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2015-2016 Hercules Dev Team +-- Copyright (C) 2015-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2017-03-15--14-29.sql b/sql-files/upgrades/2017-03-15--14-29.sql index 13306d73e..c3acc6ac4 100644 --- a/sql-files/upgrades/2017-03-15--14-29.sql +++ b/sql-files/upgrades/2017-03-15--14-29.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2017 Hercules Dev Team +-- Copyright (C) 2017-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2017-06-04--15-04.sql b/sql-files/upgrades/2017-06-04--15-04.sql index 0805d054b..5cdd526a8 100644 --- a/sql-files/upgrades/2017-06-04--15-04.sql +++ b/sql-files/upgrades/2017-06-04--15-04.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2017 Hercules Dev Team +-- Copyright (C) 2017-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2017-06-04--15-05.sql b/sql-files/upgrades/2017-06-04--15-05.sql index 550197a15..c3de76640 100644 --- a/sql-files/upgrades/2017-06-04--15-05.sql +++ b/sql-files/upgrades/2017-06-04--15-05.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2017 Hercules Dev Team +-- Copyright (C) 2017-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2018-03-10--04-06.sql b/sql-files/upgrades/2018-03-10--04-06.sql index ee827735d..ff29bea34 100644 --- a/sql-files/upgrades/2018-03-10--04-06.sql +++ b/sql-files/upgrades/2018-03-10--04-06.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2017 Hercules Dev Team +-- Copyright (C) 2017-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2018-06-03--00-10.sql b/sql-files/upgrades/2018-06-03--00-10.sql index c7f6ac48d..6e93886f8 100644 --- a/sql-files/upgrades/2018-06-03--00-10.sql +++ b/sql-files/upgrades/2018-06-03--00-10.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2018 Hercules Dev Team +-- Copyright (C) 2018-2020 Hercules Dev Team -- Copyright (C) Smokexyz -- -- Hercules is free software: you can redistribute it and/or modify diff --git a/sql-files/upgrades/2018-06-03--17-16.sql b/sql-files/upgrades/2018-06-03--17-16.sql index e14ca62ca..27091808b 100644 --- a/sql-files/upgrades/2018-06-03--17-16.sql +++ b/sql-files/upgrades/2018-06-03--17-16.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2018 Hercules Dev Team +-- Copyright (C) 2018-2020 Hercules Dev Team -- Copyright (C) Dastgir -- -- Hercules is free software: you can redistribute it and/or modify diff --git a/sql-files/upgrades/2018-06-05--12-02.sql b/sql-files/upgrades/2018-06-05--12-02.sql index 26c22243f..0ed67214c 100644 --- a/sql-files/upgrades/2018-06-05--12-02.sql +++ b/sql-files/upgrades/2018-06-05--12-02.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2018 Hercules Dev Team +-- Copyright (C) 2018-2020 Hercules Dev Team -- Copyright (C) 2018 Dastgir -- -- Hercules is free software: you can redistribute it and/or modify diff --git a/sql-files/upgrades/2018-07-24--03-23.sql b/sql-files/upgrades/2018-07-24--03-23.sql index a8d2d8f77..695f99b1e 100644 --- a/sql-files/upgrades/2018-07-24--03-23.sql +++ b/sql-files/upgrades/2018-07-24--03-23.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2018 Hercules Dev Team +-- Copyright (C) 2018-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2018-09-01--05-22.sql b/sql-files/upgrades/2018-09-01--05-22.sql index 7a834edd4..c8b4496ac 100644 --- a/sql-files/upgrades/2018-09-01--05-22.sql +++ b/sql-files/upgrades/2018-09-01--05-22.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2018 Hercules Dev Team +-- Copyright (C) 2018-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2018-12-14--01-02.sql b/sql-files/upgrades/2018-12-14--01-02.sql index 7bcd583c2..2d74b562c 100644 --- a/sql-files/upgrades/2018-12-14--01-02.sql +++ b/sql-files/upgrades/2018-12-14--01-02.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2018 Hercules Dev Team +-- Copyright (C) 2018-2020 Hercules Dev Team -- Copyright (C) 4144 -- -- Hercules is free software: you can redistribute it and/or modify diff --git a/sql-files/upgrades/2018-12-29--07-51.sql b/sql-files/upgrades/2018-12-29--07-51.sql index 641179399..9a6c69624 100644 --- a/sql-files/upgrades/2018-12-29--07-51.sql +++ b/sql-files/upgrades/2018-12-29--07-51.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2019-04-08--21-52.sql b/sql-files/upgrades/2019-04-08--21-52.sql index bd015acf8..10c9ac714 100644 --- a/sql-files/upgrades/2019-04-08--21-52.sql +++ b/sql-files/upgrades/2019-04-08--21-52.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2019 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2019-04-25--02-12.sql b/sql-files/upgrades/2019-04-25--02-12.sql index 64abe45b6..0b1583ab0 100644 --- a/sql-files/upgrades/2019-04-25--02-12.sql +++ b/sql-files/upgrades/2019-04-25--02-12.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2019 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2019-05-09--18-07.sql b/sql-files/upgrades/2019-05-09--18-07.sql index 96d80c29c..75f678f45 100644 --- a/sql-files/upgrades/2019-05-09--18-07.sql +++ b/sql-files/upgrades/2019-05-09--18-07.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2015 Hercules Dev Team +-- Copyright (C) 2015-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2019-08-08--19-43.sql b/sql-files/upgrades/2019-08-08--19-43.sql index 35faf4ace..15bc4a89a 100644 --- a/sql-files/upgrades/2019-08-08--19-43.sql +++ b/sql-files/upgrades/2019-08-08--19-43.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2019 Hercules Dev Team +-- Copyright (C) 2019-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2019-10-05--19-01.sql b/sql-files/upgrades/2019-10-05--19-01.sql index 4cb7c1c51..165764a80 100644 --- a/sql-files/upgrades/2019-10-05--19-01.sql +++ b/sql-files/upgrades/2019-10-05--19-01.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2019 Hercules Dev Team +-- Copyright (C) 2019-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2019-10-12--14-21.sql b/sql-files/upgrades/2019-10-12--14-21.sql index 7da66e9b8..929092809 100644 --- a/sql-files/upgrades/2019-10-12--14-21.sql +++ b/sql-files/upgrades/2019-10-12--14-21.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2019 Hercules Dev Team +-- Copyright (C) 2019-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/2019-11-22--23-58.sql b/sql-files/upgrades/2019-11-22--23-58.sql index 8d02fdfab..34ffc2c71 100644 --- a/sql-files/upgrades/2019-11-22--23-58.sql +++ b/sql-files/upgrades/2019-11-22--23-58.sql @@ -3,7 +3,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2019 Hercules Dev Team +-- Copyright (C) 2019-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/eAthena-logs-upgrade.sql b/sql-files/upgrades/eAthena-logs-upgrade.sql index 014f119e3..a1e4d1d82 100644 --- a/sql-files/upgrades/eAthena-logs-upgrade.sql +++ b/sql-files/upgrades/eAthena-logs-upgrade.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/eAthena-main-upgrade.sql b/sql-files/upgrades/eAthena-main-upgrade.sql index 647c9e004..ed1591bec 100644 --- a/sql-files/upgrades/eAthena-main-upgrade.sql +++ b/sql-files/upgrades/eAthena-main-upgrade.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2015 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/rAthena-logs-upgrade.sql b/sql-files/upgrades/rAthena-logs-upgrade.sql index 09a571818..2e7319fc3 100644 --- a/sql-files/upgrades/rAthena-logs-upgrade.sql +++ b/sql-files/upgrades/rAthena-logs-upgrade.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2014 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/sql-files/upgrades/rAthena-main-upgrade.sql b/sql-files/upgrades/rAthena-main-upgrade.sql index 5dd6111a5..7a6b75beb 100644 --- a/sql-files/upgrades/rAthena-main-upgrade.sql +++ b/sql-files/upgrades/rAthena-main-upgrade.sql @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2013-2014 Hercules Dev Team +-- Copyright (C) 2013-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/char/HPMchar.c b/src/char/HPMchar.c index f3cf2cff4..517bc0835 100644 --- a/src/char/HPMchar.c +++ b/src/char/HPMchar.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2014-2018 Hercules Dev Team + * Copyright (C) 2014-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/HPMchar.h b/src/char/HPMchar.h index 0de3b88b8..d2fc69301 100644 --- a/src/char/HPMchar.h +++ b/src/char/HPMchar.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2014-2018 Hercules Dev Team + * Copyright (C) 2014-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/Makefile.in b/src/char/Makefile.in index f159a443f..79ee3e18f 100644 --- a/src/char/Makefile.in +++ b/src/char/Makefile.in @@ -1,8 +1,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2018 Hercules Dev Team -# Copyright (C) Athena Dev Teams +# Copyright (C) 2012-2020 Hercules Dev Team +# Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/char/char.c b/src/char/char.c index 66bfdd4ee..aac9ad20c 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/char.h b/src/char/char.h index 3b8bcff2e..413007868 100644 --- a/src/char/char.h +++ b/src/char/char.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/geoip.c b/src/char/geoip.c index 67c057aff..daace34d5 100644 --- a/src/char/geoip.c +++ b/src/char/geoip.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/geoip.h b/src/char/geoip.h index be9fe4fff..f8070dc2e 100644 --- a/src/char/geoip.h +++ b/src/char/geoip.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_achievement.c b/src/char/int_achievement.c index 14311ecf0..167178482 100644 --- a/src/char/int_achievement.c +++ b/src/char/int_achievement.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * -* Copyright (C) 2017 Hercules Dev Team +* Copyright (C) 2017-2020 Hercules Dev Team * Copyright (C) Smokexyz * * Hercules is free software: you can redistribute it and/or modify diff --git a/src/char/int_achievement.h b/src/char/int_achievement.h index 4a44a798d..6c6ddc7f4 100644 --- a/src/char/int_achievement.h +++ b/src/char/int_achievement.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * -* Copyright (C) 2017 Hercules Dev Team +* Copyright (C) 2017-2020 Hercules Dev Team * Copyright (C) Smokexyz * * Hercules is free software: you can redistribute it and/or modify diff --git a/src/char/int_auction.c b/src/char/int_auction.c index 1e5b0a06d..aa01872f9 100644 --- a/src/char/int_auction.c +++ b/src/char/int_auction.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_auction.h b/src/char/int_auction.h index 720efe22a..642fd21e3 100644 --- a/src/char/int_auction.h +++ b/src/char/int_auction.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_clan.c b/src/char/int_clan.c index 9fb8ad95e..87f21f3fd 100644 --- a/src/char/int_clan.c +++ b/src/char/int_clan.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2017 Hercules Dev Team + * Copyright (C) 2017-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_clan.h b/src/char/int_clan.h index e7b44ecd3..abc026efb 100644 --- a/src/char/int_clan.h +++ b/src/char/int_clan.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2017 Hercules Dev Team + * Copyright (C) 2017-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_elemental.c b/src/char/int_elemental.c index 175007b66..76ea7d56f 100644 --- a/src/char/int_elemental.c +++ b/src/char/int_elemental.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_elemental.h b/src/char/int_elemental.h index 3172dcacf..8c326faef 100644 --- a/src/char/int_elemental.h +++ b/src/char/int_elemental.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 3e9d50f8d..af2088403 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_guild.h b/src/char/int_guild.h index 4ed0f526e..252a4970f 100644 --- a/src/char/int_guild.h +++ b/src/char/int_guild.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_homun.c b/src/char/int_homun.c index 5a1c9d23f..52418a1fa 100644 --- a/src/char/int_homun.c +++ b/src/char/int_homun.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_homun.h b/src/char/int_homun.h index 8eba66963..f68dfb4e4 100644 --- a/src/char/int_homun.h +++ b/src/char/int_homun.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_mail.c b/src/char/int_mail.c index e0625fcab..5a698eb3c 100644 --- a/src/char/int_mail.c +++ b/src/char/int_mail.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_mail.h b/src/char/int_mail.h index 95934d0a1..8fd6e70a5 100644 --- a/src/char/int_mail.h +++ b/src/char/int_mail.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_mercenary.c b/src/char/int_mercenary.c index 21bfb5538..a39bd9ad6 100644 --- a/src/char/int_mercenary.c +++ b/src/char/int_mercenary.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_mercenary.h b/src/char/int_mercenary.h index 6291bfcf6..85292938f 100644 --- a/src/char/int_mercenary.h +++ b/src/char/int_mercenary.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_party.c b/src/char/int_party.c index bf680c816..b29ccaf24 100644 --- a/src/char/int_party.c +++ b/src/char/int_party.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_party.h b/src/char/int_party.h index b9a888cca..b3306cc13 100644 --- a/src/char/int_party.h +++ b/src/char/int_party.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_pet.c b/src/char/int_pet.c index d31e7545c..880de668d 100644 --- a/src/char/int_pet.c +++ b/src/char/int_pet.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_pet.h b/src/char/int_pet.h index b5852d441..43360ccda 100644 --- a/src/char/int_pet.h +++ b/src/char/int_pet.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_quest.c b/src/char/int_quest.c index 0fa7771cb..4269b3da1 100644 --- a/src/char/int_quest.c +++ b/src/char/int_quest.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_quest.h b/src/char/int_quest.h index e71afc561..a5fb4805b 100644 --- a/src/char/int_quest.h +++ b/src/char/int_quest.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_rodex.c b/src/char/int_rodex.c index fbf628f32..0539eab7e 100644 --- a/src/char/int_rodex.c +++ b/src/char/int_rodex.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2017 Hercules Dev Team + * Copyright (C) 2017-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_rodex.h b/src/char/int_rodex.h index a6a172ceb..44b9ce477 100644 --- a/src/char/int_rodex.h +++ b/src/char/int_rodex.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2017 Hercules Dev Team + * Copyright (C) 2017-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_storage.c b/src/char/int_storage.c index 130df5515..d82440270 100644 --- a/src/char/int_storage.c +++ b/src/char/int_storage.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/int_storage.h b/src/char/int_storage.h index 918927620..886c54e15 100644 --- a/src/char/int_storage.h +++ b/src/char/int_storage.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/inter.c b/src/char/inter.c index 264327289..2d8d06a9c 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/inter.h b/src/char/inter.h index f97c619c0..36d28b656 100644 --- a/src/char/inter.h +++ b/src/char/inter.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/loginif.c b/src/char/loginif.c index a093c8cf5..554513420 100644 --- a/src/char/loginif.c +++ b/src/char/loginif.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/loginif.h b/src/char/loginif.h index 5dfedb952..55fd03f83 100644 --- a/src/char/loginif.h +++ b/src/char/loginif.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/mapif.c b/src/char/mapif.c index 29be4eaa2..9077afae4 100644 --- a/src/char/mapif.c +++ b/src/char/mapif.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/mapif.h b/src/char/mapif.h index f5b54b6b7..11dd79504 100644 --- a/src/char/mapif.h +++ b/src/char/mapif.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team + * Copyright (C) 2012-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/packets_hc_struct.h b/src/char/packets_hc_struct.h index 196493cac..dc5feab60 100644 --- a/src/char/packets_hc_struct.h +++ b/src/char/packets_hc_struct.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2016-2018 Hercules Dev Team + * Copyright (C) 2016-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/pincode.c b/src/char/pincode.c index 5a7eb1cab..6346f3266 100644 --- a/src/char/pincode.c +++ b/src/char/pincode.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/char/pincode.h b/src/char/pincode.h index 699758179..594aabb19 100644 --- a/src/char/pincode.h +++ b/src/char/pincode.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/HPM.c b/src/common/HPM.c index 479135767..23335fcde 100644 --- a/src/common/HPM.c +++ b/src/common/HPM.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2018 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/HPM.h b/src/common/HPM.h index a4e3e46cc..6e40c323b 100644 --- a/src/common/HPM.h +++ b/src/common/HPM.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2018 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h index 75dac2071..a0a9f8c35 100644 --- a/src/common/HPMDataCheck.h +++ b/src/common/HPMDataCheck.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2014-2020 Hercules Dev Team + * Copyright (C) 2014-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/HPMSymbols.inc.h b/src/common/HPMSymbols.inc.h index 3a6bd3c57..1ead8c5e2 100644 --- a/src/common/HPMSymbols.inc.h +++ b/src/common/HPMSymbols.inc.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/HPMi.h b/src/common/HPMi.h index 3d39f06d4..fca08a482 100644 --- a/src/common/HPMi.h +++ b/src/common/HPMi.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/Makefile.in b/src/common/Makefile.in index 708780595..033b26ae3 100644 --- a/src/common/Makefile.in +++ b/src/common/Makefile.in @@ -1,8 +1,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2018 Hercules Dev Team -# Copyright (C) Athena Dev Teams +# Copyright (C) 2012-2020 Hercules Dev Team +# Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/common/atomic.h b/src/common/atomic.h index fdff6e6ab..518d2e6ab 100644 --- a/src/common/atomic.h +++ b/src/common/atomic.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) rAthena Project (www.rathena.org) + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) rAthena Project (www.rathena.org) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index c9c189032..0b5613316 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team + * Copyright (C) 2012-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/conf.c b/src/common/conf.c index d81a6636b..dae7db8fc 100644 --- a/src/common/conf.c +++ b/src/common/conf.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/conf.h b/src/common/conf.h index ccab6dc17..2d2df92f2 100644 --- a/src/common/conf.h +++ b/src/common/conf.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/console.c b/src/common/console.c index 0075ac2a1..5b4dbeb1a 100644 --- a/src/common/console.c +++ b/src/common/console.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/console.h b/src/common/console.h index dd3a9cf2e..92a262a12 100644 --- a/src/common/console.h +++ b/src/common/console.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/core.c b/src/common/core.c index dbd1d2596..54358b85c 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/core.h b/src/common/core.h index 0622a987d..3fceb0b1a 100644 --- a/src/common/core.h +++ b/src/common/core.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/db.c b/src/common/db.c index c28ad1f7c..bcd57875b 100644 --- a/src/common/db.c +++ b/src/common/db.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/db.h b/src/common/db.h index 2af47567e..bbc6232ef 100644 --- a/src/common/db.h +++ b/src/common/db.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/des.c b/src/common/des.c index fbd158265..5a0e32b48 100644 --- a/src/common/des.c +++ b/src/common/des.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/des.h b/src/common/des.h index 79fe05603..860e35424 100644 --- a/src/common/des.h +++ b/src/common/des.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/ers.c b/src/common/ers.c index e421c47c9..30a90116f 100644 --- a/src/common/ers.c +++ b/src/common/ers.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/ers.h b/src/common/ers.h index 612a98dd4..cb8dfd009 100644 --- a/src/common/ers.h +++ b/src/common/ers.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/grfio.c b/src/common/grfio.c index 79154d191..0fdcbe61f 100644 --- a/src/common/grfio.c +++ b/src/common/grfio.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/grfio.h b/src/common/grfio.h index 13e7201fe..c7e58329f 100644 --- a/src/common/grfio.h +++ b/src/common/grfio.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/hercules.h b/src/common/hercules.h index 6b4b9d696..89ea761b4 100644 --- a/src/common/hercules.h +++ b/src/common/hercules.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2015 Hercules Dev Team + * Copyright (C) 2015-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/mapindex.c b/src/common/mapindex.c index f6097bb06..e5bbb082c 100644 --- a/src/common/mapindex.c +++ b/src/common/mapindex.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/mapindex.h b/src/common/mapindex.h index b7e02447d..6fa52066e 100644 --- a/src/common/mapindex.h +++ b/src/common/mapindex.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/md5calc.c b/src/common/md5calc.c index 3f9ccdc41..dc95fe298 100644 --- a/src/common/md5calc.c +++ b/src/common/md5calc.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/md5calc.h b/src/common/md5calc.h index bd06f1fbc..27f308a6a 100644 --- a/src/common/md5calc.h +++ b/src/common/md5calc.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/memmgr.c b/src/common/memmgr.c index 3c645e7fa..13629259a 100644 --- a/src/common/memmgr.c +++ b/src/common/memmgr.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/memmgr.h b/src/common/memmgr.h index c7147cc5e..891a2c393 100644 --- a/src/common/memmgr.h +++ b/src/common/memmgr.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/mmo.h b/src/common/mmo.h index ed74f11df..ec1b2948a 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/mutex.c b/src/common/mutex.c index dd63d2adc..fbcc5b576 100644 --- a/src/common/mutex.c +++ b/src/common/mutex.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) rAthena Project (www.rathena.org) + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) rAthena Project (www.rathena.org) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/mutex.h b/src/common/mutex.h index fc3ef4abc..5cde330ee 100644 --- a/src/common/mutex.h +++ b/src/common/mutex.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) rAthena Project (www.rathena.org) + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) rAthena Project (www.rathena.org) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/nullpo.c b/src/common/nullpo.c index e19f7f846..dfb938708 100644 --- a/src/common/nullpo.c +++ b/src/common/nullpo.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/nullpo.h b/src/common/nullpo.h index 398531f13..fc5386243 100644 --- a/src/common/nullpo.h +++ b/src/common/nullpo.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets.c b/src/common/packets.c index 429418e0a..12d6850d1 100644 --- a/src/common/packets.c +++ b/src/common/packets.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team + * Copyright (C) 2012-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets.h b/src/common/packets.h index 83c92c7fa..32f0fef9c 100644 --- a/src/common/packets.h +++ b/src/common/packets.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2018 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2003_len_main.h b/src/common/packets/packets2003_len_main.h index beed1fb67..3f5abc7ac 100644 --- a/src/common/packets/packets2003_len_main.h +++ b/src/common/packets/packets2003_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2003_len_sak.h b/src/common/packets/packets2003_len_sak.h index 0da973bf4..2dd50fdfd 100644 --- a/src/common/packets/packets2003_len_sak.h +++ b/src/common/packets/packets2003_len_sak.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2004_len_ad.h b/src/common/packets/packets2004_len_ad.h index 05f741dee..e09f92122 100644 --- a/src/common/packets/packets2004_len_ad.h +++ b/src/common/packets/packets2004_len_ad.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2004_len_main.h b/src/common/packets/packets2004_len_main.h index 72b2329a3..1ec936773 100644 --- a/src/common/packets/packets2004_len_main.h +++ b/src/common/packets/packets2004_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2004_len_sak.h b/src/common/packets/packets2004_len_sak.h index 1f4b3d3ea..ff48440de 100644 --- a/src/common/packets/packets2004_len_sak.h +++ b/src/common/packets/packets2004_len_sak.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2005_len_ad.h b/src/common/packets/packets2005_len_ad.h index 4113d7b91..41a82f773 100644 --- a/src/common/packets/packets2005_len_ad.h +++ b/src/common/packets/packets2005_len_ad.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2005_len_main.h b/src/common/packets/packets2005_len_main.h index c57b65693..e49ea9c94 100644 --- a/src/common/packets/packets2005_len_main.h +++ b/src/common/packets/packets2005_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2005_len_sak.h b/src/common/packets/packets2005_len_sak.h index bf744b3d0..2da2a1065 100644 --- a/src/common/packets/packets2005_len_sak.h +++ b/src/common/packets/packets2005_len_sak.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2006_len_ad.h b/src/common/packets/packets2006_len_ad.h index dc5cfe25e..0e38df526 100644 --- a/src/common/packets/packets2006_len_ad.h +++ b/src/common/packets/packets2006_len_ad.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2006_len_main.h b/src/common/packets/packets2006_len_main.h index ed15984cf..92020778d 100644 --- a/src/common/packets/packets2006_len_main.h +++ b/src/common/packets/packets2006_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2006_len_sak.h b/src/common/packets/packets2006_len_sak.h index 1c3243cac..c01f5d51b 100644 --- a/src/common/packets/packets2006_len_sak.h +++ b/src/common/packets/packets2006_len_sak.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2007_len_ad.h b/src/common/packets/packets2007_len_ad.h index 2eb90e88f..d620d36e8 100644 --- a/src/common/packets/packets2007_len_ad.h +++ b/src/common/packets/packets2007_len_ad.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2007_len_main.h b/src/common/packets/packets2007_len_main.h index 5ddb540da..953026a6b 100644 --- a/src/common/packets/packets2007_len_main.h +++ b/src/common/packets/packets2007_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2007_len_sak.h b/src/common/packets/packets2007_len_sak.h index 38d339306..d23b07d75 100644 --- a/src/common/packets/packets2007_len_sak.h +++ b/src/common/packets/packets2007_len_sak.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2008_len_ad.h b/src/common/packets/packets2008_len_ad.h index ceb4181eb..1a1aa5f54 100644 --- a/src/common/packets/packets2008_len_ad.h +++ b/src/common/packets/packets2008_len_ad.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2008_len_main.h b/src/common/packets/packets2008_len_main.h index 795582ec0..a8caefe10 100644 --- a/src/common/packets/packets2008_len_main.h +++ b/src/common/packets/packets2008_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2008_len_re.h b/src/common/packets/packets2008_len_re.h index 81d615190..8b855d34d 100644 --- a/src/common/packets/packets2008_len_re.h +++ b/src/common/packets/packets2008_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2008_len_sak.h b/src/common/packets/packets2008_len_sak.h index 38ee488ed..1bc3d5edc 100644 --- a/src/common/packets/packets2008_len_sak.h +++ b/src/common/packets/packets2008_len_sak.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2009_len_main.h b/src/common/packets/packets2009_len_main.h index eb645b1b0..f35a273d7 100644 --- a/src/common/packets/packets2009_len_main.h +++ b/src/common/packets/packets2009_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2009_len_re.h b/src/common/packets/packets2009_len_re.h index deab0c497..f8b5ac986 100644 --- a/src/common/packets/packets2009_len_re.h +++ b/src/common/packets/packets2009_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2009_len_sak.h b/src/common/packets/packets2009_len_sak.h index e90bd59f0..da3727fd2 100644 --- a/src/common/packets/packets2009_len_sak.h +++ b/src/common/packets/packets2009_len_sak.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2010_len_main.h b/src/common/packets/packets2010_len_main.h index 887545b26..da5c3aa13 100644 --- a/src/common/packets/packets2010_len_main.h +++ b/src/common/packets/packets2010_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2010_len_re.h b/src/common/packets/packets2010_len_re.h index 5e53e0b57..9ebe1def6 100644 --- a/src/common/packets/packets2010_len_re.h +++ b/src/common/packets/packets2010_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2011_len_main.h b/src/common/packets/packets2011_len_main.h index 907dfcb5b..a5644177d 100644 --- a/src/common/packets/packets2011_len_main.h +++ b/src/common/packets/packets2011_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2011_len_re.h b/src/common/packets/packets2011_len_re.h index b1fc84270..7bb9f0537 100644 --- a/src/common/packets/packets2011_len_re.h +++ b/src/common/packets/packets2011_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2012_len_main.h b/src/common/packets/packets2012_len_main.h index 0720e97b1..6095f6807 100644 --- a/src/common/packets/packets2012_len_main.h +++ b/src/common/packets/packets2012_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2012_len_re.h b/src/common/packets/packets2012_len_re.h index 131c29276..6846b3ff0 100644 --- a/src/common/packets/packets2012_len_re.h +++ b/src/common/packets/packets2012_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2013_len_main.h b/src/common/packets/packets2013_len_main.h index 673d36815..3ca54efd2 100644 --- a/src/common/packets/packets2013_len_main.h +++ b/src/common/packets/packets2013_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2013_len_re.h b/src/common/packets/packets2013_len_re.h index 21a159b4d..021a7ef4d 100644 --- a/src/common/packets/packets2013_len_re.h +++ b/src/common/packets/packets2013_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2014_len_main.h b/src/common/packets/packets2014_len_main.h index 4246dad81..0e3aeab37 100644 --- a/src/common/packets/packets2014_len_main.h +++ b/src/common/packets/packets2014_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2014_len_re.h b/src/common/packets/packets2014_len_re.h index 725aa3c9f..de1eac07e 100644 --- a/src/common/packets/packets2014_len_re.h +++ b/src/common/packets/packets2014_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2015_len_main.h b/src/common/packets/packets2015_len_main.h index 6aa9098c4..f1454b3ce 100644 --- a/src/common/packets/packets2015_len_main.h +++ b/src/common/packets/packets2015_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2015_len_re.h b/src/common/packets/packets2015_len_re.h index 2e343a1ea..bce9fe5a2 100644 --- a/src/common/packets/packets2015_len_re.h +++ b/src/common/packets/packets2015_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2016_len_main.h b/src/common/packets/packets2016_len_main.h index daae397de..80518e3eb 100644 --- a/src/common/packets/packets2016_len_main.h +++ b/src/common/packets/packets2016_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2016_len_re.h b/src/common/packets/packets2016_len_re.h index 6f8574edf..b5b08bf00 100644 --- a/src/common/packets/packets2016_len_re.h +++ b/src/common/packets/packets2016_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2017_len_main.h b/src/common/packets/packets2017_len_main.h index 9c9379270..fce8e08c5 100644 --- a/src/common/packets/packets2017_len_main.h +++ b/src/common/packets/packets2017_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2017_len_re.h b/src/common/packets/packets2017_len_re.h index 626876785..fd716595e 100644 --- a/src/common/packets/packets2017_len_re.h +++ b/src/common/packets/packets2017_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2017_len_zero.h b/src/common/packets/packets2017_len_zero.h index 2d4befaaa..ef5e5944e 100644 --- a/src/common/packets/packets2017_len_zero.h +++ b/src/common/packets/packets2017_len_zero.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2018_len_main.h b/src/common/packets/packets2018_len_main.h index 42e34e731..3712d0656 100644 --- a/src/common/packets/packets2018_len_main.h +++ b/src/common/packets/packets2018_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2018_len_re.h b/src/common/packets/packets2018_len_re.h index 3cd8e662b..2d700f016 100644 --- a/src/common/packets/packets2018_len_re.h +++ b/src/common/packets/packets2018_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2018_len_zero.h b/src/common/packets/packets2018_len_zero.h index 3f4ec4b60..1f99f1ddb 100644 --- a/src/common/packets/packets2018_len_zero.h +++ b/src/common/packets/packets2018_len_zero.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2019_len_main.h b/src/common/packets/packets2019_len_main.h index f3e025c85..5772ec89a 100644 --- a/src/common/packets/packets2019_len_main.h +++ b/src/common/packets/packets2019_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2019_len_re.h b/src/common/packets/packets2019_len_re.h index 713f15a61..45572abc1 100644 --- a/src/common/packets/packets2019_len_re.h +++ b/src/common/packets/packets2019_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2019_len_zero.h b/src/common/packets/packets2019_len_zero.h index 3c1f393ac..226de51ac 100644 --- a/src/common/packets/packets2019_len_zero.h +++ b/src/common/packets/packets2019_len_zero.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2020_len_main.h b/src/common/packets/packets2020_len_main.h index fe06bb7d1..a85cddb29 100644 --- a/src/common/packets/packets2020_len_main.h +++ b/src/common/packets/packets2020_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets2020_len_re.h b/src/common/packets/packets2020_len_re.h index a77dce7be..6e72cbb7d 100644 --- a/src/common/packets/packets2020_len_re.h +++ b/src/common/packets/packets2020_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets_len_ad.h b/src/common/packets/packets_len_ad.h index 2c5341f3c..60382a8b8 100644 --- a/src/common/packets/packets_len_ad.h +++ b/src/common/packets/packets_len_ad.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2019-2020 Hercules Dev Team - * Copyright (C) 2019-2020 Andrei Karas (4144) + * Copyright (C) 2019-2020 Hercules Dev Team + * Copyright (C) 2019-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets_len_main.h b/src/common/packets/packets_len_main.h index 7b93b35b0..365b0af6f 100644 --- a/src/common/packets/packets_len_main.h +++ b/src/common/packets/packets_len_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets_len_re.h b/src/common/packets/packets_len_re.h index 23a507886..302381722 100644 --- a/src/common/packets/packets_len_re.h +++ b/src/common/packets/packets_len_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets_len_sak.h b/src/common/packets/packets_len_sak.h index 324445cfe..1a39b2fcf 100644 --- a/src/common/packets/packets_len_sak.h +++ b/src/common/packets/packets_len_sak.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2019-2020 Hercules Dev Team - * Copyright (C) 2019-2020 Andrei Karas (4144) + * Copyright (C) 2019-2020 Hercules Dev Team + * Copyright (C) 2019-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets/packets_len_zero.h b/src/common/packets/packets_len_zero.h index 8e933e3d3..1385c80ee 100644 --- a/src/common/packets/packets_len_zero.h +++ b/src/common/packets/packets_len_zero.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2018-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packets_len.h b/src/common/packets_len.h index 02f63ae0d..f0ec0273f 100644 --- a/src/common/packets_len.h +++ b/src/common/packets_len.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team + * Copyright (C) 2012-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/packetsstatic_len.h b/src/common/packetsstatic_len.h index f721ab882..79aad47bc 100644 --- a/src/common/packetsstatic_len.h +++ b/src/common/packetsstatic_len.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2018 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/random.c b/src/common/random.c index 9bbe4f86c..263c541b9 100644 --- a/src/common/random.c +++ b/src/common/random.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/random.h b/src/common/random.h index 70f019678..acfa36166 100644 --- a/src/common/random.h +++ b/src/common/random.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/showmsg.c b/src/common/showmsg.c index 32d1e7610..11ba80158 100644 --- a/src/common/showmsg.c +++ b/src/common/showmsg.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/showmsg.h b/src/common/showmsg.h index ace155ee8..e5bca564e 100644 --- a/src/common/showmsg.h +++ b/src/common/showmsg.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/socket.c b/src/common/socket.c index 8ee4f06e2..74d54dde8 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/socket.h b/src/common/socket.h index b20b0b07e..5bb0762a8 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/spinlock.h b/src/common/spinlock.h index 97818ef82..f011d703e 100644 --- a/src/common/spinlock.h +++ b/src/common/spinlock.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) rAthena Project (www.rathena.org) + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) rAthena Project (www.rathena.org) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/sql.c b/src/common/sql.c index 0efc54564..bd00619eb 100644 --- a/src/common/sql.c +++ b/src/common/sql.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/sql.h b/src/common/sql.h index 147b56c0c..73e437957 100644 --- a/src/common/sql.h +++ b/src/common/sql.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/strlib.c b/src/common/strlib.c index ddb1eb78a..deccbc119 100644 --- a/src/common/strlib.c +++ b/src/common/strlib.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/strlib.h b/src/common/strlib.h index 006bbd14b..3aabc7287 100644 --- a/src/common/strlib.h +++ b/src/common/strlib.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c index e3977f440..9791c8369 100644 --- a/src/common/sysinfo.c +++ b/src/common/sysinfo.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2019 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/sysinfo.h b/src/common/sysinfo.h index 2a391bfa4..d81a1c6e8 100644 --- a/src/common/sysinfo.h +++ b/src/common/sysinfo.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/thread.c b/src/common/thread.c index 605153011..1b7e351e3 100644 --- a/src/common/thread.c +++ b/src/common/thread.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) rAthena Project (www.rathena.org) + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) rAthena Project (www.rathena.org) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/thread.h b/src/common/thread.h index 3f1b8d022..1aba44c15 100644 --- a/src/common/thread.h +++ b/src/common/thread.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) rAthena Project (www.rathena.org) + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) rAthena Project (www.rathena.org) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/timer.c b/src/common/timer.c index d5f9c83d1..107bfc54e 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/timer.h b/src/common/timer.h index 85edd611b..6f60ea804 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/utils.c b/src/common/utils.c index 238ebe65d..48ce539b6 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/utils.h b/src/common/utils.h index 81234c843..a0590db7f 100644 --- a/src/common/utils.h +++ b/src/common/utils.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common/winapi.h b/src/common/winapi.h index 5dc46d615..e9a42fd65 100644 --- a/src/common/winapi.h +++ b/src/common/winapi.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/config/classes/general.h b/src/config/classes/general.h index ad42fefb4..d1a8b0a16 100644 --- a/src/config/classes/general.h +++ b/src/config/classes/general.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/config/const.h b/src/config/const.h index df8c07b67..45e98e3f8 100644 --- a/src/config/const.h +++ b/src/config/const.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/config/core.h b/src/config/core.h index a22d47324..b091e6dee 100644 --- a/src/config/core.h +++ b/src/config/core.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/config/renewal.h b/src/config/renewal.h index 6c45abc0e..3163a4134 100644 --- a/src/config/renewal.h +++ b/src/config/renewal.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/config/secure.h b/src/config/secure.h index f262852e4..fd05b4a49 100644 --- a/src/config/secure.h +++ b/src/config/secure.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/HPMlogin.c b/src/login/HPMlogin.c index 304db5501..ac891f515 100644 --- a/src/login/HPMlogin.c +++ b/src/login/HPMlogin.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2014-2018 Hercules Dev Team + * Copyright (C) 2014-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/HPMlogin.h b/src/login/HPMlogin.h index e16edb6b8..1530b9fdc 100644 --- a/src/login/HPMlogin.h +++ b/src/login/HPMlogin.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2014-2018 Hercules Dev Team + * Copyright (C) 2014-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/Makefile.in b/src/login/Makefile.in index 5e0a04a81..464b33e56 100644 --- a/src/login/Makefile.in +++ b/src/login/Makefile.in @@ -1,8 +1,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2018 Hercules Dev Team -# Copyright (C) Athena Dev Teams +# Copyright (C) 2012-2020 Hercules Dev Team +# Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/login/account.c b/src/login/account.c index 783cf85ea..3632c257a 100644 --- a/src/login/account.c +++ b/src/login/account.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/account.h b/src/login/account.h index 312bb85c5..712b91ed6 100644 --- a/src/login/account.h +++ b/src/login/account.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/ipban.c b/src/login/ipban.c index 32ee1a19b..e5bf853d6 100644 --- a/src/login/ipban.c +++ b/src/login/ipban.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/ipban.h b/src/login/ipban.h index ac502b50d..87b48135f 100644 --- a/src/login/ipban.h +++ b/src/login/ipban.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/lclif.c b/src/login/lclif.c index 97871922d..f99011de9 100644 --- a/src/login/lclif.c +++ b/src/login/lclif.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2016 Hercules Dev Team + * Copyright (C) 2016-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/lclif.h b/src/login/lclif.h index 26c061367..2abcb8455 100644 --- a/src/login/lclif.h +++ b/src/login/lclif.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2016 Hercules Dev Team + * Copyright (C) 2016-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/lclif.p.h b/src/login/lclif.p.h index cc9805ea8..72abe34ae 100644 --- a/src/login/lclif.p.h +++ b/src/login/lclif.p.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2016 Hercules Dev Team + * Copyright (C) 2016-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/login.c b/src/login/login.c index 580f79ebb..4201a8b4e 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/login.h b/src/login/login.h index 7f74057c6..0f5a87b9e 100644 --- a/src/login/login.h +++ b/src/login/login.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/loginlog.c b/src/login/loginlog.c index 19f269ab5..2589c9a1c 100644 --- a/src/login/loginlog.c +++ b/src/login/loginlog.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/loginlog.h b/src/login/loginlog.h index 0fcbae568..eb683da53 100644 --- a/src/login/loginlog.h +++ b/src/login/loginlog.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/packets_ac_struct.h b/src/login/packets_ac_struct.h index c9fb04f26..bdd31308a 100644 --- a/src/login/packets_ac_struct.h +++ b/src/login/packets_ac_struct.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2016-2018 Hercules Dev Team + * Copyright (C) 2016-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/login/packets_ca_struct.h b/src/login/packets_ca_struct.h index 0828c7293..6b9360086 100644 --- a/src/login/packets_ca_struct.h +++ b/src/login/packets_ca_struct.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2016-2018 Hercules Dev Team + * Copyright (C) 2016-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/HPMmap.c b/src/map/HPMmap.c index e89f47c12..42c7b3c5f 100644 --- a/src/map/HPMmap.c +++ b/src/map/HPMmap.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/HPMmap.h b/src/map/HPMmap.h index a9d2a454e..52ab36cce 100644 --- a/src/map/HPMmap.h +++ b/src/map/HPMmap.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/Makefile.in b/src/map/Makefile.in index f851de756..6dbebb5ad 100644 --- a/src/map/Makefile.in +++ b/src/map/Makefile.in @@ -1,8 +1,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2018 Hercules Dev Team -# Copyright (C) Athena Dev Teams +# Copyright (C) 2012-2020 Hercules Dev Team +# Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/map/achievement.c b/src/map/achievement.c index 5215526a9..e6a9ae3be 100644 --- a/src/map/achievement.c +++ b/src/map/achievement.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * -* Copyright (C) 2017 Hercules Dev Team +* Copyright (C) 2017-2020 Hercules Dev Team * Copyright (C) Smokexyz * Copyright (C) Dastgir * diff --git a/src/map/achievement.h b/src/map/achievement.h index de5eaa060..dd80f7a23 100644 --- a/src/map/achievement.h +++ b/src/map/achievement.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * -* Copyright (C) 2018 Hercules Dev Team +* Copyright (C) 2018-2020 Hercules Dev Team * Copyright (C) Smokexyz * * Hercules is free software: you can redistribute it and/or modify diff --git a/src/map/atcommand.c b/src/map/atcommand.c index b82224206..3cd26079d 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/atcommand.h b/src/map/atcommand.h index f1da2760a..f3b1be51b 100644 --- a/src/map/atcommand.h +++ b/src/map/atcommand.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/battle.c b/src/map/battle.c index 9413076fb..0b88f17c9 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/battle.h b/src/map/battle.h index dd6265b1e..2e710f7f8 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/battleground.c b/src/map/battleground.c index e0d2e8003..7a9d54266 100644 --- a/src/map/battleground.c +++ b/src/map/battleground.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/battleground.h b/src/map/battleground.h index 4f6e5507e..b567dddd4 100644 --- a/src/map/battleground.h +++ b/src/map/battleground.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/buyingstore.c b/src/map/buyingstore.c index 8cac65775..2c2fc13ae 100644 --- a/src/map/buyingstore.c +++ b/src/map/buyingstore.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/buyingstore.h b/src/map/buyingstore.h index 63762f321..a35167fbc 100644 --- a/src/map/buyingstore.h +++ b/src/map/buyingstore.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/channel.c b/src/map/channel.c index c87e425eb..43e903fc9 100644 --- a/src/map/channel.c +++ b/src/map/channel.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/channel.h b/src/map/channel.h index c56227c66..8f91b0777 100644 --- a/src/map/channel.h +++ b/src/map/channel.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/chat.c b/src/map/chat.c index b650ff029..097fbdca4 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/chat.h b/src/map/chat.h index 9bea51a82..6c571c62e 100644 --- a/src/map/chat.h +++ b/src/map/chat.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/chrif.c b/src/map/chrif.c index ddc106d0c..b131907e0 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/chrif.h b/src/map/chrif.h index 78910d24b..e2e82c6cb 100644 --- a/src/map/chrif.h +++ b/src/map/chrif.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/clan.c b/src/map/clan.c index 3d5c70eb1..041ba1d6d 100644 --- a/src/map/clan.c +++ b/src/map/clan.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2017 Hercules Dev Team + * Copyright (C) 2017-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/clan.h b/src/map/clan.h index 15ed52680..95ea8565c 100644 --- a/src/map/clan.h +++ b/src/map/clan.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2017 Hercules Dev Team + * Copyright (C) 2017-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/clif.c b/src/map/clif.c index 9da6a592e..3dff01523 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/clif.h b/src/map/clif.h index 99560f52e..b61772bba 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/date.c b/src/map/date.c index 8060db458..9db7155ab 100644 --- a/src/map/date.c +++ b/src/map/date.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/date.h b/src/map/date.h index c5fe56d5f..1673b8c6d 100644 --- a/src/map/date.h +++ b/src/map/date.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/duel.c b/src/map/duel.c index c2c24e37b..dca040f83 100644 --- a/src/map/duel.c +++ b/src/map/duel.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/duel.h b/src/map/duel.h index facb09ff9..4e8985b96 100644 --- a/src/map/duel.h +++ b/src/map/duel.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/elemental.c b/src/map/elemental.c index b7bd5c090..1c1d98634 100644 --- a/src/map/elemental.c +++ b/src/map/elemental.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/elemental.h b/src/map/elemental.h index 0c6b4ec27..71c991268 100644 --- a/src/map/elemental.h +++ b/src/map/elemental.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/guild.c b/src/map/guild.c index 2fcbe02e7..f344878e1 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/guild.h b/src/map/guild.h index 5a14b8a34..82582a864 100644 --- a/src/map/guild.h +++ b/src/map/guild.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/homunculus.c b/src/map/homunculus.c index fbb94334c..189cf29e4 100644 --- a/src/map/homunculus.c +++ b/src/map/homunculus.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/homunculus.h b/src/map/homunculus.h index 2914a26cc..c12629f46 100644 --- a/src/map/homunculus.h +++ b/src/map/homunculus.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/instance.c b/src/map/instance.c index e87cc03bb..90f2217b1 100644 --- a/src/map/instance.c +++ b/src/map/instance.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/instance.h b/src/map/instance.h index 91928bf40..8206902c1 100644 --- a/src/map/instance.h +++ b/src/map/instance.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/intif.c b/src/map/intif.c index 5a62f9644..a420b7204 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/intif.h b/src/map/intif.h index ffac4a1c9..c397eda7d 100644 --- a/src/map/intif.h +++ b/src/map/intif.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/irc-bot.c b/src/map/irc-bot.c index a0c7276a9..bc9cb6ad1 100644 --- a/src/map/irc-bot.c +++ b/src/map/irc-bot.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/irc-bot.h b/src/map/irc-bot.h index 54f462e35..66880f427 100644 --- a/src/map/irc-bot.h +++ b/src/map/irc-bot.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/itemdb.c b/src/map/itemdb.c index b016af1c9..2b8200c06 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/itemdb.h b/src/map/itemdb.h index ecdcbcafc..d2592af4e 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/log.c b/src/map/log.c index 45335b16a..61679089b 100644 --- a/src/map/log.c +++ b/src/map/log.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/log.h b/src/map/log.h index 5035e9526..3f9a80e36 100644 --- a/src/map/log.h +++ b/src/map/log.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/mail.c b/src/map/mail.c index 0a6603a45..a1176e8fc 100644 --- a/src/map/mail.c +++ b/src/map/mail.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/mail.h b/src/map/mail.h index 9aeb46120..6281890c0 100644 --- a/src/map/mail.h +++ b/src/map/mail.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/map.c b/src/map/map.c index 9db868329..afdc2ed41 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/map.h b/src/map/map.h index 6b360e1bc..78f1a3c89 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/mapdefines.h b/src/map/mapdefines.h index 348ca98fd..f5a8149d4 100644 --- a/src/map/mapdefines.h +++ b/src/map/mapdefines.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/mapreg.h b/src/map/mapreg.h index 4a9fd9e97..b3b89e1b2 100644 --- a/src/map/mapreg.h +++ b/src/map/mapreg.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/mapreg_sql.c b/src/map/mapreg_sql.c index 516be56cb..741505e17 100644 --- a/src/map/mapreg_sql.c +++ b/src/map/mapreg_sql.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 918701c9d..00fdcae9f 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/mercenary.h b/src/map/mercenary.h index 65e8d5338..bd28729c5 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/messages.h b/src/map/messages.h index a46905a76..adf5bc7e0 100644 --- a/src/map/messages.h +++ b/src/map/messages.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2020 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/messages_ad.h b/src/map/messages_ad.h index 016858496..9a3ada406 100644 --- a/src/map/messages_ad.h +++ b/src/map/messages_ad.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/messages_main.h b/src/map/messages_main.h index 5dce0b1ce..b2b67f08c 100644 --- a/src/map/messages_main.h +++ b/src/map/messages_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/messages_re.h b/src/map/messages_re.h index 294084c65..8cb3b6624 100644 --- a/src/map/messages_re.h +++ b/src/map/messages_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/messages_sak.h b/src/map/messages_sak.h index 00e414b22..723f1f1f4 100644 --- a/src/map/messages_sak.h +++ b/src/map/messages_sak.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/messages_zero.h b/src/map/messages_zero.h index 305f76911..18aed7d5b 100644 --- a/src/map/messages_zero.h +++ b/src/map/messages_zero.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/mob.c b/src/map/mob.c index 60b6977bb..4b74abc8f 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/mob.h b/src/map/mob.h index 6693c3671..8fd16f191 100644 --- a/src/map/mob.h +++ b/src/map/mob.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/npc.c b/src/map/npc.c index 868b8711a..cc588e52c 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/npc.h b/src/map/npc.h index 5ff63532d..c5f44f0e0 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c index 92393122e..0ca84cff4 100644 --- a/src/map/npc_chat.c +++ b/src/map/npc_chat.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/packets.h b/src/map/packets.h index abcbddadb..90b9beeb7 100644 --- a/src/map/packets.h +++ b/src/map/packets.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/packets_keys_main.h b/src/map/packets_keys_main.h index adfefe5dc..1d5f96ee9 100644 --- a/src/map/packets_keys_main.h +++ b/src/map/packets_keys_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/packets_keys_zero.h b/src/map/packets_keys_zero.h index 6be572964..d4c96beca 100644 --- a/src/map/packets_keys_zero.h +++ b/src/map/packets_keys_zero.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/packets_shuffle_main.h b/src/map/packets_shuffle_main.h index 0e7ca8609..83a9107f2 100644 --- a/src/map/packets_shuffle_main.h +++ b/src/map/packets_shuffle_main.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/packets_shuffle_re.h b/src/map/packets_shuffle_re.h index 37b50c863..9c9df85ed 100644 --- a/src/map/packets_shuffle_re.h +++ b/src/map/packets_shuffle_re.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/packets_shuffle_zero.h b/src/map/packets_shuffle_zero.h index eaac59a12..91b0c1e89 100644 --- a/src/map/packets_shuffle_zero.h +++ b/src/map/packets_shuffle_zero.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team - * Copyright (C) 2018-2020 Andrei Karas (4144) + * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2018-2020 Andrei Karas (4144) * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index 7b1d91004..0fa602ba5 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2018 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/party.c b/src/map/party.c index 35ffe5636..7d7f69620 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/party.h b/src/map/party.h index 1831da414..c2306b7a8 100644 --- a/src/map/party.h +++ b/src/map/party.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/path.c b/src/map/path.c index 16d9b0563..f271e8219 100644 --- a/src/map/path.c +++ b/src/map/path.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/path.h b/src/map/path.h index 7791a46cf..04072e303 100644 --- a/src/map/path.h +++ b/src/map/path.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/pc.c b/src/map/pc.c index 6ea3b3393..c4f9d8be0 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/pc.h b/src/map/pc.h index e44b9cdda..f4f0044a9 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c index 8d55897b8..9149aa6e4 100644 --- a/src/map/pc_groups.c +++ b/src/map/pc_groups.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h index f3994b9c4..0a8cfce86 100644 --- a/src/map/pc_groups.h +++ b/src/map/pc_groups.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/pet.c b/src/map/pet.c index b2b6d96f8..f20de2650 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/pet.h b/src/map/pet.h index 2508a70a6..e0a5529a6 100644 --- a/src/map/pet.h +++ b/src/map/pet.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/quest.c b/src/map/quest.c index 38ac88eea..10ea668a6 100644 --- a/src/map/quest.c +++ b/src/map/quest.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/quest.h b/src/map/quest.h index d60b9b33c..f83bb7d73 100644 --- a/src/map/quest.h +++ b/src/map/quest.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/refine.c b/src/map/refine.c index 29d81c9b8..f6c855cea 100644 --- a/src/map/refine.c +++ b/src/map/refine.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * -* Copyright (C) 2019 Hercules Dev Team +* Copyright (C) 2019-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/refine.h b/src/map/refine.h index 410811e06..bb3790a45 100644 --- a/src/map/refine.h +++ b/src/map/refine.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * -* Copyright (C) 2019 Hercules Dev Team +* Copyright (C) 2019-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/refine.p.h b/src/map/refine.p.h index 3247d15c9..5dbed2afc 100644 --- a/src/map/refine.p.h +++ b/src/map/refine.p.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * -* Copyright (C) 2019 Hercules Dev Team +* Copyright (C) 2019-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/rodex.c b/src/map/rodex.c index 766fdc5ea..1ebed0623 100644 --- a/src/map/rodex.c +++ b/src/map/rodex.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2017 Hercules Dev Team + * Copyright (C) 2017-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/rodex.h b/src/map/rodex.h index b6e7ca5b7..6a1621657 100644 --- a/src/map/rodex.h +++ b/src/map/rodex.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2017 Hercules Dev Team + * Copyright (C) 2017-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/script.c b/src/map/script.c index f8a12f2a4..26bd678fe 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/script.h b/src/map/script.h index 7bcb5298c..d652f2155 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/searchstore.c b/src/map/searchstore.c index c991e38c4..a2f00bb0a 100644 --- a/src/map/searchstore.c +++ b/src/map/searchstore.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/searchstore.h b/src/map/searchstore.h index 71d562679..83705d4ca 100644 --- a/src/map/searchstore.h +++ b/src/map/searchstore.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/skill.c b/src/map/skill.c index c19a684af..4579b2ea7 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/skill.h b/src/map/skill.h index fe5cb6282..dbda6470f 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/status.c b/src/map/status.c index 98cb7d4e0..3b99b99b8 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/status.h b/src/map/status.h index fe99cfba9..ecf27d411 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/storage.c b/src/map/storage.c index 90b620f63..b83bd8489 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/storage.h b/src/map/storage.h index 5c6152894..7a342efb2 100644 --- a/src/map/storage.h +++ b/src/map/storage.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/stylist.c b/src/map/stylist.c index 438302214..8b4180971 100644 --- a/src/map/stylist.c +++ b/src/map/stylist.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * -* Copyright (C) 2018-2019 Hercules Dev Team +* Copyright (C) 2018-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/stylist.h b/src/map/stylist.h index 5bedfefc7..1b8e20616 100644 --- a/src/map/stylist.h +++ b/src/map/stylist.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2018-2019 Hercules Dev Team + * Copyright (C) 2018-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/trade.c b/src/map/trade.c index ff5c04fc3..e727c3c70 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/trade.h b/src/map/trade.h index ac732122f..da55f5057 100644 --- a/src/map/trade.h +++ b/src/map/trade.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/unit.c b/src/map/unit.c index d7d95c57b..482440978 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/unit.h b/src/map/unit.h index 3209351e3..5437a172a 100644 --- a/src/map/unit.h +++ b/src/map/unit.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/vending.c b/src/map/vending.c index 692f5f378..4fd009025 100644 --- a/src/map/vending.c +++ b/src/map/vending.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/map/vending.h b/src/map/vending.h index c994aad3a..fcf80aef0 100644 --- a/src/map/vending.h +++ b/src/map/vending.h @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking.c b/src/plugins/HPMHooking.c index 8e7ed4823..5af7576d3 100644 --- a/src/plugins/HPMHooking.c +++ b/src/plugins/HPMHooking.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2018 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking.h b/src/plugins/HPMHooking.h index 39d63a50b..76f12dbad 100644 --- a/src/plugins/HPMHooking.h +++ b/src/plugins/HPMHooking.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2016 Hercules Dev Team + * Copyright (C) 2016-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc index b2c3e80ac..1f34dfdd4 100644 --- a/src/plugins/HPMHooking/HPMHooking.Defs.inc +++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc index 570e20968..a9a83511e 100644 --- a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc index 48f24fcab..7f52ebe46 100644 --- a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc index 49fe48aac..d5297c29c 100644 --- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking_char.sources.inc b/src/plugins/HPMHooking/HPMHooking_char.sources.inc index 9e723d83b..7adc65b3c 100644 --- a/src/plugins/HPMHooking/HPMHooking_char.sources.inc +++ b/src/plugins/HPMHooking/HPMHooking_char.sources.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc index c81d42da8..c638a1ef6 100644 --- a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc index 790c8a3a5..ef6081f41 100644 --- a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc index 7eab86a08..20c709bce 100644 --- a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking_login.sources.inc b/src/plugins/HPMHooking/HPMHooking_login.sources.inc index 576796779..8a548bedc 100644 --- a/src/plugins/HPMHooking/HPMHooking_login.sources.inc +++ b/src/plugins/HPMHooking/HPMHooking_login.sources.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc index 16de79ecb..eccf2a277 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc index 7b81bac49..b8d5f3482 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index 7873e544a..e24b00f78 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/HPMHooking/HPMHooking_map.sources.inc b/src/plugins/HPMHooking/HPMHooking_map.sources.inc index 53ee71a03..e49a6b166 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.sources.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.sources.inc @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2020 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index e90a04f8b..5527ceb2f 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -1,7 +1,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2013-2018 Hercules Dev Team +# Copyright (C) 2013-2020 Hercules Dev Team # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/plugins/constdb2doc.c b/src/plugins/constdb2doc.c index ebaf7a833..5d01aa360 100644 --- a/src/plugins/constdb2doc.c +++ b/src/plugins/constdb2doc.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2016 Hercules Dev Team - * Copyright (C) 2016 Haru + * Copyright (C) 2016-2020 Hercules Dev Team + * Copyright (C) 2016 Haru * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c index 159d4e2a6..6ca52a593 100644 --- a/src/plugins/db2sql.c +++ b/src/plugins/db2sql.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2018 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -104,7 +104,7 @@ void db2sql_fileheader(void) "-- This file is part of Hercules.\n" "-- http://herc.ws - http://github.com/HerculesWS/Hercules\n" "--\n" - "-- Copyright (C) 2013-%d Hercules Dev Team\n" + "-- Copyright (C) 2013-%d Hercules Dev Team\n" "--\n" "-- Hercules is free software: you can redistribute it and/or modify\n" "-- it under the terms of the GNU General Public License as published by\n" diff --git a/src/plugins/dbghelpplug.c b/src/plugins/dbghelpplug.c index b68bb1efc..ab6b5fc76 100644 --- a/src/plugins/dbghelpplug.c +++ b/src/plugins/dbghelpplug.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/generate-translations.c b/src/plugins/generate-translations.c index 14a3c0a4d..7aeae0c96 100644 --- a/src/plugins/generate-translations.c +++ b/src/plugins/generate-translations.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2016 Hercules Dev Team + * Copyright (C) 2016-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -254,7 +254,7 @@ bool translations_enter_file(const char *filepath) "# This file is part of Hercules.\n" "# http://herc.ws - http://github.com/HerculesWS/Hercules\n" "#\n" - "# Copyright (C) 2013-%d Hercules Dev Team\n" + "# Copyright (C) 2013-%d Hercules Dev Team\n" "#\n" "# Hercules is free software: you can redistribute it and/or modify\n" "# it under the terms of the GNU General Public License as published by\n" diff --git a/src/plugins/mapcache.c b/src/plugins/mapcache.c index 208f39abb..3dc6e3b34 100644 --- a/src/plugins/mapcache.c +++ b/src/plugins/mapcache.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * -* Copyright (C) 2013-2015 Hercules Dev Team +* Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/sample.c b/src/plugins/sample.c index da29bd837..41f9517b5 100644 --- a/src/plugins/sample.c +++ b/src/plugins/sample.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-2015 Hercules Dev Team + * Copyright (C) 2013-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/plugins/script_mapquit.c b/src/plugins/script_mapquit.c index b212ce1c6..af53dc00c 100644 --- a/src/plugins/script_mapquit.c +++ b/src/plugins/script_mapquit.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2014-2018 Hercules Dev Team + * Copyright (C) 2014-2020 Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/Makefile.in b/src/test/Makefile.in index 1bd86608f..8399100f1 100644 --- a/src/test/Makefile.in +++ b/src/test/Makefile.in @@ -1,8 +1,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2018 Hercules Dev Team -# Copyright (C) Athena Dev Teams +# Copyright (C) 2012-2020 Hercules Dev Team +# Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/src/test/test_libconfig.c b/src/test/test_libconfig.c index e1a767195..140b86f49 100644 --- a/src/test/test_libconfig.c +++ b/src/test/test_libconfig.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2015 Hercules Dev Team - * Copyright (C) 2015 Haru + * Copyright (C) 2015-2020 Hercules Dev Team + * Copyright (C) 2015 Haru * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/test_spinlock.c b/src/test/test_spinlock.c index fc2eed5da..4ceeea7b9 100644 --- a/src/test/test_spinlock.c +++ b/src/test/test_spinlock.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/sysinfogen.sh b/sysinfogen.sh index ff1dadcb0..1264c7e64 100755 --- a/sysinfogen.sh +++ b/sysinfogen.sh @@ -3,7 +3,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2014-2015 Hercules Dev Team +# Copyright (C) 2014-2020 Hercules Dev Team # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ cat > "$OUTFILE" << EOF * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2014-$YEAR Hercules Dev Team + * Copyright (C) 2014-$YEAR Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/tools/HPMHookGen/HPMDataCheckGen.pl b/tools/HPMHookGen/HPMDataCheckGen.pl index f6e4dac24..538068f80 100644 --- a/tools/HPMHookGen/HPMDataCheckGen.pl +++ b/tools/HPMHookGen/HPMDataCheckGen.pl @@ -3,7 +3,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2014-2018 Hercules Dev Team +# Copyright (C) 2014-2020 Hercules Dev Team # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -72,7 +72,7 @@ print FH <<"EOF"; * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2014-$year Hercules Dev Team + * Copyright (C) 2014-$year Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/tools/HPMHookGen/HPMHookGen.pl b/tools/HPMHookGen/HPMHookGen.pl index 46cae36cb..35c83f367 100755 --- a/tools/HPMHookGen/HPMHookGen.pl +++ b/tools/HPMHookGen/HPMHookGen.pl @@ -3,7 +3,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2013-2018 Hercules Dev Team +# Copyright (C) 2013-2020 Hercules Dev Team # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -472,7 +472,7 @@ my $fileheader = <<"EOF"; * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2013-$year Hercules Dev Team + * Copyright (C) 2013-$year Hercules Dev Team * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/tools/HPMHookGen/Makefile.in b/tools/HPMHookGen/Makefile.in index d2fe379d8..43c6efff3 100644 --- a/tools/HPMHookGen/Makefile.in +++ b/tools/HPMHookGen/Makefile.in @@ -1,8 +1,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team -# Copyright (C) Athena Dev Teams +# Copyright (C) 2012-2020 Hercules Dev Team +# Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/Script-Checker.applescript b/tools/Script-Checker.applescript index 0b7207569..202e19800 100644 --- a/tools/Script-Checker.applescript +++ b/tools/Script-Checker.applescript @@ -2,7 +2,7 @@ This file is part of Hercules. http://herc.ws - http://github.com/HerculesWS/Hercules - Copyright (C) 2014-2015 Hercules Dev Team + Copyright (C) 2014-2020 Hercules Dev Team Hercules is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tools/check-doc b/tools/check-doc index 8ac9a87ad..267968470 100755 --- a/tools/check-doc +++ b/tools/check-doc @@ -3,7 +3,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team +# Copyright (C) 2012-2020 Hercules Dev Team # checking-doc script by trojal # modified by lighta # diff --git a/tools/ci/retry.sh b/tools/ci/retry.sh index 688f02d9a..584e78f13 100755 --- a/tools/ci/retry.sh +++ b/tools/ci/retry.sh @@ -3,8 +3,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2016 Hercules Dev Team -# Copyright (C) 2016 Haru +# Copyright (C) 2016-2020 Hercules Dev Team +# Copyright (C) 2016 Haru # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/ci/travis.sh b/tools/ci/travis.sh index 22f523bdf..10c653925 100755 --- a/tools/ci/travis.sh +++ b/tools/ci/travis.sh @@ -3,7 +3,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2014-2015 Hercules Dev Team +# Copyright (C) 2014-2020 Hercules Dev Team # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/configconverter.pl b/tools/configconverter.pl index 20f5f4cfb..385278963 100755 --- a/tools/configconverter.pl +++ b/tools/configconverter.pl @@ -3,8 +3,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2016 Hercules Dev Team -# Copyright (C) 2016 Haru +# Copyright (C) 2016-2020 Hercules Dev Team +# Copyright (C) 2016 Haru # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/constdbconverter.pl b/tools/constdbconverter.pl index b534eba70..39f594790 100755 --- a/tools/constdbconverter.pl +++ b/tools/constdbconverter.pl @@ -3,7 +3,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2016 Hercules Dev Team +# Copyright (C) 2016-2020 Hercules Dev Team # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -73,7 +73,7 @@ print << "EOF"; //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016-$year Hercules Dev Team +//= Copyright (C) 2016-$year Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/tools/doxygen/Makefile.in b/tools/doxygen/Makefile.in index 233779f05..483e640aa 100644 --- a/tools/doxygen/Makefile.in +++ b/tools/doxygen/Makefile.in @@ -1,7 +1,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2016 Hercules Dev Team +# Copyright (C) 2016-2020 Hercules Dev Team # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/item_merge.lua b/tools/item_merge.lua index 2ef08eb7b..ba2e4b9b9 100644 --- a/tools/item_merge.lua +++ b/tools/item_merge.lua @@ -1,7 +1,7 @@ -- This file is part of Hercules. -- http://herc.ws - http://github.com/HerculesWS/Hercules -- --- Copyright (C) 2014-2015 Hercules Dev Team +-- Copyright (C) 2014-2020 Hercules Dev Team -- -- Hercules is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/tools/itemcombodbconverter.py b/tools/itemcombodbconverter.py index ae4deeba3..33519646a 100644 --- a/tools/itemcombodbconverter.py +++ b/tools/itemcombodbconverter.py @@ -4,7 +4,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2019 Hercules Dev Team +# Copyright (C) 2019-2020 Hercules Dev Team # Copyright (C) 2019 Asheraf # # Hercules is free software: you can redistribute it and/or modify @@ -40,7 +40,7 @@ def ConvertFile(args): //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2019 Hercules Dev Team +//= Copyright (C) 2019-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/tools/itemdb_jobmask_converter.pl b/tools/itemdb_jobmask_converter.pl index 11a5e7a5f..e9295c217 100644 --- a/tools/itemdb_jobmask_converter.pl +++ b/tools/itemdb_jobmask_converter.pl @@ -3,7 +3,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2016 Hercules Dev Team +# Copyright (C) 2016-2020 Hercules Dev Team # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/itemdbconverter.pl b/tools/itemdbconverter.pl index fe30ce24e..913af0486 100755 --- a/tools/itemdbconverter.pl +++ b/tools/itemdbconverter.pl @@ -3,7 +3,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2013-2015 Hercules Dev Team +# Copyright (C) 2013-2020 Hercules Dev Team # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/mobavailconverter.py b/tools/mobavailconverter.py index 44a3cd2eb..377557710 100644 --- a/tools/mobavailconverter.py +++ b/tools/mobavailconverter.py @@ -4,7 +4,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2019 Hercules Dev Team +# Copyright (C) 2019-2020 Hercules Dev Team # Copyright (C) 2019 Asheraf # # Hercules is free software: you can redistribute it and/or modify diff --git a/tools/mobdbconvall.sh b/tools/mobdbconvall.sh index 45eb8c38f..4cbd21a56 100755 --- a/tools/mobdbconvall.sh +++ b/tools/mobdbconvall.sh @@ -3,7 +3,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2015-2015 Hercules Dev Team +# Copyright (C) 2015-2020 Hercules Dev Team # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/mobdbconverter.py b/tools/mobdbconverter.py index 683e28274..2073d083c 100755 --- a/tools/mobdbconverter.py +++ b/tools/mobdbconverter.py @@ -4,8 +4,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2015 Hercules Dev Team -# Copyright (C) 2015 Andrei Karas (4144) +# Copyright (C) 2015-2020 Hercules Dev Team +# Copyright (C) 2015 Andrei Karas (4144) # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/mobskilldbconverter.py b/tools/mobskilldbconverter.py index 4ba042062..ac73b1f7b 100755 --- a/tools/mobskilldbconverter.py +++ b/tools/mobskilldbconverter.py @@ -4,8 +4,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2018 Hercules Dev Team -# Copyright (C) 2018 Asheraf +# Copyright (C) 2018-2020 Hercules Dev Team +# Copyright (C) 2018 Asheraf # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/petdbconverter.py b/tools/petdbconverter.py index 1b7d2e4d6..220d54531 100644 --- a/tools/petdbconverter.py +++ b/tools/petdbconverter.py @@ -4,9 +4,9 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2018 Hercules Dev Team -# Copyright (C) 2018 Asheraf -# Copyright (C) 2015 Andrei Karas (4144) +# Copyright (C) 2018-2020 Hercules Dev Team +# Copyright (C) 2018 Asheraf +# Copyright (C) 2015 Andrei Karas (4144) # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -211,4 +211,4 @@ else: printHelp(); exit(1) -convertFile(sourceFile, itemDb) \ No newline at end of file +convertFile(sourceFile, itemDb) diff --git a/tools/petevolutionconverter.py b/tools/petevolutionconverter.py index 0ccc71314..5428ff6eb 100644 --- a/tools/petevolutionconverter.py +++ b/tools/petevolutionconverter.py @@ -4,7 +4,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2018 Hercules Dev Team +# Copyright (C) 2018-2020 Hercules Dev Team # Copyright (C) 2018 Dastgir # # Hercules is free software: you can redistribute it and/or modify @@ -39,7 +39,7 @@ def printHeader(): //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team +//= Copyright (C) 2018-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/tools/questdbconverter.pl b/tools/questdbconverter.pl index 42017758a..9bdc650aa 100755 --- a/tools/questdbconverter.pl +++ b/tools/questdbconverter.pl @@ -3,7 +3,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2015 Hercules Dev Team +# Copyright (C) 2015-2020 Hercules Dev Team # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/scconfigconverter.py b/tools/scconfigconverter.py index 9216fa3b5..e6a82585c 100644 --- a/tools/scconfigconverter.py +++ b/tools/scconfigconverter.py @@ -4,7 +4,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2019 Hercules Dev Team +# Copyright (C) 2019-2020 Hercules Dev Team # Copyright (C) 2019 Asheraf # # Hercules is free software: you can redistribute it and/or modify @@ -37,7 +37,7 @@ with open('../db/sc_config.txt') as dbfile: //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2019 Hercules Dev Team +//= Copyright (C) 2019-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/tools/skilldbconverter.php b/tools/skilldbconverter.php index 8e241ff6f..233001e08 100644 --- a/tools/skilldbconverter.php +++ b/tools/skilldbconverter.php @@ -11,7 +11,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * -* Copyright (C) 2016- Smokexyz/Hercules Dev Team +* Copyright (C) 2016-2020 Hercules Dev Team +* Copyright (C) 2016 Smokexyz * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -938,7 +939,7 @@ function printcredits() print " | | | | __/ | | (__| |_| | | __/\__ \ \n"; print " \_| |_/\___|_| \___|\__,_|_|\___||___/\n"; print "Hercules Skill Database TXT to Libconfig Converter by Smokexyz\n"; - print "Copyright (C) 2016 Hercules\n"; + print "Copyright (C) 2016-2020 Hercules\n"; print "-----------------------------------------------\n\n"; } @@ -955,7 +956,7 @@ function getcomments($re) //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2018 Hercules Dev Team +//= Copyright (C) 2014-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/tools/utils/common.py b/tools/utils/common.py index 06695751a..b4dae0c8c 100644 --- a/tools/utils/common.py +++ b/tools/utils/common.py @@ -4,8 +4,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2018 Hercules Dev Team -# Copyright (C) 2018 Asheraf +# Copyright (C) 2018-2020 Hercules Dev Team +# Copyright (C) 2018 Asheraf # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/utils/libconf.py b/tools/utils/libconf.py index 7f9d6de90..3858b93b5 100644 --- a/tools/utils/libconf.py +++ b/tools/utils/libconf.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf8 -*- # -# Copyright (C) 2018 Hercules Dev Team +# Copyright (C) 2018-2020 Hercules Dev Team # # This library is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tools/validateinterfaces.py b/tools/validateinterfaces.py index 924ea903f..e031c34ab 100755 --- a/tools/validateinterfaces.py +++ b/tools/validateinterfaces.py @@ -4,8 +4,8 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2014-2015 Hercules Dev Team -# Copyright (C) 2014 Andrei Karas (4144) +# Copyright (C) 2014-2020 Hercules Dev Team +# Copyright (C) 2014 Andrei Karas (4144) # # Hercules is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- cgit v1.2.3-70-g09d2 From 1098b588625774ca2cf4e05527b00fd4d0187919 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Mon, 20 Jan 2020 09:49:23 +0100 Subject: Fixed skill conditions check and parameter in itemskill() script command. * itemskill() script command should check for the skill's conditions and also consumes them. SP are not consumed. * The same applies to Hocus-pocus skill. Conditions should be checked and consumed, SP are not consumed. * This was bugged for more than 6 years now. See linked bug report and commits. Related bug: * https://herc.ws/oldboard/tracker/issue-7210-itemskill-command-does-not-check-for-required-items/ Related commits: * https://github.com/HerculesWS/Hercules/commit/b864056b8d088660fca9129bddad477732ed8df9 * https://github.com/HerculesWS/Hercules/commit/07272f7a16db87970583286db03167ca79604a69 --- src/map/pc.h | 11 +++++++++++ src/map/script.c | 25 ++++++++++++++++++------- src/map/script.h | 8 ++++++++ src/map/skill.c | 56 +++++++++++++++++++++++++++++++++----------------------- src/map/unit.c | 47 ++++++++++++++++++++++++++++------------------- 5 files changed, 98 insertions(+), 49 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/pc.h b/src/map/pc.h index a3a3ee48d..4d7a7eef0 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -240,6 +240,8 @@ struct map_session_data { unsigned int refine_ui : 1; unsigned int npc_unloaded : 1; ///< The player is talking with an unloaded NPCs (respawned tombstones) unsigned int lapine_ui : 1; + unsigned int itemskill_conditions_checked : 1; // Used by itemskill() script command, to prevent second check of conditions after target was selected. + unsigned int itemskill_no_conditions : 1; // Used by itemskill() script command, to ignore skill conditions and don't consume them. } state; struct { unsigned char no_weapon_damage, no_magic_damage, no_misc_damage; @@ -643,6 +645,15 @@ END_ZEROED_BLOCK; bool achievements_received; // Title VECTOR_DECL(int) title_ids; + + /* + * itemskill_conditions_checked/itemskill_no_conditions abuse prevention. + * If a skill, casted by itemskill() script command, is aborted while target selection, + * the map server gets no notification where these states could be unset. + * Thus we need this helper variables to prevent abusing these states for next skill cast. + */ + int itemskill_id; + int itemskill_lv; }; #define EQP_WEAPON EQP_HAND_R diff --git a/src/map/script.c b/src/map/script.c index b77e6a376..470ad9408 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11000,15 +11000,26 @@ static BUILDIN(itemskill) id = ( script_isstringtype(st,2) ? skill->name2id(script_getstr(st,2)) : script_getnum(st,2) ); lv = script_getnum(st,3); -/* temporarily disabled, awaiting for kenpachi to detail this so we can make it work properly */ -#if 0 - if( !script_hasdata(st, 4) ) { - if( !skill->check_condition_castbegin(sd,id,lv) || !skill->check_condition_castend(sd,id,lv) ) - return true; - } -#endif sd->skillitem=id; sd->skillitemlv=lv; + + /// itemskill_conditions_checked/itemskill_no_conditions abuse prevention. + /// Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. + sd->itemskill_id = id; + sd->itemskill_lv = lv; + + int flag = script_hasdata(st, 4) ? script_getnum(st, 4) : ISF_NONE; + + sd->state.itemskill_conditions_checked = 0; /// Skill casting items will check the conditions prior to the target selection in AEGIS. Thus we need a flag to prevent checking them twice. + sd->state.itemskill_no_conditions = ((flag & ISF_IGNORECONDITIONS) == ISF_IGNORECONDITIONS) ? 1 : 0; /// Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. + + if (sd->state.itemskill_no_conditions == 0) { + if (skill->check_condition_castbegin(sd, id, lv) == 0 || skill->check_condition_castend(sd, id, lv) == 0) + return true; + + sd->state.itemskill_conditions_checked = 1; /// Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. + } + clif->item_skill(sd,id,lv); return true; } diff --git a/src/map/script.h b/src/map/script.h index 8d7669d68..c981a895d 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -564,6 +564,14 @@ enum mado_type { #endif }; +/** + * Option flags for itemskill() script command. + **/ +enum itemskill_flag { + ISF_NONE = 0x00, + ISF_IGNORECONDITIONS = 0x01, // Ignore skill conditions and don't consume them. +}; + /** * Structures **/ diff --git a/src/map/skill.c b/src/map/skill.c index 0f0a72dce..2b4f87a11 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -13997,9 +13997,17 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s nullpo_ret(sd); + if (skill_lv < 1 || skill_lv > MAX_SKILL_LEVEL) + return 0; + if (sd->chat_id != 0) return 0; + if ((sd->state.itemskill_conditions_checked == 1 || sd->state.itemskill_no_conditions == 1) + && sd->itemskill_id == sd->skillitem && sd->itemskill_lv == sd->skillitemlv) { + return 1; + } + if (pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->skillitem != skill_id) { //GMs don't override the skillItem check, otherwise they can use items without them being consumed! [Skotlex] sd->state.arrow_atk = skill->get_ammotype(skill_id)?1:0; //Need to do arrow state check. @@ -14041,24 +14049,32 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s if( (i = sd->itemindex) == -1 || sd->status.inventory[i].nameid != sd->itemid || sd->inventory_data[i] == NULL || - !sd->inventory_data[i]->flag.delay_consume || + (sd->inventory_data[i]->flag.delay_consume == 0 && skill_id == WZ_EARTHSPIKE) || // TODO: See below. [Kenpachi] sd->status.inventory[i].amount < 1 ) { //Something went wrong, item exploit? sd->itemid = sd->itemindex = -1; return 0; } + + /** + * [Kenpachi] TODO: + * - No skill casting item should be of type IT_DELAYCONSUME, they are all consumed immediately, even before the skill cursor appears. + * The WZ_EARTHSPIKE check for TK_SPTIME skill should be moved to pc_useitem(), once the type of all skill casting items is updated. + * + * - The consumption of 10 SP when using Earth_Scroll_1_3 or Earth_Scroll_1_5 while SC_EARTHSCROLL is active needs to be implemented. + * + **/ //Consume sd->itemid = sd->itemindex = -1; if( skill_id == WZ_EARTHSPIKE && sc && sc->data[SC_EARTHSCROLL] && rnd()%100 > sc->data[SC_EARTHSCROLL]->val2 ) // [marquis007] ; //Do not consume item. - else if( sd->status.inventory[i].expire_time == 0 ) // Rental usable items are not consumed until expiration + else if (sd->status.inventory[i].expire_time == 0 && sd->inventory_data[i]->flag.delay_consume == 1) // Rental usable items are not consumed until expiration pc->delitem(sd, i, 1, 0, DELITEM_NORMAL, LOG_TYPE_CONSUME); } - return 1; } - if( pc_is90overweight(sd) ) { + if (pc_is90overweight(sd) && sd->skillitem != skill_id) { /// Skill casting items ignore the overweight restriction. [Kenpachi] clif->skill_fail(sd, skill_id, USESKILL_FAIL_WEIGHTOVER, 0, 0); return 0; } @@ -14182,9 +14198,6 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s } } - if( skill_lv < 1 || skill_lv > MAX_SKILL_LEVEL ) - return 0; - require = skill->get_requirement(sd,skill_id,skill_lv); //Can only update state when weapon/arrow info is checked. @@ -14932,7 +14945,7 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s return 0; } - if( require.sp > 0 && st->sp < (unsigned int)require.sp) { + if (require.sp > 0 && st->sp < (unsigned int)require.sp && sd->skillitem != skill_id) { /// Skill casting items and Hocus-Pocus skills don't consume SP. [Kenpachi] clif->skill_fail(sd, skill_id, USESKILL_FAIL_SP_INSUFFICIENT, 0, 0); return 0; } @@ -14990,6 +15003,11 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski if (sd->chat_id != 0) return 0; + if ((sd->state.itemskill_conditions_checked == 1 || sd->state.itemskill_no_conditions == 1) + && sd->itemskill_id == sd->skillitem && sd->itemskill_lv == sd->skillitemlv) { + return 1; + } + if( pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->skillitem != skill_id ) { //GMs don't override the skillItem check, otherwise they can use items without them being consumed! [Skotlex] sd->state.arrow_atk = skill->get_ammotype(skill_id)?1:0; //Need to do arrow state check. @@ -15017,14 +15035,8 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski return 0; break; } - /* temporarily disabled, awaiting for kenpachi to detail this so we can make it work properly */ -#if 0 - if( sd->state.abra_flag ) // Casting finished (Hocus-Pocus) - return 1; -#endif - if( sd->skillitem == skill_id ) - return 1; - if( pc_is90overweight(sd) ) { + + if (pc_is90overweight(sd) && sd->skillitem != skill_id) { /// Skill casting items ignore the overweight restriction. [Kenpachi] clif->skill_fail(sd, skill_id, USESKILL_FAIL_WEIGHTOVER, 0, 0); return 0; } @@ -15197,6 +15209,9 @@ static int skill_consume_requirement(struct map_session_data *sd, uint16 skill_i nullpo_ret(sd); + if (sd->state.itemskill_no_conditions == 1 && sd->itemskill_id == sd->skillitem && sd->itemskill_lv == sd->skillitemlv) + return 1; + req = skill->get_requirement(sd,skill_id,skill_lv); if (type&1) { @@ -15206,8 +15221,9 @@ static int skill_consume_requirement(struct map_session_data *sd, uint16 skill_i req.sp = 0; break; default: - if( sd->state.autocast ) + if (sd->state.autocast == 1 || sd->skillitem == skill_id) /// Skill casting items and Hocus-Pocus skills don't consume SP. [Kenpachi] req.sp = 0; + break; } @@ -15285,12 +15301,6 @@ static struct skill_condition skill_get_requirement(struct map_session_data *sd, if( !sd ) return req; -#if 0 /* temporarily disabled, awaiting for kenpachi to detail this so we can make it work properly */ - if( sd->state.abra_flag ) -#else // not 0 - if( sd->skillitem == skill_id ) -#endif // 0 - return req; // Hocus-Pocus don't have requirements. sc = &sd->sc; if( !sc->count ) diff --git a/src/map/unit.c b/src/map/unit.c index 482440978..923438d78 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1041,11 +1041,19 @@ static int unit_stop_walking(struct block_list *bl, int flag) static int unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv) { - return unit->skilluse_id2( - src, target_id, skill_id, skill_lv, - skill->cast_fix(src, skill_id, skill_lv), - skill->get_castcancel(skill_id) - ); + int casttime = skill->cast_fix(src, skill_id, skill_lv); + int castcancel = skill->get_castcancel(skill_id); + int ret = unit->skilluse_id2(src, target_id, skill_id, skill_lv, casttime, castcancel); + struct map_session_data *sd = BL_CAST(BL_PC, src); + + if (sd != NULL) { + sd->itemskill_id = 0; + sd->itemskill_lv = 0; + sd->state.itemskill_conditions_checked = 0; + sd->state.itemskill_no_conditions = 0; + } + + return ret; } static int unit_is_walking(struct block_list *bl) @@ -1418,15 +1426,8 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill } } - if (sd) { - /* temporarily disabled, awaiting for kenpachi to detail this so we can make it work properly */ -#if 0 - if (sd->skillitem != skill_id && !skill->check_condition_castbegin(sd, skill_id, skill_lv)) -#else - if (!skill->check_condition_castbegin(sd, skill_id, skill_lv)) -#endif - return 0; - } + if (sd != NULL && skill->check_condition_castbegin(sd, skill_id, skill_lv) == 0) + return 0; if (src->type == BL_MOB) { const struct mob_data *src_md = BL_UCCAST(BL_MOB, src); @@ -1678,11 +1679,19 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill static int unit_skilluse_pos(struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv) { - return unit->skilluse_pos2( - src, skill_x, skill_y, skill_id, skill_lv, - skill->cast_fix(src, skill_id, skill_lv), - skill->get_castcancel(skill_id) - ); + int casttime = skill->cast_fix(src, skill_id, skill_lv); + int castcancel = skill->get_castcancel(skill_id); + int ret = unit->skilluse_pos2(src, skill_x, skill_y, skill_id, skill_lv, casttime, castcancel); + struct map_session_data *sd = BL_CAST(BL_PC, src); + + if (sd != NULL) { + sd->itemskill_id = 0; + sd->itemskill_lv = 0; + sd->state.itemskill_conditions_checked = 0; + sd->state.itemskill_no_conditions = 0; + } + + return ret; } static int unit_skilluse_pos2(struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv, int casttime, int castcancel) -- cgit v1.2.3-70-g09d2 From 38a504a04a2c864938ef3e105d0ce22332ff0b7a Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Mon, 20 Jan 2020 10:08:00 +0100 Subject: Added a new option flag to itemskill() script command, to be able to cast a skill without cast time. --- src/map/pc.h | 3 ++- src/map/script.c | 3 ++- src/map/script.h | 1 + src/map/unit.c | 13 +++++++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/pc.h b/src/map/pc.h index 4d7a7eef0..1540482c3 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -242,6 +242,7 @@ struct map_session_data { unsigned int lapine_ui : 1; unsigned int itemskill_conditions_checked : 1; // Used by itemskill() script command, to prevent second check of conditions after target was selected. unsigned int itemskill_no_conditions : 1; // Used by itemskill() script command, to ignore skill conditions and don't consume them. + unsigned int itemskill_no_casttime : 1; // Used by itemskill() script command, to cast skill instantaneously. } state; struct { unsigned char no_weapon_damage, no_magic_damage, no_misc_damage; @@ -647,7 +648,7 @@ END_ZEROED_BLOCK; VECTOR_DECL(int) title_ids; /* - * itemskill_conditions_checked/itemskill_no_conditions abuse prevention. + * itemskill_conditions_checked/itemskill_no_conditions/itemskill_no_casttime abuse prevention. * If a skill, casted by itemskill() script command, is aborted while target selection, * the map server gets no notification where these states could be unset. * Thus we need this helper variables to prevent abusing these states for next skill cast. diff --git a/src/map/script.c b/src/map/script.c index 470ad9408..acf9fb9ff 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11003,7 +11003,7 @@ static BUILDIN(itemskill) sd->skillitem=id; sd->skillitemlv=lv; - /// itemskill_conditions_checked/itemskill_no_conditions abuse prevention. + /// itemskill_conditions_checked/itemskill_no_conditions/itemskill_no_casttime abuse prevention. /// Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. sd->itemskill_id = id; sd->itemskill_lv = lv; @@ -11012,6 +11012,7 @@ static BUILDIN(itemskill) sd->state.itemskill_conditions_checked = 0; /// Skill casting items will check the conditions prior to the target selection in AEGIS. Thus we need a flag to prevent checking them twice. sd->state.itemskill_no_conditions = ((flag & ISF_IGNORECONDITIONS) == ISF_IGNORECONDITIONS) ? 1 : 0; /// Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. + sd->state.itemskill_no_casttime = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST) ? 1 : 0; /// /// Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. if (sd->state.itemskill_no_conditions == 0) { if (skill->check_condition_castbegin(sd, id, lv) == 0 || skill->check_condition_castend(sd, id, lv) == 0) diff --git a/src/map/script.h b/src/map/script.h index c981a895d..8167a9efd 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -570,6 +570,7 @@ enum mado_type { enum itemskill_flag { ISF_NONE = 0x00, ISF_IGNORECONDITIONS = 0x01, // Ignore skill conditions and don't consume them. + ISF_INSTANTCAST = 0x02, // Cast skill instantaneously. }; /** diff --git a/src/map/unit.c b/src/map/unit.c index 923438d78..ee721bb64 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1051,6 +1051,7 @@ static int unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_ sd->itemskill_lv = 0; sd->state.itemskill_conditions_checked = 0; sd->state.itemskill_no_conditions = 0; + sd->state.itemskill_no_casttime = 0; } return ret; @@ -1610,6 +1611,11 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill if (!ud->state.running) //need TK_RUN or WUGDASH handler to be done before that, see bugreport:6026 unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS);// even though this is not how official works but this will do the trick. bugreport:6829 + if (sd != NULL && sd->state.itemskill_no_casttime == 1 && sd->itemskill_id == sd->skillitem + && sd->itemskill_lv == sd->skillitemlv) { + casttime = 0; + } + // in official this is triggered even if no cast time. clif->useskill(src, src->id, target_id, 0,0, skill_id, skill_lv, casttime); if( casttime > 0 || temp ) @@ -1689,6 +1695,7 @@ static int unit_skilluse_pos(struct block_list *src, short skill_x, short skill_ sd->itemskill_lv = 0; sd->state.itemskill_conditions_checked = 0; sd->state.itemskill_no_conditions = 0; + sd->state.itemskill_no_casttime = 0; } return ret; @@ -1816,6 +1823,12 @@ static int unit_skilluse_pos2(struct block_list *src, short skill_x, short skill } unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS); + + if (sd != NULL && sd->state.itemskill_no_casttime == 1 && sd->itemskill_id == sd->skillitem + && sd->itemskill_lv == sd->skillitemlv) { + casttime = 0; + } + // in official this is triggered even if no cast time. clif->useskill(src, src->id, 0, skill_x, skill_y, skill_id, skill_lv, casttime); if( casttime > 0 ) { -- cgit v1.2.3-70-g09d2 From a67dddb0c21be9c6ceeb174db023d3b9db4a9db9 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Mon, 20 Jan 2020 10:30:03 +0100 Subject: Added a new option flag to itemskill() script command to be able to forcefully cast skill on on invoking character. --- src/map/clif.c | 8 +++++++- src/map/pc.h | 3 ++- src/map/script.c | 5 +++-- src/map/script.h | 1 + src/map/unit.c | 2 ++ 5 files changed, 15 insertions(+), 4 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/clif.c b/src/map/clif.c index 868117a96..50b81d25d 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6759,10 +6759,16 @@ static void clif_item_skill(struct map_session_data *sd, uint16 skill_id, uint16 nullpo_retv(sd); fd=sd->fd; + + int type = skill->get_inf(skill_id); + + if (sd->state.itemskill_castonself == 1 && sd->itemskill_id == sd->skillitem && sd->itemskill_lv == sd->skillitemlv) + type = INF_SELF_SKILL; + WFIFOHEAD(fd,packet_len(0x147)); WFIFOW(fd, 0)=0x147; WFIFOW(fd, 2)=skill_id; - WFIFOL(fd, 4)=skill->get_inf(skill_id); + WFIFOL(fd, 4) = type; WFIFOW(fd, 8)=skill_lv; WFIFOW(fd,10)=skill->get_sp(skill_id,skill_lv); WFIFOW(fd,12)=skill->get_range2(&sd->bl, skill_id,skill_lv); diff --git a/src/map/pc.h b/src/map/pc.h index 1540482c3..26e33a400 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -243,6 +243,7 @@ struct map_session_data { unsigned int itemskill_conditions_checked : 1; // Used by itemskill() script command, to prevent second check of conditions after target was selected. unsigned int itemskill_no_conditions : 1; // Used by itemskill() script command, to ignore skill conditions and don't consume them. unsigned int itemskill_no_casttime : 1; // Used by itemskill() script command, to cast skill instantaneously. + unsigned int itemskill_castonself : 1; // Used by itemskill() script command, to forcefully cast skill on invoking character. } state; struct { unsigned char no_weapon_damage, no_magic_damage, no_misc_damage; @@ -648,7 +649,7 @@ END_ZEROED_BLOCK; VECTOR_DECL(int) title_ids; /* - * itemskill_conditions_checked/itemskill_no_conditions/itemskill_no_casttime abuse prevention. + * itemskill_conditions_checked/itemskill_no_conditions/itemskill_no_casttime/itemskill_castonself abuse prevention. * If a skill, casted by itemskill() script command, is aborted while target selection, * the map server gets no notification where these states could be unset. * Thus we need this helper variables to prevent abusing these states for next skill cast. diff --git a/src/map/script.c b/src/map/script.c index acf9fb9ff..b51c1a915 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11003,7 +11003,7 @@ static BUILDIN(itemskill) sd->skillitem=id; sd->skillitemlv=lv; - /// itemskill_conditions_checked/itemskill_no_conditions/itemskill_no_casttime abuse prevention. + /// itemskill_conditions_checked/itemskill_no_conditions/itemskill_no_casttime/itemskill_castonself abuse prevention. /// Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. sd->itemskill_id = id; sd->itemskill_lv = lv; @@ -11013,6 +11013,7 @@ static BUILDIN(itemskill) sd->state.itemskill_conditions_checked = 0; /// Skill casting items will check the conditions prior to the target selection in AEGIS. Thus we need a flag to prevent checking them twice. sd->state.itemskill_no_conditions = ((flag & ISF_IGNORECONDITIONS) == ISF_IGNORECONDITIONS) ? 1 : 0; /// Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. sd->state.itemskill_no_casttime = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST) ? 1 : 0; /// /// Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. + sd->state.itemskill_castonself = ((flag & ISF_CASTONSELF) == ISF_CASTONSELF) ? 1 : 0; /// Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. if (sd->state.itemskill_no_conditions == 0) { if (skill->check_condition_castbegin(sd, id, lv) == 0 || skill->check_condition_castend(sd, id, lv) == 0) @@ -11021,7 +11022,7 @@ static BUILDIN(itemskill) sd->state.itemskill_conditions_checked = 1; /// Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. } - clif->item_skill(sd,id,lv); + clif->item_skill(sd, id, lv); return true; } /*========================================== diff --git a/src/map/script.h b/src/map/script.h index 8167a9efd..857d22c61 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -571,6 +571,7 @@ enum itemskill_flag { ISF_NONE = 0x00, ISF_IGNORECONDITIONS = 0x01, // Ignore skill conditions and don't consume them. ISF_INSTANTCAST = 0x02, // Cast skill instantaneously. + ISF_CASTONSELF = 0x04, // Forcefully cast skill on invoking character without showing the target selection cursor. }; /** diff --git a/src/map/unit.c b/src/map/unit.c index ee721bb64..3ad94d20a 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1052,6 +1052,7 @@ static int unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_ sd->state.itemskill_conditions_checked = 0; sd->state.itemskill_no_conditions = 0; sd->state.itemskill_no_casttime = 0; + sd->state.itemskill_castonself = 0; } return ret; @@ -1696,6 +1697,7 @@ static int unit_skilluse_pos(struct block_list *src, short skill_x, short skill_ sd->state.itemskill_conditions_checked = 0; sd->state.itemskill_no_conditions = 0; sd->state.itemskill_no_casttime = 0; + sd->state.itemskill_castonself = 0; } return ret; -- cgit v1.2.3-70-g09d2 From 7b003f2028906218bb6cff68e5e97ec47ad6681e Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Sun, 26 Jan 2020 21:52:43 +0100 Subject: Added pc_itemskill_clear() function. --- src/map/clif.c | 1 + src/map/pc.c | 21 +++++++++++++++++++++ src/map/pc.h | 1 + src/map/script.c | 11 +++++------ src/map/skill.c | 5 +++++ src/map/unit.c | 20 ++++---------------- 6 files changed, 37 insertions(+), 22 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/clif.c b/src/map/clif.c index 50b81d25d..24de61ec0 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -12932,6 +12932,7 @@ static void clif_parse_UseSkillMap(int fd, struct map_session_data *sd) pc->delinvincibletimer(sd); skill->castend_map(sd,skill_id,map_name); + pc->itemskill_clear(sd); } static void clif_parse_RequestMemo(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); diff --git a/src/map/pc.c b/src/map/pc.c index a404d93e7..c96e957c7 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5321,6 +5321,26 @@ static int pc_useitem(struct map_session_data *sd, int n) return 1; } +/** + * Sets state flags and helper variables, used by itemskill() script command, to 0. + * + * @param sd The character's session data. + * @return 0 if parameter sd is NULL, otherwise 1. + */ +static int pc_itemskill_clear(struct map_session_data *sd) +{ + nullpo_ret(sd); + + sd->itemskill_id = 0; + sd->itemskill_lv = 0; + sd->state.itemskill_conditions_checked = 0; + sd->state.itemskill_no_conditions = 0; + sd->state.itemskill_no_casttime = 0; + sd->state.itemskill_castonself = 0; + + return 1; +} + /*========================================== * Add item on cart for given index. * Return: @@ -12662,6 +12682,7 @@ void pc_defaults(void) pc->unequipitem_pos = pc_unequipitem_pos; pc->checkitem = pc_checkitem; pc->useitem = pc_useitem; + pc->itemskill_clear = pc_itemskill_clear; pc->skillatk_bonus = pc_skillatk_bonus; pc->skillheal_bonus = pc_skillheal_bonus; diff --git a/src/map/pc.h b/src/map/pc.h index 26e33a400..e940c3310 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -1034,6 +1034,7 @@ END_ZEROED_BLOCK; /* End */ void (*unequipitem_pos) (struct map_session_data *sd, int n, int pos); int (*checkitem) (struct map_session_data *sd); int (*useitem) (struct map_session_data *sd,int n); + int (*itemskill_clear) (struct map_session_data *sd); int (*skillatk_bonus) (struct map_session_data *sd, uint16 skill_id); int (*skillheal_bonus) (struct map_session_data *sd, uint16 skill_id); diff --git a/src/map/script.c b/src/map/script.c index b87a46785..c1eb2e8b7 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11007,7 +11007,7 @@ static BUILDIN(itemskill) int flag = script_hasdata(st, 4) ? script_getnum(st, 4) : ISF_NONE; - sd->state.itemskill_no_conditions = ((flag & ISF_IGNORECONDITIONS) == ISF_IGNORECONDITIONS) ? 1 : 0; // Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. + sd->state.itemskill_no_conditions = ((flag & ISF_IGNORECONDITIONS) == ISF_IGNORECONDITIONS) ? 1 : 0; // Unset in pc_itemskill_clear(). if (sd->state.itemskill_no_conditions == 0) { if (skill->check_condition_castbegin(sd, sd->skillitem, sd->skillitemlv) == 0 @@ -11015,14 +11015,13 @@ static BUILDIN(itemskill) return true; } - sd->state.itemskill_conditions_checked = 1; // Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. + sd->state.itemskill_conditions_checked = 1; // Unset in pc_itemskill_clear(). } - sd->state.itemskill_no_casttime = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST) ? 1 : 0; // Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. - sd->state.itemskill_castonself = ((flag & ISF_CASTONSELF) == ISF_CASTONSELF) ? 1 : 0; // Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. + sd->state.itemskill_no_casttime = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST) ? 1 : 0; // Unset in pc_itemskill_clear(). + sd->state.itemskill_castonself = ((flag & ISF_CASTONSELF) == ISF_CASTONSELF) ? 1 : 0; // Unset in pc_itemskill_clear(). - // itemskill_conditions_checked/itemskill_no_conditions/itemskill_no_casttime/itemskill_castonself abuse prevention. - // Unset in unit_skilluse_id()/unit_skilluse_pos() if skill was not aborted while target selection. + // itemskill_conditions_checked/itemskill_no_conditions/itemskill_no_casttime/itemskill_castonself abuse prevention. Unset in pc_itemskill_clear(). sd->itemskill_id = sd->skillitem; sd->itemskill_lv = sd->skillitemlv; diff --git a/src/map/skill.c b/src/map/skill.c index e853bcc1d..6f0cb424b 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4190,6 +4190,11 @@ static void skill_castend_type(int type, struct block_list *src, struct block_li skill->castend_damage_id(src, bl, skill_id, skill_lv, tick, flag); break; } + + struct map_session_data *sd = BL_CAST(BL_PC, src); + + if (sd != NULL) + pc->itemskill_clear(sd); } /*========================================== diff --git a/src/map/unit.c b/src/map/unit.c index 3ad94d20a..0a6008247 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1046,14 +1046,8 @@ static int unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_ int ret = unit->skilluse_id2(src, target_id, skill_id, skill_lv, casttime, castcancel); struct map_session_data *sd = BL_CAST(BL_PC, src); - if (sd != NULL) { - sd->itemskill_id = 0; - sd->itemskill_lv = 0; - sd->state.itemskill_conditions_checked = 0; - sd->state.itemskill_no_conditions = 0; - sd->state.itemskill_no_casttime = 0; - sd->state.itemskill_castonself = 0; - } + if (sd != NULL) + pc->itemskill_clear(sd); return ret; } @@ -1691,14 +1685,8 @@ static int unit_skilluse_pos(struct block_list *src, short skill_x, short skill_ int ret = unit->skilluse_pos2(src, skill_x, skill_y, skill_id, skill_lv, casttime, castcancel); struct map_session_data *sd = BL_CAST(BL_PC, src); - if (sd != NULL) { - sd->itemskill_id = 0; - sd->itemskill_lv = 0; - sd->state.itemskill_conditions_checked = 0; - sd->state.itemskill_no_conditions = 0; - sd->state.itemskill_no_casttime = 0; - sd->state.itemskill_castonself = 0; - } + if (sd != NULL) + pc->itemskill_clear(sd); return ret; } -- cgit v1.2.3-70-g09d2 From 29dfb34968fe42945bad712ce3ac8806d49ba473 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Sun, 26 Jan 2020 23:33:39 +0100 Subject: Added skill_is_item_skill() function. --- src/map/clif.c | 2 +- src/map/skill.c | 23 ++++++++++++++++++++--- src/map/skill.h | 1 + src/map/unit.c | 8 ++------ 4 files changed, 24 insertions(+), 10 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/clif.c b/src/map/clif.c index 24de61ec0..23fc3a74d 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6762,7 +6762,7 @@ static void clif_item_skill(struct map_session_data *sd, uint16 skill_id, uint16 int type = skill->get_inf(skill_id); - if (sd->state.itemskill_castonself == 1 && sd->itemskill_id == sd->skillitem && sd->itemskill_lv == sd->skillitemlv) + if (sd->state.itemskill_castonself == 1 && skill->is_item_skill(sd, skill_id, skill_lv)) type = INF_SELF_SKILL; WFIFOHEAD(fd,packet_len(0x147)); diff --git a/src/map/skill.c b/src/map/skill.c index 6f0cb424b..a8dbefbd7 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -13994,6 +13994,22 @@ static bool skill_is_combo(int skill_id) return false; } +/** + * Checks if a skill is casted by an item (itemskill() script command). + * + * @param sd The charcater's session data. + * @param skill_id The skill's ID. + * @param skill_lv The skill's level. + * @return true if skill is casted by an item, otherwise false. + */ +static bool skill_is_item_skill(struct map_session_data *sd, int skill_id, int skill_lv) +{ + nullpo_retr(false, sd); + + return (sd->skillitem == skill_id && sd->skillitemlv == skill_lv + && sd->itemskill_id == skill_id && sd->itemskill_lv == skill_lv); +} + static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv) { struct status_data *st; @@ -14009,7 +14025,7 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s return 0; if ((sd->state.itemskill_conditions_checked == 1 || sd->state.itemskill_no_conditions == 1) - && sd->itemskill_id == sd->skillitem && sd->itemskill_lv == sd->skillitemlv) { + && skill->is_item_skill(sd, skill_id, skill_lv)) { return 1; } @@ -14998,7 +15014,7 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski return 0; if ((sd->state.itemskill_conditions_checked == 1 || sd->state.itemskill_no_conditions == 1) - && sd->itemskill_id == sd->skillitem && sd->itemskill_lv == sd->skillitemlv) { + && skill->is_item_skill(sd, skill_id, skill_lv)) { return 1; } @@ -15203,7 +15219,7 @@ static int skill_consume_requirement(struct map_session_data *sd, uint16 skill_i nullpo_ret(sd); - if (sd->state.itemskill_no_conditions == 1 && sd->itemskill_id == sd->skillitem && sd->itemskill_lv == sd->skillitemlv) + if (sd->state.itemskill_no_conditions == 1 && skill->is_item_skill(sd, skill_id, skill_lv)) return 1; req = skill->get_requirement(sd,skill_id,skill_lv); @@ -21611,6 +21627,7 @@ void skill_defaults(void) skill->cast_fix_sc = skill_castfix_sc; skill->vf_cast_fix = skill_vfcastfix; skill->delay_fix = skill_delay_fix; + skill->is_item_skill = skill_is_item_skill; skill->check_condition_castbegin = skill_check_condition_castbegin; skill->check_condition_castend = skill_check_condition_castend; skill->consume_requirement = skill_consume_requirement; diff --git a/src/map/skill.h b/src/map/skill.h index 188a1c927..eff9ed7fc 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -2019,6 +2019,7 @@ struct skill_interface { int (*cast_fix_sc) ( struct block_list *bl, int time); int (*vf_cast_fix) ( struct block_list *bl, double time, uint16 skill_id, uint16 skill_lv); int (*delay_fix) ( struct block_list *bl, uint16 skill_id, uint16 skill_lv); + bool (*is_item_skill) (struct map_session_data *sd, int skill_id, int skill_lv); int (*check_condition_castbegin) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); int (*check_condition_castend) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); int (*consume_requirement) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, short type); diff --git a/src/map/unit.c b/src/map/unit.c index 0a6008247..29a01aea7 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1606,10 +1606,8 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill if (!ud->state.running) //need TK_RUN or WUGDASH handler to be done before that, see bugreport:6026 unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS);// even though this is not how official works but this will do the trick. bugreport:6829 - if (sd != NULL && sd->state.itemskill_no_casttime == 1 && sd->itemskill_id == sd->skillitem - && sd->itemskill_lv == sd->skillitemlv) { + if (sd != NULL && sd->state.itemskill_no_casttime == 1 && skill->is_item_skill(sd, skill_id, skill_lv)) casttime = 0; - } // in official this is triggered even if no cast time. clif->useskill(src, src->id, target_id, 0,0, skill_id, skill_lv, casttime); @@ -1814,10 +1812,8 @@ static int unit_skilluse_pos2(struct block_list *src, short skill_x, short skill unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS); - if (sd != NULL && sd->state.itemskill_no_casttime == 1 && sd->itemskill_id == sd->skillitem - && sd->itemskill_lv == sd->skillitemlv) { + if (sd != NULL && sd->state.itemskill_no_casttime == 1 && skill->is_item_skill(sd, skill_id, skill_lv)) casttime = 0; - } // in official this is triggered even if no cast time. clif->useskill(src, src->id, 0, skill_x, skill_y, skill_id, skill_lv, casttime); -- cgit v1.2.3-70-g09d2 From 0c99331676fc31cc040c78393d90b52f32128103 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Thu, 5 Mar 2020 07:21:23 +0100 Subject: Fix conditions to call pc_itemskill_clear() function --- src/map/unit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 29a01aea7..ee6159959 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1046,7 +1046,7 @@ static int unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_ int ret = unit->skilluse_id2(src, target_id, skill_id, skill_lv, casttime, castcancel); struct map_session_data *sd = BL_CAST(BL_PC, src); - if (sd != NULL) + if (sd != NULL && (ret == 0 || !skill->is_item_skill(sd, skill_id, skill_lv))) pc->itemskill_clear(sd); return ret; @@ -1683,7 +1683,7 @@ static int unit_skilluse_pos(struct block_list *src, short skill_x, short skill_ int ret = unit->skilluse_pos2(src, skill_x, skill_y, skill_id, skill_lv, casttime, castcancel); struct map_session_data *sd = BL_CAST(BL_PC, src); - if (sd != NULL) + if (sd != NULL && (ret == 0 || !skill->is_item_skill(sd, skill_id, skill_lv))) pc->itemskill_clear(sd); return ret; -- cgit v1.2.3-70-g09d2 From a51003dda282a5aeed0e63b93b8a213acd82cafb Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 18:37:05 +0200 Subject: Refactor unit->bl2ud --- src/map/unit.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 29a01aea7..f0125ec79 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -76,15 +76,26 @@ struct unit_interface *unit; **/ static struct unit_data *unit_bl2ud(struct block_list *bl) { - if (bl == NULL) return NULL; - if (bl->type == BL_PC) return &BL_UCAST(BL_PC, bl)->ud; - if (bl->type == BL_MOB) return &BL_UCAST(BL_MOB, bl)->ud; - if (bl->type == BL_PET) return &BL_UCAST(BL_PET, bl)->ud; - if (bl->type == BL_NPC) return BL_UCAST(BL_NPC, bl)->ud; - if (bl->type == BL_HOM) return &BL_UCAST(BL_HOM, bl)->ud; - if (bl->type == BL_MER) return &BL_UCAST(BL_MER, bl)->ud; - if (bl->type == BL_ELEM) return &BL_UCAST(BL_ELEM, bl)->ud; - return NULL; + if (bl == NULL) + return NULL; + switch (bl->type) { + case BL_PC: + return &BL_UCAST(BL_PC, bl)->ud; + case BL_MOB: + return &BL_UCAST(BL_MOB, bl)->ud; + case BL_PET: + return &BL_UCAST(BL_PET, bl)->ud; + case BL_NPC: + return BL_UCAST(BL_NPC, bl)->ud; + case BL_HOM: + return &BL_UCAST(BL_HOM, bl)->ud; + case BL_MER: + return &BL_UCAST(BL_MER, bl)->ud; + case BL_ELEM: + return &BL_UCAST(BL_ELEM, bl)->ud; + default: + return NULL; + } } /** -- cgit v1.2.3-70-g09d2 From d4a40467c5fb99b34b235a7fa8cde423fbdf24c0 Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 18:39:58 +0200 Subject: Add documentation for unit->walktoxy_sub --- src/map/unit.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index f0125ec79..db4fc47e7 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -116,6 +116,11 @@ static struct unit_data *unit_bl2ud2(struct block_list *bl) return unit->bl2ud(bl); } +/** + * TODO: understand purpose of this function + * @param bl block_list to process + * @return 0: success, 1: fail, 2: nullpointer + */ static int unit_walktoxy_sub(struct block_list *bl) { int i; -- cgit v1.2.3-70-g09d2 From 0ca593266e3d7f78eb4648ffe7bad7a7db9b6490 Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 18:47:06 +0200 Subject: Move declarations to initializations in unit->walktoxy_sub --- src/map/unit.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index db4fc47e7..12d53df13 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -124,14 +124,12 @@ static struct unit_data *unit_bl2ud2(struct block_list *bl) static int unit_walktoxy_sub(struct block_list *bl) { int i; - struct walkpath_data wpd; - struct unit_data *ud = NULL; - - nullpo_retr(1, bl); - ud = unit->bl2ud(bl); - if(ud == NULL) return 0; + nullpo_retr(2, bl); + struct unit_data *ud = unit->bl2ud(bl); + if (ud == NULL) + return 2; - memset(&wpd, 0, sizeof(wpd)); + struct walkpath_data wpd = {0}; if( !path->search(&wpd,bl,bl->m,bl->x,bl->y,ud->to_x,ud->to_y,ud->state.walk_easy,CELL_CHKNOPASS) ) return 0; @@ -143,7 +141,7 @@ static int unit_walktoxy_sub(struct block_list *bl) return 0; #endif - memcpy(&ud->walkpath,&wpd,sizeof(wpd)); + ud->walkpath = wpd; if (ud->target_to && ud->chaserange>1) { //Generally speaking, the walk path is already to an adjacent tile -- cgit v1.2.3-70-g09d2 From f4039d8b2c28b06b160fa44e27908856646633a7 Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 19:09:16 +0200 Subject: Rename reused var appropriately in unit->walktoxy_sub --- src/map/unit.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 12d53df13..d6eb6c30f 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -123,7 +123,6 @@ static struct unit_data *unit_bl2ud2(struct block_list *bl) */ static int unit_walktoxy_sub(struct block_list *bl) { - int i; nullpo_retr(2, bl); struct unit_data *ud = unit->bl2ud(bl); if (ud == NULL) @@ -147,9 +146,9 @@ static int unit_walktoxy_sub(struct block_list *bl) //Generally speaking, the walk path is already to an adjacent tile //so we only need to shorten the path if the range is greater than 1. - //Trim the last part of the path to account for range, - //but always move at least one cell when requested to move. - for (i = (ud->chaserange*10)-10; i > 0 && ud->walkpath.path_len>1;) { + // Trim the last part of the path to account for range, + // but always move at least one cell when requested to move. + for (int i = ud->chaserange * 10 - 10; i > 0 && ud->walkpath.path_len > 1;) { uint8 dir; ud->walkpath.path_len--; dir = ud->walkpath.path[ud->walkpath.path_len]; @@ -171,14 +170,16 @@ static int unit_walktoxy_sub(struct block_list *bl) } clif->move(ud); - if(ud->walkpath.path_pos>=ud->walkpath.path_len) - i = -1; - else if(ud->walkpath.path[ud->walkpath.path_pos]&1) - i = status->get_speed(bl)*MOVE_DIAGONAL_COST/MOVE_COST; + int timer_delay; + if (ud->walkpath.path_pos >= ud->walkpath.path_len) + timer_delay = -1; + else if ((ud->walkpath.path[ud->walkpath.path_pos] & 1) != 0) + timer_delay = status->get_speed(bl) * MOVE_DIAGONAL_COST / MOVE_COST; else - i = status->get_speed(bl); - if( i > 0) - ud->walktimer = timer->add(timer->gettick()+i,unit->walktoxy_timer,bl->id,i); + timer_delay = status->get_speed(bl); + + if (timer_delay > 0) + ud->walktimer = timer->add(timer->gettick() + timer_delay, unit->walktoxy_timer, bl->id, 0); //TODO: check if unit->walktoxy_timer uses any intptr data return 1; } -- cgit v1.2.3-70-g09d2 From 2351fb29487eb11df3c9d563f5ade84ece4e8d0b Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 19:12:15 +0200 Subject: Update Coding Style in unit->walktoxy_sub --- src/map/unit.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index d6eb6c30f..d1abed1d0 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -130,21 +130,22 @@ static int unit_walktoxy_sub(struct block_list *bl) struct walkpath_data wpd = {0}; - if( !path->search(&wpd,bl,bl->m,bl->x,bl->y,ud->to_x,ud->to_y,ud->state.walk_easy,CELL_CHKNOPASS) ) + if (!path->search(&wpd, bl, bl->m, bl->x, bl->y, ud->to_x, ud->to_y, ud->state.walk_easy, CELL_CHKNOPASS)) return 0; #ifdef OFFICIAL_WALKPATH - if( !path->search_long(NULL, bl, bl->m, bl->x, bl->y, ud->to_x, ud->to_y, CELL_CHKNOPASS) // Check if there is an obstacle between - && wpd.path_len > 14 // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett] - && (bl->type != BL_NPC) ) // If type is a NPC, please disregard. + if (bl->type != BL_NPC // If type is an NPC, disregard. + && !path->search_long(NULL, bl, bl->m, bl->x, bl->y, ud->to_x, ud->to_y, CELL_CHKNOPASS) // Check if there is an obstacle between + && wpd.path_len > 14) { // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett] return 0; + } #endif ud->walkpath = wpd; - if (ud->target_to && ud->chaserange>1) { - //Generally speaking, the walk path is already to an adjacent tile - //so we only need to shorten the path if the range is greater than 1. + if (ud->target_to != 0 && ud->chaserange > 1) { + // Generally speaking, the walk path is already to an adjacent tile + // so we only need to shorten the path if the range is greater than 1. // Trim the last part of the path to account for range, // but always move at least one cell when requested to move. @@ -152,8 +153,8 @@ static int unit_walktoxy_sub(struct block_list *bl) uint8 dir; ud->walkpath.path_len--; dir = ud->walkpath.path[ud->walkpath.path_len]; - if (dir&1) - i -= MOVE_COST*20; //When chasing, units will target a diamond-shaped area in range [Playtester] + if ((dir & 1) != 0) + i -= MOVE_COST * 20; // When chasing, units will target a diamond-shaped area in range [Playtester] else i -= MOVE_COST; ud->to_x -= dirx[dir]; @@ -161,7 +162,7 @@ static int unit_walktoxy_sub(struct block_list *bl) } } - ud->state.change_walk_target=0; + ud->state.change_walk_target = 0; if (bl->type == BL_PC) { struct map_session_data *sd = BL_UCAST(BL_PC, bl); -- cgit v1.2.3-70-g09d2 From 4e0b33282d2f8914fa5e425f65d6e15f8bd86526 Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 19:15:04 +0200 Subject: Change returning error-code in unit->walktoxy_sub --- src/map/unit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index d1abed1d0..d8d4f1144 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -131,13 +131,13 @@ static int unit_walktoxy_sub(struct block_list *bl) struct walkpath_data wpd = {0}; if (!path->search(&wpd, bl, bl->m, bl->x, bl->y, ud->to_x, ud->to_y, ud->state.walk_easy, CELL_CHKNOPASS)) - return 0; + return 1; #ifdef OFFICIAL_WALKPATH if (bl->type != BL_NPC // If type is an NPC, disregard. && !path->search_long(NULL, bl, bl->m, bl->x, bl->y, ud->to_x, ud->to_y, CELL_CHKNOPASS) // Check if there is an obstacle between && wpd.path_len > 14) { // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett] - return 0; + return 1; } #endif @@ -181,7 +181,7 @@ static int unit_walktoxy_sub(struct block_list *bl) if (timer_delay > 0) ud->walktimer = timer->add(timer->gettick() + timer_delay, unit->walktoxy_timer, bl->id, 0); //TODO: check if unit->walktoxy_timer uses any intptr data - return 1; + return 0; } /** -- cgit v1.2.3-70-g09d2 From 5a6b00556a6787b62a6b0f8b61929249db02ac33 Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 19:18:32 +0200 Subject: Update error-code and some Coding Style in unit->step_timer --- src/map/unit.c | 56 +++++++++++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 33 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index d8d4f1144..5f8ff0c42 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -189,40 +189,33 @@ static int unit_walktoxy_sub(struct block_list *bl) * @param tid: Timer ID * @param tick: Unused * @param id: ID of bl to do the action - * @param data: Not used - * @return 1: Success 0: Fail (No valid bl) + * @param data: Unused + * @return 0: success, 1: fail, 2: nullpointer */ static int unit_step_timer(int tid, int64 tick, int id, intptr_t data) { - struct block_list *bl; - struct unit_data *ud; - int target_id; - - bl = map->id2bl(id); - - if (!bl || bl->prev == NULL) - return 0; - - ud = unit->bl2ud(bl); - - if(!ud) - return 0; + struct block_list *bl = map->id2bl(id); + if (bl == NULL || bl->prev == NULL) + return 2; + struct unit_data *ud = unit->bl2ud(bl); + if (ud == NULL) + return 2; - if(ud->steptimer != tid) { - ShowError("unit_step_timer mismatch %d != %d\n",ud->steptimer,tid); - return 0; + if (ud->steptimer != tid) { + ShowError("unit_step_timer mismatch %d != %d\n", ud->steptimer, tid); + return 1; } ud->steptimer = INVALID_TIMER; - if(!ud->stepaction) - return 0; + if (!ud->stepaction) + return 1; //Set to false here because if an error occurs, it should not be executed again ud->stepaction = false; - if(!ud->target_to) - return 0; + if (ud->target_to == 0) + return 1; //Flush target_to as it might contain map coordinates which should not be used by other functions target_id = ud->target_to; @@ -237,19 +230,16 @@ static int unit_step_timer(int tid, int64 tick, int id, intptr_t data) } else { //If a player has target_id set and target is in range, attempt attack struct block_list *tbl = map->id2bl(target_id); - if (!tbl || !status->check_visibility(bl, tbl)) { - return 0; - } - if(ud->stepskill_id == 0) { - //Execute normal attack - unit->attack(bl, tbl->id, (ud->state.attack_continue) + 2); - } else { - //Execute non-ground skill - unit->skilluse_id(bl, tbl->id, ud->stepskill_id, ud->stepskill_lv); - } + nullpo_retr(2, tbl); + if (status->check_visibility(bl, tbl) == 0) // Target not visible + return 1; + if (ud->stepskill_id == 0) + unit->attack(bl, tbl->id, ud->state.attack_continue + 2); // Execute normal attack + else + unit->skilluse_id(bl, tbl->id, ud->stepskill_id, ud->stepskill_lv); // Execute non-ground skill } - return 1; + return 0; } static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) -- cgit v1.2.3-70-g09d2 From cd0a421095215933f40b20f9b1108b03f4f51dca Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 19:20:12 +0200 Subject: Update Coding Style in unit->step_timer --- src/map/unit.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 5f8ff0c42..eb9bd9e37 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -211,24 +211,24 @@ static int unit_step_timer(int tid, int64 tick, int id, intptr_t data) if (!ud->stepaction) return 1; - //Set to false here because if an error occurs, it should not be executed again + // Set to false here because if an error occurs, it should not be executed again ud->stepaction = false; if (ud->target_to == 0) return 1; - //Flush target_to as it might contain map coordinates which should not be used by other functions - target_id = ud->target_to; + // Flush target_to as it might contain map coordinates which should not be used by other functions + int target_id = ud->target_to; ud->target_to = 0; - //If stepaction is set then we remembered a client request that should be executed on the next step - //Execute request now if target is in attack range - if(ud->stepskill_id && skill->get_inf(ud->stepskill_id) & INF_GROUND_SKILL) { - //Execute ground skill + // If stepaction is set then we remembered a client request that should be executed on the next step + // Execute request now if target is in attack range + if (ud->stepskill_id != 0 && (skill->get_inf(ud->stepskill_id) & INF_GROUND_SKILL) != 0) { + // Execute ground skill struct map_data *md = &map->list[bl->m]; - unit->skilluse_pos(bl, target_id%md->xs, target_id/md->xs, ud->stepskill_id, ud->stepskill_lv); + unit->skilluse_pos(bl, target_id % md->xs, target_id / md->xs, ud->stepskill_id, ud->stepskill_lv); } else { - //If a player has target_id set and target is in range, attempt attack + // If a player has target_id set and target is in range, attempt attack struct block_list *tbl = map->id2bl(target_id); nullpo_retr(2, tbl); if (status->check_visibility(bl, tbl) == 0) // Target not visible -- cgit v1.2.3-70-g09d2 From fe378985d5267bee1f73049c826ad4f1e9c2b9c4 Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 19:45:53 +0200 Subject: Refactor unit_walktoxy_timer --- src/map/unit.c | 314 +++++++++++++++++++++++++++++---------------------------- src/map/unit.h | 1 + 2 files changed, 159 insertions(+), 156 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index eb9bd9e37..235a843eb 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -242,226 +242,226 @@ static int unit_step_timer(int tid, int64 tick, int id, intptr_t data) return 0; } -static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) +/** + * Warps homunuculus or mercenary towards his master in case he's too far away for 3 seconds. + * @param master_bl: block_list of master + * @param slave_bl: block_list of homunuculus/mercenary master owns + * @return 0: success, 1: fail + */ +static int unit_warpto_master(struct block_list *master_bl, struct block_list *slave_bl) { - int i; - int x,y,dx,dy; - unsigned char icewall_walk_block; - uint8 dir; - struct block_list *bl; - struct map_session_data *sd; - struct mob_data *md; - struct unit_data *ud; - struct mercenary_data *mrd; + nullpo_retr(1, master_bl); + nullpo_retr(1, slave_bl); + int64 *masterteleport_timer; + struct homun_data *hd = BL_CAST(BL_HOM, slave_bl); + struct mercenary_data *md = BL_CAST(BL_MER, slave_bl); + + bool check = true; + if (hd != NULL) { + masterteleport_timer = &hd->masterteleport_timer; + check = homun_alive(hd); + } else if (md != NULL) { + masterteleport_timer = &md->masterteleport_timer; + } else { + return 1; + } - bl = map->id2bl(id); - if(bl == NULL) - return 0; - sd = BL_CAST(BL_PC, bl); - md = BL_CAST(BL_MOB, bl); - mrd = BL_CAST(BL_MER, bl); - ud = unit->bl2ud(bl); + if (check && !check_distance_bl(master_bl, slave_bl, MAX_MER_DISTANCE)) { + if (*masterteleport_timer == 0) { + *masterteleport_timer = timer->gettick(); + return 0; + } else if (DIFF_TICK(timer->gettick(), *masterteleport_timer) > 3000) { + unit->warp(slave_bl, master_bl->m, master_bl->x, master_bl->y, CLR_TELEPORT); + } + } + *masterteleport_timer = 0; // resets tick in case he isn't far anymore. - if(ud == NULL) return 0; + return 0; +} + +/** + * Timer for walking to target coordinates or object. + * @param tid: timer id + * @param tick: tick + * @param id: id of bl to do the action + * @param data: unused + * @return 0: success, 1: fail + */ +static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) +{ + struct block_list *bl = map->id2bl(id); + if (bl == NULL || bl->prev == NULL) // Stop moved because it is missing from the block_list + return 1; + struct unit_data *ud = unit->bl2ud(bl); + if (ud == NULL) + return 1; - if(ud->walktimer != tid){ + if (ud->walktimer != tid) { ShowError("unit_walk_timer mismatch %d != %d\n",ud->walktimer,tid); - return 0; + return 1; } ud->walktimer = INVALID_TIMER; - if (bl->prev == NULL) return 0; // Stop moved because it is missing from the block_list - if(ud->walkpath.path_pos>=ud->walkpath.path_len) - return 0; + if (ud->walkpath.path_pos >= ud->walkpath.path_len) + return 1; - if(ud->walkpath.path[ud->walkpath.path_pos]>=8) + uint8 dir = ud->walkpath.path[ud->walkpath.path_pos]; + if (ud->walkpath.path[ud->walkpath.path_pos] >= 8) return 1; - x = bl->x; - y = bl->y; + int x = bl->x; + int y = bl->y; - dir = ud->walkpath.path[ud->walkpath.path_pos]; ud->dir = dir; - dx = dirx[(int)dir]; - dy = diry[(int)dir]; + int dx = dirx[(int) dir]; + int dy = diry[(int) dir]; - //Get icewall walk block depending on boss mode (players can't be trapped) - if(md && md->status.mode&MD_BOSS) - icewall_walk_block = battle_config.boss_icewall_walk_block; - else if(md) - icewall_walk_block = battle_config.mob_icewall_walk_block; - else - icewall_walk_block = 0; + // Get icewall walk block depending on boss mode (players can't be trapped) + unsigned char icewall_walk_block = 0; + struct mob_data *md = BL_CAST(BL_MOB, bl); + if (md != NULL) { + if ((md->status.mode & MD_BOSS) != 0) + icewall_walk_block = battle_config.boss_icewall_walk_block; + else + icewall_walk_block = battle_config.mob_icewall_walk_block; + } - //Monsters will walk into an icewall from the west and south if they already started walking + // Monsters will walk into an icewall from the west and south if they already started walking if (map->getcell(bl->m, bl, x + dx, y + dy, CELL_CHKNOPASS) && (icewall_walk_block == 0 || !map->getcell(bl->m, bl, x + dx, y + dy, CELL_CHKICEWALL) || dx < 0 || dy < 0)) return unit->walktoxy_sub(bl); - //Monsters can only leave icewalls to the west and south - //But if movement fails more than icewall_walk_block times, they can ignore this rule - if (md && md->walktoxy_fail_count < icewall_walk_block && map->getcell(bl->m, bl, x, y, CELL_CHKICEWALL) && (dx > 0 || dy > 0)) { - //Needs to be done here so that rudeattack skills are invoked + // Monsters can only leave icewalls to the west and south + // But if movement fails more than icewall_walk_block times, they can ignore this rule + if (md != NULL && md->walktoxy_fail_count < icewall_walk_block && map->getcell(bl->m, bl, x, y, CELL_CHKICEWALL) != 0 && (dx > 0 || dy > 0)) { + // Needs to be done here so that rudeattack skills are invoked md->walktoxy_fail_count++; clif->fixpos(bl); - //Monsters in this situation first use a chase skill, then unlock target and then use an idle skill - if (!(++ud->walk_count%WALK_SKILL_INTERVAL)) + // Monsters in this situation first use a chase skill, then unlock target and then use an idle skill + if ((++ud->walk_count % WALK_SKILL_INTERVAL) == 0) mob->skill_use(md, tick, -1); mob->unlocktarget(md, tick); - if (!(++ud->walk_count%WALK_SKILL_INTERVAL)) + if ((++ud->walk_count % WALK_SKILL_INTERVAL) != 0) mob->skill_use(md, tick, -1); - return 0; + return 1; } + struct map_session_data *sd = BL_CAST(BL_PC, bl); //Refresh view for all those we lose sight - map->foreachinmovearea(clif->outsight, bl, AREA_SIZE, dx, dy, sd?BL_ALL:BL_PC, bl); + map->foreachinmovearea(clif->outsight, bl, AREA_SIZE, dx, dy, (sd != NULL ? BL_ALL : BL_PC), bl); x += dx; y += dy; map->moveblock(bl, x, y, tick); - ud->walk_count++; //walked cell counter, to be used for walk-triggered skills. [Skotlex] + ud->walk_count++; // walked cell counter, to be used for walk-triggered skills. [Skotlex] status_change_end(bl, SC_ROLLINGCUTTER, INVALID_TIMER); //If you move, you lose your counters. [malufett] if (bl->x != x || bl->y != y || ud->walktimer != INVALID_TIMER) - return 0; //map->moveblock has altered the object beyond what we expected (moved/warped it) + return 1; // map->moveblock has altered the object beyond what we expected (moved/warped it) ud->walktimer = -2; // arbitrary non-INVALID_TIMER value to make the clif code send walking packets - map->foreachinmovearea(clif->insight, bl, AREA_SIZE, -dx, -dy, sd?BL_ALL:BL_PC, bl); + map->foreachinmovearea(clif->insight, bl, AREA_SIZE, -dx, -dy, (sd != NULL ? BL_ALL : BL_PC), bl); ud->walktimer = INVALID_TIMER; - if(sd) { - if( sd->touching_id ) - npc->touchnext_areanpc(sd,false); + struct mercenary_data *mrd = BL_CAST(BL_MER, bl); + if (sd != NULL) { + if (sd->touching_id != 0) + npc->touchnext_areanpc(sd, false); if (map->getcell(bl->m, bl, x, y, CELL_CHKNPC)) { - npc->touch_areanpc(sd,bl->m,x,y); + npc->touch_areanpc(sd, bl->m, x, y); if (bl->prev == NULL) //Script could have warped char, abort remaining of the function. return 0; - } else + } else { npc->untouch_areanpc(sd, bl->m, x, y); - - if( sd->md ) { // mercenary should be warped after being 3 seconds too far from the master [greenbox] - if( !check_distance_bl(&sd->bl, &sd->md->bl, MAX_MER_DISTANCE) ) { - if (sd->md->masterteleport_timer == 0) - sd->md->masterteleport_timer = timer->gettick(); - else if (DIFF_TICK(timer->gettick(), sd->md->masterteleport_timer) > 3000) { - sd->md->masterteleport_timer = 0; - unit->warp( &sd->md->bl, sd->bl.m, sd->bl.x, sd->bl.y, CLR_TELEPORT ); - } - } else // reset the tick, he is not far anymore - sd->md->masterteleport_timer = 0; - } - if( sd->hd ) { - if( homun_alive(sd->hd) && !check_distance_bl(&sd->bl, &sd->hd->bl, MAX_MER_DISTANCE) ) { - if (sd->hd->masterteleport_timer == 0) - sd->hd->masterteleport_timer = timer->gettick(); - else if (DIFF_TICK(timer->gettick(), sd->hd->masterteleport_timer) > 3000) { - sd->hd->masterteleport_timer = 0; - unit->warp( &sd->hd->bl, sd->bl.m, sd->bl.x, sd->bl.y, CLR_TELEPORT ); - } - } else - sd->hd->masterteleport_timer = 0; } + + if (sd->md != NULL) // mercenary should be warped after being 3 seconds too far from the master [greenbox] + unit->warpto_master(bl, &sd->md->bl); + if (sd->hd != NULL) + unit->warpto_master(bl, &sd->hd->bl); } else if (md) { - //Movement was successful, reset walktoxy_fail_count + // Movement was successful, reset walktoxy_fail_count md->walktoxy_fail_count = 0; - if (map->getcell(bl->m, bl, x, y, CELL_CHKNPC)) { - if( npc->touch_areanpc2(md) ) return 0; // Warped - } else + + if (map->getcell(bl->m, bl, x, y, CELL_CHKNPC) != 0 && npc->touch_areanpc2(md)) + return 0; // Warped + else md->areanpc_id = 0; - if (md->min_chase > md->db->range3) md->min_chase--; - //Walk skills are triggered regardless of target due to the idle-walk mob state. - //But avoid triggering on stop-walk calls. - if (tid != INVALID_TIMER - && !(ud->walk_count%WALK_SKILL_INTERVAL) - && map->list[bl->m].users > 0 - && mob->skill_use(md, tick, -1) - ) { + + if (md->min_chase > md->db->range3) + md->min_chase--; + // Walk skills are triggered regardless of target due to the idle-walk mob state. + // But avoid triggering on stop-walk calls. + if (tid != INVALID_TIMER && (ud->walk_count % WALK_SKILL_INTERVAL) == 0 + && map->list[bl->m].users > 0 && mob->skill_use(md, tick, -1) == 1) { + // Walk skills are supposed to be used while walking if (!(ud->skill_id == NPC_SELFDESTRUCTION && ud->skilltimer != INVALID_TIMER) - && md->state.skillstate != MSS_WALK //Walk skills are supposed to be used while walking - ) { - //Skill used, abort walking - clif->fixpos(bl); //Fix position as walk has been canceled. - return 0; + && md->state.skillstate != MSS_WALK) { + // Skill used, abort walking + clif->fixpos(bl); // Fix position as walk has been canceled. + return 1; } - //Resend walk packet for proper Self Destruction display. + // Resend walk packet for proper Self Destruction display. clif->move(ud); } - } - else if( mrd && mrd->master ) - { - if (!check_distance_bl(&mrd->master->bl, bl, MAX_MER_DISTANCE)) - { - // mercenary should be warped after being 3 seconds too far from the master [greenbox] - if (mrd->masterteleport_timer == 0) - { - mrd->masterteleport_timer = timer->gettick(); - } - else if (DIFF_TICK(timer->gettick(), mrd->masterteleport_timer) > 3000) - { - mrd->masterteleport_timer = 0; - unit->warp( bl, mrd->master->bl.m, mrd->master->bl.x, mrd->master->bl.y, CLR_TELEPORT ); - } - } - else - { - mrd->masterteleport_timer = 0; - } + } else if (mrd != NULL && mrd->master != NULL) { + unit->warpto_master(&mrd->master->bl, bl); } - if(tid == INVALID_TIMER) //A directly invoked timer is from battle_stop_walking, therefore the rest is irrelevant. + if(tid == INVALID_TIMER) // A directly invoked timer is from battle_stop_walking, therefore the rest is irrelevant. return 0; - //If stepaction is set then we remembered a client request that should be executed on the next step - if (ud->stepaction && ud->target_to) { - //Delete old stepaction even if not executed yet, the latest command is what counts - if(ud->steptimer != INVALID_TIMER) { + // If stepaction is set then we remembered a client request that should be executed on the next step + if (ud->stepaction && ud->target_to != 0) { + // Delete old stepaction even if not executed yet, the latest command is what counts + if (ud->steptimer != INVALID_TIMER) { timer->delete(ud->steptimer, unit->step_timer); ud->steptimer = INVALID_TIMER; } - //Delay stepactions by half a step (so they are executed at full step) - if(ud->walkpath.path[ud->walkpath.path_pos]&1) - i = status->get_speed(bl)*14/20; + // Delay stepactions by half a step (so they are executed at full step) + int timer_delay; + if ((ud->walkpath.path[ud->walkpath.path_pos] & 1) != 0) + timer_delay = status->get_speed(bl) * 14 / 20; else - i = status->get_speed(bl)/2; - ud->steptimer = timer->add(tick+i, unit->step_timer, bl->id, 0); + timer_delay = status->get_speed(bl) / 2; + ud->steptimer = timer->add(tick + timer_delay, unit->step_timer, bl->id, 0); } - if(ud->state.change_walk_target) { - if(unit->walktoxy_sub(bl)) { - return 1; - } else { - clif->fixpos(bl); + if (ud->state.change_walk_target) { + if (unit->walktoxy_sub(bl) == 0) return 0; - } + clif->fixpos(bl); + return 1; } + int timer_delay; ud->walkpath.path_pos++; if(ud->walkpath.path_pos>=ud->walkpath.path_len) - i = -1; - else if(ud->walkpath.path[ud->walkpath.path_pos]&1) - i = status->get_speed(bl)*14/10; + timer_delay = -1; + else if ((ud->walkpath.path[ud->walkpath.path_pos] & 1) != 0) + timer_delay = status->get_speed(bl) * 14 / 10; else - i = status->get_speed(bl); + timer_delay = status->get_speed(bl); - if(i > 0) { - ud->walktimer = timer->add(tick+i,unit->walktoxy_timer,id,i); - if( md && DIFF_TICK(tick,md->dmgtick) < 3000 )//not required not damaged recently + if (timer_delay > 0) { + ud->walktimer = timer->add(tick + timer_delay, unit->walktoxy_timer, id, 0); + if (md != NULL && DIFF_TICK(tick, md->dmgtick) < 3000) // not required not damaged recently clif->move(ud); - } else if(ud->state.running) { - //Keep trying to run. - if ( !(unit->run(bl, NULL, SC_RUN) || unit->run(bl, sd, SC_WUGDASH)) ) + } else if (ud->state.running != 0) { + // Keep trying to run. + if (!(unit->run(bl, NULL, SC_RUN) || unit->run(bl, sd, SC_WUGDASH))) ud->state.running = 0; - } else if (!ud->stepaction && ud->target_to) { - //Update target trajectory. + } else if (!ud->stepaction && ud->target_to != 0) { + // Update target trajectory. struct block_list *tbl = map->id2bl(ud->target_to); - if (!tbl || !status->check_visibility(bl, tbl)) { - //Cancel chase. + if (tbl == NULL || status->check_visibility(bl, tbl) == 0) { // not visible + // Cancel chase. ud->to_x = bl->x; ud->to_y = bl->y; - if (tbl && bl->type == BL_MOB && mob->warpchase(BL_UCAST(BL_MOB, bl), tbl)) + if (tbl != NULL && bl->type == BL_MOB && mob->warpchase(BL_UCAST(BL_MOB, bl), tbl) != 0) return 0; ud->target_to = 0; - return 0; + return 1; } if (tbl->m == bl->m && check_distance_bl(bl, tbl, ud->chaserange)) { //Reached destination. @@ -472,19 +472,19 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) clif->fixpos(bl); unit->attack(bl, tbl->id, ud->state.attack_continue); } - } else { //Update chase-path - unit->walktobl(bl, tbl, ud->chaserange, ud->state.walk_easy|(ud->state.attack_continue? 1 : 0)); + } else { // Update chase-path + unit->walktobl(bl, tbl, ud->chaserange, ud->state.walk_easy | ud->state.attack_continue); return 0; } } else { - //Stopped walking. Update to_x and to_y to current location [Skotlex] + // Stopped walking. Update to_x and to_y to current location [Skotlex] ud->to_x = bl->x; ud->to_y = bl->y; - if (battle_config.official_cell_stack_limit && map->count_oncell(bl->m, x, y, BL_CHAR|BL_NPC, 0x1 | 0x2) > battle_config.official_cell_stack_limit) { - //Walked on occupied cell, call unit_walktoxy again - if(ud->steptimer != INVALID_TIMER) { - //Execute step timer on next step instead + if (battle_config.official_cell_stack_limit != 0 && map->count_oncell(bl->m, x, y, BL_CHAR | BL_NPC, 0x1 | 0x2) > battle_config.official_cell_stack_limit) { + // Walked on occupied cell, call unit->walktoxy again + if (ud->steptimer != INVALID_TIMER) { + // Execute step timer on next step instead timer->delete(ud->steptimer, unit->step_timer); ud->steptimer = INVALID_TIMER; } @@ -494,6 +494,7 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) return 0; } +//TODO: CONTINUE REFACTORING HERE static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); @@ -589,7 +590,7 @@ static int unit_walktobl_sub(int tid, int64 tick, int id, intptr_t data) if (DIFF_TICK(ud->canmove_tick, tick) > 0) //Keep waiting? timer->add(ud->canmove_tick+1, unit->walktobl_sub, id, data); else if (unit->can_move(bl)) { - if (unit->walktoxy_sub(bl)) + if (unit->walktoxy_sub(bl) == 0) set_mobstate(bl, ud->state.attack_continue); } } @@ -648,9 +649,9 @@ static int unit_walktobl(struct block_list *bl, struct block_list *tbl, int rang if(!unit->can_move(bl)) return 0; - if (unit->walktoxy_sub(bl)) { + if (unit->walktoxy_sub(bl) == 0) { //ALREADY REFACTORED set_mobstate(bl, flag&2); - return 1; + return 0; } return 0; } @@ -3013,6 +3014,7 @@ void unit_defaults(void) unit->getdir = unit_getdir; unit->blown = unit_blown; unit->warp = unit_warp; + unit->warpto_master = unit_warpto_master; unit->stop_walking = unit_stop_walking; unit->skilluse_id = unit_skilluse_id; unit->step_timer = unit_step_timer; diff --git a/src/map/unit.h b/src/map/unit.h index 5437a172a..315cc0515 100644 --- a/src/map/unit.h +++ b/src/map/unit.h @@ -119,6 +119,7 @@ struct unit_interface { uint8 (*getdir) (struct block_list *bl); int (*blown) (struct block_list *bl, int dx, int dy, int count, int flag); int (*warp) (struct block_list *bl, short m, short x, short y, enum clr_type type); + int (*warpto_master) (struct block_list *master_bl, struct block_list *slave_bl); int (*stop_walking) (struct block_list *bl, int type); int (*skilluse_id) (struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv); int (*step_timer) (int tid, int64 tick, int id, intptr_t data); -- cgit v1.2.3-70-g09d2 From feb1f9d96a9cfc12602c96235106397b67f2aeb4 Mon Sep 17 00:00:00 2001 From: skyleo Date: Sun, 8 Sep 2019 02:42:37 +0200 Subject: Add enum unit_dir and make direction functions use it Without a doubt the readability of code will be increased by this greatly --- src/map/map.c | 89 +++++++++++++++++++++++++++------------------------ src/map/map.h | 5 +-- src/map/unit.c | 33 ++++++++++++------- src/map/unit.h | 7 ++-- src/map/unitdefines.h | 58 +++++++++++++++++++++++++++++++++ 5 files changed, 135 insertions(+), 57 deletions(-) create mode 100644 src/map/unitdefines.h (limited to 'src/map/unit.c') diff --git a/src/map/map.c b/src/map/map.c index 70623ae22..9637609ec 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2845,63 +2845,70 @@ static int map_mapname2ipport(unsigned short name, uint32 *ip, uint16 *port) return 0; } -/*========================================== +/** * Checks if both dirs point in the same direction. - *------------------------------------------*/ -static int map_check_dir(int s_dir, int t_dir) + * @param s_dir: direction source is facing + * @param t_dir: direction target is facing + * @return 0: success(both face the same direction), 1: failure + **/ +static int map_check_dir(enum unit_dir s_dir, enum unit_dir t_dir) { - if(s_dir == t_dir) + if (s_dir == t_dir || ((t_dir + UNIT_DIR_MAX - 1) % UNIT_DIR_MAX) == s_dir + || ((t_dir + UNIT_DIR_MAX + 1) % UNIT_DIR_MAX) == s_dir) return 0; - switch(s_dir) { - case 0: if(t_dir == 7 || t_dir == 1 || t_dir == 0) return 0; break; - case 1: if(t_dir == 0 || t_dir == 2 || t_dir == 1) return 0; break; - case 2: if(t_dir == 1 || t_dir == 3 || t_dir == 2) return 0; break; - case 3: if(t_dir == 2 || t_dir == 4 || t_dir == 3) return 0; break; - case 4: if(t_dir == 3 || t_dir == 5 || t_dir == 4) return 0; break; - case 5: if(t_dir == 4 || t_dir == 6 || t_dir == 5) return 0; break; - case 6: if(t_dir == 5 || t_dir == 7 || t_dir == 6) return 0; break; - case 7: if(t_dir == 6 || t_dir == 0 || t_dir == 7) return 0; break; - } return 1; } -/*========================================== +/** * Returns the direction of the given cell, relative to 'src' - *------------------------------------------*/ -static uint8 map_calc_dir(struct block_list *src, int16 x, int16 y) + * @param src: object to put in relation between coordinates + * @param x: x-coordinate of cell + * @param y: y-coordinate of cell + * @return the direction of the given cell, relative to 'src' + **/ +static enum unit_dir map_calc_dir(struct block_list *src, int16 x, int16 y) { - uint8 dir = 0; - int dx, dy; - - nullpo_ret(src); + nullpo_retr(UNIT_DIR_NORTH, src); + enum unit_dir dir = UNIT_DIR_NORTH; - dx = x-src->x; - dy = y-src->y; + int dx = x - src->x; + int dy = y - src->y; if (dx == 0 && dy == 0) { // both are standing on the same spot. // aegis-style, makes knockback default to the left. // athena-style, makes knockback default to behind 'src'. - dir = (battle_config.knockback_left ? 6 : unit->getdir(src)); - } else if (dx >= 0 && dy >=0) { - // upper-right - if( dx*2 < dy || dx == 0 ) dir = 0; // up - else if( dx > dy*2+1 || dy == 0 ) dir = 6; // right - else dir = 7; // up-right + if (battle_config.knockback_left != 0) + dir = UNIT_DIR_EAST; + else + dir = unit->getdir(src); + } else if (dx >= 0 && dy >= 0) { + if (dx * 2 < dy || dx == 0) + dir = UNIT_DIR_NORTH; + else if (dx > dy * 2 + 1 || dy == 0) + dir = UNIT_DIR_EAST; + else + dir = UNIT_DIR_NORTHEAST; } else if (dx >= 0 && dy <= 0) { - // lower-right - if( dx*2 < -dy || dx == 0 ) dir = 4; // down - else if( dx > -dy*2+1 || dy == 0 ) dir = 6; // right - else dir = 5; // down-right + if (dx * 2 < -dy || dx == 0) + dir = UNIT_DIR_SOUTH; + else if (dx > -dy * 2 + 1 || dy == 0) + dir = UNIT_DIR_EAST; + else + dir = UNIT_DIR_SOUTHEAST; } else if (dx <= 0 && dy <= 0) { - // lower-left - if( dx*2 > dy || dx == 0 ) dir = 4; // down - else if( dx < dy*2-1 || dy == 0 ) dir = 2; // left - else dir = 3; // down-left + if (dx * 2 > dy || dx == 0 ) + dir = UNIT_DIR_SOUTH; + else if (dx < dy * 2 + 1 || dy == 0) + dir = UNIT_DIR_WEST; + else + dir = UNIT_DIR_SOUTHWEST; } else { - // upper-left - if( -dx*2 < dy || dx == 0 ) dir = 0; // up - else if( -dx > dy*2+1 || dy == 0) dir = 2; // left - else dir = 1; // up-left + if (-dx * 2 < dy || dx == 0 ) + dir = UNIT_DIR_NORTH; + else if (-dx > dy * 2 + 1 || dy == 0) + dir = UNIT_DIR_WEST; + else + dir = UNIT_DIR_NORTHWEST; } return dir; } diff --git a/src/map/map.h b/src/map/map.h index dbd9c0fba..e0fbcf9b2 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -27,6 +27,7 @@ #include "common/db.h" #include "common/mapindex.h" #include "common/mmo.h" +#include "map/unitdefines.h" // enum unit_dir #include #include @@ -1216,8 +1217,8 @@ END_ZEROED_BLOCK; // reload config file looking only for npcs void (*reloadnpc) (bool clear); - int (*check_dir) (int s_dir,int t_dir); - uint8 (*calc_dir) (struct block_list *src,int16 x,int16 y); + int (*check_dir) (enum unit_dir s_dir, enum unit_dir t_dir); + enum unit_dir (*calc_dir) (struct block_list *src, int16 x, int16 y); int (*random_dir) (struct block_list *bl, short *x, short *y); // [Skotlex] int (*cleanup_sub) (struct block_list *bl, va_list ap); diff --git a/src/map/unit.c b/src/map/unit.c index 235a843eb..3a940665d 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -832,12 +832,18 @@ static int unit_movepos(struct block_list *bl, short dst_x, short dst_y, int eas return 1; } -static int unit_setdir(struct block_list *bl, unsigned char dir) +/** + * Sets the facing direction of a unit + * @param bl: unit to modify + * @param dir: the facing direction @see enum unit_dir + * @return 0: success, 1: failure + */ +static int unit_setdir(struct block_list *bl, enum unit_dir dir) { - struct unit_data *ud; - nullpo_ret(bl ); - ud = unit->bl2ud(bl); - if (!ud) return 0; + nullpo_retr(1, bl); + struct unit_data *ud = unit->bl2ud(bl); + if (ud == NULL) + return 1; ud->dir = dir; if (bl->type == BL_PC) BL_UCAST(BL_PC, bl)->head_dir = 0; @@ -845,15 +851,20 @@ static int unit_setdir(struct block_list *bl, unsigned char dir) return 0; } -static uint8 unit_getdir(struct block_list *bl) +/** + * Get the facing direction of a unit + * @param bl: unit to request data from + * @return the facing direction @see enum unit_dir + */ +static enum unit_dir unit_getdir(struct block_list *bl) { - struct unit_data *ud; - nullpo_ret(bl); + nullpo_retr(UNIT_DIR_NORTH, bl); - if( bl->type == BL_NPC ) + if (bl->type == BL_NPC) return BL_UCCAST(BL_NPC, bl)->dir; - ud = unit->bl2ud(bl); - if (!ud) return 0; + struct unit_data *ud = unit->bl2ud(bl); + if (ud == NULL) + return UNIT_DIR_NORTH; return ud->dir; } diff --git a/src/map/unit.h b/src/map/unit.h index 315cc0515..bdee032f8 100644 --- a/src/map/unit.h +++ b/src/map/unit.h @@ -24,6 +24,7 @@ #include "map/clif.h" // clr_type #include "map/path.h" // struct walkpath_data #include "map/skill.h" // 'MAX_SKILLTIMERSKILL, struct skill_timerskill, struct skill_unit_group, struct skill_unit_group_tickset +#include "map/unitdefines.h" // enum unit_dir #include "common/hercules.h" struct map_session_data; @@ -67,7 +68,7 @@ struct unit_data { int64 attackabletime; int64 canact_tick; int64 canmove_tick; - uint8 dir; + enum unit_dir dir; unsigned char walk_count; unsigned char target_count; struct { @@ -115,8 +116,8 @@ struct unit_interface { void (*run_hit) (struct block_list *bl, struct status_change *sc, struct map_session_data *sd, enum sc_type type); int (*escape) (struct block_list *bl, struct block_list *target, short dist); int (*movepos) (struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath); - int (*setdir) (struct block_list *bl, unsigned char dir); - uint8 (*getdir) (struct block_list *bl); + int (*setdir) (struct block_list *bl, enum unit_dir dir); + enum unit_dir (*getdir) (struct block_list *bl); int (*blown) (struct block_list *bl, int dx, int dy, int count, int flag); int (*warp) (struct block_list *bl, short m, short x, short y, enum clr_type type); int (*warpto_master) (struct block_list *master_bl, struct block_list *slave_bl); diff --git a/src/map/unitdefines.h b/src/map/unitdefines.h new file mode 100644 index 000000000..70b6e8d4d --- /dev/null +++ b/src/map/unitdefines.h @@ -0,0 +1,58 @@ +/** + * This file is part of Hercules. + * http://herc.ws - http://github.com/HerculesWS/Hercules + * + * Copyright (C) 2012-2019 Hercules Dev Team + * Copyright (C) Athena Dev Teams + * + * Hercules is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#ifndef UNIT_UNITDEFINES_H +#define UNIT_UNITDEFINES_H + +/** + * Used for directions, @see unit_data.dir + */ +enum unit_dir { + UNIT_DIR_UNDEFINED = -1, + UNIT_DIR_FIRST = 0, + UNIT_DIR_NORTH = 0, + UNIT_DIR_NORTHWEST = 1, + UNIT_DIR_WEST = 2, + UNIT_DIR_SOUTHWEST = 3, + UNIT_DIR_SOUTH = 4, + UNIT_DIR_SOUTHEAST = 5, + UNIT_DIR_EAST = 6, + UNIT_DIR_NORTHEAST = 7, + UNIT_DIR_MAX = 8, + /* IMPORTANT: Changing the order would break the above macros + * and several usages of directions anywhere */ +}; + +/* Returns the opposite of the facing direction */ +#define unit_get_opposite_dir(dir) ( ((dir) + 4) % UNIT_DIR_MAX ) + +/* Returns true when direction is diagonal/combined (ex. UNIT_DIR_NORTHWEST, UNIT_DIR_SOUTHWEST, ...) */ +#define unit_is_diagonal_dir(dir) ( ((dir) % 2) == UNIT_DIR_NORTHWEST ) + +/* Returns true if direction equals val or the opposite direction of val */ +#define unit_is_dir_or_opposite(dir, val) ( ((dir) % 4) == (val) ) + +/* Returns the next direction after 90° CCW on a compass */ +#define unit_get_ccw90_dir(dir) ( ((dir) + 2) % UNIT_DIR_MAX ) + +/* Returns a random diagonal direction */ +#define unit_get_rnd_diagonal_dir() ( UNIT_DIR_NORTHWEST + 2 * (rnd() % 4) ) + +#endif /* UNIT_UNITDEFINES_H */ -- cgit v1.2.3-70-g09d2 From d13b24a62ac933364839c7ece1f70eba001e7c2d Mon Sep 17 00:00:00 2001 From: skyleo Date: Sun, 8 Sep 2019 02:53:24 +0200 Subject: Refactor code using directions to use enum unit_dir This removes a lot of duplicated code, especially related to people not using the arrays dirx and diry. Assertions for whenever these arrays are used have been added as well, to ensure valid index range. Some trailing white space has been removed as well. --- src/map/atcommand.c | 42 +++++++--- src/map/battle.c | 23 +++--- src/map/clif.c | 10 +-- src/map/map.c | 40 ++++++---- src/map/npc.c | 2 +- src/map/npc.h | 4 +- src/map/script.c | 26 +++--- src/map/skill.c | 225 ++++++++++++++++++++++++---------------------------- src/map/skill.h | 10 +-- src/map/unit.c | 28 +++---- src/map/unit.h | 2 +- 11 files changed, 207 insertions(+), 205 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 707522423..410cd7af7 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -4123,16 +4123,36 @@ ACMD(mapinfo) for (i = 0; i < map->list[m_id].npc_num;) { struct npc_data *nd = map->list[m_id].npc[i]; switch(nd->dir) { - case 0: strcpy(direction, msg_fd(fd,1101)); break; // North - case 1: strcpy(direction, msg_fd(fd,1102)); break; // North West - case 2: strcpy(direction, msg_fd(fd,1103)); break; // West - case 3: strcpy(direction, msg_fd(fd,1104)); break; // South West - case 4: strcpy(direction, msg_fd(fd,1105)); break; // South - case 5: strcpy(direction, msg_fd(fd,1106)); break; // South East - case 6: strcpy(direction, msg_fd(fd,1107)); break; // East - case 7: strcpy(direction, msg_fd(fd,1108)); break; // North East - case 9: strcpy(direction, msg_fd(fd,1109)); break; // North - default: strcpy(direction, msg_fd(fd,1110)); break; // Unknown + case UNIT_DIR_NORTH: + strcpy(direction, msg_fd(fd, 1101)); // North + break; + case UNIT_DIR_NORTHWEST: + strcpy(direction, msg_fd(fd, 1102)); // North West + break; + case UNIT_DIR_WEST: + strcpy(direction, msg_fd(fd, 1103)); // West + break; + case UNIT_DIR_SOUTHWEST: + strcpy(direction, msg_fd(fd, 1104)); // South West + break; + case UNIT_DIR_SOUTH: + strcpy(direction, msg_fd(fd, 1105)); // South + break; + case UNIT_DIR_SOUTHEAST: + strcpy(direction, msg_fd(fd, 1106)); // South East + break; + case UNIT_DIR_EAST: + strcpy(direction, msg_fd(fd, 1107)); // East + break; + case UNIT_DIR_NORTHEAST: + strcpy(direction, msg_fd(fd, 1108)); // North East + break; + case 9: // is this actually used? [skyleo] + strcpy(direction, msg_fd(fd, 1109)); // North + break; + default: + strcpy(direction, msg_fd(fd, 1110)); // Unknown + break; } if(strcmp(nd->name,nd->exname) == 0) safesnprintf(atcmd_output, sizeof(atcmd_output), msg_fd(fd,1111), // NPC %d: %s | Direction: %s | Sprite: %d | Location: %d %d @@ -6899,7 +6919,7 @@ ACMD(identify) } } } - + if (num == 0) clif->message(fd,msg_fd(fd,1238)); // There are no items to appraise. else if (!identifyall) diff --git a/src/map/battle.c b/src/map/battle.c index c057ad81a..24e58cc09 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3231,12 +3231,11 @@ static int64 battle_calc_damage(struct block_list *src, struct block_list *bl, s if (!damage) return 0; if( (sce = sc->data[SC_LIGHTNINGWALK]) && flag&BF_LONG && rnd()%100 < sce->val1 ) { - int dx[8]={0,-1,-1,-1,0,1,1,1}; - int dy[8]={1,1,0,-1,-1,-1,0,1}; - uint8 dir = map->calc_dir(bl, src->x, src->y); - if( unit->movepos(bl, src->x-dx[dir], src->y-dy[dir], 1, 1) ) { - clif->slide(bl,src->x-dx[dir],src->y-dy[dir]); - unit->setdir(bl, dir); + enum unit_dir dir = map->calc_dir(bl, src->x, src->y); + Assert_ret(dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); + if (unit->movepos(bl, src->x - dirx[dir], src->y - diry[dir], 1, 1)) { + clif->slide(bl, src->x - dirx[dir], src->y - diry[dir]); + unit->set_dir(bl, dir); } d->dmg_lv = ATK_DEF; status_change_end(bl, SC_LIGHTNINGWALK, INVALID_TIMER); @@ -5858,10 +5857,10 @@ static void battle_reflect_damage(struct block_list *target, struct block_list * if( wd->flag & BF_SHORT ) { if( !is_boss(src) ) { if( sc->data[SC_DEATHBOUND] && skill_id != WS_CARTTERMINATION ) { - uint8 dir = map->calc_dir(target,src->x,src->y), - t_dir = unit->getdir(target); + enum unit_dir dir = map->calc_dir(target, src->x, src->y); + enum unit_dir t_dir = unit->getdir(target); - if( !map->check_dir(dir,t_dir) ) { + if (map->check_dir(dir, t_dir) == 0) { int64 rd1 = damage * sc->data[SC_DEATHBOUND]->val2 / 100; // Amplify damage. trdamage += rdamage = rd1 - (damage = rd1 * 30 / 100); // not normalized as intended. @@ -6229,10 +6228,10 @@ static enum damage_lv battle_weapon_attack(struct block_list *src, struct block_ status_change_end(src, SC_CLOAKINGEXCEED, INVALID_TIMER); } if( tsc && tsc->data[SC_AUTOCOUNTER] && status->check_skilluse(target, src, KN_AUTOCOUNTER, 1) ) { - uint8 dir = map->calc_dir(target,src->x,src->y); - int t_dir = unit->getdir(target); + enum unit_dir dir = map->calc_dir(target, src->x, src->y), + t_dir = unit->getdir(target); int dist = distance_bl(src, target); - if(dist <= 0 || (!map->check_dir(dir,t_dir) && dist <= tstatus->rhw.range+1)) { + if(dist <= 0 || (map->check_dir(dir, t_dir) == 0 && dist <= tstatus->rhw.range + 1)) { uint16 skill_lv = tsc->data[SC_AUTOCOUNTER]->val1; clif->skillcastcancel(target); //Remove the casting bar. [Skotlex] clif->damage(src, target, sstatus->amotion, 1, 0, 1, BDT_NORMAL, 0); //Display MISS. diff --git a/src/map/clif.c b/src/map/clif.c index 3022d7f69..a0ffeac32 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -11348,15 +11348,7 @@ static void clif_parse_MapMove(int fd, struct map_session_data *sd) /// 0 = straight /// 1 = turned CW /// 2 = turned CCW -/// dir: -/// 0 = north -/// 1 = northwest -/// 2 = west -/// 3 = southwest -/// 4 = south -/// 5 = southeast -/// 6 = east -/// 7 = northeast +/// dir: @see enum unit_dir static void clif_changed_dir(struct block_list *bl, enum send_target target) { unsigned char buf[64]; diff --git a/src/map/map.c b/src/map/map.c index 9637609ec..e0ab2b08d 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1670,7 +1670,7 @@ static int map_search_freecell(struct block_list *src, int16 m, int16 *x, int16 *------------------------------------------*/ static bool map_closest_freecell(int16 m, const struct block_list *bl, int16 *x, int16 *y, int type, int flag) { - uint8 dir = 6; + enum unit_dir dir = UNIT_DIR_EAST; int16 tx; int16 ty; int costrange = 10; @@ -1689,7 +1689,7 @@ static bool map_closest_freecell(int16 m, const struct block_list *bl, int16 *x, short dy = diry[dir]; //Linear search - if(dir%2 == 0 && costrange%MOVE_COST == 0) { + if (!unit_is_diagonal_dir(dir) && (costrange % MOVE_COST) == 0) { tx = *x+dx*(costrange/MOVE_COST); ty = *y+dy*(costrange/MOVE_COST); if (!map->count_oncell(m, tx, ty, type, flag) && map->getcell(m, bl, tx, ty, CELL_CHKPASS)) { @@ -1699,7 +1699,7 @@ static bool map_closest_freecell(int16 m, const struct block_list *bl, int16 *x, } } //Full diagonal search - else if(dir%2 == 1 && costrange%MOVE_DIAGONAL_COST == 0) { + else if (unit_is_diagonal_dir(dir) && (costrange % MOVE_DIAGONAL_COST) == 0) { tx = *x+dx*(costrange/MOVE_DIAGONAL_COST); ty = *y+dy*(costrange/MOVE_DIAGONAL_COST); if (!map->count_oncell(m, tx, ty, type, flag) && map->getcell(m, bl, tx, ty, CELL_CHKPASS)) { @@ -1709,16 +1709,24 @@ static bool map_closest_freecell(int16 m, const struct block_list *bl, int16 *x, } } //One cell diagonal, rest linear (TODO: Find a better algorithm for this) - else if(dir%2 == 1 && costrange%MOVE_COST == 4) { - tx = *x+dx*((dir%4==3)?(costrange/MOVE_COST):1); - ty = *y+dy*((dir%4==1)?(costrange/MOVE_COST):1); + else if (unit_is_diagonal_dir(dir) && (costrange % MOVE_COST) == 4) { + tx = *x + dx; + ty = *y + dy; + if (unit_is_dir_or_opposite(dir, UNIT_DIR_SOUTHWEST)) + tx *= costrange / MOVE_COST; + if (unit_is_dir_or_opposite(dir, UNIT_DIR_NORTHWEST)) + ty *= costrange / MOVE_COST; if (!map->count_oncell(m, tx, ty, type, flag) && map->getcell(m, bl, tx, ty, CELL_CHKPASS)) { *x = tx; *y = ty; return true; } - tx = *x+dx*((dir%4==1)?(costrange/MOVE_COST):1); - ty = *y+dy*((dir%4==3)?(costrange/MOVE_COST):1); + tx = *x + dx; + ty = *y + dy; + if (unit_is_dir_or_opposite(dir, UNIT_DIR_NORTHWEST)) + tx *= costrange / MOVE_COST; + if (unit_is_dir_or_opposite(dir, UNIT_DIR_SOUTHWEST)) + ty *= costrange / MOVE_COST; if (!map->count_oncell(m, tx, ty, type, flag) && map->getcell(m, bl, tx, ty, CELL_CHKPASS)) { *x = tx; *y = ty; @@ -1727,17 +1735,17 @@ static bool map_closest_freecell(int16 m, const struct block_list *bl, int16 *x, } //Get next direction - if (dir == 5) { + if (dir == UNIT_DIR_SOUTHEAST) { //Diagonal search complete, repeat with higher cost range if(costrange == 14) costrange += 6; else if(costrange == 28 || costrange >= 38) costrange += 2; else costrange += 4; - dir = 6; - } else if (dir == 4) { + dir = UNIT_DIR_EAST; + } else if (dir == UNIT_DIR_SOUTH) { //Linear search complete, switch to diagonal directions - dir = 7; + dir = UNIT_DIR_NORTHEAST; } else { - dir = (dir+2)%8; + dir = unit_get_ccw90_dir(dir); } } @@ -2936,11 +2944,11 @@ static int map_random_dir(struct block_list *bl, int16 *x, int16 *y) if (dist < 1) dist =1; do { - int j = 1 + 2*(rnd()%4); //Pick a random diagonal direction + enum unit_dir dir = unit_get_rnd_diagonal_dir(); short segment = 1+(rnd()%dist); //Pick a random interval from the whole vector in that direction - xi = bl->x + segment*dirx[j]; + xi = bl->x + segment * dirx[dir]; segment = (short)sqrt((float)(dist2 - segment*segment)); //The complement of the previously picked segment - yi = bl->y + segment*diry[j]; + yi = bl->y + segment * diry[dir]; } while ((map->getcell(bl->m, bl, xi, yi, CELL_CHKNOPASS) || !path->search(NULL, bl, bl->m, bl->x, bl->y, xi, yi, 1, CELL_CHKNOREACH)) && (++i)<100); diff --git a/src/map/npc.c b/src/map/npc.c index e66888a74..2ac99948b 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -3391,7 +3391,7 @@ static bool npc_viewisid(const char *viewid) * @param class_ The NPC view class. * @return A pointer to the created NPC data (ownership passed to the caller). */ -static struct npc_data *npc_create_npc(enum npc_subtype subtype, int m, int x, int y, uint8 dir, int class_) +static struct npc_data *npc_create_npc(enum npc_subtype subtype, int m, int x, int y, enum unit_dir dir, int class_) { struct npc_data *nd; diff --git a/src/map/npc.h b/src/map/npc.h index 65c9796d9..1585a2bc8 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -95,7 +95,7 @@ struct npc_data { int chat_id; int touching_id; int64 next_walktime; - uint8 dir; + enum unit_dir dir; uint8 area_size; int clan_id; @@ -281,7 +281,7 @@ struct npc_interface { void (*parsename) (struct npc_data *nd, const char *name, const char *start, const char *buffer, const char *filepath); int (*parseview) (const char *w4, const char *start, const char *buffer, const char *filepath); bool (*viewisid) (const char *viewid); - struct npc_data *(*create_npc) (enum npc_subtype subtype, int m, int x, int y, uint8 dir, int class_); + struct npc_data *(*create_npc) (enum npc_subtype subtype, int m, int x, int y, enum unit_dir dir, int class_); struct npc_data* (*add_warp) (char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y); const char *(*parse_warp) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); const char *(*parse_shop) (const char *w1, const char *w2, const char *w3, const char *w4, const char *start, const char *buffer, const char *filepath, int *retval); diff --git a/src/map/script.c b/src/map/script.c index 0e30708d9..28d06a8f1 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -19727,7 +19727,7 @@ static BUILDIN(setunitdata) clif->changelook(bl, LOOK_WEAPON, val); break; case UDT_LOOKDIR: - unit->setdir(bl, (uint8) val); + unit->setdir(bl, (enum unit_dir) val); break; case UDT_CANMOVETICK: md->ud.canmove_tick = val; @@ -19859,7 +19859,7 @@ static BUILDIN(setunitdata) status->calc_misc(bl, &hd->base_status, hd->homunculus.level); break; case UDT_LOOKDIR: - unit->setdir(bl, (unsigned char) val); + unit->setdir(bl, (enum unit_dir) val); break; case UDT_CANMOVETICK: hd->ud.canmove_tick = val; @@ -19998,7 +19998,7 @@ static BUILDIN(setunitdata) status->calc_misc(bl, &pd->status, pd->pet.level); break; case UDT_LOOKDIR: - unit->setdir(bl, (unsigned char) val); + unit->setdir(bl, (enum unit_dir) val); break; case UDT_CANMOVETICK: pd->ud.canmove_tick = val; @@ -20131,7 +20131,7 @@ static BUILDIN(setunitdata) status->calc_misc(bl, &mc->base_status, mc->db->lv); break; case UDT_LOOKDIR: - unit->setdir(bl, (unsigned char) val); + unit->setdir(bl, (enum unit_dir) val); break; case UDT_CANMOVETICK: mc->ud.canmove_tick = val; @@ -20265,7 +20265,7 @@ static BUILDIN(setunitdata) status->calc_misc(bl, &ed->base_status, ed->db->lv); break; case UDT_LOOKDIR: - unit->setdir(bl, (unsigned char) val); + unit->setdir(bl, (enum unit_dir) val); break; case UDT_CANMOVETICK: ed->ud.canmove_tick = val; @@ -20397,7 +20397,7 @@ static BUILDIN(setunitdata) status->calc_misc(bl, &nd->status, nd->level); break; case UDT_LOOKDIR: - unit->setdir(bl, (unsigned char) val); + unit->setdir(bl, (enum unit_dir) val); break; case UDT_STR: nd->status.str = (unsigned short) val; @@ -23250,7 +23250,6 @@ static BUILDIN(progressbar_unit) } static BUILDIN(pushpc) { - uint8 dir; int cells, dx, dy; struct map_session_data* sd; @@ -23259,14 +23258,14 @@ static BUILDIN(pushpc) return true; } - dir = script_getnum(st,2); - cells = script_getnum(st,3); + enum unit_dir dir = script_getnum(st, 2); + cells = script_getnum(st,3); - if (dir > 7) { + if (dir >= UNIT_DIR_MAX) { ShowWarning("buildin_pushpc: Invalid direction %d specified.\n", dir); script->reportsrc(st); - dir%= 8; // trim spin-over + dir %= UNIT_DIR_MAX; // trim spin-over } if(!cells) @@ -23275,10 +23274,11 @@ static BUILDIN(pushpc) } else if(cells<0) {// pushing backwards - dir = (dir+4)%8; // turn around - cells = -cells; + dir = unit_get_opposite_dir(dir); + cells = -cells; } + Assert_retr(false, dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); dx = dirx[dir]; dy = diry[dir]; diff --git a/src/map/skill.c b/src/map/skill.c index a8dbefbd7..668c1849c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1180,7 +1180,6 @@ static int skillnotok_mercenary(uint16 skill_id, struct mercenary_data *md) static struct s_skill_unit_layout *skill_get_unit_layout(uint16 skill_id, uint16 skill_lv, struct block_list *src, int x, int y) { int pos = skill->get_unit_layout_type(skill_id,skill_lv); - uint8 dir; nullpo_retr(&skill->dbs->unit_layout[0], src); if (pos < -1 || pos >= MAX_SKILL_UNIT_LAYOUT) { @@ -1191,7 +1190,9 @@ static struct s_skill_unit_layout *skill_get_unit_layout(uint16 skill_id, uint16 if (pos != -1) // simple single-definition layout return &skill->dbs->unit_layout[pos]; - dir = (src->x == x && src->y == y) ? 6 : map->calc_dir(src,x,y); // 6 - default aegis direction + enum unit_dir dir = UNIT_DIR_EAST; // default aegis direction + if (src->x != x || src->y != y) + dir = map->calc_dir(src, x, y); if (skill_id == MG_FIREWALL) return &skill->dbs->unit_layout [skill->firewall_unit_pos + dir]; @@ -2626,11 +2627,11 @@ static int skill_strip_equip(struct block_list *bl, unsigned short where, int ra /*========================================================================= * Used to knock back players, monsters, traps, etc * 'count' is the number of squares to knock back - * 'direction' indicates the way OPPOSITE to the knockback direction (or -1 for default behavior) + * 'direction' indicates the way OPPOSITE to the knockback direction (or UNIT_DIR_UNDEFINED for default behavior) * if 'flag&0x1', position update packets must not be sent. * if 'flag&0x2', skill blown ignores players' special_state.no_knockback */ -static int skill_blown(struct block_list *src, struct block_list *target, int count, int8 dir, int flag) +static int skill_blown(struct block_list *src, struct block_list *target, int count, enum unit_dir dir, int flag) { int dx = 0, dy = 0; struct status_change *tsc = status->get_sc(target); @@ -2672,10 +2673,10 @@ static int skill_blown(struct block_list *src, struct block_list *target, int co break; } - if (dir == -1) // : do the computation here instead of outside + if (dir == UNIT_DIR_UNDEFINED) // : do the computation here instead of outside dir = map->calc_dir(target, src->x, src->y); // direction from src to target, reversed - if (dir >= 0 && dir < 8) { + if (dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX) { // take the reversed 'direction' and reverse it dx = -dirx[dir]; dy = -diry[dir]; @@ -3297,7 +3298,7 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li //Only knockback if it's still alive, otherwise a "ghost" is left behind. [Skotlex] //Reflected spells do not bounce back (bl == dsrc since it only happens for direct skills) if (dmg.blewcount > 0 && bl!=dsrc && !status->isdead(bl)) { - int8 dir = -1; // default + enum unit_dir dir = UNIT_DIR_UNDEFINED; // default switch(skill_id) {//direction case MG_FIREWALL: case PR_SANCTUARY: @@ -3310,16 +3311,16 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li // This ensures the storm randomly pushes instead of exactly a cell backwards per official mechanics. case WZ_STORMGUST: if(!battle_config.stormgust_knockback) - dir = rnd()%8; + dir = rnd() % UNIT_DIR_MAX; break; case WL_CRIMSONROCK: dir = map->calc_dir(bl,skill->area_temp[4],skill->area_temp[5]); break; case MC_CARTREVOLUTION: - dir = 6; // Official servers push target to the West + dir = UNIT_DIR_EAST; // Official servers push target to the West break; default: - dir = skill->attack_dir_unknown(&attack_type, src, dsrc, bl, &skill_id, &skill_lv, &tick, &flag); + dir = UNIT_DIR_UNDEFINED; break; } @@ -3337,8 +3338,9 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li case SR_KNUCKLEARROW: if( skill->blown(dsrc,bl,dmg.blewcount,dir,0) && !(flag&4) ) { short dir_x, dir_y; - dir_x = dirx[(dir+4)%8]; - dir_y = diry[(dir+4)%8]; + Assert_ret(dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); + dir_x = dirx[unit_get_opposite_dir(dir)]; + dir_y = diry[unit_get_opposite_dir(dir)]; if (map->getcell(bl->m, bl, bl->x + dir_x, bl->y + dir_y, CELL_CHKNOPASS) != 0) skill->addtimerskill(src, tick + 300 * ((flag&2) ? 1 : 2), bl->id, 0, 0, skill_id, skill_lv, BF_WEAPON, flag|4); } @@ -3496,12 +3498,9 @@ static int skill_attack_copy_unknown(int *attack_type, struct block_list *src, s return *skill_id; } -static int skill_attack_dir_unknown(int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag) -{ - return -1; -} - -static void skill_attack_blow_unknown(int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage, int8 *dir) +static void skill_attack_blow_unknown(int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, + uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, + struct Damage *dmg, int64 *damage, enum unit_dir *dir) { nullpo_retv(bl); nullpo_retv(dmg); @@ -3512,7 +3511,7 @@ static void skill_attack_blow_unknown(int *attack_type, struct block_list *src, if (!dmg->blewcount && bl->type == BL_SKILL && *damage > 0){ struct skill_unit *su = BL_UCAST(BL_SKILL, bl); if (su->group && su->group->skill_id == HT_BLASTMINE) - skill->blown(src, bl, 3, -1, 0); + skill->blown(src, bl, 3, UNIT_DIR_UNDEFINED, 0); } } @@ -4406,7 +4405,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl case KN_CHARGEATK: { bool path_exists = path->search_long(NULL, src, src->m, src->x, src->y, bl->x, bl->y,CELL_CHKWALL); unsigned int dist = distance_bl(src, bl); - uint8 dir = map->calc_dir(bl, src->x, src->y); + enum unit_dir dir = map->calc_dir(bl, src->x, src->y); // teleport to target (if not on WoE grounds) if( !map_flag_gvg2(src->m) && !map->list[src->m].flag.battleground && unit->movepos(src, bl->x, bl->y, 0, 1) ) @@ -4418,7 +4417,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl skill->blown(src, bl, dist, dir, 0); //HACK: since knockback officially defaults to the left, the client also turns to the left... therefore, // make the caster look in the direction of the target - unit->setdir(src, (dir+4)%8); + unit->setdir(src, unit_get_opposite_dir(dir)); } } @@ -4457,11 +4456,12 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl case RG_BACKSTAP: { - uint8 dir = map->calc_dir(src, bl->x, bl->y), t_dir = unit->getdir(bl); - if ((!check_distance_bl(src, bl, 0) && !map->check_dir(dir, t_dir)) || bl->type == BL_SKILL) { + enum unit_dir dir = map->calc_dir(src, bl->x, bl->y); + enum unit_dir t_dir = unit->getdir(bl); + if ((!check_distance_bl(src, bl, 0) && map->check_dir(dir, t_dir) == 0) || bl->type == BL_SKILL) { status_change_end(src, SC_HIDING, INVALID_TIMER); skill->attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag); - dir = dir < 4 ? dir+4 : dir-4; // change direction [Celest] + dir = unit_get_opposite_dir(dir); // change direction [Celest] unit->setdir(bl,dir); } else if (sd) @@ -4489,7 +4489,6 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl { short x, y, i = 2; // Move 2 cells for Issen(from target) struct block_list *mbl = bl; - short dir = 0; skill->attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag); @@ -4511,13 +4510,13 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl status->set_hp(src, 1, STATUS_HEAL_DEFAULT); #endif // RENEWAL } - dir = map->calc_dir(src,bl->x,bl->y); - if( dir > 0 && dir < 4) x = -i; - else if( dir > 4 ) x = i; - else x = 0; - if( dir > 2 && dir < 6 ) y = -i; - else if( dir == 7 || dir < 2 ) y = i; - else y = 0; + enum unit_dir dir = map->calc_dir(src, bl->x, bl->y); + if (Assert_chk(dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX)) { + map->freeblock_unlock(); // unblock before assert-returning + return 0; + } + x = i * dirx[dir]; + y = i * diry[dir]; if ((mbl == src || (!map_flag_gvg2(src->m) && !map->list[src->m].flag.battleground))) { // only NJ_ISSEN don't have slide effect in GVG if (!(unit->movepos(src, mbl->x+x, mbl->y+y, 1, 1))) { // The cell is not reachable (wall, object, ...), move next to the target @@ -4744,12 +4743,12 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl if(idb_exists(skill->bowling_db, bl->id)) break; // Random direction - dir = rnd()%8; + dir = rnd() % UNIT_DIR_MAX; } else { // Create an empty list of already hit targets db_clear(skill->bowling_db); // Direction is walkpath - dir = (unit->getdir(src)+4)%8; + dir = unit_get_opposite_dir(unit->getdir(src)); } // Add current target to the list of already hit targets idb_put(skill->bowling_db, bl->id, bl); @@ -4758,6 +4757,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl ty = bl->y; for(i=0;i= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); tx -= dirx[dir]; ty -= diry[dir]; // If target cell is a wall then break @@ -4786,18 +4786,21 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl if (bl->id==skill->area_temp[1]) break; if (skill->attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,SD_ANIMATION)) - skill->blown(src,bl,skill->area_temp[2],-1,0); + skill->blown(src, bl, skill->area_temp[2], UNIT_DIR_UNDEFINED, 0); } else { - int x=bl->x,y=bl->y,i,dir; - dir = map->calc_dir(bl,src->x,src->y); + int x = bl->x; + int y = bl->y; + int i; + enum unit_dir dir = map->calc_dir(bl, src->x, src->y); skill->area_temp[1] = bl->id; skill->area_temp[2] = skill->get_blewcount(skill_id,skill_lv); // all the enemies between the caster and the target are hit, as well as the target if (skill->attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,0)) - skill->blown(src,bl,skill->area_temp[2],-1,0); + skill->blown(src, bl, skill->area_temp[2], UNIT_DIR_UNDEFINED, 0); for (i=0;i<4;i++) { map->foreachincell(skill->area_sub,bl->m,x,y,BL_CHAR,src,skill_id,skill_lv, tick,flag|BCT_ENEMY|1,skill->castend_damage_id); + Assert_ret(dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); x += dirx[dir]; y += diry[dir]; } @@ -5019,7 +5022,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl if(rnd()%100 < (10 + 3*skill_lv)) { if( !sd || pc->checkskill(sd,KN_SPEARBOOMERANG) == 0 ) break; // Spear Boomerang auto cast chance only works if you have mastered Spear Boomerang. - skill->blown(src,bl,6,-1,0); + skill->blown(src, bl, 6, UNIT_DIR_UNDEFINED, 0); skill->addtimerskill(src,tick+800,bl->id,0,0,skill_id,skill_lv,BF_WEAPON,flag); skill->castend_damage_id(src,bl,KN_SPEARBOOMERANG,1,tick,0); } @@ -5041,16 +5044,10 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl case KO_JYUMONJIKIRI: case GC_DARKILLUSION: { - short x, y; - short dir = map->calc_dir(bl, src->x, src->y); - - if ( dir < 4 ) { - x = bl->x + 2 * (dir > 0) - 3 * (dir > 0); - y = bl->y + 1 - (dir / 2) - (dir > 2); - } else { - x = bl->x + 2 * (dir > 4) - 1 * (dir > 4); - y = bl->y + (dir / 6) - 1 + (dir > 6); - } + enum unit_dir dir = map->calc_dir(bl, src->x, src->y); + Assert_ret(dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); + short x = bl->x + dirx[dir]; + short y = bl->y + diry[dir]; if ( unit->movepos(src, x, y, 1, 1) ) { clif->slide(src, x, y); @@ -5207,14 +5204,13 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl skill->attack(BF_MAGIC,src,src,bl,skill_id,skill_lv,tick,flag|ELE_DARK); break; case RA_WUGSTRIKE: - if( sd && pc_isridingwug(sd) ){ - short x[8]={0,-1,-1,-1,0,1,1,1}; - short y[8]={1,1,0,-1,-1,-1,0,1}; - uint8 dir = map->calc_dir(bl, src->x, src->y); - - if( unit->movepos(src, bl->x+x[dir], bl->y+y[dir], 1, 1) ) - { - clif->slide(src, bl->x+x[dir], bl->y+y[dir]); + if (sd != NULL && pc_isridingwug(sd)) { + enum unit_dir dir = map->calc_dir(bl, src->x, src->y); + Assert_ret(dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); + short x = bl->x + dirx[dir]; + short y = bl->y + diry[dir]; + if (unit->movepos(src, x, y, 1, 1) != 0) { + clif->slide(src, x, y); clif->fixpos(src); skill->attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag); } @@ -5657,8 +5653,9 @@ static int skill_castend_id(int tid, int64 tick, int id, intptr_t data) } if(ud->skill_id == RG_BACKSTAP) { - uint8 dir = map->calc_dir(src,target->x,target->y),t_dir = unit->getdir(target); - if(check_distance_bl(src, target, 0) || map->check_dir(dir,t_dir)) { + enum unit_dir dir = map->calc_dir(src, target->x, target->y); + enum unit_dir t_dir = unit->getdir(target); + if (check_distance_bl(src, target, 0) || map->check_dir(dir, t_dir) != 0) { break; } } @@ -5877,25 +5874,13 @@ static int skill_castend_id(int tid, int64 tick, int id, intptr_t data) } if (target && target->m == src->m) { //Move character to target anyway. - int dir, x, y; + enum unit_dir dir = map->calc_dir(src, target->x, target->y); + Assert_ret(dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); int dist = 3; // number of cells that asura caster will walk + int x = dist * dirx[dir]; + int y = dist * diry[dir]; - dir = map->calc_dir(src,target->x,target->y); - if (dir > 0 && dir < 4) - x = -dist; - else if (dir > 4) - x = dist; - else - x = 0; - - if (dir > 2 && dir < 6) - y = -dist; - else if (dir == 7 || dir < 2) - y = dist; - else - y = 0; - - if (unit->movepos(src, src->x + x, src->y + y, 1, 1) == 1) { + if (unit->movepos(src, src->x + x, src->y + y, 1, 1) != 0) { //Display movement + animation. clif->slide(src, src->x, src->y); clif->spiritball(src); @@ -7835,7 +7820,9 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * case TK_HIGHJUMP: { - int x,y, dir = unit->getdir(src); + int x; + int y; + enum unit_dir dir = unit->getdir(src); //Fails on noteleport maps, except for GvG and BG maps [Skotlex] if( map->list[src->m].flag.noteleport @@ -8084,11 +8071,16 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * case NPC_RUN: { - const int mask[8][2] = {{0,-1},{1,-1},{1,0},{1,1},{0,1},{-1,1},{-1,0},{-1,-1}}; - uint8 dir = (bl == src)?unit->getdir(src):map->calc_dir(src,bl->x,bl->y); //If cast on self, run forward, else run away. + enum unit_dir dir; + if (bl == src) //If cast on self, run forward, else run away. + dir = unit->getdir(src); + else + dir = map->calc_dir(src, bl->x, bl->y); + Assert_ret(dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); unit->stop_attack(src); //Run skillv tiles overriding the can-move check. - if (unit->walktoxy(src, src->x + skill_lv * mask[dir][0], src->y + skill_lv * mask[dir][1], 2) && md) + if (unit->walktoxy(src, (src->x + skill_lv * -dirx[dir]), + (src->y + skill_lv * -diry[dir]), 2) != 0 && md != NULL) md->state.skillstate = MSS_WALK; //Otherwise it isn't updated in the AI. } break; @@ -9449,7 +9441,9 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * case NC_F_SIDESLIDE: case NC_B_SIDESLIDE: { - uint8 dir = (skill_id == NC_F_SIDESLIDE) ? (unit->getdir(src)+4)%8 : unit->getdir(src); + enum unit_dir dir = unit->getdir(src); + if (skill_id == NC_F_SIDESLIDE) + dir = unit_get_opposite_dir(dir); skill->blown(src,bl,skill->get_blewcount(skill_id,skill_lv),dir,0); clif->slide(src,src->x,src->y); clif->skill_nodamage(src,bl,skill_id,skill_lv,1); @@ -11606,17 +11600,16 @@ static int skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill case WL_EARTHSTRAIN: { - int i, wave = skill_lv + 4, dir = map->calc_dir(src,x,y); + int i; + int wave = skill_lv + 4; + enum unit_dir dir = map->calc_dir(src, x, y); + Assert_ret(dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); int sx = x = src->x, sy = y = src->y; // Store first caster's location to avoid glitch on unit setting - for( i = 1; i <= wave; i++ ) - { - switch( dir ){ - case 0: case 1: case 7: sy = y + i; break; - case 3: case 4: case 5: sy = y - i; break; - case 2: sx = x - i; break; - case 6: sx = x + i; break; - } + for (i = 1; i <= wave; i++) { + sy = y + i * diry[dir]; + if (dir == UNIT_DIR_WEST || dir == UNIT_DIR_EAST) + sx = x + i * dirx[dir]; skill->addtimerskill(src,timer->gettick() + (140 * i),0,sx,sy,skill_id,skill_lv,dir,flag&2); } } @@ -13835,12 +13828,14 @@ static int skill_check_condition_char_sub(struct block_list *bl, va_list ap) } else { switch(skill_id) { - case PR_BENEDICTIO: { - uint8 dir = map->calc_dir(&sd->bl,tsd->bl.x,tsd->bl.y); - dir = (unit->getdir(&sd->bl) + dir)%8; //This adjusts dir to account for the direction the sd is facing. - if ((tsd->job & MAPID_BASEMASK) == MAPID_ACOLYTE && (dir == 2 || dir == 6) //Must be standing to the left/right of Priest. - && sd->status.sp >= 10) + case PR_BENEDICTIO: + { + enum unit_dir dir = map->calc_dir(&sd->bl, tsd->bl.x, tsd->bl.y); + dir = (unit->getdir(&sd->bl) + dir) % UNIT_DIR_MAX; //This adjusts dir to account for the direction the sd is facing. + if ((tsd->job & MAPID_BASEMASK) == MAPID_ACOLYTE && (dir == UNIT_DIR_WEST || dir == UNIT_DIR_EAST) //Must be standing to the left/right of Priest. + && sd->status.sp >= 10) { p_sd[(*c)++]=tsd->bl.id; + } return 1; } case AB_ADORAMUS: @@ -15976,11 +15971,11 @@ struct square { int val2[5]; }; -static void skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int16 y) +static void skill_brandishspear_first(struct square *tc, enum unit_dir dir, int16 x, int16 y) { nullpo_retv(tc); - if(dir == 0){ + if (dir == UNIT_DIR_NORTH) { tc->val1[0]=x-2; tc->val1[1]=x-1; tc->val1[2]=x; @@ -15991,7 +15986,7 @@ static void skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int tc->val2[2]= tc->val2[3]= tc->val2[4]=y-1; - } else if(dir==2){ + } else if (dir == UNIT_DIR_WEST) { tc->val1[0]= tc->val1[1]= tc->val1[2]= @@ -16002,7 +15997,7 @@ static void skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int tc->val2[2]=y; tc->val2[3]=y-1; tc->val2[4]=y-2; - } else if(dir==4){ + } else if (dir == UNIT_DIR_SOUTH) { tc->val1[0]=x-2; tc->val1[1]=x-1; tc->val1[2]=x; @@ -16013,7 +16008,7 @@ static void skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int tc->val2[2]= tc->val2[3]= tc->val2[4]=y+1; - } else if(dir==6){ + } else if (dir == UNIT_DIR_EAST) { tc->val1[0]= tc->val1[1]= tc->val1[2]= @@ -16024,7 +16019,7 @@ static void skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int tc->val2[2]=y; tc->val2[3]=y-1; tc->val2[4]=y-2; - } else if(dir==1){ + } else if (dir == UNIT_DIR_NORTHWEST) { tc->val1[0]=x-1; tc->val1[1]=x; tc->val1[2]=x+1; @@ -16035,7 +16030,7 @@ static void skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int tc->val2[2]=y-1; tc->val2[3]=y; tc->val2[4]=y+1; - } else if(dir==3){ + } else if (dir == UNIT_DIR_SOUTHWEST) { tc->val1[0]=x+3; tc->val1[1]=x+2; tc->val1[2]=x+1; @@ -16046,7 +16041,7 @@ static void skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int tc->val2[2]=y+1; tc->val2[3]=y+2; tc->val2[4]=y+3; - } else if(dir==5){ + } else if (dir == UNIT_DIR_SOUTHEAST) { tc->val1[0]=x+1; tc->val1[1]=x; tc->val1[2]=x-1; @@ -16057,7 +16052,7 @@ static void skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int tc->val2[2]=y+1; tc->val2[3]=y; tc->val2[4]=y-1; - } else if(dir==7){ + } else if (dir == UNIT_DIR_NORTHEAST) { tc->val1[0]=x-3; tc->val1[1]=x-2; tc->val1[2]=x-1; @@ -16072,36 +16067,27 @@ static void skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int } -static void skill_brandishspear_dir(struct square *tc, uint8 dir, int are) +static void skill_brandishspear_dir(struct square *tc, enum unit_dir dir, int are) { - int c; nullpo_retv(tc); + Assert_retv(dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); - for( c = 0; c < 5; c++ ) { - switch( dir ) { - case 0: tc->val2[c]+=are; break; - case 1: tc->val1[c]-=are; tc->val2[c]+=are; break; - case 2: tc->val1[c]-=are; break; - case 3: tc->val1[c]-=are; tc->val2[c]-=are; break; - case 4: tc->val2[c]-=are; break; - case 5: tc->val1[c]+=are; tc->val2[c]-=are; break; - case 6: tc->val1[c]+=are; break; - case 7: tc->val1[c]+=are; tc->val2[c]+=are; break; - } + for (int c = 0; c < 5; c++) { + tc->val1[c] += dirx[dir] * are; + tc->val2[c] += diry[dir] * are; } } static void skill_brandishspear(struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) { int c,n=4; - uint8 dir; struct square tc; int x, y; nullpo_retv(bl); x = bl->x; y = bl->y; - dir = map->calc_dir(src, x, y); + enum unit_dir dir = map->calc_dir(src, x, y); skill->brandishspear_first(&tc,dir,x,y); skill->brandishspear_dir(&tc,dir,4); skill->area_temp[1] = bl->id; @@ -21764,7 +21750,6 @@ void skill_defaults(void) skill->attack_combo2_unknown = skill_attack_combo2_unknown; skill->attack_display_unknown = skill_attack_display_unknown; skill->attack_copy_unknown = skill_attack_copy_unknown; - skill->attack_dir_unknown = skill_attack_dir_unknown; skill->attack_blow_unknown = skill_attack_blow_unknown; skill->attack_post_unknown = skill_attack_post_unknown; skill->timerskill_dead_unknown = skill_timerskill_dead_unknown; diff --git a/src/map/skill.h b/src/map/skill.h index eff9ed7fc..03062b199 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -23,6 +23,7 @@ #include "map/map.h" // struct block_list #include "map/status.h" // enum sc_type +#include "map/unitdefines.h" // enum unit_dir #include "common/hercules.h" #include "common/db.h" #include "common/mmo.h" // MAX_SKILL_DB, struct square @@ -2002,7 +2003,7 @@ struct skill_interface { int (*addtimerskill) (struct block_list *src, int64 tick, int target, int x, int y, uint16 skill_id, uint16 skill_lv, int type, int flag); int (*additional_effect) (struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int dmg_lv, int64 tick); int (*counter_additional_effect) (struct block_list* src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int64 tick); - int (*blown) (struct block_list* src, struct block_list* target, int count, int8 dir, int flag); + int (*blown) (struct block_list* src, struct block_list* target, int count, enum unit_dir dir, int flag); int (*break_equip) (struct block_list *bl, unsigned short where, int rate, int flag); int (*strip_equip) (struct block_list *bl, unsigned short where, int rate, int lv, int time); struct skill_unit_group* (*id2group) (int group_id); @@ -2085,8 +2086,8 @@ struct skill_interface { bool (*dance_switch) (struct skill_unit* su, int flag); int (*check_condition_char_sub) (struct block_list *bl, va_list ap); int (*check_condition_mob_master_sub) (struct block_list *bl, va_list ap); - void (*brandishspear_first) (struct square *tc, uint8 dir, int16 x, int16 y); - void (*brandishspear_dir) (struct square* tc, uint8 dir, int are); + void (*brandishspear_first) (struct square *tc, enum unit_dir dir, int16 x, int16 y); + void (*brandishspear_dir) (struct square* tc, enum unit_dir dir, int are); int (*get_fixed_cast) (int skill_id, int skill_lv); int (*sit_count) (struct block_list *bl, va_list ap); int (*sit_in) (struct block_list *bl, va_list ap); @@ -2162,8 +2163,7 @@ struct skill_interface { void (*attack_combo2_unknown) (int *attack_type, struct block_list* src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *combo); void (*attack_display_unknown) (int *attack_type, struct block_list* src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage); int (*attack_copy_unknown) (int *attack_type, struct block_list* src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); - int (*attack_dir_unknown) (int *attack_type, struct block_list* src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); - void (*attack_blow_unknown) (int *attack_type, struct block_list* src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage, int8 *dir); + void (*attack_blow_unknown) (int *attack_type, struct block_list* src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage, enum unit_dir *dir); void (*attack_post_unknown) (int *attack_type, struct block_list* src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag); bool (*timerskill_dead_unknown) (struct block_list *src, struct unit_data *ud, struct skill_timerskill *skl); void (*timerskill_target_unknown) (int tid, int64 tick, struct block_list *src, struct block_list *target, struct unit_data *ud, struct skill_timerskill *skl); diff --git a/src/map/unit.c b/src/map/unit.c index 3a940665d..19ad5423d 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -150,10 +150,11 @@ static int unit_walktoxy_sub(struct block_list *bl) // Trim the last part of the path to account for range, // but always move at least one cell when requested to move. for (int i = ud->chaserange * 10 - 10; i > 0 && ud->walkpath.path_len > 1;) { - uint8 dir; + enum unit_dir dir; ud->walkpath.path_len--; dir = ud->walkpath.path[ud->walkpath.path_len]; - if ((dir & 1) != 0) + Assert_retr(1, dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); + if (unit_is_diagonal_dir(dir)) i -= MOVE_COST * 20; // When chasing, units will target a diamond-shaped area in range [Playtester] else i -= MOVE_COST; @@ -305,16 +306,15 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) if (ud->walkpath.path_pos >= ud->walkpath.path_len) return 1; - uint8 dir = ud->walkpath.path[ud->walkpath.path_pos]; - if (ud->walkpath.path[ud->walkpath.path_pos] >= 8) - return 1; + enum unit_dir dir = ud->walkpath.path[ud->walkpath.path_pos]; + Assert_retr(1, dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); int x = bl->x; int y = bl->y; ud->dir = dir; - int dx = dirx[(int) dir]; - int dy = diry[(int) dir]; + int dx = dirx[dir]; + int dy = diry[dir]; // Get icewall walk block depending on boss mode (players can't be trapped) unsigned char icewall_walk_block = 0; @@ -759,9 +759,9 @@ static bool unit_run(struct block_list *bl, struct map_session_data *sd, enum sc //Makes bl attempt to run dist cells away from target. Uses hard-paths. static int unit_escape(struct block_list *bl, struct block_list *target, short dist) { - uint8 dir; nullpo_ret(bl); - dir = map->calc_dir(target, bl->x, bl->y); + enum unit_dir dir = map->calc_dir(target, bl->x, bl->y); + Assert_retr(1, dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); while (dist > 0 && map->getcell(bl->m, bl, bl->x + dist * dirx[dir], bl->y + dist * diry[dir], CELL_CHKNOREACH)) dist--; return ( dist > 0 && unit->walktoxy(bl, bl->x + dist*dirx[dir], bl->y + dist*diry[dir], 0) ); @@ -771,7 +771,6 @@ static int unit_escape(struct block_list *bl, struct block_list *target, short d static int unit_movepos(struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath) { short dx,dy; - uint8 dir; struct unit_data *ud = NULL; struct map_session_data *sd = NULL; @@ -790,7 +789,7 @@ static int unit_movepos(struct block_list *bl, short dst_x, short dst_y, int eas ud->to_x = dst_x; ud->to_y = dst_y; - dir = map->calc_dir(bl, dst_x, dst_y); + enum unit_dir dir = map->calc_dir(bl, dst_x, dst_y); ud->dir = dir; dx = dst_x - bl->x; @@ -2100,14 +2099,13 @@ static bool unit_can_reach_bl(struct block_list *bl, struct block_list *tbl, int /*========================================== * Calculates position of Pet/Mercenary/Homunculus/Elemental *------------------------------------------*/ -static int unit_calc_pos(struct block_list *bl, int tx, int ty, uint8 dir) +static int unit_calc_pos(struct block_list *bl, int tx, int ty, enum unit_dir dir) { int dx, dy, x, y; struct unit_data *ud = unit->bl2ud(bl); nullpo_ret(ud); - if(dir > 7) - return 1; + Assert_retr(1, dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); ud->to_x = tx; ud->to_y = ty; @@ -2124,7 +2122,7 @@ static int unit_calc_pos(struct block_list *bl, int tx, int ty, uint8 dir) if (!unit->can_reach_pos(bl, x, y, 0)) { int i; for (i = 0; i < 12; i++) { - int k = rnd()%8; // Pick a Random Dir + enum unit_dir k = rnd() % UNIT_DIR_MAX; // Pick a Random Dir dx = -dirx[k] * 2; dy = -diry[k] * 2; x = tx + dx; diff --git a/src/map/unit.h b/src/map/unit.h index bdee032f8..7c9dc1095 100644 --- a/src/map/unit.h +++ b/src/map/unit.h @@ -139,7 +139,7 @@ struct unit_interface { int (*cancel_combo) (struct block_list *bl); bool (*can_reach_pos) (struct block_list *bl, int x, int y, int easy); bool (*can_reach_bl) (struct block_list *bl, struct block_list *tbl, int range, int easy, short *x, short *y); - int (*calc_pos) (struct block_list *bl, int tx, int ty, uint8 dir); + int (*calc_pos) (struct block_list *bl, int tx, int ty, enum unit_dir dir); int (*attack_timer_sub) (struct block_list *src, int tid, int64 tick); int (*skillcastcancel) (struct block_list *bl, int type); void (*dataset) (struct block_list *bl); -- cgit v1.2.3-70-g09d2 From bf40cd64e6bee575ee03eddee8efb033c8b084b5 Mon Sep 17 00:00:00 2001 From: skyleo Date: Tue, 10 Sep 2019 21:55:48 +0200 Subject: Remove refactor-continue comment --- src/map/unit.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 19ad5423d..d70f76113 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -494,7 +494,6 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) return 0; } -//TODO: CONTINUE REFACTORING HERE static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); -- cgit v1.2.3-70-g09d2 From d663f0c9df2c66211718d84ca5f62a8a387445fb Mon Sep 17 00:00:00 2001 From: skyleo Date: Tue, 10 Sep 2019 22:00:14 +0200 Subject: Apply code-style to nullpointer-checks in unit->delay_walktoxy_timer --- src/map/unit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index d70f76113..790f6b802 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -497,8 +497,7 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); - - if (!bl || bl->prev == NULL) + if (bl == NULL || bl->prev == NULL) return 0; unit->walktoxy(bl, (short)((data>>16)&0xffff), (short)(data&0xffff), 0); return 1; -- cgit v1.2.3-70-g09d2 From 6295bf32b22f6a6193b5434ff001a9993211c8ed Mon Sep 17 00:00:00 2001 From: skyleo Date: Tue, 10 Sep 2019 22:42:12 +0200 Subject: Move bitwise-operations into named variables in unit->delay_walktoxy_timer --- src/map/unit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 790f6b802..d37998e9a 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -499,7 +499,9 @@ static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) struct block_list *bl = map->id2bl(id); if (bl == NULL || bl->prev == NULL) return 0; - unit->walktoxy(bl, (short)((data>>16)&0xffff), (short)(data&0xffff), 0); + short x = (short) ((data >> 16) & 0xffff); + short y = (short) (data & 0xffff); + unit->walktoxy(bl, x, y, 0); return 1; } -- cgit v1.2.3-70-g09d2 From 3d34c37c8affc7ca5711245dadaaf3f3cecbba41 Mon Sep 17 00:00:00 2001 From: skyleo Date: Tue, 10 Sep 2019 22:44:37 +0200 Subject: Change returning error-code in unit->delay_walktoxy_timer to obey code-style guidelines --- src/map/unit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index d37998e9a..75bed7eca 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -498,11 +498,11 @@ static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); if (bl == NULL || bl->prev == NULL) - return 0; + return 1; short x = (short) ((data >> 16) & 0xffff); short y = (short) (data & 0xffff); unit->walktoxy(bl, x, y, 0); - return 1; + return 0; } //flag parameter: -- cgit v1.2.3-70-g09d2 From 02f661dc3b112efb9d4e61d3b15f9f0fa840e9ee Mon Sep 17 00:00:00 2001 From: skyleo Date: Tue, 10 Sep 2019 22:50:48 +0200 Subject: Add documentation for unit->delay_walktoxy_timer --- src/map/unit.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 75bed7eca..8eb490c34 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -494,6 +494,14 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) return 0; } +/** + * Timer for delayed execution of unit->walktoxy once triggered + * @param tid: Timer ID, unused + * @param tick: Tick, unused + * @param id: ID of block_list to execute the action + * @param data: intptr_t filled with x-coord in highest 16 bits and y-coord in lowest 16 bits + * @return 0: success, 1: failure + */ static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); -- cgit v1.2.3-70-g09d2 From 769f5801f3499f525071cd0363ca9e66ef46f2cf Mon Sep 17 00:00:00 2001 From: skyleo Date: Wed, 11 Sep 2019 02:21:31 +0200 Subject: Use *DWord functions for saving x & y into data of unit->delay_walktoxy_timer --- src/map/unit.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 8eb490c34..f5784b405 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -57,6 +57,7 @@ #include "common/showmsg.h" #include "common/socket.h" #include "common/timer.h" +#include "common/utils.h" #include #include @@ -499,7 +500,7 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) * @param tid: Timer ID, unused * @param tick: Tick, unused * @param id: ID of block_list to execute the action - * @param data: intptr_t filled with x-coord in highest 16 bits and y-coord in lowest 16 bits + * @param data: uint32 data cast to intptr_t with x-coord in lowest 16 bits and y-coord in highest 16 bits * @return 0: success, 1: failure */ static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) @@ -507,8 +508,8 @@ static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) struct block_list *bl = map->id2bl(id); if (bl == NULL || bl->prev == NULL) return 1; - short x = (short) ((data >> 16) & 0xffff); - short y = (short) (data & 0xffff); + short x = (short)GetWord((uint32)data, 0); + short y = (short)GetWord((uint32)data, 1); unit->walktoxy(bl, x, y, 0); return 0; } @@ -548,7 +549,7 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) if (flag&4 && DIFF_TICK(ud->canmove_tick, timer->gettick()) > 0 && DIFF_TICK(ud->canmove_tick, timer->gettick()) < 2000) { // Delay walking command. [Skotlex] - timer->add(ud->canmove_tick+1, unit->delay_walktoxy_timer, bl->id, (x<<16)|(y&0xFFFF)); + timer->add(ud->canmove_tick + 1, unit->delay_walktoxy_timer, bl->id, (intptr_t)MakeDWord((uint16)x, (uint16)y)); return 1; } -- cgit v1.2.3-70-g09d2 From 40e0422b8754dc5b0f57b2dd5c5892798a598c22 Mon Sep 17 00:00:00 2001 From: skyleo Date: Wed, 11 Sep 2019 21:55:37 +0200 Subject: Cleanup nullpointer checks in unit->walktoxy --- src/map/unit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index f5784b405..61a85d431 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -529,7 +529,8 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) ud = unit->bl2ud(bl); - if( ud == NULL) return 0; + if (ud == NULL) + return 0; if (battle_config.check_occupied_cells && (flag&8) && !map->closest_freecell(bl->m, bl, &x, &y, BL_CHAR|BL_NPC, 1)) //This might change x and y return 0; @@ -564,7 +565,7 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) unit->stop_stepaction(bl); // unit->walktoxy removes any remembered stepaction and resets ud->target_to sc = status->get_sc(bl); - if( sc ) { + if (sc != NULL) { if( sc->data[SC_CONFUSION] || sc->data[SC__CHAOS] ) //Randomize the target position map->random_dir(bl, &ud->to_x, &ud->to_y); if( sc->data[SC_COMBOATTACK] ) -- cgit v1.2.3-70-g09d2 From 43bc7911460a53a2ebed4b54d81c473b9e6567b8 Mon Sep 17 00:00:00 2001 From: skyleo Date: Wed, 11 Sep 2019 22:19:28 +0200 Subject: Correct checks mistreating non-boolean values in unit->walktoxy --- src/map/unit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 61a85d431..9526a1f79 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -532,7 +532,7 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) if (ud == NULL) return 0; - if (battle_config.check_occupied_cells && (flag&8) && !map->closest_freecell(bl->m, bl, &x, &y, BL_CHAR|BL_NPC, 1)) //This might change x and y + if (battle_config.check_occupied_cells != 0 && (flag & 8) != 0 && !map->closest_freecell(bl->m, bl, &x, &y, BL_CHAR | BL_NPC, 1)) // This might change x and y return 0; if (!path->search(&wpd, bl, bl->m, bl->x, bl->y, x, y, flag&1, CELL_CHKNOPASS)) // Count walk path cells @@ -547,14 +547,14 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) if ((wpd.path_len > battle_config.max_walk_path) && (bl->type != BL_NPC)) return 0; - if (flag&4 && DIFF_TICK(ud->canmove_tick, timer->gettick()) > 0 && + if ((flag & 4) != 0 && DIFF_TICK(ud->canmove_tick, timer->gettick()) > 0 && DIFF_TICK(ud->canmove_tick, timer->gettick()) < 2000) { // Delay walking command. [Skotlex] timer->add(ud->canmove_tick + 1, unit->delay_walktoxy_timer, bl->id, (intptr_t)MakeDWord((uint16)x, (uint16)y)); return 1; } - if(!(flag&2) && (!(status_get_mode(bl)&MD_CANMOVE) || !unit->can_move(bl))) + if ((flag & 2) == 0 && ((status_get_mode(bl) & MD_CANMOVE) == 0 || unit->can_move(bl) == 0)) return 0; ud->state.walk_easy = flag&1; @@ -566,9 +566,9 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) sc = status->get_sc(bl); if (sc != NULL) { - if( sc->data[SC_CONFUSION] || sc->data[SC__CHAOS] ) //Randomize the target position + if (sc->data[SC_CONFUSION] != NULL || sc->data[SC__CHAOS] != NULL) //Randomize the target position map->random_dir(bl, &ud->to_x, &ud->to_y); - if( sc->data[SC_COMBOATTACK] ) + if (sc->data[SC_COMBOATTACK] != NULL) status_change_end(bl, SC_COMBOATTACK, INVALID_TIMER); } -- cgit v1.2.3-70-g09d2 From 0817191184bd867836a7fcc30d65305b10964a5f Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 12 Sep 2019 00:33:54 +0200 Subject: Change returning error-code in unit->walktoxy to obey code-style guidelines --- src/map/elemental.c | 4 ++-- src/map/mob.c | 6 +++--- src/map/pet.c | 5 +++-- src/map/script.c | 17 ++++++++++------- src/map/skill.c | 2 +- src/map/unit.c | 28 ++++++++++++++++------------ 6 files changed, 35 insertions(+), 27 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/elemental.c b/src/map/elemental.c index 1c1d98634..e9b6fa372 100644 --- a/src/map/elemental.c +++ b/src/map/elemental.c @@ -788,8 +788,8 @@ static int elemental_ai_sub_timer(struct elemental_data *ed, struct map_session_ return 0; //Already walking to him if( DIFF_TICK(tick, ed->ud.canmove_tick) < 0 ) return 0; //Can't move yet. - if( map->search_freecell(&ed->bl, sd->bl.m, &x, &y, MIN_ELEDISTANCE, MIN_ELEDISTANCE, 1) - && unit->walktoxy(&ed->bl, x, y, 0) ) + if (map->search_freecell(&ed->bl, sd->bl.m, &x, &y, MIN_ELEDISTANCE, MIN_ELEDISTANCE, 1) != 0 + && unit->walktoxy(&ed->bl, x, y, 0) == 0) return 0; } diff --git a/src/map/mob.c b/src/map/mob.c index 0830e5a5a..431bdbe0d 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1462,7 +1462,7 @@ static int mob_ai_sub_hard_slavemob(struct mob_data *md, int64 tick) // If master is BL_MOB and in battle, lock & chase to master's target instead, unless configured not to. if ((battle_config.slave_chase_masters_chasetarget == 0 || (m_md != NULL && !mob->is_in_battle_state(m_md))) && map->search_freecell(&md->bl, bl->m, &x, &y, MOB_SLAVEDISTANCE, MOB_SLAVEDISTANCE, 1) - && unit->walktoxy(&md->bl, x, y, 0)) + && unit->walktoxy(&md->bl, x, y, 0) == 0) return 1; } } else if (bl->m != md->bl.m && map_flag_gvg(md->bl.m)) { @@ -1576,9 +1576,9 @@ static int mob_randomwalk(struct mob_data *md, int64 tick) x+=md->bl.x; y+=md->bl.y; - if (((x != md->bl.x) || (y != md->bl.y)) && map->getcell(md->bl.m, &md->bl, x, y, CELL_CHKPASS) && unit->walktoxy(&md->bl, x, y, 8)) { + if ((x != md->bl.x || y != md->bl.y) && map->getcell(md->bl.m, &md->bl, x, y, CELL_CHKPASS) != 0 + && unit->walktoxy(&md->bl, x, y, 8) == 0) break; - } } if(i==retrycount){ md->move_fail_count++; diff --git a/src/map/pet.c b/src/map/pet.c index f20de2650..0537baaa7 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -891,7 +891,8 @@ static int pet_randomwalk(struct pet_data *pd, int64 tick) int r=rnd(); int x=pd->bl.x+r%(d*2+1)-d; int y=pd->bl.y+r/(d*2+1)%(d*2+1)-d; - if(map->getcell (pd->bl.m, &pd->bl, x, y, CELL_CHKPASS) && unit->walktoxy(&pd->bl, x, y, 0)) { + if (map->getcell(pd->bl.m, &pd->bl, x, y, CELL_CHKPASS) != 0 + && unit->walktoxy(&pd->bl, x, y, 0) == 0) { pd->move_fail_count=0; break; } @@ -991,7 +992,7 @@ static int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int return 0; //Already walking to him unit->calc_pos(&pd->bl, sd->bl.x, sd->bl.y, sd->ud.dir); - if(!unit->walktoxy(&pd->bl,pd->ud.to_x,pd->ud.to_y,0)) + if (unit->walktoxy(&pd->bl, pd->ud.to_x, pd->ud.to_y, 0) != 0) pet->randomwalk(pd,tick); return 0; diff --git a/src/map/script.c b/src/map/script.c index 28d06a8f1..d6462384d 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -19680,7 +19680,7 @@ static BUILDIN(setunitdata) unit->warp(bl, (short) val, (short) val2, (short) val3, CLR_TELEPORT); break; case UDT_WALKTOXY: - if (!unit->walktoxy(bl, (short) val, (short) val2, 2)) + if (unit->walktoxy(bl, (short)val, (short)val2, 2) != 0) unit->movepos(bl, (short) val, (short) val2, 0, 0); break; case UDT_SPEED: @@ -19851,7 +19851,7 @@ static BUILDIN(setunitdata) unit->warp(bl, (short) val, (short) val2, (short) val3, CLR_TELEPORT); break; case UDT_WALKTOXY: - if (!unit->walktoxy(bl, (short) val, (short) val2, 2)) + if (unit->walktoxy(bl, (short)val, (short)val2, 2) != 0) unit->movepos(bl, (short) val, (short) val2, 0, 0); break; case UDT_SPEED: @@ -19990,7 +19990,7 @@ static BUILDIN(setunitdata) unit->warp(bl, (short) val, (short) val2, (short) val3, CLR_TELEPORT); break; case UDT_WALKTOXY: - if (!unit->walktoxy(bl, (short) val, (short) val2, 2)) + if (unit->walktoxy(bl, (short)val, (short)val2, 2) != 0) unit->movepos(bl, (short) val, (short) val2, 0, 0); break; case UDT_SPEED: @@ -20123,7 +20123,7 @@ static BUILDIN(setunitdata) unit->warp(bl, (short) val, (short) val2, (short) val3, CLR_TELEPORT); break; case UDT_WALKTOXY: - if (!unit->walktoxy(bl, (short) val, (short) val2, 2)) + if (unit->walktoxy(bl, (short)val, (short)val2, 2) != 0) unit->movepos(bl, (short) val, (short) val2, 0, 0); break; case UDT_SPEED: @@ -20257,7 +20257,7 @@ static BUILDIN(setunitdata) unit->warp(bl, (short) val, (short) val2, (short) val3, CLR_TELEPORT); break; case UDT_WALKTOXY: - if (!unit->walktoxy(bl, (short) val, (short) val2, 2)) + if (unit->walktoxy(bl, (short)val, (short)val2, 2) != 0) unit->movepos(bl, (short) val, (short) val2, 0, 0); break; case UDT_SPEED: @@ -20386,7 +20386,7 @@ static BUILDIN(setunitdata) unit->warp(bl, (short) val, (short) val2, (short) val3, CLR_TELEPORT); break; case UDT_WALKTOXY: - if (!unit->walktoxy(bl, (short) val, (short) val2, 2)) + if (unit->walktoxy(bl, (short)val, (short)val2, 2) != 0) unit->movepos(bl, (short) val, (short) val2, 0, 0); break; case UDT_CLASS: @@ -21121,7 +21121,10 @@ static BUILDIN(unitwalk) if (script_hasdata(st, 4)) { int x = script_getnum(st, 3); int y = script_getnum(st, 4); - script_pushint(st, unit->walktoxy(bl, x, y, 0));// We'll use harder calculations. + if (unit->walktoxy(bl, x, y, 0) == 0) // We'll use harder calculations. + script_pushint(st, 1); + else + script_pushint(st, 0); } else { int target_id = script_getnum(st, 3); diff --git a/src/map/skill.c b/src/map/skill.c index 668c1849c..693cbfe2c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8080,7 +8080,7 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * unit->stop_attack(src); //Run skillv tiles overriding the can-move check. if (unit->walktoxy(src, (src->x + skill_lv * -dirx[dir]), - (src->y + skill_lv * -diry[dir]), 2) != 0 && md != NULL) + (src->y + skill_lv * -diry[dir]), 2) == 0 && md != NULL) md->state.skillstate = MSS_WALK; //Otherwise it isn't updated in the AI. } break; diff --git a/src/map/unit.c b/src/map/unit.c index 9526a1f79..ba0dec9dc 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -519,43 +519,44 @@ static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) //&2 -> force walking //&4 -> Delay walking if the reason you can't walk is the canwalk delay //&8 -> Search for an unoccupied cell and cancel if none available +//@return 0: success, 1: failure static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) { struct unit_data* ud = NULL; struct status_change* sc = NULL; struct walkpath_data wpd; - nullpo_ret(bl); + nullpo_retr(1, bl); ud = unit->bl2ud(bl); if (ud == NULL) - return 0; + return 1; if (battle_config.check_occupied_cells != 0 && (flag & 8) != 0 && !map->closest_freecell(bl->m, bl, &x, &y, BL_CHAR | BL_NPC, 1)) // This might change x and y - return 0; + return 1; if (!path->search(&wpd, bl, bl->m, bl->x, bl->y, x, y, flag&1, CELL_CHKNOPASS)) // Count walk path cells - return 0; + return 1; #ifdef OFFICIAL_WALKPATH if( !path->search_long(NULL, bl, bl->m, bl->x, bl->y, x, y, CELL_CHKNOPASS) // Check if there is an obstacle between && (wpd.path_len > (battle_config.max_walk_path/17)*14) // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett] && (bl->type != BL_NPC) ) // If type is a NPC, please disregard. - return 0; + return 1; #endif if ((wpd.path_len > battle_config.max_walk_path) && (bl->type != BL_NPC)) - return 0; + return 1; if ((flag & 4) != 0 && DIFF_TICK(ud->canmove_tick, timer->gettick()) > 0 && DIFF_TICK(ud->canmove_tick, timer->gettick()) < 2000) { // Delay walking command. [Skotlex] timer->add(ud->canmove_tick + 1, unit->delay_walktoxy_timer, bl->id, (intptr_t)MakeDWord((uint16)x, (uint16)y)); - return 1; + return 0; } if ((flag & 2) == 0 && ((status_get_mode(bl) & MD_CANMOVE) == 0 || unit->can_move(bl) == 0)) - return 0; + return 1; ud->state.walk_easy = flag&1; ud->to_x = x; @@ -576,7 +577,7 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) // When you come to the center of the grid because the change of destination while you're walking right now // Call a function from a timer unit->walktoxy_sub ud->state.change_walk_target = 1; - return 1; + return 0; } return unit->walktoxy_sub(bl); @@ -749,14 +750,14 @@ static bool unit_run(struct block_list *bl, struct map_session_data *sd, enum sc return false; } - if( unit->walktoxy(bl, to_x, to_y, 1) ) + if (unit->walktoxy(bl, to_x, to_y, 1) == 0) return true; //There must be an obstacle nearby. Attempt walking one cell at a time. do { to_x -= dir_x; to_y -= dir_y; - } while (--i > 0 && !unit->walktoxy(bl, to_x, to_y, 1)); + } while (--i > 0 && unit->walktoxy(bl, to_x, to_y, 1) != 0); if ( i == 0 ) { unit->run_hit(bl, sc, sd, type); @@ -774,7 +775,10 @@ static int unit_escape(struct block_list *bl, struct block_list *target, short d Assert_retr(1, dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); while (dist > 0 && map->getcell(bl->m, bl, bl->x + dist * dirx[dir], bl->y + dist * diry[dir], CELL_CHKNOREACH)) dist--; - return ( dist > 0 && unit->walktoxy(bl, bl->x + dist*dirx[dir], bl->y + dist*diry[dir], 0) ); + if (dist > 0 && unit->walktoxy(bl, bl->x + dist * dirx[dir], bl->y + dist * diry[dir], 0) == 0) + return 1; + else + return 0; } //Instant warp function. -- cgit v1.2.3-70-g09d2 From f6986831b06044def3e389283d382d54f4d41e7c Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 12 Sep 2019 00:37:07 +0200 Subject: Remove "already refactored" comment --- src/map/unit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index ba0dec9dc..d1d73ff30 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -660,7 +660,7 @@ static int unit_walktobl(struct block_list *bl, struct block_list *tbl, int rang if(!unit->can_move(bl)) return 0; - if (unit->walktoxy_sub(bl) == 0) { //ALREADY REFACTORED + if (unit->walktoxy_sub(bl) == 0) { set_mobstate(bl, flag&2); return 0; } -- cgit v1.2.3-70-g09d2 From 33eb8cd6bf37336da5a7305531aa010e1b9ace30 Mon Sep 17 00:00:00 2001 From: skyleo Date: Wed, 2 Oct 2019 22:37:43 +0200 Subject: Update Coding Style of unit->walktoxy --- src/map/unit.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index d1d73ff30..c67a7e919 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -533,32 +533,38 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) if (ud == NULL) return 1; - if (battle_config.check_occupied_cells != 0 && (flag & 8) != 0 && !map->closest_freecell(bl->m, bl, &x, &y, BL_CHAR | BL_NPC, 1)) // This might change x and y - return 1; + if ((flag & 8) != 0 && battle_config.check_occupied_cells != 0) { + if (!map->closest_freecell(bl->m, bl, &x, &y, BL_CHAR | BL_NPC, 1)) // This might change x and y + return 1; + } - if (!path->search(&wpd, bl, bl->m, bl->x, bl->y, x, y, flag&1, CELL_CHKNOPASS)) // Count walk path cells + if (!path->search(&wpd, bl, bl->m, bl->x, bl->y, x, y, flag & 1, CELL_CHKNOPASS)) // Count walk path cells return 1; + if (bl->type != BL_NPC) { #ifdef OFFICIAL_WALKPATH - if( !path->search_long(NULL, bl, bl->m, bl->x, bl->y, x, y, CELL_CHKNOPASS) // Check if there is an obstacle between - && (wpd.path_len > (battle_config.max_walk_path/17)*14) // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett] - && (bl->type != BL_NPC) ) // If type is a NPC, please disregard. - return 1; + // Check if there is an obstacle between + // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett] + if (!path->search_long(NULL, bl, bl->m, bl->x, bl->y, x, y, CELL_CHKNOPASS) + && (wpd.path_len > (battle_config.max_walk_path / 17) * 14)) + return 1; #endif - if ((wpd.path_len > battle_config.max_walk_path) && (bl->type != BL_NPC)) - return 1; + if (wpd.path_len > battle_config.max_walk_path) + return 1; + } - if ((flag & 4) != 0 && DIFF_TICK(ud->canmove_tick, timer->gettick()) > 0 && - DIFF_TICK(ud->canmove_tick, timer->gettick()) < 2000) { + if ((flag & 4) != 0 && DIFF_TICK(ud->canmove_tick, timer->gettick()) > 0 + && DIFF_TICK(ud->canmove_tick, timer->gettick()) < 2000) { // Delay walking command. [Skotlex] - timer->add(ud->canmove_tick + 1, unit->delay_walktoxy_timer, bl->id, (intptr_t)MakeDWord((uint16)x, (uint16)y)); + timer->add(ud->canmove_tick + 1, unit->delay_walktoxy_timer, bl->id, + (intptr_t)MakeDWord((uint16)x, (uint16)y)); return 0; } if ((flag & 2) == 0 && ((status_get_mode(bl) & MD_CANMOVE) == 0 || unit->can_move(bl) == 0)) return 1; - ud->state.walk_easy = flag&1; + ud->state.walk_easy = flag & 1; ud->to_x = x; ud->to_y = y; unit->stop_attack(bl); //Sets target to 0 @@ -567,13 +573,13 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) sc = status->get_sc(bl); if (sc != NULL) { - if (sc->data[SC_CONFUSION] != NULL || sc->data[SC__CHAOS] != NULL) //Randomize the target position + if (sc->data[SC_CONFUSION] != NULL || sc->data[SC__CHAOS] != NULL) // Randomize the target position map->random_dir(bl, &ud->to_x, &ud->to_y); if (sc->data[SC_COMBOATTACK] != NULL) status_change_end(bl, SC_COMBOATTACK, INVALID_TIMER); } - if(ud->walktimer != INVALID_TIMER) { + if (ud->walktimer != INVALID_TIMER) { // When you come to the center of the grid because the change of destination while you're walking right now // Call a function from a timer unit->walktoxy_sub ud->state.change_walk_target = 1; -- cgit v1.2.3-70-g09d2 From 7879d7be752fe7488c8d1653b0ca88e6574b9e4a Mon Sep 17 00:00:00 2001 From: skyleo Date: Wed, 2 Oct 2019 23:58:30 +0200 Subject: Add documentation for unit->walktoxy --- src/map/unit.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index c67a7e919..3a1f2a9f9 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -514,12 +514,19 @@ static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) return 0; } -//flag parameter: -//&1 -> 1/0 = easy/hard -//&2 -> force walking -//&4 -> Delay walking if the reason you can't walk is the canwalk delay -//&8 -> Search for an unoccupied cell and cancel if none available -//@return 0: success, 1: failure +/** + * Makes a unit walk to (x, y) coordinates + * @param bl: block_list of unit to move + * @param x: x-coordinate + * @param y: y-coordinate + * @param flag: flag paramater with following options: + * - `& 1` -> 1/0 = easy / hard + * - `& 2` -> Force walking + * - `& 4` -> Delay walking, if the reason you can't walk is the `canwalk delay` + * - `& 8` -> Search for an unoccupied cell and cancel if none available + * . + * @return 0: success, 1: failure + */ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) { struct unit_data* ud = NULL; -- cgit v1.2.3-70-g09d2 From a70f43dc90f634b1e840d3e77895c433bcc91d71 Mon Sep 17 00:00:00 2001 From: skyleo Date: Wed, 2 Oct 2019 23:59:32 +0200 Subject: Add TODO-comment suggesting enum for unit->walktoxy --- src/map/unit.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 3a1f2a9f9..b0d7a6767 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -529,6 +529,7 @@ static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) */ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) { + // TODO: change flag to enum? [skyleo] struct unit_data* ud = NULL; struct status_change* sc = NULL; struct walkpath_data wpd; -- cgit v1.2.3-70-g09d2 From 349f811ab9921e5e2d91411f822b9b6c916a60f7 Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 00:04:01 +0200 Subject: Add documentation for set_mobstate --- src/map/unit.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index b0d7a6767..37a211ba1 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -597,7 +597,12 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) return unit->walktoxy_sub(bl); } -//To set Mob's CHASE/FOLLOW states (shouldn't be done if there's no path to reach) +/** + * Sets mob's CHASE / FOLLOW states. + * WARNING: This shouldn't be done if there's no path to reach + * @param bl: block_list of mob + * @param flag: if set to 0 this function will set nothing + */ static inline void set_mobstate(struct block_list *bl, int flag) { struct mob_data* md = BL_CAST(BL_MOB,bl); -- cgit v1.2.3-70-g09d2 From 38108320a6ab0a27d9deba967f553b2a6f8b9537 Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 00:15:13 +0200 Subject: Update Coding Style for set_mobstate --- src/map/unit.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 37a211ba1..5d3011aba 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -605,10 +605,14 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) */ static inline void set_mobstate(struct block_list *bl, int flag) { - struct mob_data* md = BL_CAST(BL_MOB,bl); + struct mob_data* md = BL_CAST(BL_MOB, bl); - if( md && flag ) - md->state.skillstate = md->state.aggressive ? MSS_FOLLOW : MSS_RUSH; + if (md != NULL && flag != 0) { + if (md->state.aggressive != 0) + md->state.skillstate = MSS_FOLLOW; + else + md->state.skillstate = MSS_RUSH; + } } static int unit_walktobl_sub(int tid, int64 tick, int id, intptr_t data) -- cgit v1.2.3-70-g09d2 From 193956af55b94852917fc236a431ae384bf78d84 Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 01:25:04 +0200 Subject: Add nullpo_retr for unit_data in unit->walktobl_sub --- src/map/unit.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 5d3011aba..64a849384 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -618,9 +618,13 @@ static inline void set_mobstate(struct block_list *bl, int flag) static int unit_walktobl_sub(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); - struct unit_data *ud = bl?unit->bl2ud(bl):NULL; + if (bl == NULL) + return 1; + struct unit_data *ud = unit->bl2ud(bl); + if (ud == NULL) + return 1; - if (ud && ud->walktimer == INVALID_TIMER && ud->target == data) { + if (ud->walktimer == INVALID_TIMER && ud->target == data) { if (DIFF_TICK(ud->canmove_tick, tick) > 0) //Keep waiting? timer->add(ud->canmove_tick+1, unit->walktobl_sub, id, data); else if (unit->can_move(bl)) { -- cgit v1.2.3-70-g09d2 From 665855f460eb454d028f9f81c6779539bef7e494 Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 02:11:48 +0200 Subject: Update Coding Style for unit->walktobl_sub --- src/map/unit.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 64a849384..bff75d6bd 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -625,12 +625,10 @@ static int unit_walktobl_sub(int tid, int64 tick, int id, intptr_t data) return 1; if (ud->walktimer == INVALID_TIMER && ud->target == data) { - if (DIFF_TICK(ud->canmove_tick, tick) > 0) //Keep waiting? - timer->add(ud->canmove_tick+1, unit->walktobl_sub, id, data); - else if (unit->can_move(bl)) { - if (unit->walktoxy_sub(bl) == 0) - set_mobstate(bl, ud->state.attack_continue); - } + if (DIFF_TICK(ud->canmove_tick, tick) > 0) // Keep waiting? + timer->add(ud->canmove_tick + 1, unit->walktobl_sub, id, data); + else if (unit->can_move(bl) != 0 && unit->walktoxy_sub(bl) == 0) + set_mobstate(bl, ud->state.attack_continue); } return 0; } -- cgit v1.2.3-70-g09d2 From 63b3f95389e56437fc630e7f6051f1a419322fee Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 03:16:15 +0200 Subject: Rename unit->walktobl_sub to unit->walktobl_timer --- src/map/unit.c | 12 ++++++------ src/map/unit.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index bff75d6bd..644fd47bb 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -615,7 +615,7 @@ static inline void set_mobstate(struct block_list *bl, int flag) } } -static int unit_walktobl_sub(int tid, int64 tick, int id, intptr_t data) +static int unit_walktobl_timer(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); if (bl == NULL) @@ -626,7 +626,7 @@ static int unit_walktobl_sub(int tid, int64 tick, int id, intptr_t data) if (ud->walktimer == INVALID_TIMER && ud->target == data) { if (DIFF_TICK(ud->canmove_tick, tick) > 0) // Keep waiting? - timer->add(ud->canmove_tick + 1, unit->walktobl_sub, id, data); + timer->add(ud->canmove_tick + 1, unit->walktobl_timer, id, data); else if (unit->can_move(bl) != 0 && unit->walktoxy_sub(bl) == 0) set_mobstate(bl, ud->state.attack_continue); } @@ -678,7 +678,7 @@ static int unit_walktobl(struct block_list *bl, struct block_list *tbl, int rang if (DIFF_TICK(ud->canmove_tick, timer->gettick()) > 0) { //Can't move, wait a bit before invoking the movement. - timer->add(ud->canmove_tick+1, unit->walktobl_sub, bl->id, ud->target); + timer->add(ud->canmove_tick + 1, unit->walktobl_timer, bl->id, ud->target); return 1; } @@ -1291,7 +1291,7 @@ static int unit_set_walkdelay(struct block_list *bl, int64 tick, int delay, int } else { unit->stop_walking(bl, STOPWALKING_FLAG_NEXTCELL); if (ud->target) - timer->add(ud->canmove_tick+1, unit->walktobl_sub, bl->id, ud->target); + timer->add(ud->canmove_tick + 1, unit->walktobl_timer, bl->id, ud->target); } } } @@ -3025,7 +3025,7 @@ static int do_init_unit(bool minimal) timer->add_func_list(unit->attack_timer, "unit_attack_timer"); timer->add_func_list(unit->walktoxy_timer,"unit_walktoxy_timer"); - timer->add_func_list(unit->walktobl_sub, "unit_walktobl_sub"); + timer->add_func_list(unit->walktobl_timer, "unit_walktobl_timer"); timer->add_func_list(unit->delay_walktoxy_timer,"unit_delay_walktoxy_timer"); timer->add_func_list(unit->step_timer,"unit_step_timer"); return 0; @@ -3052,7 +3052,7 @@ void unit_defaults(void) unit->walktoxy_sub = unit_walktoxy_sub; unit->delay_walktoxy_timer = unit_delay_walktoxy_timer; unit->walktoxy = unit_walktoxy; - unit->walktobl_sub = unit_walktobl_sub; + unit->walktobl_timer = unit_walktobl_timer; unit->walktobl = unit_walktobl; unit->run = unit_run; unit->run_hit = unit_run_hit; diff --git a/src/map/unit.h b/src/map/unit.h index 7c9dc1095..dd338d076 100644 --- a/src/map/unit.h +++ b/src/map/unit.h @@ -110,7 +110,7 @@ struct unit_interface { int (*walktoxy_sub) (struct block_list *bl); int (*delay_walktoxy_timer) (int tid, int64 tick, int id, intptr_t data); int (*walktoxy) (struct block_list *bl, short x, short y, int flag); - int (*walktobl_sub) (int tid, int64 tick, int id, intptr_t data); + int (*walktobl_timer) (int tid, int64 tick, int id, intptr_t data); int (*walktobl) (struct block_list *bl, struct block_list *tbl, int range, int flag); bool (*run) (struct block_list *bl, struct map_session_data *sd, enum sc_type type); void (*run_hit) (struct block_list *bl, struct status_change *sc, struct map_session_data *sd, enum sc_type type); -- cgit v1.2.3-70-g09d2 From 6b7bfcf7508a7d3778082190a0f709775453649a Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 03:59:08 +0200 Subject: Add documentation for unit->walktobl_timer --- src/map/unit.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 644fd47bb..3c86ff02d 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -615,6 +615,15 @@ static inline void set_mobstate(struct block_list *bl, int flag) } } +/** + * Timer used for when a unit can't walk towards its target yet due to it's canmove_tick, + * keeps retrying until it works or target changes. + * @param tid: Timer ID, unused + * @param tick: Tick, unused + * @param id: ID of block_list to execute the action + * @param data: ID of block_list to walk towards + * @return 0: success, 1: failure + */ static int unit_walktobl_timer(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); -- cgit v1.2.3-70-g09d2 From c9f4cabfbd516155d4ad9222dfaa4ec2d228fc13 Mon Sep 17 00:00:00 2001 From: skyleo Date: Thu, 3 Oct 2019 03:59:54 +0200 Subject: Remove unnecessary parameter of set_mobstate --- src/map/unit.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 3c86ff02d..04035da98 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -598,16 +598,15 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) } /** - * Sets mob's CHASE / FOLLOW states. + * Sets CHASE / FOLLOW states, in case bl is a mob. * WARNING: This shouldn't be done if there's no path to reach * @param bl: block_list of mob - * @param flag: if set to 0 this function will set nothing */ -static inline void set_mobstate(struct block_list *bl, int flag) +static inline void set_mobstate(struct block_list *bl) { struct mob_data* md = BL_CAST(BL_MOB, bl); - if (md != NULL && flag != 0) { + if (md != NULL) { if (md->state.aggressive != 0) md->state.skillstate = MSS_FOLLOW; else @@ -636,8 +635,8 @@ static int unit_walktobl_timer(int tid, int64 tick, int id, intptr_t data) if (ud->walktimer == INVALID_TIMER && ud->target == data) { if (DIFF_TICK(ud->canmove_tick, tick) > 0) // Keep waiting? timer->add(ud->canmove_tick + 1, unit->walktobl_timer, id, data); - else if (unit->can_move(bl) != 0 && unit->walktoxy_sub(bl) == 0) - set_mobstate(bl, ud->state.attack_continue); + else if (unit->can_move(bl) != 0 && unit->walktoxy_sub(bl) == 0 && ud->state.attack_continue != 0) + set_mobstate(bl); } return 0; } @@ -681,7 +680,8 @@ static int unit_walktobl(struct block_list *bl, struct block_list *tbl, int rang if(ud->walktimer != INVALID_TIMER) { ud->state.change_walk_target = 1; - set_mobstate(bl, flag&2); + if ((flag & 2) != 0) + set_mobstate(bl); return 1; } @@ -694,8 +694,8 @@ static int unit_walktobl(struct block_list *bl, struct block_list *tbl, int rang if(!unit->can_move(bl)) return 0; - if (unit->walktoxy_sub(bl) == 0) { - set_mobstate(bl, flag&2); + if (unit->walktoxy_sub(bl) == 0 && (flag & 2) != 0) { + set_mobstate(bl); return 0; } return 0; -- cgit v1.2.3-70-g09d2 From ddd62450518afd71bd72f914196b6a2eac7e6bd3 Mon Sep 17 00:00:00 2001 From: skyleo Date: Sun, 17 Nov 2019 13:35:15 +0100 Subject: Change the name of all functions which got their return-value meaning changed --- src/map/clif.c | 8 ++--- src/map/elemental.c | 2 +- src/map/mob.c | 6 ++-- src/map/pet.c | 4 +-- src/map/script.c | 28 ++++++++--------- src/map/skill.c | 14 ++++----- src/map/unit.c | 88 ++++++++++++++++++++++++++--------------------------- src/map/unit.h | 12 ++++---- 8 files changed, 81 insertions(+), 81 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/clif.c b/src/map/clif.c index a0ffeac32..a8b6ea768 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -4900,7 +4900,7 @@ static int clif_damage(struct block_list *src, struct block_list *dst, int sdela } if(src == dst) { - unit->setdir(src,unit->getdir(src)); + unit->set_dir(src, unit->getdir(src)); } //Return adjusted can't walk delay for further processing. @@ -11130,7 +11130,7 @@ static void clif_parse_WalkToXY(int fd, struct map_session_data *sd) //Set last idle time... [Skotlex] pc->update_idle_time(sd, BCIDLE_WALK); - unit->walktoxy(&sd->bl, x, y, 4); + unit->walk_toxy(&sd->bl, x, y, 4); } /// Notification about the result of a disconnect request (ZC_ACK_REQ_DISCONNECT). @@ -16451,7 +16451,7 @@ static void clif_parse_HomMoveToMaster(int fd, struct map_session_data *sd) unit->calc_pos(bl, sd->bl.x, sd->bl.y, sd->ud.dir); ud = unit->bl2ud(bl); - unit->walktoxy(bl, ud->to_x, ud->to_y, 4); + unit->walk_toxy(bl, ud->to_x, ud->to_y, 4); } static void clif_parse_HomMoveTo(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); @@ -16475,7 +16475,7 @@ static void clif_parse_HomMoveTo(int fd, struct map_session_data *sd) else return; - unit->walktoxy(bl, x, y, 4); + unit->walk_toxy(bl, x, y, 4); } static void clif_parse_HomAttack(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); diff --git a/src/map/elemental.c b/src/map/elemental.c index e9b6fa372..f176bb9e2 100644 --- a/src/map/elemental.c +++ b/src/map/elemental.c @@ -789,7 +789,7 @@ static int elemental_ai_sub_timer(struct elemental_data *ed, struct map_session_ if( DIFF_TICK(tick, ed->ud.canmove_tick) < 0 ) return 0; //Can't move yet. if (map->search_freecell(&ed->bl, sd->bl.m, &x, &y, MIN_ELEDISTANCE, MIN_ELEDISTANCE, 1) != 0 - && unit->walktoxy(&ed->bl, x, y, 0) == 0) + && unit->walk_toxy(&ed->bl, x, y, 0) == 0) return 0; } diff --git a/src/map/mob.c b/src/map/mob.c index 431bdbe0d..51a32abd9 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1462,7 +1462,7 @@ static int mob_ai_sub_hard_slavemob(struct mob_data *md, int64 tick) // If master is BL_MOB and in battle, lock & chase to master's target instead, unless configured not to. if ((battle_config.slave_chase_masters_chasetarget == 0 || (m_md != NULL && !mob->is_in_battle_state(m_md))) && map->search_freecell(&md->bl, bl->m, &x, &y, MOB_SLAVEDISTANCE, MOB_SLAVEDISTANCE, 1) - && unit->walktoxy(&md->bl, x, y, 0) == 0) + && unit->walk_toxy(&md->bl, x, y, 0) == 0) return 1; } } else if (bl->m != md->bl.m && map_flag_gvg(md->bl.m)) { @@ -1544,7 +1544,7 @@ static int mob_unlocktarget(struct mob_data *md, int64 tick) unit->set_target(&md->ud, 0); } if(battle_config.official_cell_stack_limit && map->count_oncell(md->bl.m, md->bl.x, md->bl.y, BL_CHAR|BL_NPC, 0x1 | 0x2) > battle_config.official_cell_stack_limit) { - unit->walktoxy(&md->bl, md->bl.x, md->bl.y, 8); + unit->walk_toxy(&md->bl, md->bl.x, md->bl.y, 8); } return 0; @@ -1577,7 +1577,7 @@ static int mob_randomwalk(struct mob_data *md, int64 tick) y+=md->bl.y; if ((x != md->bl.x || y != md->bl.y) && map->getcell(md->bl.m, &md->bl, x, y, CELL_CHKPASS) != 0 - && unit->walktoxy(&md->bl, x, y, 8) == 0) + && unit->walk_toxy(&md->bl, x, y, 8) == 0) break; } if(i==retrycount){ diff --git a/src/map/pet.c b/src/map/pet.c index 0537baaa7..aeb372c05 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -892,7 +892,7 @@ static int pet_randomwalk(struct pet_data *pd, int64 tick) int x=pd->bl.x+r%(d*2+1)-d; int y=pd->bl.y+r/(d*2+1)%(d*2+1)-d; if (map->getcell(pd->bl.m, &pd->bl, x, y, CELL_CHKPASS) != 0 - && unit->walktoxy(&pd->bl, x, y, 0) == 0) { + && unit->walk_toxy(&pd->bl, x, y, 0) == 0) { pd->move_fail_count=0; break; } @@ -992,7 +992,7 @@ static int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int return 0; //Already walking to him unit->calc_pos(&pd->bl, sd->bl.x, sd->bl.y, sd->ud.dir); - if (unit->walktoxy(&pd->bl, pd->ud.to_x, pd->ud.to_y, 0) != 0) + if (unit->walk_toxy(&pd->bl, pd->ud.to_x, pd->ud.to_y, 0) != 0) pet->randomwalk(pd,tick); return 0; diff --git a/src/map/script.c b/src/map/script.c index d6462384d..3bf0464e7 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -16558,7 +16558,7 @@ static BUILDIN(npcwalkto) } else { status_calc_npc(nd, SCO_NONE); } - unit->walktoxy(&nd->bl, x, y, 0); + unit->walk_toxy(&nd->bl, x, y, 0); } return true; @@ -19680,7 +19680,7 @@ static BUILDIN(setunitdata) unit->warp(bl, (short) val, (short) val2, (short) val3, CLR_TELEPORT); break; case UDT_WALKTOXY: - if (unit->walktoxy(bl, (short)val, (short)val2, 2) != 0) + if (unit->walk_toxy(bl, (short)val, (short)val2, 2) != 0) unit->movepos(bl, (short) val, (short) val2, 0, 0); break; case UDT_SPEED: @@ -19727,7 +19727,7 @@ static BUILDIN(setunitdata) clif->changelook(bl, LOOK_WEAPON, val); break; case UDT_LOOKDIR: - unit->setdir(bl, (enum unit_dir) val); + unit->set_dir(bl, (enum unit_dir)val); break; case UDT_CANMOVETICK: md->ud.canmove_tick = val; @@ -19851,7 +19851,7 @@ static BUILDIN(setunitdata) unit->warp(bl, (short) val, (short) val2, (short) val3, CLR_TELEPORT); break; case UDT_WALKTOXY: - if (unit->walktoxy(bl, (short)val, (short)val2, 2) != 0) + if (unit->walk_toxy(bl, (short)val, (short)val2, 2) != 0) unit->movepos(bl, (short) val, (short) val2, 0, 0); break; case UDT_SPEED: @@ -19859,7 +19859,7 @@ static BUILDIN(setunitdata) status->calc_misc(bl, &hd->base_status, hd->homunculus.level); break; case UDT_LOOKDIR: - unit->setdir(bl, (enum unit_dir) val); + unit->set_dir(bl, (enum unit_dir)val); break; case UDT_CANMOVETICK: hd->ud.canmove_tick = val; @@ -19990,7 +19990,7 @@ static BUILDIN(setunitdata) unit->warp(bl, (short) val, (short) val2, (short) val3, CLR_TELEPORT); break; case UDT_WALKTOXY: - if (unit->walktoxy(bl, (short)val, (short)val2, 2) != 0) + if (unit->walk_toxy(bl, (short)val, (short)val2, 2) != 0) unit->movepos(bl, (short) val, (short) val2, 0, 0); break; case UDT_SPEED: @@ -19998,7 +19998,7 @@ static BUILDIN(setunitdata) status->calc_misc(bl, &pd->status, pd->pet.level); break; case UDT_LOOKDIR: - unit->setdir(bl, (enum unit_dir) val); + unit->set_dir(bl, (enum unit_dir)val); break; case UDT_CANMOVETICK: pd->ud.canmove_tick = val; @@ -20123,7 +20123,7 @@ static BUILDIN(setunitdata) unit->warp(bl, (short) val, (short) val2, (short) val3, CLR_TELEPORT); break; case UDT_WALKTOXY: - if (unit->walktoxy(bl, (short)val, (short)val2, 2) != 0) + if (unit->walk_toxy(bl, (short)val, (short)val2, 2) != 0) unit->movepos(bl, (short) val, (short) val2, 0, 0); break; case UDT_SPEED: @@ -20131,7 +20131,7 @@ static BUILDIN(setunitdata) status->calc_misc(bl, &mc->base_status, mc->db->lv); break; case UDT_LOOKDIR: - unit->setdir(bl, (enum unit_dir) val); + unit->set_dir(bl, (enum unit_dir)val); break; case UDT_CANMOVETICK: mc->ud.canmove_tick = val; @@ -20257,7 +20257,7 @@ static BUILDIN(setunitdata) unit->warp(bl, (short) val, (short) val2, (short) val3, CLR_TELEPORT); break; case UDT_WALKTOXY: - if (unit->walktoxy(bl, (short)val, (short)val2, 2) != 0) + if (unit->walk_toxy(bl, (short)val, (short)val2, 2) != 0) unit->movepos(bl, (short) val, (short) val2, 0, 0); break; case UDT_SPEED: @@ -20265,7 +20265,7 @@ static BUILDIN(setunitdata) status->calc_misc(bl, &ed->base_status, ed->db->lv); break; case UDT_LOOKDIR: - unit->setdir(bl, (enum unit_dir) val); + unit->set_dir(bl, (enum unit_dir)val); break; case UDT_CANMOVETICK: ed->ud.canmove_tick = val; @@ -20386,7 +20386,7 @@ static BUILDIN(setunitdata) unit->warp(bl, (short) val, (short) val2, (short) val3, CLR_TELEPORT); break; case UDT_WALKTOXY: - if (unit->walktoxy(bl, (short)val, (short)val2, 2) != 0) + if (unit->walk_toxy(bl, (short)val, (short)val2, 2) != 0) unit->movepos(bl, (short) val, (short) val2, 0, 0); break; case UDT_CLASS: @@ -20397,7 +20397,7 @@ static BUILDIN(setunitdata) status->calc_misc(bl, &nd->status, nd->level); break; case UDT_LOOKDIR: - unit->setdir(bl, (enum unit_dir) val); + unit->set_dir(bl, (enum unit_dir)val); break; case UDT_STR: nd->status.str = (unsigned short) val; @@ -21121,7 +21121,7 @@ static BUILDIN(unitwalk) if (script_hasdata(st, 4)) { int x = script_getnum(st, 3); int y = script_getnum(st, 4); - if (unit->walktoxy(bl, x, y, 0) == 0) // We'll use harder calculations. + if (unit->walk_toxy(bl, x, y, 0) == 0) // We'll use harder calculations. script_pushint(st, 1); else script_pushint(st, 0); diff --git a/src/map/skill.c b/src/map/skill.c index eb9efa071..b3ed46fbd 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4425,7 +4425,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl skill->blown(src, bl, dist, dir, 0); //HACK: since knockback officially defaults to the left, the client also turns to the left... therefore, // make the caster look in the direction of the target - unit->setdir(src, unit_get_opposite_dir(dir)); + unit->set_dir(src, unit_get_opposite_dir(dir)); } } @@ -4470,7 +4470,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl status_change_end(src, SC_HIDING, INVALID_TIMER); skill->attack(BF_WEAPON, src, src, bl, skill_id, skill_lv, tick, flag); dir = unit_get_opposite_dir(dir); // change direction [Celest] - unit->setdir(bl,dir); + unit->set_dir(bl, dir); } else if (sd) clif->skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0, 0); @@ -5044,7 +5044,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl case RK_PHANTOMTHRUST: { struct map_session_data *tsd = BL_CAST(BL_PC, bl); - unit->setdir(src,map->calc_dir(src, bl->x, bl->y)); + unit->set_dir(src, map->calc_dir(src, bl->x, bl->y)); clif->skill_nodamage(src,bl,skill_id,skill_lv,1); skill->blown(src,bl,distance_bl(src,bl)-1,unit->getdir(src),0); @@ -5871,7 +5871,7 @@ static int skill_castend_id(int tid, int64 tick, int id, intptr_t data) // Asura Strike caster doesn't look to their target in the end if (src->id != target->id && !is_asura) - unit->setdir(src, map->calc_dir(src, target->x, target->y)); + unit->set_dir(src, map->calc_dir(src, target->x, target->y)); map->freeblock_unlock(); return 1; @@ -8102,8 +8102,8 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * } unit->stop_attack(src); //Run skillv tiles overriding the can-move check. - if (unit->walktoxy(src, (src->x + skill_lv * -dirx[dir]), - (src->y + skill_lv * -diry[dir]), 2) == 0 && md != NULL) + if (unit->walk_toxy(src, src->x + skill_lv * -dirx[dir], src->y + skill_lv * -diry[dir], 2) == 0 + && md != NULL) md->state.skillstate = MSS_WALK; //Otherwise it isn't updated in the AI. } break; @@ -10844,7 +10844,7 @@ static int skill_castend_pos(int tid, int64 tick, int id, intptr_t data) if( sd && sd->skillitem != AL_WARP ) // Warp-Portal thru items will clear data in skill_castend_map. [Inkfish] sd->skillitem = sd->skillitemlv = 0; - unit->setdir(src, map->calc_dir(src, ud->skillx, ud->skilly)); + unit->set_dir(src, map->calc_dir(src, ud->skillx, ud->skilly)); if (ud->skilltimer == INVALID_TIMER) { if (md) md->skill_idx = -1; diff --git a/src/map/unit.c b/src/map/unit.c index 04035da98..418bbe4b0 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -122,7 +122,7 @@ static struct unit_data *unit_bl2ud2(struct block_list *bl) * @param bl block_list to process * @return 0: success, 1: fail, 2: nullpointer */ -static int unit_walktoxy_sub(struct block_list *bl) +static int unit_walk_toxy_sub(struct block_list *bl) { nullpo_retr(2, bl); struct unit_data *ud = unit->bl2ud(bl); @@ -182,7 +182,7 @@ static int unit_walktoxy_sub(struct block_list *bl) timer_delay = status->get_speed(bl); if (timer_delay > 0) - ud->walktimer = timer->add(timer->gettick() + timer_delay, unit->walktoxy_timer, bl->id, 0); //TODO: check if unit->walktoxy_timer uses any intptr data + ud->walktimer = timer->add(timer->gettick() + timer_delay, unit->walk_toxy_timer, bl->id, 0); //TODO: check if unit->walk_toxy_timer uses any intptr data return 0; } @@ -194,7 +194,7 @@ static int unit_walktoxy_sub(struct block_list *bl) * @param data: Unused * @return 0: success, 1: fail, 2: nullpointer */ -static int unit_step_timer(int tid, int64 tick, int id, intptr_t data) +static int unit_steptimer(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); if (bl == NULL || bl->prev == NULL) @@ -204,7 +204,7 @@ static int unit_step_timer(int tid, int64 tick, int id, intptr_t data) return 2; if (ud->steptimer != tid) { - ShowError("unit_step_timer mismatch %d != %d\n", ud->steptimer, tid); + ShowError("unit_steptimer mismatch %d != %d\n", ud->steptimer, tid); return 1; } @@ -289,7 +289,7 @@ static int unit_warpto_master(struct block_list *master_bl, struct block_list *s * @param data: unused * @return 0: success, 1: fail */ -static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) +static int unit_walk_toxy_timer(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); if (bl == NULL || bl->prev == NULL) // Stop moved because it is missing from the block_list @@ -330,7 +330,7 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) // Monsters will walk into an icewall from the west and south if they already started walking if (map->getcell(bl->m, bl, x + dx, y + dy, CELL_CHKNOPASS) && (icewall_walk_block == 0 || !map->getcell(bl->m, bl, x + dx, y + dy, CELL_CHKICEWALL) || dx < 0 || dy < 0)) - return unit->walktoxy_sub(bl); + return unit->walk_toxy_sub(bl); // Monsters can only leave icewalls to the west and south // But if movement fails more than icewall_walk_block times, they can ignore this rule @@ -416,7 +416,7 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) if (ud->stepaction && ud->target_to != 0) { // Delete old stepaction even if not executed yet, the latest command is what counts if (ud->steptimer != INVALID_TIMER) { - timer->delete(ud->steptimer, unit->step_timer); + timer->delete(ud->steptimer, unit->steptimer); ud->steptimer = INVALID_TIMER; } // Delay stepactions by half a step (so they are executed at full step) @@ -425,11 +425,11 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) timer_delay = status->get_speed(bl) * 14 / 20; else timer_delay = status->get_speed(bl) / 2; - ud->steptimer = timer->add(tick + timer_delay, unit->step_timer, bl->id, 0); + ud->steptimer = timer->add(tick + timer_delay, unit->steptimer, bl->id, 0); } if (ud->state.change_walk_target) { - if (unit->walktoxy_sub(bl) == 0) + if (unit->walk_toxy_sub(bl) == 0) return 0; clif->fixpos(bl); return 1; @@ -445,7 +445,7 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) timer_delay = status->get_speed(bl); if (timer_delay > 0) { - ud->walktimer = timer->add(tick + timer_delay, unit->walktoxy_timer, id, 0); + ud->walktimer = timer->add(tick + timer_delay, unit->walk_toxy_timer, id, 0); if (md != NULL && DIFF_TICK(tick, md->dmgtick) < 3000) // not required not damaged recently clif->move(ud); } else if (ud->state.running != 0) { @@ -483,34 +483,34 @@ static int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) ud->to_y = bl->y; if (battle_config.official_cell_stack_limit != 0 && map->count_oncell(bl->m, x, y, BL_CHAR | BL_NPC, 0x1 | 0x2) > battle_config.official_cell_stack_limit) { - // Walked on occupied cell, call unit->walktoxy again + // Walked on occupied cell, call unit->walk_toxy again if (ud->steptimer != INVALID_TIMER) { // Execute step timer on next step instead - timer->delete(ud->steptimer, unit->step_timer); + timer->delete(ud->steptimer, unit->steptimer); ud->steptimer = INVALID_TIMER; } - return unit->walktoxy(bl, x, y, 8); + return unit->walk_toxy(bl, x, y, 8); } } return 0; } /** - * Timer for delayed execution of unit->walktoxy once triggered + * Timer for delayed execution of unit->walk_toxy once triggered * @param tid: Timer ID, unused * @param tick: Tick, unused * @param id: ID of block_list to execute the action * @param data: uint32 data cast to intptr_t with x-coord in lowest 16 bits and y-coord in highest 16 bits * @return 0: success, 1: failure */ -static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) +static int unit_delay_walk_toxy_timer(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); if (bl == NULL || bl->prev == NULL) return 1; short x = (short)GetWord((uint32)data, 0); short y = (short)GetWord((uint32)data, 1); - unit->walktoxy(bl, x, y, 0); + unit->walk_toxy(bl, x, y, 0); return 0; } @@ -527,7 +527,7 @@ static int unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) * . * @return 0: success, 1: failure */ -static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) +static int unit_walk_toxy(struct block_list *bl, short x, short y, int flag) { // TODO: change flag to enum? [skyleo] struct unit_data* ud = NULL; @@ -564,7 +564,7 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) if ((flag & 4) != 0 && DIFF_TICK(ud->canmove_tick, timer->gettick()) > 0 && DIFF_TICK(ud->canmove_tick, timer->gettick()) < 2000) { // Delay walking command. [Skotlex] - timer->add(ud->canmove_tick + 1, unit->delay_walktoxy_timer, bl->id, + timer->add(ud->canmove_tick + 1, unit->delay_walk_toxy_timer, bl->id, (intptr_t)MakeDWord((uint16)x, (uint16)y)); return 0; } @@ -589,12 +589,12 @@ static int unit_walktoxy(struct block_list *bl, short x, short y, int flag) if (ud->walktimer != INVALID_TIMER) { // When you come to the center of the grid because the change of destination while you're walking right now - // Call a function from a timer unit->walktoxy_sub + // Call a function from a timer unit->walk_toxy_sub ud->state.change_walk_target = 1; return 0; } - return unit->walktoxy_sub(bl); + return unit->walk_toxy_sub(bl); } /** @@ -635,7 +635,7 @@ static int unit_walktobl_timer(int tid, int64 tick, int id, intptr_t data) if (ud->walktimer == INVALID_TIMER && ud->target == data) { if (DIFF_TICK(ud->canmove_tick, tick) > 0) // Keep waiting? timer->add(ud->canmove_tick + 1, unit->walktobl_timer, id, data); - else if (unit->can_move(bl) != 0 && unit->walktoxy_sub(bl) == 0 && ud->state.attack_continue != 0) + else if (unit->can_move(bl) != 0 && unit->walk_toxy_sub(bl) == 0 && ud->state.attack_continue != 0) set_mobstate(bl); } return 0; @@ -694,7 +694,7 @@ static int unit_walktobl(struct block_list *bl, struct block_list *tbl, int rang if(!unit->can_move(bl)) return 0; - if (unit->walktoxy_sub(bl) == 0 && (flag & 2) != 0) { + if (unit->walk_toxy_sub(bl) == 0 && (flag & 2) != 0) { set_mobstate(bl); return 0; } @@ -784,14 +784,14 @@ static bool unit_run(struct block_list *bl, struct map_session_data *sd, enum sc return false; } - if (unit->walktoxy(bl, to_x, to_y, 1) == 0) + if (unit->walk_toxy(bl, to_x, to_y, 1) == 0) return true; //There must be an obstacle nearby. Attempt walking one cell at a time. do { to_x -= dir_x; to_y -= dir_y; - } while (--i > 0 && unit->walktoxy(bl, to_x, to_y, 1) != 0); + } while (--i > 0 && unit->walk_toxy(bl, to_x, to_y, 1) != 0); if ( i == 0 ) { unit->run_hit(bl, sc, sd, type); @@ -809,7 +809,7 @@ static int unit_escape(struct block_list *bl, struct block_list *target, short d Assert_retr(1, dir >= UNIT_DIR_FIRST && dir < UNIT_DIR_MAX); while (dist > 0 && map->getcell(bl->m, bl, bl->x + dist * dirx[dir], bl->y + dist * diry[dir], CELL_CHKNOREACH)) dist--; - if (dist > 0 && unit->walktoxy(bl, bl->x + dist * dirx[dir], bl->y + dist * diry[dir], 0) == 0) + if (dist > 0 && unit->walk_toxy(bl, bl->x + dist * dirx[dir], bl->y + dist * diry[dir], 0) == 0) return 1; else return 0; @@ -885,7 +885,7 @@ static int unit_movepos(struct block_list *bl, short dst_x, short dst_y, int eas * @param dir: the facing direction @see enum unit_dir * @return 0: success, 1: failure */ -static int unit_setdir(struct block_list *bl, enum unit_dir dir) +static int unit_set_dir(struct block_list *bl, enum unit_dir dir) { nullpo_retr(1, bl); struct unit_data *ud = unit->bl2ud(bl); @@ -1075,7 +1075,7 @@ static int unit_stop_walking(struct block_list *bl, int flag) //timer->delete function does not messes with it. If the function's //behavior changes in the future, this code could break! td = timer->get(ud->walktimer); - timer->delete(ud->walktimer, unit->walktoxy_timer); + timer->delete(ud->walktimer, unit->walk_toxy_timer); ud->walktimer = INVALID_TIMER; ud->state.change_walk_target = 0; tick = timer->gettick(); @@ -1083,7 +1083,7 @@ static int unit_stop_walking(struct block_list *bl, int flag) || (flag&STOPWALKING_FLAG_NEXTCELL && td && DIFF_TICK(td->tick, tick) <= td->data/2) //Enough time has passed to cover half-cell ) { ud->walkpath.path_len = ud->walkpath.path_pos+1; - unit->walktoxy_timer(INVALID_TIMER, tick, bl->id, ud->walkpath.path_pos); + unit->walk_toxy_timer(INVALID_TIMER, tick, bl->id, ud->walkpath.path_pos); } if(flag&STOPWALKING_FLAG_FIXPOS) @@ -1515,7 +1515,7 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill ud->target_to = target_id; ud->stepskill_id = skill_id; ud->stepskill_lv = skill_lv; - return 0; // Attacking will be handled by unit_walktoxy_timer in this case + return 0; // Attacking will be handled by unit_walk_toxy_timer in this case } //Check range when not using skill on yourself or is a combo-skill during attack @@ -1728,7 +1728,7 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill if( casttime > 0 ) { if (src->id != target->id) // self-targeted skills shouldn't show different direction - unit->setdir(src, map->calc_dir(src, target->x, target->y)); + unit->set_dir(src, map->calc_dir(src, target->x, target->y)); ud->skilltimer = timer->add( tick+casttime, skill->castend_id, src->id, 0 ); if (sd && (pc->checkskill(sd, SA_FREECAST) > 0 || skill_id == LG_EXEEDBREAK || (skill->get_inf2(ud->skill_id) & INF2_FREE_CAST_REDUCED) != 0)) status_calc_bl(&sd->bl, SCB_SPEED|SCB_ASPD); @@ -1822,7 +1822,7 @@ static int unit_skilluse_pos2(struct block_list *src, short skill_x, short skill ud->target_to = (skill_x + skill_y*md->xs); ud->stepskill_id = skill_id; ud->stepskill_lv = skill_lv; - return 0; // Attacking will be handled by unit_walktoxy_timer in this case + return 0; // Attacking will be handled by unit_walk_toxy_timer in this case } if( skill->get_state(ud->skill_id) == ST_MOVE_ENABLE ) { @@ -1883,7 +1883,7 @@ static int unit_skilluse_pos2(struct block_list *src, short skill_x, short skill // in official this is triggered even if no cast time. clif->useskill(src, src->id, 0, skill_x, skill_y, skill_id, skill_lv, casttime); if( casttime > 0 ) { - unit->setdir(src, map->calc_dir(src, skill_x, skill_y)); + unit->set_dir(src, map->calc_dir(src, skill_x, skill_y)); ud->skilltimer = timer->add( tick+casttime, skill->castend_pos, src->id, 0 ); if ((sd && pc->checkskill(sd, SA_FREECAST) > 0) || skill_id == LG_EXEEDBREAK || (skill->get_inf2(ud->skill_id) & INF2_FREE_CAST_REDUCED) != 0) { status_calc_bl(&sd->bl, SCB_SPEED|SCB_ASPD); @@ -1962,7 +1962,7 @@ static void unit_stop_stepaction(struct block_list *bl) return; //Clear timer - timer->delete(ud->steptimer, unit->step_timer); + timer->delete(ud->steptimer, unit->steptimer); ud->steptimer = INVALID_TIMER; } @@ -2046,7 +2046,7 @@ static int unit_attack(struct block_list *src, int target_id, int continuous) ud->target_to = ud->target; ud->stepskill_id = 0; ud->stepskill_lv = 0; - return 0; // Attacking will be handled by unit_walktoxy_timer in this case + return 0; // Attacking will be handled by unit_walk_toxy_timer in this case } if(DIFF_TICK(ud->attackabletime, timer->gettick()) > 0) @@ -2336,7 +2336,7 @@ static int unit_attack_timer_sub(struct block_list *src, int tid, int64 tick) } if(ud->state.attack_continue) { - unit->setdir(src, map->calc_dir(src, target->x, target->y)); + unit->set_dir(src, map->calc_dir(src, target->x, target->y)); if( src->type == BL_PC ) pc->update_idle_time(sd, BCIDLE_ATTACK); ud->attacktimer = timer->add(ud->attackabletime,unit->attack_timer,src->id,0); @@ -3033,10 +3033,10 @@ static int do_init_unit(bool minimal) return 0; timer->add_func_list(unit->attack_timer, "unit_attack_timer"); - timer->add_func_list(unit->walktoxy_timer,"unit_walktoxy_timer"); + timer->add_func_list(unit->walk_toxy_timer, "unit_walk_toxy_timer"); timer->add_func_list(unit->walktobl_timer, "unit_walktobl_timer"); - timer->add_func_list(unit->delay_walktoxy_timer,"unit_delay_walktoxy_timer"); - timer->add_func_list(unit->step_timer,"unit_step_timer"); + timer->add_func_list(unit->delay_walk_toxy_timer, "unit_delay_walk_toxy_timer"); + timer->add_func_list(unit->steptimer, "unit_steptimer"); return 0; } @@ -3057,24 +3057,24 @@ void unit_defaults(void) unit->bl2ud2 = unit_bl2ud2; unit->init_ud = unit_init_ud; unit->attack_timer = unit_attack_timer; - unit->walktoxy_timer = unit_walktoxy_timer; - unit->walktoxy_sub = unit_walktoxy_sub; - unit->delay_walktoxy_timer = unit_delay_walktoxy_timer; - unit->walktoxy = unit_walktoxy; + unit->walk_toxy_timer = unit_walk_toxy_timer; + unit->walk_toxy_sub = unit_walk_toxy_sub; + unit->delay_walk_toxy_timer = unit_delay_walk_toxy_timer; + unit->walk_toxy = unit_walk_toxy; unit->walktobl_timer = unit_walktobl_timer; unit->walktobl = unit_walktobl; unit->run = unit_run; unit->run_hit = unit_run_hit; unit->escape = unit_escape; unit->movepos = unit_movepos; - unit->setdir = unit_setdir; + unit->set_dir = unit_set_dir; unit->getdir = unit_getdir; unit->blown = unit_blown; unit->warp = unit_warp; unit->warpto_master = unit_warpto_master; unit->stop_walking = unit_stop_walking; unit->skilluse_id = unit_skilluse_id; - unit->step_timer = unit_step_timer; + unit->steptimer = unit_steptimer; unit->stop_stepaction = unit_stop_stepaction; unit->is_walking = unit_is_walking; unit->can_move = unit_can_move; diff --git a/src/map/unit.h b/src/map/unit.h index dd338d076..57f04b57a 100644 --- a/src/map/unit.h +++ b/src/map/unit.h @@ -106,24 +106,24 @@ struct unit_interface { struct unit_data* (*bl2ud2) (struct block_list *bl); void (*init_ud) (struct unit_data *ud); int (*attack_timer) (int tid, int64 tick, int id, intptr_t data); - int (*walktoxy_timer) (int tid, int64 tick, int id, intptr_t data); - int (*walktoxy_sub) (struct block_list *bl); - int (*delay_walktoxy_timer) (int tid, int64 tick, int id, intptr_t data); - int (*walktoxy) (struct block_list *bl, short x, short y, int flag); + int (*walk_toxy_timer) (int tid, int64 tick, int id, intptr_t data); + int (*walk_toxy_sub) (struct block_list *bl); + int (*delay_walk_toxy_timer) (int tid, int64 tick, int id, intptr_t data); + int (*walk_toxy) (struct block_list *bl, short x, short y, int flag); int (*walktobl_timer) (int tid, int64 tick, int id, intptr_t data); int (*walktobl) (struct block_list *bl, struct block_list *tbl, int range, int flag); bool (*run) (struct block_list *bl, struct map_session_data *sd, enum sc_type type); void (*run_hit) (struct block_list *bl, struct status_change *sc, struct map_session_data *sd, enum sc_type type); int (*escape) (struct block_list *bl, struct block_list *target, short dist); int (*movepos) (struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath); - int (*setdir) (struct block_list *bl, enum unit_dir dir); + int (*set_dir) (struct block_list *bl, enum unit_dir dir); enum unit_dir (*getdir) (struct block_list *bl); int (*blown) (struct block_list *bl, int dx, int dy, int count, int flag); int (*warp) (struct block_list *bl, short m, short x, short y, enum clr_type type); int (*warpto_master) (struct block_list *master_bl, struct block_list *slave_bl); int (*stop_walking) (struct block_list *bl, int type); int (*skilluse_id) (struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv); - int (*step_timer) (int tid, int64 tick, int id, intptr_t data); + int (*steptimer) (int tid, int64 tick, int id, intptr_t data); void (*stop_stepaction) (struct block_list *bl); int (*is_walking) (struct block_list *bl); int (*can_move) (struct block_list *bl); -- cgit v1.2.3-70-g09d2 From 1d17449c0cb809cec8ca16f2ac860f6377bfa305 Mon Sep 17 00:00:00 2001 From: skyleo Date: Mon, 2 Dec 2019 19:58:08 +0100 Subject: Add unit->cbl2ud for when using const block_list --- src/map/unit.c | 33 +++++++++++++++++++++++++++++++++ src/map/unit.h | 1 + 2 files changed, 34 insertions(+) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 418bbe4b0..acf64e820 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -99,6 +99,38 @@ static struct unit_data *unit_bl2ud(struct block_list *bl) } } +/** + * Returns the const unit_data for the given const block_list. If the object is using + * shared unit_data (i.e. in case of BL_NPC), it returns the shared data. + * + * __Warning:__ if bl->type is not known or NULL, + * an assertion will be triggered and NULL returned. + * @param bl block_list to process, it is expected to be not NULL. + * @return a pointer to the given object's unit_data + **/ +static const struct unit_data *unit_cbl2ud(const struct block_list *bl) +{ + Assert_retr(NULL, bl != NULL); + switch (bl->type) { + case BL_PC: + return &BL_UCCAST(BL_PC, bl)->ud; + case BL_MOB: + return &BL_UCCAST(BL_MOB, bl)->ud; + case BL_PET: + return &BL_UCCAST(BL_PET, bl)->ud; + case BL_NPC: + return BL_UCCAST(BL_NPC, bl)->ud; + case BL_HOM: + return &BL_UCCAST(BL_HOM, bl)->ud; + case BL_MER: + return &BL_UCCAST(BL_MER, bl)->ud; + case BL_ELEM: + return &BL_UCCAST(BL_ELEM, bl)->ud; + default: + Assert_retr(NULL, false); + } +} + /** * Returns the unit_data for the given block_list. If the object is using * shared unit_data (i.e. in case of BL_NPC), it recreates a copy of the @@ -3054,6 +3086,7 @@ void unit_defaults(void) unit->final = do_final_unit; /* */ unit->bl2ud = unit_bl2ud; + unit->cbl2ud = unit_cbl2ud; unit->bl2ud2 = unit_bl2ud2; unit->init_ud = unit_init_ud; unit->attack_timer = unit_attack_timer; diff --git a/src/map/unit.h b/src/map/unit.h index 57f04b57a..7bf94d3e1 100644 --- a/src/map/unit.h +++ b/src/map/unit.h @@ -103,6 +103,7 @@ struct unit_interface { int (*final) (void); /* */ struct unit_data* (*bl2ud) (struct block_list *bl); + const struct unit_data* (*cbl2ud) (const struct block_list *bl); struct unit_data* (*bl2ud2) (struct block_list *bl); void (*init_ud) (struct unit_data *ud); int (*attack_timer) (int tid, int64 tick, int id, intptr_t data); -- cgit v1.2.3-70-g09d2 From dad727a34acf286ef0f30ca0ee396d3e106be2ec Mon Sep 17 00:00:00 2001 From: skyleo Date: Mon, 2 Dec 2019 18:22:24 +0100 Subject: Expect bl to be not NULL in unit->bl2ud --- src/map/unit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index acf64e820..96222a62f 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -72,13 +72,12 @@ struct unit_interface *unit; /** * Returns the unit_data for the given block_list. If the object is using * shared unit_data (i.e. in case of BL_NPC), it returns the shared data. - * @param bl block_list to process + * @param bl block_list to process, it is expected to be not NULL. * @return a pointer to the given object's unit_data **/ static struct unit_data *unit_bl2ud(struct block_list *bl) { - if (bl == NULL) - return NULL; + Assert_retr(NULL, bl != NULL); switch (bl->type) { case BL_PC: return &BL_UCAST(BL_PC, bl)->ud; -- cgit v1.2.3-70-g09d2 From 88cca0d976bdd6fbe07c8646939fc1512e97cf72 Mon Sep 17 00:00:00 2001 From: skyleo Date: Mon, 2 Dec 2019 18:26:42 +0100 Subject: Handle not known values of bl->type with assertion --- src/map/unit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 96222a62f..28f81017f 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -72,6 +72,9 @@ struct unit_interface *unit; /** * Returns the unit_data for the given block_list. If the object is using * shared unit_data (i.e. in case of BL_NPC), it returns the shared data. + * + * __Warning:__ if bl->type is not known or NULL, + * an assertion will be triggered and NULL returned. * @param bl block_list to process, it is expected to be not NULL. * @return a pointer to the given object's unit_data **/ @@ -94,7 +97,7 @@ static struct unit_data *unit_bl2ud(struct block_list *bl) case BL_ELEM: return &BL_UCAST(BL_ELEM, bl)->ud; default: - return NULL; + Assert_retr(NULL, false); } } -- cgit v1.2.3-70-g09d2 From d21fd8e6727f1fba7cb57994aa9c74d4dd0cf05b Mon Sep 17 00:00:00 2001 From: skyleo Date: Mon, 2 Dec 2019 19:03:05 +0100 Subject: Change bl parameter to be const in unit->getdir --- src/map/unit.c | 4 ++-- src/map/unit.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 28f81017f..4a0d98cc4 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -937,13 +937,13 @@ static int unit_set_dir(struct block_list *bl, enum unit_dir dir) * @param bl: unit to request data from * @return the facing direction @see enum unit_dir */ -static enum unit_dir unit_getdir(struct block_list *bl) +static enum unit_dir unit_getdir(const struct block_list *bl) { nullpo_retr(UNIT_DIR_NORTH, bl); if (bl->type == BL_NPC) return BL_UCCAST(BL_NPC, bl)->dir; - struct unit_data *ud = unit->bl2ud(bl); + const struct unit_data *ud = unit->cbl2ud(bl); if (ud == NULL) return UNIT_DIR_NORTH; return ud->dir; diff --git a/src/map/unit.h b/src/map/unit.h index 7bf94d3e1..3f288e0d3 100644 --- a/src/map/unit.h +++ b/src/map/unit.h @@ -118,7 +118,7 @@ struct unit_interface { int (*escape) (struct block_list *bl, struct block_list *target, short dist); int (*movepos) (struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath); int (*set_dir) (struct block_list *bl, enum unit_dir dir); - enum unit_dir (*getdir) (struct block_list *bl); + enum unit_dir (*getdir) (const struct block_list *bl); int (*blown) (struct block_list *bl, int dx, int dy, int count, int flag); int (*warp) (struct block_list *bl, short m, short x, short y, enum clr_type type); int (*warpto_master) (struct block_list *master_bl, struct block_list *slave_bl); -- cgit v1.2.3-70-g09d2 From 2f32871ca7790a4924dec19aeeabc1da6cb1fc32 Mon Sep 17 00:00:00 2001 From: skyleo Date: Wed, 5 Feb 2020 21:51:21 +0100 Subject: Correct some typos in doc of unit->walk_toxy_timer --- src/map/unit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 4a0d98cc4..99682e2d3 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -279,9 +279,9 @@ static int unit_steptimer(int tid, int64 tick, int id, intptr_t data) } /** - * Warps homunuculus or mercenary towards his master in case he's too far away for 3 seconds. + * Warps homunculus or mercenary towards his master in case he's too far away for 3 seconds. * @param master_bl: block_list of master - * @param slave_bl: block_list of homunuculus/mercenary master owns + * @param slave_bl: block_list of homunculus/mercenary master owns * @return 0: success, 1: fail */ static int unit_warpto_master(struct block_list *master_bl, struct block_list *slave_bl) -- cgit v1.2.3-70-g09d2 From ab5c275e3915def5ce4f1cdd0928a4115db50cb6 Mon Sep 17 00:00:00 2001 From: skyleo Date: Sat, 14 Mar 2020 16:49:59 +0100 Subject: Fix wrong return-value on success by unit->walktobl This bugged aggressive monsters for example, as they wouldn't move to you and just do a move animation on 1 cell, stationary. Introduced by fe378985d5267bee1f73049c826ad4f1e9c2b9c4 --- src/map/unit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index d2cfcb03d..dd644d8d1 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -730,7 +730,7 @@ static int unit_walktobl(struct block_list *bl, struct block_list *tbl, int rang if (unit->walk_toxy_sub(bl) == 0 && (flag & 2) != 0) { set_mobstate(bl); - return 0; + return 1; } return 0; } -- cgit v1.2.3-70-g09d2 From 0a1982baa30e29431622c1a4f52668756d563214 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Wed, 11 Mar 2020 21:24:28 +0100 Subject: Rename function pc_itemskill_clear() to pc_autocast_clear() --- src/map/clif.c | 2 +- src/map/pc.c | 6 +++--- src/map/pc.h | 2 +- src/map/script.c | 14 +++++++------- src/map/skill.c | 2 +- src/map/unit.c | 4 ++-- src/plugins/HPMHooking/HPMHooking.Defs.inc | 4 ++-- src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc | 8 ++++---- src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc | 2 +- src/plugins/HPMHooking/HPMHooking_map.Hooks.inc | 16 ++++++++-------- 10 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/clif.c b/src/map/clif.c index c9e018f73..d7dffb293 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -12987,7 +12987,7 @@ static void clif_parse_UseSkillMap(int fd, struct map_session_data *sd) pc->delinvincibletimer(sd); skill->castend_map(sd,skill_id,map_name); - pc->itemskill_clear(sd); + pc->autocast_clear(sd); } static void clif_parse_RequestMemo(int fd, struct map_session_data *sd) __attribute__((nonnull (2))); diff --git a/src/map/pc.c b/src/map/pc.c index ebba015a2..073c16029 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5337,12 +5337,12 @@ static int pc_useitem(struct map_session_data *sd, int n) } /** - * Sets state flags and helper variables, used by itemskill() script command, to 0. + * Unsets a character's auto-cast related data. * * @param sd The character's session data. * @return 0 if parameter sd is NULL, otherwise 1. */ -static int pc_itemskill_clear(struct map_session_data *sd) +static int pc_autocast_clear(struct map_session_data *sd) { nullpo_ret(sd); @@ -12733,7 +12733,7 @@ void pc_defaults(void) pc->unequipitem_pos = pc_unequipitem_pos; pc->checkitem = pc_checkitem; pc->useitem = pc_useitem; - pc->itemskill_clear = pc_itemskill_clear; + pc->autocast_clear = pc_autocast_clear; pc->skillatk_bonus = pc_skillatk_bonus; pc->skillheal_bonus = pc_skillheal_bonus; diff --git a/src/map/pc.h b/src/map/pc.h index f069c0d66..92444aa2a 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -1046,7 +1046,7 @@ END_ZEROED_BLOCK; /* End */ void (*unequipitem_pos) (struct map_session_data *sd, int n, int pos); int (*checkitem) (struct map_session_data *sd); int (*useitem) (struct map_session_data *sd,int n); - int (*itemskill_clear) (struct map_session_data *sd); + int (*autocast_clear) (struct map_session_data *sd); int (*skillatk_bonus) (struct map_session_data *sd, uint16 skill_id); int (*skillheal_bonus) (struct map_session_data *sd, uint16 skill_id); diff --git a/src/map/script.c b/src/map/script.c index 83c221e78..b08613ec3 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11001,7 +11001,7 @@ static BUILDIN(itemskill) if (sd == NULL || sd->ud.skilltimer != INVALID_TIMER) return true; - pc->itemskill_clear(sd); + pc->autocast_clear(sd); sd->autocast.type = AUTOCAST_ITEM; sd->autocast.skill_id = script_isstringtype(st, 2) ? skill->name2id(script_getstr(st, 2)) : script_getnum(st, 2); sd->autocast.skill_lv = script_getnum(st, 3); @@ -11011,26 +11011,26 @@ static BUILDIN(itemskill) int flag = script_hasdata(st, 4) ? script_getnum(st, 4) : ISF_NONE; - sd->state.itemskill_check_conditions = ((flag & ISF_CHECKCONDITIONS) == ISF_CHECKCONDITIONS) ? 1 : 0; // Unset in pc_itemskill_clear(). + sd->state.itemskill_check_conditions = ((flag & ISF_CHECKCONDITIONS) == ISF_CHECKCONDITIONS) ? 1 : 0; // Unset in pc_autocast_clear(). sd->autocast.itemskill_check_conditions = ((flag & ISF_CHECKCONDITIONS) == ISF_CHECKCONDITIONS); if (sd->state.itemskill_check_conditions == 1) { if (skill->check_condition_castbegin(sd, sd->skillitem, sd->skillitemlv) == 0 || skill->check_condition_castend(sd, sd->skillitem, sd->skillitemlv) == 0) { - pc->itemskill_clear(sd); + pc->autocast_clear(sd); return true; } - sd->state.itemskill_conditions_checked = 1; // Unset in pc_itemskill_clear(). + sd->state.itemskill_conditions_checked = 1; // Unset in pc_autocast_clear(). sd->autocast.itemskill_conditions_checked = true; } - sd->state.itemskill_no_casttime = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST) ? 1 : 0; // Unset in pc_itemskill_clear(). - sd->state.itemskill_castonself = ((flag & ISF_CASTONSELF) == ISF_CASTONSELF) ? 1 : 0; // Unset in pc_itemskill_clear(). + sd->state.itemskill_no_casttime = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST) ? 1 : 0; // Unset in pc_autocast_clear(). + sd->state.itemskill_castonself = ((flag & ISF_CASTONSELF) == ISF_CASTONSELF) ? 1 : 0; // Unset in pc_autocast_clear(). sd->autocast.itemskill_instant_cast = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST); sd->autocast.itemskill_cast_on_self = ((flag & ISF_CASTONSELF) == ISF_CASTONSELF); - // itemskill_conditions_checked/itemskill_no_conditions/itemskill_no_casttime/itemskill_castonself abuse prevention. Unset in pc_itemskill_clear(). + // itemskill_conditions_checked/itemskill_no_conditions/itemskill_no_casttime/itemskill_castonself abuse prevention. Unset in pc_autocast_clear(). sd->itemskill_id = sd->skillitem; sd->itemskill_lv = sd->skillitemlv; diff --git a/src/map/skill.c b/src/map/skill.c index 5ceff376f..f28d50c6e 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4223,7 +4223,7 @@ static void skill_castend_type(int type, struct block_list *src, struct block_li struct map_session_data *sd = BL_CAST(BL_PC, src); if (sd != NULL) - pc->itemskill_clear(sd); + pc->autocast_clear(sd); } /*========================================== diff --git a/src/map/unit.c b/src/map/unit.c index d2cfcb03d..984cc6802 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1146,7 +1146,7 @@ static int unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_ struct map_session_data *sd = BL_CAST(BL_PC, src); if (sd != NULL && (ret == 0 || !skill->is_item_skill(sd, skill_id, skill_lv))) - pc->itemskill_clear(sd); + pc->autocast_clear(sd); return ret; } @@ -1783,7 +1783,7 @@ static int unit_skilluse_pos(struct block_list *src, short skill_x, short skill_ struct map_session_data *sd = BL_CAST(BL_PC, src); if (sd != NULL && (ret == 0 || !skill->is_item_skill(sd, skill_id, skill_lv))) - pc->itemskill_clear(sd); + pc->autocast_clear(sd); return ret; } diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc index 28f81b97f..edfd60fbc 100644 --- a/src/plugins/HPMHooking/HPMHooking.Defs.inc +++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc @@ -6184,8 +6184,8 @@ typedef int (*HPMHOOK_pre_pc_checkitem) (struct map_session_data **sd); typedef int (*HPMHOOK_post_pc_checkitem) (int retVal___, struct map_session_data *sd); typedef int (*HPMHOOK_pre_pc_useitem) (struct map_session_data **sd, int *n); typedef int (*HPMHOOK_post_pc_useitem) (int retVal___, struct map_session_data *sd, int n); -typedef int (*HPMHOOK_pre_pc_itemskill_clear) (struct map_session_data **sd); -typedef int (*HPMHOOK_post_pc_itemskill_clear) (int retVal___, struct map_session_data *sd); +typedef int (*HPMHOOK_pre_pc_autocast_clear) (struct map_session_data **sd); +typedef int (*HPMHOOK_post_pc_autocast_clear) (int retVal___, struct map_session_data *sd); typedef int (*HPMHOOK_pre_pc_skillatk_bonus) (struct map_session_data **sd, uint16 *skill_id); typedef int (*HPMHOOK_post_pc_skillatk_bonus) (int retVal___, struct map_session_data *sd, uint16 skill_id); typedef int (*HPMHOOK_pre_pc_skillheal_bonus) (struct map_session_data **sd, uint16 *skill_id); diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc index f94606bab..fed7e7a5e 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc @@ -4764,8 +4764,8 @@ struct { struct HPMHookPoint *HP_pc_checkitem_post; struct HPMHookPoint *HP_pc_useitem_pre; struct HPMHookPoint *HP_pc_useitem_post; - struct HPMHookPoint *HP_pc_itemskill_clear_pre; - struct HPMHookPoint *HP_pc_itemskill_clear_post; + struct HPMHookPoint *HP_pc_autocast_clear_pre; + struct HPMHookPoint *HP_pc_autocast_clear_post; struct HPMHookPoint *HP_pc_skillatk_bonus_pre; struct HPMHookPoint *HP_pc_skillatk_bonus_post; struct HPMHookPoint *HP_pc_skillheal_bonus_pre; @@ -11639,8 +11639,8 @@ struct { int HP_pc_checkitem_post; int HP_pc_useitem_pre; int HP_pc_useitem_post; - int HP_pc_itemskill_clear_pre; - int HP_pc_itemskill_clear_post; + int HP_pc_autocast_clear_pre; + int HP_pc_autocast_clear_post; int HP_pc_skillatk_bonus_pre; int HP_pc_skillatk_bonus_post; int HP_pc_skillheal_bonus_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc index a360b3f53..8b38177ae 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc @@ -2440,7 +2440,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(pc->unequipitem_pos, HP_pc_unequipitem_pos) }, { HP_POP(pc->checkitem, HP_pc_checkitem) }, { HP_POP(pc->useitem, HP_pc_useitem) }, - { HP_POP(pc->itemskill_clear, HP_pc_itemskill_clear) }, + { HP_POP(pc->autocast_clear, HP_pc_autocast_clear) }, { HP_POP(pc->skillatk_bonus, HP_pc_skillatk_bonus) }, { HP_POP(pc->skillheal_bonus, HP_pc_skillheal_bonus) }, { HP_POP(pc->skillheal2_bonus, HP_pc_skillheal2_bonus) }, diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index 592279cc4..4b139b322 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -63359,14 +63359,14 @@ int HP_pc_useitem(struct map_session_data *sd, int n) { } return retVal___; } -int HP_pc_itemskill_clear(struct map_session_data *sd) { +int HP_pc_autocast_clear(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; - if (HPMHooks.count.HP_pc_itemskill_clear_pre > 0) { + if (HPMHooks.count.HP_pc_autocast_clear_pre > 0) { int (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; - for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_itemskill_clear_pre; hIndex++) { - preHookFunc = HPMHooks.list.HP_pc_itemskill_clear_pre[hIndex].func; + for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_autocast_clear_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_pc_autocast_clear_pre[hIndex].func; retVal___ = preHookFunc(&sd); } if (*HPMforce_return) { @@ -63375,12 +63375,12 @@ int HP_pc_itemskill_clear(struct map_session_data *sd) { } } { - retVal___ = HPMHooks.source.pc.itemskill_clear(sd); + retVal___ = HPMHooks.source.pc.autocast_clear(sd); } - if (HPMHooks.count.HP_pc_itemskill_clear_post > 0) { + if (HPMHooks.count.HP_pc_autocast_clear_post > 0) { int (*postHookFunc) (int retVal___, struct map_session_data *sd); - for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_itemskill_clear_post; hIndex++) { - postHookFunc = HPMHooks.list.HP_pc_itemskill_clear_post[hIndex].func; + for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_autocast_clear_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_pc_autocast_clear_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd); } } -- cgit v1.2.3-70-g09d2 From b151b29cf072ed336214c2d0ca43e6db34a773ad Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Wed, 11 Mar 2020 22:07:36 +0100 Subject: Add skill_validate_autocast_data() function calls --- src/map/clif.c | 24 ++++++++++++++++++++++++ src/map/unit.c | 12 ++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/clif.c b/src/map/clif.c index 6c693297d..66533a6fc 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -12706,6 +12706,14 @@ static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill { int64 tick = timer->gettick(); + /** + * According to Skotlex' comment below, the client sometimes passes 0 for the skill level. + * Even though this seems to only affect guild skills, sd->autocast.skill_lv is used + * for the auto-cast data validation if skill_lv is 0. + * + **/ + skill->validate_autocast_data(sd, skill_id, (skill_lv == 0) ? sd->autocast.skill_lv : skill_lv); + if (skill_lv < 1) skill_lv = 1; //No clue, I have seen the client do this with guild skills :/ [Skotlex] @@ -12847,6 +12855,16 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin int64 tick = timer->gettick(); nullpo_retv(sd); + + /** + * When using clif_item_skill() to initiate the execution of ground skills, + * the client sometimes passes 0 for the skill level in packet 0x0af4. + * In that case sd->autocast.skill_lv is used for the auto-cast data validation, + * since clif_item_skill() is only used for auto-cast skills. + * + **/ + skill->validate_autocast_data(sd, skill_id, (skill_lv == 0) ? sd->autocast.skill_lv : skill_lv); + if( !(skill->get_inf(skill_id)&INF_GROUND_SKILL) ) return; //Using a target skill on the ground? WRONG. @@ -12985,6 +13003,12 @@ static void clif_parse_UseSkillMap(int fd, struct map_session_data *sd) return; } + /** + * Since no skill level was passed use 0 to notify skill_validate_autocast_data() of this special case. + * + **/ + skill->validate_autocast_data(sd, skill_id, 0); + pc->delinvincibletimer(sd); skill->castend_map(sd,skill_id,map_name); pc->autocast_clear(sd); diff --git a/src/map/unit.c b/src/map/unit.c index 984cc6802..c1da2c72b 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1145,8 +1145,10 @@ static int unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_ int ret = unit->skilluse_id2(src, target_id, skill_id, skill_lv, casttime, castcancel); struct map_session_data *sd = BL_CAST(BL_PC, src); - if (sd != NULL && (ret == 0 || !skill->is_item_skill(sd, skill_id, skill_lv))) - pc->autocast_clear(sd); + if (sd != NULL && ret == 0) + pc->autocast_clear(sd); // Error in unit_skilluse_id2(). + else if (sd != NULL && ret != 0 && skill_id != SA_ABRACADABRA && skill_id != WM_RANDOMIZESPELL) + skill->validate_autocast_data(sd, skill_id, skill_lv); return ret; } @@ -1782,8 +1784,10 @@ static int unit_skilluse_pos(struct block_list *src, short skill_x, short skill_ int ret = unit->skilluse_pos2(src, skill_x, skill_y, skill_id, skill_lv, casttime, castcancel); struct map_session_data *sd = BL_CAST(BL_PC, src); - if (sd != NULL && (ret == 0 || !skill->is_item_skill(sd, skill_id, skill_lv))) - pc->autocast_clear(sd); + if (sd != NULL && ret == 0) + pc->autocast_clear(sd); // Error in unit_skilluse_pos2(). + else if (sd != NULL && ret != 0 && skill_id != SA_ABRACADABRA && skill_id != WM_RANDOMIZESPELL) + skill->validate_autocast_data(sd, skill_id, skill_lv); return ret; } -- cgit v1.2.3-70-g09d2 From 49d0ce1c60455e4971c7bf9c80f4b92ce49f377f Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Wed, 11 Mar 2020 23:02:24 +0100 Subject: Remove skill_is_item_skill() function and use map_session_data->autocast.type instead --- src/map/clif.c | 2 +- src/map/skill.c | 23 +++--------------- src/map/skill.h | 1 - src/map/unit.c | 4 ++-- src/plugins/HPMHooking/HPMHooking.Defs.inc | 2 -- .../HPMHooking/HPMHooking_map.HPMHooksCore.inc | 4 ---- .../HPMHooking/HPMHooking_map.HookingPoints.inc | 1 - src/plugins/HPMHooking/HPMHooking_map.Hooks.inc | 27 ---------------------- 8 files changed, 6 insertions(+), 58 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/clif.c b/src/map/clif.c index 66533a6fc..1a99a07f3 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6766,7 +6766,7 @@ static void clif_item_skill(struct map_session_data *sd, uint16 skill_id, uint16 struct PACKET_ZC_AUTORUN_SKILL *p = WFIFOP(fd, 0); int type = skill->get_inf(skill_id); - if (sd->state.itemskill_castonself == 1 && skill->is_item_skill(sd, skill_id, skill_lv)) + if (sd->state.itemskill_castonself == 1 && sd->autocast.type == AUTOCAST_ITEM) type = INF_SELF_SKILL; p->packetType = HEADER_ZC_AUTORUN_SKILL; diff --git a/src/map/skill.c b/src/map/skill.c index d21a19742..14bc9460e 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -14048,22 +14048,6 @@ static bool skill_is_combo(int skill_id) return false; } -/** - * Checks if a skill is casted by an item (itemskill() script command). - * - * @param sd The charcater's session data. - * @param skill_id The skill's ID. - * @param skill_lv The skill's level. - * @return true if skill is casted by an item, otherwise false. - */ -static bool skill_is_item_skill(struct map_session_data *sd, int skill_id, int skill_lv) -{ - nullpo_retr(false, sd); - - return (sd->skillitem == skill_id && sd->skillitemlv == skill_lv - && sd->itemskill_id == skill_id && sd->itemskill_lv == skill_lv); -} - static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv) { struct status_data *st; @@ -14079,7 +14063,7 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s return 0; if ((sd->state.itemskill_conditions_checked == 1 || sd->state.itemskill_check_conditions == 0) - && skill->is_item_skill(sd, skill_id, skill_lv)) { + && sd->autocast.type == AUTOCAST_ITEM) { return 1; } @@ -15068,7 +15052,7 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski return 0; if ((sd->state.itemskill_conditions_checked == 1 || sd->state.itemskill_check_conditions == 0) - && skill->is_item_skill(sd, skill_id, skill_lv)) { + && sd->autocast.type == AUTOCAST_ITEM) { return 1; } @@ -15273,7 +15257,7 @@ static int skill_consume_requirement(struct map_session_data *sd, uint16 skill_i nullpo_ret(sd); - if (sd->state.itemskill_check_conditions == 0 && skill->is_item_skill(sd, skill_id, skill_lv)) + if (sd->state.itemskill_check_conditions == 0 && sd->autocast.type == AUTOCAST_ITEM) return 1; req = skill->get_requirement(sd,skill_id,skill_lv); @@ -21672,7 +21656,6 @@ void skill_defaults(void) skill->cast_fix_sc = skill_castfix_sc; skill->vf_cast_fix = skill_vfcastfix; skill->delay_fix = skill_delay_fix; - skill->is_item_skill = skill_is_item_skill; skill->check_condition_castbegin = skill_check_condition_castbegin; skill->check_condition_castend = skill_check_condition_castend; skill->consume_requirement = skill_consume_requirement; diff --git a/src/map/skill.h b/src/map/skill.h index 731044876..65195dc75 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -2029,7 +2029,6 @@ struct skill_interface { int (*cast_fix_sc) ( struct block_list *bl, int time); int (*vf_cast_fix) ( struct block_list *bl, double time, uint16 skill_id, uint16 skill_lv); int (*delay_fix) ( struct block_list *bl, uint16 skill_id, uint16 skill_lv); - bool (*is_item_skill) (struct map_session_data *sd, int skill_id, int skill_lv); int (*check_condition_castbegin) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); int (*check_condition_castend) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); int (*consume_requirement) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, short type); diff --git a/src/map/unit.c b/src/map/unit.c index c1da2c72b..ab6f345ed 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1707,7 +1707,7 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill if (!ud->state.running) //need TK_RUN or WUGDASH handler to be done before that, see bugreport:6026 unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS);// even though this is not how official works but this will do the trick. bugreport:6829 - if (sd != NULL && sd->state.itemskill_no_casttime == 1 && skill->is_item_skill(sd, skill_id, skill_lv)) + if (sd != NULL && sd->state.itemskill_no_casttime == 1 && sd->autocast.type == AUTOCAST_ITEM) casttime = 0; // in official this is triggered even if no cast time. @@ -1915,7 +1915,7 @@ static int unit_skilluse_pos2(struct block_list *src, short skill_x, short skill unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS); - if (sd != NULL && sd->state.itemskill_no_casttime == 1 && skill->is_item_skill(sd, skill_id, skill_lv)) + if (sd != NULL && sd->state.itemskill_no_casttime == 1 && sd->autocast.type == AUTOCAST_ITEM) casttime = 0; // in official this is triggered even if no cast time. diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc index edfd60fbc..018170812 100644 --- a/src/plugins/HPMHooking/HPMHooking.Defs.inc +++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc @@ -7332,8 +7332,6 @@ typedef int (*HPMHOOK_pre_skill_vf_cast_fix) (struct block_list **bl, double *ti typedef int (*HPMHOOK_post_skill_vf_cast_fix) (int retVal___, struct block_list *bl, double time, uint16 skill_id, uint16 skill_lv); typedef int (*HPMHOOK_pre_skill_delay_fix) (struct block_list **bl, uint16 *skill_id, uint16 *skill_lv); typedef int (*HPMHOOK_post_skill_delay_fix) (int retVal___, struct block_list *bl, uint16 skill_id, uint16 skill_lv); -typedef bool (*HPMHOOK_pre_skill_is_item_skill) (struct map_session_data **sd, int *skill_id, int *skill_lv); -typedef bool (*HPMHOOK_post_skill_is_item_skill) (bool retVal___, struct map_session_data *sd, int skill_id, int skill_lv); typedef int (*HPMHOOK_pre_skill_check_condition_castbegin) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); typedef int (*HPMHOOK_post_skill_check_condition_castbegin) (int retVal___, struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); typedef int (*HPMHOOK_pre_skill_check_condition_castend) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv); diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc index fed7e7a5e..8912ad8ef 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc @@ -5856,8 +5856,6 @@ struct { struct HPMHookPoint *HP_skill_vf_cast_fix_post; struct HPMHookPoint *HP_skill_delay_fix_pre; struct HPMHookPoint *HP_skill_delay_fix_post; - struct HPMHookPoint *HP_skill_is_item_skill_pre; - struct HPMHookPoint *HP_skill_is_item_skill_post; struct HPMHookPoint *HP_skill_check_condition_castbegin_pre; struct HPMHookPoint *HP_skill_check_condition_castbegin_post; struct HPMHookPoint *HP_skill_check_condition_castend_pre; @@ -12731,8 +12729,6 @@ struct { int HP_skill_vf_cast_fix_post; int HP_skill_delay_fix_pre; int HP_skill_delay_fix_post; - int HP_skill_is_item_skill_pre; - int HP_skill_is_item_skill_post; int HP_skill_check_condition_castbegin_pre; int HP_skill_check_condition_castbegin_post; int HP_skill_check_condition_castend_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc index 8b38177ae..9458fc2f6 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc @@ -2997,7 +2997,6 @@ struct HookingPointData HookingPoints[] = { { HP_POP(skill->cast_fix_sc, HP_skill_cast_fix_sc) }, { HP_POP(skill->vf_cast_fix, HP_skill_vf_cast_fix) }, { HP_POP(skill->delay_fix, HP_skill_delay_fix) }, - { HP_POP(skill->is_item_skill, HP_skill_is_item_skill) }, { HP_POP(skill->check_condition_castbegin, HP_skill_check_condition_castbegin) }, { HP_POP(skill->check_condition_castend, HP_skill_check_condition_castend) }, { HP_POP(skill->consume_requirement, HP_skill_consume_requirement) }, diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index 4b139b322..04706b751 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -78163,33 +78163,6 @@ int HP_skill_delay_fix(struct block_list *bl, uint16 skill_id, uint16 skill_lv) } return retVal___; } -bool HP_skill_is_item_skill(struct map_session_data *sd, int skill_id, int skill_lv) { - int hIndex = 0; - bool retVal___ = false; - if (HPMHooks.count.HP_skill_is_item_skill_pre > 0) { - bool (*preHookFunc) (struct map_session_data **sd, int *skill_id, int *skill_lv); - *HPMforce_return = false; - for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_is_item_skill_pre; hIndex++) { - preHookFunc = HPMHooks.list.HP_skill_is_item_skill_pre[hIndex].func; - retVal___ = preHookFunc(&sd, &skill_id, &skill_lv); - } - if (*HPMforce_return) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.skill.is_item_skill(sd, skill_id, skill_lv); - } - if (HPMHooks.count.HP_skill_is_item_skill_post > 0) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int skill_id, int skill_lv); - for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_is_item_skill_post; hIndex++) { - postHookFunc = HPMHooks.list.HP_skill_is_item_skill_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, skill_id, skill_lv); - } - } - return retVal___; -} int HP_skill_check_condition_castbegin(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv) { int hIndex = 0; int retVal___ = 0; -- cgit v1.2.3-70-g09d2 From 12de22e7008081c94631c8730d05d487e7b0cfcc Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Wed, 11 Mar 2020 23:16:29 +0100 Subject: Remove map_session_data->state.itemskill_* and use map_session_data->autocast.itemskill_* instead --- src/map/clif.c | 2 +- src/map/pc.c | 4 ---- src/map/pc.h | 4 ---- src/map/script.c | 7 +------ src/map/skill.c | 6 +++--- src/map/unit.c | 4 ++-- 6 files changed, 7 insertions(+), 20 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/clif.c b/src/map/clif.c index 1a99a07f3..6b5c57d46 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6766,7 +6766,7 @@ static void clif_item_skill(struct map_session_data *sd, uint16 skill_id, uint16 struct PACKET_ZC_AUTORUN_SKILL *p = WFIFOP(fd, 0); int type = skill->get_inf(skill_id); - if (sd->state.itemskill_castonself == 1 && sd->autocast.type == AUTOCAST_ITEM) + if (sd->autocast.itemskill_cast_on_self && sd->autocast.type == AUTOCAST_ITEM) type = INF_SELF_SKILL; p->packetType = HEADER_ZC_AUTORUN_SKILL; diff --git a/src/map/pc.c b/src/map/pc.c index 8586270b8..e181b5f89 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5354,10 +5354,6 @@ static int pc_autocast_clear(struct map_session_data *sd) sd->autocast.itemskill_check_conditions = false; sd->autocast.itemskill_instant_cast = false; sd->autocast.itemskill_cast_on_self = false; - sd->state.itemskill_conditions_checked = 0; - sd->state.itemskill_check_conditions = 0; - sd->state.itemskill_no_casttime = 0; - sd->state.itemskill_castonself = 0; return 1; } diff --git a/src/map/pc.h b/src/map/pc.h index 83b86b68b..2991bfc68 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -250,10 +250,6 @@ struct map_session_data { unsigned int refine_ui : 1; unsigned int npc_unloaded : 1; ///< The player is talking with an unloaded NPCs (respawned tombstones) unsigned int lapine_ui : 1; - unsigned int itemskill_conditions_checked : 1; // Used by itemskill() script command, to prevent second check of conditions after target was selected. - unsigned int itemskill_check_conditions : 1; // Used by itemskill() script command, to check skill conditions and consume them. - unsigned int itemskill_no_casttime : 1; // Used by itemskill() script command, to cast skill instantaneously. - unsigned int itemskill_castonself : 1; // Used by itemskill() script command, to forcefully cast skill on invoking character. } state; struct { unsigned char no_weapon_damage, no_magic_damage, no_misc_damage; diff --git a/src/map/script.c b/src/map/script.c index b8f8d7638..6ed94bc92 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11007,26 +11007,21 @@ static BUILDIN(itemskill) sd->autocast.skill_lv = script_getnum(st, 3); sd->skillitem = script_isstringtype(st, 2) ? skill->name2id(script_getstr(st, 2)) : script_getnum(st, 2); sd->skillitemlv = script_getnum(st, 3); - sd->state.itemskill_conditions_checked = 0; // Skill casting items will check the conditions prior to the target selection in AEGIS. Thus we need a flag to prevent checking them twice. int flag = script_hasdata(st, 4) ? script_getnum(st, 4) : ISF_NONE; - sd->state.itemskill_check_conditions = ((flag & ISF_CHECKCONDITIONS) == ISF_CHECKCONDITIONS) ? 1 : 0; // Unset in pc_autocast_clear(). sd->autocast.itemskill_check_conditions = ((flag & ISF_CHECKCONDITIONS) == ISF_CHECKCONDITIONS); - if (sd->state.itemskill_check_conditions == 1) { + if (sd->autocast.itemskill_check_conditions) { if (skill->check_condition_castbegin(sd, sd->skillitem, sd->skillitemlv) == 0 || skill->check_condition_castend(sd, sd->skillitem, sd->skillitemlv) == 0) { pc->autocast_clear(sd); return true; } - sd->state.itemskill_conditions_checked = 1; // Unset in pc_autocast_clear(). sd->autocast.itemskill_conditions_checked = true; } - sd->state.itemskill_no_casttime = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST) ? 1 : 0; // Unset in pc_autocast_clear(). - sd->state.itemskill_castonself = ((flag & ISF_CASTONSELF) == ISF_CASTONSELF) ? 1 : 0; // Unset in pc_autocast_clear(). sd->autocast.itemskill_instant_cast = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST); sd->autocast.itemskill_cast_on_self = ((flag & ISF_CASTONSELF) == ISF_CASTONSELF); diff --git a/src/map/skill.c b/src/map/skill.c index 14bc9460e..001c11c36 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -14062,7 +14062,7 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s if (sd->chat_id != 0) return 0; - if ((sd->state.itemskill_conditions_checked == 1 || sd->state.itemskill_check_conditions == 0) + if ((sd->autocast.itemskill_conditions_checked || !sd->autocast.itemskill_check_conditions) && sd->autocast.type == AUTOCAST_ITEM) { return 1; } @@ -15051,7 +15051,7 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski if (sd->chat_id != 0) return 0; - if ((sd->state.itemskill_conditions_checked == 1 || sd->state.itemskill_check_conditions == 0) + if ((sd->autocast.itemskill_conditions_checked || !sd->autocast.itemskill_check_conditions) && sd->autocast.type == AUTOCAST_ITEM) { return 1; } @@ -15257,7 +15257,7 @@ static int skill_consume_requirement(struct map_session_data *sd, uint16 skill_i nullpo_ret(sd); - if (sd->state.itemskill_check_conditions == 0 && sd->autocast.type == AUTOCAST_ITEM) + if (!sd->autocast.itemskill_check_conditions && sd->autocast.type == AUTOCAST_ITEM) return 1; req = skill->get_requirement(sd,skill_id,skill_lv); diff --git a/src/map/unit.c b/src/map/unit.c index ab6f345ed..ad4dc88b5 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1707,7 +1707,7 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill if (!ud->state.running) //need TK_RUN or WUGDASH handler to be done before that, see bugreport:6026 unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS);// even though this is not how official works but this will do the trick. bugreport:6829 - if (sd != NULL && sd->state.itemskill_no_casttime == 1 && sd->autocast.type == AUTOCAST_ITEM) + if (sd != NULL && sd->autocast.itemskill_instant_cast && sd->autocast.type == AUTOCAST_ITEM) casttime = 0; // in official this is triggered even if no cast time. @@ -1915,7 +1915,7 @@ static int unit_skilluse_pos2(struct block_list *src, short skill_x, short skill unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS); - if (sd != NULL && sd->state.itemskill_no_casttime == 1 && sd->autocast.type == AUTOCAST_ITEM) + if (sd != NULL && sd->autocast.itemskill_instant_cast && sd->autocast.type == AUTOCAST_ITEM) casttime = 0; // in official this is triggered even if no cast time. -- cgit v1.2.3-70-g09d2 From 6f49858747acc7ee3767dd431bec32b919b81536 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Thu, 12 Mar 2020 00:03:54 +0100 Subject: Use map_session_data->autocast.type instead of skillitem variable to check for auto-cast skills --- src/map/clif.c | 8 ++++---- src/map/skill.c | 26 +++++++++++++------------- src/map/status.c | 6 +++--- src/map/unit.c | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/clif.c b/src/map/clif.c index 6b5c57d46..074ca570b 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -12767,7 +12767,7 @@ static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill if (skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST) return; } else if (DIFF_TICK(tick, sd->ud.canact_tick) < 0) { - if (sd->skillitem != skill_id) { + if (sd->autocast.type == AUTOCAST_NONE) { clif->skill_fail(sd, skill_id, USESKILL_FAIL_SKILLINTERVAL, 0, 0); return; } @@ -12785,7 +12785,7 @@ static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill } else if (sd->menuskill_id != SA_AUTOSPELL) return; //Can't use skills while a menu is open. } - if (sd->skillitem == skill_id) { + if (sd->autocast.type != AUTOCAST_NONE) { if (skill_lv != sd->skillitemlv) skill_lv = sd->skillitemlv; if (!(tmp&INF_SELF_SKILL)) @@ -12905,7 +12905,7 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin return; if( DIFF_TICK(tick, sd->ud.canact_tick) < 0 ) { - if( sd->skillitem != skill_id ) { + if (sd->autocast.type == AUTOCAST_NONE) { clif->skill_fail(sd, skill_id, USESKILL_FAIL_SKILLINTERVAL, 0, 0); return; } @@ -12926,7 +12926,7 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin pc->delinvincibletimer(sd); - if( sd->skillitem == skill_id ) { + if (sd->autocast.type != AUTOCAST_NONE) { if( skill_lv != sd->skillitemlv ) skill_lv = sd->skillitemlv; unit->skilluse_pos(&sd->bl, x, y, skill_id, skill_lv); diff --git a/src/map/skill.c b/src/map/skill.c index 001c11c36..8515cc3c9 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1010,8 +1010,8 @@ static int skillnotok(uint16 skill_id, struct map_session_data *sd) if (pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL)) return 0; // can do any damn thing they want - if( skill_id == AL_TELEPORT && sd->skillitem == skill_id && sd->skillitemlv > 2 ) - return 0; // Teleport lv 3 bypasses this check.[Inkfish] + if (skill_id == AL_TELEPORT && sd->autocast.type == AUTOCAST_ITEM && sd->skillitemlv > 2) + return 0; // Teleport level 3 and higher bypasses this check if cast by itemskill() script commands. // Epoque: // This code will compare the player's attack motion value which is influenced by ASPD before @@ -1032,7 +1032,7 @@ static int skillnotok(uint16 skill_id, struct map_session_data *sd) * It has been confirmed on a official server (thanks to Yommy) that item-cast skills bypass all the restrictions below * Also, without this check, an exploit where an item casting + healing (or any other kind buff) isn't deleted after used on a restricted map **/ - if( sd->skillitem == skill_id ) + if (sd->autocast.type == AUTOCAST_ITEM) return 0; if( sd->sc.data[SC_ALL_RIDING] ) @@ -7464,7 +7464,7 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * map->freeblock_unlock(); return 1; } - if( sd->skillitem != skill_id ) + if (sd->autocast.type == AUTOCAST_NONE) status_zap(src, 0, skill->get_sp(skill_id, skill_lv)); // consume sp only if succeeded } break; @@ -11026,7 +11026,7 @@ static int skill_castend_map(struct map_session_data *sd, uint16 skill_id, const } } - lv = sd->skillitem==skill_id?sd->skillitemlv:pc->checkskill(sd,skill_id); + lv = (sd->autocast.type > AUTOCAST_TEMP) ? sd->skillitemlv : pc->checkskill(sd, skill_id); wx = sd->menuskill_val>>16; wy = sd->menuskill_val&0xffff; @@ -14067,8 +14067,8 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s return 1; } - if (pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->skillitem != skill_id) { - //GMs don't override the skillItem check, otherwise they can use items without them being consumed! [Skotlex] + if (pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->autocast.type != AUTOCAST_ITEM) { + // GMs don't override the AUTOCAST_ITEM check, otherwise they can use items without them being consumed! sd->state.arrow_atk = skill->get_ammotype(skill_id)?1:0; //Need to do arrow state check. sd->spiritball_old = sd->spiritball; //Need to do Spiritball check. return 1; @@ -14099,7 +14099,7 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s if( !sc->count ) sc = NULL; - if( sd->skillitem == skill_id ) { + if (sd->autocast.type == AUTOCAST_ITEM) { if (sd->autocast.type == AUTOCAST_ABRA || sd->autocast.type == AUTOCAST_IMPROVISE) { // Abracadabra or Improvised Song was used. sd->autocast.type = AUTOCAST_NONE; } else { @@ -14122,7 +14122,7 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s } } - if (pc_is90overweight(sd) && sd->skillitem != skill_id) { /// Skill casting items ignore the overweight restriction. [Kenpachi] + if (pc_is90overweight(sd) && sd->autocast.type != AUTOCAST_ITEM) { // Skill casting items ignore the overweight restriction. clif->skill_fail(sd, skill_id, USESKILL_FAIL_WEIGHTOVER, 0, 0); return 0; } @@ -14993,7 +14993,7 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s return 0; } - if (require.sp > 0 && st->sp < (unsigned int)require.sp && sd->skillitem != skill_id) { /// Skill casting items and Hocus-Pocus skills don't consume SP. [Kenpachi] + if (require.sp > 0 && st->sp < (unsigned int)require.sp && sd->autocast.type == AUTOCAST_NONE) { // Auto-cast skills don't consume SP. clif->skill_fail(sd, skill_id, USESKILL_FAIL_SP_INSUFFICIENT, 0, 0); return 0; } @@ -15056,8 +15056,8 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski return 1; } - if( pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->skillitem != skill_id ) { - //GMs don't override the skillItem check, otherwise they can use items without them being consumed! [Skotlex] + if (pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->autocast.type != AUTOCAST_ITEM) { + // GMs don't override the AUTOCAST_ITEM check, otherwise they can use items without them being consumed! sd->state.arrow_atk = skill->get_ammotype(skill_id)?1:0; //Need to do arrow state check. sd->spiritball_old = sd->spiritball; //Need to do Spiritball check. return 1; @@ -15084,7 +15084,7 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski break; } - if (pc_is90overweight(sd) && sd->skillitem != skill_id) { /// Skill casting items ignore the overweight restriction. [Kenpachi] + if (pc_is90overweight(sd) && sd->autocast.type != AUTOCAST_ITEM) { // Skill casting items ignore the overweight restriction. clif->skill_fail(sd, skill_id, USESKILL_FAIL_WEIGHTOVER, 0, 0); return 0; } diff --git a/src/map/status.c b/src/map/status.c index 4d798b606..a1aac8649 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1584,7 +1584,7 @@ static int status_check_skilluse(struct block_list *src, struct block_list *targ } if( skill_id ) { - if (src != NULL && (sd == NULL || sd->skillitem == 0)) { + if (src != NULL && (sd == NULL || sd->autocast.type != AUTOCAST_ITEM)) { // Items that cast skills using 'itemskill' will not be handled by map_zone_db. int i; @@ -1628,7 +1628,7 @@ static int status_check_skilluse(struct block_list *src, struct block_list *targ if (src != NULL && map->getcell(src->m, src, src->x, src->y, CELL_CHKLANDPROTECTOR) && !(st->mode&MD_BOSS) - && (src->type != BL_PC || sd->skillitem != skill_id)) + && (src->type != BL_PC || sd->autocast.type != AUTOCAST_ITEM)) return 0; break; default: @@ -1707,7 +1707,7 @@ static int status_check_skilluse(struct block_list *src, struct block_list *targ return 0; //Can't amp out of Wand of Hermode :/ [Skotlex] } - if (skill_id != 0 /* Do not block item-casted skills.*/ && (src->type != BL_PC || sd->skillitem != skill_id)) { + if (skill_id != 0 /* Do not block item-casted skills.*/ && (src->type != BL_PC || sd->autocast.type != AUTOCAST_ITEM)) { //Skills blocked through status changes... if (!flag && ( //Blocked only from using the skill (stuff like autospell may still go through sc->data[SC_SILENCE] || diff --git a/src/map/unit.c b/src/map/unit.c index ad4dc88b5..f9ea9adb6 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1745,7 +1745,7 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill if( casttime <= 0 ) ud->state.skillcastcancel = 0; - if( !sd || sd->skillitem != skill_id || skill->get_cast(skill_id,skill_lv) ) + if (sd == NULL || sd->autocast.type < AUTOCAST_ABRA || skill->get_cast(skill_id, skill_lv) != 0) ud->canact_tick = tick + casttime + 100; if( sd ) { @@ -1884,7 +1884,7 @@ static int unit_skilluse_pos2(struct block_list *src, short skill_x, short skill } ud->state.skillcastcancel = castcancel&&casttime>0?1:0; - if( !sd || sd->skillitem != skill_id || skill->get_cast(skill_id,skill_lv) ) + if (sd == NULL || sd->autocast.type < AUTOCAST_ABRA || skill->get_cast(skill_id, skill_lv) != 0) ud->canact_tick = tick + casttime + 100; #if 0 if (sd) { -- cgit v1.2.3-70-g09d2 From e6936d2db256d0feffc858f88ce170b2b766eddd Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Sat, 21 Mar 2020 04:27:08 +0100 Subject: Move misplaced condition in unit_walktobl() function --- src/map/unit.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index dd644d8d1..a879a125f 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -728,10 +728,13 @@ static int unit_walktobl(struct block_list *bl, struct block_list *tbl, int rang if(!unit->can_move(bl)) return 0; - if (unit->walk_toxy_sub(bl) == 0 && (flag & 2) != 0) { - set_mobstate(bl); + if (unit->walk_toxy_sub(bl) == 0) { + if ((flag & 2) != 0) + set_mobstate(bl); + return 1; } + return 0; } -- cgit v1.2.3-70-g09d2 From 2e5aba2d3594e8739fff86204dd800127050478b Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Tue, 31 Mar 2020 12:40:49 +0200 Subject: Fix misplaced return condition --- src/map/unit.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index a879a125f..b81685a39 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -326,7 +326,7 @@ static int unit_warpto_master(struct block_list *master_bl, struct block_list *s static int unit_walk_toxy_timer(int tid, int64 tick, int id, intptr_t data) { struct block_list *bl = map->id2bl(id); - if (bl == NULL || bl->prev == NULL) // Stop moved because it is missing from the block_list + if (bl == NULL) return 1; struct unit_data *ud = unit->bl2ud(bl); if (ud == NULL) @@ -336,8 +336,12 @@ static int unit_walk_toxy_timer(int tid, int64 tick, int id, intptr_t data) ShowError("unit_walk_timer mismatch %d != %d\n",ud->walktimer,tid); return 1; } + ud->walktimer = INVALID_TIMER; + if (bl->prev == NULL) // Stop moved because it is missing from the block_list. + return 1; + if (ud->walkpath.path_pos >= ud->walkpath.path_len) return 1; -- cgit v1.2.3-70-g09d2 From 044fa30eff1f86880367391ab91e0539de684446 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Wed, 1 Apr 2020 12:03:21 +0200 Subject: Add case for BL_SKILL to unit_bl2ud() to not trigger assert-returning --- src/map/unit.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index a879a125f..ff121af3d 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -96,6 +96,8 @@ static struct unit_data *unit_bl2ud(struct block_list *bl) return &BL_UCAST(BL_MER, bl)->ud; case BL_ELEM: return &BL_UCAST(BL_ELEM, bl)->ud; + case BL_SKILL: // No assertion to not spam the server console when attacking a skill type unit such as Ice Wall. + return NULL; default: Assert_retr(NULL, false); } -- cgit v1.2.3-70-g09d2 From acedc5713df59989b8624770a1fbd9a75d1a0c85 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Wed, 1 Apr 2020 15:41:03 +0200 Subject: Add case for BL_SKILL to unit_cbl2ud() to not trigger assert-returning --- src/map/unit.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index ff121af3d..2f50c5664 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -130,6 +130,8 @@ static const struct unit_data *unit_cbl2ud(const struct block_list *bl) return &BL_UCCAST(BL_MER, bl)->ud; case BL_ELEM: return &BL_UCCAST(BL_ELEM, bl)->ud; + case BL_SKILL: // No assertion to not spam the server console when attacking a skill type unit such as Ice Wall. + return NULL; default: Assert_retr(NULL, false); } -- cgit v1.2.3-70-g09d2 From 09e291009156002e83566afe7a10b6509f5463f5 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Thu, 13 Feb 2020 08:29:47 +0100 Subject: Add enum for pet intimacy levels and use its constants --- src/char/int_pet.c | 11 +++-------- src/common/mmo.h | 11 +++++++++++ src/map/atcommand.c | 2 +- src/map/clif.c | 4 ++-- src/map/pc.c | 6 +++--- src/map/pet.c | 26 +++++++++++++------------- src/map/script.c | 9 +++++++++ src/map/status.c | 2 +- src/map/unit.c | 6 +++--- 9 files changed, 46 insertions(+), 31 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/char/int_pet.c b/src/char/int_pet.c index e7be4d762..1c3ca16d6 100644 --- a/src/char/int_pet.c +++ b/src/char/int_pet.c @@ -61,7 +61,7 @@ static int inter_pet_tosql(const struct s_pet *p) SQL->EscapeStringLen(inter->sql_handle, esc_name, p->name, strnlen(p->name, NAME_LENGTH)); hungry = cap_value(p->hungry, PET_HUNGER_STARVING, PET_HUNGER_STUFFED); - intimate = cap_value(p->intimate, 0, 1000); + intimate = cap_value(p->intimate, PET_INTIMACY_NONE, PET_INTIMACY_MAX); if (p->pet_id == 0) { // New pet. @@ -129,7 +129,7 @@ static int inter_pet_fromsql(int pet_id, struct s_pet *p) SQL->FreeResult(inter->sql_handle); p->hungry = cap_value(p->hungry, PET_HUNGER_STARVING, PET_HUNGER_STUFFED); - p->intimate = cap_value(p->intimate, 0, 1000); + p->intimate = cap_value(p->intimate, PET_INTIMACY_NONE, PET_INTIMACY_MAX); if (chr->show_save_log) ShowInfo("Pet loaded (%d - %s).\n", pet_id, p->name); @@ -176,16 +176,11 @@ static struct s_pet *inter_pet_create(int account_id, int char_id, int pet_class inter_pet->pt->level = pet_lv; inter_pet->pt->egg_id = pet_egg_id; inter_pet->pt->equip = pet_equip; - inter_pet->pt->intimate = intimate; + inter_pet->pt->intimate = cap_value(intimate, PET_INTIMACY_NONE, PET_INTIMACY_MAX); inter_pet->pt->hungry = cap_value(hungry, PET_HUNGER_STARVING, PET_HUNGER_STUFFED); inter_pet->pt->rename_flag = rename_flag; inter_pet->pt->incubate = incubate; - if(inter_pet->pt->intimate < 0) - inter_pet->pt->intimate = 0; - else if(inter_pet->pt->intimate > 1000) - inter_pet->pt->intimate = 1000; - inter_pet->pt->pet_id = 0; //Signal NEW pet. if ((inter_pet->pt->pet_id = inter_pet->tosql(inter_pet->pt)) != 0) return inter_pet->pt; diff --git a/src/common/mmo.h b/src/common/mmo.h index 4886ca04b..9421f6e35 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -1388,6 +1388,17 @@ enum e_pet_hunger_level { PET_HUNGER_STUFFED = 100 }; +/** Pet intimacy level **/ +enum e_pet_intimacy_level { + PET_INTIMACY_NONE = 0, + PET_INTIMACY_AWKWARD = 1, + PET_INTIMACY_SHY = 100, + PET_INTIMACY_NEUTRAL = 250, + PET_INTIMACY_CORDIAL = 750, + PET_INTIMACY_LOYAL = 900, + PET_INTIMACY_MAX = 1000 +}; + /* packet size constant for itemlist */ #if MAX_INVENTORY > MAX_STORAGE && MAX_INVENTORY > MAX_CART #define MAX_ITEMLIST MAX_INVENTORY diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 9fc552f5f..96093ffec 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2817,7 +2817,7 @@ ACMD(petfriendly) return false; } - if (friendly < 0 || friendly > 1000) + if (friendly < PET_INTIMACY_NONE || friendly > PET_INTIMACY_MAX) { clif->message(fd, msg_fd(fd,37)); // An invalid number was specified. return false; diff --git a/src/map/clif.c b/src/map/clif.c index 14f5557eb..162308516 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10804,7 +10804,7 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd) } } - if(sd->pd && sd->pd->pet.intimate > 900) + if (sd->pd && sd->pd->pet.intimate > PET_INTIMACY_LOYAL) clif->pet_emotion(sd->pd,(sd->pd->pet.class_ - 100)*100 + 50 + pet->hungry_val(sd->pd)); if(homun_alive(sd->hd)) @@ -15232,7 +15232,7 @@ static void clif_parse_pet_evolution(int fd, struct map_session_data *sd) } // Not Loyal Yet - if (sd->pd == NULL || sd->pd->pet.intimate < 900) { + if (sd->pd == NULL || sd->pd->pet.intimate < PET_INTIMACY_LOYAL) { clif->petEvolutionResult(fd, PET_EVOL_RG_FAMILIAR); return; } diff --git a/src/map/pc.c b/src/map/pc.c index 6dba997ef..33deb780b 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5920,7 +5920,7 @@ static int pc_setpos(struct map_session_data *sd, unsigned short map_index, int sd->regen.state.gc = 1; } - if( sd->status.pet_id > 0 && sd->pd && sd->pd->pet.intimate > 0 ) { + if (sd->status.pet_id > 0 && sd->pd && sd->pd->pet.intimate > PET_INTIMACY_NONE) { sd->pd->bl.m = m; sd->pd->bl.x = sd->pd->ud.to_x = x; sd->pd->bl.y = sd->pd->ud.to_y = y; @@ -8046,8 +8046,8 @@ static int pc_dead(struct map_session_data *sd, struct block_list *src) struct pet_data *pd = sd->pd; if( !map->list[sd->bl.m].flag.noexppenalty ) { pet->set_intimate(pd, pd->pet.intimate - pd->petDB->die); - if( pd->pet.intimate < 0 ) - pd->pet.intimate = 0; + if (pd->pet.intimate < PET_INTIMACY_NONE) + pd->pet.intimate = PET_INTIMACY_NONE; clif->send_petdata(sd,sd->pd,1,pd->pet.intimate); } if( sd->pd->target_id ) // Unlock all targets... diff --git a/src/map/pet.c b/src/map/pet.c index 39a502d0f..592a25d3e 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -91,7 +91,7 @@ static void pet_set_intimate(struct pet_data *pd, int value) status_calc_pc(sd,SCO_NONE); /* Pet is lost, delete the egg */ - if (value <= 0) { + if (value <= PET_INTIMACY_NONE) { int i; ARR_FIND(0, sd->status.inventorySize, i, sd->status.inventory[i].card[0] == CARD0_PET && @@ -246,7 +246,7 @@ static int pet_hungry(int tid, int64 tick, int id, intptr_t data) } pd->pet_hungry_timer = INVALID_TIMER; - if (pd->pet.intimate <= 0) + if (pd->pet.intimate <= PET_INTIMACY_NONE) return 1; //You lost the pet already, the rest is irrelevant. pd->pet.hungry--; @@ -262,9 +262,9 @@ static int pet_hungry(int tid, int64 tick, int id, intptr_t data) pet_stop_attack(pd); pd->pet.hungry = PET_HUNGER_STARVING; pet->set_intimate(pd, pd->pet.intimate - battle_config.pet_hungry_friendly_decrease); - if( pd->pet.intimate <= 0 ) + if (pd->pet.intimate <= PET_INTIMACY_NONE) { - pd->pet.intimate = 0; + pd->pet.intimate = PET_INTIMACY_NONE; pd->status.speed = pd->db->status.speed; } status_calc_pet(pd, SCO_NONE); @@ -320,9 +320,9 @@ static int pet_performance(struct map_session_data *sd, struct pet_data *pd) int val; nullpo_retr(1, pd); - if (pd->pet.intimate > 900) + if (pd->pet.intimate > PET_INTIMACY_LOYAL) val = (pd->petDB->s_perfor > 0)? 4:3; - else if(pd->pet.intimate > 750) //TODO: this is way too high + else if (pd->pet.intimate > PET_INTIMACY_CORDIAL) //TODO: this is way too high val = 2; else val = 1; @@ -678,7 +678,7 @@ static int pet_menu(struct map_session_data *sd, int menunum) return 1; //You lost the pet already. - if(!sd->status.pet_id || sd->pd->pet.intimate <= 0 || sd->pd->pet.incubate) + if (!sd->status.pet_id || sd->pd->pet.intimate <= PET_INTIMACY_NONE || sd->pd->pet.incubate) return 1; egg_id = itemdb->exists(sd->pd->petDB->EggID); @@ -858,12 +858,12 @@ static int pet_food(struct map_session_data *sd, struct pet_data *pd) } pet->set_intimate(pd, pd->pet.intimate + add_intimate); } - if (pd->pet.intimate <= 0) { - pd->pet.intimate = 0; + if (pd->pet.intimate <= PET_INTIMACY_NONE) { + pd->pet.intimate = PET_INTIMACY_NONE; pet_stop_attack(pd); pd->status.speed = pd->db->status.speed; - } else if (pd->pet.intimate > 1000) { - pd->pet.intimate = 1000; + } else if (pd->pet.intimate > PET_INTIMACY_MAX) { + pd->pet.intimate = PET_INTIMACY_MAX; } status_calc_pet(pd, SCO_NONE); pd->pet.hungry += pd->petDB->fullness; @@ -937,7 +937,7 @@ static int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, int if(pd->ud.walktimer != INVALID_TIMER && pd->ud.walkpath.path_pos <= 2) return 0; //No thinking when you just started to walk. - if(pd->pet.intimate <= 0) { + if (pd->pet.intimate <= PET_INTIMACY_NONE) { //Pet should just... well, random walk. pet->randomwalk(pd,tick); return 0; @@ -1168,7 +1168,7 @@ static int pet_skill_bonus_timer(int tid, int64 tick, int id, intptr_t data) if (pd->state.skillbonus && pd->bonus->delay > 0) { bonus = 0; duration = pd->bonus->delay*1000; // the duration until pet bonuses will be reactivated again - } else if (pd->pet.intimate) { + } else if (pd->pet.intimate > PET_INTIMACY_NONE) { bonus = 1; duration = pd->bonus->duration*1000; // the duration for pet bonuses to be in effect } else { //Lost pet... diff --git a/src/map/script.c b/src/map/script.c index 11ee56180..b6e3b8198 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -27721,6 +27721,15 @@ static void script_hardcoded_constants(void) script->set_constant("PET_HUNGER_SATISFIED", PET_HUNGER_SATISFIED, false, false); script->set_constant("PET_HUNGER_STUFFED", PET_HUNGER_STUFFED, false, false); + script->constdb_comment("Pet intimacy levels"); + script->set_constant("PET_INTIMACY_NONE", PET_INTIMACY_NONE, false, false); + script->set_constant("PET_INTIMACY_AWKWARD", PET_INTIMACY_AWKWARD, false, false); + script->set_constant("PET_INTIMACY_SHY", PET_INTIMACY_SHY, false, false); + script->set_constant("PET_INTIMACY_NEUTRAL", PET_INTIMACY_NEUTRAL, false, false); + script->set_constant("PET_INTIMACY_CORDIAL", PET_INTIMACY_CORDIAL, false, false); + script->set_constant("PET_INTIMACY_LOYAL", PET_INTIMACY_LOYAL, false, false); + script->set_constant("PET_INTIMACY_MAX", PET_INTIMACY_MAX, false, false); + script->constdb_comment("monster skill states"); script->set_constant("MSS_ANY", MSS_ANY, false, false); script->set_constant("MSS_IDLE", MSS_IDLE, false, false); diff --git a/src/map/status.c b/src/map/status.c index 4e7094569..bee5645ad 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2583,7 +2583,7 @@ static int status_calc_pc_(struct map_session_data *sd, enum e_status_calc_opt o struct pet_data *pd = sd->pd; if( pd && pd->petDB && pd->petDB->equip_script && pd->pet.intimate >= battle_config.pet_equip_min_friendly ) script->run(pd->petDB->equip_script,0,sd->bl.id,0); - if( pd && pd->pet.intimate > 0 && (!battle_config.pet_equip_required || pd->pet.equip > 0) && pd->state.skillbonus == 1 && pd->bonus ) + if (pd && pd->pet.intimate > PET_INTIMACY_NONE && (!battle_config.pet_equip_required || pd->pet.equip > 0) && pd->state.skillbonus == 1 && pd->bonus) pc->bonus(sd,pd->bonus->type, pd->bonus->val); } diff --git a/src/map/unit.c b/src/map/unit.c index 56ddb5917..015f755bb 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -898,7 +898,7 @@ static int unit_movepos(struct block_list *bl, short dst_x, short dst_y, int eas } else npc->untouch_areanpc(sd, bl->m, bl->x, bl->y); - if( sd->status.pet_id > 0 && sd->pd && sd->pd->pet.intimate > 0 ) + if (sd->status.pet_id > 0 && sd->pd && sd->pd->pet.intimate > PET_INTIMACY_NONE) { // Check if pet needs to be teleported. [Skotlex] int flag = 0; struct block_list* pbl = &sd->pd->bl; @@ -2722,7 +2722,7 @@ static int unit_remove_map(struct block_list *bl, enum clr_type clrtype, const c case BL_PET: { struct pet_data *pd = BL_UCAST(BL_PET, bl); - if( pd->pet.intimate <= 0 && !(pd->msd && !pd->msd->state.active) ) { + if (pd->pet.intimate <= PET_INTIMACY_NONE && !(pd->msd && !pd->msd->state.active)) { //If logging out, this is deleted on unit->free clif->clearunit_area(bl,clrtype); map->delblock(bl); @@ -2936,7 +2936,7 @@ static int unit_free(struct block_list *bl, enum clr_type clrtype) aFree (pd->loot); pd->loot = NULL; } - if (pd->pet.intimate > 0) { + if (pd->pet.intimate > PET_INTIMACY_NONE) { intif->save_petdata(pd->pet.account_id,&pd->pet); } else { //Remove pet. -- cgit v1.2.3-70-g09d2 From 452b603ae4812bac490b4591f08a6f08d1571515 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Tue, 14 Apr 2020 08:12:24 +0200 Subject: Adjust return value of mob_skill_use() and mobskill_event() according to code style --- src/map/mob.c | 20 ++++++++++---------- src/map/unit.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/mob.c b/src/map/mob.c index 78ba4e712..94a032a94 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1520,7 +1520,7 @@ static int mob_unlocktarget(struct mob_data *md, int64 tick) FALLTHROUGH case MSS_IDLE: // Idle skill. - if (!(++md->ud.walk_count%IDLE_SKILL_INTERVAL) && mob->skill_use(md, tick, -1)) + if ((++md->ud.walk_count % IDLE_SKILL_INTERVAL) == 0 && mob->skill_use(md, tick, -1) == 0) break; //Random walk. if (!md->master_id && @@ -1700,7 +1700,7 @@ static bool mob_ai_sub_hard(struct mob_data *md, int64 tick) || !mob->can_reach(md, tbl, md->min_chase, MSS_RUSH) ) && md->state.attacked_count++ >= RUDE_ATTACKED_COUNT - && !mob->skill_use(md, tick, MSC_RUDEATTACKED) // If can't rude Attack + && mob->skill_use(md, tick, MSC_RUDEATTACKED) == 0 // If can't rude Attack && can_move && unit->escape(&md->bl, tbl, rnd()%10 +1) // Attempt escape ) { //Escaped @@ -1728,7 +1728,7 @@ static bool mob_ai_sub_hard(struct mob_data *md, int64 tick) ) { // Rude attacked if (md->state.attacked_count++ >= RUDE_ATTACKED_COUNT - && !mob->skill_use(md, tick, MSC_RUDEATTACKED) && can_move + && mob->skill_use(md, tick, MSC_RUDEATTACKED) == 0 && can_move != 0 && !tbl && unit->escape(&md->bl, abl, rnd()%10 +1) ) { //Escaped. @@ -3465,7 +3465,7 @@ static struct block_list *mob_getfriendstatus(struct mob_data *md, int cond1, in * @param md The monster which tries to cast a skill. * @param tick The timestamp of skill execution. * @param event The MSC_* flag which triggered the skill execution. (-1 for non-event skill conditions.) - * @return 1 on success, 0 on failure. + * @return 0 on success, 1 on failure. * **/ static int mob_skill_use(struct mob_data *md, int64 tick, int event) @@ -3477,10 +3477,10 @@ static int mob_skill_use(struct mob_data *md, int64 tick, int event) nullpo_ret(ms); if (battle_config.mob_skill_rate == 0 || md->ud.skilltimer != INVALID_TIMER || md->db->maxskill == 0) - return 0; + return 1; if (event == -1 && DIFF_TICK(md->ud.canact_tick, tick) > 0) - return 0; // Skill act delay only affects non-event skill conditions. + return 1; // Skill act delay only affects non-event skill conditions. // Pick a starting position and loop from that. int skill_idx = ((battle_config.mob_ai & 0x100) != 0) ? rnd() % md->db->maxskill : 0; @@ -3718,12 +3718,12 @@ static int mob_skill_use(struct mob_data *md, int64 tick, int event) } map->freeblock_unlock(); - return 1; + return 0; } // No skill was used. md->skill_idx = -1; - return 0; + return 1; } /*========================================== @@ -3736,7 +3736,7 @@ static int mobskill_event(struct mob_data *md, struct block_list *src, int64 tic nullpo_ret(md); nullpo_ret(src); if(md->bl.prev == NULL || md->status.hp <= 0) - return 0; + return 1; if (md->special_state.ai == AI_SPHERE) {//LOne WOlf explained that ANYONE can trigger the marine countdown skill. [Skotlex] md->state.alchemist = 1; @@ -3756,7 +3756,7 @@ static int mobskill_event(struct mob_data *md, struct block_list *src, int64 tic else if (flag&BF_LONG && !(flag&BF_MAGIC)) //Long-attacked should not include magic. res = mob->skill_use(md, tick, MSC_LONGRANGEATTACKED); - if (!res) + if (res != 0) //Restore previous target only if skill condition failed to trigger. [Skotlex] md->target_id = target_id; //Otherwise check if the target is an enemy, and unlock if needed. diff --git a/src/map/unit.c b/src/map/unit.c index d484056f9..19f09f83c 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -436,7 +436,7 @@ static int unit_walk_toxy_timer(int tid, int64 tick, int id, intptr_t data) // Walk skills are triggered regardless of target due to the idle-walk mob state. // But avoid triggering on stop-walk calls. if (tid != INVALID_TIMER && (ud->walk_count % WALK_SKILL_INTERVAL) == 0 - && map->list[bl->m].users > 0 && mob->skill_use(md, tick, -1) == 1) { + && map->list[bl->m].users > 0 && mob->skill_use(md, tick, -1) == 0) { // Walk skills are supposed to be used while walking if (!(ud->skill_id == NPC_SELFDESTRUCTION && ud->skilltimer != INVALID_TIMER) && md->state.skillstate != MSS_WALK) { @@ -2345,7 +2345,7 @@ static int unit_attack_timer_sub(struct block_list *src, int tid, int64 tick) if(md) { //First attack is always a normal attack if(md->state.skillstate == MSS_ANGRY || md->state.skillstate == MSS_BERSERK) { - if (mob->skill_use(md,tick,-1)) { + if (mob->skill_use(md, tick, -1) == 0) { map->freeblock_unlock(); return 1; } -- cgit v1.2.3-70-g09d2