mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-12-15 15:20:57 -08:00
Code Issues Projects Releases Wiki Activity

Fixed #3709

Browse source
This commit is contained in:
Anuken 2020-12-02 09:56:02 -05:00
parent 430538ea7e
commit 775e17a726
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/src/mindustry/content/TechTree.java
View file

@ -714,8 +714,14 @@ public class TechTree implements ContentList{
finishedRequirements[i] = new ItemStack(requirements[i].item, Core.settings == null ? 0 : Core.settings.getInt("req-" + content.name + "-" + requirements[i].item.name)); finishedRequirements[i] = new ItemStack(requirements[i].item, Core.settings == null ? 0 : Core.settings.getInt("req-" + content.name + "-" + requirements[i].item.name));
} }
var used = new ObjectSet<Content>();
//add dependencies as objectives. //add dependencies as objectives.
content.getDependencies(d -> objectives.add(new Research(d))); content.getDependencies(d -> {
if(used.add(d)){
objectives.add(new Research(d));
}
});
map.put(content, this); map.put(content, this);
all.add(this); all.add(this);

2
core/src/mindustry/content/Weathers.java
View file

@ -75,7 +75,7 @@ public class Weathers implements ContentList{
attrs.set(Attribute.spores, 1f); attrs.set(Attribute.spores, 1f);
attrs.set(Attribute.light, -0.15f); attrs.set(Attribute.light, -0.15f);
status = StatusEffects.sporeSlowed; status = StatusEffects.sporeSlowed;
opacityMultiplier = 0.75f; opacityMultiplier = 0.5f;
force = 0.1f; force = 0.1f;
sound = Sounds.wind; sound = Sounds.wind;
soundVol = 0.7f; soundVol = 0.7f;

5
fastlane/metadata/android/en-US/changelogs/29744.txt Normal file
View file

@ -0,0 +1,5 @@
[This is a truncated changelog, see Github for full notes]
Yeah, it's another hotfix. I missed these during earlier testing.
- Fixed research deadlock caused by blocks requiring optional inputs as research
- Possible fix for "Unsupported combination of formats" startup error