汇总合并 rAthena 官方最新代码 - 2024年05月06日 #765
Merged
Conversation
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
Heal amount of SC_HELPANGEL (NV_HELPANGEL skill) is now not displayed.
- Fixed the damage type of various NPC skills - NPC_*BREATH skills and NPC_VAMPIRE_GIFT will now no longer be influenced by ATKpercent - Fixed NPC_CRITICALSLASH not working in pre-re - NPC_KEEPING now lasts 30s - NPC_BARRIER now lasts 15s - NPC_DEFENDER now lasts 15s, reduces damage by 87.5% and halves movement speed - Fixes #3538
- Envenom now applies the attribute table to the final damage again (fixes #8212)
- NPC_POWERUP and NPC_AGIUP now grant their own unique status changes - Duration of NPC_POWERUP is now 5s*level - Duration of NPC_AGIUP is now 10s*level and max level is back to 10 - Quagmire, Slow Grace and Adoramus now work even when the target used NPC_AGIUP - NPC_AGIUP will remove Decrease Agi on start but will not prevent it - NPC_AGIUP can be dispelled, but NPC_POWERUP cannot - Dispel will now make a monster unlock its target - Removed custom code to display the NPC_POWERUP effect, it's now correctly linked to EFST_POWERUP - Removed the ifdef around EXTREMITYFIST2, so we no longer constantly change its ID - Fixes #8242 - Fixes #904 - Fixes #7346
- Most NPC skills are now influenced by ATKpercent again - LK_SPIRALPIERCE is now only not influenced by ATKpercent when used by players - Introduced a new enum for bonus check flags - Follow-up to 03f07ab - Fixes #3538
- Venom Splasher now ignores +% damage cards, but no longer ignores weapon element - Venom Splasher now uses the correct durations and cooldowns in pre-re (was already correct in renewal) - Venom Splasher and Venom Knife now correctly use default poison duration - Venom Splasher and Venom Knife now have a poison chance of 100% - Fixes #8221
- Throw skills no longer consider arrow attack unless you have a ranged weapon equipped - Throw Shuriken is no longer modified by +% damage cards - Throw Shuriken/Kunai no longer ignore flee - Throw Shuriken's damage bonus is now flee-ignoring and includes skill level(x4), dagger mastery(x3) and arrow attack - Throw Kunai's damage bonus is now three times arrow attack per hit - Throw Shuriken/Kunai's final damage is now applied as forced neutral damage - Fixed range of Throw Coins (9 -> 7) - Other code improvements - Fixes #8206
- Freezing Trap, Sand Attack, Gunslinger Mine, Flip Tatami and Excruciating Palm no longer are affected by +% dmg cards - The skills that ignore +% dmg cards are now exactly those skills that also ignore EDP and the EDP/Magnum Break elemental damage bonus - Non-players are now always affected by ATKpercent - Simplified the code accordingly - Fixes #8250
Fixes #8239 Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
- NPC_INVINCIBLE now grants SC_INVINCIBLE for 300s instead of unlimited - NPC_INVINCIBLEOFF and MER_INVINCIBLEOFF2 now just end SC_INVINCIBLE instead of having their own status change - SC_INVINCIBLE now works like plant mode instead of just setting incoming damage to 1 - SC_INVINCIBLE now increases ATKpercent by 100 instead of increasing all damage by 75% - SC_INVINCIBLE no longer blocks skills - SC_INVINCIBLE now increases movement speed by 50% instead of 75% - SC_INVINCIBLE now increases ASPD strongly - Quagmire can no longer prevent ASPD increase (it still ends various status changes and prevents them) - If you counter Spell Breaker with Magic Rod you now receive 20% of the caster's MaxSP - Spell Breaker will now only deal HP damage on level 5 - Spell Breaker now can deal damage to bosses to 10% in pre-re (cannot be reduced by SC_INVINCIBLE unless you enable the "invincible_nodamage" setting) - Spell Breaker will no longer deal damage if it would be lethal - Added missing animation of Spell Breaker's damage - Fixes #8228
- Values that are added together will now be correctly capped to their max value - Status resistance can no longer exceed 100% (made negative success rates become positive)
- SC_ANKLE no longer has a natural resistance and minimum duration - Glacier Fist, Clashing Spiral and Tarot Card of Fate now grant SC_ANKLE instead of SC_STOP (cannot teleport while under SC_ANKLE effect) - Grand Cross now gives SC_ANKLE to self during the spell duration - Ankle Snare now has a minimum duration of 3000+30*baselevel milliseconds - Ankle Snare will no longer activate on bosses in renewal - Fixed Ankle Snare stopping bosses in pre-renewal even if you didn't enable the config setting for it - Glacier Fist now has a minimum duration of 1500+15*baselevel milliseconds rather than it being the maximum duration - You can now define Glacier Fist's effective base duration in the YML file without worrying about it being halved in the source code (it is still getting reduced by Agi) - Fixed some integer overflow issues - Fixes #8253
Note by Playtester: In renewal the "battle_calc_skill_base_damage" function adds to the ATK values rather than resetting them, so calling it twice will cause the values to be doubled, so we can't easily use this system for renewal. Will do a follow-up cleanup later.
- As this variable is unused and is very hard to calculate in renewal's structure, it was removed completely from renewal to make the renewal code cleaner - In pre-re it still works exactly the same as before (used for the EDP and Magnum Break bonus - renewal uses weaponATK for this instead) - Follow-up to b5e3e5e
- Added config setting mob_unlock_time that defines how long a monster can be trapped (immobile) before it unlocks its target * Default is 2000ms, which makes Clashing Spiral no longer cause monsters to drop their target, but Ankle Snare still will even at minimum duration - Monsters will now promptly use idle skills while trapped (there was a delay before) - Increased the time the AI is still active when there are no players left on the map from 0ms to 5000ms * This fixes an issue that monsters never unlocked their target if it was the last player to leave the map - Clashing Spiral now has a range of 4 instead of 5 - Skid Trap no longer has a stop effect in pre-re, but it will make monsters unlock their target and become idle - Skid Trap still stops targets for 3 seconds in renewal, but will no longer activate on bosses - Throw Stone now deals 30 damage when used by monsters - Fixes #7846
- Fixed immobile monsters targeting random bystanders with their spells even though they already have a target - Fixed some Malaya Port enemies targeting randomly - Fixes #8273
- Fixed several pre-re monster stats being 1 instead of 0 * Issue was introduced in 05a17d8 as safety measure to prevent division by 0, but it results in wrong damage numbers * Players can get 0 on stats as well, so it's better to put such safety measures at the point where the division takes place - Minimum stat for monsters is now 0 instead of 1 - Monsters that have 0 Luk after this change can no longer be cursed - Improved csv2yaml converter to no longer lose the information whether a stat is 0 or 1 - Fixed an issue with converting Race2 in the csv2yaml converter - Removed arbitrary "+1 MATK" bonus that was probably added due to people not figuring out why the damage was off by 1 - Fixed small damage inaccuracy issue in PVP - Fixes #8277
- Grand Cross on target is now considered a full magic attack and no longer triggers drain and similar effects that only work with physical attacks * This problem as was introduced in d8a02e9 to fix Coma not working on Grand Cross, but the reason that Coma works on Grand Cross is because it can also trigger on Magic skills (this is already working) - Grand Cross damage on self is still considered as "physical damage received" for reactive cards (e.g. Alarm Card), but no longer as "magical damage received" (e.g. Platinum Shield does not trigger) - Grand Cross no longer channels through the whole "weapon attack" code and just calls the necessary parts directly (it only considers ATK, DEF/VIT_DEF and refine) - Damage parts of Grand Cross can now go below 1 and reduce the other part (e.g. -5 physical damage and 15 magical damage now results in 10 damage instead of 16) - Implemented the official renewal damage formula for Grand Cross: [((ATK+MATK)/2)*RATIO - DEF - VIT_DEF - MDEF - MDEF2] - Fixed the order of damage processing for Grand Cross for fully accurate damage (there were a lot of rounding issues before) - The attribute table is no longer applied twice on self damage (still applied twice on target) - Cards that increase magic damage now work with Grand Cross (e.g. Skeggiold Card) - Changed Grand Cross range to 9 as that's the official range (you never know when it matters) - Fixes #1140
- Fixed renewal offhand damage being double as high as it should be - You will now deal unarmed main hand damage if you equip a weapon only in your left hand - Your offhand damage will now be the same regardless of whether you have a weapon in the main hand or not - Fixes #8284
- Coma item bonus is no longer an additional effect / status change, but instead replaces the attack damage with setting HP/SP to 1 * That means Coma attacks will never kill someone, even if the original attack would be lethal * When doing a Coma attack, the attack displays the original damage and this is also what counts towards the mob damage log - Coma is checked for every single event that applies damage, including reflect damage, and for Provoke / Self Provoke * Some Renewal-only effects couldn't be tested and were left unchanged (e.g. damage from White Imprison) - Coma now sets SP to 1 instead of 0 - bComaRace, bWeaponComaRace and bWeaponComaEle won't work on bosses, GVG and battlefield objects - bComaClass and bWeaponComaClass no longer work on GVG and battlefield objects, but can work on bosses if you specify Class_Boss or Class_All - Edge is now defined to only work on normal monster - The default exp_calc_type 0 no longer counts the first attacker twice and instead works like on official servers - Added a new exp_calc_type 2 that counts the first attacker twice as previously - The damage logged will now include overkill damage on exp_calc_type 0 and 2, but not count Coma damage (it will count the damage you would have originally dealt instead) - Fiber Lock now has a range of 9 instead of 7 - Fixes #8279
- Fixed a problem that caused the DB cache to always be missing the last entry - Removed renewal monsters from pre-re/mob_db.yml
Follow up to d949740
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
后续备忘