alysbrooks-public » games » isometric-park-fna

Commit r524:755c9e3991d6 public

parent | child
Description:
Experiment with merged set.
Commit status:
[Not Reviewed]
References:
m6-tiles-and-trees
Diff options:
Raw Diff | Patch Diff | Download Diff
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment
Browse Files

r524:755c9e3991d6 -

Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: new file 100644, binary diff hidden
NO CONTENT: new file 100644, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: new file 100644, binary diff hidden
NO CONTENT: new file 100644, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -29,6 +29,7
29 isometric-park-fna/Content/images/crops/*
29 isometric-park-fna/Content/images/crops/*
30 isometric-park-fna/Content/Portraits/converted/*
30 isometric-park-fna/Content/Portraits/converted/*
31 isometric-park-fna/Content/Portraits/crops/*
31 isometric-park-fna/Content/Portraits/crops/*
32 isometric-park-fna/Content/Pak64/split/*
32 isometric-park-fna/DynamicLanguageRuntime.1.3.0/*
33 isometric-park-fna/DynamicLanguageRuntime.1.3.0/*
33 isometric-park-fna/IronPython.2.7.11/
34 isometric-park-fna/IronPython.2.7.11/
34 **.patch
35 **.patch
Show file before | Show file after | Show commentsHide comments
@@ -26,6 +26,33
26
26
27 #PIPELINE
27 #PIPELINE
28
28
29 ##Paks
30
31 ##I do some dubious things here to adopt Make to a workflow that generates multiple output files per input file, which
32 ##is not Make's strong suit.
33
34 isometric-park-fna/Content/Pak64/split/%.png: isometric-park-fna/Content/Pak64/%.png
35 convert $< -transparent '#e7ffff' -crop 64x64 isometric-park-fna/Content/Pak64/split/$*"%02d.png"
36 cp isometric-park-fna/Content/Pak64/split/$*00.png $@
37
38 isometric-park-fna/Content/pak64_tileset.png: $(shell find -ipath "*isometric-park-fna/Content/Pak64/*.png" -and -not -ipath "*split*" | sed "s:Pak64/:Pak64/split/:" |sort)
39 rm $^
40 montage isometric-park-fna/Content/Pak64/split/* -background transparent -tile 5 -geometry +0+0 -gravity north PNG8:$@
41 touch $^
42
43
44 pak: isometric-park-fna/Content/pak64_tileset.png
45
46
47 ## Merged
48
49 isometric-park-fna/Content/merged_tileset.png: isometric-park-fna/Content/pak64_tileset.png
50 montage isometric-park-fna/Content/part4_tileset.png $^ -background transparent -geometry +0+0 -tile 1x2 PNG8:isometric-park-fna/Content/merged_tileset.png
51
52 merged: isometric-park-fna/Content/merged_tileset.png
53
54 ##Portraits
55
29 isometric-park-fna/Content/Portraits/converted/%.png: isometric-park-fna/Content/Portraits/%.jpg
56 isometric-park-fna/Content/Portraits/converted/%.png: isometric-park-fna/Content/Portraits/%.jpg
30 convert $< -resize 500x500\> -dither FloydSteinberg -colors 8 -colorspace gray $@
57 convert $< -resize 500x500\> -dither FloydSteinberg -colors 8 -colorspace gray $@
31
58
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -732,10 +732,10
732 if (this.simulation.map.cells[i][j].HasTree)
732 if (this.simulation.map.cells[i][j].HasTree)
733 { //until we actually simulate:
733 { //until we actually simulate:
734 if (this.simulation.map.cells[i][j].Type == TreeType.GenericDeciduous) {
734 if (this.simulation.map.cells[i][j].Type == TreeType.GenericDeciduous) {
735 drawTileAt(i, j, 183, 1);
735 drawTileAt(i, j, 173, 1);
736 }
736 }
737 else {
737 else {
738 drawTileAt(i, j, 122, 2);
738 drawTileAt(i, j, 203, 1); //122
739 }
739 }
740 // if ((i + j) % 8 == 0)
740 // if ((i + j) % 8 == 0)
741 // {
741 // {
You need to be logged in to leave comments. Login now