Feat/fix bug oso and enemies lvl2#404
Merged
Merged
Conversation
Add Player::IsBearModeActive() to consolidate bear-related state checks (isBearMode_, isBearTransforming_, isThrowingBear_, isKidSleeping_). Use this helper in HidingRock::Update and HidingRock::PostUpdate to block interaction and prompt rendering when the player is in bear mode or in related transition/animation states, preventing unintended hiding behavior.
…m/HiddenDreamStudio/EchoesOfSlumber into feat/fix-bug-oso-and-enemies-lvl2
Add AnimationSet::SetFinished API and expose it in the header. Improve EnemyStitchling and EnemyWindUpScurry behavior and robustness: - EnemyStitchling: add REVERSING state, handle DEATH state/animation properly (play die, mark pendingToDelete), implement TakeDamage (remove physics bodies, play fx), avoid processing collisions when dead, process player attack collisions and trap sensor logic, reset die animation on death entry, and tweak drawing logic. - EnemyWindUpScurry: increase health from 1 to 3, add an attack cooldown (attackCooldown_ + ATTACK_COOLDOWN) to prevent repeated damage/audio every physics frame, fix state transitions to use durations, adjust collision damage logic to respect cooldown, minor formatting and texture load/unload cleanups, and small refactors (playerRef assignment, spacing). But it still crashing all time dying
Stitchling: clean up formatting and refactor FSM/draw helpers; add escapeTimer and ESCAPE_TIME_LIMIT to the trap mechanic so trapped players take damage after a timeout, track mash escapes, reset timers on state enter, and ensure player slowdown is applied/removed correctly. Improve Draw/Update/Collision helpers and tidy texture unload spacing. WindUpScurry: add BITE and BITE_RETREAT states (with placeholder animations/textures), introduce bite damage+retreat logic and timers, store retreat direction, and make chase->bite transitions when in range. Replace capsule collider with a rectangle, consolidate animation updates into a compact switch, avoid double-unloading aliased textures, simplify patrol/detection/chase logic, and add numerous clarifying comments and small logging tweaks. Overall changes add new combat interactions, fix resource/unload issues, and improve readability/maintainability.
…m/HiddenDreamStudio/EchoesOfSlumber into feat/fix-bug-oso-and-enemies-lvl2
TheUnrealZaka
approved these changes
Jun 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Canvis
El enemigo wind up se le ha cambiado la hitbox ya que no concuerda con su forma.
Despues de que haga un ataque al player se marcha en dirección contraria ya que el enenmigo se quedaba enganchado con el player, ya no es inmortal tanto el raton y el yo yo. El yo yo ya hace daño cuando te atrapa pero si tardas menos de 3 segundos no te hace daño. Y el oso ya no se puede esconder en la piedra.
Issues relacionades
#393
Tipus de canvi
feat: Nova funcionalitatfix: Correcció de bugart: Asset gràficdocs: Documentaciórefactor: Refactorització de codibuild: Canvis al sistema de buildChecklist