Make DamageType defaults to NK_NONE

HerculesWS · Jun 2, 2020 · 147a491 · 147a491
1 parent 452dd30
commit 147a491
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
@@ -87,7 +87,7 @@
 	                                            "Ele_Weapon" - Uses weapon's element.
 	                                            "Ele_Endowed" - Uses Endowed element.
 	                                            "Ele_Random" - Uses random element.
-	DamageType: {                               (bool, default to "NoDamage")
+	DamageType: {                               (bool, default to "NK_NONE")
 		NoDamage: true/false                     No damage skill
 		SplashArea: true/false                   Has splash area (requires source modification)
 		SplitDamage: true/false                  Damage should be split among targets (requires 'SplashArea' in order to work)

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
@@ -87,7 +87,7 @@
 	                                            "Ele_Weapon" - Uses weapon's element.
 	                                            "Ele_Endowed" - Uses Endowed element.
 	                                            "Ele_Random" - Uses random element.
-	DamageType: {                               (bool, default to "NoDamage")
+	DamageType: {                               (bool, default to "NK_NONE")
 		NoDamage: true/false                     No damage skill
 		SplashArea: true/false                   Has splash area (requires source modification)
 		SplitDamage: true/false                  Damage should be split among targets (requires 'SplashArea' in order to work)

diff --git a/src/map/skill.c b/src/map/skill.c
@@ -21208,9 +21208,6 @@ static void skill_validate_damagetype(struct config_setting_t *conf, struct s_sk
 			}
 		}
 	}
-
-	if (sk->nk == NK_NONE)
-		sk->nk = NK_NO_DAMAGE;
 }
 
 /**