Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mud

Browse Source
This commit is contained in:
Anuken
2020-09-18 00:13:08 -04:00
parent 4c241f9867
commit c71be9ae32
17 changed files with 256 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/environment/mud1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
core/assets-raw/sprites/blocks/environment/mud2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
core/assets-raw/sprites/blocks/environment/mud3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

1
core/assets/bundles/bundle.properties
View File

@@ -979,6 +979,7 @@ block.dune-wall.name = Dune Wall
block.pine.name = Pine block.pine.name = Pine
block.dirt.name = Dirt block.dirt.name = Dirt
block.dirt-wall.name = Dirt Wall block.dirt-wall.name = Dirt Wall
block.mud.name = Mud
block.white-tree-dead.name = White Tree Dead block.white-tree-dead.name = White Tree Dead
block.white-tree.name = White Tree block.white-tree.name = White Tree
block.spore-cluster.name = Spore Cluster block.spore-cluster.name = Spore Cluster

1
core/assets/contributors
View File

@@ -90,3 +90,4 @@ DeltaNedas
GioIacca9 GioIacca9
SnakkiZXZ SnakkiZXZ
sk7725 sk7725
ThePlayerA

29
core/assets/shaders/mud.frag Normal file
View File

@@ -0,0 +1,29 @@
#define HIGHP
#define NSCALE 180.0 / 2.0
uniform sampler2D u_texture;
uniform sampler2D u_noise;
uniform vec2 u_campos;
uniform vec2 u_resolution;
uniform float u_time;
varying vec2 v_texCoords;
void main(){
vec2 c = v_texCoords.xy;
vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y);
float btime = u_time / 8000000.0;
float noise = sin((texture2D(u_noise, (coords) / NSCALE + vec2(btime) * vec2(-0.9, 0.8)).r + texture2D(u_noise, (coords) / NSCALE + vec2(abs(sin(btime)) * 1.1) * vec2(-0.8, -1.0)).r) / 2.0);
vec4 color = texture2D(u_texture, c);
if(noise > 0.54 && noise < 0.68){
color.rgb *= 1.4;
}else if(!(noise > 0.40 && noise < 0.54)){
color.rgb *= 1.2;
}
gl_FragColor = color;
}

165
core/assets/sprites/fallback/sprites.atlas
View File

