Ranged combat

cache/src/main/kotlin/world/gregs/voidps/cache/definition/data/ClientScriptDefinition.kt

@@ -10,7 +10,7 @@ data class ClientScriptDefinition(
     var intVariableCount: Int = 0,
     var stringArgumentCount: Int = 0,
     var longArgumentCount: Int = 0,
-    var aHashTableArray9503: Array<List<Pair<Int, Int>>>? = null,
+    var switchStatementIndices: Array<List<Pair<Int, Int>>>? = null,
     var name: String? = null,
     var instructions: IntArray = intArrayOf(),
     var stringOperands: Array<String?>? = null,
@@ -30,10 +30,10 @@ data class ClientScriptDefinition(
         if (intVariableCount != other.intVariableCount) return false
         if (stringArgumentCount != other.stringArgumentCount) return false
         if (longArgumentCount != other.longArgumentCount) return false
-        if (aHashTableArray9503 != null) {
-            if (other.aHashTableArray9503 == null) return false
-            if (!aHashTableArray9503!!.contentEquals(other.aHashTableArray9503!!)) return false
-        } else if (other.aHashTableArray9503 != null) return false
+        if (switchStatementIndices != null) {
+            if (other.switchStatementIndices == null) return false
+            if (!switchStatementIndices!!.contentEquals(other.switchStatementIndices!!)) return false
+        } else if (other.switchStatementIndices != null) return false
         if (name != other.name) return false
         if (!instructions.contentEquals(other.instructions)) return false
         if (stringOperands != null) {
@@ -60,7 +60,7 @@ data class ClientScriptDefinition(
         result = 31 * result + intVariableCount
         result = 31 * result + stringArgumentCount
         result = 31 * result + longArgumentCount
-        result = 31 * result + (aHashTableArray9503?.contentHashCode() ?: 0)
+        result = 31 * result + (switchStatementIndices?.contentHashCode() ?: 0)
         result = 31 * result + (name?.hashCode() ?: 0)
         result = 31 * result + instructions.contentHashCode()
         result = 31 * result + (stringOperands?.contentHashCode() ?: 0)

cache/src/main/kotlin/world/gregs/voidps/cache/definition/data/Instructions.kt

@@ -0,0 +1,10 @@
+package world.gregs.voidps.cache.definition.data
+
+object Instructions {
+    const val PUSH_INT = 0
+    const val PUSH_STRING = 3
+    const val MERGE_STRINGS = 37
+    const val CALL_CS2 = 40
+    const val SWITCH = 51
+    const val GOTO = 6
+}

cache/src/main/kotlin/world/gregs/voidps/cache/definition/decoder/ClientScriptDecoder.kt

@@ -47,7 +47,7 @@ class ClientScriptDecoder(cache: world.gregs.voidps.cache.Cache, private val rev
                     hashtable.add(buffer.readInt() to buffer.readInt())
                 }
             }
-            aHashTableArray9503 = list.toTypedArray()
+            switchStatementIndices = list.toTypedArray()
         }
         buffer.position(0)
         name = buffer.readString()

cache/src/main/kotlin/world/gregs/voidps/cache/definition/encoder/ClientScriptEncoder.kt

@@ -37,7 +37,7 @@ class ClientScriptEncoder(private val revision634: Boolean = false) : Definition
             writeShort(definition.longArgumentCount)
         }
         val position = position()
-        val table = definition.aHashTableArray9503
+        val table = definition.switchStatementIndices
         if (table.isNullOrEmpty()) {
             writeByte(0)
         } else {

cache/src/test/kotlin/world/gregs/voidps/cache/definition/encoder/ClientScriptEncoderTest.kt

@@ -22,7 +22,7 @@ internal class ClientScriptEncoderTest {
             intVariableCount = 2,
             stringArgumentCount = 1,
             longArgumentCount = 3,
-            aHashTableArray9503 = arrayOf(listOf(1 to 2), listOf(2 to 3, 3 to 4)),
+            switchStatementIndices = arrayOf(listOf(1 to 2), listOf(2 to 3, 3 to 4)),
             name = "client-script",
             instructions = intArrayOf(3, 54, 54, 54, 0, 21),
             stringOperands = arrayOf("one", null, null, null, null, null),
@@ -54,7 +54,7 @@ internal class ClientScriptEncoderTest {
             stringVariableCount = 1,
             intVariableCount = 2,
             stringArgumentCount = 1,
-            aHashTableArray9503 = arrayOf(listOf(1 to 2), listOf(2 to 3, 3 to 4)),
+            switchStatementIndices = arrayOf(listOf(1 to 2), listOf(2 to 3, 3 to 4)),
             name = "client-script",
             instructions = intArrayOf(3, 0, 21),
             stringOperands = arrayOf("one", null, null),

data/definitions/animation-definition-extras.yml

@@ -1016,4 +1016,84 @@ teleport_land_lunar:
 teleport_tablet:
   id: 9597
 teleport_land_tablet:
-  id: 9598
+  id: 9598
+bow_shoot:
+  id: 426
+crossbow_shoot:
+  id: 4230
+cow_hit:
+  id: 150
+cow_death:
+  id: 244
+cow_attack:
+  id: 245
+calf_hit:
+  id: 150
+calf_death:
+  id: 244
+calf_attack:
+  id: 245
+chicken_attack:
+  id: 5387
+chicken_hit:
+  id: 5388
+chicken_death:
+  id: 5389
+goblin_attack:
+  id: 6184
+goblin_hit:
+  id: 6183
+goblin_death:
+  id: 6182
+big_spider_attack:
+  id: 5327
+big_spider_hit:
+  id: 5328
+big_spider_death:
+  id: 5329
+rat_attack:
+  id: 2705
+rat_hit:
+  id: 2706
+player_punch:
+  id: 422
+player_kick:
+  id: 423
+player_death:
+  id: 9055
+sap:
+  id: 12569
+leech:
+  id: 12575
+deflect:
+  id: 12573
+magic_shortbow_special:
+  id: 1074
+zaniks_crossbow_special:
+  id: 11359
+throw_dart:
+  id: 582
+throw_javelin:
+  id: 10501
+throw_morrigans_throwing_axe:
+  id: 10501
+throw_morrigans_throwing_axe_special:
+  id: 10504
+throw_projectile:
+  id: 929
+hand_cannon_shoot:
+  id: 12152
+hand_cannon_special:
+  id: 12174
+hand_cannon_explode:
+  id: 12175
+karils_crossbow_shoot:
+  id: 2075
+sling_rock:
+  id: 14867
+toktz-xil-ul:
+  id: 3353
+throw_chinchompa:
+  id: 2779
+rune_throwing_axe_special:
+  id: 1068