6 files changed, 180 insertions, 123 deletions

diff --git a/CONTEXT.md b/CONTEXT.md
index 21128f7..1969781 100644
--- a/CONTEXT.md
+++ b/CONTEXT.md
@@ -1,47 +1,168 @@
 # Context: HL2 Linux Internal Cheat (`hl2hake`)
 
-## What is this project?
+## What this is
 
-A minimal, featureless cheat for Half-Life 2 (native Linux build, 32-bit `hl2_linux`). Originally ported from a Windows reference (`hake`) that implemented auto-bhop, auto-ABH, and auto-climb via a `CHLClient::CreateMove` vtable hook.
+A 32-bit Linux internal for Half-Life 2 (native `hl2_linux`), loaded with
+`LD_PRELOAD` through Steam's bundled 32-bit runtime. It started as a port of
+the Windows `hake` reference (auto-bhop / auto-ABH / auto-climb) and now also
+covers ESP, aimbot, triggerbot and silent aim.
 
-## Resolved terms
+## Build / run
 
-- **Build**: LD_PRELOAD a 32-bit `.so` into `hl2_linux` via Steam's bundled 32-bit runtime (`steam-runtime/run.sh`).
-- **Hook**: Copy-and-swap vtable on the `CHLClient` instance (slot 21 = `CreateMove`). 256-slot copy to cover all dispatched virtuals.
-- **Netvars**: RecvTable walk from `IBaseClientDLL::GetAllClasses` (vtable slot 8). Prediction datamap scan for `CBaseEntity::m_MoveType` (networked `movetype` is a virtual proxy with offset 0).
-- **CInput**: Discovered via byte-scan of `CHLClient::CreateMove` prologue (gcc PIC `call thunk; add $imm,%esi` idiom), resolving the module-level `IInput*` variable.
-- **UserCMD CRC**: Standard CRC-32 (IEEE reflected, poly `0xEDB88320`, init `0xFFFFFFFF`). Field set and offsets verified against the binary's `CInput::ValidateUserCmd` disassembly.
-- **Module discovery**: `/proc/self/maps` scan for `client.so` / `engine.so` basenames (exact match at `/` boundary). PROT_NONE (`---p`) entries excluded. Merged file-backed ranges absorb one directly-adjacent anonymous `.bss` tail; anon-to-anon chaining is prohibited.
-- **Calling convention**: All game virtuals use **cdecl** with `this` as first stack arg (`0x8(%ebp)` in prologues, bare `ret`). No MSVC `__thiscall`.
+- `./build.sh` -> `libhl2hake.so`
+  (`g++ -m32 -O2 -std=c++17 -Wall -Wextra -Werror -fPIC -shared`,
+  sources: `hl2h modules cinput netvars menu esp server bones vischeck`, `-ldl`).
+- `./play.sh` -> Steam runtime + `hl2.sh -steam -novid -console +map d1_town_01`.
+- Logs: `/tmp/hl2hake.log` (`logf`) and stderr. `./play.sh > /tmp/hl2run.log 2>&1`
+  captures everything.
+- Debug env:
+  - `HL2H_DRAW_TEST=1` — red probe rect + text, no menu needed.
+  - `HL2H_BONE_DEBUG=1` — white marker at each NPC head hitbox.
+  - `HL2H_NO_SERVER=1` — disable server-side health reads.
+- Config: `$XDG_CONFIG_HOME/hl2hake/config`, falling back to
+  `~/.config/hl2hake/config`. Plain INI, saved on every change.
 
-## Netvar offsets (this build, verified via both RecvTable walk and pred-TD scan)
+## Runtime architecture
 
-| Field | Offset | Source |
-|---|---|---|
-| `m_fFlags` | `0x33C` | RecvTable + pred TD |
-| `m_vecVelocity[0]` | `0xE0` | RecvTable (array, FIELD_VECTOR) |
-| `m_MoveType` | `0x164` | pred-TD only (networked `movetype` has offset 0) |
+- Modules from `/proc/self/maps`: `client.so`, `engine.so`, `server.so`.
+  PROT_NONE ranges excluded; file-backed bss tails merged.
+- Calling convention: cdecl (i386); `this` is the first stack argument.
+- Hooks (copy-and-swap vtable, 256 slots):
+  - `CHLClient` slot 21 `CreateMove`; slot 35 `FrameStageNotify`.
+  - `ISurface` slot 114 `PaintTraverseEx` (primary draw);
+    slot 22 `DrawPrintText` fallback. Draws wrapped in
+    `PushMakeCurrent`/`PopMakeCurrent`.
+- `CInput*` discovered by byte-scanning the `CHLClient::CreateMove` prologue.
+  Usercmd CRC-32 is repaired after any cmd edit (`note_modified`).
+- Console output via `ConMsg` from `libtier0.so`
+  (`_Z6ConMsgPKcz`), not `IVEngineClient::ClientCmd`.
 
