pixi-rainman-game-engine 0.2.22 → 0.2.23

package/dist/SettingsUI/components/UXSettings/index.jsx

@@ -14,10 +14,10 @@ export const UXSettings = observer(() => {
                     <SwitchWithHeader header="Battery saver" description="Safe battery life by reducing animation speed" flag={settingStore.batterySaverFlag} setFlag={settingStore.setBatteryFlag}/>
                 </div>
                 <div className="ux-settings__switch">
-                    <SwitchWithHeader header="Ambient music" description="Turn on or off the game music" flag={settingStore.ambientMusicFlag} setFlag={settingStore.setAmbientMusicFlag}/>
+                    <SwitchWithHeader header="Ambient music" description="Turn on or off the game music" flag={settingStore.shouldPlayAmbientMusic} setFlag={settingStore.setShouldPlayAmbientMusic}/>
                 </div>
                 <div className="ux-settings__switch">
-                    <SwitchWithHeader header="Sound fx" description="Turn on or off the game sounds" flag={settingStore.soundFxFlag} setFlag={settingStore.setSoundFxFlag}/>
+                    <SwitchWithHeader header="Sound fx" description="Turn on or off the game sounds" flag={settingStore.shouldPlayFxSounds} setFlag={settingStore.setShouldPlayFxSounds}/>
                 </div>
                 <div className="ux-settings__switch">
                     <SwitchWithHeader header="Full screen mode" description="Turn on or off game fullscreen" flag={settingStore.fullScreenFlag} setFlag={settingStore.setFullScreenFlag}/>

package/dist/SettingsUI/components/VolumeSettings/index.jsx

@@ -14,7 +14,10 @@ const onChange = (newVolumeLevel) => {
 };
 const onAfterChange = (newVolumeLevel) => {
     RainMan.settingsStore.flipSoundsEnabled(newVolumeLevel);
-    if (RainMan.settingsStore.isSoundEnabled()) {
+    if (!RainMan.settingsStore.isSoundEnabled()) {
+        SoundManager.pauseAll();
+    }
+    else {
         SoundManager.resumeAll();
     }
 };
@@ -29,16 +32,16 @@ export const VolumeSettings = observer(() => {
             width: "7px",
             height: "24px",
             bottom: "-6px",
-            borderRadius: "4px",
+            borderRadius: "4px"
         }} railStyle={{
-            backgroundColor: "#fff",
+            backgroundColor: "#fff"
         }} trackStyle={{
             backgroundColor: COLOR,
             height: "5px",
-            borderRadius: "1px",
+            borderRadius: "1px"
         }} onBeforeChange={onBeforeChange} onChange={onChange} onAfterChange={onAfterChange}/>
             <p className="volume-control__text" style={{
-            color: COLOR,
+            color: COLOR
         }}>
                 {settingStore.volumeLevel}
             </p>

package/dist/application/ButtonsEventManager/ButtonsEventManager.js

@@ -196,8 +196,12 @@ export class ButtonsEventManager {
         RainMan.settingsStore.setUpdateVolumeButtonTexture(() => RainMan.componentRegistry.get(VolumeButton.registryName).changeTextureDependOnVolume());
         RainMan.componentRegistry.get(VolumeButton.registryName).setOnClick(() => {
             RainMan.settingsStore.flipSoundsEnabled();
-            if (RainMan.settingsStore.isSoundEnabled())
+            if (RainMan.settingsStore.isSoundEnabled()) {
                 SoundManager.resumeAll();
+                if (RainMan.settingsStore.shouldPlayAmbientMusic) {
+                    SoundManager.setPlayStatus("music", RainMan.settingsStore.shouldPlayAmbientMusic);
+                }
+            }
             RainMan.componentRegistry.get(VolumeButton.registryName).changeTextureDependOnVolume();
             this.handleModalInvocation(UI_ITEMS.volume);
         });

package/dist/application/SoundManager/SoundManager.js

@@ -86,7 +86,7 @@ export class SoundManagerInstance {
      * @param {SoundTrack} soundName - name of the sound
      */
     play(soundName) {
-        if (!RainMan.settingsStore.soundFxFlag)
+        if (!RainMan.settingsStore.shouldPlayFxSounds)
             return;
         const overrideSoundName = this.overrides[soundName];
         const sound = overrideSoundName
@@ -94,7 +94,7 @@ export class SoundManagerInstance {
             : this.musicCatalogue.get(soundName);
         if (!sound)
             return;
-        if (soundName === "music" && sound.isPlaying && !RainMan.settingsStore.ambientMusicFlag)
+        if (soundName === "music" && sound.isPlaying && !RainMan.settingsStore.shouldPlayAmbientMusic)
             return;
         sound.play({
             loop: soundsToLoop.includes(soundName),
@@ -110,7 +110,7 @@ export class SoundManagerInstance {
         this.musicCatalogue.forEach((sound, soundName) => {
             if (sound.paused && sound.isPlaying)
                 sound.resume();
-            if (RainMan.settingsStore.ambientMusicFlag && soundName === SoundTracks.music && sound.paused) {
+            if (RainMan.settingsStore.shouldPlayAmbientMusic && soundName === SoundTracks.music && sound.paused) {
                 sound.resume();
             }
         });

package/dist/components/AbstractMainContainer/AbstractMainContainer.js

@@ -57,8 +57,9 @@ export class AbstractMainContainer extends Container {
         this.messageBox = new MessageBox();
         if (RainMan.settingsStore.isSoundEnabled()) {
             SoundManager.resumeAll();
-            if (RainMan.settingsStore.ambientMusicFlag)
-                SoundManager.play(SoundTracks.music);
+            if (RainMan.settingsStore.shouldPlayAmbientMusic) {
+                SoundManager.setPlayStatus(SoundTracks.music, RainMan.settingsStore.shouldPlayAmbientMusic);
+            }
         }
         RainMan.app.renderer.on("resize", () => this.resize());
     }

package/dist/stores/SettingsStore.d.ts

@@ -1,6 +1,7 @@
 import { SpeedLevel, SymbolId } from "../application";
 import { ResumableContainer, SpineWithResumableContainer, SpriteWithResumableContainer } from "../components";
 import { InitDataInterface, Point, RangeQuantityValue, SpinData } from "../connectivity";
+import { Nullable } from "../utils";
 import { PaytableData } from "./types";
 /**
  * This class represents global state of pixi and react application
@@ -12,8 +13,8 @@ export declare class SettingsStore {
     betChangeDisabled: boolean;
     bet: number;
     betText: string;
-    ambientMusicFlag: boolean;
-    soundFxFlag: boolean;
+    shouldPlayAmbientMusic: boolean;
+    shouldPlayFxSounds: boolean;
     fullScreenFlag: boolean;
     onAnyWin: boolean;
     totalNumberOfFreeSpins: number;
@@ -75,14 +76,14 @@ export declare class SettingsStore {
      * @param {boolean} flag - new value for ambient music flag
      * @param {boolean} saveToLocalStorage - default {@link true}, if true the flag will be saved to localStorage
      */
-    setAmbientMusicFlag(flag: boolean, saveToLocalStorage?: boolean): void;
+    setShouldPlayAmbientMusic(flag: boolean, saveToLocalStorage?: boolean): void;
     /**
      * Sets flag for effect sounds
      * @param {boolean} flag - new value for sound fx flag
      * @param {boolean} saveToLocalStorage - default {@link true}, if true the flag will be saved to localStorage
      */
-    setSoundFxFlag(flag: boolean, saveToLocalStorage?: boolean): void;
-    flipSoundsEnabled(volumeLevel?: number | null): void;
+    setShouldPlayFxSounds(flag: boolean, saveToLocalStorage?: boolean): void;
+    flipSoundsEnabled(volumeLevel?: Nullable<number>): void;
     isSoundEnabled(): boolean;
     setFullScreenFlag(flag: boolean): void;
     setHiResolutionFlag(flag: boolean): void;

package/dist/stores/SettingsStore.js

@@ -16,10 +16,8 @@ export class SettingsStore {
     betChangeDisabled = false;
     bet = 0;
     betText = "";
-    ambientMusicFlag = getFromLocalStorage(LOCAL_STORAGE.isAmbientMusicEnabled) ??
-        getFromLocalStorage(LOCAL_STORAGE.isSoundEnabled, true);
-    soundFxFlag = getFromLocalStorage(LOCAL_STORAGE.isSoundFxEnabled) ??
-        getFromLocalStorage(LOCAL_STORAGE.isSoundEnabled, true);
+    shouldPlayAmbientMusic = getFromLocalStorage(LOCAL_STORAGE.isAmbientMusicEnabled, false);
+    shouldPlayFxSounds = getFromLocalStorage(LOCAL_STORAGE.isSoundFxEnabled, false);
     fullScreenFlag = false;
     onAnyWin = false;
     totalNumberOfFreeSpins = 0;
@@ -74,8 +72,8 @@ export class SettingsStore {
         }
         makeAutoObservable(this, {
             setBatteryFlag: action.bound,
-            setAmbientMusicFlag: action.bound,
-            setSoundFxFlag: action.bound,
+            setShouldPlayAmbientMusic: action.bound,
+            setShouldPlayFxSounds: action.bound,
             setFullScreenFlag: action.bound,
             setHiResolutionFlag: action.bound,
             setSpeedLevel: action.bound,
@@ -154,8 +152,8 @@ export class SettingsStore {
      * @param {boolean} flag - new value for ambient music flag
      * @param {boolean} saveToLocalStorage - default {@link true}, if true the flag will be saved to localStorage
      */
-    setAmbientMusicFlag(flag, saveToLocalStorage = true) {
-        this.ambientMusicFlag = flag;
+    setShouldPlayAmbientMusic(flag, saveToLocalStorage = true) {
+        this.shouldPlayAmbientMusic = flag;
         SoundManager.setPlayStatus(SoundTracks.music, flag);
         this.updateVolumeButtonTexture?.();
         if (saveToLocalStorage) {
@@ -168,8 +166,8 @@ export class SettingsStore {
      * @param {boolean} flag - new value for sound fx flag
      * @param {boolean} saveToLocalStorage - default {@link true}, if true the flag will be saved to localStorage
      */
-    setSoundFxFlag(flag, saveToLocalStorage = true) {
-        this.soundFxFlag = flag;
+    setShouldPlayFxSounds(flag, saveToLocalStorage = true) {
+        this.shouldPlayFxSounds = flag;
         if (!flag)
             SoundManager.stopPlayingFxSounds();
         this.updateVolumeButtonTexture?.();
@@ -179,23 +177,26 @@ export class SettingsStore {
         }
     }
     flipSoundsEnabled(volumeLevel = null) {
-        const flag = volumeLevel !== null ? volumeLevel > 0 : !(this.ambientMusicFlag || this.soundFxFlag);
-        const ambientMusicLocalStorageFlag = getFromLocalStorage(LOCAL_STORAGE.isAmbientMusicEnabled, true);
-        const soundFxLocalStorageFlag = getFromLocalStorage(LOCAL_STORAGE.isSoundFxEnabled, true);
-        let ambientMusicFlag = flag && ambientMusicLocalStorageFlag;
-        let soundFxFlag = flag && soundFxLocalStorageFlag;
-        if (!ambientMusicLocalStorageFlag && !soundFxLocalStorageFlag) {
+        let shouldEnableSound = volumeLevel !== null ? volumeLevel > 0 : !this.isSoundEnabled();
+        const ambientEnabledInStorage = getFromLocalStorage(LOCAL_STORAGE.isAmbientMusicEnabled, true);
+        const fxEnabledInStorage = getFromLocalStorage(LOCAL_STORAGE.isSoundFxEnabled, true);
+        let ambientMusicFlag = shouldEnableSound && ambientEnabledInStorage;
+        let soundFxFlag = shouldEnableSound && fxEnabledInStorage;
+        const bothDisabledInStorage = !ambientEnabledInStorage && !fxEnabledInStorage;
+        if (bothDisabledInStorage) {
             ambientMusicFlag = true;
             soundFxFlag = true;
+            shouldEnableSound = true;
             removeFromLocalStorage(LOCAL_STORAGE.isAmbientMusicEnabled);
             removeFromLocalStorage(LOCAL_STORAGE.isSoundFxEnabled);
+            removeFromLocalStorage(LOCAL_STORAGE.isSoundEnabled);
         }
-        this.setAmbientMusicFlag(ambientMusicFlag, false);
-        this.setSoundFxFlag(soundFxFlag, false);
-        setToLocalStorage(LOCAL_STORAGE.isSoundEnabled, flag);
+        this.setShouldPlayAmbientMusic(ambientMusicFlag, true);
+        this.setShouldPlayFxSounds(soundFxFlag, true);
+        setToLocalStorage(LOCAL_STORAGE.isSoundEnabled, shouldEnableSound);
     }
     isSoundEnabled() {
-        return this.soundFxFlag || this.ambientMusicFlag;
+        return this.shouldPlayFxSounds || this.shouldPlayAmbientMusic;
     }
     setFullScreenFlag(flag) {
         this.fullScreenFlag = flag;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pixi-rainman-game-engine",
-    "version": "0.2.22",
+    "version": "0.2.23",
     "description": "This repository contains all of the mechanics that used in rainman games.",
     "main": "./dist/index.js",
     "module": "./dist/index.js",