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

Unify all run_eocs in single function [2/2] #77661

Merged
merged 8 commits into from
Nov 13, 2024
Merged

Unify all run_eocs in single function [2/2] #77661

merged 8 commits into from
Nov 13, 2024

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Nov 7, 2024 •
edited
Loading

Summary

None

Purpose of change

Continuation of #77000

Describe the solution

Replace strings in json
Deprecate all run_eoc_until, run_eoc_with, queue_eocs and queue_eoc_with with run_eocs
Update documentation somewhat after #77359

Testing

Yep, it loads

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. NPC / Factions NPCs, AI, Speech, Factions, Ownership [JSON] Changes (can be) made in JSON Missions Quests and missions Bionics CBM (Compact Bionic Modules) Map / Mapgen Overmap, Mapgen, Map extras, Map display Items: Food / Vitamins Comestibles and drinks Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Code: Tests Measurement, self-control, statistics, balancing. [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [Markdown] Markdown issues and PRs Scenarios New Scenarios, balancing, bugs with scenarios Mechanics: Weather Rain, snow, portal storms and non-temperature environment Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Aftershock Anything to do with the Aftershock mod Mechanics: Enchantments / Spells Enchantments and spells Mods: Defense Mode Anything to do with the Defense Mode mod EOC: Effects On Condition Anything concerning Effects On Condition Mods: Desert Region Anything relating to the Desert Region mod Mods: Xedra Evolved Anything to do with Xedra Evolved Mods: Bombastic Perks Mods: Mind Over Matter Mods: Sky Island Anything about the Sky Island mod Mods: Isolation Protocol ☣ The total conversion mod Isolation Protocol labels Nov 7, 2024
GuardianDll
GuardianDll commented Nov 7, 2024
View reviewed changes
data/changelog.txt Outdated Show resolved Hide resolved
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Nov 7, 2024
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 8, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 8, 2024
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 9, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 12, 2024
@Maleclypse Maleclypse merged commit f51474b into CleverRaven:master Nov 13, 2024
21 of 28 checks passed
@GuardianDll GuardianDll deleted the one_eoc_to_rule_them_all branch November 13, 2024 00:12
@Procyonae Procyonae mentioned this pull request Nov 13, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Bionics CBM (Compact Bionic Modules) [C++] Changes (can be) made in C++. Previously named `Code` Code: Tests Measurement, self-control, statistics, balancing. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling <Documentation> Design documents, internal info, guides and help. EOC: Effects On Condition Anything concerning Effects On Condition Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Food / Vitamins Comestibles and drinks [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display [Markdown] Markdown issues and PRs Mechanics: Enchantments / Spells Enchantments and spells Mechanics: Weather Rain, snow, portal storms and non-temperature environment Missions Quests and missions Mods: Aftershock Anything to do with the Aftershock mod Mods: Bombastic Perks Mods: Defense Mode Anything to do with the Defense Mode mod Mods: Desert Region Anything relating to the Desert Region mod Mods: Isolation Protocol ☣ The total conversion mod Isolation Protocol Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Mind Over Matter Mods: Sky Island Anything about the Sky Island mod Mods: Xedra Evolved Anything to do with Xedra Evolved Monsters Monsters both friendly and unfriendly. Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies NPC / Factions NPCs, AI, Speech, Factions, Ownership Scenarios New Scenarios, balancing, bugs with scenarios
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@GuardianDll @Maleclypse