@@ -7784,153 +7784,174 @@ moss3
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-coal1 mud1
rotate: false rotate: false
xy: 1073, 309 xy: 1073, 309
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-coal2 mud2
rotate: false rotate: false
xy: 1039, 275 xy: 1039, 275
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-coal3 mud3
rotate: false rotate: false
xy: 1073, 275 xy: 1073, 275
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-copper1 ore-coal1
rotate: false rotate: false
xy: 821, 225 xy: 821, 225
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-copper2 ore-coal2
rotate: false rotate: false
xy: 855, 225 xy: 855, 225
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-copper3 ore-coal3
rotate: false rotate: false
xy: 889, 225 xy: 889, 225
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-lead1 ore-copper1
rotate: false rotate: false
xy: 923, 225 xy: 923, 225
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-lead2 ore-copper2
rotate: false rotate: false
xy: 957, 225 xy: 957, 225
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-lead3 ore-copper3
rotate: false rotate: false
xy: 991, 225 xy: 991, 225
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-scrap1 ore-lead1
rotate: false rotate: false
xy: 787, 209 xy: 787, 209
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-scrap2 ore-lead2
rotate: false rotate: false
xy: 1025, 241 xy: 1025, 241
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-scrap3 ore-lead3
rotate: false rotate: false
xy: 1059, 241 xy: 1059, 241
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-thorium1 ore-scrap1
rotate: false rotate: false
xy: 821, 191 xy: 821, 191
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-thorium2 ore-scrap2
rotate: false rotate: false
xy: 855, 191 xy: 855, 191
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-thorium3 ore-scrap3
rotate: false rotate: false
xy: 889, 191 xy: 889, 191
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-titanium1 ore-thorium1
rotate: false rotate: false
xy: 923, 191 xy: 923, 191
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-titanium2 ore-thorium2
rotate: false rotate: false
xy: 957, 191 xy: 957, 191
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-titanium3 ore-thorium3
rotate: false rotate: false
xy: 991, 191 xy: 991, 191
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pebbles1 ore-titanium1
rotate: false rotate: false
xy: 1025, 207 xy: 1025, 207
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pebbles2 ore-titanium2
rotate: false rotate: false
xy: 1059, 207 xy: 1059, 207
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pebbles3 ore-titanium3
rotate: false rotate: false
xy: 1025, 173 xy: 1025, 173
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pebbles1
rotate: false
xy: 1059, 173
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
pebbles2
rotate: false
xy: 1093, 241
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
pebbles3
rotate: false
xy: 1093, 207
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
pine pine
rotate: false rotate: false
xy: 785, 311 xy: 785, 311
@@ -7940,7 +7961,7 @@ pine
index: -1 index: -1
salt salt
rotate: false rotate: false
xy: 1059, 173 xy: 1093, 173
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -7961,14 +7982,14 @@ salt-wall-large
index: -1 index: -1
salt-wall1 salt-wall1
rotate: false rotate: false
xy: 1093, 241 xy: 1107, 309
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
salt-wall2 salt-wall2
rotate: false rotate: false
xy: 1093, 207 xy: 1107, 275
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -7989,21 +8010,21 @@ sand-wall-large
index: -1 index: -1
sand-wall1 sand-wall1
rotate: false rotate: false
xy: 1127, 241 xy: 591, 99
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand-wall2 sand-wall2
rotate: false rotate: false
xy: 1127, 207 xy: 591, 65
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand-water sand-water
rotate: false rotate: false
xy: 1127, 173 xy: 625, 97
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8017,63 +8038,63 @@ sand-water-edge
index: -1 index: -1
sand-water1 sand-water1
rotate: false rotate: false
xy: 591, 99 xy: 625, 63
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand-water2 sand-water2
rotate: false rotate: false
xy: 591, 65 xy: 659, 97
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand-water3 sand-water3
rotate: false rotate: false
xy: 625, 97 xy: 659, 63
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand1 sand1
rotate: false rotate: false
xy: 1093, 173 xy: 1127, 241
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand2 sand2
rotate: false rotate: false
xy: 1107, 309 xy: 1127, 207
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand3 sand3
rotate: false rotate: false
xy: 1107, 275 xy: 1127, 173
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
scrap1 scrap1
rotate: false rotate: false
xy: 625, 63 xy: 689, 197
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
scrap2 scrap2
rotate: false rotate: false
xy: 659, 97 xy: 689, 163
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
scrap3 scrap3
rotate: false rotate: false
xy: 659, 63 xy: 723, 195
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8094,35 +8115,35 @@ shale-wall-large
index: -1 index: -1
shale-wall1 shale-wall1
rotate: false rotate: false
xy: 723, 161 xy: 791, 157
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shale-wall2 shale-wall2
rotate: false rotate: false
xy: 757, 175 xy: 825, 157
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shale1 shale1
rotate: false rotate: false
xy: 689, 197 xy: 723, 161
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shale2 shale2
rotate: false rotate: false
xy: 689, 163 xy: 757, 175
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shale3 shale3
rotate: false rotate: false
xy: 723, 195 xy: 757, 141
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8136,21 +8157,21 @@ shrubs-large
index: -1 index: -1
shrubs1 shrubs1
rotate: false rotate: false
xy: 757, 141 xy: 859, 157
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shrubs2 shrubs2
rotate: false rotate: false
xy: 791, 157 xy: 893, 157
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
slag slag
rotate: false rotate: false
xy: 825, 157 xy: 927, 157
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8185,42 +8206,42 @@ snow-wall-large
index: -1 index: -1
snow-wall1 snow-wall1
rotate: false rotate: false
xy: 961, 157 xy: 859, 123
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
snow-wall2 snow-wall2
rotate: false rotate: false
xy: 791, 123 xy: 893, 123
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
snow1 snow1
rotate: false rotate: false
xy: 859, 157 xy: 961, 157
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
snow2 snow2
rotate: false rotate: false
xy: 893, 157 xy: 791, 123
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
snow3 snow3
rotate: false rotate: false
xy: 927, 157 xy: 825, 123
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
spawn spawn
rotate: false rotate: false
xy: 825, 123 xy: 927, 123
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8234,21 +8255,21 @@ spore-moss-edge
index: -1 index: -1
spore-moss1 spore-moss1
rotate: false rotate: false
xy: 859, 123 xy: 961, 123
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
spore-moss2 spore-moss2
rotate: false rotate: false
xy: 893, 123 xy: 995, 139
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
spore-moss3 spore-moss3
rotate: false rotate: false
xy: 927, 123 xy: 1029, 139
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8269,14 +8290,14 @@ spore-wall-large
index: -1 index: -1
spore-wall1 spore-wall1
rotate: false rotate: false
xy: 961, 123 xy: 1063, 139
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
spore-wall2 spore-wall2
rotate: false rotate: false
xy: 995, 139 xy: 1097, 139
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8297,42 +8318,42 @@ stone-wall-large
index: -1 index: -1
stone-wall1 stone-wall1
rotate: false rotate: false
xy: 1131, 139 xy: 1063, 105
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
stone-wall2 stone-wall2
rotate: false rotate: false
xy: 995, 105 xy: 1097, 105
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
stone1 stone1
rotate: false rotate: false
xy: 1029, 139 xy: 1131, 139
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
stone2 stone2
rotate: false rotate: false
xy: 1063, 139 xy: 995, 105
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
stone3 stone3
rotate: false rotate: false
xy: 1097, 139 xy: 1029, 105
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
tainted-water tainted-water
rotate: false rotate: false
xy: 1029, 105 xy: 1131, 105
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8346,7 +8367,7 @@ tainted-water-edge
index: -1 index: -1
tar tar
rotate: false rotate: false
xy: 1063, 105 xy: 1133, 391
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8360,70 +8381,70 @@ tar-edge
index: -1 index: -1
tendrils1 tendrils1
rotate: false rotate: false
xy: 1097, 105 xy: 1167, 391
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
tendrils2 tendrils2
rotate: false rotate: false
xy: 1131, 105 xy: 1201, 391
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
tendrils3 tendrils3
rotate: false rotate: false
xy: 1133, 391 xy: 1235, 391
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
thorium1 thorium1
rotate: false rotate: false
xy: 1167, 391 xy: 1269, 391
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
thorium2 thorium2
rotate: false rotate: false
xy: 1201, 391 xy: 1303, 391
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
thorium3 thorium3
rotate: false rotate: false
xy: 1235, 391 xy: 1337, 391
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
titanium1 titanium1
rotate: false rotate: false
xy: 1269, 391 xy: 1371, 391
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
titanium2 titanium2
rotate: false rotate: false
xy: 1303, 391 xy: 1405, 391
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
titanium3 titanium3
rotate: false rotate: false
xy: 1337, 391 xy: 1439, 391
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
water water
rotate: false rotate: false
xy: 1371, 391 xy: 1473, 391
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0

