-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
kevingranade
merged 7 commits into
CleverRaven:master
from
irwiss:remove-more-0.G-migrations
Mar 22, 2023
Merged
Remove more 0.G migrations #64399
kevingranade
merged 7 commits into
CleverRaven:master
from
irwiss:remove-more-0.G-migrations
Mar 22, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bae169b
to
4262781
Compare
dd8b6fb
to
aee22b8
Compare
aee22b8
to
94b2aee
Compare
Why not mark this PR as a draft instead of naming it (don't merge yet)? |
Drafts don't run all tests |
3bbbc8e
to
96602c8
Compare
96602c8
to
6228cea
Compare
6228cea
to
56cf921
Compare
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 debugmsgsSurvivor armor in
data\json\recipes\armor\bespoke_armor
also remains stillStuff 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