Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transition cleanly to and from combat instances #217

Merged
merged 9 commits into from
May 7, 2024
Merged

Transition cleanly to and from combat instances #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
29fe1f3
Restructure main for combat, rename trigger.tscn and interaction.tscn
food-please Mar 24, 2024
74ce461
Draft combat node structure
food-please Mar 24, 2024
7f0317e
Draft combat triggers and arenas
food-please Mar 24, 2024
fff10fe
Enter and exit combat state
food-please Apr 29, 2024
31b7486
Refactor ScreenTransition to autoload, add a (fixed) roaming encounter
food-please Apr 29, 2024
e8de3ba
Refactor combat transition logic into combat state; add trigger and i…
food-please Apr 30, 2024
74eb424
Update Dialogic to most recent build; iron out a few cutscene timing …
food-please Apr 30, 2024
2f9bc98
Add two combat music tracks
food-please Apr 30, 2024
004c0f2
Update the changelog and credits
food-please Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 20 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# Changelog

## v0.3.0 Combat Demo ⚔️

### New

The demo scene has been reworked to include combat.

The demo introduces:
- A Main scene separated into two main gameplay objects, the Field and Combat.
- 1 additional template Cutscene:
- Combat Trigger, that runs when colliding with the player. This is designed to be used with roaming encounters that may pounce on the player in the field. Winning removes the encounter from the Field, whereas losing will lead to a game-over.
- An example combat that is run from a conversation. Winning or losing leads to different dialogue options.
- Combat-related music.
- Smooth transitions to and from combat.

### Changes
- Added a handful of combat events that allow objects to hook into changes in a given combat.
- Refactored ScreenTransition into an autoload, since only one should ever be active at a given moment anyways.
- Updated Dialogic 2 to the most recent build. ***Note that input has been modified to respond to the input events being released, rather than pressed.***
- Miscellaneous fixes to the demo.

## v0.2.0 Cutscene Demo 💬

### New
Expand Down
10 changes: 10 additions & 0 deletions CREDITS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ Author: Kenney
URL: https://kenney.nl/assets/emotes-pack (accessed 2023-06-02)
License: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)

Fun Run, The
Author: Zane Little Music
URL: https://opengameart.org/content/the-fun-run-day-3 (accessed 2024-04-30)
License: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)

Impact Sounds
Author: Kenney
URL: https://kenney.nl/assets/impact-sounds (accessed 2023-12-20)
Expand All @@ -30,6 +35,11 @@ Author: Kenney
URL: https://kenney.nl/assets/rpg-audio (accessed 2023-12-20)
License: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)

Squashin' Bugs
Author: Zane Little Music
URL: https://opengameart.org/content/squashin-bugs-day-15 (accessed 2023-06-06)
License: [CC0](https://creativecommons.org/publicdomain/zero/1.0/)

Tiny Series (Tiny Town & Tiny Dungeon)
Author: Kenney
URL: https://kenney.nl/assets/tiny-town & https://kenney.nl/assets/tiny-dungeon (accessed 2023-02-22)
Expand Down
Loading