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.

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

Remove more 0.G migrations #64399

Merged
merged 7 commits into from
Mar 22, 2023

Conversation

irwiss
Copy link
Contributor

@irwiss irwiss commented Mar 19, 2023

Summary

None

Purpose of change

Cull more stuff to clear #64302

Describe the solution

Stuff not resolved completely:

Untouchables: t_centrifuge, t_machinery_light etc... MUST sit in data/json/obsoletion.json, if you so much as move the file to obsoletion/ folder then the game will fail on loading, these are still widely used, probably load order is messing up somehow.

Overmap stuff is complicated to remove; -snip- turns out a bad PR was messing with this, but it can be done in a later PR

Some stuff like obsolete monsters still sit in data/json/obsoletion/obsolete_but_used_0_G_monsters.json, removing them causes older games fail on load; when overmap and achievement try to resolve monster types, seems we have no migration path for those without raising debugmsgs

Survivor armor in data\json\recipes\armor\bespoke_armor also remains still

Stuff done:

Removes 0.G item/recipe migrations
Replaces a bunch of ids still used in game with their migrated id
Consolidates remaining 0.G obsolete entries under data/json/obsoletion/* (except for data/json/obsolete.json, see above)
Moves (or rather - copies for now) monsters like zombie burner to Xedra and No Hope (they're used there)

Describe alternatives you've considered

Testing

Loaded worlds with mods Aftershock, Xedra, No_Hope, Generic Guns without errors
Loaded a couple older games - there were no errors

Hopefully tests catch stray ids I missed

Additional context

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON [Markdown] Markdown issues and PRs [Python] Code made in Python Bionics CBM (Compact Bionic Modules) Code: Tooling Tooling that is not part of the main game but is part of the repo. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing Items: Food / Vitamins Comestibles and drinks Items: Magazines Ammo holding items and objects. Map / Mapgen Overmap, Mapgen, Map extras, Map display Mechanics: Enchantments / Spells Enchantments and spells Mods Issues related to mods or modding Mods: Aftershock Anything to do with the Aftershock mod Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mods: Generic Guns Anything to do with Generic Guns Mods: Innawood 🌲 Anything to do with Innawood mod Mods: Magiclysm Anything to do with the Magiclysm mod Mods: No Hope Relating to the mod No Hope Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. Mods: Xedra Evolved Anything to do with Xedra Evolved Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies labels Mar 19, 2023
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 20, 2023
@irwiss irwiss force-pushed the remove-more-0.G-migrations branch 2 times, most recently from bae169b to 4262781 Compare March 20, 2023 02:49
@irwiss irwiss changed the title Remove more 0.G migrations (don't merge yet) Remove more 0.G migrations Mar 20, 2023
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 20, 2023
@irwiss irwiss force-pushed the remove-more-0.G-migrations branch 2 times, most recently from dd8b6fb to aee22b8 Compare March 20, 2023 04:59
@github-actions github-actions bot added Monsters Monsters both friendly and unfriendly. BasicBuildPassed This PR builds correctly, label assigned by github actions labels Mar 20, 2023
@irwiss irwiss force-pushed the remove-more-0.G-migrations branch from aee22b8 to 94b2aee Compare March 20, 2023 13:28
@Brambor
Copy link
Contributor

Brambor commented Mar 20, 2023

Why not mark this PR as a draft instead of naming it (don't merge yet)?

@irwiss
Copy link
Contributor Author

irwiss commented Mar 20, 2023

Drafts don't run all tests

@irwiss irwiss force-pushed the remove-more-0.G-migrations branch 2 times, most recently from 3bbbc8e to 96602c8 Compare March 21, 2023 23:10
@irwiss irwiss changed the title (don't merge yet) Remove more 0.G migrations Remove more 0.G migrations Mar 21, 2023
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 21, 2023
@irwiss irwiss force-pushed the remove-more-0.G-migrations branch from 96602c8 to 6228cea Compare March 22, 2023 01:44
@irwiss irwiss force-pushed the remove-more-0.G-migrations branch from 6228cea to 56cf921 Compare March 22, 2023 03:13
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 22, 2023
@kevingranade kevingranade merged commit 8a3d165 into CleverRaven:master Mar 22, 2023
@irwiss irwiss deleted the remove-more-0.G-migrations branch March 22, 2023 05:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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: Infrastructure / Style / Static Analysis Code internal infrastructure and style Code: Tests Measurement, self-control, statistics, balancing. Code: Tooling Tooling that is not part of the main game but is part of the repo. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling <Documentation> Design documents, internal info, guides and help. Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing Items: Food / Vitamins Comestibles and drinks Items: Magazines Ammo holding items and objects. [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 Mods: Aftershock Anything to do with the Aftershock mod Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mods: Generic Guns Anything to do with Generic Guns Mods: Innawood 🌲 Anything to do with Innawood mod Mods: Magiclysm Anything to do with the Magiclysm mod Mods: No Hope Relating to the mod No Hope Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding Monsters Monsters both friendly and unfriendly. Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies NPC / Factions NPCs, AI, Speech, Factions, Ownership [Python] Code made in Python Scenarios New Scenarios, balancing, bugs with scenarios Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants