Fix: Sprites must have the same order in the source as in the resulting grf.

pull/1/head
frosch 2014-02-02 20:00:23 +01:00
parent 096e11fd17
commit 396af3d20e
8 changed files with 91 additions and 92 deletions

View File

@ -3,12 +3,16 @@
#include "sprites/base/base-0000-font.pnml"
#include "sprites/base/base-0674-gui.pnml"
#include "sprites/base/base-0771-recolor.pnml"
#include "sprites/base/base-0771-recolor-gui.pnml"
#include "sprites/base/base-0774-gui-terraform.pnml"
#include "sprites/base/base-0775-recolor.pnml"
#include "sprites/base/base-0805-faces.pnml"
#include "sprites/base/base-0990-foundations.pnml"
#include "sprites/base/base-1005-rail-infra.pnml"
#include "sprites/base/base-1309-road-infra.pnml"
#include "sprites/base/base-1420-houses.pnml"
#include "sprites/base/base-1420-houses-church.pnml"
#include "sprites/base/base-1438-recolor-church.pnml"
#include "sprites/base/base-1440-houses.pnml"
#include "sprites/base/base-1576-trees.pnml"
#include "sprites/base/base-2011-industries.pnml"
#include "sprites/base/base-2365-tunnels.pnml"

View File

@ -102,8 +102,3 @@ base_graphics spr767( 767, "") { [ 322, 504, 64, 47, -31, -9, "sprites/png/g
base_graphics spr768( 768, "") { [ 402, 504, 64, 15, -31, 7, "sprites/png/gui/gui04.png"] }
base_graphics spr769( 769, "") { [ 482, 504, 64, 31, -31, -1, "sprites/png/gui/gui04.png"] }
base_graphics spr770( 770, "") { [ 562, 504, 64, 31, -31, -1, "sprites/png/gui/gui04.png"] }
//774 some weird white ball (drag for terraform?)
base_graphics spr774(774, "sprites/png/gui/gui04.png") {
[658, 504, 7, 7, -3, -4]
}

View File

@ -0,0 +1,29 @@
base_graphics spr771(771, "") {
// PALETTE_TILE_RED_PULSATING (red tile border pulsating)
recolour_sprite {
0x01..0x0C: 0xF0;
0x0D..0x0F: 0xEF;
0x10..0xFF: 0x00;
}
// PALETTE_SEL_TILE_RED (red tile border)
recolour_sprite {
0x01: 0xB2;
0x02..0x05: 0xB3;
0x06..0x07: 0xB4;
0x08..0x09: 0xB5;
0x0A..0x0D: 0xA3;
0x0E..0x0F: 0xA4;
0x10..0xFF: 0x00;
}
// PALETTE_SEL_TILE_BLUE (blue tile border)
recolour_sprite {
0x02..0x05: 0x01;
0x06..0x07: 0x80;
0x08..0x09: 0x81;
0x0A..0x0B: 0x83;
0x0C..0x0D: 0x84;
0x0E..0x0F: 0x85;
0x10..0xFF: 0x00;
}
}

View File

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

View File

@ -1,32 +1,3 @@
base_graphics spr771(771, "") {
// PALETTE_TILE_RED_PULSATING (red tile border pulsating)
recolour_sprite {
0x01..0x0C: 0xF0;
0x0D..0x0F: 0xEF;
0x10..0xFF: 0x00;
}
// PALETTE_SEL_TILE_RED (red tile border)
recolour_sprite {
0x01: 0xB2;
0x02..0x05: 0xB3;
0x06..0x07: 0xB4;
0x08..0x09: 0xB5;
0x0A..0x0D: 0xA3;
0x0E..0x0F: 0xA4;
0x10..0xFF: 0x00;
}
// PALETTE_SEL_TILE_BLUE (blue tile border)
recolour_sprite {
0x02..0x05: 0x01;
0x06..0x07: 0x80;
0x08..0x09: 0x81;
0x0A..0x0B: 0x83;
0x0C..0x0D: 0x84;
0x0E..0x0F: 0x85;
0x10..0xFF: 0x00;
}
}
#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;
#define CC1_RANGE(start) 0xC6..0xCD: start..start+7;
@ -831,31 +802,3 @@ base_graphics spr795(795, "") {
0xFF: 0x09;
}
}
// church recolouring
base_graphics spr1438(1438, "") {
recolour_sprite {
0x69: 0x46;
0x6A: 0x47;
0x6D: 0x4A;
0x6E: 0x4B;
0x72: 0x49;
0x74: 0x4C;
0x76: 0x4D;
0x77: 0x4E;
0x78: 0x4F;
0x7B: 0x48;
}
recolour_sprite {
0x69: 0x02;
0x6A: 0x21;
0x6D: 0x23;
0x6E: 0x24;
0x72: 0x22;
0x74: 0x24;
0x76: 0x25;
0x77: 0x26;
0x78: 0x27;
0x7B: 0x20;
}
}

View File

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

View File

@ -0,0 +1,27 @@
// church recolouring
base_graphics spr1438(1438, "") {
recolour_sprite {
0x69: 0x46;
0x6A: 0x47;
0x6D: 0x4A;
0x6E: 0x4B;
0x72: 0x49;
0x74: 0x4C;
0x76: 0x4D;
0x77: 0x4E;
0x78: 0x4F;
0x7B: 0x48;
}
recolour_sprite {
0x69: 0x02;
0x6A: 0x21;
0x6D: 0x23;
0x6E: 0x24;
0x72: 0x22;
0x74: 0x24;
0x76: 0x25;
0x77: 0x26;
0x78: 0x27;
0x7B: 0x20;
}
}

View File

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