Merge pull request #11 from sotakoira/009

009
sotakoira · Jul 7, 2021 · 7889102 · 7889102
2 parents 63ec704 + 5c86de7
commit 7889102
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 8 deletions.
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
@@ -128,7 +128,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) {

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)
     var dwbSendPackets = parseOffset()

diff --git a/src/main/kotlin/rat/poison/scripts/visuals/IndicatorESP.kt b/src/main/kotlin/rat/poison/scripts/visuals/IndicatorESP.kt
@@ -18,7 +18,7 @@ import kotlin.math.hypot
 import kotlin.math.sin
 
 fun indicatorEsp() = App {
-    if (!curSettings["ENABLE_ESP"].strToBool() || !curSettings["INDICATOR_ESP"].strToBool() || !inGame) return@App
+    if (!curSettings["ENABLE_ESP"].strToBool() || !curSettings["INDICATOR_ESP"].strToBool() || curSettings["DISABLE_DETECTED_FEATURES"].strToBool() || !inGame) return@App
 
     val bomb: Entity = entityByType(EntityType.CC4)?.entity ?: -1L
     val bEnt = bomb.carrier()

diff --git a/src/main/kotlin/rat/poison/scripts/visuals/SnapLines.kt b/src/main/kotlin/rat/poison/scripts/visuals/SnapLines.kt
@@ -14,7 +14,7 @@ import rat.poison.utils.inGame
 
 //TODO god fix this eventually g
 fun snapLines() = App {
-    if (!curSettings["ENABLE_SNAPLINES"].strToBool() || !curSettings["ENABLE_ESP"].strToBool() || !inGame) return@App
+    if (!curSettings["ENABLE_SNAPLINES"].strToBool() || !curSettings["ENABLE_ESP"].strToBool() || curSettings["DISABLE_DETECTED_FEATURES"].strToBool() || !inGame) return@App
 
     val bomb: Entity = entityByType(EntityType.CC4)?.entity ?: -1L
     val bEnt = bomb.carrier()

diff --git a/src/main/kotlin/rat/poison/ui/DisableDetected.kt b/src/main/kotlin/rat/poison/ui/DisableDetected.kt
@@ -8,10 +8,7 @@ import rat.poison.game.netvars.NetVarOffsets.flFlashMaxAlpha
 import rat.poison.game.offsets.ClientOffsets.bOverridePostProcesing
 import rat.poison.overlay.opened
 import rat.poison.scripts.visuals.disableAllEsp
-import rat.poison.ui.tabs.boxEspTab
-import rat.poison.ui.tabs.espTabbedPane
-import rat.poison.ui.tabs.footStepsEspTab
-import rat.poison.ui.tabs.othersTab
+import rat.poison.ui.tabs.*
 import rat.poison.ui.uiPanels.mainTabbedPane
 import rat.poison.ui.uiPanels.optionsTab
 import rat.poison.ui.uiPanels.ranksTab
@@ -31,6 +28,8 @@ fun disableDetectedUpdate() {
         visualsTab.apply {
 
             espTabbedPane.disableTab(footStepsEspTab, bool)
+            espTabbedPane.disableTab(snaplinesEspTab, bool)
+            espTabbedPane.disableTab(indicatorEspTab, bool)
 
             boxEspTab.skeletonEsp.disable(bool)
             boxEspTab.showTeamSkeleton.disable(bool)
@@ -45,6 +44,38 @@ fun disableDetectedUpdate() {
             footStepsEspTab.footStepEnemyBox.disable(bool)
             footStepsEspTab.footStepEnemyColor.disable(bool)
 
+            snaplinesEspTab.enableSnaplines.disable(bool)
+            snaplinesEspTab.snaplinesWidth.disable(bool, col)
+            snaplinesEspTab.snaplinesSmokeCheck.disable(bool)
+            snaplinesEspTab.enemySnaplines.disable(bool)
+            snaplinesEspTab.enemySnaplinesColor.disable(bool)
+            snaplinesEspTab.teamSnaplines.disable(bool)
+            snaplinesEspTab.teamSnaplinesColor.disable(bool)
+            snaplinesEspTab.weaponSnaplines.disable(bool)
+            snaplinesEspTab.weaponSnaplinesColor.disable(bool)
+            snaplinesEspTab.bombSnaplines.disable(bool)
+            snaplinesEspTab.bombSnaplinesColor.disable(bool)
+            snaplinesEspTab.bombCarrierSnaplines.disable(bool)
+            snaplinesEspTab.bombCarrierSnaplinesColor.disable(bool)
+
+            indicatorEspTab.indicatorEsp.disable(bool)
+            indicatorEspTab.indicatorDistance.disable(bool, col)
+            indicatorEspTab.indicatorSize.disable(bool, col)
+            indicatorEspTab.indicatorSmokeCheck.disable(bool)
+            indicatorEspTab.showTeam.disable(bool)
+            indicatorEspTab.showEnemies.disable(bool)
+            indicatorEspTab.showBomb.disable(bool)
+            indicatorEspTab.showBombCarrier.disable(bool)
+            indicatorEspTab.showWeapons.disable(bool)
+            indicatorEspTab.showGrenades.disable(bool)
+            indicatorEspTab.showDefusers.disable(bool)
+            indicatorEspTab.indicatorTeamColor.disable(bool)
+            indicatorEspTab.indicatorEnemyColor.disable(bool)
+            indicatorEspTab.indicatorBombColor.disable(bool)
+            indicatorEspTab.indicatorDefuserColor.disable(bool)
+            indicatorEspTab.indicatorWeaponColor.disable(bool)
+            indicatorEspTab.indicatorGrenadeColor.disable(bool)
+
         }
     }
     othersTab.apply {