Skip to content

Commit fc2ee2e

Browse files
committed
Feature: 4x zoom build stages, details and ground tiles for many temperate houses
1 parent a433d77 commit fc2ee2e

66 files changed

Lines changed: 231 additions & 65 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

baseset/nml/base/base-1420-houses-church.pnml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ base_graphics spr1430(1430, "../graphics/towns/temperate/64/pygen/flats_8bpp.png
4343
#32 #ez alternative_sprites(spr1430, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/towns/temperate/256/pygen/flats_bt32bpp.png") { template_spr1430(4) }
4444
base_graphics spr1433(1433, "../graphics/towns/temperate/64/pygen/flats_base_8bpp.png") { template_house_1x1(0, 0, 1, 74) } // (Ground tile)
4545
#32 alternative_sprites(spr1433, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/towns/temperate/64/pygen/flats_base_bt32bpp.png") { template_house_1x1(0, 0, 1, 74) }
46+
#ez alternative_sprites(spr1433, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/towns/temperate/256/pygen/flats_base_8bpp.png") { template_house_1x1(0, 0, 4, 74) }
47+
#32 #ez alternative_sprites(spr1433, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/towns/temperate/256/pygen/flats_base_bt32bpp.png") { template_house_1x1(0, 0, 4, 74) }
4648

4749
//1434-1437 church
4850
template template_spr1434(z) {
@@ -56,3 +58,5 @@ base_graphics spr1434(1434, "../graphics/towns/temperate/64/pygen/churches_8bpp.
5658
#32 #ez alternative_sprites(spr1434, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/towns/temperate/256/pygen/churches_rm32bpp.png", "../graphics/towns/temperate/256/pygen/churches_8bpp.png") { template_spr1434(4) }
5759
base_graphics spr1437(1437, "../graphics/towns/temperate/64/pygen/churches_base_8bpp.png") { template_house_1x1(0, 0, 1, 64) }
5860
#32 alternative_sprites(spr1437, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/towns/temperate/64/pygen/churches_base_bt32bpp.png") { template_house_1x1(0, 0, 1, 64) }
61+
#ez alternative_sprites(spr1437, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/towns/temperate/256/pygen/churches_base_8bpp.png") { template_house_1x1(0, 0, 4, 64) }
62+
#32 #ez alternative_sprites(spr1437, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/towns/temperate/256/pygen/churches_base_bt32bpp.png") { template_house_1x1(0, 0, 4, 64) }

baseset/nml/base/base-1440-houses.pnml

Lines changed: 60 additions & 2 deletions
Large diffs are not rendered by default.

baseset/nml/base/base-4404-houses-town-snow.pnml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
//4404-4405 cinema
33
base_graphics spr4404(4404, "../graphics/towns/temperate/64/pygen/theatreandcinema_base_8bpp.png") { template_house_1x1( 65, 0, 1, 69) }
44
#32 alternative_sprites(spr4404, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/towns/temperate/64/pygen/theatreandcinema_base_bt32bpp.png") { template_house_1x1( 65, 0, 1, 69) }
5+
#ez alternative_sprites(spr4404, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/towns/temperate/256/pygen/theatreandcinema_base_8bpp.png") { template_house_1x1( 65, 0, 4, 69) }
6+
#32 #ez alternative_sprites(spr4404, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/towns/temperate/256/pygen/theatreandcinema_base_bt32bpp.png") { template_house_1x1( 65, 0, 4, 69) }
57
base_graphics spr4405(4405, "../graphics/towns/temperate/64/pygen/theatreandcinema_8bpp.png") { template_house_1x1_anim( 65, 0, 1, 69) }
68
#32 alternative_sprites(spr4405, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/towns/temperate/64/pygen/theatreandcinema_rm32bpp.png", "../graphics/towns/temperate/64/pygen/theatreandcinema_8bpp.png") { template_house_1x1_anim( 65, 0, 1, 69) }
79
#ez alternative_sprites(spr4405, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/towns/temperate/256/pygen/theatreandcinema_8bpp.png") { template_house_1x1_anim( 65, 0, 4, 69) }

graphics/generate_graphics.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,16 @@ def copy_if_changed(source_path, target_directory):
190190
scale = 4
191191
if scale <= max_scale:
192192
current_path = os.path.join(base_path, "towns", "temperate", str(scale * 64))
193-
mask_tiles(os.path.join(current_path, "pygen", "2x1_hotel"), os.path.join(current_path, "2x1_hotel_tilemask.png"), scale)
193+
#### flatten
194+
flatten_list = ["bungalow"]
195+
for name in flatten_list:
196+
buildings_base_flatten(os.path.join(current_path, name), scale)
197+
#### tile mask
198+
mask_list = {
199+
"2x1_hotel": "2x1_hotel_tilemask.png",
200+
}
201+
for name, mask in mask_list.items():
202+
mask_tiles(os.path.join(current_path, "pygen", name), os.path.join(current_path, mask), scale)
194203
## tropical
195204
### scale 1
196205
scale = 1
Lines changed: 3 additions & 0 deletions
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:cc8b105e0097fa22c070e093ccfc16a20cf8341fbaee968be8f08d0313a863ca
3+
size 30586
Lines changed: 3 additions & 0 deletions
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f67a66b141584b0bbbfa372553d33889c596e3469328da245a6c82a019c541e2
3-
size 23151
2+
oid sha256:952d764dab3d622046cb4f7b9536eaa476a2d8107c098a81671fa01c15dd7970
3+
size 23245
Lines changed: 2 additions & 2 deletions
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:38ab2ea8703288a8faf0864bc864ba882d27cb729ee434043de6eb95ebecd350
3+
size 23825

0 commit comments

Comments
 (0)