From 7c5f3762dd83d0882a51fed0b17751cda373a932 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 9 Jul 2020 16:48:36 -0400 Subject: [PATCH] Bugfixes --- .../main/resources/revisions/Bullet/1.json | 1 - .../main/resources/revisions/Bullet/2.json | 1 - .../resources/revisions/EffectState/1.json | 1 - .../resources/revisions/EffectState/2.json | 1 - core/assets/sprites/noiseAlpha.png | Bin 0 -> 9671 bytes core/src/mindustry/content/Weathers.java | 25 +++++++++++++++--- .../ui/fragments/PlayerListFragment.java | 2 +- gradle.properties | 2 +- 8 files changed, 23 insertions(+), 10 deletions(-) delete mode 100644 annotations/src/main/resources/revisions/Bullet/1.json delete mode 100644 annotations/src/main/resources/revisions/Bullet/2.json delete mode 100644 annotations/src/main/resources/revisions/EffectState/1.json delete mode 100644 annotations/src/main/resources/revisions/EffectState/2.json create mode 100644 core/assets/sprites/noiseAlpha.png diff --git a/annotations/src/main/resources/revisions/Bullet/1.json b/annotations/src/main/resources/revisions/Bullet/1.json deleted file mode 100644 index bdb86498f2..0000000000 --- a/annotations/src/main/resources/revisions/Bullet/1.json +++ /dev/null @@ -1 +0,0 @@ -{version:1,fields:[{name:collided,type:arc.struct.IntSeq,size:-1},{name:damage,type:float,size:4},{name:data,type:java.lang.Object,size:-1},{name:lifetime,type:float,size:4},{name:owner,type:Entityc,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:type,type:mindustry.entities.bullet.BulletType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/Bullet/2.json b/annotations/src/main/resources/revisions/Bullet/2.json deleted file mode 100644 index b28c91f9a7..0000000000 --- a/annotations/src/main/resources/revisions/Bullet/2.json +++ /dev/null @@ -1 +0,0 @@ -{version:2,fields:[{name:collided,type:arc.struct.IntSeq,size:-1},{name:damage,type:float,size:4},{name:data,type:java.lang.Object,size:-1},{name:lifetime,type:float,size:4},{name:owner,type:mindustry.gen.Entityc,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:type,type:mindustry.entities.bullet.BulletType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/EffectState/1.json b/annotations/src/main/resources/revisions/EffectState/1.json deleted file mode 100644 index 530155f361..0000000000 --- a/annotations/src/main/resources/revisions/EffectState/1.json +++ /dev/null @@ -1 +0,0 @@ -{version:1,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/annotations/src/main/resources/revisions/EffectState/2.json b/annotations/src/main/resources/revisions/EffectState/2.json deleted file mode 100644 index a1ea72acf0..0000000000 --- a/annotations/src/main/resources/revisions/EffectState/2.json +++ /dev/null @@ -1 +0,0 @@ -{version:2,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:mindustry.gen.Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/core/assets/sprites/noiseAlpha.png b/core/assets/sprites/noiseAlpha.png new file mode 100644 index 0000000000000000000000000000000000000000..3553bc58917bd35506b510ffa84a916426d984fb GIT binary patch literal 9671 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 JPDHLkV1g_NZm9qO literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/Weathers.java b/core/src/mindustry/content/Weathers.java index beceac902a..9c3a16ea44 100644 --- a/core/src/mindustry/content/Weathers.java +++ b/core/src/mindustry/content/Weathers.java @@ -2,6 +2,7 @@ package mindustry.content; import arc.*; import arc.graphics.*; +import arc.graphics.Texture.*; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; @@ -158,15 +159,22 @@ public class Weathers implements ContentList{ sandstorm = new Weather("sandstorm"){ TextureRegion region; - float yspeed = 0.3f, xspeed = 6f, padding = 110f, size = 110f, invDensity = 800f; + float yspeed = 0.3f, xspeed = 6f, size = 140f, padding = size, invDensity = 1500f; Vec2 force = new Vec2(0.45f, 0.01f); Color color = Color.valueOf("f7cba4"); + Texture noise; @Override public void load(){ - super.load(); - region = Core.atlas.find("circle-shadow"); + noise = new Texture("sprites/noiseAlpha.png"); + noise.setWrap(TextureWrap.repeat); + noise.setFilter(TextureFilter.linear); + } + + @Override + public void dispose(){ + noise.dispose(); } @Override @@ -179,6 +187,16 @@ public class Weathers implements ContentList{ @Override public void drawOver(WeatherState state){ + Draw.tint(color); + + float scale = 1f / 2000f; + float scroll = Time.time() * scale; + Tmp.tr1.setTexture(noise); + Core.camera.bounds(Tmp.r1); + Tmp.tr1.set(Tmp.r1.x*scale, Tmp.r1.y*scale, (Tmp.r1.x + Tmp.r1.width)*scale, (Tmp.r1.y + Tmp.r1.height)*scale); + Tmp.tr1.scroll(-xspeed * scroll, -yspeed * scroll); + Draw.rect(Tmp.tr1, Core.camera.position.x, Core.camera.position.y, Core.camera.width, -Core.camera.height); + rand.setSeed(0); Tmp.r1.setCentered(Core.camera.position.x, Core.camera.position.y, Core.graphics.getWidth() / renderer.minScale(), Core.graphics.getHeight() / renderer.minScale()); Tmp.r1.grow(padding); @@ -206,7 +224,6 @@ public class Weathers implements ContentList{ if(Tmp.r3.setCentered(x, y, size * sscl).overlaps(Tmp.r2)){ Draw.alpha(alpha * baseAlpha); - //Fill.circle(x, y, size * sscl / 2f); Draw.rect(region, x, y, size * sscl, size * sscl); } } diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java index 3fc60a82e2..151b5f51b2 100644 --- a/core/src/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java @@ -98,7 +98,7 @@ public class PlayerListFragment extends Fragment{ } }; table.margin(8); - table.add(new Image(user.icon()).setScaling(Scaling.none)).grow(); + table.add(new Image(user.icon()).setScaling(Scaling.bounded)).grow(); button.add(table).size(h); button.labelWrap("[#" + user.color().toString().toUpperCase() + "]" + user.name()).width(170f).pad(10); diff --git a/gradle.properties b/gradle.properties index 2b8cc9b8fe..17e116dd78 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=dc2078079498cd673f5784ff875a573afb82473d +archash=3249f40f8f3a18846e7b5975dbe3d21c67fda8e4