Skip to content

Commit

Permalink
update to latest cs
Browse files Browse the repository at this point in the history
  • Loading branch information
SPRAVEDLIVO committed Jan 14, 2022
1 parent 58cbdb8 commit 6a47dcf
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion settings/CFGS/DefaultSettings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion settings/General.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 9 additions & 7 deletions src/main/kotlin/rat/poison/RatPoison.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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()

Expand Down Expand Up @@ -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()
Expand All @@ -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()
}
Expand All @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/rat/poison/game/CSGO.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions src/main/kotlin/rat/poison/game/offsets/EngineOffsets.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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)
Expand Down
8 changes: 3 additions & 5 deletions src/main/kotlin/rat/poison/overlay/App.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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<App.() -> Unit>()
private lateinit var camera: OrthographicCamera
Expand Down Expand Up @@ -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

Expand Down
13 changes: 8 additions & 5 deletions src/main/kotlin/rat/poison/overlay/Overlay.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -91,7 +94,7 @@ class Overlay(private val targetAppTitle: String, private val myAppTitle: String

saveStyle()

if (!curSettings["APPLESS"].strToBool()) {
if (!appless) {
makeUndecorated()
}

Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
}

Expand All @@ -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()
}
Expand Down
10 changes: 5 additions & 5 deletions src/main/kotlin/rat/poison/scripts/Backtrack.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/rat/poison/ui/tabs/AimTab.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 0 additions & 24 deletions src/main/kotlin/rat/poison/utils/ParseOffset.kt

This file was deleted.

2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1.7.1.5
1.7.1.6
master

0 comments on commit 6a47dcf

Please sign in to comment.