Skip to content

Commit 396af3d

Browse files
frosch123frosch123
committed
Fix: Sprites must have the same order in the source as in the resulting grf.
1 parent 096e11f commit 396af3d

8 files changed

+91
-92
lines changed

‎ogfx1_base.pnml

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@
33

44
#include "sprites/base/base-0000-font.pnml"
55
#include "sprites/base/base-0674-gui.pnml"
6-
#include "sprites/base/base-0771-recolor.pnml"
6+
#include "sprites/base/base-0771-recolor-gui.pnml"
7+
#include "sprites/base/base-0774-gui-terraform.pnml"
8+
#include "sprites/base/base-0775-recolor.pnml"
79
#include "sprites/base/base-0805-faces.pnml"
810
#include "sprites/base/base-0990-foundations.pnml"
911
#include "sprites/base/base-1005-rail-infra.pnml"
1012
#include "sprites/base/base-1309-road-infra.pnml"
11-
#include "sprites/base/base-1420-houses.pnml"
13+
#include "sprites/base/base-1420-houses-church.pnml"
14+
#include "sprites/base/base-1438-recolor-church.pnml"
15+
#include "sprites/base/base-1440-houses.pnml"
1216
#include "sprites/base/base-1576-trees.pnml"
1317
#include "sprites/base/base-2011-industries.pnml"
1418
#include "sprites/base/base-2365-tunnels.pnml"

‎sprites/base/base-0674-gui.pnml

