瀏覽代碼

Splits up the sequence from Skills map

aleos 1 年之前
父節點
當前提交
691cdb3f79
共有 7 個文件被更改,包括 568 次插入481 次删除
  1. 5 4
      db/import-tmpl/skill_db.yml
  2. 204 170
      db/pre-re/skill_db.yml
  3. 325 282
      db/re/skill_db.yml
  4. 5 4
      db/skill_db.yml
  5. 23 16
      doc/skill_db.txt
  6. 5 4
      doc/yaml/db/skill_db.yml
  7. 1 1
      src/map/skill.cpp

+ 5 - 4
db/import-tmpl/skill_db.yml

@@ -37,10 +37,11 @@
 #   HitCount:                 Skill hit count. (Default: 0)
 #     - Level                 Skill level.
 #       Count                 Number of hits at specific skill level.
-#   HitRate                   Skill hit rate. (Default: 100)
-#     - Level                 Skill level.
-#       Rate                  Rate is a percent of hit rate added to hit rate.
-#       Skills:               Skill flagged as a requirement (players only). (Optional)
+#   HitRate                   Skill hit rate.
+#     Rates:                  Rate. (Default: 100)
+#       - Level               Skill level.
+#         Rate                Rate is a percent of hit rate added to hit rate.
+#     Skills:                 Skill flagged as a requirement (players only). (Optional)
 #   Element:                  Skill element. (Default: Neutral)
 #     - Level                 Skill level.
 #       Element               Element at specific skill level.

+ 204 - 170
db/pre-re/skill_db.yml

@@ -37,10 +37,11 @@
 #   HitCount:                 Skill hit count. (Default: 0)
 #     - Level                 Skill level.
 #       Count                 Number of hits at specific skill level.
-#   HitRate                   Skill hit rate. (Default: 100)
-#     - Level                 Skill level.
-#       Rate                  Rate is a percent of hit rate added to hit rate.
-#       Skills:               Skill flagged as a requirement (players only). (Optional)
+#   HitRate                   Skill hit rate.
+#     Rates:                  Rate. (Default: 100)
+#       - Level               Skill level.
+#         Rate                Rate is a percent of hit rate added to hit rate.
+#     Skills:                 Skill flagged as a requirement (players only). (Optional)
 #   Element:                  Skill element. (Default: Neutral)
 #     - Level                 Skill level.
 #       Element               Element at specific skill level.
@@ -175,26 +176,27 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 105
-      - Level: 2
-        Rate: 110
-      - Level: 3
-        Rate: 115
-      - Level: 4
-        Rate: 120
-      - Level: 5
-        Rate: 125
-      - Level: 6
-        Rate: 130
-      - Level: 7
-        Rate: 135
-      - Level: 8
-        Rate: 140
-      - Level: 9
-        Rate: 145
-      - Level: 10
-        Rate: 150
+      Rates:
+        - Level: 1
+          Rate: 105
+        - Level: 2
+          Rate: 110
+        - Level: 3
+          Rate: 115
+        - Level: 4
+          Rate: 120
+        - Level: 5
+          Rate: 125
+        - Level: 6
+          Rate: 130
+        - Level: 7
+          Rate: 135
+        - Level: 8
+          Rate: 140
+        - Level: 9
+          Rate: 145
+        - Level: 10
+          Rate: 150
     Element: Weapon
     CopyFlags:
       Skill:
@@ -295,26 +297,27 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 110
-      - Level: 2
-        Rate: 120
-      - Level: 3
-        Rate: 130
-      - Level: 4
-        Rate: 140
-      - Level: 5
-        Rate: 150
-      - Level: 6
-        Rate: 160
-      - Level: 7
-        Rate: 170
-      - Level: 8
-        Rate: 180
-      - Level: 9
-        Rate: 190
-      - Level: 10
-        Rate: 200
+      Rates:
+        - Level: 1
+          Rate: 110
+        - Level: 2
+          Rate: 120
+        - Level: 3
+          Rate: 130
+        - Level: 4
+          Rate: 140
+        - Level: 5
+          Rate: 150
+        - Level: 6
+          Rate: 160
+        - Level: 7
+          Rate: 170
+        - Level: 8
+          Rate: 180
+        - Level: 9
+          Rate: 190
+        - Level: 10
+          Rate: 200
     Element: Fire
     SplashArea:
       - Level: 1
@@ -2135,26 +2138,27 @@ Body:
     Hit: Multi_Hit
     HitCount: 3
     HitRate:
