Skip to content

Configurable Activities #1609

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

Merged
TheJJ merged 44 commits into from
Jan 12, 2024
Merged

Configurable Activities #1609

Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
78bebc5
convert: Load nyan data API v0.4.1.
heinezen Dec 4, 2023
b7e693a
convert: Basic activity for units.
heinezen Dec 7, 2023
b62266d
convert: Export new API version as modpack.
heinezen Dec 10, 2023
33a53f3
convert: Activity ability.
heinezen Dec 10, 2023
884a15f
gamestate: Docstrings for activity.
heinezen Dec 17, 2023
33ced29
gamestate: API interface for nyan activities.
heinezen Dec 17, 2023
943e67a
gamestate: Create activity from nyan data.
heinezen Dec 17, 2023
eba3c96
gamestate: Rename activity node files.
heinezen Dec 18, 2023
a9e7d44
gamestate: Refactor XorGate to use one condition per node.
heinezen Dec 18, 2023
c586d7f
gamestate: Adjust activity demo for new condition.
heinezen Dec 18, 2023
c960ab8
gamestate: Remove old condition functionality.
heinezen Dec 18, 2023
b381dc5
gamestate: Refactor XorEventGate to use one event primer per node.
heinezen Dec 18, 2023
7de149d
gamestate: Adjust activity demo for new event primers.
heinezen Dec 19, 2023
6118211
gamestate: Use new event priming functionality.
heinezen Dec 19, 2023
26d04bb
gamestate: Remove unused functions.
heinezen Dec 19, 2023
64dfb07
gamestate: Add breakout event to default actvity graph.
heinezen Dec 19, 2023
7e9dbd1
gamestate: Predefined activity event functions.
heinezen Dec 20, 2023
3027ce9
gamestate: Get event primer from API definition.
heinezen Dec 20, 2023
ca4f15e
gamestate: Create connections between nodes in activity graph.
heinezen Dec 20, 2023
24d83c0
gamestate: Set default node separately from other outputs.
heinezen Dec 23, 2023
a07f7d2
refactor: Move event primers into activity subfolders.
heinezen Dec 23, 2023
7c12205
gamestate: Add built-in condition functions to activity system.
heinezen Dec 23, 2023
831a4f8
gamestate: Use built-in condition for example activity.
heinezen Dec 23, 2023
97460f0
gamestate: Fix command not returned by reference.
heinezen Dec 23, 2023
8db9807
gamestate: Detect condition from API objects.
heinezen Dec 24, 2023
31018e3
gamestate: Detect system task from API objects.
heinezen Dec 24, 2023
53ece80
gamestate: Fix reading from nyan activity condition API object.
heinezen Dec 24, 2023
537830a
gamestate: Fix wrong member ID lookup.
heinezen Dec 24, 2023
30a6234
gamestate: Fix lookup of activity conditions/events.
heinezen Dec 24, 2023
bc1f82d
curve: Fix queue behaviour when popping elements.
heinezen Dec 24, 2023
c269a67
convert: Fix game entity activity not idling after move.
heinezen Dec 24, 2023
c2244c4
convert: Import aliases for nyan API activities.
heinezen Dec 24, 2023
d035829
convert: Warn when alias cannot be added to import tree.
heinezen Dec 24, 2023
c31e861
doc: Replace activity example in docs with current default activity.
heinezen Dec 24, 2023
737e2b2
gamestate: Cache created activities.
heinezen Dec 24, 2023
2457ed8
gamestate: Make command queue getter non-const.
heinezen Dec 25, 2023
ab12e98
time: Constants for min, max, zero.
heinezen Dec 25, 2023
26b2f97
curve: Replace time numeric limit with constants.
heinezen Dec 25, 2023
6f0117b
event: Replace time numeric limit with constants.
heinezen Dec 25, 2023
1f54b5d
pong: Replace time numeric limit with constants.
heinezen Dec 25, 2023
0e7178f
gamestate: Replace time numeric limit with constants.
heinezen Dec 25, 2023
73b97d4
curve: Search queue from the end instead from begin.
heinezen Dec 25, 2023
6d41917
gamestate: Remove unused variable.
heinezen Dec 25, 2023
ec381df
convert: Clarify modpack version/versionstr difference.
heinezen Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
convert: Import aliases for nyan API activities.
  • Loading branch information
@heinezen
heinezen committed Dec 25, 2023
commit c2244c4888d2e1da254f59aed4803ad168773e21
5 changes: 5 additions & 0 deletions openage/convert/processor/conversion/aoc/modpack_subprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ def _set_static_aliases(modpack: Modpack, import_tree: ImportTree) -> None:
import_tree.add_alias(("engine", "ability", "property", "type"), "ability_prop")

# Auxiliary objects
import_tree.add_alias(
("engine", "util", "activity", "condition", "type"), "activity_condition"
)
import_tree.add_alias(("engine", "util", "activity", "event", "type"), "activity_event")
import_tree.add_alias(("engine", "util", "activity", "node", "type"), "activity_node")
import_tree.add_alias(("engine", "util", "accuracy"), "accuracy")
import_tree.add_alias(
("engine", "util", "animation_override"), "animation_override"
Expand Down