Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes CI errors

Browse Source
This commit is contained in:
aleos 2024-01-12 16:15:01 -05:00
parent 39f6e1492b
commit e60e3e8dc2
4 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/battle/guild.conf
View File

@ -27,9 +27,6 @@ guild_max_castles: 0
// Note: This was changed in renewal in favor of individual skill cooldown. // Note: This was changed in renewal in favor of individual skill cooldown.
guild_skill_relog_delay: 300000 guild_skill_relog_delay: 300000
// 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) // Flee penalty on gvg grounds. Official value is 20 (Note 2)
// NOTE: It's %, not absolute, so 20 is -20% of your total flee // NOTE: It's %, not absolute, so 20 is -20% of your total flee
gvg_flee_penalty: 20 gvg_flee_penalty: 20

4
db/re/map_zones.yml
View File

@ -4139,8 +4139,6 @@ Body:
- Flag: NoTeleport - Flag: NoTeleport
- Flag: NoWarpTo - Flag: NoWarpTo
- Flag: PartyLock - Flag: PartyLock
- Flag: PvP_NoGuild
- Flag: PvP_NoParty
- Id: Unknown_Sealed_Shrine # Sealed Shrine - Id: Unknown_Sealed_Shrine # Sealed Shrine
DisabledSkills: DisabledSkills:
@ -4225,8 +4223,6 @@ Body:
- Flag: NoTeleport - Flag: NoTeleport
- Flag: NoWarpTo - Flag: NoWarpTo
- Flag: PartyLock - Flag: PartyLock
- Flag: PvP_NoGuild
- Flag: PvP_NoParty
- Id: Unknown_FrancePvP # France PvP - Id: Unknown_FrancePvP # France PvP
DisabledSkills: DisabledSkills:

30
npc/custom/official/GeffenMagicTournament.txt
View File

@ -4830,33 +4830,3 @@ OnInstanceInit:
hideonnpc instance_npcname("Handsome Adventurer#gef"); hideonnpc instance_npcname("Handsome Adventurer#gef");
end; end;
} }
1@gef mapflag nowarp
1@gef mapflag nomemo
1@gef mapflag noteleport
1@gef mapflag monster_noteleport
1@gef mapflag nosave
1@gef mapflag nobranch
1@gef mapflag nowarpto
1@gef mapflag noicewall
1@gef mapflag restricted 9
1@ge_st mapflag nowarp
1@ge_st mapflag nomemo
1@ge_st mapflag noteleport
1@ge_st mapflag monster_noteleport
1@ge_st mapflag nosave
1@ge_st mapflag nobranch
1@ge_st mapflag nowarpto
1@ge_st mapflag noicewall
1@ge_st mapflag restricted 9
1@gef_in mapflag nowarp
1@gef_in mapflag nomemo
1@gef_in mapflag noteleport
1@gef_in mapflag monster_noteleport
1@gef_in mapflag nosave
1@gef_in mapflag nobranch
1@gef_in mapflag nowarpto
1@gef_in mapflag noicewall
1@gef_in mapflag restricted 9

5
src/map/battle.cpp
View File

@ -2095,11 +2095,6 @@ int64 battle_calc_gvg_damage(struct block_list *src,struct block_list *bl,int64
if (skill_get_inf2(skill_id, INF2_IGNOREGVGREDUCTION)) //Skills with no gvg damage reduction. if (skill_get_inf2(skill_id, INF2_IGNOREGVGREDUCTION)) //Skills with no gvg damage reduction.
return damage; return damage;
/* 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;
*/
return i64max(battle_calc_zone_damage_rate(*bl, damage, flag), 1); return i64max(battle_calc_zone_damage_rate(*bl, damage, flag), 1);
} }