-## Key engine index table (IVEngineClient014, this build)
+## Interfaces / indices
 
-| Index | Method | Verification |
+| Interface | Version | Notes |
 |---|---|---|
-| 8 | *(not ClientCmd)* | Disasm: per-player index bounds check on `(arg-1)` — likely `GetPlayerInfo` |
-| 9 | *(not ClientCmd_Unrestricted)* | Disasm: loop over split-screen players — no-op'd in single-player |
-| 12 | `GetLocalPlayer` | Disasm: `return *(CClientState + 0x1b0) + 1` — confirmed in-game |
-| 65 | `HudUpdate`-family | Crash-site (256-slot bump): `call *(this, float)` |
+| Client | `VClient017` | |
+| Entity list | `VClientEntityList003` | |
+| Engine | `VEngineClient014` | |
+| Model info | `VModelInfoClient006` | |
+| Engine server | `VEngineServer021` | edicts / listen-server entities |
+| Debug overlay | `VDebugOverlay003` | accurate world->screen |
+| Engine trace | `EngineTraceClient003` | vischeck / trigger ray |
+| Surface | `VGUI_Surface030` | |
+
+Relevant vtable slots (this build):
+
+- Engine: `GetLocalPlayer` 12, `Time` 14, `GetViewAngles` 19, `SetViewAngles` 20.
+- Entity list: `GetClientNetworkable` 0, `GetClientEntity` 3,
+  `GetHighestEntityIndex` 6.
+- `IClientNetworkable`: `GetClientClass` 2. `ClientClass::m_pNetworkName` at +8.
+- `IClientUnknown`: `GetClientRenderable` 6.
+- `IClientRenderable`: `GetModel` 9, `SetupBones` 16.
+- `IVModelInfo`: `GetModel` 2, `GetModelName` 4, `GetStudiomodel` 29.
+- `IVEngineServer`: `PEntityOfEntIndex` 19.
+  Edict `m_pUnk` at +0xC; `IServerUnknown::GetBaseEntity` 6.
+- `IVDebugOverlay`: `ScreenPosition` 9.
+- `IEngineTrace`: `TraceRay` 4. `Ray_t` uses 16-byte `VectorAligned`;
+  `trace_t`: `fraction` 44, `startsolid` 55, `m_pEnt` 76.
+
+## Netvars / entity data (this build)
+
+| Field | Client offset |
+|---|---|
+| `m_fFlags` | `0x33C` |
+| `m_vecVelocity[0]` | `0xE0` |
+| `m_MoveType` (prediction datamap) | `0x164` |
+| `m_iHealth` | `0x80` |
+| `m_iMaxHealth` | not networked |
+| `m_iTeamNum` | `0x88` |
+| `m_vecOrigin` | `0x324` |
+| `m_vecViewOffset[0]` | `0xD4` |
+| `m_vecMins` / `m_vecMaxs` | `0x1A8` / `0x1B4` |
+| `m_lifeState` | `0x7F` |
+| `m_nModelIndex` | `0x7C` |
+
+- Eye position = `m_vecOrigin + m_vecViewOffset` on **all three axes**.
+  (The old code added the X component to Z, which left the eye ~64 units low.)
+- NPC health is not networked. Alive state comes from the networked client
+  `m_lifeState`; real HP is read from the listen-server `CBaseEntity` found via
+  `PEntityOfEntIndex -> edict->m_pUnk -> GetBaseEntity`, using offsets scanned
+  from `server.so`'s datamap:
+  - `m_iHealth` `0xF4`, `m_iMaxHealth` `0xF0`,
+    `m_lifeState` `0xF8`, `m_nModelIndex` `0x7A` (short).
+
+## Menu
+
+Starts fully collapsed on first open. `Insert` toggles; `Up`/`Down` navigate;
+`Enter` expands/toggles; `Left`/`Right` edit values; `Escape` closes.
+Bind rows enter bind-select mode: press a key/button to assign, `Escape` sets
+None (always-on), `Enter` cancels.
+
+```
+HL2hake
+  Bunnyhop
+    Active
+    Uni-directional auto-strafe
+  ABH
+    Active
+  ESP
+    Active
+    Show neutral / healthbar / healthnum / name / skeleton / box
+  Aimbot
+    Active
+    Bind
+    Vischeck
+    Bones -> Head / Torso / Left arm / Right arm / Left leg / Right leg
+    Smoothness (1..45 deg/tick, Left/Right)
+  Triggerbot
+    Active
+    Bind
+  Silent aim
+    Active
+    Bind
+```
+
+Binds use SDL scancodes; mouse buttons are pseudo-scancodes 600..604.
+
+## Bones / ESP
 
