diff --git a/data/entities/player/morcus.yaml b/data/entities/player/morcus.yaml index 03247e6..d9e2b66 100644 --- a/data/entities/player/morcus.yaml +++ b/data/entities/player/morcus.yaml @@ -40,10 +40,10 @@ animations: hurt_east: { frames: [8, 9, 10, 11], frame_ms: 100 } hurt_west: { frames: [8, 9, 10, 11], frame_ms: 100, flip_h: true } - attack_south: { frames: [20, 21, 22, 23], frame_ms: 50 } - attack_north: { frames: [24, 25, 26, 27], frame_ms: 50 } - attack_east: { frames: [28, 29, 30, 31], frame_ms: 50 } - attack_west: { frames: [28, 29, 30, 31], frame_ms: 50, flip_h: true } + attack_south: { frames: [20, 21, 22, 23], frame_ms: 80 } + attack_north: { frames: [24, 25, 26, 27], frame_ms: 80 } + attack_east: { frames: [28, 29, 30, 31], frame_ms: 80 } + attack_west: { frames: [28, 29, 30, 31], frame_ms: 80, flip_h: true } recover_south: { frames: [23] } recover_north: { frames: [27] } @@ -119,7 +119,7 @@ hurt: # recuperació en què la hitbox ja no fa dany. whip: range_tiles: 3 - swing_ms: 200 + swing_ms: 320 cooldown_ms: 200 damage: 1 sound: whip.wav diff --git a/data/entities/player/sam.yaml b/data/entities/player/sam.yaml index ccca89d..a1c20b0 100644 --- a/data/entities/player/sam.yaml +++ b/data/entities/player/sam.yaml @@ -40,10 +40,10 @@ animations: hurt_east: { frames: [8, 9, 10, 11], frame_ms: 100 } hurt_west: { frames: [8, 9, 10, 11], frame_ms: 100, flip_h: true } - attack_south: { frames: [20, 21, 22, 23], frame_ms: 50 } - attack_north: { frames: [24, 25, 26, 27], frame_ms: 50 } - attack_east: { frames: [28, 29, 30, 31], frame_ms: 50 } - attack_west: { frames: [28, 29, 30, 31], frame_ms: 50, flip_h: true } + attack_south: { frames: [20, 21, 22, 23], frame_ms: 80 } + attack_north: { frames: [24, 25, 26, 27], frame_ms: 80 } + attack_east: { frames: [28, 29, 30, 31], frame_ms: 80 } + attack_west: { frames: [28, 29, 30, 31], frame_ms: 80, flip_h: true } recover_south: { frames: [23] } recover_north: { frames: [27] } @@ -119,7 +119,7 @@ hurt: # recuperació en què la hitbox ja no fa dany. whip: range_tiles: 3 - swing_ms: 200 + swing_ms: 320 cooldown_ms: 200 damage: 1 sound: whip.wav diff --git a/data/entities/whip_attack/whip_attack.yaml b/data/entities/whip_attack/whip_attack.yaml index 38edc0b..a596f37 100644 --- a/data/entities/whip_attack/whip_attack.yaml +++ b/data/entities/whip_attack/whip_attack.yaml @@ -25,7 +25,7 @@ sprites: # Animació compartida entre les 4 direccions: la seqüència de frames i les # durades són idèntiques; només canvia quina surface/mida es clipa. # - `frames` : índex de tile dins l'spritesheet (graella deduïda). -# - `frame_ms` : durada uniforme per frame; 50 ms × 4 ≈ 200 ms swing. +# - `frame_ms` : durada uniforme per frame; 80 ms × 4 = 320 ms swing. # - `loop: false` : el látigo viu una animació i mor (`markDead`). # - `active_frames` : valors dins de `frames` durant els quals la # hitbox aplica dany. Wind-up (0) i recovery (3) no @@ -33,6 +33,6 @@ sprites: animations: swing: frames: [0, 1, 2, 3] - frame_ms: 50 + frame_ms: 80 loop: false active_frames: [1, 2]