Merge pull request #3043 from MrKeiKun/update-hardcoded_range2

De-hardcode skill range modifier in skill_get_range2.
HerculesWS · Oct 6, 2021 · f1dabc0 · f1dabc0
2 parents 9de0a39 + 7221682
commit f1dabc0
Show file tree

Hide file tree

Showing 4 changed files with 205 additions and 91 deletions.
diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
@@ -80,6 +80,11 @@
 		IsCombo: true/false                     (boolean, defaults to false)
 		BlockedByStasis: true/false                (boolean, defaults to false)
 		BlockedByKagehumi: true/false              (boolean, defaults to false)
+		RangeModByVulture: true/false           (boolean, defaults to false)
+		RangeModBySnakeEye: true/false          (boolean, defaults to false)
+		RangeModByShadowJump: true/false        (boolean, defaults to false)
+		RangeModByRadius: true/false            (boolean, defaults to false)
+		RangeModByResearchTrap: true/false      (boolean, defaults to false)
 	}
 	AttackType: "Attack Type"                   (string, defaults to "None") (can be grouped by Levels)
 	                                            Types: "None", "Weapon", "Magic" or "Misc"
@@ -1789,6 +1794,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		RangeModByVulture: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -1819,6 +1825,7 @@ skill_db: (
 	SkillInfo: {
 		IgnoreLandProtector: true
 		AllowReproduce: true
+		RangeModByVulture: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -4095,6 +4102,7 @@ skill_db: (
 	SkillInfo: {
 		Trap: true
 		AllowReproduce: true
+		RangeModByResearchTrap: true
 	}
 	AttackType: "Misc"
 	Element: "Ele_Earth"
@@ -4381,6 +4389,7 @@ skill_db: (
 	SkillInfo: {
 		Trap: true
 		AllowReproduce: true
+		RangeModByResearchTrap: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Water"
@@ -4444,6 +4453,7 @@ skill_db: (
 	SkillInfo: {
 		Trap: true
 		AllowReproduce: true
+		RangeModByResearchTrap: true
 	}
 	AttackType: "Misc"
 	Element: "Ele_Wind"
@@ -4497,6 +4507,7 @@ skill_db: (
 	SkillInfo: {
 		Trap: true
 		AllowReproduce: true
+		RangeModByResearchTrap: true
 	}
 	AttackType: "Misc"
 	Element: "Ele_Fire"
@@ -4621,6 +4632,9 @@ skill_db: (
 	SkillType: {
 		Enemy: true
 	}
+	SkillInfo: {
+		RangeModByVulture: true
+	}
 	AttackType: "Misc"
 	DamageType: {
 		SplashArea: true
@@ -5183,6 +5197,7 @@ skill_db: (
 	SkillInfo: {
 		Quest: true
 		AllowReproduce: true
+		RangeModByVulture: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -11613,6 +11628,9 @@ skill_db: (
 	SkillType: {
 		Enemy: true
 	}
+	SkillInfo: {
+		RangeModByVulture: true
+	}
 	AttackType: "Misc"
 	DamageType: {
 		IgnoreFlee: true
@@ -15469,6 +15487,7 @@ skill_db: (
 		Spirit: true
 		IsCombo: true
 		BlockedByStasis: true
+		RangeModByVulture: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -15812,6 +15831,9 @@ skill_db: (
 	SkillType: {
 		Enemy: true
 	}
+	SkillInfo: {
+		RangeModBySnakeEye: true
+	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
 	DamageType: {
@@ -15853,6 +15875,9 @@ skill_db: (
 	SkillType: {
 		Enemy: true
 	}
+	SkillInfo: {
+		RangeModBySnakeEye: true
+	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
 	NumberOfHits: 5
@@ -16021,6 +16046,9 @@ skill_db: (
 	SkillType: {
 		Enemy: true
 	}
+	SkillInfo: {
+		RangeModBySnakeEye: true
+	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
 	InterruptCast: true
@@ -16081,6 +16109,9 @@ skill_db: (
 	SkillType: {
 		Enemy: true
 	}
+	SkillInfo: {
+		RangeModBySnakeEye: true
+	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
 	DamageType: {
@@ -16130,6 +16161,9 @@ skill_db: (
 	SkillType: {
 		Place: true
 	}
+	SkillInfo: {
+		RangeModBySnakeEye: true
+	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
 	DamageType: {
@@ -16435,6 +16469,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		RangeModByShadowJump: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -20788,6 +20823,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		BlockedByStasis: true
+		RangeModByRadius: true
 	}
 	AttackType: "Magic"
 	InterruptCast: true
@@ -20833,6 +20869,7 @@ skill_db: (
 	SkillInfo: {
 		AllowReproduce: true
 		BlockedByStasis: true
+		RangeModByRadius: true
 	}
 	AttackType: "Magic"
 	Element: "Ele_Ghost"
@@ -21005,6 +21042,9 @@ skill_db: (
 	SkillType: {
 		Enemy: true
 	}
+	SkillInfo: {
+		RangeModByRadius: true
+	}
 	AttackType: "Magic"
 	DamageType: {
 		NoDamage: true
@@ -21110,6 +21150,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		BlockedByStasis: true
+		RangeModByRadius: true
 	}
 	AttackType: "Magic"
 	Element: "Ele_Earth"
@@ -21254,6 +21295,7 @@ skill_db: (
 	SkillInfo: {
 		AllowReproduce: true
 		BlockedByStasis: true
+		RangeModByRadius: true
 	}
 	AttackType: "Magic"
 	InterruptCast: true
@@ -21286,6 +21328,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		RangeModByRadius: true
 	}
 	AttackType: "Magic"
 	Element: "Ele_Fire"
@@ -21327,6 +21370,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		RangeModByRadius: true
 	}
 	AttackType: "Magic"
 	Element: "Ele_Fire"
@@ -21373,6 +21417,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		RangeModByRadius: true
 	}
 	AttackType: "Magic"
 	NumberOfHits: -20
@@ -21433,6 +21478,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		RangeModByRadius: true
 	}
 	AttackType: "Magic"
 	SplashRange: 3
@@ -21495,6 +21541,7 @@ skill_db: (
 	SkillInfo: {
 		AllowReproduce: true
 		BlockedByStasis: true
+		RangeModByRadius: true
 	}
 	AttackType: "Magic"
 	Element: "Ele_Earth"
@@ -21573,6 +21620,9 @@ skill_db: (
 	SkillType: {
 		Enemy: true
 	}
+	SkillInfo: {
+		RangeModByRadius: true
+	}
 	AttackType: "Magic"
 	InterruptCast: true
 	CastTime: {
@@ -21948,6 +21998,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		BlockedByStasis: true
+		RangeModByRadius: true
 	}
 	AttackType: "Magic"
 	InterruptCast: true
@@ -22009,6 +22060,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		RangeModByVulture: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -22136,6 +22188,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		AllowReproduce: true
+		RangeModByVulture: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -22251,6 +22304,7 @@ skill_db: (
 	SkillInfo: {
 		Trap: true
 		AllowReproduce: true
+		RangeModByResearchTrap: true
 	}
 	AttackType: "Misc"
 	DamageType: {
@@ -22368,6 +22422,9 @@ skill_db: (
 	SkillType: {
 		Enemy: true
 	}
+	SkillInfo: {
+		RangeModByVulture: true
+	}
 	AttackType: "Weapon"
 	AfterCastActDelay: 2000
 	SkillData1: {
@@ -22672,6 +22729,7 @@ skill_db: (
 	SkillInfo: {
 		Trap: true
 		AllowReproduce: true
+		RangeModByResearchTrap: true
 	}
 	AttackType: "Misc"
 	Element: "Ele_Fire"
@@ -22714,6 +22772,7 @@ skill_db: (
 	SkillInfo: {
 		Trap: true
 		AllowReproduce: true
+		RangeModByResearchTrap: true
 	}
 	AttackType: "Misc"
 	Element: "Ele_Water"
@@ -37502,6 +37561,9 @@ skill_db: (
 	SkillType: {
 		Enemy: true
 	}
+	SkillInfo: {
+		RangeModByVulture: true
+	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
 	NumberOfHits: 2
@@ -37527,6 +37589,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		IgnoreLandProtector: true
+		RangeModByVulture: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
@@ -37805,6 +37868,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		Quest: true
+		RangeModByVulture: true
 	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"