-      - Level: 1
-        Rate: 105
-      - Level: 2
-        Rate: 110
-      - Level: 3
-        Rate: 115
-      - Level: 4
-        Rate: 120
-      - Level: 5
-        Rate: 125
-      - Level: 6
-        Rate: 130
-      - Level: 7
-        Rate: 135
-      - Level: 8
-        Rate: 140
-      - Level: 9
-        Rate: 145
-      - Level: 10
-        Rate: 150
+      Rates:
+        - Level: 1
+          Rate: 105
+        - Level: 2
+          Rate: 110
+        - Level: 3
+          Rate: 115
+        - Level: 4
+          Rate: 120
+        - Level: 5
+          Rate: 125
+        - Level: 6
+          Rate: 130
+        - Level: 7
+          Rate: 135
+        - Level: 8
+          Rate: 140
+        - Level: 9
+          Rate: 145
+        - Level: 10
+          Rate: 150
     Element: Weapon
     Requires:
       SpCost: 7
@@ -2299,7 +2303,8 @@ Body:
       Critical: true
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration1:
       - Level: 1
@@ -4837,26 +4842,27 @@ Body:
     Hit: Multi_Hit
     HitCount: -8
     HitRate:
-      - Level: 1
-        Rate: 50
-      - Level: 2
-        Rate: 50
-      - Level: 3
-        Rate: 50
-      - Level: 4
-        Rate: 50
-      - Level: 5
-        Rate: 50
-      - Level: 6
-        Rate: 50
-      - Level: 7
-        Rate: 50
-      - Level: 8
-        Rate: 50
-      - Level: 9
-        Rate: 50
-      - Level: 10
-        Rate: 50
+      Rates:
+        - Level: 1
+          Rate: 50
+        - Level: 2
+          Rate: 50
+        - Level: 3
+          Rate: 50
+        - Level: 4
+          Rate: 50
+        - Level: 5
+          Rate: 50
+        - Level: 6
+          Rate: 50
+        - Level: 7
+          Rate: 50
+        - Level: 8
+          Rate: 50
+        - Level: 9
+          Rate: 50
+        - Level: 10
+          Rate: 50
       Skills:
         AS_SONICACCEL: true
     Element: Weapon
@@ -5696,7 +5702,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration2: 60000
     Status: Poison
@@ -5711,7 +5718,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration2: 30000
     Status: Blind
@@ -5726,7 +5734,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration2: 30000
     Status: Silence
@@ -5741,7 +5750,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration2: 5000
     Status: Stun
@@ -5756,7 +5766,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration1: 100
     Duration2: 20000
@@ -5772,7 +5783,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Dark
     Duration2: 30000
     Status: Curse
@@ -5787,7 +5799,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration2: 30000
     Status: Sleep
@@ -5814,7 +5827,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Water
   - Id: 185
     Name: NPC_GROUNDATTACK
@@ -5828,7 +5842,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Earth
   - Id: 186
     Name: NPC_FIREATTACK
@@ -5841,7 +5856,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Fire
   - Id: 187
     Name: NPC_WINDATTACK
@@ -5854,7 +5870,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Wind
   - Id: 188
     Name: NPC_POISONATTACK
@@ -5867,7 +5884,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Poison
     Status: Poison
   - Id: 189
@@ -5881,7 +5899,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Holy
   - Id: 190
     Name: NPC_DARKNESSATTACK
@@ -5894,7 +5913,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Dark
   - Id: 191
     Name: NPC_TELEKINESISATTACK
@@ -5907,7 +5927,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Ghost
   - Id: 192
     Name: NPC_MAGICALATTACK
@@ -9486,7 +9507,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Undead
   - Id: 348
     Name: NPC_CHANGEUNDEAD
@@ -9499,7 +9521,8 @@ Body:
     Range: -2
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Undead
     Duration2: 60000
     Status: ChangeUndead
@@ -13197,7 +13220,8 @@ Body:
     Range: 4
     Hit: Multi_Hit
     HitCount: 5
-    HitRate: 120
+    HitRate:
+      Rates: 120
     CastTime: 1000
     AfterCastActDelay: 1000
     Requires:
@@ -15708,7 +15732,8 @@ Body:
       IgnoreLandProtector: true
     Hit: Multi_Hit
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     SplashArea:
       - Level: 1
         Area: 5
@@ -15769,7 +15794,8 @@ Body:
     Range: 6
     Hit: Single
     HitCount: 1
