Permalink
3 comments
on commit
Please
sign in to comment.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
*Added Skill Damage Adjustment!
- Disabled by default on src/config/core.h. Uncomment '#define ADJUST_SKILL_DAMAGE' to enable this skill damage adjustment - Added skill_damage_db.txt (thank Lilith for 'Manage Skill Damage') - Added new mapflag: 'skill_damage'. Please read 'doc/mapflags.txt' for more details *Fixed bugreport:8029 (thank exneval for testing and reporting) (Akinari) *Follow-up 647f99f (Akinari) *Follow-up 15074d8: optimized item_isNoEquip check parts *and some mirror changes
- Loading branch information
Showing
with
496 additions
and 82 deletions.
- +2 −1 conf/msg_conf/map_msg.conf
- +46 −0 db/skill_damage_db.txt
- +34 −1 doc/mapflags.txt
- +3 −0 npc/mapflag/skill_damage.txt
- +6 −5 npc/scripts_mapflags.conf
- +10 −0 src/config/core.h
- +41 −0 src/map/atcommand.c
- +154 −8 src/map/battle.c
- +14 −8 src/map/map.c
- +26 −2 src/map/map.h
- +2 −2 src/map/mob.c
- +49 −6 src/map/npc.c
- +7 −7 src/map/pc.c
- +51 −17 src/map/script.c
- +31 −23 src/map/skill.c
- +18 −0 src/map/skill.h
- +2 −2 src/map/status.c
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -887,7 +887,8 @@ | ||
| 1049: Weather Flags: | ||
| 1050: Other Flags: | ||
| 1051: Other Flags2: | ||
| 1052: Skill Damage Adjustments: | ||
| //1053-1064 free | ||
| 1065: No Exp Penalty: %s | No Zeny Penalty: %s | ||
| 1066: On | ||
| 1067: Off | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,46 @@ | ||
| // Manage skill damage database | ||
| // ---------------------------------------------- | ||
| // rAthena dev team | ||
| // ---------------------------------------------- | ||
| // Credits: | ||
| // [Lilith] | ||
| // [Cydh] | ||
| // ---------------------------------------------- | ||
| // <SkillName>,<Caster>,<Map>,<Damage against Players>{,<Damage against Mobs>{,<Damage against Bosses>{,<Damage against Other>}}} | ||
| // ---------------------------------------------- | ||
| // Caster: The adjustment only works if the caster is (bitmask) | ||
| // 1 = Player | ||
| // 2 = Monster | ||
| // 4 = Pet | ||
| // 8 = Homunculus | ||
| // 16 = Mercenary | ||
| // 32 = Elemental | ||
| // Map: | ||
| // 1 - Normal (the maps that aren't classified as these maps below) | ||
| // 2 - PVP | ||
| // 4 - GVG | ||
| // 8 - Battlegrounds | ||
| // 16 - 'skill_damage' mapflag | ||
| // Restricted zones - they're configured by 'restricted <numberCastermapflag | ||
| // 32 - Zone 1 | ||
| // 64 - Zone 2 | ||
| // 128 - Zone 3 | ||
| // 256 - Zone 4 | ||
| // 512 - Zone 5 | ||
| // 1024 - Zone 6 | ||
| // 2048 - Zone 7 | ||
| // Damage adjustments: | ||
| // Using value between -100 and 100000 | ||
| // minus value that mean normal damage will be decreased, and positive is | ||
| // otherwise. 0 = no additional rate | ||
| // ---------------------------------------------- | ||
| // Examples: | ||
| // 1. Mammonite: Normal maps, +50% player vs players, nothing else | ||
| //MC_MAMMONITE,1,1,50 | ||
| // 2. Adoramus: PvP & GvG maps, if the caster is player: +50% vs player, +0% vs | ||
| // mob, +10% vs boss mob, +15% vs other | ||
| //AB_ADORAMUS,1,6,50,0,10,15 | ||
| // 3. Asura Strike: Only deals half damage (-50%) if player vs player at PvP & | ||
| // GvG maps | ||
| //MO_EXTREMITYFIST,1,6,-50 | ||
| // ---------------------------------------------- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,3 @@ | ||
| //============================================================ | ||
| //<mapname> mapflag skill_damage {<skill_name>,<caster>,<damage1>,<damage2>,<damage3>,<damage4>} | ||
| //------------------------------------------------------------ | ||
This comment has been minimized.
cydh
Author
Contributor
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -1,26 +1,27 @@ | ||
| // -------------------------------------------------------------- | ||
| // - Map Flags - | ||
| // -------------------------------------------------------------- | ||
| npc: npc/mapflag/battleground.txt | ||
| npc: npc/mapflag/gvg.txt | ||
| npc: npc/mapflag/jail.txt | ||
| npc: npc/mapflag/night.txt | ||
| npc: npc/mapflag/nightmare.txt | ||
| npc: npc/mapflag/nobranch.txt | ||
| npc: npc/mapflag/noicewall.txt | ||
| npc: npc/mapflag/nomemo.txt | ||
| npc: npc/mapflag/nopenalty.txt | ||
| npc: npc/mapflag/nopvp.txt | ||
| npc: npc/mapflag/noreturn.txt | ||
| npc: npc/mapflag/nosave.txt | ||
| npc: npc/mapflag/noteleport.txt | ||
| npc: npc/mapflag/noskill.txt | ||
| npc: npc/mapflag/nowarp.txt | ||
| npc: npc/mapflag/nowarpto.txt | ||
| //npc: npc/mapflag/partylock.txt | ||
| npc: npc/mapflag/pvp.txt | ||
| npc: npc/mapflag/pvp_noparty.txt | ||
| npc: npc/mapflag/pvp_noguild.txt | ||
| npc: npc/mapflag/restricted.txt | ||
| npc: npc/mapflag/reset.txt | ||
| npc: npc/mapflag/skill_damage.txt | ||
| npc: npc/mapflag/town.txt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
3 comments
on commit cd9a776
There was a problem hiding this comment.
nice to see ^^
There was a problem hiding this comment.
Thank you for the code! :)
There was a problem hiding this comment.
thx Lilith :D
err my Notepad++ is drunk, when double click something to selecting, it selects random place. Please fix this on next commit