Compare commits

..

No commits in common. "2d20b0c08aee7a0342d5de9e712ffec1f31f6593" and "0556318ca0ab737a46d75ff9575d47af77c7c1d4" have entirely different histories.

3 changed files with 3 additions and 6 deletions

1
res/.gitignore vendored
View File

@ -2,7 +2,6 @@
!.gitignore
!CMakeLists.txt
!ldtk_repacker.py
!pack_ldtk.sh
!test_assets.info
!testLevels.lvldata.zst
!rres_packer.c

View File

@ -1,3 +0,0 @@
#!/bin/sh
python ldtk_repacker.py $1.ldtk && zstd $1.lvldata

View File

@ -432,8 +432,9 @@ void player_movement_input_system(Scene_t* scene)
{
// Although this can be achieved via higher friction, i'll explain away as the player is not
// good with swimming, resulting in lower movement acceleration
p_ctransform->accel = Vector2Scale(Vector2Normalize(p_pstate->player_dir), MOVE_ACCEL / (1.0f + 0.12f * p_mstate->water_overlap));
p_ctransform->accel = Vector2Scale(Vector2Normalize(p_pstate->player_dir), MOVE_ACCEL / (1.0f + 0.2f * p_mstate->water_overlap));
p_ctransform->accel.y *= p_mstate->water_overlap * 0.8;
if (p_pstate->is_crouch & 1)
{
p_ctransform->accel = Vector2Scale(p_ctransform->accel, 0.5);
@ -481,7 +482,7 @@ void player_movement_input_system(Scene_t* scene)
{
p_ctransform->velocity.y = -p_cjump->jump_speed
/ (
((p_mstate->ground_state & 1) ? 1 : 1.2)
(p_mstate->ground_state & 1) ? 1 : 1.2
+ (p_mstate->water_overlap > CRITICAL_WATER_OVERLAP ? 0.6 * p_mstate->water_overlap : 0)
);
}