this commit just j 😹 😹

RatPoison-dev · Jul 8, 2021 · 2d921d8 · 2d921d8
1 parent 907e3c2
commit 2d921d8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/src/main/kotlin/rat/poison/RatPoison.kt b/src/main/kotlin/rat/poison/RatPoison.kt
@@ -48,7 +48,7 @@ data class sWeapon(var tSkinID: Int, var tStatTrak: Int, var tWear: Float, var t
 const val TITLE = "RatPoison"
 const val BRANCH = "Beta"
 const val F_VERSION = "1.8"
-const val M_VERSION = "1.8.5.7"
+const val M_VERSION = "1.8.5.8"
 var LOADED_CONFIG = "DEFAULT"
 var oWeaponSize = oWeapon::class.java.declaredFields.size
 

diff --git a/src/main/kotlin/rat/poison/game/entity/EntityType.kt b/src/main/kotlin/rat/poison/game/entity/EntityType.kt
@@ -280,6 +280,7 @@ enum class EntityType(val weapon: Boolean = false, val grenade: Boolean = false,
 	CWeaponUMP45(weapon = true),
 	CWeaponUSP(weapon = true),
 	CWeaponXM1014(weapon = true),
+	CWeaponZoneRepulsor,
 	CWorld,
 	CWorldVguiText,
 	DustTrail,

diff --git a/src/main/kotlin/rat/poison/game/hooks/EntityIteration.kt b/src/main/kotlin/rat/poison/game/hooks/EntityIteration.kt
@@ -131,7 +131,7 @@ fun constructEntities() = every(500, continuous = true) {
 
     var dzMode = false
     for (glowIndex in 0..glowObjectCount) {
-        val glowAddress = glowObject + (glowIndex * GLOW_OBJECT_SIZE)
+        val glowAddress = glowObject + (glowIndex * GLOW_OBJECT_SIZE) + 4
         val entity = csgoEXE.uint(glowAddress)
 
         if (entity > 0L) {
@@ -156,9 +156,9 @@ fun constructEntities() = every(500, continuous = true) {
         }
     }
 
-    val maxIndex = clientDLL.int(dwEntityList + 0x24) //Not right?
+    //val maxIndex = clientDLL.int(dwEntityList + 0x24) //Not right?
 
-    for (i in 64..maxIndex) {
+    for (i in 64..1024) {
         val entity = clientDLL.uint(dwEntityList + (i * 0x10) - 0x10)
 
         if (entity != 0L) {

diff --git a/src/main/kotlin/rat/poison/game/offsets/EngineOffsets.kt b/src/main/kotlin/rat/poison/game/offsets/EngineOffsets.kt
@@ -11,7 +11,7 @@ object EngineOffsets {
     val dwModelPrecache by engineDLL(0x3, subtract = false)(0x0C, 0x3B, 0x81, 0[4], 0x75, 0x11, 0x8B, 0x45, 0x10, 0x83, 0xF8, 0x01, 0x7C, 0x09, 0x50, 0x83)
 
     val dwGlobalVars by engineDLL(1)(0x68, 0[4], 0x68, 0[4], 0xFF, 0x50, 0x08, 0x85, 0xC0)
-    val dwViewAngles by engineDLL(4, subtract = false)(0xF3, 0x0F, 0x11, 0x80, 0[4], 0xD9, 0x46, 0x04, 0xD9, 0x05)
+    val dwViewAngles by engineDLL(4, subtract = false)(0xF3, 0x0F, 0x11, 0x80, 0[4], 0xF3, 0x0F, 0x10, 0x44, 0x24, 0x38)
 
     val dwSignOnState by engineDLL(2, subtract = false)(0x83, 0xB8, 0[5], 0x0F, 0x94, 0xC0, 0xC3)
     val dwbSendPackets = parseOffset()

diff --git a/src/main/kotlin/rat/poison/utils/generalUtil/LoadSettings.kt b/src/main/kotlin/rat/poison/utils/generalUtil/LoadSettings.kt
@@ -2,6 +2,7 @@ package rat.poison.utils.generalUtil
 
 import org.apache.commons.lang3.StringUtils.isNumeric
 import rat.poison.*
+import rat.poison.scripts.aim.numToBone
 import rat.poison.utils.extensions.upper
 import rat.poison.utils.saving
 import java.io.File
@@ -115,11 +116,11 @@ fun validateSetting(settingName: String, value: String): Boolean {
             tStr = tStr.replace("oWeapon(", "").replace(")", "")
             val tSA = tStr.split(", ") //temp String Array
             val weapon = oWeapon()
-            if (size > 6 && tSA.pull(5).stringToList(";").all { isNumeric(it) }) {
-                //weapon.tAimBone = tSA.pull(5).stringToIntList().map { it.numToBone() }
+            if (size > 6 && tSA.pull(5).stringToList(";").all { it.toIntOrNull() != null }) {
+                weapon.tAimBone = tSA.pull(5).stringToIntList().map { it.numToBone() }
             }
-            if (size > 7 && tSA.pull(6).stringToList(";").all { isNumeric(it) }) {
-                //weapon.tForceBone = tSA.pull(6).stringToIntList().map { it.numToBone() }
+            if (size > 7 && tSA.pull(6).stringToList(";").all { it.toIntOrNull() != null }) {
+                weapon.tForceBone = tSA.pull(6).stringToIntList().map { it.numToBone() }
             }
             weapon.apply {
                 tOverride = if (size > 1) tSA.pull(0).safeToBool(defaultValue = tOverride) else tOverride

diff --git a/version.txt b/version.txt
@@ -1,2 +1,2 @@
-1.8.5.7
+1.8.5.8
 beta