-    HitRate: 200
+    HitRate:
+      Rates: 200
     Element: Fire
     SplashArea: 3
     ActiveInstance: 14
@@ -15784,7 +15810,8 @@ Body:
     Range: 6
     Hit: Single
     HitCount: 1
-    HitRate: 200
+    HitRate:
+      Rates: 200
     Element: Water
     SplashArea: 3
     ActiveInstance: 14
@@ -15801,7 +15828,8 @@ Body:
     Range: 6
     Hit: Single
     HitCount: 1
-    HitRate: 200
+    HitRate:
+      Rates: 200
     Element: Wind
     SplashArea: 3
     ActiveInstance: 14
@@ -15816,7 +15844,8 @@ Body:
     Range: 6
     Hit: Single
     HitCount: 1
-    HitRate: 200
+    HitRate:
+      Rates: 200
     Element: Poison
     SplashArea: 3
     ActiveInstance: 14
@@ -15833,7 +15862,8 @@ Body:
     Range: 6
     Hit: Single
     HitCount: 1
-    HitRate: 200
+    HitRate:
+      Rates: 200
     Element: Dark
     SplashArea: 3
     ActiveInstance: 14
@@ -15881,7 +15911,8 @@ Body:
     Range: -9
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration2: 120000
     Status: Bleeding
@@ -32378,26 +32409,27 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 105
-      - Level: 2
-        Rate: 110
-      - Level: 3
-        Rate: 115
-      - Level: 4
-        Rate: 120
-      - Level: 5
-        Rate: 125
-      - Level: 6
-        Rate: 130
-      - Level: 7
-        Rate: 135
-      - Level: 8
-        Rate: 140
-      - Level: 9
-        Rate: 145
-      - Level: 10
-        Rate: 150
+      Rates:
+        - Level: 1
+          Rate: 105
+        - Level: 2
+          Rate: 110
+        - Level: 3
+          Rate: 115
+        - Level: 4
+          Rate: 120
+        - Level: 5
+          Rate: 125
+        - Level: 6
+          Rate: 130
+        - Level: 7
+          Rate: 135
+        - Level: 8
+          Rate: 140
+        - Level: 9
+          Rate: 145
+        - Level: 10
+          Rate: 150
     Element: Weapon
     Requires:
       SpCost:
@@ -32457,26 +32489,27 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 110
-      - Level: 2
-        Rate: 120
-      - Level: 3
-        Rate: 130
-      - Level: 4
-        Rate: 140
-      - Level: 5
-        Rate: 150
-      - Level: 6
-        Rate: 160
-      - Level: 7
-        Rate: 170
-      - Level: 8
-        Rate: 180
-      - Level: 9
-        Rate: 190
-      - Level: 10
-        Rate: 200
+      Rates:
+        - Level: 1
+          Rate: 110
+        - Level: 2
+          Rate: 120
+        - Level: 3
+          Rate: 130
+        - Level: 4
+          Rate: 140
+        - Level: 5
+          Rate: 150
+        - Level: 6
+          Rate: 160
+        - Level: 7
+          Rate: 170
+        - Level: 8
+          Rate: 180
+        - Level: 9
+          Rate: 190
+        - Level: 10
+          Rate: 200
     Element: Fire
     SplashArea: 2
     Knockback: 2
@@ -32932,26 +32965,27 @@ Body:
     Hit: Multi_Hit
     HitCount: 3
     HitRate:
-      - Level: 1
-        Rate: 105
-      - Level: 2
-        Rate: 110
-      - Level: 3
-        Rate: 115
-      - Level: 4
-        Rate: 120
-      - Level: 5
-        Rate: 125
-      - Level: 6
-        Rate: 130
-      - Level: 7
-        Rate: 135
-      - Level: 8
-        Rate: 140
-      - Level: 9
-        Rate: 145
-      - Level: 10
-        Rate: 150
+      Rates:
+        - Level: 1
+          Rate: 105
+        - Level: 2
+          Rate: 110
+        - Level: 3
+          Rate: 115
+        - Level: 4
+          Rate: 120
+        - Level: 5
+          Rate: 125
+        - Level: 6
+          Rate: 130
+        - Level: 7
+          Rate: 135
+        - Level: 8
+          Rate: 140
+        - Level: 9
+          Rate: 145
+        - Level: 10
+          Rate: 150
     Element: Weapon
     Requires:
       SpCost: 7

+ 325 - 282
db/re/skill_db.yml

