Port CInstanceBase::AddDamageEffect/ProcessDamage: damage packets queue
per actor and show one digit-effect burst per update, dodge/block show
the miss effect. Add CEffectManager::SetEffectTextures and
CFlyingManager::CreateIndexedFly for the indexed fly types, and reset
the damage target on GC_PHASE loading.
Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com>
ParseRaceMotionData now reads LoopData, MotionEventData and the per-motion
.mss sound script. ActorInstance runs the events each 1/60 s frame:
effects, sounds, splash attacks, fly shots, show/hide and warp. Player
skill and guild-skill motions are registered. ClickSkillSlot and remote
FUNC_SKILL states play the skill motions, and fly targets are synced with
the server (audit P1 #4).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Character create/delete/rename and empire selection now reach the
server, and LOGIN_SUCCESS3, PLAYER_CREATE_SUCCESS/FAILURE,
PLAYER_DELETE_SUCCESS/WRONG_SOCIAL_ID, POINT_CHANGE and CHANGE_NAME are
parsed and forwarded to the select/create windows like Windows.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
PHASE_SELECT returns the connection to LoginSession (cached roster,
SelectReady, later LOGIN_SUCCESS refreshes), PHASE_CLOSE goes to the
login phase, LOADING clears the player, GAME refreshes the status and
DEAD no longer leaves the game phase.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
RecvWarpPacket now matches Windows: DirectEnter for the selected slot
(warp flavour, SetNewLoadingPhase) and Connect(lAddr, wPort) through
LoginClient::warp, discarding what is left on the old socket.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
CMapOutdoor keeps the 3x3 terrain blocks around the player loaded and
reloads them on a block change; we loaded only the warp block, so the
map ended at its edge. Stitch the set into one TerrainHeightmap, fix the
attr.atr cell mapping, and reload terrain, areadata and water per block
from CPythonBackground::Update.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- chrRender collects intro draws with hardware skinning off (CPU scene path
ignores GPU palettes, so the select-screen character stayed in T-pose).
- Preview player hair: warrior/hair/hair_1_1.gr2 (old path did not exist).
- SpeedTree: always draw full geometry like CSpeedTreeWrapper::Advance
(SetLodLevel(1.0f)); resolve SPT texture names as GetPath+NoExtension+.dds.
- Terrain patches get edge skirts to hide step-1/step-2 T-junction cracks.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Interaction ideas from jhaizhou-ops/d2r-mobile (MIT), no code taken:
- world fingers in the bottom safe inset (gesture bar) are ignored
- SDL_EVENT_FINGER_CANCELED cancels one finger; a cancelled joystick
keeps its vector for 300 ms and a finger near the old base re-acquires it
- attack taps shorter than a frame release on the next Update
- cancelled UI touches and world taps park the pointer (no hover residue)
- long press on an empty inventory cell offers the original sort
Desktop ctest 59/59; sort sheet verified on the device.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Preview radar drew at the fixed PC spot; it now follows the uiminimap
window (CPythonMiniMap::GetScreenPosition) and its open state. On
Android the top safe inset came from the hidden status bar's gesture
zone; Ava2Surface takes the top only from the cutout and visible bars.
The preview keyboard-hint header is skipped in touch mode, and
--game-script also runs with --preview-data.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
SDK 62a5f5a carries the SpeedTree runtime, so the local mirror/shim is no
longer needed. attack_combo and ava2_render_3d tests called the code under
test inside assert() and segfaulted under NDEBUG; undefine it like
hardware_scene_test. android/build.sh prefers the SDK adb. Desktop ctest
59/59 incl. speedtree_forest; device 60 fps with real trees.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- Ava2Activity passes the "args" intent extra as the command line
(build.sh forwards AVA2_ARGS); it also always requests sensor landscape.
- app_loop sets SDL_HINT_ORIENTATIONS to landscape and creates the window
fullscreen on Android/iOS (SDL requested FULL_USER for the resizable
window, overriding the manifest; the status bar drew over the HUD).
- push_assets.py: pack-manifest test-rundir now wins over assets/loose
(~1000 differing files; half-size tree atlases broke SpeedTree UVs),
pushes in batches of <=20k files, and chmods shell-owned files so the
app can read them on Android 17.
- PORT-PLAN: device verification results and outstanding gaps.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Port the EterPythonLib CSlotWindow/CGridSlotWindow mouse handlers
(select, drop, use, right click, tooltips, grid picking/CheckMoving) and
CWindowManager IsDragging/right button, which were missing so item
interaction did not work on desktop either. app.SetMouseHandler now
renders the attached icon, app.IsPressed reads real key state, desktop
double clicks reach the window manager.
The touch router maps UI touches to the original mouse: tap = click at
the touch-down point, drag = press-and-drag, double tap = double click,
long press on an item slot = touch.SetLongPressEvent, which opens the
ui_mobile_actions item sheet (use / split / quick slot via virtual
Shift/Ctrl). New ava2.inventory_touch test drives uiinventory.py.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- ios/build.sh builds static SDL3 + FreeType, then the .app (code only,
embedded Python); signs ad hoc and runs on a simulator, or signs with a
development profile and installs with devicectl (device path untested).
Simulator-only SDL patch: accept the simulator Metal device for SDL_GPU.
- ios/Info.plist.in: landscape, full screen, launch screen, file sharing.
- Data dir is Documents on iOS; ios/push_assets.py stages the client root
lower-cased (iOS is case-sensitive, the client opens lower-cased paths)
and copies it into the app container.
- EffectData path normalisation folds A-Z like the effect cache key.
- android/push_assets.py: test-rundir base layer + svside/, which the game
phase needs (also fixes Android); --lowercase (ASCII only).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
main.cpp moves to app_loop.cpp; its body becomes RunClient, a C++20
coroutine suspended at the top of each frame, driven by ava2::app::AppLoop
(Start/Iterate/QueueEvent/Finish/Run). The new main.cpp uses SDL main
callbacks (AVA2_MAIN_CALLBACKS, default on except Android) or the classic
loop. Screenshots are byte-identical through both drivers; 54/54 tests.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Engine-free AutoHunt state machine (search/engage/loot/return/paused) driven
from the game loop through the existing manual paths: move target, target
packet, normal attack, quickslot skills, item pick-up and belt potions.
player.SetAutoHunt/GetAutoHuntState/SetAutoHuntOption with autohunt.cfg;
AUTO button on the combat wheel (tap toggles, long press opens settings).
Tests: ava2.auto_hunt, extended ava2.touch_game; 54/54.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Phones and tablets pick the logical UI size from the screen (height
600..768 from the dp height, width from the aspect ratio) instead of
letterboxing 1024x768; metin2.cfg is left untouched via a display-size
override. --phone/--safe-insets/--ui-height simulate on desktop. The
mobile HUD rebuilds and re-adopts the original windows when the safe
area changes. Keeps HUD gauge backgrounds alive and fixes the step-4
disc pixel check threshold.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Native CDisc window for procedural round frames; ui_mobile_widgets
(RoundButton, QuickSlotDisc); HUD laid out as the phone plan: player
panel, top-right entry row with minimap, left button column, attack disc
with two quickslot rings, potion belt on quickslot page 4, exp bar. The
PC taskbar and its tooltips are hidden in mobile mode. Adds global
quickslot use/add/move for the belt.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Move the macOS/Android data and config directory code out of main.cpp
into src/app/platform. Handle background/foreground: save config and
interface status, pause audio, cancel touch input and skip rendering
while keeping the network pumped. Map the window safe area through the
letterboxed presentation into TouchLayout and expose touch.GetSafeArea()
so the mobile HUD stays clear of notches and gesture bars.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Port the ActorInstanceBattle combo state machine, CRaceMotionData attack
data, player motion/combo tables, NEW_Attack + OnAttack/OnHit packets and
remote FUNC_ATTACK/FUNC_COMBO playback so keyboard and touch attacks swing
and hit on the real-server path.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Route each finger to UI, the attack button, a floating lower-left joystick or
the camera (drag rotate, pinch zoom, tap = world click). Touch mode is default
on Android/iOS and available on desktop via --touch / AVA2_TOUCH=1; it disables
SDL touch-to-mouse and drives app.ENABLE_MOBILE_HUD. The joystick feeds the
original camera-relative movement path and the attack button sets the same
attack-key state as player.SetAttackKeyState. New `touch` Python module; the
mobile HUD joystick and combat wheel become display-only.
Tests: ava2.touch_router, ava2.touch_game (GameWindow + mobile HUD).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Stages assets/loose + upstream/python-root (scripts win, case-insensitive)
+ python27.zip as a hard-link tree in build/android-data/root and sends it
to the app's external files directory with adb push --sync, so later runs
only transfer changed files. The committed assets/loose symlinks into the
old machine's pack_maker tree (bgm, sound/ui, icon/icon) are remapped to
the local pack_maker. The desktop client reaches the login screen inside
the staged tree with no missing-effect errors.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
SDL_StartTextInput was called once for the whole session, which keeps the
Android soft keyboard over the game. Where SDL reports on-screen keyboard
support, the frame loop now starts/stops text input with the original
EditLine focus (ime.EnableCaptureInput/DisableCaptureInput in ui.py), the
in-game chat and the dev login view. Desktop keeps text input always on.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The APK holds code only: on Android the client enters
SDL_GetAndroidExternalStoragePath() at startup, where the flattened client
root (assets/loose + python-root + python27.zip) is pushed. Script-root
discovery now also accepts a flattened root (game.py beside uiscript/) in
the working directory. Missing data shows a message box, and fatal errors
go to logcat because stderr is not captured on Android.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Move support/android to a top-level android/ and make it build:
Gradle 8.12 wrapper + AGP 8.7.3, compileSdk/targetSdk 35, SDL3 3.4.16
and FreeType 2.13.3 built once into build/android-deps (SDL Java sources
copied from the same release), libSDL3.so staged as a jniLib, 16 KB page
alignment, RelWithDebInfo native code for debug APKs, placeholder adaptive
icon. build.sh installs and launches the APK when a phone is attached.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Helper attachments made outside the part slots were attached to
PART_MAIN only and dropped whenever the parts were rebound (LOD level
change, shape change, slot update). They are now recorded on the actor,
attached to the drawn instance and re-attached after the slots. A slot
taking the same bone drops the helper (last writer wins, as before);
SetRace/SetModel clear them. LODs missing a helper's bone stay on
PART_MAIN.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Back-to-front order for blended, non-depth-writing, water and additive
draws now uses the bounds centre of the vertices the draw indexes. The
centre of shared (immutable) geometry is cached per index range and
validated against the owning pointer; per-frame geometry is recomputed.
Depth-writing opaque draws keep the first-vertex tie-break.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Port CGrannyLODController level selection: _lod_01.._03 are queued
{lod_03, lod_02, lod_01, main}, loaded lazily, and chosen from the
camera-target/camera distance bands (actors) or the building factor.
Parts, skins and the current motion follow the drawn instance.
Shipped LODs that drop an attaching bone in use (lion2_lod_02/03 lose
"saddle", shaman_miyeom_lod_* lose equip_left/right) stay on PART_MAIN,
and bone queries fall back to PART_MAIN for bones a LOD lacks.
Weapon item LODs are not ported.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Water, network-actor, flying-effect and weapon-trace clocks used
frames*0.033 or frames/60, and the sky box, effect.Update, fly.Update and
render-target previews advanced a fixed 1/30 or 1/60 s per call, so their
speed followed the frame rate. They now use the measured frame delta
(game_clock = sum of dt in main; GetGameFrameDelta for the Python-driven
paths; elapsed SDL ticks for render targets). --frames runs keep their
fixed 0.033 s step. The SpeedTree wind update is left unchanged.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Port CGrannyLODController::UpdateLODLevel and
CGrannyModelInstance::Update(dwAniFPS): actors whose model has a
_lod_01.gr2 sibling and stand more than 500 units from the camera
target get 30-120 animation FPS by camera distance (LODDISTANCE_ACTOR
5000, LODDISTANCE_BUILDING 25000 for models of 500+ units), and their
pose time only advances every 120/fps frames, so the SDK's cached pose
is reused in between. Restarted or switched motions re-sample at once.
The _lod_ meshes themselves are still not swapped in.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
HardwareScene now tracks the bound vertex/index buffer, pipeline and
sampler within the pass and only rebinds on change (each sampler rebind
allocates a new descriptor set on SDL's Vulkan backend). The opaque sort
orders depth-writing opaque and alpha-tested draws by cull mode, texture
and geometry so consecutive batches share state; blended and
non-depth-writing draws keep back-to-front order.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
TerrainHeightmap::AppendCulledDrawRefs references the cached, shared-
geometry patch commands for the visible quadtree patches (writing the
background light into the cache) instead of copying them into a new
vector each frame. BuildCulledDraws keeps its copying behaviour on top
of it for existing callers.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The SDL_GPU pipeline renders into its own view-sized colour target and
already composites it over the whole render target, so routing it through
gpu_scene_texture cost one extra same-size copy per frame. The scaled
intermediate is now used only by the SDL geometry fallback; the hardware
composite upscales with linear filtering.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
AVA2 builds with ENABLE_MAP_OBJECT_OPTIMIZATION: CArea::
__UpdateLoadedObjectInstances unloads objects whose 2D distance from the
main actor is at least max(OBJECT_DIST, 5000). CPythonBackground::Update
now takes the main actor position (as CPythonApplication passes it) and
sets that loading center on MapObjectManager, which skips farther
objects before their frustum test.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
MapObjectManager::AppendDrawRefs references each visible object's cached
Render3DDraw (writing the per-frame light into the cache) rather than
copying the whole command (two texture strings, shared_ptrs, matrices)
every frame. main.cpp flattens owned draws and refs in submission order
(FlattenDraws) and passes a pointer list to RenderSceneGPU/RenderScene.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Per-frame UI callbacks (OnUpdate/OnRender/...) looked up methods with
PyObject_GetAttrString, building a new PyString each call. Names are
now interned once and cached; Py_AtExit drops the cache so a
Py_Finalize/Py_Initialize cycle never reuses stale objects.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>