From 6a47dcf21d1c30842f3578caff96e751ba3e974c Mon Sep 17 00:00:00 2001 From: SPRAVEDLIVO Date: Sat, 15 Jan 2022 01:42:30 +0300 Subject: [PATCH] update to latest cs --- .idea/misc.xml | 2 +- settings/CFGS/DefaultSettings.cfg | 2 +- settings/General.txt | 2 +- src/main/kotlin/rat/poison/RatPoison.kt | 16 +++++++------ src/main/kotlin/rat/poison/game/CSGO.kt | 3 ++- .../rat/poison/game/offsets/EngineOffsets.kt | 3 +-- src/main/kotlin/rat/poison/overlay/App.kt | 8 +++---- src/main/kotlin/rat/poison/overlay/Overlay.kt | 13 ++++++---- .../kotlin/rat/poison/scripts/Backtrack.kt | 10 ++++---- src/main/kotlin/rat/poison/ui/tabs/AimTab.kt | 4 ++-- .../kotlin/rat/poison/utils/ParseOffset.kt | 24 ------------------- version.txt | 2 +- 12 files changed, 34 insertions(+), 55 deletions(-) delete mode 100644 src/main/kotlin/rat/poison/utils/ParseOffset.kt diff --git a/.idea/misc.xml b/.idea/misc.xml index c03cbf65..5a6df5d5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/settings/CFGS/DefaultSettings.cfg b/settings/CFGS/DefaultSettings.cfg index 01764192..86b59d7f 100644 --- a/settings/CFGS/DefaultSettings.cfg +++ b/settings/CFGS/DefaultSettings.cfg @@ -102,7 +102,7 @@ MENU_KEY = 112 CURRENT_LOCALE = locale_en_US FOV_TYPE = STATIC GAUSSIAN_BLUR = false -MENU_APP = "Counter-Strike: Global Offensive" +MENU_APP = "Counter-Strike: Global Offensive - Direct3D 9" MENU_STAY_FOCUSED = true DISABLE_POST_PROCESSING = false OVERLAY_WIDTH = 1920 diff --git a/settings/General.txt b/settings/General.txt index ef08320b..439212af 100644 --- a/settings/General.txt +++ b/settings/General.txt @@ -26,7 +26,7 @@ GAUSSIAN_BLUR = false //The title of the app to draw the overlay on //Ex "Untitled - Notepad" -MENU_APP = "Counter-Strike: Global Offensive" +MENU_APP = "Counter-Strike: Global Offensive - Direct3D 9" APPLESS = false //Menu stays focused even when csgo isn't diff --git a/src/main/kotlin/rat/poison/RatPoison.kt b/src/main/kotlin/rat/poison/RatPoison.kt index 545484e4..cd8c7941 100644 --- a/src/main/kotlin/rat/poison/RatPoison.kt +++ b/src/main/kotlin/rat/poison/RatPoison.kt @@ -45,12 +45,14 @@ data class sWeapon(var tSkinID: Int, var tStatTrak: Int, var tWear: Float, var t const val TITLE = "RatPoison" const val BRANCH = "Master" const val F_VERSION = "1.7" -const val M_VERSION = "1.7.1.5" +const val M_VERSION = "1.7.1.6" var LOADED_CONFIG = "DEFAULT" //const val EXPERIMENTAL = false const val SETTINGS_DIRECTORY = "settings" //Internal - +val DEFAULT_MENU_APP = "Counter-Strike: Global Offensive - Direct3D 9" +var MENU_APP = "" +var appless = false lateinit var WEAPON_STATS_FILE: File lateinit var SKIN_INFO_FILE: File @@ -74,6 +76,8 @@ fun main() { if (dbg) println("DEBUG enabled") println("Launching...") + MENU_APP = curSettings["MENU_APP"].replace("\"", "") + appless = curSettings["APPLESS"].strToBool() CSGO.initialize() @@ -142,15 +146,13 @@ fun main() { if (dbg) { println("[DEBUG] Initializing Weapon Changer") }; skinChanger() if (dbg) { println("[DEBUG] Initializing NightMode/FullBright") }; nightMode() if (dbg) { println("[DEBUG] Initializing Bomb Updater")}; bombUpdater() - - if (dbg) { println("[DEBUG] Initializing Backtrack") }; setupBacktrack() - if (dbg) { println("[DEBUG] Initializing Draw Backtrack") }; drawBacktrack() if (dbg) { println("[DEBUG] Initializing Handle Fire Key") }; handleFireKey() if (dbg) { println("[DEBUG] Initializing Head Level Helper") }; headLevelHelper() if (dbg) { println("[DEBUG] Initializing Nade Thrower") }; nadeThrower() if (dbg) { println("[DEBUG] Initializing Name Changer") }; nameChanger() if (dbg) { println("[DEBUG] dwbSendPackets: $dwbSendPackets")} + println("Backtrack disabled") //if (EXPERIMENTAL) { //rayTraceTest() @@ -172,7 +174,7 @@ fun main() { var w = CSGO.gameWidth var h = CSGO.gameHeight - if ((w == 0 || h == 0) || curSettings["MENU_APP"] != "\"Counter-Strike: Global Offensive\"" || curSettings["APPLESS"].strToBool()) { + if ((w == 0 || h == 0) || MENU_APP != DEFAULT_MENU_APP || appless) { w = curSettings["OVERLAY_WIDTH"].toInt() h = curSettings["OVERLAY_HEIGHT"].toInt() } @@ -189,7 +191,7 @@ fun main() { //Required to fix W2S offset setWindowPosition(CSGO.gameX, CSGO.gameY) - setDecorated(curSettings["APPLESS"].strToBool()) + setDecorated(appless) useVsync(false) glfwSwapInterval(0) glfwWindowHint(GLFW_DOUBLEBUFFER, GLFW_TRUE) diff --git a/src/main/kotlin/rat/poison/game/CSGO.kt b/src/main/kotlin/rat/poison/game/CSGO.kt index 97fea27d..ef33762c 100644 --- a/src/main/kotlin/rat/poison/game/CSGO.kt +++ b/src/main/kotlin/rat/poison/game/CSGO.kt @@ -5,6 +5,7 @@ import com.sun.jna.platform.win32.WinDef import org.jire.arrowhead.Module import org.jire.arrowhead.Process import org.jire.arrowhead.processByName +import rat.poison.DEFAULT_MENU_APP import rat.poison.dbg import rat.poison.game.hooks.constructEntities import rat.poison.game.hooks.updateCursorEnable @@ -57,7 +58,7 @@ object CSGO { } val rect = WinDef.RECT() - val hwd = CUser32.FindWindowA(null, "Counter-Strike: Global Offensive") + val hwd = CUser32.FindWindowA(null, DEFAULT_MENU_APP) //Get initially if (!CUser32.GetClientRect(hwd, rect)) exitProcess(2) diff --git a/src/main/kotlin/rat/poison/game/offsets/EngineOffsets.kt b/src/main/kotlin/rat/poison/game/offsets/EngineOffsets.kt index 0912103c..2778eabf 100644 --- a/src/main/kotlin/rat/poison/game/offsets/EngineOffsets.kt +++ b/src/main/kotlin/rat/poison/game/offsets/EngineOffsets.kt @@ -3,7 +3,6 @@ package rat.poison.game.offsets import rat.poison.game.CSGO.engineDLL import rat.poison.utils.extensions.invoke import rat.poison.utils.get -import rat.poison.utils.parseOffset object EngineOffsets { @@ -14,7 +13,7 @@ object EngineOffsets { val dwViewAngles by engineDLL(4, subtract = false)(0xF3, 0x0F, 0x11, 0x86, 0[4], 0xF3, 0x0F, 0x10, 0x44, 0x24, 0, 0xF3, 0x0F, 0x11, 0x86) val dwSignOnState by engineDLL(2, subtract = false)(0x83, 0xB8, 0[5], 0x0F, 0x94, 0xC0, 0xC3) - val dwbSendPackets = parseOffset() + val dwbSendPackets = -1 val pStudioModel by engineDLL(0x2)(0x8B, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xB7, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8B, 0x11, 0x89, 0x45, 0x08, 0x5D, 0xFF, 0x62, 0x38, 0x33, 0xC0) diff --git a/src/main/kotlin/rat/poison/overlay/App.kt b/src/main/kotlin/rat/poison/overlay/App.kt index 14c2d962..87949ed7 100644 --- a/src/main/kotlin/rat/poison/overlay/App.kt +++ b/src/main/kotlin/rat/poison/overlay/App.kt @@ -16,12 +16,10 @@ import com.kotcrab.vis.ui.VisUI import com.sun.management.OperatingSystemMXBean import it.unimi.dsi.fastutil.objects.ObjectArrayList import org.jire.arrowhead.keyPressed -import rat.poison.curSettings -import rat.poison.dbg +import rat.poison.* import rat.poison.game.CSGO import rat.poison.game.me import rat.poison.game.updateViewMatrix -import rat.poison.haltProcess import rat.poison.interfaces.IOverlay import rat.poison.interfaces.IOverlayListener import rat.poison.jna.enums.AccentStates @@ -57,7 +55,7 @@ object App : ApplicationAdapter() { lateinit var sb: SpriteBatch lateinit var textRenderer: BitmapFont lateinit var shapeRenderer: ShapeRenderer - private val overlay = Overlay(if (curSettings["APPLESS"].strToBool()) { "Counter-Strike: Global Offensive" } else { curSettings["MENU_APP"].replace("\"", "") }, "Rat Poison UI", AccentStates.ACCENT_ENABLE_BLURBEHIND) + private val overlay = Overlay(if (appless) { DEFAULT_MENU_APP } else { MENU_APP }, "Rat Poison UI", AccentStates.ACCENT_ENABLE_BLURBEHIND) lateinit var menuStage: Stage private val bodies = ObjectArrayList Unit>() private lateinit var camera: OrthographicCamera @@ -260,7 +258,7 @@ object App : ApplicationAdapter() { aimTab.tAim.enableAim.isChecked = !aimTab.tAim.enableAim.isChecked } - if (!curSettings["APPLESS"].strToBool()) { + if (!appless) { val w = overlay.width val h = overlay.height diff --git a/src/main/kotlin/rat/poison/overlay/Overlay.kt b/src/main/kotlin/rat/poison/overlay/Overlay.kt index c3bfd242..e61b1d3a 100644 --- a/src/main/kotlin/rat/poison/overlay/Overlay.kt +++ b/src/main/kotlin/rat/poison/overlay/Overlay.kt @@ -4,6 +4,9 @@ package rat.poison.overlay import com.sun.jna.platform.win32.WinUser +import rat.poison.DEFAULT_MENU_APP +import rat.poison.MENU_APP +import rat.poison.appless import rat.poison.curSettings import rat.poison.interfaces.IOverlay import rat.poison.interfaces.IOverlayListener @@ -91,7 +94,7 @@ class Overlay(private val targetAppTitle: String, private val myAppTitle: String saveStyle() - if (!curSettings["APPLESS"].strToBool()) { + if (!appless) { makeUndecorated() } @@ -126,7 +129,7 @@ class Overlay(private val targetAppTitle: String, private val myAppTitle: String x = rcWindow.left + (rcWindow.right - rcWindow.left - width) / 2 - 1 y = rcWindow.top + rcWindow.bottom - rcWindow.top - height - 1 - if (!curSettings["APPLESS"].strToBool()) { + if (!appless) { if (oldX != x || oldY != y || oldWidth != width || oldHeight != height) { SetWindowPos(myHWND, HWND_TOPPOS, x, y, width, height, WinUser.SWP_NOSENDCHANGING or WinUser.SWP_NOZORDER or WinUser.SWP_DEFERERASE or WinUser.SWP_NOREDRAW or WinUser.SWP_ASYNCWINDOWPOS or WinUser.SWP_FRAMECHANGED) listener?.onBoundsChange(this@Overlay, x, y, width, height) @@ -140,7 +143,7 @@ class Overlay(private val targetAppTitle: String, private val myAppTitle: String } } else { if (isMyWindowVisible) { - if (curSettings["MENU_APP"].replace("\"", "") == "Counter-Strike: Global Offensive") { + if (MENU_APP == DEFAULT_MENU_APP) { if (!curSettings["MENU_STAY_FOCUSED"].strToBool()) { ShowWindow(myHWND, WinUser.SW_HIDE) listener?.onBackground(this@Overlay) @@ -276,7 +279,7 @@ class Overlay(private val targetAppTitle: String, private val myAppTitle: String AttachThreadInput(dwCurrentThread.toLong(), dwFGThread.toLong(), false) - if (!curSettings["APPLESS"].strToBool()) { + if (!appless) { SetWindowPos(myHWND, HWND_TOPPOS, x, y, width, height, 0) } @@ -285,7 +288,7 @@ class Overlay(private val targetAppTitle: String, private val myAppTitle: String } private fun bePassive() = with(User32) { - if (!curSettings["APPLESS"].strToBool()) { + if (!appless) { SetWindowLongA(myHWND, WinUser.GWL_EXSTYLE, WinUser.WS_EX_LAYERED or WinUser.WS_EX_TRANSPARENT or WS_EX_TOOLWINDOW or WS_EX_TOPMOST) makeTransparent() } diff --git a/src/main/kotlin/rat/poison/scripts/Backtrack.kt b/src/main/kotlin/rat/poison/scripts/Backtrack.kt index 47fd8689..0df18b84 100644 --- a/src/main/kotlin/rat/poison/scripts/Backtrack.kt +++ b/src/main/kotlin/rat/poison/scripts/Backtrack.kt @@ -56,11 +56,11 @@ fun setupBacktrack() { } } - every(4, true, inGameCheck = true) { - if (!curSettings["ENABLE_BACKTRACK"].strToBool() || me <= 0 || !haveGvars) return@every - - constructRecords() - } + //every(4, true, inGameCheck = true) { + // if (!curSettings["ENABLE_BACKTRACK"].strToBool() || me <= 0 || !haveGvars) return@every +// + // constructRecords() + //} } fun attemptBacktrack(): Boolean { diff --git a/src/main/kotlin/rat/poison/ui/tabs/AimTab.kt b/src/main/kotlin/rat/poison/ui/tabs/AimTab.kt index 8a0c0f26..1dd4889b 100644 --- a/src/main/kotlin/rat/poison/ui/tabs/AimTab.kt +++ b/src/main/kotlin/rat/poison/ui/tabs/AimTab.kt @@ -279,14 +279,14 @@ fun updateDisableBacktrack() { if (!opened) return aimTab.tBacktrack.apply { - val bool = !aimTab.tBacktrack.enableBacktrack.isChecked + val bool = true var col = Color(255F, 255F, 255F, 1F) if (bool) { col = Color(105F, 105F, 105F, .2F) } - //enableBacktrack.disable(bool) + enableBacktrack.disable(bool) backtrackVisualize.disable(bool) backtrackEnableKey.disable(bool) backtrackKey.disable(bool, col) diff --git a/src/main/kotlin/rat/poison/utils/ParseOffset.kt b/src/main/kotlin/rat/poison/utils/ParseOffset.kt deleted file mode 100644 index 6aece005..00000000 --- a/src/main/kotlin/rat/poison/utils/ParseOffset.kt +++ /dev/null @@ -1,24 +0,0 @@ -package rat.poison.utils - -import java.net.URL -import javax.net.ssl.HttpsURLConnection - -fun parseOffset(): Int { - try { - val connection = URL("https://raw.githubusercontent.com/frk1/hazedumper/master/csgo.json") - val con = connection.openConnection() as HttpsURLConnection - val text = connection.readText() - con.disconnect() - - //this obviously is not a perfect solution - val lines = text.split("\n") - lines.forEach { line -> - if ("dwbSendPackets" in line) { - val regex = "\\d+".toRegex() - return regex.find(line)!!.value.toInt() - } - } - } - catch (e: Exception) { } - return -1 -} \ No newline at end of file diff --git a/version.txt b/version.txt index cda00cff..ec8411a9 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ -1.7.1.5 +1.7.1.6 master