Door

assets/testmap.json

@@ -1,19 +1,25 @@
 {
-  "width": 10,
+  "width": 16,
-  "height": 10,
+  "height": 16,
   "layers": [
     {
       "tiles": [
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 5, 5, 5, 5, 5, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 5, 5, 5, 5, 5, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
       ]
     }
   ],
@@ -25,16 +31,21 @@
     },
     {
       "type": 2,
-      "x": 3,
+      "x": 9,
-      "y": 3,
+      "y": 9,
       "name": "Bob",
       "text": "Hello, I am Bob."
     },
     {
       "type": 3,
-      "x": 6,
+      "x": 3,
-      "y": 6,
+      "y": 8,
       "text": "This is a sign."
+    },
+    {
+      "type": 4,
+      "x": 6,
+      "y": 8
     }
   ]
 }

src/dawn/display/color.c

@@ -16,7 +16,9 @@ const color4f_t COLOR4F_COLOR_MAP[COLOR_COUNT] = {
   COLOR4F(0.0f, 0.0f, 0.8f, 1.0f),
   COLOR4F(0.8f, 0.8f, 0.0f, 1.0f),
   COLOR4F(0.8f, 0.0f, 0.8f, 1.0f),
-  COLOR4F(0.0f, 0.8f, 0.8f, 1.0f)
+  COLOR4F(0.0f, 0.8f, 0.8f, 1.0f),
+  COLOR4F(0.5f, 0.5f, 0.5f, 1.0f),
+  COLOR4F(0.5f, 0.25f, 0.0f, 1.0f)
 };
 
 void color4fCopy(const color4f_t src, color4f_t dest) {

src/dawn/display/color.h

@@ -20,8 +20,10 @@ typedef float_t color4f_t[4];
 #define COLOR_YELLOW 0x05
 #define COLOR_MAGENTA 0x06
 #define COLOR_CYAN 0x07
+#define COLOR_GRAY 0x08
+#define COLOR_BROWN 0x09
 
-#define COLOR_COUNT COLOR_CYAN+1
+#define COLOR_COUNT COLOR_BROWN+1
 
 #define COLOR3F(r,g,b) ((color3f_t){ r, g, b })
 #define COLOR3F_RED COLOR3F(1, 0, 0)

src/dawn/display/symbol.c

@@ -12,9 +12,16 @@
 
 char_t symbolGetCharByEntity(const entity_t *ent) {
   assertNotNull(ent, "Entity cannot be NULL.");
-  
+
-  if(ent->type == ENTITY_TYPE_SIGN) {
+  switch(ent->type) {
-    return '+';
+    case ENTITY_TYPE_SIGN:
+      return '+';
+
+    case ENTITY_TYPE_DOOR:
+      return 'D';
+
+    default:
+      break;
   }
 
   switch(ent->direction) {
@@ -29,10 +36,13 @@ char_t symbolGetCharByEntity(const entity_t *ent) {
 
 char_t symbolGetCharByTile(const tile_t tile) {
   switch(tile) {
-    case TILE_ID_GRASS:
+    case TILE_NULL:
+      return ' ';
+
+    case TILE_GRASS:
       return '#';
 
-    case TILE_ID_WATER:
+    case TILE_WATER:
       int32_t j = (int32_t)(TIME.time * 2) % 4;
       switch(j) {
         case 0: return '/';
@@ -41,8 +51,14 @@ char_t symbolGetCharByTile(const tile_t tile) {
         case 3: return '|';
       }
 
+    case TILE_BUILDING_WALL:
+      return '-';
+
+    case TILE_ROOF:
+      return '/';
+
     default:
-      return ' ';
+      assertUnreachable("Unknown char for tile.");
   }
 }
 
@@ -53,11 +69,14 @@ uint8_t symbolGetColorByEntity(const entity_t *ent) {
       return COLOR_RED;
 
     case ENTITY_TYPE_NPC:
-      return COLOR_YELLOW;
+      return COLOR_MAGENTA;
     
     case ENTITY_TYPE_SIGN:
       return COLOR_YELLOW;
 
+    case ENTITY_TYPE_DOOR:
+      return COLOR_BROWN;
+
     default:
       assertUnreachable("Invalid entity type.");
   }
@@ -65,13 +84,22 @@ uint8_t symbolGetColorByEntity(const entity_t *ent) {
 
 uint8_t symbolGetColorByTile(const tile_t tile) {
   switch(tile) {
-    case TILE_ID_GRASS:
+    case TILE_NULL:
+      return COLOR_BLACK;
+
+    case TILE_GRASS:
       return COLOR_GREEN;
 
-    case TILE_ID_WATER:
+    case TILE_WATER:
       return COLOR_BLUE;
+
+    case TILE_BUILDING_WALL:
+      return COLOR_GRAY;
+
+    case TILE_ROOF:
+      return COLOR_BROWN;
     
     default:
-      return COLOR_BLACK;
+      assertUnreachable("Unknown color for tile.");
   }
 }

src/dawn/rpg/entity/CMakeLists.txt

@@ -14,4 +14,5 @@ target_sources(${DAWN_TARGET_NAME}
     sign.c
     interact.c
     npc.c
+    door.c
 )

src/dawn/rpg/entity/door.c

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) 2024 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "door.h"
+#include "assert/assert.h"
+
+void doorInit(door_t *door) {
+  assertNotNull(door, "Door cannot be NULL.");
+  door->bruv = 0;
+}

src/dawn/rpg/entity/door.h

@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2024 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "dawn.h"
+
+typedef struct {
+  uint8_t bruv;
+} door_t;
+
+/**
+ * Initializes a door.
+ * 
+ * @param door Door to initialize.
+ */
+void doorInit(door_t *door);

src/dawn/rpg/entity/entity.c

@@ -37,6 +37,10 @@ void entityInit(
       signInit(&entity->sign);
       break;
 
+    case ENTITY_TYPE_DOOR:
+      doorInit(&entity->door);
+      break;
+
     case ENTITY_TYPE_PLAYER:
       playerInit(entity);
       break;

src/dawn/rpg/entity/entity.h

@@ -10,6 +10,7 @@
 #include "sign.h"
 #include "entitydirection.h"
 #include "npc.h"
+#include "door.h"
 
 typedef struct _map_t map_t;
 
@@ -17,7 +18,8 @@ typedef enum {
   ENTITY_TYPE_NULL = 0,
   ENTITY_TYPE_PLAYER = 1,
   ENTITY_TYPE_NPC = 2,
-  ENTITY_TYPE_SIGN = 3
+  ENTITY_TYPE_SIGN = 3,
+  ENTITY_TYPE_DOOR = 4
 } entitytype_t;
 
 typedef enum {
@@ -49,6 +51,7 @@ typedef struct _entity_t {
     player_t player;
     npc_t npc;
     sign_t sign;
+    door_t door;
   };
 } entity_t;
 

src/dawn/rpg/entity/interact.c

@@ -15,10 +15,11 @@ void entityInteractEntity(
   assertNotNull(source, "entityInteractEntity: Source is NULL!");
   assertNotNull(target, "entityInteractEntity: Target is NULL!");
 
+  source->state = ENTITY_STATE_TALKING;
+  target->state = ENTITY_STATE_TALKING;
+
   switch(target->type) {
     case ENTITY_TYPE_NPC:
-      source->state = ENTITY_STATE_TALKING;
-      target->state = ENTITY_STATE_TALKING;
       target->direction = entityDirectionLookAt(
         target->x, target->y,
         source->x, source->y
@@ -27,11 +28,13 @@ void entityInteractEntity(
       return;
 
     case ENTITY_TYPE_SIGN:
-      source->state = ENTITY_STATE_TALKING;
-      target->state = ENTITY_STATE_TALKING;
       textboxSetText("Sign", target->sign.text);
       return;
 
+    case ENTITY_TYPE_DOOR:
+      textboxSetText("Door", "It's a door.");
+      return;
+
     default:
       return;
   }
@@ -44,10 +47,11 @@ void entityInteractTile(
   assertNotNull(source, "entityInteractTile: Source is NULL!");
 
   switch(tile) {
-    case TILE_ID_WATER:
+    case TILE_WATER:
-      textboxSetText(NULL, "You cannot swim.");
+      textboxSetText(NULL, "A refreshing pool of water.");
       source->state = ENTITY_STATE_TALKING;
       return;
+
     default:
       break;
   }

src/dawn/rpg/world/tile.c

@@ -9,8 +9,11 @@
 
 bool_t tileIsSolid(const tile_t tile) {
   switch(tile) {
-    case TILE_ID_WATER:
+    case TILE_WATER:
+    case TILE_BUILDING_WALL:
+    case TILE_ROOF:
       return true;
+
       
     default:
       return false;

src/dawn/rpg/world/tile.h

@@ -9,9 +9,12 @@
 #include "dawn.h"
 
 typedef enum {
-  TILE_ID_NULL = 0,
+  TILE_NULL = 0,
-  TILE_ID_GRASS = 1,
+  TILE_GRASS = 1,
-  TILE_ID_WATER = 2
+  TILE_WATER = 2,
+  // TILE_DOOR = 3,
+  TILE_BUILDING_WALL = 4,
+  TILE_ROOF = 5
 } tile_t;
 
 /**