alysbrooks-public » games » isometric-park-fna

Commit r523:58398e94f44c public

parent | child
Description:
Add merged tileset for experimentation.
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

r523:58398e94f44c -

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
@@ -193,7 +193,8
193 #if DEBUG
193 #if DEBUG
194 sound = Content.Load<SoundEffect>("FNASound");
194 sound = Content.Load<SoundEffect>("FNASound");
195 #endif
195 #endif
196 Tile.TileSetTexture = Content.Load<Texture2D>(@"part4_tileset");
196 // Tile.TileSetTexture = Content.Load<Texture2D>(@"part4_tileset");
197 Tile.TileSetTexture = Content.Load<Texture2D>(@"merged_tileset");
197 var texture = Content.Load<Texture2D>(@"solid_tileset");
198 var texture = Content.Load<Texture2D>(@"solid_tileset");
198
199
199 var imageMapTexture = Content.Load<Texture2D>(@"photos_converted3");
200 var imageMapTexture = Content.Load<Texture2D>(@"photos_converted3");
@@ -731,7 +732,7
731 if (this.simulation.map.cells[i][j].HasTree)
732 if (this.simulation.map.cells[i][j].HasTree)
732 { //until we actually simulate:
733 { //until we actually simulate:
733 if (this.simulation.map.cells[i][j].Type == TreeType.GenericDeciduous) {
734 if (this.simulation.map.cells[i][j].Type == TreeType.GenericDeciduous) {
734 drawTileAt(i, j, 142, 2);
735 drawTileAt(i, j, 183, 1);
735 }
736 }
736 else {
737 else {
737 drawTileAt(i, j, 122, 2);
738 drawTileAt(i, j, 122, 2);
Show file before | Show file after | Show commentsHide comments
@@ -90,7 +90,10
90 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
90 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
91 </None>
91 </None>
92 <None Include="packages.config" />
92 <None Include="packages.config" />
93 <None Include="Content\part4_tileset.png">
93 <!-- <None Include="Content\part4_tileset.png"> -->
94 <!-- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> -->
95 <!-- </None> -->
96 <None Include="Content\merged_tileset.png">
94 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
97 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
95 </None>
98 </None>
96 <None Include="Content\solid_tileset.png">
99 <None Include="Content\solid_tileset.png">
You need to be logged in to leave comments. Login now