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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

DYTG_3dore}ty#1~fvYt5RrpnxQ(51Q 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 b{AXYd;>=FCgTe~DWM4fEC_C? 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