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

New tentative edge style / Zone tweaks

Browse Source
This commit is contained in:
Anuken
2019-03-26 20:10:01 -04:00
parent 545a64f7dc
commit 7ce571e59c
17 changed files with 296 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/shaders/tar.fragment
View File

@@ -56,7 +56,6 @@ void main() {
if(color.r > 0.01){
color = texture2D(u_texture, c + vec2(sin(stime/3.0 + coords.y/0.75) * v.x, 0.0)) * vec4(0.9, 0.9, 1, 1.0);
color.a = 1.0;
float n1 = snoise(coords / 22.0 + vec2(-time) / 540.0);
float n2 = snoise((coords + vec2(632.0)) / 8.0 + vec2(0.0, time) / 510.0);
@@ -65,7 +64,6 @@ void main() {
if(r < -0.3 && r > -0.6){
color *= 1.4;
color.a = 1.0;
}
}

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

@@ -9804,28 +9804,28 @@ char2
index: -1
char3
rotate: false
xy: 1483, 669
xy: 1193, 571
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
cliffs1
rotate: false
xy: 1599, 785
xy: 1309, 687
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
coal1
rotate: false
xy: 1019, 491
xy: 1599, 785
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
coal2
rotate: false
xy: 1309, 589
xy: 1019, 491
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -9860,28 +9860,28 @@ copper3
index: -1
craters1
rotate: false
xy: 1483, 635
xy: 1193, 537
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
craters2
rotate: false
xy: 1633, 785
xy: 1343, 687
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
craters3
rotate: false
xy: 1053, 491
xy: 1633, 785
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
craters4
rotate: false
xy: 1343, 589
xy: 1053, 491
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -9923,7 +9923,7 @@ darksand-edge
index: -1
darksand-tainted-water
rotate: false
xy: 1377, 589
xy: 1087, 491
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -9958,14 +9958,14 @@ darksand1
index: -1
darksand2
rotate: false
xy: 1667, 785
xy: 1377, 687
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
darksand3
rotate: false
xy: 1087, 491
xy: 1667, 785
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -10000,7 +10000,7 @@ dunerocks1
index: -1
dunerocks2
rotate: false
xy: 1701, 785
xy: 1411, 687
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -10014,28 +10014,28 @@ edge-stencil-blocky
index: -1
edge-stencil-smooth
rotate: false
xy: 323, 721
xy: 1, 175
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
grass-edge
rotate: false
xy: 613, 819
xy: 323, 721
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
grass1
rotate: false
xy: 1121, 491
xy: 1701, 785
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
grass2
rotate: false
xy: 1411, 589
xy: 1121, 491
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -10049,28 +10049,28 @@ grass3
index: -1
holostone-edge
rotate: false
xy: 903, 917
xy: 613, 819
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
holostone1
rotate: false
xy: 1735, 785
xy: 1445, 687
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
holostone2
rotate: false
xy: 1155, 491
xy: 1735, 785
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
holostone3
rotate: false
xy: 1445, 589
xy: 1155, 491
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -10098,14 +10098,14 @@ hotrock3
index: -1
ice-edge
rotate: false
xy: 1, 77
xy: 903, 917
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
ice-snow-edge
rotate: false
xy: 323, 623
xy: 1, 77
size: 288, 96
orig: 288, 96
offset: 0, 0
@@ -10224,42 +10224,42 @@ magmarock1
index: -1
magmarock2
rotate: false
xy: 903, 425
xy: 1483, 719
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
magmarock3
rotate: false
xy: 1193, 523
xy: 903, 425
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
metal-floor
rotate: false
xy: 937, 425
xy: 1517, 719
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
metal-floor-damaged5
rotate: false
xy: 937, 425
xy: 1517, 719
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
metal-floor-2
rotate: false
xy: 1227, 523
xy: 937, 425
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
metal-floor-2-edge
rotate: false
xy: 613, 721
xy: 323, 623
size: 288, 96
orig: 288, 96
offset: 0, 0
@@ -10273,7 +10273,7 @@ metal-floor-3
index: -1
metal-floor-3-edge
rotate: false
xy: 903, 819
xy: 613, 721
size: 288, 96
orig: 288, 96
offset: 0, 0
@@ -10287,14 +10287,14 @@ metal-floor-5
index: -1
metal-floor-5-edge
rotate: false
xy: 1193, 917
xy: 903, 819
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
metal-floor-damaged-edge
rotate: false
xy: 323, 525
xy: 1193, 917
size: 288, 96
orig: 288, 96
offset: 0, 0
@@ -10336,14 +10336,14 @@ metal-floor-damaged6
index: -1
metal-floor-edge
rotate: false
xy: 613, 623
xy: 323, 525
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
moss-edge
rotate: false
xy: 903, 721
xy: 613, 623
size: 288, 96
orig: 288, 96
offset: 0, 0
@@ -10357,14 +10357,14 @@ moss1
index: -1
moss2
rotate: false
xy: 1189, 489
xy: 1479, 685
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
moss3
rotate: false
xy: 1223, 489
xy: 1513, 685
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -10420,14 +10420,14 @@ ore-lead1
index: -1
ore-lead2
rotate: false
xy: 971, 441
xy: 1551, 735
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
ore-lead3
rotate: false
xy: 1261, 539
xy: 971, 441
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -10441,7 +10441,7 @@ ore-scrap1
index: -1
ore-scrap2
rotate: false
xy: 1533, 719
xy: 1243, 621
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -10511,14 +10511,14 @@ rock1
index: -1
rock2
rotate: false
xy: 1483, 703
xy: 1193, 605
size: 48, 48
orig: 48, 48
offset: 0, 0
index: -1
rocks-large
rotate: false
xy: 1483, 753
xy: 1193, 655
size: 64, 64
orig: 64, 64
offset: 0, 0
@@ -10546,28 +10546,28 @@ salt
index: -1
salt-edge
rotate: false
xy: 1193, 819
xy: 903, 721
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
sand-edge
rotate: false
xy: 1483, 917
xy: 1193, 819
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
sand-water
rotate: false
xy: 1517, 669
xy: 1227, 571
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
sand-water-edge
rotate: false
xy: 323, 427
xy: 1483, 917
size: 288, 96
orig: 288, 96
offset: 0, 0
@@ -10595,147 +10595,147 @@ sand3
index: -1
sandrocks-large
rotate: false
xy: 903, 459
xy: 1483, 753
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
sandrocks1
rotate: false
xy: 1517, 635
xy: 1227, 537
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
sandrocks2
rotate: false
xy: 1309, 555
xy: 1019, 457
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
scrap1
rotate: false
xy: 1343, 555
xy: 1053, 457
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
scrap2
rotate: false
xy: 1377, 555
xy: 1087, 457
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
scrap3
rotate: false
xy: 1411, 555
xy: 1121, 457
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
shale-boulder1
rotate: false
xy: 1087, 457
xy: 1377, 653
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
shale-boulder2
rotate: false
xy: 1121, 457
xy: 1411, 653
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
shale-edge
rotate: false
xy: 613, 525
xy: 323, 427
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
shale1
rotate: false
xy: 1445, 555
xy: 1155, 457
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
shale2
rotate: false
xy: 1019, 457
xy: 1309, 653
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
shale3
rotate: false
xy: 1053, 457
xy: 1343, 653
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
shalerocks-large
rotate: false
xy: 1193, 557
xy: 903, 459
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
shalerocks1
rotate: false
xy: 1155, 457
xy: 1445, 653
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
shalerocks2
rotate: false
xy: 1189, 455
xy: 1479, 651
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
snow-edge
rotate: false
xy: 903, 623
xy: 613, 525
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
snow1
rotate: false
xy: 1223, 455
xy: 1513, 651
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
snow2
rotate: false
xy: 971, 407
xy: 1551, 701
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
snow3
rotate: false
xy: 1005, 423
xy: 1547, 667
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
snowrock1
rotate: false
xy: 1549, 769
xy: 1259, 671
size: 48, 48
orig: 48, 48
offset: 0, 0
index: -1
snowrock2
rotate: false
xy: 969, 475
xy: 1549, 769
size: 48, 48
orig: 48, 48
offset: 0, 0
@@ -10749,14 +10749,14 @@ snowrocks-large
index: -1
snowrocks1
rotate: false
xy: 1039, 423
xy: 971, 407
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
snowrocks2
rotate: false
xy: 1073, 423
xy: 1005, 423
size: 32, 32
orig: 32, 32
offset: 0, 0
@@ -10784,35 +10784,35 @@ spore-cluster3
index: -1
spore-moss-edge
rotate: false
xy: 1193, 721
xy: 903, 623
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
spore-moss1
rotate: false
xy: 1107, 423
xy: 1039, 423
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
spore-moss2
rotate: false
xy: 1141, 423
xy: 1073, 423
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
spore-moss3
rotate: false
xy: 1175, 421
xy: 1107, 423
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
spore-pine
rotate: false
xy: 1259, 573
xy: 969, 475
size: 48, 48
orig: 48, 48
offset: 0, 0
@@ -10826,112 +10826,112 @@ sporerocks-large
index: -1
sporerocks1
rotate: false
xy: 1209, 421
xy: 1141, 423
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
sporerocks2
rotate: false
xy: 1261, 505
xy: 1599, 751
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
stone-edge
rotate: false
xy: 1483, 819
xy: 1193, 721
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
stone3
rotate: false
xy: 1257, 471
xy: 1633, 751
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
tainted-water
rotate: false
xy: 1295, 521
xy: 1667, 751
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
tainted-water-edge
rotate: false
xy: 613, 427
xy: 1483, 819
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
tar
rotate: false
xy: 1329, 521
xy: 1701, 751
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
tar-edge
rotate: false
xy: 903, 525
xy: 613, 427
size: 288, 96
orig: 288, 96
offset: 0, 0
index: -1
thorium1
rotate: false
xy: 1363, 521
xy: 1735, 751
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
thorium2
rotate: false
xy: 1397, 521
xy: 1769, 739
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
thorium3
rotate: false
xy: 1431, 521
xy: 1585, 717
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium1
rotate: false
xy: 1599, 751
xy: 1619, 717
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium2
rotate: false
xy: 1633, 751
xy: 1653, 717
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
titanium3
rotate: false
xy: 1667, 751
xy: 1687, 717
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
water
rotate: false
xy: 1701, 751
xy: 1721, 717
size: 32, 32
orig: 32, 32
offset: 0, 0
index: -1
water-edge
rotate: false
xy: 1193, 623
xy: 903, 525
size: 288, 96
orig: 288, 96
offset: 0, 0

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 218 KiB

After

Width:  |  Height:  |  Size: 950 KiB

330
core/assets/sprites/sprites_fallback.atlas
View File

File diff suppressed because it is too large Load Diff

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 750 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 100 KiB