-Console output uses `ConMsg` from `libtier0.so` (resolved via `dlsym(RTLD_DEFAULT, "_Z6ConMsgPKcz")`), not `IVEngineClient::ClientCmd`.
+- `SetupBones(BONE_USED_BY_ANYTHING)` with engine `Time()`; studio header via
+  `GetStudiomodel`; hitboxes and bone names/parents from that header.
+- HL2 strips many ValveBiped bone names (the zombie's spine/legs/left arm are
+  unnamed), so the humanoid skeleton is built from the **union of hitbox bone
+  parent paths** (`HITGROUP_*`). Head group 1 includes the zombie headcrab body
+  and its `HC_Head` child; fingers, toes and other `HC_*` limbs are excluded.
+- Non-humanoid NPCs (headcrabs, crows, antlions, ...) draw the full bone tree.
+- `aim_points` = head hitbox/bone + hitbox centers for the selected groups;
+  the aim features pick the nearest visible point.
 
-## Menu system
+## Aim features
 
-- **Toggle architecture**: each feature is runtime-toggleable, ON by default. A `MenuState` struct holds per-feature `active` bool and `bind` (key code or None).
-- **Rendering**: hook `IEngineVGui::Paint` via `VEngineVGui001` — draws every frame including the main menu. Text-only overlay in top-left corner.
-- **Persistence**: INI-style plain text config; one line per setting (`climb_active=1`, `climb_bind=MOUSE3`). Config written on every state change; loaded before hooks install.
-- **Input model**: Insert toggles menu open/closed; arrow keys navigate the tree; Enter expands/collapses nodes and toggles boolean fields; Escape closes the menu. Modal while open (all game input blocked). Long-term: selective pass-through for unused inputs.
-- **Bind assignment UX**: selecting a Bind node enters bind-select mode; any key press becomes the new bind; Escape sets bind to None (disabling the feature); Enter cancels bind change and reverts.
-- **Tree layout**: HL2hake (root) → Climb (Active + Bind), Bunnyhop (Active), ABH (Active). Children indented. All nodes expanded by default when the menu opens.
+- Shared target selection (`select_aim_target`): live hostile NPCs, skip
+  friendly/neutral, rank by angle to the crosshair, then pick the nearest
+  selected hitgroup point. Target candidates are tried nearest-first.
+- Vischeck: `EngineTraceClient003::TraceRay`, `MASK_VISIBLE`,
+  `TRACE_WORLD_ONLY` (world only; static props are not tested — deliberate).
+- Aimbot: bounded smoothing — 0.05 deg deadzone, max `Smoothness` deg/tick,
+  shortest-path yaw, pitch clamped to ±89; pushes the new view with
+  `SetViewAngles`.
+- Triggerbot: crosshair ray with `MASK_SHOT` + `TRACE_EVERYTHING` (filter
+  ignores the local player). First hit must be a live hostile NPC; sets
+  `IN_ATTACK`.
+- Silent aim: exact target angle written to `cmd->viewangles`, `IN_ATTACK`,
+  then the rendered view is restored immediately **and** at
+  `FRAME_RENDER_START`; `forwardmove`/`sidemove` are rewritten to preserve the
+  world-space movement wish vector.
+- ABH: on the landing/jump tick, face opposite the horizontal velocity with
+  zero forward/side movement; HL2's jump speed-bound subtraction then
+  accelerates along the velocity. Camera restored at `FRAME_RENDER_START`.
 
