sadpmpk
/
SqaureGame
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reduce player size and and mercy jump

master
En Yi 2020-01-31 19:05:19 +08:00
parent 3754f3719a
commit 06460d6636
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.c
View File

@ -49,8 +49,8 @@ int main()
struct kinematic_obj tile3 = init_kinematic_obj(100, 40); struct kinematic_obj tile3 = init_kinematic_obj(100, 40);
set_position(&player.kinematic, 400, 100); set_position(&player.kinematic, 400, 100);
set_position(&tile, -50, 380); set_position(&tile, -50, 380);
set_position(&tile2, 350, 330); set_position(&tile2, 100, 280);
set_position(&tile3, 250, 270); set_position(&tile3, 500, 280);
struct squishy_square sqr = init_squishy_square(&player.kinematic, RED); struct squishy_square sqr = init_squishy_square(&player.kinematic, RED);
player.image = &sqr; player.image = &sqr;

11
obj/player.c
View File

@ -20,7 +20,7 @@ const unsigned int run_start_frames = 10;
const unsigned int jump_squat_frames = 4; const unsigned int jump_squat_frames = 4;
const unsigned int land_lag_frames = 6; const unsigned int land_lag_frames = 6;
unsigned int PLAYER_SIZE = 40; unsigned int PLAYER_SIZE = 30;
// The player FSM // The player FSM
void player_input_check(struct player_obj *player){ void player_input_check(struct player_obj *player){
@ -71,10 +71,10 @@ void player_input_check(struct player_obj *player){
set_squish_target_offset(player->image, 2, 0); set_squish_target_offset(player->image, 2, 0);
if (player->kinematic.velocity.x == 0){ if (player->kinematic.velocity.x == 0){
if (run_dir == 1){ if (run_dir == 1){
player->kinematic.dim_reduction[0] = 20; player->kinematic.dim_reduction[0] = PLAYER_SIZE / 2;
set_squish_target_offset(player->image, 0, 15); set_squish_target_offset(player->image, 0, 15);
}else{ }else{
player->kinematic.dim_reduction[2] = 20; player->kinematic.dim_reduction[2] = PLAYER_SIZE / 2;
set_squish_target_offset(player->image, 2, 15); set_squish_target_offset(player->image, 2, 15);
} }
} }
@ -152,7 +152,7 @@ void player_input_check(struct player_obj *player){
player->state = LANDING; player->state = LANDING;
player->kinematic.dim_reduction[3] = 0; player->kinematic.dim_reduction[3] = 0;
player->kinematic.set_dim_reduction[3] = 0; player->kinematic.set_dim_reduction[3] = 0;
player->kinematic.dim_reduction[1] = 40; player->kinematic.dim_reduction[1] = PLAYER_SIZE;
on_ground = true; on_ground = true;
state_buffer = IDLE; state_buffer = IDLE;
} }
@ -198,7 +198,8 @@ void player_input_check(struct player_obj *player){
--jumps; --jumps;
} }
if (on_ground == true && !place_meeting(&player->kinematic, (Vector2){0,1})){ // Add mercy jump here
if (on_ground == true && !place_meeting(&player->kinematic, (Vector2){0,1}) && player->state != JUMP_SQUAT){
jumps = 0; jumps = 0;
on_ground = false; on_ground = false;
allow_friction = true; allow_friction = true;