汇总合并 rAthena 官方最新代码 - 2024年04月07日 #764
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
* Framen - Increases base damage from 4750+(Fidus Animus skill level x 25)%/5250+(Fidus Animus skill level x 25)%(demon and undead)Matk to 6500+(Fidus Animus skill level x 25)%/6750+(Fidus Animus skill level x 25)%(demon and undead)Matk based on level 5. * Pneumaticus Procella - Reduces AP consumption from 30 to 20. - Changes damage property from holy to neutral. - Addes global cooldown by 0.5 seconds. - Changes sound effect.
* Savage Impact - Increases base damage from 900%/1100%(Shadow Exceed)Atk to 1050%/1250%(Shadow Exceed)Atk per hit based on level 10. * Shadow Stab - Unifies number of hit from 2/3(Cloaking Exceed) hits to 3 hits regardless of Cloaking Exceed buff. - Increases base damage from 1750%/2000%(Cloaking Exceed)Atk to 2750%/3250%(Cloaking Exceed)Atk per hit based on level 5. * Eternal Slash - Attack count no longer be removed by Dispell or Clearance. - Increases base damage from 1325%/1825%(Shadow Exceed)Atk to 1500%/2100%(Shadow Exceed)Atk per hit based on level 5.
* Climax - Reduces AP consumption from 150 to 125. - Reduces skill cooldown from 300 seconds to 60 seconds. * Floral Flare Road - Increases global cooldown from 0.25 seconds to 0.75 seconds based on level 5. * Tornado Storm - Increases global cooldown from 0.25 seconds to 0.75 seconds based on level 5. * Stratum Tremor - Increases global cooldown from 0.25 seconds to 0.75 seconds based on level 5. * Rain of Crystal - Increases global cooldown from 0.25 seconds to 0.75 seconds based on level 5. * Crimson Arrow - Increases base damage from 1750%/3500%Matk to 2000%/3750%Matk based on level 5. * Storm Cannon - Increases base damage from 6000%/7500%(Climax)Matk to 7750%/9250%(Climax)Matk based on level 5. * Frozen Slash - Increases base damage from 4900%/6800%(Climax)Matk to 5200%/7100%(Climax)Matk based on level 5. * Mystery Illusion - Increases global cooldown from 0.5 seconds to 0.75 seconds based on level 5. * All Bloom - Increases global cooldown from 0.5 seconds to 1 second based on level 5. * Violent Quake - Increases global cooldown from 0.5 seconds to 1 second based on level 5. * Soul Vulcan Strike - Increases base damage from 1250%Matk to 1500%Matk per hit based on level 5. * Astral Strike - Increases global cooldown from 0.5 seconds to 1 second based on level 10.
* Gale Storm - Reduces skill cooldown from 1.2 seconds to 0.7 seconds. - Increases base damage from 10000%Atk to 13500%Atk based on level 5. * Crescive Bolt - Increases base damage from 9400%Atk to 13500%Atk based on level 10. - Increases damage bonus on standing still from 10% per stack (up to 30% on 3 stacks) to 20% per stack (up to 60% on 3 stacks). - Changes sound effect. * Calamity Gale - Reduces AP consumption from 200 to 125. - Reduces skill cooldown from 180 seconds to 60 seconds. * Added missing clif_skill_nodamage for WH_GALESTORM Thanks to @Haydrich !
Co-authored-by: Pokye <98105181+Pokye@users.noreply.github.com>
* Implemented equipment and etc items up to 05022024 * Added 1@vrsn map
Correct comparations in conditions for some base level achievements to work with the multi level check of achievements.
* suppressing warning C4018 * dinamically get decltype suggested by vstumpf
Fixes #8109 Co-authored-by: Aleos <aleos89@users.noreply.github.com> Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
* Rhythm Shooting - Increases base damage from 3700%/4550%(sound brand)Atk to 5300%/6100%(sound brand)Atk per hit based on level 5. * Metallic Fury - Increases base damage from 13000%/18000%(sound brand)Matk to 19250%/23250%(sound brand)Matk based on level 5. - Changes sound effect.
Explosive Powder - Increases base damage from 3150%/3650%(Research Report)Atk to 3750%/4250%(Research Report)Atk per hit based on level 5.
* Explosion Blaster - Increases base damage from 12000%/17600%(Oleum Sanctum)Atk to 13450%/18200%(Oleum Sanctum)Atk based on level 5. * Third Punish - Reduces skill cooldown from 1 second to 0.7 seconds. - Adds global cooldown by 0.5 seconds. - Increases base damage from 7850%Atk to 9450%Atk based on level 5. * Third Flame Bomb - Adds global cooldown by 0.7 seconds.
* Servant Weapon - Reduces skill cooldown from 150 seconds to 60 seconds based on level 5. - Increases base damage from 2500%Atk to 4850%Atk based on level 5. - Increases number of hit from 2 hits to 3 hits. - No longer be removed by Dispell or Clearance. - Increases the trigger chance of weapon from 15% to 25% based on level 5. * Madness Crusher - Increases base damage from 8350%Atk to 20000%Atk based on level 5. * Storm Slash - Increases base damage from 2200%Atk to 4050%Atk per hit based on level 5. * Hack and Slasher - Increases base damage from 7700%Atk to 8550%Atk per hit based on level 10. * Dragonic Breath - Increases factor weight of MaxHP in skill formula from 12.5% to 25%. - Increases factor weight of MaxSP in skill formula from 25% to 50%. Additionally: Dragonic Breath formula updated. Thanks to @datawulf ! Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
* Axe Stomp - Increases global cooldown from 0.25 seconds to 0.7 seconds based on level 5. - Increases base damage from 5150%Atk to 6200%Atk per hit based on level 5. * Mighty Smash - Increases global cooldown from 0.25 seconds to 0.7 seconds based on level 10. - Increases base damage from 1825%/1850%(Axe Stomp)Atk to 2480%/2500%(Axe Stomp)Atk per hit based on level 10. * Spark Blaster - Increases base damage from 9250%Atk to 14600%Atk based on level 10. * Triple Laser - Increases base damage from 5050%Atk to 6400%Atk per hit based on level 5. * Rush Quake - Buff no longer be removed by Dispell or Clearance. Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
Fix the issue of Zeny variable overflow causing it to become negative. Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
Disabled warnings in libconfig only for MSVS
Taken from #7024 Co-authored-by: munkrej <schmunk@posteo.de> Co-authored-by: Atemo <Atemo@users.noreply.github.com>
Taken from #7024 Co-authored-by: munkrej <schmunk@posteo.de>
* The Vigilante at Night - Increases SP consumption from 65 to 88 based on level 5. - Reduces area of effect of gatling gun from 13 x 13 cells to 11 x 11 cells based on level 5. * Only One Bullet - Increases cooldown from 0.3 seconds to 0.35 seconds. - Increases base damage from 7550%/8300%Atk to 16200%/18200%Atk based on level 5. * Spiral Shooting - Increases base damage from 8500%/9700%Atk to 9700%/15400%Atk per hit based on level 5. * Magazine for One - Increases base damage from 1950%/2400%Atk to 2750%/4300%Atk per hit based on level 5. * Wild Fire - Increases base damage from 13250%/12500%Atk to 17500%/16500%Atk based on level 5. * Basic Grenade - Increases base damage from 5750%Atk to 12000%Atk based on level 5. * Hasty Fire in the Hole - Increases base damage from 6750%Atk to 9000%Atk per hit based on level 5. Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
* Double Bowling Bash - Increases base damage from 3200+(Self Study Tactics skill level x 30)%Atk to 4250+(Self Study Tactics skill level x 30)%Atk per hit based on level 10. * Shield Chain Rush - Increases base damage from 5700+(Self Study Tactics skill level x 30)%Atk to 11350+(Self Study Tactics skill level x 30)%Atk based on level 10. * Spiral Pierce Max - Increases base damage from 8700+(Self Study Tactics skill level x 30)%Atk x size correction to 16000+(Self Study Tactics skill level x 30)%Atk x size correction based on level 10. * Breaking Limit - Increases damage bonus of Double Bowling Bash and Shield Chain Rush from 70% to 120%. * Hell's Drive - Increases base damage from 8500+(Self Study Sorcery skill level x 30)%Atk to 10700+(Self Study Sorcery skill level x 30)%Matk based on level 10.
* Guardian Shield - Reworks AP condition from recovering AP to consuming 35 AP upon using instead. - Reduces skill duration from 60 seconds to 40 seconds. - Increases skill cooldown from 15 seconds to 25 seconds. - Reduces global cooldown from 1 second to 0.3 seconds. - Reduces factor weight of MaxHP in skill formula from 50% to 30%. - Reduces final durability factor of skill level from 250% to 125% based on level 5. * Cross Rain - Increases AP recovery rate from 4 to 6. - Increases base damage from 3200+(Spear & Sword Mastery skill level x 100)%/4500+(Spear & Sword Mastery skill level x 150)%(Holy Shield)Matk to 4500+(Spear & Sword Mastery skill level x 100)%/6500+(Spear & Sword Mastery skill level x 150)%(Holy Shield)Matk per hit based on level 10. * Holy Shield - No longer be removed by Dispell or Clearance. * Shield Shooting - Increases AP recovery rate from 3 to 5. - Increases base damage from 14900+(Shield Mastery skill level x 250)%Atk to 18500+(Shield Mastery skill level x 750)%Atk based on level 5. - Increases factor weight of shield refine rate in skill formula from 25 to 100. - Increases factor weight of POW in skill formula from 7 to 10. * Overslash - Increases AP recovery rate from 3 to 5. - Increases base damage from 1600+(Spear & Sword Mastery skill level x 250)%Atk to 2200+(Spear & Sword Mastery skill level x 500)%Atk per hit based on level 10. * Judgement Cross - Changes damage property from holy to neutral.
* Summon Elemental Ardor - Reduces skill cooldown from 900 seconds to 60 seconds. - Passive mode : Flame Technique, increases damage bonus of Fire Bolt from 100% to 400%. * Summon Elemental Diluvio - Reduces skill cooldown from 900 seconds to 60 seconds. - Passive mode : Cold Force, increases damage bonus of Cold Bolt from 100% to 400%. * Summon Elemental Procella - Reduces skill cooldown from 900 seconds to 60 seconds. - Passive mode : Grace Breeze, increases damage bonus of Lightning Bolt from 100% to 400%. * Summon Elemental Terremotus - Reduces skill cooldown from 900 seconds to 60 seconds. - Passive mode : Earth Care, increases damage bonus of Earth Spike from 80% to 800%. * Summon Elemental Serpens - Reduces skill cooldown from 900 seconds to 60 seconds. - Passive mode : Deep Poisoning, increases damage bonus of Killing Cloud from 50% to 1500%. * Conflagration - Increases global cooldown from 0.5 seconds to 0.7 seconds. - Increases base damage from 3750%/5750%(spirit)Matk to 6200%/7200%(spirit)Matk based on level 5. - Reduces the chance of inflicting [blaze] on each hit from 60% to 3%. * Diamond Storm - Increases base damage from 8150%/14400%(spirit)Matk to 12500%/20800%(spirit)Matk based on level 5. - Reduces the chance of inflicting [quench] on each hit from 90% to 5%. * Lightning Land - Increases global cooldown from 0.5 seconds to 0.7 seconds. - Increases base damage from 3750%/5750%(spirit)Matk to 6200%/7200%(spirit)Matk based on level 5. - Reduces the chance of inflicting [torrent] on each hit from 60% to 3%. * Terra Drive - Increases base damage from 8150%/14400%(spirit)Matk to 12500%/20800%(spirit)Matk based on level 5. - Reduces the chance of inflicting [concretion] on each hit from 90% to 5%. * Venom Swamp - Increases global cooldown from 0.5 seconds to 0.7 seconds. - Increases base damage from 3750%/5750%(spirit)Matk to 6200%/7200%(spirit)Matk based on level 5. - Reduces the chance of inflicting [severe poison] on each hit from 60% to 3%. * Elemental Buster - Reduces AP consumption from 30 to 15. - Reduces skill cooldown from 5 seconds to 2 seconds. - Increases base damage from 22500%/24000%(dragon and formless)Matk to 27050%/28550%(dragon and formless)Matk based on level 10.
* Abyss Slayer - Reduces AP consumption from 150 to 120. * Omega Abyss Strike - Reduces fixed casting time from 1.5 seconds to 1 second. - Reduces skill cooldown from 3 seconds to 0.7 seconds. - Reduces AP consumption from 15 to 10. - Changes damage property from neutral to fire. - Increases base damage from 22000%/23500%(angel and demon)Matk to 26500%/28500%(angel and demon)Matk based on level 10. * Abyss Dagger - Increases base damage from 4600%Atk to 7350%Atk based on level 5. * Deft Stab - Increases base damage from 3750%Atk to 6200%Atk based on level 10. - Increases factor weight of POW in skill formula from 5 to 7. * From the Abyss - Reduces skill cooldown from 60 seconds to 30 seconds. - Increases number of hit from 2 hits to 5 hits. - Increases base damage from 2600%Matk to 3400%Matk based on level 5. - No longer be removed by Dispell or Clearance. - Increases the trigger chance of abyss sphere from 15% to 25% based on level 5. * Abyss Square - Increases base damage from 2850+(Magic Sword Mastery skill level x 100)%Matk to 3750+(Magic Sword Mastery skill level x 200)Matk based on level 5. * Chain Reaction Shot - Increases base damage of secondary attack from 12350%Atk to 13550%Atk based on level 5. * Frenzy Shot - Increases AP recovery rate from 1 to 3. - Increases base damage from 6150%Atk to 8250%Atk per hit based on level 10.
* Hidden Card - No longer be removed by Dispell or Clearance. * The Vigilante at Night - Increases AP recovery rate from 1 to 2. * Only One Bullet - Increases AP recovery rate from 1 to 2. * Spiral Shooting - Increases AP recovery rate from 1 to 2. * Magazine for One - Increases AP recovery rate from 1 to 2. * Wild Fire - Increases AP recovery rate from 1 to 2.
* Updated the "Name" of some items in item DB according to https://www.divine-pride.net/ * Truncated "Shinkiro & Shiranui Soul (Huuma Shuriken - Construct)" item name to 49 character
* Updated geteleminfo script command * Added a new <type> "2" that returns the class ID of the elemental spirit * Fixed Dimensions Elemental* combos: item descriptions require high elemental spirit check * Added new constants for geteleminfo Thanks to @aleos89 @Badarosk0 !
* Updates pet_db.yml based on KRO client data.
Files updated according to KRO client datas.
* Updated items Trade, Flags, EquipLevelMin, ArmorLevel, WeaponLevel, Slot and Gradable
* Corrected etc items with item script (shouldn't happen) * Corrected some item type
* Removed duplicate IDs
- Monster damage is now always reduced by items that reduce BF_WEAPON damage - Monster damage is now never reduced by items that reduce BF_MAGIC damage - Asprika now reduces all damage from monsters by 30% - Asprika now reduces all physical damage from players by 30% - Asprika now reduces damage regardless of range of the attack - Shaman Hat will no longer reduce damage from monsters, but will still reduce magic damage from players - This also affects all custom items using bonus3 bSubEle and bonus3 bSubRace - Added a config to battle/items.conf to return to old behavior - Fixes #8171
Co-authored-by: Aleos <aleos89@users.noreply.github.com>
- When a Mercenary gains a bonus, there will now be an animation - Mercenary bonuses now last for 5 minutes instead of 10 minutes - Fixed HP/SP recovery values of Mercenaries (and Elementals) - Mercenaries now recover HP when walking - Homunculi no longer recover SP when walking - Mercenary natural recovery interval is 8s for HP and 6s for SP - Homunculus natural recovery interval is 2s for HP and 4s for SP - MER_CRASH now only deals 1 hit and can be cast-cancelled - Frenzy now drains HP every 10 seconds instead of every 15 in pre-renewal - Fixed SP cost Mercenary Frenzy (100 -> 200 SP) - Killing monsters exactly 2 times below you base level now still counts as mercenary kill - Fixes #8184 - Fixes #7663
- Added missing EDP 25% poison damage bonus (it was already fixed in renewal but applies to pre-re too), that works identical to the 20% fire damage bonus from Magnum Break; both buffs overwrite each other - The damage on which EDP/Magnum Break is based on now considers defense reduction, passive mastery, refine and true sight - The EDP/Magnum Break damage bonus now considers spirit sphere damage, but the spirit sphere part is non-elemental; both are added together before they get rounded down - The EDP/Magnum Break damage bonus can now become negative through attribute table and is dispelled on logout - The EDP/Magnum Break damage bonus no longer applies when damage is already 0 or lower beforehand - EDP is now applied after defense, refine and mastery - Refine bonus now is applied before mastery and between both the damage is capped to 1 - Envenom's fixed damage bonus is now a mastery bonus (was already fixed in renewal but applies to pre-re too) and thus increased by EDP - Fixed damage interaction between MO_FINGEROFFENSIVE (Throw Spirit Sphere) with Magnum Break, refine and spirit spheres - Fixed Magnum Break costing HP; it requires HP but does not consume it - Fixed Sonic Blow's damage formula (300%+50%*skill_lv) and how the bonus from Sonic Acceleration works (+10% to ratio) - Poison/DPoison now reduce hard DEF vs. monsters by 25%, but the DEF reduction no longer stacks - Fixed DPoison's duration (60s base duration on all levels) - Fixed Enchant Deadly Poison duration in Renewal - Fixed chance of DPoison to be inflicted (3% level 1+2, 4% level 3+4, 5% level 5) - Fixed negative resistances not increasing the chance of a status change to occur (it's only capped to 0 in renewal)
- Fixed Frenzy HP drain interval being 15 instead 10 seconds in renewal (follow-up to 1a004f0) - The buffs granted when a Super Novice levels up now all last 120 seconds (fixes #8189) - Assassin Soul Link now doubles stun chance outside GVG/BG (fixes #8195)
- Focused Arrow Strike no longer deals max damage when it crits (pre-re) - Focused Arrow Strike no longer considers cards that increase/decrease critical damage (pre-re) - Criticals with any guns are now calculated like melee criticals, not considering bullet attack (pre-re) - Chain Action can no longer do critical hits (pre-re) - Fixes #8200
- Fixes #8202 - Follow-up to 7d9a23d
* Corrections in item group DB * Implemented new groups
…, Paladin skills (#8210) - A handful of skills grant status changes that actually are calculated together into a value "ATKpercent" rather than increasing BATK/WATK, this value is then applied to most weapon skills * Pre-re - Damage after skill ratio but before DEF reduction is multiplied with ATKpercent * Renewal - Is a linear addition to skill ratio instead (ATKpercent of 200 means +100% to any skill ratio, so 100% becomes 200%, but 500% only becomes 600%) * For further information which status changes go into ATKpercent and which skills are not influenced by it, please see the battle_get_atkpercent function - Fixed base damage not being calculated correctly for certain skills - MO_INVESTIGATE is no longer influenced by Spirit Spheres except when you have the WATK_ELEMENT effect (Magnum Break) - Freezing trap now deals 100% damage on all levels and can miss - Acid Terror now ignores DEF, but its base attack is reduced by VIT - Acid Terror skill ratio is now 50%+50%*level - Acid Terror and Martyr's Reckoning (PA_SACRIFICE) are no longer affected by refine and mastery bonus - Magnum Break/EDP bonus no longer affects Acid Terror and unit skills - Fixed damage formula of Shield Boomerang and Rapid Smiting - Code improvements - Fixes #8193
- Volcano now increases BaseATK instead of WeaponATK for non-monsters - Fixed a bug that caused Volcano to increase MATK in pre-re (fixes #8208) - Fixed min damage not being set correctly - Fixed a compiler warning
Cleaned up code. Fixed invalid allocations from the old code. Changed to struct. Use correct packet id. Fixed invalid RENEWAL check instead of PACKETVER. Thanks to @aleos89
Co-authored-by: Atemo <Atemo@users.noreply.github.com>
* Replaced getrandgroupitem by getgroupitem script command * Fixed incorrect use of getrandgroupitem in NPC folder
… Smiting, Clashing Spiral (#8219) - ATKpercent, Spirit Spheres and other mastery bonuses, now all affect the exactly same skills with some exceptions for refine and Star Crumbs, see battle_skill_stacks_masteries_vvs - EDP and elemental bonus damage now apply to the exact same list of skills, see battle_skill_stacks_edp_element (pre-re) - Star Crumbs and Spirit Spheres no longer multiply the damage by number of hits twice - Star Crumbs, Spirit Spheres and similar mastery bonuses that apply even on MISS are now applied after the attribute table but before EDP and elemental bonus damage (pre-re) - Attribute table can now make damage go negative which is weighted against any of the above mastery bonuses and elemental bonus damage before being capped to 0 - EDP and elemental bonus damage no longer apply to the left hand; removed "basedamage2" as it is no longer needed - Left-hand damage is now always capped to 0 instead of 1 - Fixed Guillotine Fist ignoring size modifiers - Fixed inaccuracies in Guillotine Fist's damage due to rounding issues - Fixed bonus damage from Magnum Break when using Guillotine Fist - Sand Attack is no longer influenced by EDP - Rapid Smiting now has a fixed 20% hit bonus (it hits at least to 25%) - Rapid Smiting no longer deals damage on MISS - Clashing Spiral damage is no longer influenced by ATKpercent and any mastery except Star Crumbs - Further code improvements / compiler warning fix - Fixes #8211 - Fixes #8218 - Fixes #7750 - Fixes #1823
- Freezing Trap is now calculated like a ranged attack when the user has a bow equipped - Fixed some minor trap damage inaccuracies - Fixes #8227
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.
后续备忘
C4018 后面 rAthena 在 6月份有一个提交会修正，暂时不自己处理