From ab97ea48ac75af9b924dd88b3f38f4995ada841f Mon Sep 17 00:00:00 2001
From: alex <10777884+ahoyaharr@users.noreply.github.com>
Date: Sun, 20 Oct 2024 16:57:23 -0700
Subject: [PATCH 1/4] mob_db2 inheritance doc

---
 db/mob_db2.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/db/mob_db2.conf b/db/mob_db2.conf
index 7dc40c834c0..97a26507faf 100644
--- a/db/mob_db2.conf
+++ b/db/mob_db2.conf
@@ -94,6 +94,15 @@ mob_db: (
 		// ...
 	}
 	DamageTakenRate: damage taken rate    (int, defaults to 100)
+	Inherit: true/false                   (bool, defaults to false.
+                                               When true, inherits the
+                                               values from mob_db using
+                                               Id as the primary key.
+                                               Individual items in a nested 
+                                               field (e.g., Drops) can be
+                                               added or modified without
+                                               respecifying the other items
+                                               in that field.)
 },
 **************************************************************************/
 

From d6233f800f17aca16fc8adabcd93021c8c9d6d1c Mon Sep 17 00:00:00 2001
From: alex <10777884+ahoyaharr@users.noreply.github.com>
Date: Sun, 20 Oct 2024 17:02:49 -0700
Subject: [PATCH 2/4] fix doc

---
 db/mob_db2.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/mob_db2.conf b/db/mob_db2.conf
index 97a26507faf..c306e14c204 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)

From 6da294c16e3b59b987f2847004fc5d036592f6ad Mon Sep 17 00:00:00 2001
From: alex <10777884+ahoyaharr@users.noreply.github.com>
Date: Sun, 3 Nov 2024 11:18:04 -0800
Subject: [PATCH 3/4] fix mistake

---
 db/mob_db2.conf | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/db/mob_db2.conf b/db/mob_db2.conf
index c306e14c204..ed6c2ef30d8 100644
--- a/db/mob_db2.conf
+++ b/db/mob_db2.conf
@@ -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,17 +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 mob_db using
-                                               Id as the primary key.
-                                               Individual items in a nested 
-                                               field (e.g., Drops) can be
-                                               added or modified without
-                                               respecifying the other items
-                                               in that field.)
+                                               values from the original
+                                               mob_db)
 },
 **************************************************************************/
 

From cb88193e1549c6f35ffd522622a0b9263c891140 Mon Sep 17 00:00:00 2001
From: alex <10777884+ahoyaharr@users.noreply.github.com>
Date: Sun, 3 Nov 2024 11:19:21 -0800
Subject: [PATCH 4/4] magnum attack modifier comment fixed

---
 src/map/skill.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/map/skill.c b/src/map/skill.c
index 582639b50c2..211ec90685e 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7313,7 +7313,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;