@@ -37,10 +37,11 @@
 #   HitCount:                 Skill hit count. (Default: 0)
 #     - Level                 Skill level.
 #       Count                 Number of hits at specific skill level.
-#   HitRate                   Skill hit rate. (Default: 100)
-#     - Level                 Skill level.
-#       Rate                  Rate is a percent of hit rate added to hit rate.
-#       Skills:               Skill flagged as a requirement (players only). (Optional)
+#   HitRate                   Skill hit rate.
+#     Rates:                  Rate. (Default: 100)
+#       - Level               Skill level.
+#         Rate                Rate is a percent of hit rate added to hit rate.
+#     Skills:                 Skill flagged as a requirement (players only). (Optional)
 #   Element:                  Skill element. (Default: Neutral)
 #     - Level                 Skill level.
 #       Element               Element at specific skill level.
@@ -175,26 +176,27 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 105
-      - Level: 2
-        Rate: 110
-      - Level: 3
-        Rate: 115
-      - Level: 4
-        Rate: 120
-      - Level: 5
-        Rate: 125
-      - Level: 6
-        Rate: 130
-      - Level: 7
-        Rate: 135
-      - Level: 8
-        Rate: 140
-      - Level: 9
-        Rate: 145
-      - Level: 10
-        Rate: 150
+      Rates:
+        - Level: 1
+          Rate: 105
+        - Level: 2
+          Rate: 110
+        - Level: 3
+          Rate: 115
+        - Level: 4
+          Rate: 120
+        - Level: 5
+          Rate: 125
+        - Level: 6
+          Rate: 130
+        - Level: 7
+          Rate: 135
+        - Level: 8
+          Rate: 140
+        - Level: 9
+          Rate: 145
+        - Level: 10
+          Rate: 150
     Element: Weapon
     CopyFlags:
       Skill:
@@ -294,26 +296,27 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 110
-      - Level: 2
-        Rate: 120
-      - Level: 3
-        Rate: 130
-      - Level: 4
-        Rate: 140
-      - Level: 5
-        Rate: 150
-      - Level: 6
-        Rate: 160
-      - Level: 7
-        Rate: 170
-      - Level: 8
-        Rate: 180
-      - Level: 9
-        Rate: 190
-      - Level: 10
-        Rate: 200
+      Rates:
+        - Level: 1
+          Rate: 110
+        - Level: 2
+          Rate: 120
+        - Level: 3
+          Rate: 130
+        - Level: 4
+          Rate: 140
+        - Level: 5
+          Rate: 150
+        - Level: 6
+          Rate: 160
+        - Level: 7
+          Rate: 170
+        - Level: 8
+          Rate: 180
+        - Level: 9
+          Rate: 190
+        - Level: 10
+          Rate: 200
     Element: Fire
     SplashArea:
       - Level: 1
@@ -2149,26 +2152,27 @@ Body:
     Hit: Multi_Hit
     HitCount: 3
     HitRate:
-      - Level: 1
-        Rate: 105
-      - Level: 2
-        Rate: 110
-      - Level: 3
-        Rate: 115
-      - Level: 4
-        Rate: 120
-      - Level: 5
-        Rate: 125
-      - Level: 6
-        Rate: 130
-      - Level: 7
-        Rate: 135
-      - Level: 8
-        Rate: 140
-      - Level: 9
-        Rate: 145
-      - Level: 10
-        Rate: 150
+      Rates:
+        - Level: 1
+          Rate: 105
+        - Level: 2
+          Rate: 110
+        - Level: 3
+          Rate: 115
+        - Level: 4
+          Rate: 120
+        - Level: 5
+          Rate: 125
+        - Level: 6
+          Rate: 130
+        - Level: 7
+          Rate: 135
+        - Level: 8
+          Rate: 140
+        - Level: 9
+          Rate: 145
+        - Level: 10
+          Rate: 150
     Element: Weapon
     Requires:
       SpCost: 7
@@ -2314,7 +2318,8 @@ Body:
       Critical: true
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration1:
       - Level: 1
@@ -5082,26 +5087,27 @@ Body:
     Hit: Multi_Hit
     HitCount: -8
     HitRate:
