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

Jump to bottom

Dynamic scenario objects #1169

Merged
merged 56 commits into from
Jan 30, 2025
Merged

Dynamic scenario objects #1169

merged 56 commits into from
Jan 30, 2025
+10,022 −5,126

Conversation

crudelios
Copy link
Collaborator

This PR adds many changes to the map editor.

Most notable changes:

  • Unlimited requests, price changes, demand changes and invasions (there was a hard limit of 20)
  • Repeatable requests and invasions, with varying amount of items/ invaders, with configurable min and max, number of repeats and time between repeats
  • Unlimited custom variables (there was a hard limit of 100)
  • Ability to name events for ease of use
  • Ability to group event conditions - if any condition in a group is met, the entire group is considered met. All groups and ungrouped conditions need to be met for the event action to fire
  • All buildings can be individually allowed and disallowed
  • Many map editor UI improvements
  • Probably more stuff I don't remember

This needs a lot of testing. Also, backup your important savefiles as there may be unforseen issues.

crudelios added 30 commits July 10, 2024 15:17
@crudelios
Start implementing dynamic scenario stuff
11a67ee
@crudelios
Start making requests dynamic
9a3a275
@crudelios
Finish internal support for unlimited requests
2dea765
@crudelios
Merge remote-tracking branch 'augustus/master' into dynamic-scenario-…
cc2ba87 
…objects
@crudelios
Improve UI for unlimited requests
d7033d2
@crudelios
Fix small load issue
31456a2
@crudelios
Merge remote-tracking branch 'origin/master' into dynamic-scenario-ob…
8a22dac 
…jects
@crudelios
Improve requests UI on scenario events editor
3a812dc
@crudelios
Merge branch 'dynamic-scenario-objects' of https://github.com/crudeli…
60ec1ba 
…os/julius into dynamic-scenario-objects
@crudelios
Small code fixes
c405978
@crudelios
Merge remote-tracking branch 'augustus/master' into dynamic-scenario-…
3bb444b 
…objects
@crudelios
Remove static max invasions from scenario
6bfdc3c
@crudelios
Merge remote-tracking branch 'origin/master' into dynamic-scenario-ob…
588eb87 
…jects
@crudelios
Fix some issues with invasions and requests on the scenario editor
f42e0c8
@crudelios
Add internal engine support for invasion repetition and variable numb…
31fb5ac 
…er of invaders
@crudelios
Add UI support for variable number of invaders and invasion repetition
640fbd3
@crudelios
Add dynamic demand changes
de4f89d 
Also some code refactoring
@crudelios
Make price changes dynamic
7627c30
@crudelios
Refactor generic button code
b478028
@crudelios
Improve positioning for numeric inputs and select lists
3c476f7
@crudelios
Improve requests, invasions, price changes, demand changes edit window:
f858369 
- Add form validation
- Color "remove item" button
- Add "Cancel" button
@crudelios
Add background support for naming scenario events and adding "OR" con…
30f6362 
…dition types
@crudelios
Scenario events: Add background support for condition groups
818fd62 
Event conditions can now be grouped. If any condition in a group is met, the entire group is set as met.

All groups, as well as all ungrouped conditions, must be met for an event to trriger an action.

Also start improving the event editor UI (still WIP).
@crudelios
Update UI for scenario event editor
72738ba
@crudelios
Add support for "Edit and Continue" on MSVC
aece6f8 
Add "Set selected to group" button
@crudelios
Add tooltips to select all / select none buttons
b61b3b3 
Add array_pack macro
@crudelios
Fix compiler warning
95d5cee
@crudelios
Add UI support for setting up condition groups
01a9488
@crudelios
Allow deleting conditions and actions from the events window
9e84a22
@crudelios
Fix text input on event editor
a59b26a
github-advanced-security[bot]
github-advanced-security bot found potential problems Jan 21, 2025
View reviewed changes
src/window/editor/scenario_event_details.c Dismissed Show dismissed Hide dismissed
src/window/editor/scenario_event_details.c Dismissed Show dismissed Hide dismissed
src/window/editor/scenario_event_details.c Dismissed Show dismissed Hide dismissed
src/window/editor/scenario_event_details.c Dismissed Show dismissed Hide dismissed
src/window/editor/scenario_event_details.c Dismissed Show dismissed Hide dismissed
src/window/editor/scenario_event_details.c Dismissed Show dismissed Hide dismissed
@crudelios crudelios marked this pull request as ready for review January 26, 2025 01:42
@crudelios crudelios requested a review from UberWaffe January 27, 2025 16:26
@crudelios crudelios mentioned this pull request Jan 28, 2025
Open
@crudelios
Use the new "allowed buildings" window on "allow/disallow building" e…
6f15f7d 
…vent action

Remove buildings that can't be counted, like roads and bridges, from the "count buildings" condition

Improve xml import compatibility with files from before the current PR changes

Also a small code refactor
@crudelios
Try to fix corruption when importing old saves and scenarios
72c08df
@crudelios
Fix exporting and importing allowed buildings
e550a68 
Also fix some bugs with the xml exporter

Also update cv2pdb
@crudelios
Fix bug where events don't trigger on scenario load
b9a2a92 
Fix bug where the event "repeat type" could be wrongly set
@crudelios
Refactor scenario events source files
f9a05f1
@crudelios
Improve event allowed building selection UI
ef770f0
@crudelios crudelios merged commit ec596ac into Keriew:master Jan 30, 2025
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@UberWaffe UberWaffe Awaiting requested review from UberWaffe

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@crudelios