sadpmpk
/
HATPC
1
0
Fork 0
Code Issues 11 Pull Requests Projects 4 Releases Wiki Activity

Make boulder slide into wooden platform 

Internal Changelog:
- Remove speed requirment for platform destruction
- Platform check is now 1 px lower
- Allow sliding if platform is on the lower tile on the sides
scene_man
En Yi 2023-11-24 21:24:11 +08:00
parent 95dd27974a
commit bdbf936c7c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scenes/game_systems.c
View File

@ -1079,7 +1079,10 @@ void moveable_update_system(Scene_t* scene)
{ {
unsigned int tile_idx1 = tile_y * tilemap.width + tile_x; unsigned int tile_idx1 = tile_y * tilemap.width + tile_x;
unsigned int tile_idx2 = (tile_y - 1) * tilemap.width + tile_x; unsigned int tile_idx2 = (tile_y - 1) * tilemap.width + tile_x;
if ( tilemap.tiles[tile_idx1].moveable && tilemap.tiles[tile_idx2].moveable ) if (
(tilemap.tiles[tile_idx1].moveable || tilemap.tiles[tile_idx1].tile_type == ONEWAY_TILE)
&& tilemap.tiles[tile_idx2].moveable
)
{ {
bool any_solid = false; bool any_solid = false;
unsigned int idx_to_check; unsigned int idx_to_check;
@ -1114,7 +1117,10 @@ void moveable_update_system(Scene_t* scene)
{ {
unsigned int tile_idx1 = tile_y * tilemap.width + tile_x; unsigned int tile_idx1 = tile_y * tilemap.width + tile_x;
unsigned int tile_idx2 = (tile_y - 1) * tilemap.width + tile_x; unsigned int tile_idx2 = (tile_y - 1) * tilemap.width + tile_x;
if ( tilemap.tiles[tile_idx1].moveable && tilemap.tiles[tile_idx2].moveable ) if (
(tilemap.tiles[tile_idx1].moveable || tilemap.tiles[tile_idx1].tile_type == ONEWAY_TILE)
&& tilemap.tiles[tile_idx2].moveable
)
{ {
bool any_solid = false; bool any_solid = false;
unsigned int idx_to_check; unsigned int idx_to_check;
@ -1753,11 +1759,11 @@ void boulder_destroy_wooden_tile_system(Scene_t* scene)
const CTransform_t* p_ctransform = get_component(p_boulder, CTRANSFORM_COMP_T); const CTransform_t* p_ctransform = get_component(p_boulder, CTRANSFORM_COMP_T);
const CBBox_t* p_bbox = get_component(p_boulder, CBBOX_COMP_T); const CBBox_t* p_bbox = get_component(p_boulder, CBBOX_COMP_T);
if (p_ctransform->velocity.y <= 0) continue; //if (p_ctransform->velocity.y <= 0) continue;
unsigned int tile_idx = get_tile_idx( unsigned int tile_idx = get_tile_idx(
p_ctransform->position.x + p_bbox->half_size.x, p_ctransform->position.x + p_bbox->half_size.x,
p_ctransform->position.y + p_bbox->size.y, p_ctransform->position.y + p_bbox->size.y + 1,
tilemap.width tilemap.width
); );
unsigned int tile_x = (p_ctransform->position.x + p_bbox->half_size.x) / tilemap.tile_size; unsigned int tile_x = (p_ctransform->position.x + p_bbox->half_size.x) / tilemap.tile_size;