From 89db07cb0a9b7f0584cc5361db4c216706b21823 Mon Sep 17 00:00:00 2001 From: nek0 Date: Sat, 2 Feb 2019 21:25:22 +0100 Subject: [PATCH] meow --- .../{CabinetCorner.kra => cabinetCorner.kra} | Bin .../{CabinetCorner.png => cabinetCorner.png} | Bin src/Floorplan.hs | 8 ++++---- src/Types/Entity.hs | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) rename assets/cabinet/{CabinetCorner.kra => cabinetCorner.kra} (100%) rename assets/cabinet/{CabinetCorner.png => cabinetCorner.png} (100%) diff --git a/assets/cabinet/CabinetCorner.kra b/assets/cabinet/cabinetCorner.kra similarity index 100% rename from assets/cabinet/CabinetCorner.kra rename to assets/cabinet/cabinetCorner.kra diff --git a/assets/cabinet/CabinetCorner.png b/assets/cabinet/cabinetCorner.png similarity index 100% rename from assets/cabinet/CabinetCorner.png rename to assets/cabinet/cabinetCorner.png diff --git a/src/Floorplan.hs b/src/Floorplan.hs index 90b3f41..7d343ef 100644 --- a/src/Floorplan.hs +++ b/src/Floorplan.hs @@ -81,10 +81,10 @@ buildElevator fc (gen, empty) = boxCoord x = (,) <$> [row - x .. row + x] <*> [col - x .. col + x] buildShaft = foldl (\acc coord -> M.setElem (replaceTile (acc M.! coord) Hall) coord acc) - (foldl (flip $ M.setElem Wall) empty (boxCoord 2)) - (boxCoord 5) - elvDoor = M.setElem Door (row + 2, col) buildShaft - in (gen, foldl ( flip $ M.setElem Elev) elvDoor (boxCoord 1)) + (foldl (flip $ M.setElem Wall) empty (boxCoord 1)) + (boxCoord 3) + elvDoor = M.setElem Door (row + 1, col) buildShaft + in (gen, foldl ( flip $ M.setElem Elev) elvDoor (boxCoord 0)) placeHalls :: StdGen diff --git a/src/Types/Entity.hs b/src/Types/Entity.hs index b6317ac..d661578 100644 --- a/src/Types/Entity.hs +++ b/src/Types/Entity.hs @@ -26,6 +26,7 @@ data Entity f = Entity , npcWorkplace :: Component f 'Field ReachPoint , npcActionState :: Component f 'Field NPCActionState , npcStats :: Component f 'Field NPCStats + , npcClearanceLvl :: Component f 'Field Int , anim :: Component f 'Field AnimState , objAccess :: Component f 'Field ((V2 Int), Direction) , objType :: Component f 'Field ObjType