From afed54b2173bf72a61444761b6a2e8a453696eab Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 18 May 2018 09:22:40 -0700 Subject: [PATCH] Fixed a few bugs with new placement system --- .../build/libs/annotations-release.jar | Bin 8886 -> 8886 bytes core/assets/.gifimages/frame0.png | Bin 0 -> 4279 bytes core/assets/.gifimages/frame1.png | Bin 0 -> 4279 bytes core/assets/.gifimages/frame2.png | Bin 0 -> 4279 bytes core/assets/.gifimages/frame3.png | Bin 0 -> 4279 bytes core/assets/.gifimages/frame4.png | Bin 0 -> 4279 bytes core/assets/.gifimages/frame5.png | Bin 0 -> 4279 bytes core/assets/.gifimages/frame6.png | Bin 0 -> 4279 bytes core/assets/.gifimages/frame7.png | Bin 0 -> 4279 bytes .../io/anuke/mindustry/entities/Player.java | 18 ++++++++---------- .../io/anuke/mindustry/world/Placement.java | 9 +++++++-- .../world/blocks/types/BuildBlock.java | 2 ++ 12 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 core/assets/.gifimages/frame0.png create mode 100644 core/assets/.gifimages/frame1.png create mode 100644 core/assets/.gifimages/frame2.png create mode 100644 core/assets/.gifimages/frame3.png create mode 100644 core/assets/.gifimages/frame4.png create mode 100644 core/assets/.gifimages/frame5.png create mode 100644 core/assets/.gifimages/frame6.png create mode 100644 core/assets/.gifimages/frame7.png diff --git a/annotations/build/libs/annotations-release.jar b/annotations/build/libs/annotations-release.jar index 32144bcc26fee65da44f99123c7852830be94cf2..a369a0cff648b703da262b8fab028c9607f27dfc 100644 GIT binary patch delta 441 zcmdnyy3Lh0z?+$ci-CcIgTdKh(?ni1W)NlOr3R#Y7=VBYL;wLZ5NGD=Gc%xSSO(E> z-Uy^`GYg|S6PTgLtS=5`BuE7^f*D(+Lm>Z2(^ak?l_Ap{68{GXh!pe7IU zoNd!?-aCv845~n%8Nd_(>1~bQCl@M6On#uqH93x%bMk!!5m}J>fBtoMpNTOraGEnP z=pn10ETCu)R#DKoOq&a6;$0xtK~a&TXbbk$8bwK#ZH>#NC+ABkPky5)0oKNU_mK|= eP|IE*RzuOIsALY-7Oe!*<}C-*CO)}eNgV+7EoQj@ delta 441 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 F{|8Ej!2AFJ literal 0 HcmV?d00001 diff --git a/core/assets/.gifimages/frame1.png b/core/assets/.gifimages/frame1.png new file mode 100644 index 0000000000000000000000000000000000000000..982a3c348f00ef614492a6090663559707410860 GIT binary patch literal 4279 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 F{|8Ej!2AFJ literal 0 HcmV?d00001 diff --git a/core/assets/.gifimages/frame2.png b/core/assets/.gifimages/frame2.png new file mode 100644 index 0000000000000000000000000000000000000000..982a3c348f00ef614492a6090663559707410860 GIT binary patch literal 4279 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 F{|8Ej!2AFJ literal 0 HcmV?d00001 diff --git a/core/assets/.gifimages/frame3.png b/core/assets/.gifimages/frame3.png new file mode 100644 index 0000000000000000000000000000000000000000..982a3c348f00ef614492a6090663559707410860 GIT binary patch literal 4279 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 F{|8Ej!2AFJ literal 0 HcmV?d00001 diff --git a/core/assets/.gifimages/frame4.png b/core/assets/.gifimages/frame4.png new file mode 100644 index 0000000000000000000000000000000000000000..982a3c348f00ef614492a6090663559707410860 GIT binary patch literal 4279 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 F{|8Ej!2AFJ literal 0 HcmV?d00001 diff --git a/core/assets/.gifimages/frame5.png b/core/assets/.gifimages/frame5.png new file mode 100644 index 0000000000000000000000000000000000000000..982a3c348f00ef614492a6090663559707410860 GIT binary patch literal 4279 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 F{|8Ej!2AFJ literal 0 HcmV?d00001 diff --git a/core/assets/.gifimages/frame6.png b/core/assets/.gifimages/frame6.png new file mode 100644 index 0000000000000000000000000000000000000000..982a3c348f00ef614492a6090663559707410860 GIT binary patch literal 4279 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 F{|8Ej!2AFJ literal 0 HcmV?d00001 diff --git a/core/assets/.gifimages/frame7.png b/core/assets/.gifimages/frame7.png new file mode 100644 index 0000000000000000000000000000000000000000..982a3c348f00ef614492a6090663559707410860 GIT binary patch literal 4279 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 F{|8Ej!2AFJ literal 0 HcmV?d00001 diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 4361710df9..1c423c2234 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -42,7 +42,6 @@ public class Player extends Unit implements BlockPlacer{ static final float dashSpeed = 1.8f; public static final float placeDistance = 80f; - static final int timerDash = 0; static final int timerRegen = 3; static final Translator[] tmptr = {new Translator(), new Translator(), new Translator(), new Translator()}; @@ -229,7 +228,7 @@ public class Player extends Unit implements BlockPlacer{ @Override public void drawOver(){ if(!isShooting() && currentPlace != null) { - Draw.color("accent"); + Draw.color(distanceTo(currentPlace) > placeDistance ? "placeInvalid" : "accent"); float focusLen = 3.8f + Mathf.absin(Timers.time(), 1.1f, 0.6f); float px = x + Angles.trnsx(rotation, focusLen); float py = y + Angles.trnsy(rotation, focusLen); @@ -320,10 +319,6 @@ public class Player extends Unit implements BlockPlacer{ return placeQueue; } - private boolean invalidPlaceBlock(Tile check){ - return (!(check.block() instanceof BuildBlock) || distanceTo(check) > placeDistance); - } - protected void updateMech(){ Tile tile = world.tileWorld(x, y); @@ -334,21 +329,24 @@ public class Player extends Unit implements BlockPlacer{ } if(!isShooting()) { + //update placing queue if(currentPlace != null) { Tile check = currentPlace; - if (invalidPlaceBlock(currentPlace)) { + if (!(check.block() instanceof BuildBlock)) { currentPlace = null; - }else { + }else if(distanceTo(check) <= placeDistance){ BuildEntity entity = check.entity(); entity.progress += 1f / entity.result.health; rotation = Mathf.slerpDelta(rotation, angleTo(entity), 0.4f); } }else if(placeQueue.size > 0){ - PlaceRequest check = placeQueue.removeLast(); - if(Placement.validPlace(team, check.x, check.y, check.recipe.result, check.rotation)){ + PlaceRequest check = placeQueue.last(); + if(distanceTo(world.tile(check.x, check.y)) <= placeDistance && + Placement.validPlace(team, check.x, check.y, check.recipe.result, check.rotation)){ + placeQueue.removeLast(); Placement.placeBlock(team, check.x, check.y, check.recipe, check.rotation, true, true); currentPlace = world.tile(check.x, check.y); } diff --git a/core/src/io/anuke/mindustry/world/Placement.java b/core/src/io/anuke/mindustry/world/Placement.java index 5b88e3a533..1d909817c0 100644 --- a/core/src/io/anuke/mindustry/world/Placement.java +++ b/core/src/io/anuke/mindustry/world/Placement.java @@ -67,6 +67,7 @@ public class Placement { tile.setBlock(sub, rotation); tile.entity().result = result; + tile.entity().stacks = recipe.requirements; tile.setTeam(team); if(result.isMultiblock()){ @@ -88,9 +89,13 @@ public class Placement { if(effects) Effects.effect(Fx.none, worldx * tilesize, worldy * tilesize); } } - }else if(effects) Effects.effect(Fx.none, x * tilesize, y * tilesize); + }else if(effects){ + Effects.effect(Fx.none, x * tilesize, y * tilesize); + } - if(effects && sound) threads.run(() -> Effects.sound("place", x * tilesize, y * tilesize)); + if(effects && sound){ + threads.run(() -> Effects.sound("place", x * tilesize, y * tilesize)); + } } public static boolean validPlace(Team team, int x, int y, Block type, int rotation){ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/types/BuildBlock.java index 4ae9783fb0..124aac1975 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/BuildBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/BuildBlock.java @@ -9,6 +9,7 @@ import io.anuke.mindustry.entities.effect.Rubble; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.graphics.Layer; import io.anuke.mindustry.graphics.Shaders; +import io.anuke.mindustry.resource.ItemStack; import io.anuke.mindustry.resource.Recipe; import io.anuke.mindustry.world.BarType; import io.anuke.mindustry.world.Block; @@ -96,5 +97,6 @@ public class BuildBlock extends Block { public Block result; public Recipe recipe; public float progress = 0.05f; + public ItemStack[] stacks; } }