diff --git a/Demon_v0.19/README_RU.md b/Demon_v0.19/README_RU.md index 88c2e71..bc63a9b 100644 --- a/Demon_v0.19/README_RU.md +++ b/Demon_v0.19/README_RU.md @@ -2,6 +2,9 @@ ## Рабочие изменения 28 октября +- Пробел пропускает вступительную кат-сцену: останавливает голос и возвращает игровую камеру и управление. +- В покое руки суккубы опущены вдоль тела со слегка согнутыми локтями; при беге двигаются в противофазе. Усилены дыхание, движения плеч, головы, крыльев и хвоста в айдле. + - На орудии: 10 секунд непрерывного бездействия — сгорание души и штраф 50 золота. Работа сбрасывает отсчёт. Награда за потерянную душу не выдаётся. - Очередь движется от приёмных ворот к воротам напротив. Первая душа ждёт 10 секунд, затем уходит со штрафом 50 золота. У следующей начинается новый отсчёт. Старых нарастающих штрафов больше нет; золото не уходит ниже нуля. - Строительство, гримуар и пауза останавливают таймеры. Размещение на орудии занимает 0,5 секунды: распад на мелкие огоньки и сборка в правильной позе. До окончания эффекта работа заблокирована. diff --git a/Demon_v0.19/art/succubus/meshy_v02/README.md b/Demon_v0.19/art/succubus/meshy_v02/README.md index b50dc5f..7e64e2d 100644 --- a/Demon_v0.19/art/succubus/meshy_v02/README.md +++ b/Demon_v0.19/art/succubus/meshy_v02/README.md @@ -16,8 +16,10 @@ Build checks finite animated coordinates, normalized weights and edge growth <0. Measured results are in manifest.json. Runtime: succubus_actor.gd uses this GLB for heroine and helpers. meshy_gait.gd extends -the approved grounded gait: smooth 4.8s breathing, relaxed arm/head motion, existing -wing/tail secondary motion; idle fades on walking/striking and freezes on pause. +the approved grounded gait: visible 4.2s breathing, shoulder/head drift, wing/tail +secondary motion. Relaxed arms are retargeted to the Meshy surface so hands hang +beside the thighs with slightly bent elbows. Opposing arm swing follows the actual +distance-driven run phase. Idle fades on walking/striking and freezes on pause. Foot anchors remain fixed. No lip-sync added. QA: --test-gait PASS including idle movement, grounded idle feet and paused idle, diff --git a/Demon_v0.19/gait_tests.gd b/Demon_v0.19/gait_tests.gd index aaa9180..b9f744a 100644 --- a/Demon_v0.19/gait_tests.gd +++ b/Demon_v0.19/gait_tests.gd @@ -18,13 +18,19 @@ func run(g): for frame in range(240): actor._process(1.0/60) idle_motion=maxf(idle_motion,actor.gait.point("wrist.L").distance_to(hand_start)) - check(idle_motion>.004,"idle breathing and relaxed arm motion") + check(idle_motion>.012,"visible idle breathing and relaxed arm motion") + for side in ["L","R"]: + var upper=actor.gait.point("lowerarm01."+side)-actor.gait.point("upperarm01."+side) + var forearm=actor.gait.point("wrist."+side)-actor.gait.point("lowerarm01."+side) + check(upper.normalized().dot(Vector3.DOWN)>.96,"retargeted idle arms remain near vertical") + check(upper.angle_to(forearm)>deg_to_rad(8) and upper.angle_to(forearm)30 and frame<110: + var hand_offsets=Vector2.ZERO + for side_index in range(2): + var side="L" if side_index==0 else "R" + hand_offsets[side_index]=(actor.gait.point("wrist."+side)-actor.gait.point("upperarm01."+side)).dot(actor.global_basis.z.normalized()) + hand_min[side_index]=minf(hand_min[side_index],hand_offsets[side_index]);hand_max[side_index]=maxf(hand_max[side_index],hand_offsets[side_index]) + cross_sum+=(hand_offsets.x-.12)*(hand_offsets.y-.12) for i in range(2): var f=actor.gait.feet[i];var actual=actor.gait.point("foot."+f.side) max_error=maxf(max_error,actual.distance_to(f.target)) @@ -43,6 +56,8 @@ func run(g): check(max_slide<.003,"stance slip "+str(actor.scale.x)+" "+str(speed)) check(min_contact>-.002,"ground clearance") check(max_lift>.08 and planted_frames>150,"alternating lift/support") + check(hand_max.x-hand_min.x>.12 and hand_max.y-hand_min.y>.12,"both hands swing during locomotion") + check(cross_sum<0,"opposing left/right arm swing") print("GAIT_METRICS ",JSON.stringify({"scale":actor.scale.x,"speed":speed,"max_slide":max_slide,"max_target_error":max_error,"max_lift":max_lift,"min_contact":min_contact})) var phase=actor.gait.phase for frame in range(30):actor._process(1.0/60) diff --git a/Demon_v0.19/intro_tests.gd b/Demon_v0.19/intro_tests.gd index ef03be3..4b43739 100644 --- a/Demon_v0.19/intro_tests.gd +++ b/Demon_v0.19/intro_tests.gd @@ -41,5 +41,20 @@ func run(g): assert(not g.intro.active) g.intro.begin();g.reset_shift() assert(not g.intro.active and not g.intro.voice.playing and not g.avatar.cinematic_idle) + # Space skips during lead, speech and camera return without leaking gameplay input. + for phase in ["lead","voice","tail"]: + g.intro.begin() + if phase!="lead":g.intro.update(2.1) + if phase=="tail":g.intro._voice_finished();g.intro.update(.3) + var before_coins=g.coins;var before_position=g.player.position + var release=InputEventKey.new();release.keycode=KEY_SPACE;release.pressed=false + g._input(release);assert(g.intro.active) + var echo=InputEventKey.new();echo.keycode=KEY_SPACE;echo.pressed=true;echo.echo=true + g._input(echo);assert(g.intro.active) + var skip=InputEventKey.new();skip.keycode=KEY_SPACE;skip.physical_keycode=KEY_SPACE;skip.pressed=true + g._input(skip) + assert(not g.intro.active and not g.intro.voice.playing and not g.paused and g.hud.visible) + assert(not g.avatar.cinematic_idle and is_equal_approx(g.camera.size,20)) + assert(g.coins==before_coins and g.player.position==before_position and g.orbit.keys.is_empty()) print("PASS: intro full recording, 2s lead/tail, input lock, camera restore, suspend, resume and reset (%d ms)" % (Time.get_ticks_msec()-start)) g.get_tree().quit() diff --git a/Demon_v0.19/main.gd b/Demon_v0.19/main.gd index 94b91bd..c41fe58 100644 --- a/Demon_v0.19/main.gd +++ b/Demon_v0.19/main.gd @@ -523,6 +523,8 @@ func floating(text: String, p: Vector3, c: Color): func _input(event): if intro.active: + if event is InputEventKey and event.pressed and not event.echo and (event.keycode==KEY_SPACE or event.physical_keycode==KEY_SPACE): + intro.finish() get_viewport().set_input_as_handled() return if workshop:workshop.track_pointer(event) diff --git a/Demon_v0.19/meshy_gait.gd b/Demon_v0.19/meshy_gait.gd index a5cdd75..11689c7 100644 --- a/Demon_v0.19/meshy_gait.gd +++ b/Demon_v0.19/meshy_gait.gd @@ -2,19 +2,51 @@ extends "res://infernal_gait.gd" # Grounded idle breathing layered after the approved locomotion. var idle_time=0.0 var idle_weight=0.0 +var relaxed_weight=0.0 func update(dt): super.update(dt) idle_time+=dt var target=(1.0-walk_weight) if not actor.striking else 0.0 idle_weight=move_toward(idle_weight,target,dt*3.0) - var breath=sin(idle_time*TAU/4.8) + var breath=sin(idle_time*TAU/4.2) var drift=sin(idle_time*TAU/7.2) - rotate_world("spine02",actor.global_basis.x,breath*.010*idle_weight) - rotate_world("spine01",actor.global_basis.z,drift*.006*idle_weight) - rotate_world("head",actor.global_basis.x,-breath*.006*idle_weight) - rotate_world("head",actor.global_basis.y,drift*.012*idle_weight) + rotate_world("spine02",actor.global_basis.x,breath*.032*idle_weight) + rotate_world("spine01",actor.global_basis.z,drift*.018*idle_weight) + rotate_world("head",actor.global_basis.x,-breath*.016*idle_weight) + rotate_world("head",actor.global_basis.y,drift*.028*idle_weight) + var chest=bones["spine02"] + var scale=skeleton.get_bone_pose_scale(chest) + skeleton.set_bone_pose_scale(chest,scale*Vector3(1+breath*.012*idle_weight,1+breath*.006*idle_weight,1+breath*.016*idle_weight)) + skeleton.force_update_all_bone_transforms() for side in ["L","R"]: var sign_x=1.0 if side=="L" else -1.0 - rotate_world("upperarm01."+side,actor.global_basis.z,-sign_x*(.075+breath*.007)*idle_weight) - rotate_world("lowerarm01."+side,actor.global_basis.x,sin(idle_time*TAU/6.4+sign_x*.4)*.010*idle_weight) + rotate_world("Wing."+side,actor.global_basis.y,sign_x*sin(idle_time*.85)*.028*idle_weight) + rotate_world("Tail",actor.global_basis.y,sin(idle_time*1.1)*.026*idle_weight) + if actor.striking: + relaxed_weight=0.0 + return + relaxed_weight=move_toward(relaxed_weight,1.0,dt*7) + for side in ["L","R"]:relax_arm(side,breath) + +func aim_blended(bone,child,target): + var current=global_rotation(bone) + aim(bone,child,target) + set_rotation(bone,current.slerp(global_rotation(bone),relaxed_weight)) + +func relax_arm(side,breath): + var sign_x=1.0 if side=="L" else -1.0 + var upper="upperarm01."+side;var lower="lowerarm01."+side;var wrist="wrist."+side + var a=point(upper);var length_upper=a.distance_to(point(lower)) + var length_lower=point(lower).distance_to(point(wrist)) + var forward=actor.global_basis.z.normalized();var right=actor.global_basis.x.normalized() + var down=-actor.global_basis.y.normalized() + var swing=sign_x*sin(phase*TAU)*.32*walk_weight + var bend=deg_to_rad(14.0+8.0*walk_weight)+sin(idle_time*TAU/6.4+sign_x*.4)*.025*idle_weight + # The Meshy arm surface has a wider sculpted rest pose than the inherited rig. + # Retarget its lateral offset so the visible arms, not just the bones, hang down. + var upper_direction=(down-right*sign_x*.24+forward*(swing+breath*.012*idle_weight)).normalized() + aim_blended(upper,lower,a+upper_direction*length_upper) + var elbow=point(lower) + var forearm_direction=(down-right*sign_x*.13+forward*(swing+tan(bend)+breath*.012*idle_weight)).normalized() + aim_blended(lower,wrist,elbow+forearm_direction*length_lower) diff --git a/Demon_v0.19/reviews/relaxed_arms_v01/.gdignore b/Demon_v0.19/reviews/relaxed_arms_v01/.gdignore new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Demon_v0.19/reviews/relaxed_arms_v01/.gdignore @@ -0,0 +1 @@ + diff --git a/Demon_v0.19/reviews/relaxed_arms_v01/README.md b/Demon_v0.19/reviews/relaxed_arms_v01/README.md new file mode 100644 index 0000000..e0521c9 --- /dev/null +++ b/Demon_v0.19/reviews/relaxed_arms_v01/README.md @@ -0,0 +1,14 @@ +# Relaxed arms and stronger idle — 2026-10-28 + +`idle.gif` is a five-second in-game capture of the active Meshy succubus. +Hands hang beside the body with a small elbow bend. Surface-specific lateral +retargeting compensates for the sculpt's wider arm rest pose relative to the +inherited skeleton. Running uses opposing arm swing driven by traveled distance. +Whip animation retains control during a strike; the relaxed pose blends back. + +Idle includes stronger breathing, chest expansion, shoulder/head drift and +wing/tail motion. Grounded foot anchors and pause behavior are preserved. + +Capture: `tools/capture_relaxed_arms.gd -- --idle-only`. Validation: +`--test-gait` (heroine + three helpers, five speeds, elbow bend, hand swing, +grounding, strikes, pause and teleport). No new Windows export was requested. diff --git a/Demon_v0.19/reviews/relaxed_arms_v01/idle.gif b/Demon_v0.19/reviews/relaxed_arms_v01/idle.gif new file mode 100644 index 0000000..22f8c7c Binary files /dev/null and b/Demon_v0.19/reviews/relaxed_arms_v01/idle.gif differ diff --git a/Demon_v0.19/reviews/relaxed_arms_v01/idle.png b/Demon_v0.19/reviews/relaxed_arms_v01/idle.png new file mode 100644 index 0000000..79492be Binary files /dev/null and b/Demon_v0.19/reviews/relaxed_arms_v01/idle.png differ diff --git a/HANDOFF.md b/HANDOFF.md index 656fe1c..f9efee1 100644 --- a/HANDOFF.md +++ b/HANDOFF.md @@ -15,6 +15,26 @@ ## Последние выполненные задачи +- **Руки суккубы / айдл / пропуск вступления (2026-10-28):** + `meshy_gait.gd` опускает видимые руки вдоль корпуса, оставляет небольшой + сгиб локтей, задаёт противофазный мах при движении. Учтена разница между + широкой позой скульпта Meshy и наследованным скелетом; сам GLB не изменён. + Поза плавно возвращается после удара, Whip во время удара не перезаписывается. + Усилены дыхание (4,2 с), небольшое расширение грудной клетки, покачивание + плеч/головы, крыльев и хвоста. При движении/ударе айдл затухает; пауза + замораживает его, опорные стопы остаются на месте. +- В `main._input` пробел пропускает активную вступительную сцену, останавливает + голос и возвращает камеру/HUD/управление. Отпускание и автоповтор клавиши + не пропускают сцену; событие поглощается до игрового ввода. +- Проверки: Godot 4.3 import PASS; окончательный `--test-gait` PASS (героиня + + 3 помощницы, 5 скоростей, локти/мах рук, усиленный айдл, стопы, остановка, + удар, пауза, телепорт). `--test-intro` PASS: полная запись и 2+2 с сохранены, + дополнительно проверен Space во время lead/речи/tail, камера/голос/HUD, + отсутствие изменения денег/позиции, отпускание и автоповтор. + Крупные планы покоя, бега и удара просмотрены; пятисекундный айдл сохранён + в `reviews/relaxed_arms_v01/idle.gif`, съёмка — tools/capture_relaxed_arms.gd. + Изменения в исходниках; EXE не пересобирался. + - **Внутренняя отделка и накал девы (2026-10-28):** `maiden_interior.gd` добавляет усилительные рёбра, клёпаные пояса, парные завитки/вензеля, медальоны и решётчатый пол. Декор створок привязан к существующим петлям; diff --git a/tools/capture_relaxed_arms.gd b/tools/capture_relaxed_arms.gd new file mode 100644 index 0000000..bc513d2 --- /dev/null +++ b/tools/capture_relaxed_arms.gd @@ -0,0 +1,30 @@ +extends SceneTree +# Source-scene visual verification; no export or user progress writes. +func _initialize():call_deferred("run") +func run(): + AudioServer.set_bus_mute(0,true) + var g=load("res://main.tscn").instantiate();root.add_child(g) + await process_frame + g.test_mode=true;g.capture_mode=true;g.start_game();g.set_process(false) + g.avatar.set_process(false);g.hud.hide() + for imp in g.life.imps:imp.root.hide() + if is_instance_valid(g.life.hero_bubble):g.life.hero_bubble.hide() + g.player.position=Vector3(0,0,-1);g.avatar.rotation=Vector3.ZERO;g.avatar.reset_gait() + var folder=ProjectSettings.globalize_path("res://captures/relaxed-arms") + DirAccess.make_dir_recursive_absolute(folder) + for i in range(30):g.avatar._process(1.0/60) + for mode in ["idle","run","strike"]: + if "--idle-only" in OS.get_cmdline_user_args() and mode!="idle":continue + if mode=="strike":g.avatar.strike(.8) + var frames=30 if mode=="idle" else (24 if mode=="run" else 12) + if "--quick" in OS.get_cmdline_user_args():frames=3 + for frame in range(frames): + for subframe in range(10 if mode=="idle" else 5): + if mode=="run":g.player.position+=Vector3.BACK*3.3/60 + g.avatar._process(1.0/60) + var target=g.player.position+Vector3(0,1.25,0) + g.camera.size=3.0;g.camera.position=target+Vector3(.45,.1,3);g.camera.look_at(target) + await RenderingServer.frame_post_draw + assert(g.get_viewport().get_texture().get_image().save_png(folder+"/%s-%02d.png"%[mode,frame])==OK) + print("RELAXED ARMS CAPTURE COMPLETE") + quit()