Jengamon/acerola_jam0_gam - Change OQCI44VL3IROGBJ52MUI3AICPKEPAJVFL45PGQNNQRK4TKIK7HAAC

fix: respect dashing, and clamp pointer distance

Created by Jengamon on March 2, 2024

OQCI44VL3IROGBJ52MUI3AICPKEPAJVFL45PGQNNQRK4TKIK7HAAC

Dependencies

In channels

main

Change contents

Replacement in src/main.rs at line 63 [5.49]

B:BD[4.879] → [4.879:1101]

                    (
                        move_player,
                        /*test_move_pointer,*/ update_movement_pointer,
                    )
                        .chain(),
                    check_actions,

[4.879]

[4.1101]

                    handle_dashing,
                    update_movement_pointer,
                    debug_view_window,

Replacement in src/main.rs at line 68 [5.49]

B:BD[4.1134] → [4.1134:1188]

            .add_systems(FixedUpdate, update_camera);

[4.1134]

[4.1188]

            .add_systems(FixedUpdate, (move_player, update_camera));

Insertion in src/main.rs at line 79 [5.49]

[3.53]

[4.1473]

#[derive(Component)]
struct DashState(bool);
fn handle_dashing(mut query: Query<(&mut DashState, &ActionState<PlayerAction>)>) {
    for (mut dash_state, action_state) in query.iter_mut() {
        // handle hold dash
        if action_state.just_pressed(&PlayerAction::HoldDash) {
            dash_state.0 = true;
        } else if action_state.just_released(&PlayerAction::HoldDash) {
            dash_state.0 = false;
        }
        // Handle toggle dash
        if action_state.just_pressed(&PlayerAction::ToggleDash) {
            dash_state.0 = !dash_state.0;
        }
    }
}

Replacement in src/main.rs at line 103 [5.49]

B:BD[4.1589] → [4.1589:1633]

            Option<&mut MovementDirection>,

[4.1589]

[4.1633]

            &DashState,
            &mut MovementDirection,

Replacement in src/main.rs at line 110 [5.49]

B:BD[4.1677] → [4.1677:1745]

    for (action_state, mut transform, mut md) in query.iter_mut() {

[4.1677]

[4.1745]

    for (action_state, mut transform, dash, mut md) in query.iter_mut() {

Replacement in src/main.rs at line 114 [5.49]

B:BD[6.122] → [6.122:212]

B:BD[6.212] → [2.0:0]

∅:D[2.0] → [4.1985:2062]

∅:D[6.212] → [4.1985:2062]

∅:D[7.434] → [4.1985:2062]

B:BD[4.1985] → [4.1985:2062]

B:BD[4.2062] → [3.54:104]

∅:D[3.104] → [4.2062:2076]

B:BD[4.2062] → [4.2062:2076]

            transform.translation += dad.xy().extend(0.0) * SPEED * time.delta_seconds();
            if let Some(md) = md.as_mut() {
                md.0 = dad.xy();
                md.1 = dad.xy().length() * SPEED;
            }

[6.122]

[4.2076]

            const DASH_SPEED: f32 = 700.0;
            let speed = if dash.0 { DASH_SPEED } else { SPEED };
            transform.translation += dad.xy().extend(0.0) * speed * time.delta_seconds();
            md.0 = dad.xy();
            md.1 = dad.xy().length() * speed * time.delta_seconds();

Insertion in src/main.rs at line 160 [5.49]
[4.2390]
[4.2390]
```
    dash: DashState,
```
Insertion in src/main.rs at line 175 [5.49]
[3.164]
[4.2915]
```
            dash: DashState(false),
```

Insertion in src/main.rs at line 215 [5.49]

[8.1564]

    map.insert(PlayerAction::HoldDash, GamepadButtonType::RightTrigger);

Replacement in src/main.rs at line 276 [5.49]

B:BD[4.4711] → [3.1309:1410]

    // highest speed we exact movement-pointered stuff to move at
    const MAX_SPEED: f32 = 1000.0;

[4.4711]

[3.1410]

    // highest speed we expect movement-pointered stuff to move at *per frame*
    const MAX_SPEED: f32 = 16.0;

Replacement in src/main.rs at line 304 [5.49]

B:BD[3.2254] → [3.2254:2375]

                    * (MIN_POINTER_DISTANCE + MAX_POINTER_DELTA * (md.1 / MAX_SPEED)))
                    .extend(0.0);

[3.2254]

[4.5260]

                    * (MIN_POINTER_DISTANCE
                        + MAX_POINTER_DELTA * (md.1 / MAX_SPEED).clamp(0.0, 1.0)))
                .extend(0.0);

Replacement in src/main.rs at line 353 [5.49]

B:BD[4.6652] → [4.6652:6725]

            let lerped = source + diff * 0.05; //* time.delta_seconds();

[4.6652]

[4.6725]

            let lerped = source + diff * 0.09; //* time.delta_seconds();

Replacement in src/main.rs at line 362 [5.49]

B:BD[8.2007] → [8.2007:2085]

fn check_actions(
    query: Query<&ActionState<PlayerAction>, With<Player>>,

[8.2007]

[8.2085]

fn debug_view_window(
    query: Query<(&ActionState<PlayerAction>, &DashState), With<Player>>,

Replacement in src/main.rs at line 367 [5.49]

B:BD[8.2191] → [4.6874:6931]

        let Ok(action_state) = query.get_single() else {

[8.2191]

[4.6931]

        let Ok((action_state, dash_state)) = query.get_single() else {

Insertion in src/main.rs at line 371 [5.49]

[4.6963]

[8.2234]

        ui.label(if dash_state.0 {
            "Dashing"
        } else {
            "Not Dashing"
        });