Browse Source

Fixes Shadow Leap and Shadow Slash cast ranges (#5868)

* Fixes #4265.
* Shadow Leap's cast range is now 5-9 in pre-renewal and 6-10 in renewal.
* Shadow Slash is now considered a melee attack.
Thanks to @Indigo000!
Aleos 4 years ago
parent
commit
6ee25396c5
3 changed files with 22 additions and 20 deletions
  1. 10 10
      db/pre-re/skill_db.yml
  2. 10 10
      db/re/skill_db.yml
  3. 2 0
      src/map/battle.cpp

+ 10 - 10
db/pre-re/skill_db.yml

@@ -14365,15 +14365,15 @@ Body:
       AllowWhenHidden: true
       AllowWhenHidden: true
     Range:
     Range:
       - Level: 1
       - Level: 1
-        Size: 7
+        Size: 5
       - Level: 2
       - Level: 2
-        Size: 9
+        Size: 6
       - Level: 3
       - Level: 3
-        Size: 11
+        Size: 7
       - Level: 4
       - Level: 4
-        Size: 13
+        Size: 8
       - Level: 5
       - Level: 5
-        Size: 15
+        Size: 9
     Hit: Single
     Hit: Single
     HitCount: 1
     HitCount: 1
     CopyFlags:
     CopyFlags:
@@ -14398,15 +14398,15 @@ Body:
       AlterRangeShadowJump: true
       AlterRangeShadowJump: true
     Range:
     Range:
       - Level: 1
       - Level: 1
-        Size: 7
+        Size: 5
       - Level: 2
       - Level: 2
-        Size: 9
+        Size: 6
       - Level: 3
       - Level: 3
-        Size: 11
+        Size: 7
       - Level: 4
       - Level: 4
-        Size: 13
+        Size: 8
       - Level: 5
       - Level: 5
-        Size: 15
+        Size: 9
     Hit: Single
     Hit: Single
     HitCount: 1
     HitCount: 1
     Element: Weapon
     Element: Weapon

+ 10 - 10
db/re/skill_db.yml

@@ -14662,15 +14662,15 @@ Body:
       AllowWhenHidden: true
       AllowWhenHidden: true
     Range:
     Range:
       - Level: 1
       - Level: 1
-        Size: 7
+        Size: 6
       - Level: 2
       - Level: 2
-        Size: 9
+        Size: 7
       - Level: 3
       - Level: 3
-        Size: 11
+        Size: 8
       - Level: 4
       - Level: 4
-        Size: 13
+        Size: 9
       - Level: 5
       - Level: 5
-        Size: 15
+        Size: 10
     Hit: Single
     Hit: Single
     HitCount: 1
     HitCount: 1
     CopyFlags:
     CopyFlags:
@@ -14695,15 +14695,15 @@ Body:
       AlterRangeShadowJump: true
       AlterRangeShadowJump: true
     Range:
     Range:
       - Level: 1
       - Level: 1
-        Size: 7
+        Size: 6
       - Level: 2
       - Level: 2
-        Size: 9
+        Size: 7
       - Level: 3
       - Level: 3
-        Size: 11
+        Size: 8
       - Level: 4
       - Level: 4
-        Size: 13
+        Size: 9
       - Level: 5
       - Level: 5
-        Size: 15
+        Size: 10
     Hit: Single
     Hit: Single
     HitCount: -3
     HitCount: -3
     Element: Weapon
     Element: Weapon

+ 2 - 0
src/map/battle.cpp

@@ -2381,6 +2381,8 @@ static int battle_range_type(struct block_list *src, struct block_list *target,
 			// Renewal changes to ranged physical damage
 			// Renewal changes to ranged physical damage
 			return BF_LONG;
 			return BF_LONG;
 #endif
 #endif
+		case NJ_KIRIKAGE:
+			// Cast range mimics NJ_SHADOWJUMP but damage is considered melee
 		case GC_CROSSIMPACT:
 		case GC_CROSSIMPACT:
 			// Cast range is 7 cells and player jumps to target but skill is considered melee
 			// Cast range is 7 cells and player jumps to target but skill is considered melee
 			return BF_SHORT;
 			return BF_SHORT;