From 38b3ad07b73c715caaa6f068a659bc7dc86d7a40 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 5 Feb 2019 00:22:55 -0500 Subject: [PATCH] Balancing --- core/assets/maps/craters.mmap | Bin 330748 -> 330961 bytes core/assets/maps/groundZero.mmap | Bin 330762 -> 330975 bytes core/assets/maps/test.mmap | Bin 330745 -> 0 bytes .../io/anuke/mindustry/content/Blocks.java | 2 +- .../src/io/anuke/mindustry/content/Zones.java | 10 +++++----- .../io/anuke/mindustry/core/NetServer.java | 2 +- .../anuke/mindustry/entities/type/Player.java | 6 ++---- .../src/io/anuke/mindustry/net/NetworkIO.java | 2 ++ .../mindustry/ui/dialogs/PausedDialog.java | 2 +- .../world/blocks/storage/CoreBlock.java | 3 ++- 10 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 core/assets/maps/test.mmap diff --git a/core/assets/maps/craters.mmap b/core/assets/maps/craters.mmap index 81b3e3c29f07df8c258518cc3610b3019d2edb48..8d6686f4cf419ad8a4ee912c91d25b724328a882 100644 GIT binary patch literal 330961 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%0Dm*OdwR$0On|vy0!0E;1X zfLUMytQX8e7yvH%z{Fq)4NA+u!Qzk6OgA(#-Dr9l4D}_r)dDV?5Tz7?3l>8vv_NG9 zmoATb0Btd5Vd5>)hcf{2-n3=lDpI&gsp)(aK` z69~QFQV&54g2V-KGuV+3Vzl5HZ9$E$pc@4Fk`5UWT>e3_J*X4_mt0^1Tzr99NF^6Y z34#ljMW{n?!RCRvU=~6Lgaz`}X!$p6tJIN^aYlVPj1n-YTmu(Xh(Zg@0uzuz3#0^% z1upuq5nyd#^T4u5+6G> z!byOYfJ-<83(N)U0E>YMNcjiK$>3fuT|5J_jTnnSo+d^evF44c8!fL!%c~)oqd-Lg zTFC`2zR(D;5^TjBSRGgb%mNdTq7P&;xab2DLo#qi%eB#RZM0k){#h4PRDnw_Yy`OI z!zqC%`oQXtiawB`;Gz#q4F5nJEi6Y1%hAGeNak~JQH4t2EbtH#-~tc91+$RKKTvrv zTJ#O0`7%(14$0&_>hRH;iD1oyRC2*fLU56WAg~p92w5--VhSk1fr~ycF`8#a3qeqd z7)=MG>0t1t18`9VDZb$4AAT;lz(XS-rht42W{oEK(IgK_45R5_G#w1`bO0`|&CE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@ zCE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{p zmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)X zS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJNjO>( zj+TU@CE;jEI9d{pmV~1v;b=)XS`vJHW)1lM@z!dl5n&n W94!e)OTy8TaI_>GEeQv>Bm@AI`{{-N literal 330748 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 B5&HlD diff --git a/core/assets/maps/groundZero.mmap b/core/assets/maps/groundZero.mmap index 4edf31be3e15f339d77fe56e28bfa397084e00f2..94c691a8f26477adfbf86c493fef770811a3907c 100644 GIT binary patch literal 330975 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 literal 330762 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 SOTy8TaI_>GEeQv6NeBR0AlLo? diff --git a/core/assets/maps/test.mmap b/core/assets/maps/test.mmap deleted file mode 100644 index 486ceae3f9343dd5aa59a707db4261abadd3cfbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330745 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 zBpfXXM@z!dl5n&n94!e)OTy8TaI_>GEeS_U!qJj&v?LrY2}eu9(UNeqBpfXXM@z!d zl5n&n94!e)OTy8TaI_>GEeS_U!qJj&v?LrY2}eu9(UNeqBpfXXM@z!dl5n&n94!e) zOTy8TaI_>GEeS_U!qJj&v?LrY2}eu9(UNeqBpfXXM@z!dl5n&n94!e)OTy8TaI_>G zEeS_U!qJj&v?LrY2}eu9(UNeqBpfXXM@z!dl5n&n94!e)OTy8TaI_>GEeS_U!qJj& zv?LrY2}eu9(UNeqBpfXXM@z!dl5n&n94!e)OTy8TaI_>GEeS_U!qJj&v?LrY2}eu9 z(UNeqBpfXXM@z!dl5n&n94!e)OTy8TaI_>GEeS_U!qJj&v?LrY2}eu9(UNeqBpfXX zM@z!dl5n&n94!e)v%zRdI9d{pmV~1v;b=)XS`vJNjO>( zj+TU@CE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jE zI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v z;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJ zNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJNjO>(j%I_= zl5n&n94!e)OTy8TaI_>GEeS_U!qJj&v?LrY2}eu9(UNeqBpfXXM@z!dl5n&n94!e) zOTy8TaI_>GEeS_U!qJj&v?LrY2}eu9(UNeqBpfXXM@z!dl5n&n94!e)OTy8TaI_>G zEeS_U!qJj&v?LrY2}eu9(UNeqBpfXXM@z!dl5n&n94!e)OTy8TaI_>GEeS_U!qJj& zv?LrY2}eu9(UNeqBpfXXM@z!dl5n&n94!e)OTy8TaI_>GEeS_U!qJj&v?LrY2}eu9 z(UNeqBpfXXM@z!dl5n&n94!e)OTy8TaI_>GEeS_U!qJj&v?LrY2}eu9(UNeqBpfXX zM@z!dl5n&n94!e)OTy8TaI_>GEeS_U!qJj&v?LrY2}eu9(UNeqBpfXXM@z!dl5n&n z94!e)OTy8TaI_>GEeS_U!qJj&v?LrY2}eu9(UNeqBpl5Kqb1>JNjO>(j+TU@CE;jE zI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v z;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJ zNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@ zCE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{p zmV~1v;b=)XS`v new Rules(){{ waves = true; @@ -63,14 +63,14 @@ public class Zones implements ContentList{ craters = new Zone("craters", new MapGenerator("craters", 1).dist(0)){{ deployCost = ItemStack.with(Items.copper, 200); startingItems = ItemStack.with(Items.copper, 200); - conditionWave = 15; + conditionWave = 10; itemRequirements = ItemStack.with(Items.copper, 2000); zoneRequirements = new Zone[]{groundZero}; blockRequirements = new Block[]{Blocks.router}; rules = () -> new Rules(){{ waves = true; waveTimer = true; - waveSpacing = 60 * 60; + waveSpacing = 60 * 60 * 1.5f; spawns = Array.with( new SpawnGroup(UnitTypes.dagger){{ unitScaling = 2; @@ -112,13 +112,13 @@ public class Zones implements ContentList{ .decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.02))){{ deployCost = ItemStack.with(Items.copper, 500); startingItems = ItemStack.with(Items.copper, 400); - conditionWave = 15; + conditionWave = 10; zoneRequirements = new Zone[]{craters}; itemRequirements = ItemStack.with(Items.copper, 4000, Items.lead, 2000); rules = () -> new Rules(){{ waves = true; waveTimer = true; - waveSpacing = 60 * 60; + waveSpacing = 60 * 60 * 1.5f; spawns = Array.with( new SpawnGroup(UnitTypes.titan){{ unitScaling = 3; diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index a938df21a3..1128efc470 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -329,7 +329,7 @@ public class NetServer implements ApplicationListener{ player.y = prevy; //set interpolator target to *new* position so it moves toward it - player.getInterpolator().read(player.x, player.y, newx, newy, sent, rotation, baseRotation); + player.getInterpolator().read(player.x, player.y, newx, newy, rotation, baseRotation); player.velocity().set(xVelocity, yVelocity); //only for visual calculation purposes, doesn't actually update the player connection.lastRecievedClientSnapshot = snapshotID; diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index 69181c989a..df332cd260 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -11,10 +11,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.math.geom.Vector2; -import io.anuke.arc.util.Align; -import io.anuke.arc.util.Interval; -import io.anuke.arc.util.Pack; -import io.anuke.arc.util.Time; +import io.anuke.arc.util.*; import io.anuke.arc.util.pooling.Pools; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.content.Mechs; @@ -410,6 +407,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ Draw.reset(); Pools.free(layout); font.getData().setScale(1f); + font.setColor(Color.WHITE); font.setUseIntegerPositions(ints); } diff --git a/core/src/io/anuke/mindustry/net/NetworkIO.java b/core/src/io/anuke/mindustry/net/NetworkIO.java index 5d1312db55..04375e7a15 100644 --- a/core/src/io/anuke/mindustry/net/NetworkIO.java +++ b/core/src/io/anuke/mindustry/net/NetworkIO.java @@ -44,6 +44,7 @@ public class NetworkIO{ stream.writeInt(player.id); player.write(stream); + world.spawner.write(stream); SaveIO.getSaveWriter().writeMap(stream); stream.write(Team.all.length); @@ -105,6 +106,7 @@ public class NetworkIO{ world.beginMapLoad(); //map + world.spawner.read(stream); SaveIO.getSaveWriter().readMap(stream); world.setMap(new Map(map, 0, 0)); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java index b84c0e8e6d..dbbbebe360 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java @@ -40,7 +40,7 @@ public class PausedDialog extends FloatingDialog{ cont.addButton("$back", this::hide).colspan(2).width(dw*2 + 20f); cont.row(); - cont.addButton("$database", ui.database::show); + cont.addButton("techtree", ui.tech::show); cont.addButton("$settings", ui.settings::show); if(!world.isZone()){ diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index 06e538783f..47579f1de3 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -20,6 +20,7 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.Item; +import io.anuke.mindustry.type.ItemType; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockFlag; @@ -58,7 +59,7 @@ public class CoreBlock extends StorageBlock{ @Override public int getMaximumAccepted(Tile tile, Item item){ - return itemCapacity * state.teams.get(tile.getTeam()).cores.size; + return item.type == ItemType.material ? itemCapacity * state.teams.get(tile.getTeam()).cores.size : 0; } @Override