-      - Level: 1
-        Rate: 90
-      - Level: 2
-        Rate: 90
-      - Level: 3
-        Rate: 90
-      - Level: 4
-        Rate: 90
-      - Level: 5
-        Rate: 90
-      - Level: 6
-        Rate: 90
-      - Level: 7
-        Rate: 90
-      - Level: 8
-        Rate: 90
-      - Level: 9
-        Rate: 90
-      - Level: 10
-        Rate: 90
+      Rates:
+        - Level: 1
+          Rate: 90
+        - Level: 2
+          Rate: 90
+        - Level: 3
+          Rate: 90
+        - Level: 4
+          Rate: 90
+        - Level: 5
+          Rate: 90
+        - Level: 6
+          Rate: 90
+        - Level: 7
+          Rate: 90
+        - Level: 8
+          Rate: 90
+        - Level: 9
+          Rate: 90
+        - Level: 10
+          Rate: 90
       Skills:
         AS_SONICACCEL: true
     Element: Weapon
@@ -5966,7 +5972,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration2: 18000
     Status: Poison
@@ -5981,7 +5988,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration2: 18000
     Status: Blind
@@ -5996,7 +6004,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration2: 18000
     Status: Silence
@@ -6011,7 +6020,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration2: 4500
     Status: Stun
@@ -6026,7 +6036,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration1: 100
     Duration2: 17000
@@ -6042,7 +6053,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Dark
     Duration2: 28000
     Status: Curse
@@ -6057,7 +6069,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration2: 18000
     Status: Sleep
@@ -6084,7 +6097,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Water
   - Id: 185
     Name: NPC_GROUNDATTACK
@@ -6098,7 +6112,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Earth
   - Id: 186
     Name: NPC_FIREATTACK
@@ -6111,7 +6126,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Fire
   - Id: 187
     Name: NPC_WINDATTACK
@@ -6124,7 +6140,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Wind
   - Id: 188
     Name: NPC_POISONATTACK
@@ -6137,7 +6154,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Poison
     Status: Poison
   - Id: 189
@@ -6151,7 +6169,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Holy
   - Id: 190
     Name: NPC_DARKNESSATTACK
@@ -6164,7 +6183,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Dark
   - Id: 191
     Name: NPC_TELEKINESISATTACK
@@ -6177,7 +6197,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Ghost
   - Id: 192
     Name: NPC_MAGICALATTACK
@@ -6493,26 +6514,27 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 105
-      - Level: 2
-        Rate: 110
-      - Level: 3
-        Rate: 115
-      - Level: 4
-        Rate: 120
-      - Level: 5
-        Rate: 125
-      - Level: 6
-        Rate: 130
-      - Level: 7
-        Rate: 135
-      - Level: 8
-        Rate: 140
-      - Level: 9
-        Rate: 145
-      - Level: 10
-        Rate: 150
+      Rates:
+        - Level: 1
+          Rate: 105
+        - Level: 2
+          Rate: 110
+        - Level: 3
+          Rate: 115
+        - Level: 4
+          Rate: 120
+        - Level: 5
+          Rate: 125
+        - Level: 6
+          Rate: 130
+        - Level: 7
+          Rate: 135
+        - Level: 8
+          Rate: 140
+        - Level: 9
+          Rate: 145
+        - Level: 10
+          Rate: 150
     Element: Weapon
     CopyFlags:
       Skill:
@@ -9817,7 +9839,8 @@ Body:
     Range: -7
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Undead
   - Id: 348
     Name: NPC_CHANGEUNDEAD
@@ -9830,7 +9853,8 @@ Body:
     Range: -2
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Undead
     Duration2: 60000
     Status: ChangeUndead
@@ -13541,7 +13565,8 @@ Body:
         Size: 11
     Hit: Multi_Hit
     HitCount: 5
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     CastTime: 800
     AfterCastActDelay: 1000
@@ -16115,7 +16140,8 @@ Body:
       IgnoreLandProtector: true
     Hit: Multi_Hit
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     SplashArea:
       - Level: 1
         Area: 5
@@ -16177,7 +16203,8 @@ Body:
     Range: 6
     Hit: Single
     HitCount: 1
-    HitRate: 200
+    HitRate:
+      Rates: 200
     Element: Fire
     SplashArea: 3
     ActiveInstance: 14
@@ -16192,7 +16219,8 @@ Body:
     Range: 6
     Hit: Single
     HitCount: 1
-    HitRate: 200
+    HitRate:
+      Rates: 200
     Element: Water
     SplashArea: 3
     ActiveInstance: 14
@@ -16209,7 +16237,8 @@ Body:
     Range: 6
     Hit: Single
     HitCount: 1
-    HitRate: 200
+    HitRate:
+      Rates: 200
     Element: Wind
     SplashArea: 3
     ActiveInstance: 14
