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

implement colours for dashing and walljumping

master
En Yi 2020-02-22 16:49:51 +08:00
parent 353d136e13
commit eeccd7c70e
4 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/header.h
View File

@ -20,6 +20,7 @@ struct afterImage
Vector2 right_vertices[BEZIER_POINTS+1]; Vector2 right_vertices[BEZIER_POINTS+1];
float opacity; float opacity;
Color color;
struct afterImage *prev; struct afterImage *prev;
struct afterImage *next; struct afterImage *next;
}; };
@ -109,7 +110,7 @@ void create_list(void);
void add_node(struct kinematic_obj *obj); void add_node(struct kinematic_obj *obj);
//struct kinematic_obj_node **get_list(); //struct kinematic_obj_node **get_list();
void free_list(void); void free_list(void);
void create_afterimage(struct player_obj *player); void create_afterimage(struct player_obj *player, Color color);
void remove_last_afterimage(struct player_obj *player); void remove_last_afterimage(struct player_obj *player);
void free_afterimages(struct player_obj *player); void free_afterimages(struct player_obj *player);

59
obj/player.c
View File

@ -2,7 +2,7 @@
#define PLAYER_ACCEL 1600 #define PLAYER_ACCEL 1600
#define AIR_ACCEL 400 #define AIR_ACCEL 800
#define RUN_INIT_SPD 230 #define RUN_INIT_SPD 230
#define JUMP_SPD 500 #define JUMP_SPD 500
#define GRAV 1200 #define GRAV 1200
@ -13,21 +13,25 @@ static bool allow_move = true;
static bool allow_friction = true; static bool allow_friction = true;
static bool on_ground = true; static bool on_ground = true;
static bool short_hop = false; static bool short_hop = false;
static unsigned int jumps = DEFAULT_JUMP_COUNT; static unsigned int jumps = DEFAULT_JUMP_COUNT;
static unsigned int frame_counter = 0;
static int run_dir = 1;
static enum PLAYER_STATE state_buffer = IDLE;
static unsigned int dash_count = 1; static unsigned int dash_count = 1;
static unsigned int frame_counter = 0;
static unsigned int afterimage_fcounter = 10;
static Color afterimage_c = (Color){0,0,0,255};
static int run_dir = 1;
static Vector2 dash_vec = (Vector2){0.0, 0.0}; static Vector2 dash_vec = (Vector2){0.0, 0.0};
const unsigned int run_start_frames = 10; 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;
const unsigned int dash_time_frames = 8; const unsigned int dash_time_frames = 8;
static unsigned int afterimage_fcounter = 10;
const unsigned int afterimage_frames = 10; const unsigned int afterimage_frames = 10;
static enum PLAYER_STATE state_buffer = IDLE;
unsigned int PLAYER_SIZE = 30; unsigned int PLAYER_SIZE = 30;
// The player FSM // The player FSM
@ -210,7 +214,9 @@ void player_input_check(struct player_obj *player){
break; break;
} }
// Add mercy jump here // This accounts for player leaving the ground without jumping (dashing or falling)
// Must be done before updating on_ground status
// Possible change: store the previous on_ground state
if (on_ground == true && !place_meeting(&player->kinematic, (Vector2){0,1}) && player->state != JUMP_SQUAT){ if (on_ground == true && !place_meeting(&player->kinematic, (Vector2){0,1}) && player->state != JUMP_SQUAT){
jumps = 0; jumps = 0;
if (player->state != DASHING) if (player->state != DASHING)
@ -221,18 +227,21 @@ void player_input_check(struct player_obj *player){
on_ground = place_meeting(&player->kinematic, (Vector2){0,1}); on_ground = place_meeting(&player->kinematic, (Vector2){0,1});
//if (player->state != DASHING && !place_meeting(&player->kinematic, (Vector2){0,1}) ){ // This check is to add gravity, but maybe could be combined with above
if (!on_ground ){ if (!on_ground){
accel.y = GRAV; accel.y = GRAV;
if(player->state != DASHING && player->kinematic.velocity.y > 0) if(player->state != DASHING && player->kinematic.velocity.y > 0)
player->state = FALLING; player->state = FALLING;
} }
//if (allow_friction == true)
// Air friction is less than ground friction
if (on_ground == true) if (on_ground == true)
accel.x -= player->kinematic.velocity.x * 7.0; accel.x -= player->kinematic.velocity.x * 7.0;
else else
accel.x -= player->kinematic.velocity.x * 1.0; accel.x -= player->kinematic.velocity.x * 1.0;
// Handle wall jumping
// TODO: define the wall jump values
if (IsKeyPressed(JUMP)){ if (IsKeyPressed(JUMP)){
if (on_ground == false){ if (on_ground == false){
if (place_meeting(&player->kinematic, (Vector2){-8,0})){ if (place_meeting(&player->kinematic, (Vector2){-8,0})){
@ -240,15 +249,22 @@ void player_input_check(struct player_obj *player){
player->kinematic.velocity.x = 400; player->kinematic.velocity.x = 400;
player->state = JUMPING; player->state = JUMPING;
afterimage_fcounter = 5; afterimage_fcounter = 5;
afterimage_c.r = 128;
afterimage_c.g = 128;
afterimage_c.b = 128;
}else if (place_meeting(&player->kinematic, (Vector2){8, 0})){ }else if (place_meeting(&player->kinematic, (Vector2){8, 0})){
player->kinematic.velocity.y = -350; player->kinematic.velocity.y = -350;
player->kinematic.velocity.x = -400; player->kinematic.velocity.x = -400;
player->state = JUMPING; player->state = JUMPING;
afterimage_fcounter = 5; afterimage_fcounter = 5;
afterimage_c.r = 128;
afterimage_c.g = 128;
afterimage_c.b = 128;
} }
} }
} }
// Handle dashing
if (IsKeyPressed(DASH) && dash_count > 0){ if (IsKeyPressed(DASH) && dash_count > 0){
// Determine the direction of dashing // Determine the direction of dashing
dash_vec.x = 0; dash_vec.x = 0;
@ -258,7 +274,6 @@ void player_input_check(struct player_obj *player){
--dash_vec.x; --dash_vec.x;
dash_vec.y = 0; dash_vec.y = 0;
//if (player->kinematic.velocity.y > 0)
if (IsKeyDown(DOWN)) if (IsKeyDown(DOWN))
++dash_vec.y; ++dash_vec.y;
if (IsKeyDown(UP)) if (IsKeyDown(UP))
@ -272,23 +287,26 @@ void player_input_check(struct player_obj *player){
// Apply the scalar value, normalised to the unit direction // Apply the scalar value, normalised to the unit direction
double m = mag(dash_vec); double m = mag(dash_vec);
dash_vec.x = dash_vec.x * DASH_SPD/m; dash_vec.x = dash_vec.x * DASH_SPD/m;
//if (player->kinematic.velocity.y == 0)
dash_vec.y = dash_vec.y * DASH_SPD/m; dash_vec.y = dash_vec.y * DASH_SPD/m;
//allow_friction = false;
--dash_count; --dash_count;
frame_counter=0;afterimage_fcounter=0; frame_counter=0;
afterimage_fcounter=0;
afterimage_c.r = 0;
afterimage_c.g = 0;
afterimage_c.b = 255;
player->state = DASHING; player->state = DASHING;
} }
move(&player->kinematic, accel); move(&player->kinematic, accel);
// Handle jumping
/*if (IsKeyPressed(JUMP) && jumps > 0){ /*if (IsKeyPressed(JUMP) && jumps > 0){
player->state = JUMP_SQUAT; player->state = JUMP_SQUAT;
allow_friction = true;
short_hop = false; short_hop = false;
--jumps; --jumps;
}*/ }*/
// Deform player based on falling speed
player->kinematic.set_dim_reduction[1] = 0; player->kinematic.set_dim_reduction[1] = 0;
player->kinematic.set_dim_reduction[3] = 0; player->kinematic.set_dim_reduction[3] = 0;
if (on_ground == false){ if (on_ground == false){
@ -304,10 +322,15 @@ void player_input_check(struct player_obj *player){
//Generate afterimages //Generate afterimages
if (afterimage_fcounter < afterimage_frames){ if (afterimage_fcounter < afterimage_frames){
if(afterimage_fcounter%2 == 0) if(afterimage_fcounter%2 == 0)
create_afterimage(player); create_afterimage(player, afterimage_c);
++afterimage_fcounter; ++afterimage_fcounter;
} }
// Set the hitbox reductions // Set the hitbox reductions
adjust_hitbox(&player->kinematic); adjust_hitbox(&player->kinematic);
if (dash_count == 0)
player->image->color.b = 255;
else
player->image->color.b = 0;
} }

10
obj/squishy.c
View File

@ -150,12 +150,12 @@ void draw_afterimages(struct player_obj *player){
translate_mat[12] = current->pos.x; translate_mat[12] = current->pos.x;
translate_mat[13] = current->pos.y; translate_mat[13] = current->pos.y;
rlMultMatrixf(translate_mat); rlMultMatrixf(translate_mat);
Color c = (Color){ 40, 0, 180, 255 * current->opacity}; current->color.a = 255 * current->opacity;
for(i=0;i<BEZIER_POINTS;++i){ for(i=0;i<BEZIER_POINTS;++i){
DrawTriangle(current->top_vertices[i], (Vector2){0,0}, current->top_vertices[i+1], c); DrawTriangle(current->top_vertices[i], (Vector2){0,0}, current->top_vertices[i+1], current->color);
DrawTriangle(current->bottom_vertices[i], (Vector2){0,0}, current->bottom_vertices[i+1], c); DrawTriangle(current->bottom_vertices[i], (Vector2){0,0}, current->bottom_vertices[i+1], current->color);
DrawTriangle(current->left_vertices[i], (Vector2){0,0}, current->left_vertices[i+1], c); DrawTriangle(current->left_vertices[i], (Vector2){0,0}, current->left_vertices[i+1], current->color);
DrawTriangle(current->right_vertices[i], (Vector2){0,0}, current->right_vertices[i+1], c); DrawTriangle(current->right_vertices[i], (Vector2){0,0}, current->right_vertices[i+1], current->color);
} }
current->opacity -= 0.2; current->opacity -= 0.2;
rlPopMatrix(); rlPopMatrix();

3
utilities/linked_list.c
View File

@ -35,7 +35,7 @@ void free_list(){
kinematic_HEAD = NULL; kinematic_HEAD = NULL;
} }
void create_afterimage(struct player_obj *player){ void create_afterimage(struct player_obj *player, Color color){
struct afterImage *img = malloc(sizeof(struct afterImage)); struct afterImage *img = malloc(sizeof(struct afterImage));
if (img){ if (img){
for (int i=0;i<=BEZIER_POINTS;++i){ for (int i=0;i<=BEZIER_POINTS;++i){
@ -47,6 +47,7 @@ void create_afterimage(struct player_obj *player){
img->pos = (Vector2){player->image->center.x, player->image->center.y}; img->pos = (Vector2){player->image->center.x, player->image->center.y};
img->velocity = (Vector2){player->kinematic.velocity.x, player->kinematic.velocity.y}; img->velocity = (Vector2){player->kinematic.velocity.x, player->kinematic.velocity.y};
img->opacity = 1.0; img->opacity = 1.0;
img->color = color;
img->prev = NULL; img->prev = NULL;
if (player->after_img_head == NULL){ if (player->after_img_head == NULL){
img->next = NULL; img->next = NULL;