mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-13 12:16:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Frozen forest rework / Reduced starter copper / Auto-deselect

Browse Source
This commit is contained in:
Anuken 2019-02-27 19:48:00 -05:00
parent 8f4258b119
commit 13c2eae1f4
7 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/frozenForest.mmap
View File

Binary file not shown.

14
core/src/io/anuke/mindustry/content/Blocks.java
View File

@ -751,41 +751,41 @@ public class Blocks implements ContentList{
}}; }};
conduit = new Conduit("conduit"){{ conduit = new Conduit("conduit"){{
requirements(Category.liquid, ItemStack.with(Items.lead, 1)); requirements(Category.liquid, ItemStack.with(Items.metaglass, 1));
health = 45; health = 45;
}}; }};
pulseConduit = new Conduit("pulse-conduit"){{ pulseConduit = new Conduit("pulse-conduit"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 1, Items.lead, 1)); requirements(Category.liquid, ItemStack.with(Items.titanium, 1, Items.metaglass, 2));
liquidCapacity = 16f; liquidCapacity = 16f;
liquidFlowFactor = 4.9f; liquidFlowFactor = 4.9f;
health = 90; health = 90;
}}; }};
liquidRouter = new LiquidRouter("liquid-router"){{ liquidRouter = new LiquidRouter("liquid-router"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.lead, 4)); requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.metaglass, 4));
liquidCapacity = 20f; liquidCapacity = 20f;
}}; }};
liquidTank = new LiquidTank("liquid-tank"){{ liquidTank = new LiquidTank("liquid-tank"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 50, Items.lead, 50)); requirements(Category.liquid, ItemStack.with(Items.titanium, 50, Items.metaglass, 50));
size = 3; size = 3;
liquidCapacity = 1500f; liquidCapacity = 1500f;
health = 500; health = 500;
}}; }};
liquidJunction = new LiquidJunction("liquid-junction"){{ liquidJunction = new LiquidJunction("liquid-junction"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.lead, 4)); requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.metaglass, 4));
}}; }};
bridgeConduit = new LiquidExtendingBridge("bridge-conduit"){{ bridgeConduit = new LiquidExtendingBridge("bridge-conduit"){{
requirements(Category.liquid, ItemStack.with(Items.titanium, 8, Items.lead, 8)); requirements(Category.liquid, ItemStack.with(Items.titanium, 8, Items.metaglass, 8));
range = 4; range = 4;
hasPower = false; hasPower = false;
}}; }};
phaseConduit = new LiquidBridge("phase-conduit"){{ phaseConduit = new LiquidBridge("phase-conduit"){{
requirements(Category.liquid, ItemStack.with(Items.phasefabric, 10, Items.silicon, 15, Items.lead, 20, Items.titanium, 20)); requirements(Category.liquid, ItemStack.with(Items.phasefabric, 10, Items.silicon, 15, Items.metaglass, 40, Items.titanium, 20));
range = 12; range = 12;
hasPower = true; hasPower = true;
consumes.power(0.30f); consumes.power(0.30f);

16
core/src/io/anuke/mindustry/content/Loadouts.java
View File

@ -6,6 +6,7 @@ import io.anuke.mindustry.type.Loadout;
public class Loadouts implements ContentList{ public class Loadouts implements ContentList{
public static Loadout public static Loadout
basicShard, basicShard,
advancedShard,
basicFoundation, basicFoundation,
basicNucleus; basicNucleus;
@ -20,14 +21,23 @@ public class Loadouts implements ContentList{
" C# C# " " C# C# "
); );
advancedShard = new Loadout(
" ### ",
" #1# ",
"#######",
"C#^ ^C#",
" ## ## ",
" C# C# "
);
basicFoundation = new Loadout( basicFoundation = new Loadout(
" #### ", " #### ",
" #### ", " #### ",
" #2## ", " #2## ",
" #### ", " #### ",
" ^ ^ ", " ^^^^ ",
" ## ## ", " ###### ",
" C# C# " " C#C#C# "
); );
basicNucleus = new Loadout( basicNucleus = new Loadout(

2
core/src/io/anuke/mindustry/content/Zones.java
View File

@ -115,7 +115,7 @@ public class Zones implements ContentList{
}}; }};
}}; }};
frozenForest = new Zone("frozenForest", new MapGenerator("frozenForest", 2) frozenForest = new Zone("frozenForest", new MapGenerator("frozenForest", 1)
.decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.02))){{ .decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.02))){{
loadout = Loadouts.basicFoundation; loadout = Loadouts.basicFoundation;
baseLaunchCost = ItemStack.with(Items.copper, 100); baseLaunchCost = ItemStack.with(Items.copper, 100);

2
core/src/io/anuke/mindustry/game/GlobalData.java
View File

@ -116,7 +116,7 @@ public class GlobalData{
//set up default values //set up default values
if(!Core.settings.has("item-" + Items.copper.name)){ if(!Core.settings.has("item-" + Items.copper.name)){
addItem(Items.copper, 300); addItem(Items.copper, 50);
} }
} }

3
core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
View File

@ -8,6 +8,7 @@ import io.anuke.arc.scene.ui.Tooltip;
import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.utils.UIUtils; import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.Content; import io.anuke.mindustry.game.Content;
import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.game.UnlockableContent;
import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Pal;
@ -77,6 +78,6 @@ public class DatabaseDialog extends FloatingDialog{
} }
boolean unlocked(UnlockableContent content){ boolean unlocked(UnlockableContent content){
return !Vars.world.isZone() || content.unlocked(); return (!Vars.world.isZone() && !Vars.state.is(State.menu)) || content.unlocked();
} }
} }

2
core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java
View File

@ -28,7 +28,7 @@ public interface SelectionTrait{
for(Item item : items){ for(Item item : items){
if(!data.isUnlocked(item) && world.isZone()) continue; if(!data.isUnlocked(item) && world.isZone()) continue;
ImageButton button = cont.addImageButton("white", "clear-toggle", 24, () -> {}).group(group).get(); ImageButton button = cont.addImageButton("white", "clear-toggle", 24, () -> control.input(0).frag.config.hideConfig()).group(group).get();
button.changed(() -> consumer.accept(button.isChecked() ? item : null)); button.changed(() -> consumer.accept(button.isChecked() ? item : null));
button.getStyle().imageUp = new TextureRegionDrawable(item.icon(Icon.medium)); button.getStyle().imageUp = new TextureRegionDrawable(item.icon(Icon.medium));
button.update(() -> button.setChecked(holder.get() == item)); button.update(() -> button.setChecked(holder.get() == item));