Merge pull request #1903 from Asheraf/skill_scale

Implement skill scale packet for client versions >= 20151223.

2 files changed, 36 insertions, 0 deletions

diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index 80527b4f6..06c06dd16 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -73,6 +73,7 @@
 							Works like skill SA_FREECAST, allow move and attack with reduced speed.
 		FreeCastNormal: true/false              (boolean, defaults to false)
 							Works like FreeCastReduced, but not reduce speed.
+		ShowSkillScale: true/false              (boolean, defaults to false)
 	}
 	AttackType: "Attack Type"                   (string, defaults to "None")
 	                                            Types: "None", "Weapon", "Magic" or "Misc"
@@ -16551,6 +16552,7 @@ skill_db: (
 	SkillInfo: {
 		NPC: true
 		IgnoreLandProtector: true
+		ShowSkillScale: true
 	}
 	AttackType: "Weapon"
 	DamageType: {
@@ -16698,6 +16700,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -16758,6 +16761,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	AttackType: "Weapon"
 	DamageType: {
@@ -16777,6 +16781,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	AttackType: "Weapon"
 	DamageType: {
@@ -16797,6 +16802,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -16828,6 +16834,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -16859,6 +16866,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -16890,6 +16898,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -16921,6 +16930,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -16952,6 +16962,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -16983,6 +16994,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	AttackType: "Magic"
 	Element: "Ele_Fire"
@@ -17006,6 +17018,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	AttackType: "Magic"
 	Element: "Ele_Dark"
@@ -17069,6 +17082,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17174,6 +17188,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17205,6 +17220,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17236,6 +17252,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	AttackType: "Weapon"
 	DamageType: {
@@ -17265,6 +17282,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 2a59785fa..815442fd9 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -73,6 +73,7 @@
 							Works like skill SA_FREECAST, allow move and attack with reduced speed.
 		FreeCastNormal: true/false              (boolean, defaults to false)
 							Works like FreeCastReduced, but not reduce speed.
+		ShowSkillScale: true/false              (boolean, defaults to false)
 	}
 	AttackType: "Attack Type"                   (string, defaults to "None")
 	                                            Types: "None", "Weapon", "Magic" or "Misc"
@@ -17009,6 +17010,7 @@ skill_db: (
 	SkillInfo: {
 		NPC: true
 		IgnoreLandProtector: true
+		ShowSkillScale: true
 	}
 	AttackType: "Weapon"
 	DamageType: {
@@ -17156,6 +17158,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17216,6 +17219,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	AttackType: "Weapon"
 	DamageType: {
@@ -17235,6 +17239,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	AttackType: "Weapon"
 	DamageType: {
@@ -17255,6 +17260,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17286,6 +17292,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17317,6 +17324,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17348,6 +17356,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17379,6 +17388,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17410,6 +17420,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17441,6 +17452,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	AttackType: "Magic"
 	Element: "Ele_Fire"
@@ -17464,6 +17476,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	AttackType: "Magic"
 	Element: "Ele_Dark"
@@ -17527,6 +17540,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17632,6 +17646,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17663,6 +17678,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true
@@ -17694,6 +17710,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	AttackType: "Weapon"
 	DamageType: {
@@ -17723,6 +17740,7 @@ skill_db: (
 	}
 	SkillInfo: {
 		NPC: true
+		ShowSkillScale: true
 	}
 	DamageType: {
 		NoDamage: true