diff --git a/core/assets-raw/sprites/blocks/environment/mud1.png b/core/assets-raw/sprites/blocks/environment/mud1.png new file mode 100644 index 0000000000..2f5963cef9 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/mud1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/mud2.png b/core/assets-raw/sprites/blocks/environment/mud2.png new file mode 100644 index 0000000000..2407ae4449 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/mud2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/mud3.png b/core/assets-raw/sprites/blocks/environment/mud3.png new file mode 100644 index 0000000000..a602c93469 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/mud3.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c9f0b660e3..848c57d62d 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -979,6 +979,7 @@ block.dune-wall.name = Dune Wall block.pine.name = Pine block.dirt.name = Dirt block.dirt-wall.name = Dirt Wall +block.mud.name = Mud block.white-tree-dead.name = White Tree Dead block.white-tree.name = White Tree block.spore-cluster.name = Spore Cluster diff --git a/core/assets/contributors b/core/assets/contributors index f52a9bfccb..900a2990ee 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -90,3 +90,4 @@ DeltaNedas GioIacca9 SnakkiZXZ sk7725 +ThePlayerA diff --git a/core/assets/shaders/mud.frag b/core/assets/shaders/mud.frag new file mode 100644 index 0000000000..6b6ba8cac6 --- /dev/null +++ b/core/assets/shaders/mud.frag @@ -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; +} diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas index 00f1df2b50..e2b5e40d93 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -7784,153 +7784,174 @@ moss3 orig: 32, 32 offset: 0, 0 index: -1 -ore-coal1 +mud1 rotate: false xy: 1073, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-coal2 +mud2 rotate: false xy: 1039, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-coal3 +mud3 rotate: false xy: 1073, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-copper1 +ore-coal1 rotate: false xy: 821, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-copper2 +ore-coal2 rotate: false xy: 855, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-copper3 +ore-coal3 rotate: false xy: 889, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-lead1 +ore-copper1 rotate: false xy: 923, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-lead2 +ore-copper2 rotate: false xy: 957, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-lead3 +ore-copper3 rotate: false xy: 991, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-scrap1 +ore-lead1 rotate: false xy: 787, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-scrap2 +ore-lead2 rotate: false xy: 1025, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-scrap3 +ore-lead3 rotate: false xy: 1059, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-thorium1 +ore-scrap1 rotate: false xy: 821, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-thorium2 +ore-scrap2 rotate: false xy: 855, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-thorium3 +ore-scrap3 rotate: false xy: 889, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-titanium1 +ore-thorium1 rotate: false xy: 923, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-titanium2 +ore-thorium2 rotate: false xy: 957, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-titanium3 +ore-thorium3 rotate: false xy: 991, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -pebbles1 +ore-titanium1 rotate: false xy: 1025, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -pebbles2 +ore-titanium2 rotate: false xy: 1059, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -pebbles3 +ore-titanium3 rotate: false xy: 1025, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 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 rotate: false xy: 785, 311 @@ -7940,7 +7961,7 @@ pine index: -1 salt rotate: false - xy: 1059, 173 + xy: 1093, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7961,14 +7982,14 @@ salt-wall-large index: -1 salt-wall1 rotate: false - xy: 1093, 241 + xy: 1107, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt-wall2 rotate: false - xy: 1093, 207 + xy: 1107, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7989,21 +8010,21 @@ sand-wall-large index: -1 sand-wall1 rotate: false - xy: 1127, 241 + xy: 591, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-wall2 rotate: false - xy: 1127, 207 + xy: 591, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water rotate: false - xy: 1127, 173 + xy: 625, 97 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8017,63 +8038,63 @@ sand-water-edge index: -1 sand-water1 rotate: false - xy: 591, 99 + xy: 625, 63 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water2 rotate: false - xy: 591, 65 + xy: 659, 97 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water3 rotate: false - xy: 625, 97 + xy: 659, 63 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 1093, 173 + xy: 1127, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1107, 309 + xy: 1127, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1107, 275 + xy: 1127, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 625, 63 + xy: 689, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 659, 97 + xy: 689, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 659, 63 + xy: 723, 195 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8094,35 +8115,35 @@ shale-wall-large index: -1 shale-wall1 rotate: false - xy: 723, 161 + xy: 791, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-wall2 rotate: false - xy: 757, 175 + xy: 825, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale1 rotate: false - xy: 689, 197 + xy: 723, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale2 rotate: false - xy: 689, 163 + xy: 757, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale3 rotate: false - xy: 723, 195 + xy: 757, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8136,21 +8157,21 @@ shrubs-large index: -1 shrubs1 rotate: false - xy: 757, 141 + xy: 859, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs2 rotate: false - xy: 791, 157 + xy: 893, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 slag rotate: false - xy: 825, 157 + xy: 927, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8185,42 +8206,42 @@ snow-wall-large index: -1 snow-wall1 rotate: false - xy: 961, 157 + xy: 859, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-wall2 rotate: false - xy: 791, 123 + xy: 893, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 859, 157 + xy: 961, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 893, 157 + xy: 791, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 927, 157 + xy: 825, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn rotate: false - xy: 825, 123 + xy: 927, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8234,21 +8255,21 @@ spore-moss-edge index: -1 spore-moss1 rotate: false - xy: 859, 123 + xy: 961, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss2 rotate: false - xy: 893, 123 + xy: 995, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss3 rotate: false - xy: 927, 123 + xy: 1029, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8269,14 +8290,14 @@ spore-wall-large index: -1 spore-wall1 rotate: false - xy: 961, 123 + xy: 1063, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-wall2 rotate: false - xy: 995, 139 + xy: 1097, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8297,42 +8318,42 @@ stone-wall-large index: -1 stone-wall1 rotate: false - xy: 1131, 139 + xy: 1063, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-wall2 rotate: false - xy: 995, 105 + xy: 1097, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone1 rotate: false - xy: 1029, 139 + xy: 1131, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1063, 139 + xy: 995, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1097, 139 + xy: 1029, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water rotate: false - xy: 1029, 105 + xy: 1131, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8346,7 +8367,7 @@ tainted-water-edge index: -1 tar rotate: false - xy: 1063, 105 + xy: 1133, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8360,70 +8381,70 @@ tar-edge index: -1 tendrils1 rotate: false - xy: 1097, 105 + xy: 1167, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils2 rotate: false - xy: 1131, 105 + xy: 1201, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils3 rotate: false - xy: 1133, 391 + xy: 1235, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 1167, 391 + xy: 1269, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1201, 391 + xy: 1303, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1235, 391 + xy: 1337, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1269, 391 + xy: 1371, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1303, 391 + xy: 1405, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 1337, 391 + xy: 1439, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 1371, 391 + xy: 1473, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png index f5a02fab51..c9cba5260b 100644 Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ diff --git a/core/assets/sprites/fallback/sprites5.png b/core/assets/sprites/fallback/sprites5.png index 055343ee62..f53bd86775 100644 Binary files a/core/assets/sprites/fallback/sprites5.png and b/core/assets/sprites/fallback/sprites5.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 9fbc31c43a..2ed6cbbc3a 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -7772,153 +7772,174 @@ moss3 orig: 32, 32 offset: 0, 0 index: -1 -ore-coal1 +mud1 rotate: false xy: 3303, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-coal2 +mud2 rotate: false xy: 1275, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-coal3 +mud3 rotate: false xy: 3337, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-copper1 +ore-coal1 rotate: false xy: 1309, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-copper2 +ore-coal2 rotate: false xy: 3371, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-copper3 +ore-coal3 rotate: false xy: 1343, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-lead1 +ore-copper1 rotate: false xy: 3405, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-lead2 +ore-copper2 rotate: false xy: 1377, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-lead3 +ore-copper3 rotate: false xy: 3439, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-scrap1 +ore-lead1 rotate: false xy: 1411, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-scrap2 +ore-lead2 rotate: false xy: 3473, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-scrap3 +ore-lead3 rotate: false xy: 1445, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-thorium1 +ore-scrap1 rotate: false xy: 3507, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-thorium2 +ore-scrap2 rotate: false xy: 1479, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-thorium3 +ore-scrap3 rotate: false xy: 3541, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-titanium1 +ore-thorium1 rotate: false xy: 1513, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-titanium2 +ore-thorium2 rotate: false xy: 3575, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -ore-titanium3 +ore-thorium3 rotate: false xy: 1547, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -pebbles1 +ore-titanium1 rotate: false xy: 3609, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -pebbles2 +ore-titanium2 rotate: false xy: 1581, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -pebbles3 +ore-titanium3 rotate: false xy: 3643, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 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 rotate: false xy: 1, 1 @@ -7928,7 +7949,7 @@ pine index: -1 salt rotate: false - xy: 1615, 17 + xy: 3745, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7949,14 +7970,14 @@ salt-wall-large index: -1 salt-wall1 rotate: false - xy: 3677, 213 + xy: 3779, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt-wall2 rotate: false - xy: 3711, 213 + xy: 3813, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7977,21 +7998,21 @@ sand-wall-large index: -1 sand-wall1 rotate: false - xy: 3847, 213 + xy: 3949, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-wall2 rotate: false - xy: 3881, 213 + xy: 3983, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water rotate: false - xy: 3915, 213 + xy: 4017, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8005,63 +8026,63 @@ sand-water-edge index: -1 sand-water1 rotate: false - xy: 3949, 213 + xy: 4051, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water2 rotate: false - xy: 3983, 213 + xy: 1649, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water3 rotate: false - xy: 4017, 213 + xy: 1683, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 3745, 213 + xy: 3847, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 3779, 213 + xy: 3881, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 3813, 213 + xy: 3915, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 4051, 213 + xy: 1717, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 1649, 17 + xy: 1751, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 1683, 31 + xy: 1785, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8082,35 +8103,35 @@ shale-wall-large index: -1 shale-wall1 rotate: false - xy: 1819, 47 + xy: 1921, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-wall2 rotate: false - xy: 1853, 47 + xy: 1955, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale1 rotate: false - xy: 1717, 47 + xy: 1819, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale2 rotate: false - xy: 1751, 47 + xy: 1853, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale3 rotate: false - xy: 1785, 47 + xy: 1887, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8124,21 +8145,21 @@ shrubs-large index: -1 shrubs1 rotate: false - xy: 1887, 47 + xy: 1989, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs2 rotate: false - xy: 1921, 47 + xy: 2023, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 slag rotate: false - xy: 1955, 47 + xy: 2097, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8173,42 +8194,42 @@ snow-wall-large index: -1 snow-wall1 rotate: false - xy: 2097, 129 + xy: 2165, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-wall2 rotate: false - xy: 2131, 179 + xy: 2165, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1989, 47 + xy: 2097, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 2023, 47 + xy: 2131, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 2097, 163 + xy: 2131, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn rotate: false - xy: 2131, 145 + xy: 2199, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8222,21 +8243,21 @@ spore-moss-edge index: -1 spore-moss1 rotate: false - xy: 2165, 179 + xy: 2199, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss2 rotate: false - xy: 2165, 145 + xy: 2233, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss3 rotate: false - xy: 2199, 179 + xy: 2233, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8257,14 +8278,14 @@ spore-wall-large index: -1 spore-wall1 rotate: false - xy: 2199, 145 + xy: 2267, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-wall2 rotate: false - xy: 2233, 179 + xy: 2267, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8285,42 +8306,42 @@ stone-wall-large index: -1 stone-wall1 rotate: false - xy: 2301, 179 + xy: 2335, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-wall2 rotate: false - xy: 2301, 145 + xy: 2369, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone1 rotate: false - xy: 2233, 145 + xy: 2301, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 2267, 179 + xy: 2301, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 2267, 145 + xy: 2335, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water rotate: false - xy: 2335, 179 + xy: 2369, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8334,7 +8355,7 @@ tainted-water-edge index: -1 tar rotate: false - xy: 2335, 145 + xy: 2403, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8348,70 +8369,70 @@ tar-edge index: -1 tendrils1 rotate: false - xy: 2369, 179 + xy: 2403, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils2 rotate: false - xy: 2369, 145 + xy: 2437, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils3 rotate: false - xy: 2403, 179 + xy: 2437, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 2403, 145 + xy: 2471, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 2437, 179 + xy: 2471, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 2437, 145 + xy: 2505, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 2471, 179 + xy: 2505, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 2471, 145 + xy: 2539, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 2505, 179 + xy: 2539, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 2505, 145 + xy: 2573, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index dc533ea20f..8e6efad4a3 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png index 10681da213..747611cce4 100644 Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b3a670a54a..964a196b34 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -34,7 +34,7 @@ public class Blocks implements ContentList{ public static Block //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, 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, @@ -260,6 +260,16 @@ public class Blocks implements ContentList{ 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)sandWater).set(Blocks.water, Blocks.sand); ((ShallowLiquid)darksandWater).set(Blocks.water, Blocks.darksand); diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index fc66689438..cf48179da3 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -686,6 +686,13 @@ public class Fx{ 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 -> { color(Pal.sap); diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index ab21c0eb87..582a661226 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -9,7 +9,7 @@ import mindustry.type.StatusEffect; import static mindustry.Vars.*; 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 public void load(){ @@ -62,6 +62,13 @@ public class StatusEffects implements ContentList{ opposite(burning); }); }}; + + muddy = new StatusEffect("muddy"){{ + color = Color.valueOf("46382a"); + speedMultiplier = 0.94f; + effect = Fx.muddy; + effectChance = 0.09f; + }}; melting = new StatusEffect("melting"){{ speedMultiplier = 0.8f; diff --git a/core/src/mindustry/graphics/CacheLayer.java b/core/src/mindustry/graphics/CacheLayer.java index d78deca664..c3eed64feb 100644 --- a/core/src/mindustry/graphics/CacheLayer.java +++ b/core/src/mindustry/graphics/CacheLayer.java @@ -18,6 +18,17 @@ public enum CacheLayer{ endShader(Shaders.water); } }, + mud{ + @Override + public void begin(){ + beginShader(); + } + + @Override + public void end(){ + endShader(Shaders.mud); + } + }, tar{ @Override public void begin(){ diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index a0486fe0e3..bdc95d2a92 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/core/src/mindustry/graphics/Shaders.java @@ -20,7 +20,7 @@ public class Shaders{ public static UnitBuild build; public static DarknessShader darkness; public static LightShader light; - public static SurfaceShader water, tar, slag; + public static SurfaceShader water, mud, tar, slag; public static PlanetShader planet; public static PlanetGridShader planetGrid; public static AtmosphereShader atmosphere; @@ -42,6 +42,7 @@ public class Shaders{ darkness = new DarknessShader(); light = new LightShader(); water = new SurfaceShader("water"); + mud = new SurfaceShader("mud"); tar = new SurfaceShader("tar"); slag = new SurfaceShader("slag"); planet = new PlanetShader();