diff --git a/dist/shattered_sword_assets/sounds/sword_ding1.m4a b/dist/shattered_sword_assets/sounds/sword_ding1.m4a new file mode 100644 index 0000000..9e7d1da Binary files /dev/null and b/dist/shattered_sword_assets/sounds/sword_ding1.m4a differ diff --git a/src/shattered_sword/Player/PlayerStates/Fall.ts b/src/shattered_sword/Player/PlayerStates/Fall.ts index a5ed961..eacefa2 100644 --- a/src/shattered_sword/Player/PlayerStates/Fall.ts +++ b/src/shattered_sword/Player/PlayerStates/Fall.ts @@ -4,6 +4,7 @@ import InAir from "./InAir"; import InputWrapper from "../../Tools/InputWrapper"; import PlayerState from "./PlayerState"; import { GameEventType } from "../../../Wolfie2D/Events/GameEventType"; +import { GameState } from "../../sword_enums"; export default class Fall extends InAir { owner: AnimatedSprite; @@ -14,7 +15,9 @@ export default class Fall extends InAir { update(deltaT: number): void { if (!PlayerState.dashTimer.isStopped()) { - this.emitter.fireEvent(GameEventType.PLAY_SOUND, {key: "dash", loop: false, holdReference: false}); + if(InputWrapper.getState() === GameState.GAMING){ + this.emitter.fireEvent(GameEventType.PLAY_SOUND, {key: "dash", loop: false, holdReference: false}); + } this.owner.animation.playIfNotAlready("DASH"); } else { diff --git a/src/shattered_sword/Player/PlayerStates/Jump.ts b/src/shattered_sword/Player/PlayerStates/Jump.ts index 6be84d8..f90ff39 100644 --- a/src/shattered_sword/Player/PlayerStates/Jump.ts +++ b/src/shattered_sword/Player/PlayerStates/Jump.ts @@ -7,7 +7,7 @@ import InputWrapper from "../../Tools/InputWrapper"; import { PlayerStates } from "../PlayerController"; import InAir from "./InAir"; import PlayerState from "./PlayerState"; - +import { GameState } from "../../sword_enums"; export default class Jump extends InAir { owner: AnimatedSprite; @@ -19,7 +19,9 @@ export default class Jump extends InAir { update(deltaT: number): void { if (!PlayerState.dashTimer.isStopped()) { - this.emitter.fireEvent(GameEventType.PLAY_SOUND, {key: "dash", loop: false, holdReference: false}); + if(InputWrapper.getState() === GameState.GAMING){ + this.emitter.fireEvent(GameEventType.PLAY_SOUND, {key: "dash", loop: false, holdReference: false}); + } this.owner.animation.playIfNotAlready("DASH"); } else { diff --git a/src/shattered_sword/Player/PlayerStates/Walk.ts b/src/shattered_sword/Player/PlayerStates/Walk.ts index 715f7a0..8338801 100644 --- a/src/shattered_sword/Player/PlayerStates/Walk.ts +++ b/src/shattered_sword/Player/PlayerStates/Walk.ts @@ -5,6 +5,7 @@ import { PlayerStates } from "../PlayerController"; import OnGround from "./OnGround"; import PlayerState from "./PlayerState"; import { GameEventType } from "../../../Wolfie2D/Events/GameEventType"; +import { GameState } from "../../sword_enums"; export default class Walk extends OnGround { owner: AnimatedSprite; @@ -17,7 +18,9 @@ export default class Walk extends OnGround { update(deltaT: number): void { if (!PlayerState.dashTimer.isStopped()) { - this.emitter.fireEvent(GameEventType.PLAY_SOUND, {key: "dash", loop: false, holdReference: false}); + if(InputWrapper.getState() === GameState.GAMING){ + this.emitter.fireEvent(GameEventType.PLAY_SOUND, {key: "dash", loop: false, holdReference: false}); + } this.owner.animation.playIfNotAlready("DASH"); } else { diff --git a/src/shattered_sword/Scenes/GameLevel.ts b/src/shattered_sword/Scenes/GameLevel.ts index af40f02..8a3529a 100644 --- a/src/shattered_sword/Scenes/GameLevel.ts +++ b/src/shattered_sword/Scenes/GameLevel.ts @@ -163,7 +163,7 @@ export default class GameLevel extends Scene { this.load.audio("level_up","shattered_sword_assets/sounds/level_up.wav"); //神社(じんじゃ)祭(まつり) by Second Dimension Imagination Group this.load.audio("level_music","shattered_sword_assets/sounds/bgm1.mp3"); - this.load.audio("sword","shattered_sword_assets/sounds/sword_ding.m4a"); + this.load.audio("sword","shattered_sword_assets/sounds/sword_ding1.m4a");