New ramp types

src/dusk/rpg/entity/entity.c

@@ -97,22 +97,35 @@ void entityWalk(entity_t *entity, const entitydir_t direction) {
     (
       // Can only walk UP the direction the ramp faces.
       (direction+TILE_SHAPE_RAMP_NORTH) == tileCurrent ||
-      // If diagonal ramp, can go up one of two ways only.
+      // If diagonal ramp, can go up one of two ways only. Inner ramps
+      // share the same allowed directions as their outer counterparts.
       (
         (
-          tileCurrent == TILE_SHAPE_RAMP_SOUTHEAST &&
+          (
+            tileCurrent == TILE_SHAPE_RAMP_SOUTHEAST ||
+            tileCurrent == TILE_SHAPE_RAMP_SOUTHEAST_INNER
+          ) &&
           (direction == ENTITY_DIR_SOUTH || direction == ENTITY_DIR_EAST)
         ) ||
         (
-          tileCurrent == TILE_SHAPE_RAMP_SOUTHWEST &&
+          (
+            tileCurrent == TILE_SHAPE_RAMP_SOUTHWEST ||
+            tileCurrent == TILE_SHAPE_RAMP_SOUTHWEST_INNER
+          ) &&
           (direction == ENTITY_DIR_SOUTH || direction == ENTITY_DIR_WEST)
         ) ||
         (
-          tileCurrent == TILE_SHAPE_RAMP_NORTHEAST &&
+          (
+            tileCurrent == TILE_SHAPE_RAMP_NORTHEAST ||
+            tileCurrent == TILE_SHAPE_RAMP_NORTHEAST_INNER
+          ) &&
           (direction == ENTITY_DIR_NORTH || direction == ENTITY_DIR_EAST)
         ) ||
         (
-          tileCurrent == TILE_SHAPE_RAMP_NORTHWEST &&
+          (
+            tileCurrent == TILE_SHAPE_RAMP_NORTHWEST ||
+            tileCurrent == TILE_SHAPE_RAMP_NORTHWEST_INNER
+          ) &&
           (direction == ENTITY_DIR_NORTH || direction == ENTITY_DIR_WEST)
         )
       )
@@ -141,22 +154,35 @@ void entityWalk(entity_t *entity, const entitydir_t direction) {
       (
         // This handles regular cardinal ramps
         (entityDirGetOpposite(direction)+TILE_SHAPE_RAMP_NORTH) == tileBelow ||
-        // This handles diagonal ramps
+        // This handles diagonal ramps. Inner ramps share the same
+        // allowed directions as their outer counterparts.
         (
           (
-            tileBelow == TILE_SHAPE_RAMP_SOUTHEAST &&
+            (
+              tileBelow == TILE_SHAPE_RAMP_SOUTHEAST ||
+              tileBelow == TILE_SHAPE_RAMP_SOUTHEAST_INNER
+            ) &&
             (direction == ENTITY_DIR_NORTH || direction == ENTITY_DIR_WEST)
           ) ||
           (
-            tileBelow == TILE_SHAPE_RAMP_SOUTHWEST &&
+            (
+              tileBelow == TILE_SHAPE_RAMP_SOUTHWEST ||
+              tileBelow == TILE_SHAPE_RAMP_SOUTHWEST_INNER
+            ) &&
             (direction == ENTITY_DIR_NORTH || direction == ENTITY_DIR_EAST)
           ) ||
           (
-            tileBelow == TILE_SHAPE_RAMP_NORTHEAST &&
+            (
+              tileBelow == TILE_SHAPE_RAMP_NORTHEAST ||
+              tileBelow == TILE_SHAPE_RAMP_NORTHEAST_INNER
+            ) &&
             (direction == ENTITY_DIR_SOUTH || direction == ENTITY_DIR_WEST)
           ) ||
           (
-            tileBelow == TILE_SHAPE_RAMP_NORTHWEST &&
+            (
+              tileBelow == TILE_SHAPE_RAMP_NORTHWEST ||
+              tileBelow == TILE_SHAPE_RAMP_NORTHWEST_INNER
+            ) &&
             (direction == ENTITY_DIR_SOUTH || direction == ENTITY_DIR_EAST)
           )
         )

src/dusk/rpg/overworld/tile.c

@@ -27,6 +27,10 @@ bool_t tileIsRamp(const tile_t tile) {
     case TILE_SHAPE_RAMP_NORTHWEST:
     case TILE_SHAPE_RAMP_SOUTHEAST:
     case TILE_SHAPE_RAMP_SOUTHWEST:
+    case TILE_SHAPE_RAMP_NORTHEAST_INNER:
+    case TILE_SHAPE_RAMP_NORTHWEST_INNER:
+    case TILE_SHAPE_RAMP_SOUTHEAST_INNER:
+    case TILE_SHAPE_RAMP_SOUTHWEST_INNER:
       return true;
 
     default:

src/dusk/rpg/overworld/tile.h

@@ -21,7 +21,11 @@ typedef enum {
   TILE_SHAPE_RAMP_NORTHWEST = 7,
   TILE_SHAPE_RAMP_SOUTHEAST = 8,
   TILE_SHAPE_RAMP_SOUTHWEST = 9,
-  
+  TILE_SHAPE_RAMP_NORTHEAST_INNER = 10,
+  TILE_SHAPE_RAMP_NORTHWEST_INNER = 11,
+  TILE_SHAPE_RAMP_SOUTHEAST_INNER = 12,
+  TILE_SHAPE_RAMP_SOUTHWEST_INNER = 13,
+
   TILE_SHAPE_COUNT
 } tile_t;