Terncode/pixel.horse
1
0
Fork 0
mirror of https://github.com/Terncode/pixel.horse.git synced 2026-09-24 21:55:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #98 from BytewaveMLP/tools-map-season

Browse Source 
Use season in entity draw options for map renderer tool
This commit is contained in:
Eliot Partridge
2019-09-08 23:40:30 -05:00
committed by GitHub
parent 8570ea160d 53cfac5bf0
commit 93cc84e626
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ts/components/tools/tools-map/tools-map.ts
+4 -3
View File
@@ -6,7 +6,7 @@ import { tileHeight, tileWidth, REGION_SIZE } from '../../../common/constants';
import { faHome } from '../../../client/icons'; import { faHome } from '../../../client/icons';
import { updateMap, getTile, createWorldMap, setRegion, setTile } from '../../../common/worldMap'; import { updateMap, getTile, createWorldMap, setRegion, setTile } from '../../../common/worldMap';
import { import {
Season, DrawOptions, defaultDrawOptions, EntityFlags, Entity, WorldMap, defaultWorldState, MapType, MapFlags Season, DrawOptions, defaultDrawOptions, EntityFlags, Entity, WorldMap, MapType, MapFlags
} from '../../../common/interfaces'; } from '../../../common/interfaces';
import { drawCanvas } from '../../../graphics/contextSpriteBatch'; import { drawCanvas } from '../../../graphics/contextSpriteBatch';
import { paletteSpriteSheet } from '../../../generated/sprites'; import { paletteSpriteSheet } from '../../../generated/sprites';
@@ -138,6 +138,7 @@ function drawTheMap(canvas: HTMLCanvasElement, map: WorldMap, info: ToolsMapOthe
...defaultDrawOptions, ...defaultDrawOptions,
tileGrid: grid, tileGrid: grid,
shadowColor: getShadowColor(lightData, HOUR_LENGTH * 12), shadowColor: getShadowColor(lightData, HOUR_LENGTH * 12),
season: info.season
}; };
const ignoreTypes = [ const ignoreTypes = [
@@ -149,7 +150,7 @@ function drawTheMap(canvas: HTMLCanvasElement, map: WorldMap, info: ToolsMapOthe
}; };
map.entitiesDrawable = info.entities map.entitiesDrawable = info.entities
.map(({ type, id, x, y }) => createAnEntity(type, id, x, y, {}, mockPaletteManager, defaultWorldState)) .map(({ type, id, x, y }) => createAnEntity(type, id, x, y, {}, mockPaletteManager, { season: info.season }))
.filter(shouldDraw); .filter(shouldDraw);
updateMap(map, 0); updateMap(map, 0);
@@ -183,7 +184,7 @@ function drawMinimap(canvas: HTMLCanvasElement, map: WorldMap, info: ToolsMapOth
} }
map.entities = info.entities map.entities = info.entities
.map(({ type, id, x, y }) => createAnEntity(type, id, x, y, {}, mockPaletteManager, defaultWorldState)); .map(({ type, id, x, y }) => createAnEntity(type, id, x, y, {}, mockPaletteManager, { season: info.season }));
for (let i = 1; i <= 2; i++) { for (let i = 1; i <= 2; i++) {
for (const e of map.entities) { for (const e of map.entities) {