@@ -16224,7 +16253,8 @@ Body:
     Range: 6
     Hit: Single
     HitCount: 1
-    HitRate: 200
+    HitRate:
+      Rates: 200
     Element: Poison
     SplashArea: 3
     ActiveInstance: 14
@@ -16241,7 +16271,8 @@ Body:
     Range: 6
     Hit: Single
     HitCount: 1
-    HitRate: 200
+    HitRate:
+      Rates: 200
     Element: Dark
     SplashArea: 3
     ActiveInstance: 14
@@ -16289,7 +16320,8 @@ Body:
     Range: -9
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Weapon
     Duration2: 108000
     Status: Bleeding
@@ -18366,7 +18398,8 @@ Body:
     Range: -9
     Hit: Single
     HitCount: 1
-    HitRate: 120
+    HitRate:
+      Rates: 120
     Element: Neutral
     Duration2: 108000
     Status: Bleeding
@@ -18381,7 +18414,8 @@ Body:
     Range: 6
     Hit: Single
     HitCount: 1
-    HitRate: 200
+    HitRate:
+      Rates: 200
     Element: Water
     SplashArea: 4
     ActiveInstance: 14
@@ -18997,26 +19031,27 @@ Body:
     Hit: Single
     HitCount: 3
     HitRate: # TODO: Confirm rate
-      - Level: 1
-        Rate: 103
-      - Level: 2
-        Rate: 106
-      - Level: 3
-        Rate: 109
-      - Level: 4
-        Rate: 112
-      - Level: 5
-        Rate: 115
-      - Level: 6
-        Rate: 118
-      - Level: 7
-        Rate: 121
-      - Level: 8
-        Rate: 124
-      - Level: 9
-        Rate: 127
-      - Level: 10
-        Rate: 130
+      Rates:
+        - Level: 1
+          Rate: 103
+        - Level: 2
+          Rate: 106
+        - Level: 3
+          Rate: 109
+        - Level: 4
+          Rate: 112
+        - Level: 5
+          Rate: 115
+        - Level: 6
+          Rate: 118
+        - Level: 7
+          Rate: 121
+        - Level: 8
+          Rate: 124
+        - Level: 9
+          Rate: 127
+        - Level: 10
+          Rate: 130
     Element: Weapon
     CopyFlags:
       Skill:
@@ -20942,16 +20977,17 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 114
-      - Level: 2
-        Rate: 118
-      - Level: 3
-        Rate: 122
-      - Level: 4
-        Rate: 126
-      - Level: 5
-        Rate: 130
+      Rates:
+        - Level: 1
+          Rate: 114
+        - Level: 2
+          Rate: 118
+        - Level: 3
+          Rate: 122
+        - Level: 4
+          Rate: 126
+        - Level: 5
+          Rate: 130
     Element: Weapon
     AfterCastActDelay: 1000
     Requires:
@@ -23638,26 +23674,27 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 70
-      - Level: 2
-        Rate: 75
-      - Level: 3
-        Rate: 80
-      - Level: 4
-        Rate: 85
-      - Level: 5
-        Rate: 90
-      - Level: 6
-        Rate: 100
-      - Level: 7
-        Rate: 105
-      - Level: 8
-        Rate: 110
-      - Level: 9
-        Rate: 115
-      - Level: 10
-        Rate: 120
+      Rates:
+        - Level: 1
+          Rate: 70
+        - Level: 2
+          Rate: 75
+        - Level: 3
+          Rate: 80
+        - Level: 4
+          Rate: 85
+        - Level: 5
+          Rate: 90
+        - Level: 6
+          Rate: 100
+        - Level: 7
+          Rate: 105
+        - Level: 8
+          Rate: 110
+        - Level: 9
+          Rate: 115
+        - Level: 10
+          Rate: 120
     Element: Weapon
     SplashArea:
       - Level: 1
@@ -24636,26 +24673,27 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 105
-      - Level: 2
-        Rate: 110
-      - Level: 3
-        Rate: 115
-      - Level: 4
-        Rate: 120
-      - Level: 5
-        Rate: 125
-      - Level: 6
-        Rate: 130
-      - Level: 7
-        Rate: 135
-      - Level: 8
-        Rate: 140
-      - Level: 9
-        Rate: 145
-      - Level: 10
-        Rate: 150
+      Rates:
+        - Level: 1
+          Rate: 105
+        - Level: 2
+          Rate: 110
+        - Level: 3
+          Rate: 115
+        - Level: 4
+          Rate: 120
+        - Level: 5
+          Rate: 125
+        - Level: 6
+          Rate: 130
+        - Level: 7
+          Rate: 135
+        - Level: 8
+          Rate: 140
+        - Level: 9
+          Rate: 145
+        - Level: 10
+          Rate: 150
     Element: Weapon
     Requires:
       SpCost:
