diff --git a/.github/workflows/clang15_test.yml b/.github/workflows/clang15_test.yml index 3096f8284ea..7f5bca70560 100644 --- a/.github/workflows/clang15_test.yml +++ b/.github/workflows/clang15_test.yml @@ -39,7 +39,7 @@ jobs: cancel-in-progress: true container: - image: debian:unstable + image: debian:stable services: mariadb: image: mariadb:latest diff --git a/AUTHORS b/AUTHORS index 7becedd66f1..4dec8531060 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,6 +4,7 @@ ai4rei Akkarinage akrus akshat157 +alex <10777884+ahoyaharr@users.noreply.github.com> Alexander Kozlov Alige Amir El Sayed diff --git a/CHANGELOG.md b/CHANGELOG.md index 9eb0db46dbc..0546d48cc7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -792,6 +792,17 @@ All these changes only affect Renewal. Pre-renewal is unchanged. - The `is_quest` argument to `pc->gainexp()` has been changed to a `flags` bitmask enum, in order to allow expansion to different flags. (#3279) +## [v2024.11] `November 2024` + +### Changed + +- Updated mob_db2 documentation to include the `Inherit` mechanism. (#3327) + +### Fixed + +- Fixed a code comment containing misleading information. (#3327) +- Fixed the `clang-13` build in the GitHub CI, failing due to a removed package in debian unstable. (#3333) + ## [v2024.10] `October 2024` ### Changed @@ -3951,6 +3962,7 @@ Note: everything included in this release is part of PR #3198 which consists of - New versioning scheme and project changelogs/release notes (#1853) [Unreleased]: https://github.com/HerculesWS/Hercules/compare/stable...master +[v2024.11]: https://github.com/HerculesWS/Hercules/compare/v2024.10...v2024.11 [v2024.10]: https://github.com/HerculesWS/Hercules/compare/v2024.09...v2024.10 [v2024.09]: https://github.com/HerculesWS/Hercules/compare/v2024.08...v2024.09 [v2024.08]: https://github.com/HerculesWS/Hercules/compare/v2024.06...v2024.08 diff --git a/db/mob_db2.conf b/db/mob_db2.conf index 7dc40c834c0..ed6c2ef30d8 100644 --- a/db/mob_db2.conf +++ b/db/mob_db2.conf @@ -34,8 +34,8 @@ mob_db: ( { // ================ Mandatory fields ============================== Id: ID (int) - SpriteName: "SPRITE_NAME" (string) - Name: "Mob name" (string) + SpriteName: "SPRITE_NAME" (string, optional if Inherit: true) + Name: "Mob name" (string, optional if Inherit: true) // ================ Optional fields =============================== JName: "Mob name" (string) Lv: level (int, defaults to 1) @@ -54,6 +54,10 @@ mob_db: ( Int: intelligence (int, defaults to 0) Dex: dexterity (int, defaults to 0) Luk: luck (int, defaults to 0) + (if Inherit: true, + values default to + the inherited value + from mob_db) } ViewRange: view range (int, defaults to 1) ChaseRange: chase range (int, defaults to 1) @@ -92,8 +96,17 @@ mob_db: ( // or AegisName: (chance, "Option Drop Group") // ... + (if Inherit: true, values + are inherited and overridden + in sequential order. i.e., + the first entry will override + Drop1id and Drop1per) } DamageTakenRate: damage taken rate (int, defaults to 100) + Inherit: true/false (bool, defaults to false. + When true, inherits the + values from the original + mob_db) }, **************************************************************************/ diff --git a/doc/constants_pre-re.md b/doc/constants_pre-re.md index bb62027c2f9..863fef3d436 100644 --- a/doc/constants_pre-re.md +++ b/doc/constants_pre-re.md @@ -4880,7 +4880,7 @@ ### Server defines - `PACKETVER`: 20190530 -- `HERCULES_VERSION`: 202410000 +- `HERCULES_VERSION`: 202411000 - `MAX_LEVEL`: 175 - `MAX_STORAGE`: 600 - `MAX_GUILD_STORAGE`: 500 diff --git a/doc/constants_re.md b/doc/constants_re.md index 9d583556ef5..16916beb807 100644 --- a/doc/constants_re.md +++ b/doc/constants_re.md @@ -4878,7 +4878,7 @@ ### Server defines - `PACKETVER`: 20190530 -- `HERCULES_VERSION`: 202410000 +- `HERCULES_VERSION`: 202411000 - `MAX_LEVEL`: 175 - `MAX_STORAGE`: 600 - `MAX_GUILD_STORAGE`: 500 diff --git a/src/config/core.h b/src/config/core.h index 8b7f92bb1cf..3adc57a9057 100644 --- a/src/config/core.h +++ b/src/config/core.h @@ -22,7 +22,7 @@ #define CONFIG_CORE_H /// Hercules version. From tag vYYYY.MM(+PPP) -> YYYYMMPPP -#define HERCULES_VERSION 202410000 +#define HERCULES_VERSION 202411000 /// Max number of items on @autolootid list #define AUTOLOOTITEM_SIZE 10 diff --git a/src/map/skill.c b/src/map/skill.c index 08dc6ded90e..b51be92f462 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7389,7 +7389,7 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * map->foreachinrange(skill->area_sub, src, skill->get_splash(skill_id, skill_lv), BL_SKILL|BL_CHAR, src,skill_id,skill_lv,tick, flag|BCT_ENEMY|1, skill->castend_damage_id); clif->skill_nodamage (src,src,skill_id,skill_lv,1); - // Initiate 10% of your damage becomes fire element. + // Initiate 20% of your damage becomes fire element. sc_start4(src, src, SC_SUB_WEAPONPROPERTY, 100, 3, 20, 0, 0, skill->get_time2(skill_id, skill_lv), skill_id); break;