about to start work on downtown

assets/en.json

@@ -8,15 +8,15 @@
   "tiles": {
     "water": {
       "interact": "A refreshing body of water."
+    },
+    "lamp": {
+      "interact": "An electric lamp.\nA real lightbulb idea."
+    },
+    "rail": {
+      "interact": "Train tracks.\n...Better not cross them."
     }
   },
   "entities": {
-    "sign": {
-      "name": "Sign"
-    },
-    "bob": {
-      "name": "Bob"
-    }
   },
   "maps": {
     "testmap": {
@@ -26,6 +26,11 @@
         "1": "This is another sign.",
         "2": "It has two lines."
       }
+    },
+    "train_station": {
+      "stair_sign": {
+        "0": "Stairs slippery when wet.\n\n<- West to Town.\n-> East to lakefront."
+      }
     }
   }
 }

assets/maps/downtown.tmx

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="10" height="10" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
+ <layer id="1" name="Tile Layer 1" width="10" height="10">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+</map>

assets/maps/train_station.tmx

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="40" height="30" tilewidth="8" tileheight="8" infinite="0" nextlayerid="3" nextobjectid="1">
+<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="40" height="30" tilewidth="8" tileheight="8" infinite="0" nextlayerid="3" nextobjectid="3">
  <tileset firstgid="1" source="../tilemaps/tilemap.tsx"/>
- <layer id="1" name="Tile Layer 1" width="40" height="30" offsetx="-10" offsety="-0.333333">
+ <tileset firstgid="65" source="../tilemaps/entities.tsx"/>
+ <layer id="1" name="Tile Layer 1" width="40" height="30" locked="1" offsetx="0.33609" offsety="0.333511">
   <data encoding="csv">
 0,0,0,0,0,0,12,13,12,0,12,13,12,0,0,0,12,13,12,0,0,0,12,13,12,0,0,0,12,13,12,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,12,13,12,0,12,13,12,0,0,0,12,13,12,0,0,0,12,13,12,0,0,0,12,13,12,0,0,0,0,0,0,0,0,0,
@@ -18,16 +19,16 @@
 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,8,8,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-0,0,0,0,11,0,12,13,12,11,12,13,12,0,11,0,0,0,0,11,0,9,9,0,11,0,0,0,0,11,0,0,0,0,11,0,0,0,0,0,
+0,0,0,0,11,0,12,13,12,11,12,13,12,0,11,0,0,0,0,11,0,9,9,0,11,0,0,0,0,11,0,0,0,0,11,0,0,0,0,11,
-0,0,0,0,11,0,12,13,12,11,12,13,12,0,11,0,0,0,0,11,0,9,9,0,11,0,0,0,0,11,0,6,6,6,6,6,0,0,0,0,
+0,0,0,0,11,0,12,13,12,11,12,13,12,0,11,0,0,0,0,11,0,9,9,0,11,0,0,0,0,11,0,0,6,6,6,6,0,0,0,11,
-0,0,10,8,11,8,12,13,12,11,12,13,12,8,11,8,8,8,8,11,8,9,9,8,11,8,8,8,8,11,8,6,6,6,6,6,0,0,0,0,
+0,0,10,8,11,8,12,13,12,11,12,13,12,8,11,8,8,8,8,11,8,9,9,8,11,8,8,8,8,11,8,6,6,6,6,6,6,0,0,11,
-0,0,10,8,8,8,12,13,12,0,12,13,12,8,8,8,15,8,8,8,8,9,9,8,8,8,8,8,8,8,8,6,6,6,6,6,0,0,0,0,
+0,0,10,8,8,8,12,13,12,0,12,13,12,8,8,8,15,8,8,8,8,9,9,8,8,8,8,15,8,8,8,6,6,6,6,6,6,0,0,0,
-0,0,10,8,8,8,12,13,12,0,12,13,12,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,6,6,6,6,6,0,0,0,0,
+0,0,10,8,8,8,12,13,12,0,12,13,12,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,6,6,6,6,6,6,0,0,0,
-0,0,10,8,8,8,12,13,12,0,12,13,12,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,6,6,6,6,6,0,0,0,0,
+0,0,10,8,8,8,12,13,12,0,12,13,12,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,6,6,6,6,6,6,0,0,0,
-0,0,10,8,8,8,12,13,12,10,12,13,12,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,14,6,6,6,6,6,0,0,0,0,
+0,0,10,8,8,8,12,13,12,10,12,13,12,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,14,6,6,5,5,6,6,0,0,0,
-0,0,10,8,15,8,12,13,12,8,12,13,12,8,8,8,15,8,8,8,8,8,8,8,8,8,8,8,8,8,14,5,5,5,5,5,0,0,0,0,
+0,0,10,8,15,8,12,13,12,8,12,13,12,8,8,8,15,8,8,8,8,8,8,8,8,8,8,15,8,8,14,5,5,5,5,5,5,0,0,0,
-0,0,10,8,8,8,12,13,12,8,12,13,12,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,5,5,5,5,5,0,0,0,0,
+0,0,10,8,8,8,12,13,12,8,12,13,12,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,5,5,5,5,5,5,0,0,0,
-0,0,10,10,10,10,12,13,12,10,12,13,12,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,0,0,0,0,
+0,0,10,10,10,10,12,13,12,10,12,13,12,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,5,5,5,5,5,5,0,0,0,
 0,0,0,0,0,0,12,13,12,0,12,13,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,12,13,12,0,12,13,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,12,13,12,0,12,13,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -35,5 +36,12 @@
 0,0,0,0,0,0,12,13,12,0,12,13,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <objectgroup id="2" name="Entities"/>