@@ -28952,16 +28990,17 @@ Body:
     Description: Cart Remodeling
     MaxLevel: 5
     HitRate:
-      - Level: 1
-        Rate: 104
-      - Level: 2
-        Rate: 108
-      - Level: 3
-        Rate: 112
-      - Level: 4
-        Rate: 116
-      - Level: 5
-        Rate: 120
+      Rates:
+        - Level: 1
+          Rate: 104
+        - Level: 2
+          Rate: 108
+        - Level: 3
+          Rate: 112
+        - Level: 4
+          Rate: 116
+        - Level: 5
+          Rate: 120
   - Id: 2476
     Name: GN_CART_TORNADO
     Description: Cart Tornado
@@ -30663,16 +30702,17 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 10
-      - Level: 2
-        Rate: 9
-      - Level: 3
-        Rate: 8
-      - Level: 4
-        Rate: 7
-      - Level: 5
-        Rate: 6
+      Rates:
+        - Level: 1
+          Rate: 10
+        - Level: 2
+          Rate: 9
+        - Level: 3
+          Rate: 8
+        - Level: 4
+          Rate: 7
+        - Level: 5
+          Rate: 6
     Knockback: 6
     CastTime:
       - Level: 1
@@ -44251,26 +44291,27 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 105
-      - Level: 2
-        Rate: 110
-      - Level: 3
-        Rate: 115
-      - Level: 4
-        Rate: 120
-      - Level: 5
-        Rate: 125
-      - Level: 6
-        Rate: 130
-      - Level: 7
-        Rate: 135
-      - Level: 8
-        Rate: 140
-      - Level: 9
-        Rate: 145
-      - Level: 10
-        Rate: 150
+      Rates:
+        - Level: 1
+          Rate: 105
+        - Level: 2
+          Rate: 110
+        - Level: 3
+          Rate: 115
+        - Level: 4
+          Rate: 120
+        - Level: 5
+          Rate: 125
+        - Level: 6
+          Rate: 130
+        - Level: 7
+          Rate: 135
+        - Level: 8
+          Rate: 140
+        - Level: 9
+          Rate: 145
+        - Level: 10
+          Rate: 150
     Element: Weapon
     Requires:
       SpCost:
@@ -44330,26 +44371,27 @@ Body:
     Hit: Single
     HitCount: 1
     HitRate:
-      - Level: 1
-        Rate: 110
-      - Level: 2
-        Rate: 120
-      - Level: 3
-        Rate: 130
-      - Level: 4
-        Rate: 140
-      - Level: 5
-        Rate: 150
-      - Level: 6
-        Rate: 160
-      - Level: 7
-        Rate: 170
-      - Level: 8
-        Rate: 180
-      - Level: 9
-        Rate: 190
-      - Level: 10
-        Rate: 200
+      Rates:
+        - Level: 1
+          Rate: 110
+        - Level: 2
+          Rate: 120
+        - Level: 3
+          Rate: 130
+        - Level: 4
+          Rate: 140
+        - Level: 5
+          Rate: 150
+        - Level: 6
+          Rate: 160
+        - Level: 7
+          Rate: 170
+        - Level: 8
+          Rate: 180
+        - Level: 9
+          Rate: 190
+        - Level: 10
+          Rate: 200
     Element: Fire
     SplashArea: 2
     Knockback: 2
@@ -44844,26 +44886,27 @@ Body:
     Hit: Multi_Hit
     HitCount: 3
     HitRate:
-      - Level: 1
-        Rate: 15
-      - Level: 2
-        Rate: 110
-      - Level: 3
-        Rate: 115
-      - Level: 4
-        Rate: 120
-      - Level: 5
-        Rate: 125
-      - Level: 6
-        Rate: 130
-      - Level: 7
-        Rate: 135
-      - Level: 8
-        Rate: 140
-      - Level: 9
-        Rate: 145
-      - Level: 10
-        Rate: 150
+      Rates:
+        - Level: 1
+          Rate: 15
+        - Level: 2
+          Rate: 110
+        - Level: 3
+          Rate: 115
+        - Level: 4
+          Rate: 120
+        - Level: 5
+          Rate: 125
+        - Level: 6
+          Rate: 130
+        - Level: 7
+          Rate: 135
+        - Level: 8
+          Rate: 140
+        - Level: 9
+          Rate: 145
+        - Level: 10
+          Rate: 150
     Element: Weapon
     Requires:
       SpCost: 7

