From 6381fbc52dd688e6a95f1f6d477a85fbed9186ca Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 20 May 2017 12:56:02 -0400 Subject: [PATCH] Re-made all maps, added block smoke effects --- core/assets/maps/canyon.png | Bin 2086 -> 3802 bytes core/assets/maps/delta.png | Bin 2399 -> 2400 bytes core/assets/maps/maze.png | Bin 1610 -> 2791 bytes core/assets/maps/pit.png | Bin 1579 -> 2502 bytes core/assets/ui/out/icon-defense.png | Bin 198 -> 200 bytes core/assets/ui/uiskin.png | Bin 12006 -> 11990 bytes core/src/io/anuke/mindustry/EffectLoader.java | 7 +++++++ .../io/anuke/mindustry/ai/PassTileGraph.java | 4 ++-- .../anuke/mindustry/entities/TileEntity.java | 7 +++++++ .../io/anuke/mindustry/ui/LevelDialog.java | 2 +- .../io/anuke/mindustry/world/Generator.java | 2 ++ core/src/io/anuke/mindustry/world/Tile.java | 8 ++++++++ 12 files changed, 27 insertions(+), 3 deletions(-) diff --git a/core/assets/maps/canyon.png b/core/assets/maps/canyon.png index b46ec157f154502c4f078bd5079c6366d176a5f1..3b9d43316c1948dd0633fc82a3d70804edc32c8d 100644 GIT binary patch delta 3738 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 delta 1497 zcmXw(dpy&77{}+{VNN-j)saKtv|onE+)k4vL^16&&eRh5bz2jOqhqWHp+m9IMWohc z#+arKnHL#eza6*IY(f%gm`k~2E1e&`&hy9fdY;$wJfH99`_H?1Z7K2!VU>o4y-PgD z%;l=jW~LU~XBT0AT(6>^np3jXF!gOj22K_qN#;WMR?hn{4%ddh(QL=4MMpdiR|Z;~ z7T!XnPKB-$p5K1ULIfKf5_|GdF>YR#!eMQr@SgYmhs&jF5UT%zq@c_V@)k{GCF zhdg;YVD|K!TUHhl+%_`aF~Ses%1q`jLO%o;v9vIyjtG!IInTcz6OhM)d#f@6Wm(>x zqJ;rN5i2ic-hCe>P=nVlc|htcE%45kVr&S3;*rE3TnjD+eV-J;C+JK+fKhpr3^FAY{^M-|W;kv=Z20B%C_N7e%O1s$@RD*VQ zl9oNe|ATYpncinN+$lm*ATOD}Rf-V@K}oQ~5I_%tto_(nl>2w1G7dy}9T|`(V1d^2 zEfIDdlE5qBF;ksgJzY);&Eck?rRa*frDO9)=I}_5F+&-nWCs%ueshYSIy#JUD&l7< z?F$7=$GH0Wa6_l-d@EPmOhJ{R?~#w38`EqC@u!*$TLnY^-kYc~H-5IKyoYx2)}C;B z&=cPJT1_0LHa$|UOrPw1bp0!;x$xJr*M}ETR{ocZP_y(JT!IW+?9<{PkF6E$7=5M0 zYyUmm_nX1CMCRAqdt+8}orr3vjr^qlUwOZy7_ z`rK;oR^^Jv+k98qOg|T-bz8V3;^{2Y258Adwd=uJ&;a31K^8DFq7v+;klxwgVuLxR?}l;~17Q&%u@OORn;+>uO93 za#;Oq#JrsbRof>^Ke9$>=OXW0HM#zk{_I=3rw7y%6b$hy(R=2Oi-~p>J z0wqcdpcU*3BqN~7u@NQ{S2T%sar=bShHP599xw~;0`U$-7Ltp+c%3`N^nJ3|ia_a% z-CdS|4jdSGbM--@gad9{%t&Qfuik9uB@54$*RU*IL9$lygwK(|g%ebdp{+`zKIOEc zo|c^6FC)qxdO=~nN_KV|0wh|6ieUv(EZg+htNfE1kUBHQx_)mH$%vy4^Q6o^EX4ta z%c|C@$_4`p8%EE0{>lVZxq`W6*GYT?%!ed?#e4~j9vSzu+!9Rpq*Ubbxi}<-26KwB ze7KA&Lp}^0HCUM3N?HNgOINtn4c_Pn>#Cwny>&vpqJ?Rpk%n%^A|MTvuen*d>P3)rUme!Q$$q4Nzvvbe4uUEq5j0f&#L|E}_#hm-yTWg^u7 diff --git a/core/assets/ui/out/icon-defense.png b/core/assets/ui/out/icon-defense.png index d879ca6c44674721fc581e22e0b0ff4f5b4dbe31..003074bc564c1c37b47a18927e19ef76e7c4953d 100644 GIT binary patch delta 111 zcmV-#0FeL20muQ6K@1cREGLmLw8sDd0B4a+BUo@Ok-3~fB6B&4*xv(T3``8D;6DyF z0}Gl$hUe2F7_b2*EGGO%V`C`93uvV9-@$MO1_lO3s2C$M8!E@Zh#cVf007zqE}WjO R^}PT9002ovPDHLkV1l0UC~*J) delta 109 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 literal 12006 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 diff --git a/core/src/io/anuke/mindustry/EffectLoader.java b/core/src/io/anuke/mindustry/EffectLoader.java index 55519fe7f6..3317c25dea 100644 --- a/core/src/io/anuke/mindustry/EffectLoader.java +++ b/core/src/io/anuke/mindustry/EffectLoader.java @@ -83,6 +83,13 @@ public class EffectLoader{ Draw.reset(); }); + Effect.create("smoke", 100, e -> { + Draw.color(Color.GRAY, new Color(0.3f, 0.3f, 0.3f, 1f), e.ifract()); + float size = 7f-e.ifract()*7f; + Draw.rect("circle", e.x, e.y, size, size); + Draw.reset(); + }); + Effect.create("spawn", 23, e -> { Draw.thickness(2f); Draw.color(Hue.mix(Color.DARK_GRAY, Color.SCARLET, e.ifract())); diff --git a/core/src/io/anuke/mindustry/ai/PassTileGraph.java b/core/src/io/anuke/mindustry/ai/PassTileGraph.java index 61a998b840..1c675c757d 100644 --- a/core/src/io/anuke/mindustry/ai/PassTileGraph.java +++ b/core/src/io/anuke/mindustry/ai/PassTileGraph.java @@ -15,11 +15,11 @@ public class PassTileGraph implements IndexedGraph{ public Array> getConnections(Tile fromNode){ tempConnections.clear(); - if(fromNode.block().solid && !fromNode.block().update) + if(!fromNode.passable()) return tempConnections; for(Tile tile : fromNode.getNearby()){ - if(tile != null && (!tile.block().solid || tile.block().update)) + if(tile != null && (tile.passable())) tempConnections.add(new TileConnection(fromNode, tile)); } diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java index d898116c10..71a8a56c82 100644 --- a/core/src/io/anuke/mindustry/entities/TileEntity.java +++ b/core/src/io/anuke/mindustry/entities/TileEntity.java @@ -9,6 +9,7 @@ import io.anuke.mindustry.world.blocks.Blocks; import io.anuke.mindustry.world.blocks.ProductionBlocks; import io.anuke.ucore.core.Effects; import io.anuke.ucore.entities.Entity; +import io.anuke.ucore.util.Mathf; public class TileEntity extends Entity{ public Tile tile; @@ -54,6 +55,12 @@ public class TileEntity extends Entity{ @Override public void update(){ + if(health != 0 && !tile.block().name().contains("block") && + Mathf.chance(0.009f*delta*(1f-(float)health/maxhealth))){ + + Effects.effect("smoke", x+Mathf.range(4), y+Mathf.range(4)); + } + tile.block().update(tile); } diff --git a/core/src/io/anuke/mindustry/ui/LevelDialog.java b/core/src/io/anuke/mindustry/ui/LevelDialog.java index e88b7bb6b4..14993c0a88 100644 --- a/core/src/io/anuke/mindustry/ui/LevelDialog.java +++ b/core/src/io/anuke/mindustry/ui/LevelDialog.java @@ -46,7 +46,7 @@ public class LevelDialog extends Dialog{ image.clicked(()->{ selectedMap = index; }); - image.getImageCell().size(150, 150); + image.getImageCell().size(164); content().add(image).size(180); } diff --git a/core/src/io/anuke/mindustry/world/Generator.java b/core/src/io/anuke/mindustry/world/Generator.java index 5f23cf9a24..17d758659e 100644 --- a/core/src/io/anuke/mindustry/world/Generator.java +++ b/core/src/io/anuke/mindustry/world/Generator.java @@ -24,6 +24,7 @@ public class Generator{ Hue.rgb(80, 110, 180), Blocks.water, Hue.rgb(70, 90, 150), Blocks.deepwater, Hue.rgb(110, 80, 30), Blocks.dirt, + Hue.rgb(160, 120, 70), Blocks.dirtblock, Hue.rgb(100, 100, 100), Blocks.stoneblock ); @@ -50,6 +51,7 @@ public class Generator{ core = tiles[x][y]; }else if(color == spawn){ spawnpoints.add(tiles[x][y]); + floor = Blocks.dirt; }else{ if(Mathf.chance(0.02)){ block = Mathf.choose(Blocks.rock, Blocks.rock2); diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index 8a48f8c95b..666377b308 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -64,6 +64,14 @@ public class Tile{ this.floor = type; } + public boolean passable(){ + return !(floor.solid || (block.solid && !block.update)); + } + + public boolean solid(){ + return block.solid || floor.solid; + } + public boolean breakable(){ return block.update || block.breakable; }