BIN
core/assets/sprites/fallback/sprites4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 185 KiB

After

Width:  |  Height:  |  Size: 184 KiB

BIN
core/assets/sprites/fallback/sprites5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 317 KiB

After

Width:  |  Height:  |  Size: 317 KiB

165
core/assets/sprites/sprites.atlas
View File

@@ -7772,153 +7772,174 @@ moss3
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-coal1 mud1
rotate: false rotate: false
xy: 3303, 213 xy: 3303, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-coal2 mud2
rotate: false rotate: false
xy: 1275, 17 xy: 1275, 17
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-coal3 mud3
rotate: false rotate: false
xy: 3337, 213 xy: 3337, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-copper1 ore-coal1
rotate: false rotate: false
xy: 1309, 17 xy: 1309, 17
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-copper2 ore-coal2
rotate: false rotate: false
xy: 3371, 213 xy: 3371, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-copper3 ore-coal3
rotate: false rotate: false
xy: 1343, 17 xy: 1343, 17
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-lead1 ore-copper1
rotate: false rotate: false
xy: 3405, 213 xy: 3405, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-lead2 ore-copper2
rotate: false rotate: false
xy: 1377, 17 xy: 1377, 17
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-lead3 ore-copper3
rotate: false rotate: false
xy: 3439, 213 xy: 3439, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-scrap1 ore-lead1
rotate: false rotate: false
xy: 1411, 17 xy: 1411, 17
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-scrap2 ore-lead2
rotate: false rotate: false
xy: 3473, 213 xy: 3473, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-scrap3 ore-lead3
rotate: false rotate: false
xy: 1445, 17 xy: 1445, 17
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-thorium1 ore-scrap1
rotate: false rotate: false
xy: 3507, 213 xy: 3507, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-thorium2 ore-scrap2
rotate: false rotate: false
xy: 1479, 17 xy: 1479, 17
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-thorium3 ore-scrap3
rotate: false rotate: false
xy: 3541, 213 xy: 3541, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-titanium1 ore-thorium1
rotate: false rotate: false
xy: 1513, 17 xy: 1513, 17
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-titanium2 ore-thorium2
rotate: false rotate: false
xy: 3575, 213 xy: 3575, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
ore-titanium3 ore-thorium3
rotate: false rotate: false
xy: 1547, 17 xy: 1547, 17
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pebbles1 ore-titanium1
rotate: false rotate: false
xy: 3609, 213 xy: 3609, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pebbles2 ore-titanium2
rotate: false rotate: false
xy: 1581, 17 xy: 1581, 17
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pebbles3 ore-titanium3
rotate: false rotate: false
xy: 3643, 213 xy: 3643, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
pebbles1
rotate: false
xy: 1615, 17
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
pebbles2
rotate: false
xy: 3677, 213
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
pebbles3
rotate: false
xy: 3711, 213
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
pine pine
rotate: false rotate: false
xy: 1, 1 xy: 1, 1
@@ -7928,7 +7949,7 @@ pine
index: -1 index: -1
salt salt
rotate: false rotate: false
xy: 1615, 17 xy: 3745, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -7949,14 +7970,14 @@ salt-wall-large
index: -1 index: -1
salt-wall1 salt-wall1
rotate: false rotate: false
xy: 3677, 213 xy: 3779, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
salt-wall2 salt-wall2
rotate: false rotate: false
xy: 3711, 213 xy: 3813, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -7977,21 +7998,21 @@ sand-wall-large
index: -1 index: -1
sand-wall1 sand-wall1
rotate: false rotate: false
xy: 3847, 213 xy: 3949, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand-wall2 sand-wall2
rotate: false rotate: false
xy: 3881, 213 xy: 3983, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand-water sand-water
rotate: false rotate: false
xy: 3915, 213 xy: 4017, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8005,63 +8026,63 @@ sand-water-edge
index: -1 index: -1
sand-water1 sand-water1
rotate: false rotate: false
xy: 3949, 213 xy: 4051, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand-water2 sand-water2
rotate: false rotate: false
xy: 3983, 213 xy: 1649, 17
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand-water3 sand-water3
rotate: false rotate: false
xy: 4017, 213 xy: 1683, 31
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand1 sand1
rotate: false rotate: false
xy: 3745, 213 xy: 3847, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand2 sand2
rotate: false rotate: false
xy: 3779, 213 xy: 3881, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
sand3 sand3
rotate: false rotate: false
xy: 3813, 213 xy: 3915, 213
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
scrap1 scrap1
rotate: false rotate: false
xy: 4051, 213 xy: 1717, 47
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
scrap2 scrap2
rotate: false rotate: false
xy: 1649, 17 xy: 1751, 47
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
scrap3 scrap3
rotate: false rotate: false
xy: 1683, 31 xy: 1785, 47
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8082,35 +8103,35 @@ shale-wall-large
index: -1 index: -1
shale-wall1 shale-wall1
rotate: false rotate: false
xy: 1819, 47 xy: 1921, 47
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shale-wall2 shale-wall2
rotate: false rotate: false
xy: 1853, 47 xy: 1955, 47
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shale1 shale1
rotate: false rotate: false
xy: 1717, 47 xy: 1819, 47
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shale2 shale2
rotate: false rotate: false
xy: 1751, 47 xy: 1853, 47
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shale3 shale3
rotate: false rotate: false
xy: 1785, 47 xy: 1887, 47
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8124,21 +8145,21 @@ shrubs-large
index: -1 index: -1
shrubs1 shrubs1
rotate: false rotate: false
xy: 1887, 47 xy: 1989, 47
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
shrubs2 shrubs2
rotate: false rotate: false
xy: 1921, 47 xy: 2023, 47
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
slag slag
rotate: false rotate: false
xy: 1955, 47 xy: 2097, 163
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8173,42 +8194,42 @@ snow-wall-large
index: -1 index: -1
snow-wall1 snow-wall1
rotate: false rotate: false
xy: 2097, 129 xy: 2165, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
snow-wall2 snow-wall2
rotate: false rotate: false
xy: 2131, 179 xy: 2165, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
snow1 snow1
rotate: false rotate: false
xy: 1989, 47 xy: 2097, 129
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
snow2 snow2
rotate: false rotate: false
xy: 2023, 47 xy: 2131, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
snow3 snow3
rotate: false rotate: false
xy: 2097, 163 xy: 2131, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
spawn spawn
rotate: false rotate: false
xy: 2131, 145 xy: 2199, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8222,21 +8243,21 @@ spore-moss-edge
index: -1 index: -1
spore-moss1 spore-moss1
rotate: false rotate: false
xy: 2165, 179 xy: 2199, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
spore-moss2 spore-moss2
rotate: false rotate: false
xy: 2165, 145 xy: 2233, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
spore-moss3 spore-moss3
rotate: false rotate: false
xy: 2199, 179 xy: 2233, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8257,14 +8278,14 @@ spore-wall-large
index: -1 index: -1
spore-wall1 spore-wall1
rotate: false rotate: false
xy: 2199, 145 xy: 2267, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
spore-wall2 spore-wall2
rotate: false rotate: false
xy: 2233, 179 xy: 2267, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8285,42 +8306,42 @@ stone-wall-large
index: -1 index: -1
stone-wall1 stone-wall1
rotate: false rotate: false
xy: 2301, 179 xy: 2335, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
stone-wall2 stone-wall2
rotate: false rotate: false
xy: 2301, 145 xy: 2369, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
stone1 stone1
rotate: false rotate: false
xy: 2233, 145 xy: 2301, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
stone2 stone2
rotate: false rotate: false
xy: 2267, 179 xy: 2301, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
stone3 stone3
rotate: false rotate: false
xy: 2267, 145 xy: 2335, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
tainted-water tainted-water
rotate: false rotate: false
xy: 2335, 179 xy: 2369, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8334,7 +8355,7 @@ tainted-water-edge
index: -1 index: -1
tar tar
rotate: false rotate: false
xy: 2335, 145 xy: 2403, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
@@ -8348,70 +8369,70 @@ tar-edge
index: -1 index: -1
tendrils1 tendrils1
rotate: false rotate: false
xy: 2369, 179 xy: 2403, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
tendrils2 tendrils2
rotate: false rotate: false
xy: 2369, 145 xy: 2437, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
tendrils3 tendrils3
rotate: false rotate: false
xy: 2403, 179 xy: 2437, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
thorium1 thorium1
rotate: false rotate: false
xy: 2403, 145 xy: 2471, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
thorium2 thorium2
rotate: false rotate: false
xy: 2437, 179 xy: 2471, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
thorium3 thorium3
rotate: false rotate: false
xy: 2437, 145 xy: 2505, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
titanium1 titanium1
rotate: false rotate: false
xy: 2471, 179 xy: 2505, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
titanium2 titanium2
rotate: false rotate: false
xy: 2471, 145 xy: 2539, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
titanium3 titanium3
rotate: false rotate: false
xy: 2505, 179 xy: 2539, 145
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
water water
rotate: false rotate: false
xy: 2505, 145 xy: 2573, 179
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0