-## Open questions
+## Gotchas / lessons
 
-None currently.
+- Never pipe-mask build failures:
+  `./build.sh > /tmp/build.log 2>&1; echo rc=$?`.
+- `CHLClient` slot numbers: `CreateMove` 21, `FrameStageNotify` 35.
+- `ISurface` binary slot = SDK header slot + 4; see `src/ISURFACE_STATUS.md`.
+- Silent aim and ABH temporarily replace the usercmd view; silent aim preserves
+  movement, ABH intentionally zeroes it for the jump tick.
+- Aimbot vischeck (`MASK_VISIBLE`/world-only) differs from triggerbot
+  (`MASK_SHOT`/all entities): glass and static props can behave differently.
diff --git a/src/ISURFACE_STATUS.md b/src/ISURFACE_STATUS.md
index de952cd..00a7adf 100644
--- a/src/ISURFACE_STATUS.md
+++ b/src/ISURFACE_STATUS.md
@@ -1,13 +1,13 @@
 # HL2hake ISurface Drawing — Status Report
 
-## Date: 2026-09-12 (final round)
+## Date: 2026-09-12, updated 2026-10-26
 
 ## Result: WORKING
 
 Overlay drawing works in-game and in menus. Draw path: `PaintTraverseEx`
 hook (slot 114) on the copied ISurface vtable, wrapping our draws in
 `PushMakeCurrent(panel, false)` / `PopMakeCurrent(panel)` around ISurface
-slots 6/10/12/17/18/20/22/66/67.
+slots 6/10/12/15/17/18/20/22/66/67.
 
 ## Confirmed ISurface VTable Slots (disassembly-verified, binary=SDK header+4)
 
@@ -18,6 +18,8 @@ slots 6/10/12/17/18/20/22/66/67.
 | 9    | `PopMakeCurrent(VPANEL)`                  | verified via disassembly |
 | 10   | `DrawSetColor(int r,g,b,a)`               | stores RGBA at `this+0x24..0x27` |
 | 12   | `DrawFilledRect(int x0,y0,x1,y1)`         | verified via disassembly |
+| 14   | `DrawOutlinedRect(int x0,y0,x1,y1)`       | SDK header 10 + 4 |
+| 15   | `DrawLine(int x0,y0,x1,y1)`               | SDK header 11 + 4 (skeleton ESP) |
 | 17   | `DrawSetTextFont(HFont)`                  | stores HFont at `this+0x290` |
 | 18   | `DrawSetTextColor(int r,g,b,a)`           | stores RGBA at `this+0x28..0x2b` |
 | 20   | `DrawSetTextPos(int x,y)`                 | stores at `this+0x2c/0x30` |
@@ -65,24 +67,27 @@ fc-match findings (system fontconfig):
 
 ## Menu
 
-- Tree: HL2hake → Bunnyhop/ABH, children indented (`g_depth[]`, +12px/level).
-- Right-aligned state at x=200: `[on]`/`[off]` for Active rows,
-  `[keyname]` for Bind rows, `[press key]` while binding.
+- Starts fully collapsed on first open; `Insert` toggles it.
+- Tree: HL2hake -> Bunnyhop (Active, Auto-strafe), ABH (Active), ESP (Active,
+  Show neutral/healthbar/healthnum/name/skeleton/box), Aimbot (Active, Bind,
+  Vischeck, Bones, Smoothness), Triggerbot (Active, Bind), Silent aim
+  (Active, Bind). Children indented by `g_depth[]` (+12px/level).
+- Right-aligned state at x=270: `[on]`/`[off]` for toggles, `[keyname]` for
+  binds, `[press key]` while binding, `N deg/tick` for values.
 - Feature gating: `feature_active(int)` (menu.cpp) — active AND
-  (bind==0 or key held). Called from `do_move` (hl2h.cpp) to gate
-  bhop (jump) and ABH branches.
-- Config: INI at `~/.hl2hake.ini` (bhop/abh active+bind).
+  (bind==0 or key held), used by `do_move` and the aim features.
+- Config: `$XDG_CONFIG_HOME/hl2hake/config` (fallback `~/.config/hl2hake/config`).
 
 ## Build / Run
 
