Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions baseset/nml/base/base-1420-houses-church.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ base_graphics spr1430(1430, "../graphics/towns/temperate/64/pygen/flats_8bpp.png
#32 #ez alternative_sprites(spr1430, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/towns/temperate/256/pygen/flats_bt32bpp.png") { template_spr1430(4) }
base_graphics spr1433(1433, "../graphics/towns/temperate/64/pygen/flats_base_8bpp.png") { template_house_1x1(0, 0, 1, 74) } // (Ground tile)
#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) }
#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) }
#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) }

//1434-1437 church
template template_spr1434(z) {
Expand All @@ -56,3 +58,5 @@ base_graphics spr1434(1434, "../graphics/towns/temperate/64/pygen/churches_8bpp.
#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) }
base_graphics spr1437(1437, "../graphics/towns/temperate/64/pygen/churches_base_8bpp.png") { template_house_1x1(0, 0, 1, 64) }
#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) }
#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) }
#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) }
62 changes: 60 additions & 2 deletions baseset/nml/base/base-1440-houses.pnml

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions baseset/nml/base/base-4404-houses-town-snow.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
//4404-4405 cinema
base_graphics spr4404(4404, "../graphics/towns/temperate/64/pygen/theatreandcinema_base_8bpp.png") { template_house_1x1( 65, 0, 1, 69) }
#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) }
#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) }
#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) }
base_graphics spr4405(4405, "../graphics/towns/temperate/64/pygen/theatreandcinema_8bpp.png") { template_house_1x1_anim( 65, 0, 1, 69) }
#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) }
#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) }
Expand Down
11 changes: 10 additions & 1 deletion graphics/generate_graphics.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,16 @@ def copy_if_changed(source_path, target_directory):
scale = 4
if scale <= max_scale:
current_path = os.path.join(base_path, "towns", "temperate", str(scale * 64))
mask_tiles(os.path.join(current_path, "pygen", "2x1_hotel"), os.path.join(current_path, "2x1_hotel_tilemask.png"), scale)
#### flatten
flatten_list = ["bungalow"]
for name in flatten_list:
buildings_base_flatten(os.path.join(current_path, name), scale)
#### tile mask
mask_list = {
"2x1_hotel": "2x1_hotel_tilemask.png",
}
for name, mask in mask_list.items():
mask_tiles(os.path.join(current_path, "pygen", name), os.path.join(current_path, mask), scale)
## tropical
### scale 1
scale = 1
Expand Down
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/bungalow_base_overlaynormal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/bungalow_base_shape.pdn
Git LFS file not shown
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/bungalow_base_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/bungalow_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/bungalow_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/churches_base_shape.pdn
Git LFS file not shown
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/churches_base_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/churches_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/churches_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/cottages_base_overlaynormal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/cottages_base_shape.pdn
Git LFS file not shown
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/cottages_base_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/flats_base_overlaynormal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/flats_base_shape.pdn
Git LFS file not shown
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/flats_base_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/flats_overlaynormal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/flats_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/flats_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Git LFS file not shown
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/houses_arranged_base_shape.pdn
Git LFS file not shown
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/houses_arranged_base_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/houses_arranged_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/houses_arranged_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/oldhouses_base_overlaynormal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/oldhouses_base_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/oldhouses_base_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/oldhouses_overlaynormal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/oldhouses_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/oldhouses_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/shopsandoffices_base_shape.pdn
Git LFS file not shown
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/shopsandoffices_base_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/shopsandoffices_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/shopsandoffices_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/theatreandcinema_base_shape.pdn
Git LFS file not shown
3 changes: 3 additions & 0 deletions graphics/towns/temperate/256/theatreandcinema_base_shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Git LFS file not shown
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/theatreandcinema_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/theatreandcinema_shape.png
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/townhouses_arranged_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/256/townhouses_arranged_shape.png
4 changes: 2 additions & 2 deletions graphics/towns/temperate/64/bungalow_base_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/64/bungalow_base_shape.png
4 changes: 2 additions & 2 deletions graphics/towns/temperate/64/churches_base_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/64/churches_base_shape.png
4 changes: 2 additions & 2 deletions graphics/towns/temperate/64/cottages_base_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/64/flats_base_shape.pdn
Git LFS file not shown
4 changes: 2 additions & 2 deletions graphics/towns/temperate/64/oldhouses_base_overlaynormal.png
4 changes: 2 additions & 2 deletions graphics/towns/temperate/64/theatreandcinema_base_shape.pdn
Git LFS file not shown
Git LFS file not shown
2 changes: 1 addition & 1 deletion templates/zoom-sensitive.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ template template_general(x, y, w, h, ox, oy, z) {

//Template for house sprite with additional offset
template template_house_1x1_addoffs_master(x, y, z, h, ox, oy, flags) {
[ 1*z+x*z, 1*z+y*z, 64*z, h*z+z-1, -31*z+ox*z, 32*z-h*z+oy*z-int((z-1)/2)-1, flags]
[ 1*z+x*z, 1*z+y*z, 64*z, h*z+z-1, -31*z+ox*z, 32*z-h*z+oy*z-z, flags]
}
template template_house_1x1_addoffs(x, y, z, h, ox, oy) {
template_house_1x1_addoffs_master(x, y, z, h, ox, oy, 0)
Expand Down