+ 5 - 4
db/skill_db.yml

@@ -37,10 +37,11 @@
 #   HitCount:                 Skill hit count. (Default: 0)
 #     - Level                 Skill level.
 #       Count                 Number of hits at specific skill level.
-#   HitRate                   Skill hit rate. (Default: 100)
-#     - Level                 Skill level.
-#       Rate                  Rate is a percent of hit rate added to hit rate.
-#       Skills:               Skill flagged as a requirement (players only). (Optional)
+#   HitRate                   Skill hit rate.
+#     Rates:                  Rate. (Default: 100)
+#       - Level               Skill level.
+#         Rate                Rate is a percent of hit rate added to hit rate.
+#     Skills:                 Skill flagged as a requirement (players only). (Optional)
 #   Element:                  Skill element. (Default: Neutral)
 #     - Level                 Skill level.
 #       Element               Element at specific skill level.

+ 23 - 16
doc/skill_db.txt

@@ -157,28 +157,35 @@ Sequence Map Form
 
 ---------------------------------------
 
-HitRate: Skill hit rate. Rate is 100 by default. If a skill is required to be learned, then the sequence map form is needed.
+HitRate: Skill hit rate.
+
+Rates - Rate is 100 by default.
 
 Can be defined in scalar form or sequence map form:
 Scalar Form
-  HitRate: 120
+  HitRate:
+	Rates: 120
 
 Sequence Map Form
   HitRate:
-    - Level: 1
-      Count: 120
-    - Level: 2
-      Count: 140
-    - Level: 3
-      Count: 160
-    - Level: 4
-      Count: 180
-    - Level: 5
-      Count: 200
-    Skills: # Requires both NV_BASIC and SM_BASH to be learned.
-      NV_BASIC: true # Requires Novice's Basic Skill to be learned.
-      SM_BASH: true # Requires Bash to be learned.
-      SM_MAGNUM: false # Remove Magnum Break from requirements. Useful for import.
+    Rates:
+      - Level: 1
+        Count: 120
+      - Level: 2
+        Count: 140
+      - Level: 3
+        Count: 160
+      - Level: 4
+        Count: 180
+      - Level: 5
+        Count: 200
+
+Skills - If a skill is required to be learned, then the sequence map form is needed.
+
+Skills: # Requires both NV_BASIC and SM_BASH to be learned. If skill check fails then default (100) value is used.
+  NV_BASIC: true # Requires Novice's Basic Skill to be learned.
+  SM_BASH: true # Requires Bash to be learned.
+  SM_MAGNUM: false # Remove Magnum Break from requirements. Useful for import.
 
 ---------------------------------------
 

+ 5 - 4
doc/yaml/db/skill_db.yml

@@ -20,10 +20,11 @@
 #   HitCount:                 Skill hit count. (Default: 0)
 #     - Level                 Skill level.
 #       Count                 Number of hits at specific skill level.
-#   HitRate                   Skill hit rate. (Default: 100)
-#     - Level                 Skill level.
-#       Rate                  Rate is a percent of hit rate added to hit rate.
-#       Skills:               Skill flagged as a requirement (players only). (Optional)
+#   HitRate                   Skill hit rate.
+#     Rates:                  Rate. (Default: 100)
+#       - Level               Skill level.
+#         Rate                Rate is a percent of hit rate added to hit rate.
+#     Skills:                 Skill flagged as a requirement (players only). (Optional)
 #   Element:                  Skill element. (Default: Neutral)
 #     - Level                 Skill level.
 #       Element               Element at specific skill level.

+ 1 - 1
src/map/skill.cpp

@@ -23643,7 +23643,7 @@ uint64 SkillDatabase::parseBodyNode(const ryml::NodeRef& node) {
 	}
 
 	if (this->nodeExists(node, "HitRate")) {
-		if (!this->parseNode("HitRate", "Rate", node, skill->hitrate.rate))
+		if (!this->parseNode("Rates", "Rate", node["HitRate"], skill->hitrate.rate))
 			return 0;
 
 		const auto &skillsNode = node["HitRate"];