Merge pull request #3327 from ahoyaharr/mob_db-docs

mob_db2 inheritance doc
HerculesWS · Nov 30, 2024 · c4ad5a3 · c4ad5a3
2 parents 484691a + cb88193
commit c4ad5a3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git 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/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;