-- `./build.sh`: g++ `-m32 -O2 -fPIC -shared`, links 5 TUs, `-ldl`,
+- `./build.sh`: g++ `-m32 -O2 -std=c++17 -fPIC -shared`, 9 TUs
+  (`hl2h modules cinput netvars menu esp server bones vischeck`), `-ldl`,
   `-Wall -Wextra -Werror` (all warnings fatal).
 - `./play.sh -windowed +map d1_trainstation_01` (Steam runtime wrapper,
   `LD_PRELOAD=libhl2hake.so`).
-- Logs: `/tmp/hl2hake.log` (logf), `/tmp/hl2run.log` (stderr).
-- Probe logging (`hook fired:`, `probe:`) removed 2026-09-12.
+- Logs: `/tmp/hl2hake.log` (logf), stderr.
 - `HL2H_DRAW_TEST=1` env: draws red rect + "HL2H DRAW TEST" without
-  opening the menu.
+  opening the menu. `HL2H_BONE_DEBUG=1` draws head-hitbox markers.
 
 ## Lessons
 
@@ -98,7 +103,12 @@ fc-match findings (system fontconfig):
 ## File Locations
 
 - Project: `/home/salmon/Documents/rust/hl2h/`
-- Hook + feature logic: `src/hl2h.cpp`
+- Hook + movement/feature logic: `src/hl2h.cpp`
 - Menu + drawing + config + input: `src/menu.cpp`
+- ESP / skeleton drawing / aimbot / silent aim: `src/esp.cpp`
+- Bones + hitboxes: `src/bones.cpp`
+- Server-side entity/health access: `src/server.cpp`
+- World vischeck / entity trace: `src/vischeck.cpp`
 - Shared API: `src/hl2h.h`
+- Current project overview: `CONTEXT.md`
 - SDK headers: `source-sdk-2013/src/public/vgui/`
diff --git a/src/hl2h.h b/src/hl2h.h
index a08f029..37c849f 100644
--- a/src/hl2h.h
+++ b/src/hl2h.h
@@ -168,7 +168,6 @@ void fix_verified_crc(int seq, uint32_t crc);
 uint32_t usercmd_checksum(const CUserCmd *c);
 bool find_input_global();
 void resolve_netvars();
-int class_health_off(const char *name);
 bool resolve_server_netvars();
 int server_entity_health(int idx, int *maxhealth, int *lifestate, void **base_out);
 int server_model_index(void *base);
@@ -203,10 +202,6 @@ bool head_position(int idx, Vector &out);
 int aim_points(int idx, unsigned group_mask, Vector *out, int max);
 
 void outer_draw();
-// raw ISurface slot calls used by the PaintTraverseEx hook (hl2h.cpp)
-using SurfFn = void (*)(void *, ...);
-long surf_call_slot(void *surf, int slot, long a1 = 0, long a2 = 0);
-
 // ISurface pointer (defined in menu.cpp, used for drawing tests)
 struct ISurface;
 extern ISurface *g_surface;
diff --git a/src/menu.cpp b/src/menu.cpp
index c3bb9ae..d628873 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -217,22 +217,6 @@ static std::string config_path() {
   return dir + "/config";
 }
 