BIN
core/assets/sprites/sprites2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 185 KiB

BIN
core/assets/sprites/sprites3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 314 KiB

After

Width:  |  Height:  |  Size: 315 KiB

12
core/src/mindustry/content/Blocks.java
View File

@@ -34,7 +34,7 @@ public class Blocks implements ContentList{
public static Block public static Block
//environment //environment
air, spawn, cliff, deepwater, water, taintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, ice, snow, darksandTaintedWater, air, spawn, cliff, deepwater, water, taintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater,
dacite, stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster, dacite, stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, shaleBoulder, sandBoulder, daciteBoulder, grass, salt, iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, shaleBoulder, sandBoulder, daciteBoulder, grass, salt,
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, basalt, magmarock, hotrock, snowWall, boulder, snowBoulder, saltWall, metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, basalt, magmarock, hotrock, snowWall, boulder, snowBoulder, saltWall,
@@ -260,6 +260,16 @@ public class Blocks implements ContentList{
dirt = new Floor("dirt"); dirt = new Floor("dirt");
mud = new Floor("mud"){{
speedMultiplier = 0.6f;
variants = 3;
status = StatusEffects.muddy;
statusDuration = 30f;
attributes.set(Attribute.water, 2f);
cacheLayer = CacheLayer.mud;
albedo = 0.35f;
}};
((ShallowLiquid)darksandTaintedWater).set(Blocks.taintedWater, Blocks.darksand); ((ShallowLiquid)darksandTaintedWater).set(Blocks.taintedWater, Blocks.darksand);
((ShallowLiquid)sandWater).set(Blocks.water, Blocks.sand); ((ShallowLiquid)sandWater).set(Blocks.water, Blocks.sand);
((ShallowLiquid)darksandWater).set(Blocks.water, Blocks.darksand); ((ShallowLiquid)darksandWater).set(Blocks.water, Blocks.darksand);

7
core/src/mindustry/content/Fx.java
View File

@@ -687,6 +687,13 @@ public class Fx{
Fill.circle(e.x, e.y, e.fout() * 1f); Fill.circle(e.x, e.y, e.fout() * 1f);
}), }),
muddy = new Effect(80f, e -> {
color(Color.valueOf("432722"));
alpha(Mathf.clamp(e.fin() * 2f));
Fill.circle(e.x, e.y, e.fout() * 1f);
}),
sapped = new Effect(40f, e -> { sapped = new Effect(40f, e -> {
color(Pal.sap); color(Pal.sap);

9
core/src/mindustry/content/StatusEffects.java
View File

@@ -9,7 +9,7 @@ import mindustry.type.StatusEffect;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class StatusEffects implements ContentList{ public class StatusEffects implements ContentList{
public static StatusEffect none, burning, freezing, wet, melting, sapped, tarred, overdrive, overclock, shielded, shocked, blasted, corroded, boss, sporeSlowed; public static StatusEffect none, burning, freezing, wet, muddy, melting, sapped, tarred, overdrive, overclock, shielded, shocked, blasted, corroded, boss, sporeSlowed;
@Override @Override
public void load(){ public void load(){
@@ -63,6 +63,13 @@ public class StatusEffects implements ContentList{
}); });
}}; }};
muddy = new StatusEffect("muddy"){{
color = Color.valueOf("46382a");
speedMultiplier = 0.94f;
effect = Fx.muddy;
effectChance = 0.09f;
}};
melting = new StatusEffect("melting"){{ melting = new StatusEffect("melting"){{
speedMultiplier = 0.8f; speedMultiplier = 0.8f;
armorMultiplier = 0.8f; armorMultiplier = 0.8f;

11
core/src/mindustry/graphics/CacheLayer.java
View File

@@ -18,6 +18,17 @@ public enum CacheLayer{
endShader(Shaders.water); endShader(Shaders.water);
} }
}, },
mud{
@Override
public void begin(){
beginShader();
}
@Override
public void end(){
endShader(Shaders.mud);
}
},
tar{ tar{
@Override @Override
public void begin(){ public void begin(){

3
core/src/mindustry/graphics/Shaders.java
View File

@@ -20,7 +20,7 @@ public class Shaders{
public static UnitBuild build; public static UnitBuild build;
public static DarknessShader darkness; public static DarknessShader darkness;
public static LightShader light; public static LightShader light;
public static SurfaceShader water, tar, slag; public static SurfaceShader water, mud, tar, slag;
public static PlanetShader planet; public static PlanetShader planet;
public static PlanetGridShader planetGrid; public static PlanetGridShader planetGrid;
public static AtmosphereShader atmosphere; public static AtmosphereShader atmosphere;
@@ -42,6 +42,7 @@ public class Shaders{
darkness = new DarknessShader(); darkness = new DarknessShader();
light = new LightShader(); light = new LightShader();
water = new SurfaceShader("water"); water = new SurfaceShader("water");
mud = new SurfaceShader("mud");
tar = new SurfaceShader("tar"); tar = new SurfaceShader("tar");
slag = new SurfaceShader("slag"); slag = new SurfaceShader("slag");
planet = new PlanetShader(); planet = new PlanetShader();