+ <objectgroup id="2" name="Entities" offsetx="0.333422" offsety="0.333422">
+  <object id="1" name="Player" type="player" gid="66" x="111.812" y="167.507" width="8" height="8"/>
+  <object id="2" name="Stairs Sign" type="sign" gid="68" x="183.883" y="151.787" width="8" height="8">
+   <properties>
+    <property name="text_0" value="maps.train_station.stair_sign.0"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>

assets/tiled_project.tiled-session

@@ -3,10 +3,11 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "maps/train_station.tmx",
+    "activeFile": "tilemaps/entities.tsx",
     "expandedProjectPaths": [
         "maps",
-        "."
+        ".",
+        "tilemaps"
     ],
     "file.lastUsedOpenFilter": "All Files (*)",
     "fileStates": {
@@ -17,6 +18,14 @@
             "scaleInDock": 1,
             "scaleInEditor": 1
         },
+        "maps/downtown.tmx": {
+            "scale": 4.9072,
+            "selectedLayer": 0,
+            "viewCenter": {
+                "x": 49.31529181610695,
+                "y": 54.002282360612995
+            }
+        },
         "maps/testmap.tmx": {
             "expandedObjectLayers": [
                 2
@@ -40,11 +49,14 @@
             }
         },
         "maps/train_station.tmx": {
-            "scale": 3,
+            "expandedObjectLayers": [
-            "selectedLayer": 0,
+                2
+            ],
+            "scale": 2.7603,
+            "selectedLayer": 1,
             "viewCenter": {
-                "x": 67.66666666666666,
+                "x": 85.49795312103754,
-                "y": 49.333333333333314
+                "y": 157.22928667173855
             }
         },
         "testmap.tmx": {
@@ -68,10 +80,11 @@
             "scaleInEditor": 4
         },
         "tilemaps/entities.tsx": {
-            "scaleInDock": 1
+            "scaleInDock": 2,
+            "scaleInEditor": 9.7785
         },
         "tilemaps/tilemap.tsx": {
-            "scaleInDock": 1
+            "scaleInDock": 2
         }
     },
     "last.externalTilesetPath": "/home/yourwishes/htdocs/Dawn/assets",
@@ -82,16 +95,18 @@
     "map.tileWidth": 8,
     "map.width": 10,
     "openFiles": [
-        "maps/testmap.tmx",
+        "maps/train_station.tmx",
-        "maps/testmap2.tmx",
+        "tilemaps/entities.tsx",
-        "maps/train_station.tmx"
+        "maps/downtown.tmx"
     ],
     "project": "tiled_project.tiled-project",
     "property.type": "string",
     "recentFiles": [
+        "maps/train_station.tmx",
+        "maps/downtown.tmx",
+        "tilemaps/entities.tsx",
         "maps/testmap.tmx",
-        "maps/testmap2.tmx",
+        "maps/testmap2.tmx"
-        "maps/train_station.tmx"
     ],
     "tileset.lastUsedFilter": "All Files (*)",
     "tileset.lastUsedFormat": "tsx",

assets/tilemaps/entities.tsx

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tileset version="1.10" tiledversion="1.11.0" name="entities" tilewidth="8" tileheight="8" tilecount="64" columns="8">
  <image source="entities.png" width="64" height="64"/>
+ <tile id="1" type="player"/>
+ <tile id="2" type="npc"/>
+ <tile id="3" type="sign"/>
+ <tile id="4" type="door"/>
 </tileset>

src/dawn/rpg/conversation/conversationinteracttile.c

@@ -21,6 +21,15 @@ uint16_t conversationInteractTileInit(
     case TILE_WATER:
       textboxSetText(NULL, "tiles.water.interact");
       break;
+    
+    case TILE_LAMP:
+      textboxSetText(NULL, "tiles.lamp.interact");
+      break;
+    
+    case TILE_RAIL_SLEEPER:
+    case TILE_RAIL_TRACK:
+      textboxSetText(NULL, "tiles.rail.interact");
+      break;
 
     default:
       assertUnreachable("Invalid tile interaction!");

src/dawn/rpg/entity/interact.c

@@ -68,6 +68,9 @@ void entityInteractTile(
 
   switch(tile) {
     case TILE_WATER:
+    case TILE_LAMP:
+    case TILE_RAIL_SLEEPER:
+    case TILE_RAIL_TRACK:
       source->state = ENTITY_STATE_TALKING;
       conversationSet(
         conversationInteractTileInit,

src/dawn/rpg/world/tile.c

@@ -74,6 +74,11 @@ bool_t tileIsSolid(const tile_t tile) {
     case TILE_WATER:
     case TILE_BUILDING_WALL:
     case TILE_ROOF:
+    case TILE_RAILING:
+    case TILE_COLUMN:
+    case TILE_RAIL_SLEEPER:
+    case TILE_RAIL_TRACK:
+    case TILE_LAMP:
       return true;