diff options
| -rw-r--r-- | conf/map/battle/guild.conf | 3 | ||||
| -rw-r--r-- | npc/other/arena/arena_party.txt | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 6 | ||||
| -rw-r--r-- | src/map/battle.h | 1 | ||||
| -rw-r--r-- | src/map/script.c | 8 | ||||
| -rwxr-xr-x | tools/configconverter.pl | 1 |
6 files changed, 7 insertions, 14 deletions
diff --git a/conf/map/battle/guild.conf b/conf/map/battle/guild.conf index 101349a85..2cb74c2dd 100644 --- a/conf/map/battle/guild.conf +++ b/conf/map/battle/guild.conf @@ -45,9 +45,6 @@ guild_max_castles: 0 // 2 - like 1, but your logged off time is also decreased from the remaining cooldown (Aegis) guild_skill_relog_delay: 2 -// Damage adjustments for WOE battles against defending Guild monsters (Note 2) -castle_defense_rate: 100 - // Flee penalty on gvg grounds. Official value is 20 (Note 2) // NOTE: It's %, not absolute, so 20 is -20% of your total flee gvg_flee_penalty: 20 diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index 67c69f8e8..f3362687d 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -165,6 +165,8 @@ OnTouch: } force_1-2,99,31,4 script Slipslowrun#party 4_F_TELEPORTER,{ + end; + OnStart: initnpctimer; $arena_minptst = gettime(GETTIME_MINUTE); diff --git a/src/map/battle.c b/src/map/battle.c index 37fc03bca..726547c66 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3467,11 +3467,6 @@ static int64 battle_calc_gvg_damage(struct block_list *src, struct block_list *b case NC_SELFDESTRUCTION: break; default: - /* Uncomment if you want god-mode Emperiums at 100 defense. [Kisuka] - if (md && md->guardian_data) { - damage -= damage * (md->guardian_data->castle->defense/100) * battle_config.castle_defense_rate/100; - } - */ break; } return damage; @@ -7188,7 +7183,6 @@ static const struct battle_data { { "skill_removetrap_type", &battle_config.skill_removetrap_type, 0, 0, 1, }, { "disp_experience", &battle_config.disp_experience, 0, 0, 1, }, { "disp_zeny", &battle_config.disp_zeny, 0, 0, 1, }, - { "castle_defense_rate", &battle_config.castle_defense_rate, 100, 0, 100, }, { "bone_drop", &battle_config.bone_drop, 0, 0, 2, }, { "buyer_name", &battle_config.buyer_name, 1, 0, 1, }, { "skill_wall_check", &battle_config.skill_wall_check, 1, 0, 1, }, diff --git a/src/map/battle.h b/src/map/battle.h index 4400d37d1..e9bc6b258 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -342,7 +342,6 @@ struct Battle_Config { int skill_removetrap_type; int disp_experience; int disp_zeny; - int castle_defense_rate; int backstab_bow_penalty; int hp_rate; int sp_rate; diff --git a/src/map/script.c b/src/map/script.c index 0fe97574c..fffe57c34 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -18494,10 +18494,12 @@ static BUILDIN(npcshopdelitem) unsigned int nameid = script_getnum(st,i); ARR_FIND(0, size, n, nd->u.shop.shop_item[n].nameid == nameid); - if (n < size) { - memmove(&nd->u.shop.shop_item[n], &nd->u.shop.shop_item[n+1], sizeof(nd->u.shop.shop_item[0])*(size-n)); - size--; + if (n == size) { + continue; + } else if (n < size - 1) { + memmove(&nd->u.shop.shop_item[n], &nd->u.shop.shop_item[n+1], sizeof(nd->u.shop.shop_item[0]) * (size - n - 1)); } + size--; } RECREATE(nd->u.shop.shop_item, struct npc_item_list, size); diff --git a/tools/configconverter.pl b/tools/configconverter.pl index dc511aaef..20f5f4cfb 100755 --- a/tools/configconverter.pl +++ b/tools/configconverter.pl @@ -554,7 +554,6 @@ my @defaults = ( guild_exp_limit => {parse => \&parsecfg_int, print => \&printcfg_int, path => "guild:", default => 50}, guild_max_castles => {parse => \&parsecfg_int, print => \&printcfg_int, path => "guild:", default => 0}, guild_skill_relog_delay => {parse => \&parsecfg_bool, print => \&printcfg_bool, path => "guild:", default => "false"}, - castle_defense_rate => {parse => \&parsecfg_int, print => \&printcfg_int, path => "guild:", default => 100}, gvg_flee_penalty => {parse => \&parsecfg_int, print => \&printcfg_int, path => "guild:", default => 20}, require_glory_guild => {parse => \&parsecfg_bool, print => \&printcfg_bool, path => "guild:", default => "false"}, max_guild_alliance => {parse => \&parsecfg_int, print => \&printcfg_int, path => "guild:", default => 3}, |