You can now pick up gold in frail corners (#1678)

Fixes #1517
dkfans · Jul 28, 2022 · 6657e5a · 6657e5a
1 parent 644cfa0
commit 6657e5a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/src/magic.c b/src/magic.c
@@ -584,7 +584,8 @@ TbBool can_cast_power_at_xy(PlayerNumber plyr_idx, PowerKind pwkind,
     }
     PlayerNumber slb_owner;
     slb_owner = slabmap_owner(slb);
-    if ((mapblk->flags & SlbAtFlg_Blocking) != 0)
+    TbBool subtile_is_liquid_or_path = ( (subtile_is_liquid(stl_x, stl_y)) || (subtile_is_unclaimed_path(stl_x, stl_y)) );
+    if ( ((mapblk->flags & SlbAtFlg_Blocking) != 0) && (!subtile_is_liquid_or_path) )
     {
         if ((can_cast & PwCast_Claimable) != 0)
         {
@@ -626,7 +627,7 @@ TbBool can_cast_power_at_xy(PlayerNumber plyr_idx, PowerKind pwkind,
     {
         if ((can_cast & PwCast_Claimable) != 0)
         {
-            if (slab_kind_is_liquid(slb->kind))
+            if (subtile_is_liquid(stl_x, stl_y))
             {
                   return false;
             }
@@ -641,6 +642,10 @@ TbBool can_cast_power_at_xy(PlayerNumber plyr_idx, PowerKind pwkind,
             if (slbattr->category == SlbAtCtg_Unclaimed) {
                 return true;
             }
+            if (subtile_is_liquid_or_path)
+            {
+                return true;
+            }
         }
         if ((can_cast & PwCast_NeutrlGround) != 0)
         {

diff --git a/src/map_columns.c b/src/map_columns.c
@@ -545,6 +545,11 @@ TbBool cube_is_lava(long cube_id)
     return (cube_id == 40) || (cube_id == 41);
 }
 
+TbBool cube_is_unclaimed_path(long cube_id)
+{
+    return ( (cube_id == 0) || ( (cube_id >= 25) && (cube_id <= 29) ) );
+}
+
 /**
  * Returns if given cube is a sacrificial ground or magic door surface.
  * @param cube_id
@@ -596,6 +601,18 @@ TbBool subtile_has_sacrificial_on_top(MapSubtlCoord stl_x, MapSubtlCoord stl_y)
     return cube_pos<4 && cube_is_sacrificial(i);
 }
 
+TbBool subtile_is_liquid(MapSubtlCoord stl_x, MapSubtlCoord stl_y)
+{
+    return ( (subtile_has_water_on_top(stl_x, stl_y)) || (subtile_has_lava_on_top(stl_x, stl_y)) );
+}
+
+TbBool subtile_is_unclaimed_path(MapSubtlCoord stl_x, MapSubtlCoord stl_y)
+{
+    long i;
+    i = get_top_cube_at(stl_x, stl_y, NULL);
+    return cube_is_unclaimed_path(i);
+}
+
 /******************************************************************************/
 #ifdef __cplusplus
 }

diff --git a/src/map_columns.h b/src/map_columns.h
@@ -99,10 +99,13 @@ long get_ceiling_height_at_subtile(MapSubtlCoord stl_x, MapSubtlCoord stl_y);
 TbBool cube_is_water(long cube_id);
 TbBool cube_is_lava(long cube_id);
 TbBool cube_is_sacrificial(long cube_id);
+TbBool cube_is_unclaimed_path(long cube_id);
 
 TbBool subtile_has_water_on_top(MapSubtlCoord stl_x, MapSubtlCoord stl_y);
 TbBool subtile_has_lava_on_top(MapSubtlCoord stl_x, MapSubtlCoord stl_y);
 TbBool subtile_has_sacrificial_on_top(MapSubtlCoord stl_x, MapSubtlCoord stl_y);
+TbBool subtile_is_liquid(MapSubtlCoord stl_x, MapSubtlCoord stl_y);
+TbBool subtile_is_unclaimed_path(MapSubtlCoord stl_x, MapSubtlCoord stl_y);
 
 /******************************************************************************/
 #ifdef __cplusplus

diff --git a/src/packets_input.c b/src/packets_input.c
@@ -208,6 +208,7 @@ TbBool process_dungeon_power_hand_state(long plyr_idx)
             player->additional_flags |= PlaAF_ChosenSubTileIsHigh;
             get_dungeon_highlight_user_roomspace(&playeradd->render_roomspace, player->id_number, stl_x, stl_y);
             tag_cursor_blocks_dig(player->id_number, stl_x, stl_y, player->full_slab_cursor);
+            player->thing_under_hand = 0;
         }
     }
     if (player->hand_thing_idx != 0)
@@ -261,6 +262,7 @@ TbBool process_dungeon_control_packet_dungeon_control(long plyr_idx)
     {
         if (player->primary_cursor_state == CSt_PickAxe)
         {
+            player->thing_under_hand = 0;
             get_dungeon_highlight_user_roomspace(&playeradd->render_roomspace, player->id_number, stl_x, stl_y);
             tag_cursor_blocks_dig(player->id_number, stl_x, stl_y, player->full_slab_cursor);
         }