Skip to content

Backport save compression fixes #83102

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
Closed
wants to merge 210 commits into from
Closed

Backport save compression fixes #83102

wants to merge 210 commits into from

Conversation

akrieger
Copy link
Member

Summary

None

Purpose of change

Backport of #82675. Backport of #83042. Backport of #83059. See those PRs for details.

Describe the solution

Describe alternatives you've considered

Testing

Additional context

I-am-Erk and others added 30 commits July 9, 2025 21:17
@I-am-Erk
disable alpha test mutaiton
9860dca
@migo-chan @Standing-Storm @github-actions
Add minimum for You feel thirstier than before you consumed that! m…
0f729b8 
…essage to display (CleverRaven#81684)

* Add if statement

* Update src/consumption.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: [email protected] <[email protected]>
Co-authored-by: Standing-Storm <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@migo-chan @SamGondra
Pickle Fix (CleverRaven#81686)
5912c1c 
* adjust amount of gherkin cucumbers to 8 to 'fill' a 0.5L glass

0.5/0.06 =8,3333 so I am going with 8 here

* adjust the amount of charges to 10

seems easier than trying to bring the pickle item volume to 0,0625L = 62.5ml, which I think isn't a valid amount?

* fudge the volume so there fit an even 10 for 0.5L

I blame the slight increase in vitamins this leads to, on fermenting them which makes the vitamins more available or something...

* Ups - Density test

set weight to 54 which should be close to original density of the Gherkin cucumbers

---------

Co-authored-by: SamGondra <[email protected]>
@PatrikLundell
Don't try to pulp corpse that's no longer present (CleverRaven#81656)
7989fe9
@Termineitor244
Correct copper typo (CleverRaven#81653)
c622275
@Maleclypse
disable alpha test mutaiton (CleverRaven#81677)
be51285
@kevingranade
Update CI config for 0.I release candidate (CleverRaven#81685)
06f246b 
This is a forward-port of CleverRaven#73638, dd37e8c, and ff383b1
@ZhilkinSerg
Allow NPC to dress really quietly on game start (and during mutations)
2f3b615
@ZhilkinSerg
Check for !quiet only once
8f45c49
@Maleclypse
Merge pull request CleverRaven#81726 from CleverRaven/trop/0.I-branch…
60fd1cf 
…-bp-allow-npc-to-dress-really-quietly-on-game-start-and-during-mutations--1752283317330

Allow NPC to dress really quietly on game start (and during mutations)
@migo-chan @RenechCDDA
"hard" meta progression requirements for mods (CleverRaven#81737)
d22a465 
* "hard" metaprogression requirements for mods

* Fix a bug where we were ignoring the return value of ::can_pick()

---------

Co-authored-by: RenechCDDA <[email protected]>
@migo-chan @John-Candlebury
Tool trader sells nanomaterial (CleverRaven#81736)
c9b0ce0 
Co-authored-by: John Candlebury <[email protected]>
@migo-chan @John-Candlebury
Monsters only target vehicles driven by hostiles (CleverRaven#81725)
702d91a 
Co-authored-by: John Candlebury <[email protected]>
@migo-chan @kevingranade
Reign in ASRG spawns (CleverRaven#81735)
7330a4f 
* Reign in ASRG spawns

* readd but reduce asrg spawn in mil_base_z0.json

Also moves asrg furniture entry to the specific mapgen instead of placing it in the palette.

---------

Co-authored-by: Kevin Granade <[email protected]>
@migo-chan @John-Candlebury
All cryosuits update the UI not only magellan (CleverRaven#81697)
0f310af 
Co-authored-by: John Candlebury <[email protected]>
@kevingranade @ehughsbaird
Fix potential crash shooting at driverless vehicle (CleverRaven#81741)
733b5d1 
Co-authored-by: ehughsbaird <[email protected]>
@migo-chan @RogueNova1 @Maleclypse
Making Chainsaws Disassemble-able (CleverRaven#81703)
20d8882 
* adding Debug Message to find bottle neckcrafting.cpp

* adding Uncraft Recipes for Chainsaws

* purge old debug command

* Formatting Fix for Woodworking.json

* restored Craftubg,cpp from Main Repo

* Update src/crafting.cpp

* Update data/json/uncraft/tool/woodworking.json

Co-authored-by: Maleclypse <[email protected]>

* Update data/json/uncraft/tool/woodworking.json

Co-authored-by: Maleclypse <[email protected]>

* Update data/json/uncraft/tool/woodworking.json

Co-authored-by: Maleclypse <[email protected]>

* Update data/json/uncraft/tool/woodworking.json

Co-authored-by: Maleclypse <[email protected]>

---------

Co-authored-by: likowski1 <[email protected]>
Co-authored-by: RogueNova1 <[email protected]>
Co-authored-by: Maleclypse <[email protected]>
@migo-chan @Standing-Storm
[Backport]Add BULLETPROOF flag for monsters immune to ballistic damag…
91cd791 
…e, apply to Magiclysm's will o' wisps (CleverRaven#81752)

Co-authored-by: [email protected] <[email protected]>
@migo-chan @John-Candlebury @github-actions
Aftershock: Functional Starship Scenario (CleverRaven#81681)
11edce7 
* Spaceship Scenario

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Plural

* fix spacing

* Update lore items

---------

Co-authored-by: John Candlebury <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@migo-chan @ShnitzelX2
fix software crafting (CleverRaven#81764)
8490478 
for XEDRA: Evolved

Co-authored-by: ShnitzelX2 <[email protected]>
@migo-chan @cknight828
Ensure no fault in Liam's car. (CleverRaven#81765)
a9209c9 
Co-authored-by: cknight828 <[email protected]>
@migo-chan @SamGondra
fix postapoc price of S&W 10 (CleverRaven#81787)
07a4769 
Co-authored-by: SamGondra <[email protected]>
@TheMurderUnicorn @akrieger
Restore looks_like to Crabapple tree
515f218
@Maleclypse
Update data/json/furniture_and_terrain/terrain-flora.json
40f3f7a
@Maleclypse
Update data/json/furniture_and_terrain/terrain-flora.json
1e822cb
@akrieger
Merge pull request CleverRaven#81759 from CleverRaven/trop/0.I-branch…
8931b47 
…-bp-restore-looks_like-to-crabapple-tree-1752414147175

Restore looks_like to Crabapple tree
@John-Candlebury @akrieger
Resolve slipping Han incident.
561ee1d
@John-Candlebury @akrieger
Profession cryosuits start with batteries.
afeecad
@John-Candlebury @akrieger
Sink description
9856bd8
@migo-chan @Procyonae
Fix mod loading (CleverRaven#81789)
8cc71be 
* Break check_mods_list out of load_mods_list

* Adjust the vector in place instead

---------

Co-authored-by: Procyonae <[email protected]>
@github-actions github-actions bot added Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Spawn Creatures, items, vehicles, locations appearing on map 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 Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Melee Melee weapons, tactics, techniques, reach attack Scenarios New Scenarios, balancing, bugs with scenarios Character / World Generation Issues and enhancements concerning stages of creating a character or a world Player Faction Base / Camp All about the player faction base/camp/site Mods: Magiclysm Anything to do with the Magiclysm mod 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) Items: Containers Things that hold other things Game: Achievements / Conducts / Scores Player goals and how they are tracked. Code: Tooling Tooling that is not part of the main game but is part of the repo. Mechanics: Enchantments / Spells Enchantments and spells Items: Armor / Clothing Armor and clothing Mods: No Hope Relating to the mod No Hope EOC: Effects On Condition Anything concerning Effects On Condition Mods: Xedra Evolved Anything to do with Xedra Evolved Mods: Mind Over Matter ImGui Anything related to the new ImGui UI for SDL/tiles or ImTui for curses builds Mods: Isolation Protocol ☣ The total conversion mod Isolation Protocol Tutorial labels Sep 29, 2025
@akrieger akrieger deleted the backport_zzip_fixes branch September 29, 2025 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@I-am-Erk I-am-Erk Awaiting requested review from I-am-Erk

@John-Candlebury John-Candlebury Awaiting requested review from John-Candlebury

@KorGgenT KorGgenT Awaiting requested review from KorGgenT

@Maleclypse Maleclypse Awaiting requested review from Maleclypse

Assignees
No one assigned
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Character / World Generation Issues and enhancements concerning stages of creating a character or a world Code: Build Issues regarding different builds and build environments 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. EOC: Effects On Condition Anything concerning Effects On Condition Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Game: Achievements / Conducts / Scores Player goals and how they are tracked. ImGui Anything related to the new ImGui UI for SDL/tiles or ImTui for curses builds Info / User Interface Game - player communication, menus, etc. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing Items: Containers Things that hold other things Items: Food / Vitamins Comestibles and drinks [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display [Markdown] Markdown issues and PRs Mechanics: Enchantments / Spells Enchantments and spells Melee Melee weapons, tactics, techniques, reach attack 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: Isolation Protocol ☣ The total conversion mod Isolation Protocol Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Mind Over Matter Mods: No Hope Relating to the mod No Hope 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 Player Faction Base / Camp All about the player faction base/camp/site Scenarios New Scenarios, balancing, bugs with scenarios Spawn Creatures, items, vehicles, locations appearing on map Tutorial Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.