-[[maybe_unused]] static const char *sdl_scancode_name(int sc) {
-  if (sc == 0)
-    return "None";
-  static char buf[32];
-  snprintf(buf, sizeof(buf), "Key%d", sc);
-  return buf;
-}
-
-[[maybe_unused]] static int parse_sdl_scancode(const char *s) {
-  if (strcmp(s, "None") == 0 || strcmp(s, "") == 0)
-    return 0;
-  if (strncmp(s, "Key", 3) == 0)
-    return atoi(s + 3);
-  return 0;
-}
-
 static void config_save() {
   FILE *f = fopen(config_path().c_str(), "w");
   if (!f)
@@ -758,14 +742,6 @@ void outer_draw() {
   surf_pop_make_current(panel);
 }
 
-// Call an arbitrary ISurface vtable slot with up to 2 long args (cdecl thiscall
-// on i386: this first, rest on stack).
-long surf_call_slot(void *surf, int slot, long a1, long a2) {
-  void **vt = *(void ***)surf;
-  using Fn = long (*)(void *, long, long);
-  return ((Fn)vt[slot])(surf, a1, a2);
-}
-
 // ---------------------------------------------------------------------------
 // ISurface discovery — try known modules and all loaded .so files
 // ---------------------------------------------------------------------------
diff --git a/src/netvars.cpp b/src/netvars.cpp
index f702c41..b4e31d5 100644
--- a/src/netvars.cpp
+++ b/src/netvars.cpp
@@ -27,24 +27,7 @@ static bool module_string(uintptr_t p, char *out, size_t outn) {
 
 static int g_dumped_tables = 0;
 
-// per-client-class health offset (m_iHealth lives at different offsets per
-// class chain: CBasePlayer via DT_BasePlayer=128, NPCs via DT_BaseCombatCharacter)
-static struct {
-  char name[32];
-  int off;
-} g_class_health[256];
-static int g_class_health_n = 0;
-
-int class_health_off(const char *name) {
-  for (int i = 0; i < g_class_health_n; i++)
-    if (strcmp(name, g_class_health[i].name) == 0)
-      return g_class_health[i].off;
-  return -1;
-}
-
-static void collect_netvars(uintptr_t table, uintptr_t base_off, int depth,
-                            int *out_health)
-{
+static void collect_netvars(uintptr_t table, uintptr_t base_off, int depth) {
   if (depth > 8)
     return;
   uintptr_t props = *(uintptr_t *)(table + 0x00);
@@ -85,13 +68,10 @@ static void collect_netvars(uintptr_t table, uintptr_t base_off, int depth,
       logf("  [%s] %s type=%d off=%d(0x%x) table=%s array=%s", tname, pname2,
            ptype, poff, poff, ptable ? "yes" : "no", parray ? "yes" : "no");
     if (ptable) {
-      collect_netvars(ptable, base_off + (uint32_t)poff, depth + 1,
-                      out_health);
+      collect_netvars(ptable, base_off + (uint32_t)poff, depth + 1);
       continue;
     }
 
-    if (out_health && *out_health < 0 && strcmp(pname2, "m_iHealth") == 0)
-      *out_health = (int)(base_off + (uint32_t)poff);
     if (strcmp(pname2, "m_lifeState") == 0 && g_net.lifestate < 0) {
       g_net.lifestate = (int)(base_off + (uint32_t)poff);
     } else if (strcmp(pname2, "m_nModelIndex") == 0 && g_net.modelindex < 0) {
@@ -217,25 +197,9 @@ void resolve_netvars() {
   for (uintptr_t cc = head; cc && g_client.contains(cc) && classes < 1024;
        cc = *(uintptr_t *)(cc + 0x10)) {
     classes++;
-    char cname[32];
-    int hoff = -1;
-    // per-class health offset — NPCs send m_iHealth via their own table chain,
-    // not DT_BasePlayer's; g_net.health keeps the player's for aimbot use
-    if (module_string(*(uintptr_t *)(cc + 0x08), cname, sizeof(cname))) {
-      collect_netvars(*(uintptr_t *)(cc + 0x0C), 0, 0, &hoff);
-      if (hoff >= 0 && g_class_health_n < 256) {
-        char *dst = g_class_health[g_class_health_n].name;
-        const char *src = cname;
-        size_t n = sizeof(g_class_health[g_class_health_n].name) - 1;
-        for (size_t i = 0; i < n && src[i]; i++) dst[i] = src[i];
-        dst[n] = 0;
-        g_class_health[g_class_health_n].off = hoff;
-        g_class_health_n++;
-      }
-    }
+    collect_netvars(*(uintptr_t *)(cc + 0x0C), 0, 0);
   }
-  logf("client classes walked: %d, health-offset classes: %d", classes,
-       g_class_health_n);
+  logf("client classes walked: %d", classes);
 
   if (g_net.movetype < 0 && !resolve_movetype()) {
     // movetype unresolved — bhop still works, just no noclip/ladder guard
diff --git a/tree b/tree
deleted file mode 100644
index a03e5af..0000000
--- a/tree
+++ /dev/null
@@ -1,9 +0,0 @@
-HL2hake
-
-Climb
-  Active: <state>
-  Bind: <bind>
-Bunnyhop
-  Active: <state>
-ABH
-  Active: <state>