From 3ceb34298baab3944f7c52a262f5596807364dd4 Mon Sep 17 00:00:00 2001 From: jorsi Date: Mon, 1 Jun 2020 19:40:40 -0400 Subject: [PATCH] cleanup --- script/audioLibrary.js | 93 ++++++++++++-------------------------- script/events/setpieces.js | 26 +++++------ 2 files changed, 41 insertions(+), 78 deletions(-) diff --git a/script/audioLibrary.js b/script/audioLibrary.js index 3150caf..e22093f 100644 --- a/script/audioLibrary.js +++ b/script/audioLibrary.js @@ -2,19 +2,6 @@ * Module that defines all audio files */ var AudioLibrary = { - EVENT_FRIENDLY_OUTPOST: 'audio/event-friendly-outpost.flac', - EVENT_SWAMP: 'audio/event-swamp.flac', - EVENT_CAVE: 'audio/event-cave.flac', - EVENT_TOWN: 'audio/event-town.flac', - EVENT_CITY: 'audio/event-city.flac', - EVENT_HOUSE: 'audio/event-house.flac', - EVENT_BATTLEFIELD: 'audio/event-battlefield.flac', - EVENT_BOREHOLE: 'audio/event-borehole.flac', - EVENT_CRASHED_SHIP: 'audio/event-crashed-ship.flac', - EVENT_SULPHUR_MINE: 'audio/event-sulphurmine.flac', - EVENT_COAL_MINE: 'audio/event-coalmine.flac', - EVENT_IRON_MINE: 'audio/event-ironmine.flac', - EVENT_DESTROYED_VILLAGE: 'audio/event-destroyed-village.flac', EVENT_NOMAD: 'audio/event-nomad.flac', EVENT_NOISES_OUTSIDE: 'audio/event-noises-outside.flac', EVENT_NOISES_INSIDE: 'audio/event-noises-inside.flac', @@ -31,9 +18,19 @@ var AudioLibrary = { EVENT_BEAST_ATTACK: 'audio/event-beast-attack.flac', EVENT_SOLDIER_ATTACK: 'audio/event-soldier-attack.flac', EVENT_THIEF: 'audio/event-thief.flac', - ENCOUNTER_TIER_1: 'audio/encounter-tier-1.flac', - ENCOUNTER_TIER_2: 'audio/encounter-tier-2.flac', - ENCOUNTER_TIER_3: 'audio/encounter-tier-3.flac', + LANDMARK_FRIENDLY_OUTPOST: 'audio/event-friendly-outpost.flac', + LANDMARK_SWAMP: 'audio/event-swamp.flac', + LANDMARK_CAVE: 'audio/event-cave.flac', + LANDMARK_TOWN: 'audio/event-town.flac', + LANDMARK_CITY: 'audio/event-city.flac', + LANDMARK_HOUSE: 'audio/event-house.flac', + LANDMARK_BATTLEFIELD: 'audio/event-battlefield.flac', + LANDMARK_BOREHOLE: 'audio/event-borehole.flac', + LANDMARK_CRASHED_SHIP: 'audio/event-crashed-ship.flac', + LANDMARK_SULPHUR_MINE: 'audio/event-sulphurmine.flac', + LANDMARK_COAL_MINE: 'audio/event-coalmine.flac', + LANDMARK_IRON_MINE: 'audio/event-ironmine.flac', + LANDMARK_DESTROYED_VILLAGE: 'audio/event-destroyed-village.flac', MUSIC_DUSTY_PATH: 'audio/dusty-path.flac', MUSIC_SILENT_FOREST: 'audio/silent-forest.flac', MUSIC_LONELY_HUT: 'audio/lonely-hut.flac', @@ -57,57 +54,22 @@ var AudioLibrary = { MUSIC_EXOSPHERE: 'audio/exosphere.flac', MUSIC_ENDING: 'audio/ending.flac', MUSIC_SHIP: 'audio/ship.flac', - BUILD: 'audio/build.flac', - BUILD_TRAP: 'audio/build-trap.flac', - BUILD_CART: 'audio/build-cart.flac', - BUILD_HUT: 'audio/build-hut.flac', - BUILD_LODGE: 'audio/build-lodge.flac', - BUILD_TRADING_POST: 'audio/build-trading-post.flac', - BUILD_TANNERY: 'audio/build-tannery.flac', - BUILD_SMOKEHOUSE: 'audio/build-smokehouse.flac', - BUILD_WORKSHOP: 'audio/build-workshop.flac', - BUILD_STEELWORKS: 'audio/build-steelworks.flac', - BUILD_ARMOURY: 'audio/build-armoury.flac', - CRAFT: 'audio/craft.flac', - CRAFT_TORCH: 'audio/craft-torch.flac', - CRAFT_WATERSKIN: 'audio/craft-waterskin.flac', - CRAFT_CASK: 'audio/craft-cask.flac', - CRAFT_WATER_TANK: 'audio/craft-water-tank.flac', - CRAFT_BONE_SPEAR: 'audio/craft-bone-spear.flac', - CRAFT_RUCKSACK: 'audio/craft-rucksack.flac', - CRAFT_WAGON: 'audio/craft-wagon.flac', - CRAFT_CONVOY: 'audio/craft-convoy.flac', - CRAFT_LEATHER_ARMOUR: 'audio/craft-leather-armour.flac', - CRAFT_IRON_ARMOUR: 'audio/craft-iron-armour.flac', - CRAFT_STEEL_ARMOUR: 'audio/craft-steel-armour.flac', - CRAFT_IRON_SWORD: 'audio/craft-iron-sword.flac', - CRAFT_STEEL_SWORD: 'audio/craft-steel-sword.flac', - CRAFT_RIFLE: 'audio/craft-rifle.flac', - BUY: 'audio/buy.flac', - BUY_SCALES: 'audio/buy-scales.flac', - BUY_TEETH: 'audio/buy-teeth.flac', - BUY_IRON: 'audio/buy-iron.flac', - BUY_COAL: 'audio/buy-coal.flac', - BUY_STEEL: 'audio/buy-steel.flac', - BUY_MEDICINE: 'audio/buy-medicine.flac', - BUY_BULLETS: 'audio/buy-bullets.flac', - BUY_ENERGY_CELL: 'audio/buy-energy-cell.flac', - BUY_BOLAS: 'audio/buy-bolas.flac', - BUY_GRENADE: 'audio/buy-grenade.flac', - BUY_BAYONET: 'audio/buy-bayonet.flac', - BUY_ALIEN_ALLOY: 'audio/buy-alien-alloy.flac', - BUY_COMPASS: 'audio/buy-compass.flac', - EMBARK: 'audio/embark.flac', - GATHER_WOOD: 'audio/gather-wood.flac', - CHECK_TRAPS: 'audio/check-traps.flac', - EAT_MEAT: 'audio/eat-meat.flac', - USE_MEDS: 'audio/use-meds.flac', LIGHT_FIRE: 'audio/light-fire.flac', STOKE_FIRE: 'audio/stoke-fire.flac', + BUILD: 'audio/build.flac', + CRAFT: 'audio/craft.flac', + BUY: 'audio/buy.flac', + GATHER_WOOD: 'audio/gather-wood.flac', + CHECK_TRAPS: 'audio/check-traps.flac', + EMBARK: 'audio/embark.flac', FOOTSTEPS_1: 'audio/footsteps-1.flac', FOOTSTEPS_2: 'audio/footsteps-2.flac', FOOTSTEPS_3: 'audio/footsteps-3.flac', - DEATH: 'audio/death.flac', + ENCOUNTER_TIER_1: 'audio/encounter-tier-1.flac', + ENCOUNTER_TIER_2: 'audio/encounter-tier-2.flac', + ENCOUNTER_TIER_3: 'audio/encounter-tier-3.flac', + EAT_MEAT: 'audio/eat-meat.flac', + USE_MEDS: 'audio/use-meds.flac', WEAPON_UNARMED_1: 'audio/weapon-unarmed-1.flac', WEAPON_UNARMED_2: 'audio/weapon-unarmed-2.flac', WEAPON_UNARMED_3: 'audio/weapon-unarmed-3.flac', @@ -117,11 +79,12 @@ var AudioLibrary = { WEAPON_RANGED_1: 'audio/weapon-ranged-1.flac', WEAPON_RANGED_2: 'audio/weapon-ranged-2.flac', WEAPON_RANGED_3: 'audio/weapon-ranged-3.flac', + DEATH: 'audio/death.flac', + REINFORCE_HULL: 'audio/reinforce-hull.flac', + UPGRADE_ENGINE: 'audio/upgrade-engine.flac', + LIFT_OFF: 'audio/lift-off.flac', ASTEROID_HIT1: 'audio/asteroid-hit-1.flac', ASTEROID_HIT2: 'audio/asteroid-hit-2.flac', ASTEROID_HIT3: 'audio/asteroid-hit-3.flac', CRASH: 'audio/crash.flac', - REINFORCE_HULL: 'audio/reinforce-hull.flac', - UPGRADE_ENGINE: 'audio/upgrade-engine.flac', - LIFT_OFF: 'audio/lift-off.flac', }; \ No newline at end of file diff --git a/script/events/setpieces.js b/script/events/setpieces.js index 408d641..dadf91e 100644 --- a/script/events/setpieces.js +++ b/script/events/setpieces.js @@ -29,7 +29,7 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_FRIENDLY_OUTPOST + audio: AudioLibrary.LANDMARK_FRIENDLY_OUTPOST }, "swamp": { /* Swamp */ title: _('A Murky Swamp'), @@ -87,7 +87,7 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_SWAMP + audio: AudioLibrary.LANDMARK_SWAMP }, "cave": { /* Cave */ title: _('A Damp Cave'), @@ -519,7 +519,7 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_CAVE + audio: AudioLibrary.LANDMARK_CAVE }, "town": { /* Town */ title: _('A Deserted Town'), @@ -1237,7 +1237,7 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_TOWN + audio: AudioLibrary.LANDMARK_TOWN }, "city": { /* City */ title: _('A Ruined City'), @@ -2933,7 +2933,7 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_CITY + audio: AudioLibrary.LANDMARK_CITY }, "house": { /* Abandoned House */ title: _('An Old House'), @@ -3051,7 +3051,7 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_HOUSE + audio: AudioLibrary.LANDMARK_HOUSE }, "battlefield": { /* Discovering an old battlefield */ title: _('A Forgotten Battlefield'), @@ -3105,7 +3105,7 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_BATTLEFIELD + audio: AudioLibrary.LANDMARK_BATTLEFIELD }, "borehole": { /* Admiring a huge borehole */ title: _('A Huge Borehole'), @@ -3135,7 +3135,7 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_BOREHOLE + audio: AudioLibrary.LANDMARK_BOREHOLE }, "ship": { /* Finding a way off this rock */ title: _('A Crashed Ship'), @@ -3159,7 +3159,7 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_CRASHED_SHIP + audio: AudioLibrary.LANDMARK_CRASHED_SHIP }, "sulphurmine": { /* Clearing the Sulphur Mine */ title: _('The Sulphur Mine'), @@ -3309,7 +3309,7 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_SULPHUR_MINE + audio: AudioLibrary.LANDMARK_SULPHUR_MINE }, "coalmine": { /* Clearing the Coal Mine */ title: _('The Coal Mine'), @@ -3452,7 +3452,7 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_COAL_MINE + audio: AudioLibrary.LANDMARK_COAL_MINE }, "ironmine": { /* Clearing the Iron Mine */ title: _('The Iron Mine'), @@ -3529,7 +3529,7 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_IRON_MINE + audio: AudioLibrary.LANDMARK_IRON_MINE }, "cache": { /* Cache - contains some of supplies from previous game */ @@ -3582,6 +3582,6 @@ Events.Setpieces = { } } }, - audio: AudioLibrary.EVENT_DESTROYED_VILLAGE + audio: AudioLibrary.LANDMARK_DESTROYED_VILLAGE } };