-5
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,3 @@ base_graphics spr767( 767, "") { [ 322, 504, 64, 47, -31, -9, "sprites/png/g
102102
base_graphics spr768( 768, "") { [ 402, 504, 64, 15, -31, 7, "sprites/png/gui/gui04.png"] }
103103
base_graphics spr769( 769, "") { [ 482, 504, 64, 31, -31, -1, "sprites/png/gui/gui04.png"] }
104104
base_graphics spr770( 770, "") { [ 562, 504, 64, 31, -31, -1, "sprites/png/gui/gui04.png"] }
105-
106-
//774 some weird white ball (drag for terraform?)
107-
base_graphics spr774(774, "sprites/png/gui/gui04.png") {
108-
[658, 504, 7, 7, -3, -4]
109-
}

‎sprites/base/base-0771-recolor-gui.pnml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
base_graphics spr771(771, "") {
2+
// PALETTE_TILE_RED_PULSATING (red tile border pulsating)
3+
recolour_sprite {
4+
0x01..0x0C: 0xF0;
5+
0x0D..0x0F: 0xEF;
6+
0x10..0xFF: 0x00;
7+
}
8+
// PALETTE_SEL_TILE_RED (red tile border)
9+
recolour_sprite {
10+
0x01: 0xB2;
11+
0x02..0x05: 0xB3;
12+
0x06..0x07: 0xB4;
13+
0x08..0x09: 0xB5;
14+
0x0A..0x0D: 0xA3;
15+
0x0E..0x0F: 0xA4;
16+
0x10..0xFF: 0x00;
17+
}
18+
// PALETTE_SEL_TILE_BLUE (blue tile border)
19+
recolour_sprite {
20+
0x02..0x05: 0x01;
21+
0x06..0x07: 0x80;
22+
0x08..0x09: 0x81;
23+
0x0A..0x0B: 0x83;
24+
0x0C..0x0D: 0x84;
25+
0x0E..0x0F: 0x85;
26+
0x10..0xFF: 0x00;
27+
}
28+
}
29+

‎sprites/base/base-0774-gui-terraform.pnml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
//774 some weird white ball (drag for terraform?)
2+
base_graphics spr774(774, "sprites/png/gui/gui04.png") {
3+
[658, 504, 7, 7, -3, -4]
4+
}

‎sprites/base/base-0771-recolor.pnml ‎sprites/base/base-0775-recolor.pnml

-57
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,3 @@
1-
base_graphics spr771(771, "") {
2-
// PALETTE_TILE_RED_PULSATING (red tile border pulsating)
3-
recolour_sprite {
4-
0x01..0x0C: 0xF0;
5-
0x0D..0x0F: 0xEF;
6-
0x10..0xFF: 0x00;
7-
}
8-
// PALETTE_SEL_TILE_RED (red tile border)
9-
recolour_sprite {
10-
0x01: 0xB2;
11-
0x02..0x05: 0xB3;
12-
0x06..0x07: 0xB4;
13-
0x08..0x09: 0xB5;
14-
0x0A..0x0D: 0xA3;
15-
0x0E..0x0F: 0xA4;
16-
0x10..0xFF: 0x00;
17-
}
18-
// PALETTE_SEL_TILE_BLUE (blue tile border)
19-
recolour_sprite {
20-
0x02..0x05: 0x01;
21-
0x06..0x07: 0x80;
22-
0x08..0x09: 0x81;
23-
0x0A..0x0B: 0x83;
24-
0x0C..0x0D: 0x84;
25-
0x0E..0x0F: 0x85;
26-
0x10..0xFF: 0x00;
27-
}
28-
}
29-
301
#define CC1(a,b,c,d,e,f,g,h) 0xC6: a; 0xC7: b; 0xC8: c; 0xC9: d; 0xCA: e; 0xCB: f; 0xCC: g; 0xCD: h;
312
#define CC1_RANGE(start) 0xC6..0xCD: start..start+7;
323

@@ -831,31 +802,3 @@ base_graphics spr795(795, "") {
831802
0xFF: 0x09;
832803
}
833804
}
834-
835-
// church recolouring
836-
base_graphics spr1438(1438, "") {
837-
recolour_sprite {
838-
0x69: 0x46;
839-
0x6A: 0x47;
840-
0x6D: 0x4A;
841-
0x6E: 0x4B;
842-
0x72: 0x49;
843-
0x74: 0x4C;
844-
0x76: 0x4D;
845-
0x77: 0x4E;
846-
0x78: 0x4F;
847-
0x7B: 0x48;
848-
}
849-
recolour_sprite {
850-
0x69: 0x02;
851-
0x6A: 0x21;
852-
0x6D: 0x23;
853-
0x6E: 0x24;
854-
0x72: 0x22;
855-
0x74: 0x24;
856-
0x76: 0x25;
857-
0x77: 0x26;
858-
0x78: 0x27;
859-
0x7B: 0x20;
860-
}
861-
}

‎sprites/base/base-1420-houses-church.pnml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//1420 plain paved tile
2+
base_graphics spr1420(1420, "sprites/png/industries/industries_misc.png") { [ 674, 1912, 64, 31, -31, 0] }
3+
4+
//1421-1437 bunch'o'buildings
5+
//offices
6+
base_graphics spr1421(1421, "sprites/png/houses/base-1421.1425.1424-offices.png") { [ 0, 0, 66, 87, -32, -56] } // Recolour: STRUCT_CONCRETE, STRUCT_WHITE
7+
base_graphics spr1422(1422, "sprites/png/houses/buildings.png") { [ 82, 456, 66, 87, -32, -56] } // Recolour: STRUCT_CONCRETE, STRUCT_WHITE
8+
base_graphics spr1423(1423, "sprites/png/houses/buildings.png") { [ 162, 456, 66, 87, -32, -56] } // (Ground tile)
9+
base_graphics spr1424(1424, "sprites/png/houses/base-1421.1425.1424-offices.png") { [ 0, 176, 66, 87, -32, -56] } // (Ground tile)
10+
base_graphics spr1425(1425, "sprites/png/houses/base-1421.1425.1424-offices.png") { [ 0, 88, 66, 87, -32, -56] } // Recolour: STRUCT_CONCRETE, STRUCT_WHITE
11+
// 1426-1429 flats
12+
base_graphics spr1426(1426, "sprites/png/houses/base-1426-1429-flats.png") { [ 0, 0, 66, 87, -32, -56] } // Recolour: STRUCT_CONCRETE, STRUCT_BROWN
13+
base_graphics spr1427(1427, "sprites/png/houses/base-1426-1429-flats.png") { [ 0, 88, 66, 87, -32, -56] } // Recolour: STRUCT_CONCRETE, STRUCT_BROWN
14+
base_graphics spr1428(1428, "sprites/png/houses/base-1426-1429-flats.png") { [ 0, 176, 66, 87, -32, -56] } // Recolour: STRUCT_CONCRETE, STRUCT_BROWN
15+
base_graphics spr1429(1429, "sprites/png/houses/base-1426-1429-flats.png") { [ 0, 264, 66, 87, -32, -56] } // (Ground tile)
16+
// 1430-1433 house
17+
base_graphics spr1430(1430, "sprites/png/houses/base-1430-1433-house.png") { [ 0, 176, 66, 87, -32, -56] }
18+
base_graphics spr1431(1431, "sprites/png/houses/base-1430-1433-house.png") { [ 0, 88, 66, 87, -32, -56] }
19+
base_graphics spr1432(1432, "sprites/png/houses/base-1430-1433-house.png") { [ 0, 0, 66, 87, -32, -56] }
20+
base_graphics spr1433(1433, "sprites/png/houses/base-1430-1433-house.png") { [ 0, 264, 66, 87, -32, -56] }
21+
//church
22+
base_graphics spr1434(1434, "sprites/png/houses/temprtbuilds.png") { [ 66, 8, 38, 21, -19, 3] } // Recolour: CHURCH_RED, CHURCH_CREAM
23+
base_graphics spr1435(1435, "sprites/png/houses/temprtbuilds.png") { [ 114, 8, 38, 28, -19, -4] } // Recolour: CHURCH_RED, CHURCH_CREAM
24+
base_graphics spr1436(1436, "sprites/png/houses/temprtbuilds.png") { [ 162, 8, 38, 38, -19, -14] } // Recolour: CHURCH_RED, CHURCH_CREAM
25+
base_graphics spr1437(1437, "sprites/png/houses/temprtbuilds.png") { [ 210, 8, 64, 34, -31, -3] }

‎sprites/base/base-1438-recolor-church.pnml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// church recolouring
2+
base_graphics spr1438(1438, "") {
3+
recolour_sprite {
4+
0x69: 0x46;
5+
0x6A: 0x47;
6+
0x6D: 0x4A;
7+
0x6E: 0x4B;
8+
0x72: 0x49;
9+
0x74: 0x4C;
10+
0x76: 0x4D;
11+
0x77: 0x4E;
12+
0x78: 0x4F;
13+
0x7B: 0x48;
14+
}
15+
recolour_sprite {
16+
0x69: 0x02;
17+
0x6A: 0x21;
18+
0x6D: 0x23;
19+
0x6E: 0x24;
20+
0x72: 0x22;
21+
0x74: 0x24;
22+
0x76: 0x25;
23+
0x77: 0x26;
24+
0x78: 0x27;
25+
0x7B: 0x20;
26+
}
27+
}

‎sprites/base/base-1420-houses.pnml ‎sprites/base/base-1440-houses.pnml

-28
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,3 @@
1-
2-
3-
//1420 plain paved tile
4-
base_graphics spr1420(1420, "sprites/png/industries/industries_misc.png") { [ 674, 1912, 64, 31, -31, 0] }
5-
6-
//1421-1437 bunch'o'buildings
7-
//offices
8-
base_graphics spr1421(1421, "sprites/png/houses/base-1421.1425.1424-offices.png") { [ 0, 0, 66, 87, -32, -56] } // Recolour: STRUCT_CONCRETE, STRUCT_WHITE
9-
base_graphics spr1422(1422, "sprites/png/houses/buildings.png") { [ 82, 456, 66, 87, -32, -56] } // Recolour: STRUCT_CONCRETE, STRUCT_WHITE
10-
base_graphics spr1423(1423, "sprites/png/houses/buildings.png") { [ 162, 456, 66, 87, -32, -56] } // (Ground tile)
11-
base_graphics spr1424(1424, "sprites/png/houses/base-1421.1425.1424-offices.png") { [ 0, 176, 66, 87, -32, -56] } // (Ground tile)
12-
base_graphics spr1425(1425, "sprites/png/houses/base-1421.1425.1424-offices.png") { [ 0, 88, 66, 87, -32, -56] } // Recolour: STRUCT_CONCRETE, STRUCT_WHITE
13-
// 1426-1429 flats
14-
base_graphics spr1426(1426, "sprites/png/houses/base-1426-1429-flats.png") { [ 0, 0, 66, 87, -32, -56] } // Recolour: STRUCT_CONCRETE, STRUCT_BROWN
15-
base_graphics spr1427(1427, "sprites/png/houses/base-1426-1429-flats.png") { [ 0, 88, 66, 87, -32, -56] } // Recolour: STRUCT_CONCRETE, STRUCT_BROWN
16-
base_graphics spr1428(1428, "sprites/png/houses/base-1426-1429-flats.png") { [ 0, 176, 66, 87, -32, -56] } // Recolour: STRUCT_CONCRETE, STRUCT_BROWN
17-
base_graphics spr1429(1429, "sprites/png/houses/base-1426-1429-flats.png") { [ 0, 264, 66, 87, -32, -56] } // (Ground tile)
18-
// 1430-1433 house
19-
base_graphics spr1430(1430, "sprites/png/houses/base-1430-1433-house.png") { [ 0, 176, 66, 87, -32, -56] }
20-
base_graphics spr1431(1431, "sprites/png/houses/base-1430-1433-house.png") { [ 0, 88, 66, 87, -32, -56] }
21-
base_graphics spr1432(1432, "sprites/png/houses/base-1430-1433-house.png") { [ 0, 0, 66, 87, -32, -56] }
22-
base_graphics spr1433(1433, "sprites/png/houses/base-1430-1433-house.png") { [ 0, 264, 66, 87, -32, -56] }
23-
//church
24-
base_graphics spr1434(1434, "sprites/png/houses/temprtbuilds.png") { [ 66, 8, 38, 21, -19, 3] } // Recolour: CHURCH_RED, CHURCH_CREAM
25-
base_graphics spr1435(1435, "sprites/png/houses/temprtbuilds.png") { [ 114, 8, 38, 28, -19, -4] } // Recolour: CHURCH_RED, CHURCH_CREAM
26-
base_graphics spr1436(1436, "sprites/png/houses/temprtbuilds.png") { [ 162, 8, 38, 38, -19, -14] } // Recolour: CHURCH_RED, CHURCH_CREAM
27-
base_graphics spr1437(1437, "sprites/png/houses/temprtbuilds.png") { [ 210, 8, 64, 34, -31, -3] }
28-
291
//1440-1575 bunch'o'buildings
302
//office block with elevator
313
base_graphics spr1440(1440, "sprites/png/houses/temprtbuilds.png") { [ 306, 8, 54, 37, -26, -8] }

0 commit comments

Comments
 (0)