From ccf93225d445699feb420c8c86aca31dee71253e Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Wed, 18 May 2022 23:58:18 -0400 Subject: [PATCH] blades-engine fix kiss parts being ignored --- projects/blades-engine/source/data/ScenData.hx | 2 -- projects/blades-engine/source/data/TerrainData.hx | 2 ++ projects/blades-engine/source/data/TerrainData.kiss | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/blades-engine/source/data/ScenData.hx b/projects/blades-engine/source/data/ScenData.hx index b7a7c76f..987fc335 100644 --- a/projects/blades-engine/source/data/ScenData.hx +++ b/projects/blades-engine/source/data/ScenData.hx @@ -29,11 +29,9 @@ class ScenData { assert(floorData[95].name == "Floor", "floor is floor"); assert(floorData[95].which_sheet == 704, "floor gets the right spritesheet"); - trace(floorData[129]); assert(floorData[129].name == "Floor", "floors can import other floors' data"); assert(floorData[129].which_sheet == 704, "floors can import other floors' data"); assert(floorData[129].specialProperty() == BlockedToNPCs, "blocked special property becomes enum"); - trace(terrainData[12].name); assert(terrainData[12].name == "Door", "door is door"); trace('$passed assertions passed'); diff --git a/projects/blades-engine/source/data/TerrainData.hx b/projects/blades-engine/source/data/TerrainData.hx index 05a643c7..5acbebe6 100644 --- a/projects/blades-engine/source/data/TerrainData.hx +++ b/projects/blades-engine/source/data/TerrainData.hx @@ -6,6 +6,7 @@ using Reflect; import data.FloorData; import flixel.input.keyboard.FlxKey; +import kiss.Prelude; enum Direction { North; @@ -58,6 +59,7 @@ enum TerrainSpecialProperty { QuickFlammable; } +@:build(kiss.Kiss.build()) class TerrainData { public function new() {} diff --git a/projects/blades-engine/source/data/TerrainData.kiss b/projects/blades-engine/source/data/TerrainData.kiss index 0e339662..0f39e016 100644 --- a/projects/blades-engine/source/data/TerrainData.kiss +++ b/projects/blades-engine/source/data/TerrainData.kiss @@ -42,4 +42,5 @@ (42 ShimmerLightAndDark) (43 (Waterfall South)) (44 (Waterfall East)) - (45 QuickFlammable))) \ No newline at end of file + (45 QuickFlammable) + (otherwise (throw "undefined special_property")))) \ No newline at end of file