From dcfb986e34d2ac4ee6d7d03cae08b800971d72cb Mon Sep 17 00:00:00 2001 From: David Dormagen Date: Sun, 13 Dec 2015 22:14:55 +0100 Subject: [PATCH] moved sounds into subfolders This completes http://forum.openclonk.org/topic_show.pl?tid=3215 --- planet/Arena.ocf/FrozenFortress.ocs/Script.c | 2 +- .../Scrolls.ocd/FrostboltScroll.ocd/Script.c | 6 +- .../FrozenFortress.ocs/System.ocg/Explode.c | 2 +- .../Hideout.ocs/LifeGem.ocd/Script.c | 2 +- .../MoltenMonarch.ocs/System.ocg/King_Bow.c | 2 +- .../System.ocg/King_Javelin.c | 2 +- .../System.ocg/King_Musket.c | 2 +- planet/Arena.ocf/Overcast.ocs/Script.c | 2 +- .../Scrolls.ocd/FireballScroll.ocd/Script.c | 4 +- planet/Arena.ocf/ThunderousSkies.ocs/Script.c | 2 +- .../Scrolls.ocd/FireballScroll.ocd/Script.c | 4 +- .../Scrolls.ocd/ThunderScroll.ocd/Script.c | 2 +- .../System.ocg/FlyingArrowpack.c | 2 +- .../Relics.ocd/Bone.ocd/Script.c | 2 +- .../Relics.ocd/Skull.ocd/Script.c | 2 +- .../Homebase.ocd/BuyMenu.ocd/Script.c | 2 +- .../Defense.ocd/Homebase.ocd/Script.c | 6 +- planet/Defense.ocf/FightForGidl.ocs/Script.c | 4 +- .../Windmill.ocs/Boomattack.ocd/Script.c | 2 +- planet/Defense.ocf/Windmill.ocs/Script.c | 2 +- planet/Experimental.ocd/Ambience.ocd/Script.c | 2 +- .../LiftTower.ocd/Hook.ocd/Script.c | 2 +- .../Crossing.ocd/CableLine.ocd/Script.c | 2 +- .../Crossing.ocd/CableReel.ocd/Script.c | 8 +-- .../Vehicles.ocd/Lorry.ocd/Script.c | 2 +- .../OCTier.ocs/OCTier.ocd/Script.c | 4 +- .../CastleParts.ocd/Floor.ocd/Script.c | 4 +- .../DarkCastle.ocs/System.ocg/SeqIntro.c | 2 +- .../CrystalCommunicator.ocd/Script.c | 12 ++-- .../DeepSeaMining.ocs/System.ocg/SeqIntro.c | 4 +- .../DeepSeaMining.ocs/System.ocg/SeqOutro.c | 2 +- planet/Missions.ocf/Raid.ocs/Key.ocd/Script.c | 2 +- .../Raid.ocs/System.ocg/DlgNewton.c | 2 +- .../Raid.ocs/System.ocg/DlgPyrit.c | 2 +- .../Raid.ocs/System.ocg/DlgRocky.c | 2 +- .../Missions.ocf/Raid.ocs/System.ocg/Plane.c | 2 +- .../Raid.ocs/System.ocg/SeqAttack.c | 2 +- .../Raid.ocs/System.ocg/SpinWheel.c | 4 +- .../Plane.ocd/Chassis.ocd/Script.c | 2 +- .../Plane.ocd/Engine.ocd/Script.c | 2 +- .../Plane.ocd/Propeller.ocd/Script.c | 2 +- .../Skylands.ocs/Plane.ocd/Script.c | 2 +- .../Skylands.ocs/Plane.ocd/Skids.ocd/Script.c | 2 +- .../Skylands.ocs/Plane.ocd/Wings.ocd/Script.c | 2 +- .../Skylands.ocs/Scaffold.ocd/Script.c | 2 +- .../TreasureHunt.ocs/System.ocg/DlgPyrit.c | 2 +- .../System.ocg/GoldBarSpecial.c | 2 +- .../TreasureHunt.ocs/System.ocg/Plane.c | 2 +- .../TreasureHunt.ocs/System.ocg/SeqIntro.c | 4 +- .../Animals.ocd/Chippie.ocd/Egg.ocd/Script.c | 4 +- .../Animals.ocd/Chippie.ocd/Script.c | 6 +- .../Objects.ocd/Animals.ocd/Fish.ocd/Script.c | 2 +- .../Animals.ocd/Mosquito.ocd/Script.c | 2 +- .../Animals.ocd/Piranha.ocd/Script.c | 2 +- .../Animals.ocd/PiranhaSmall.ocd/Script.c | 2 +- .../Objects.ocd/Animals.ocd/Puka.ocd/Script.c | 12 ++-- .../Animals.ocd/Squid.ocd/Script.c | 2 +- .../Objects.ocd/Animals.ocd/Wipf.ocd/Script.c | 6 +- .../Animals.ocd/Zaphive.ocd/Script.c | 2 +- .../Animals.ocd/Zaphive.ocd/Zap.ocd/Script.c | 4 +- .../Clonk.ocd/Animations.ocd/Script.c | 16 ++--- planet/Objects.ocd/Clonk.ocd/Script.c | 10 +-- .../BoilingAcid.ocd/Bubble.ocd/Script.c | 2 +- .../BoilingLava.ocd/Bubble.ocd/Script.c | 2 +- .../Disasters.ocd/Earthquake.ocd/Script.c | 6 +- .../Disasters.ocd/Rockfall.ocd/Script.c | 6 +- .../Environment.ocd/Stalactite.ocd/Script.c | 4 +- .../Environment.ocd/Waterfall.ocd/Script.c | 6 +- .../Parkour.ocd/CheckPoint.ocd/Script.c | 4 +- .../ObjectInteractionMenu.ocd/Script.c | 10 +-- .../Helpers.ocd/Clock.ocd/Script.c | 2 +- .../Helpers.ocd/Sequence.ocd/Script.c | 4 +- .../Foodstuff.ocd/Bread.ocd/Script.c | 2 +- .../Foodstuff.ocd/CookedMushroom.ocd/Script.c | 2 +- .../Foodstuff.ocd/Flour.ocd/Script.c | 2 +- .../Foodstuff.ocd/Sproutberry.ocd/Script.c | 2 +- .../Resources.ocd/Cloth.ocd/Script.c | 2 +- .../Resources.ocd/CottonSeed.ocd/Script.c | 2 +- .../Resources.ocd/Diamond.ocd/Script.c | 2 +- .../Diamond.ocd/Socket.ocd/Script.c | 4 +- .../Resources.ocd/Earth.ocd/Script.c | 2 +- .../Resources.ocd/Firestone.ocd/Script.c | 2 +- .../Resources.ocd/GoldBar.ocd/Script.c | 2 +- .../Items.ocd/Resources.ocd/Ice.ocd/Script.c | 2 +- .../Items.ocd/Resources.ocd/Loam.ocd/Script.c | 2 +- .../Resources.ocd/Metal.ocd/Script.c | 2 +- .../Items.ocd/Resources.ocd/Ruby.ocd/Script.c | 2 +- .../Resources.ocd/Seeds.ocd/Script.c | 2 +- .../Resources.ocd/Sulphur.ocd/Script.c | 2 +- .../Items.ocd/Resources.ocd/Wood.ocd/Script.c | 2 +- .../Items.ocd/Tools.ocd/Axe.ocd/Script.c | 6 +- .../Balloon.ocd/BalloonDeployed.ocd/Script.c | 2 +- .../Items.ocd/Tools.ocd/Balloon.ocd/Script.c | 4 +- .../Barrel.ocd/MetalBarrel.ocd/Script.c | 4 +- .../Items.ocd/Tools.ocd/Barrel.ocd/Script.c | 4 +- .../Items.ocd/Tools.ocd/Boompack.ocd/Script.c | 10 +-- .../Items.ocd/Tools.ocd/Bucket.ocd/Script.c | 2 +- .../Items.ocd/Tools.ocd/Crate.ocd/Script.c | 6 +- .../Items.ocd/Tools.ocd/Dynamite.ocd/Script.c | 8 +-- .../DynamiteBox.ocd/Fuse.ocd/Script.c | 4 +- .../DynamiteBox.ocd/Igniter.ocd/Script.c | 2 +- .../Tools.ocd/DynamiteBox.ocd/Script.c | 6 +- .../GrappleBow.ocd/Hook.ocd/Script.c | 4 +- .../Tools.ocd/GrappleBow.ocd/Script.c | 4 +- .../Items.ocd/Tools.ocd/Lantern.ocd/Script.c | 6 +- .../Items.ocd/Tools.ocd/Pickaxe.ocd/Script.c | 4 +- .../Items.ocd/Tools.ocd/Pipe.ocd/Script.c | 4 +- .../Tools.ocd/PowderKeg.ocd/Script.c | 2 +- .../BridgeLoosePlank.ocd/Script.c | 2 +- .../Tools.ocd/Ropebridge.ocd/Script.c | 2 +- .../Tools.ocd/Ropeladder.ocd/Script.c | 2 +- .../Items.ocd/Tools.ocd/Shovel.ocd/Script.c | 2 +- .../Items.ocd/Tools.ocd/Sickle.ocd/Script.c | 2 +- .../Tools.ocd/TeleGlove.ocd/Script.c | 6 +- .../Items.ocd/Tools.ocd/Torch.ocd/Script.c | 2 +- .../Items.ocd/Tools.ocd/WallKit.ocd/Script.c | 6 +- .../Items.ocd/Tools.ocd/WindBag.ocd/Script.c | 14 ++-- .../Weapons.ocd/Bow.ocd/Arrow.ocd/Script.c | 8 +-- .../Items.ocd/Weapons.ocd/Bow.ocd/Script.c | 10 +-- .../Items.ocd/Weapons.ocd/Club.ocd/Script.c | 2 +- .../Weapons.ocd/GrenadeLauncher.ocd/Script.c | 4 +- .../Weapons.ocd/IronBomb.ocd/Script.c | 8 +-- .../IronBomb.ocd/Shrapnel.ocd/Script.c | 4 +- .../Weapons.ocd/Javelin.ocd/Script.c | 12 ++-- .../Weapons.ocd/Musket.ocd/Ammo.ocd/Script.c | 8 +-- .../Items.ocd/Weapons.ocd/Musket.ocd/Script.c | 4 +- .../Items.ocd/Weapons.ocd/Shield.ocd/Script.c | 6 +- .../Weapons.ocd/SmokeBomb.ocd/Script.c | 10 +-- .../Items.ocd/Weapons.ocd/Sword.ocd/Script.c | 6 +- .../ConstructionSite.ocd/Script.c | 2 +- .../Libraries.ocd/Goal.ocd/Script.c | 2 +- .../LampPost.ocd/Lamp.ocd/Script.c | 2 +- .../Plants.ocd/Tree.ocd/Script.c | 4 +- .../Structures.ocd/Base.ocd/Script.c | 2 +- .../Structures.ocd/Structure.ocd/Script.c | 6 +- .../Structures.ocd/ChemicalLab.ocd/Script.c | 10 +-- .../Structures.ocd/Chest.ocd/Script.c | 4 +- .../Elevator.ocd/Case.ocd/Script.c | 10 +-- .../Structures.ocd/Elevator.ocd/Script.c | 8 +-- .../Structures.ocd/Flagpole.ocd/Script.c | 2 +- .../Structures.ocd/Foundry.ocd/Script.c | 12 ++-- .../Structures.ocd/Pump.ocd/Script.c | 2 +- .../Structures.ocd/Sawmill.ocd/Script.c | 6 +- .../Structures.ocd/SteamEngine.ocd/Script.c | 6 +- .../Structures.ocd/StoneDoor.ocd/Script.c | 6 +- .../StoneDoor.ocd/SpinWheel.ocd/Script.c | 4 +- .../Structures.ocd/WindGenerator.ocd/Script.c | 2 +- .../Structures.ocd/Windmill.ocd/Script.c | 4 +- planet/Objects.ocd/System.ocg/Effects.c | 4 +- .../Vegetation.ocd/Trunk.ocd/Script.c | 2 +- .../Vehicles.ocd/Airplane.ocd/Script.c | 6 +- .../Vehicles.ocd/Airship.ocd/Script.c | 8 +-- .../Vehicles.ocd/Cannon.ocd/Script.c | 4 +- .../Vehicles.ocd/Catapult.ocd/Script.c | 2 +- .../Vehicles.ocd/Lorry.ocd/Script.c | 10 +-- planet/Parkour.ocf/Boomshire.ocs/Script.c | 2 +- .../Boomshire.ocs/System.ocg/SpinWheel.c | 2 +- planet/Parkour.ocf/BristleRidge.ocs/Script.c | 2 +- .../Maze.ocs/SprayCan.ocd/Script.c | 4 +- planet/Parkour.ocf/ShiverPeak.ocs/Script.c | 2 +- .../BigVolcano.ocd/Script.c | 2 +- .../Chippie.ocg/Bite1.wav} | Bin .../Chippie.ocg/Bite2.wav} | Bin .../Chippie.ocg/Chirp1.wav} | Bin .../Chippie.ocg/Chirp2.wav} | Bin .../Chippie.ocg/Chirp3.wav} | Bin .../Chippie.ocg/Talk1.wav} | Bin .../Chippie.ocg/Talk2.wav} | Bin .../Fish.ocg/Munch1.ogg} | Bin .../Monster.ocg/Die.wav} | Bin .../Monster.ocg/Growl1.wav} | Bin .../Monster.ocg/Growl2.wav} | Bin .../Monster.ocg/Growl3.wav} | Bin .../{ => Animals.ocg}/MosquitoBuzz.ogg | Bin .../Puka.ocg/Die.wav} | Bin .../Puka.ocg/Gulp.wav} | Bin .../Puka.ocg/Hiss1.wav} | Bin .../Puka.ocg/Hiss2.wav} | Bin .../Puka.ocg/Hurt1.wav} | Bin .../Puka.ocg/Hurt2.wav} | Bin .../Puka.ocg/Hurt3.wav} | Bin .../Puka.ocg/Hurt4.wav} | Bin .../Puka.ocg/TeleportIn.wav} | Bin .../Puka.ocg/TeleportOut.wav} | Bin .../Wipf.ocg/Aroof.wav} | Bin .../{ => Animals.ocg/Wipf.ocg}/Snuff1.wav | Bin .../{ => Animals.ocg/Wipf.ocg}/Snuff2.wav | Bin .../{ => Animals.ocg/Wipf.ocg}/Weep1.wav | Bin .../{ => Animals.ocg/Wipf.ocg}/Weep2.wav | Bin .../Wipf.ocg/Whine.wav} | Bin .../{ => Animals.ocg/Zap.ocg}/Zap1.ogg | Bin .../{ => Animals.ocg/Zap.ocg}/Zap2.ogg | Bin .../{ => Animals.ocg/Zap.ocg}/Zap3.ogg | Bin .../{ => Animals.ocg/Zap.ocg}/Zap4.ogg | Bin .../{ => Clonk.ocg/Action.ocg}/Breathing.wav | Bin .../Action.ocg/Dig.ocg}/Dig1.wav | Bin .../Action.ocg/Dig.ocg}/Dig2.wav | Bin .../Action.ocg/Dig.ocg}/Dig3.wav | Bin .../Action.ocg/Dig.ocg}/Dig4.wav | Bin .../Action.ocg/Dig.ocg}/Dig5.wav | Bin .../{ => Clonk.ocg/Action.ocg}/Munch1.ogg | Bin .../{ => Clonk.ocg/Movement.ocg}/Roll.ogg | Bin .../{ => Clonk.ocg/Movement.ocg}/Rustle1.ogg | Bin .../{ => Clonk.ocg/Movement.ocg}/Rustle2.ogg | Bin .../{ => Clonk.ocg/Movement.ocg}/Rustle3.ogg | Bin .../{ => Clonk.ocg/Movement.ocg}/Rustle4.ogg | Bin .../Movement.ocg}/RustleLand.ogg | Bin .../Movement.ocg}/StepHard1.ogg | Bin .../Movement.ocg}/StepHard2.ogg | Bin .../Movement.ocg}/StepHard3.ogg | Bin .../Movement.ocg}/StepHard4.ogg | Bin .../Movement.ocg}/StepHard5.ogg | Bin .../Movement.ocg}/StepSoft1.ogg | Bin .../Movement.ocg}/StepSoft2.ogg | Bin .../Movement.ocg}/StepSoft3.ogg | Bin .../Movement.ocg}/StepSoft4.ogg | Bin .../Movement.ocg}/StepSoft5.ogg | Bin .../Movement.ocg}/StepSoft6.ogg | Bin .../{ => Clonk.ocg/Verbal.ocg}/Confirm1.wav | Bin .../{ => Clonk.ocg/Verbal.ocg}/Confirm2.wav | Bin .../{ => Clonk.ocg/Verbal.ocg}/Confirm3.wav | Bin .../{ => Clonk.ocg/Verbal.ocg}/Die.wav | Bin .../{ => Clonk.ocg/Verbal.ocg}/FDie.ogg | Bin .../{ => Clonk.ocg/Verbal.ocg}/FHurt1.ogg | Bin .../{ => Clonk.ocg/Verbal.ocg}/FHurt2.ogg | Bin .../{ => Clonk.ocg/Verbal.ocg}/Hurt1.wav | Bin .../{ => Clonk.ocg/Verbal.ocg}/Hurt2.wav | Bin .../{ => Environment.ocg}/BirdsLoop.ogg | Bin .../Disasters.ocg}/Earthquake.ogg | Bin .../Disasters.ocg}/EarthquakeEnd.ogg | Bin .../{ => Environment.ocg/Tree.ocg}/Chop1.wav | Bin .../{ => Environment.ocg/Tree.ocg}/Chop2.wav | Bin .../{ => Environment.ocg/Tree.ocg}/Chop3.wav | Bin .../{ => Environment.ocg/Tree.ocg}/Chop4.wav | Bin .../{ => Environment.ocg/Tree.ocg}/Chop5.wav | Bin .../Tree.ocg/Crack.ogg} | Bin .../Tree.ocg/Landing.ogg} | Bin .../{ => Environment.ocg}/Waterfall.ogg | Bin .../{ => Environment.ocg}/WindLoop.ogg | Bin planet/Sound.ocg/{ => Fire.ocg}/Blast1.wav | Bin planet/Sound.ocg/{ => Fire.ocg}/Blast2.wav | Bin planet/Sound.ocg/{ => Fire.ocg}/Blast3.wav | Bin .../{ => Fire.ocg}/BlastFirework.ogg | Bin .../Sound.ocg/{ => Fire.ocg}/BlastLiquid1.ogg | Bin .../Sound.ocg/{ => Fire.ocg}/BlastLiquid2.ogg | Bin .../Sound.ocg/{ => Fire.ocg}/BlastMetal.ogg | Bin planet/Sound.ocg/{ => Fire.ocg}/Blowout.ogg | Bin planet/Sound.ocg/{ => Fire.ocg}/Cracker.ogg | Bin planet/Sound.ocg/{ => Fire.ocg}/Fire.ogg | Bin planet/Sound.ocg/{ => Fire.ocg}/Fireball.ogg | Bin planet/Sound.ocg/{ => Fire.ocg}/Fuse.ogg | Bin planet/Sound.ocg/{ => Fire.ocg}/FuseLoop.ogg | Bin planet/Sound.ocg/{ => Fire.ocg}/FuseShort.ogg | Bin planet/Sound.ocg/{ => Fire.ocg}/Inflame.ogg | Bin planet/Sound.ocg/{ => Fire.ocg}/Smoke.wav | Bin .../Sound.ocg/{ => Hits.ocg}/GeneralHit1.ogg | Bin .../Sound.ocg/{ => Hits.ocg}/GeneralHit2.ogg | Bin planet/Sound.ocg/{ => Hits.ocg}/IceHit1.wav | Bin planet/Sound.ocg/{ => Hits.ocg}/IceHit2.wav | Bin .../Materials.ocg/Glass.ocg}/GlassBreak.ogg | Bin .../Materials.ocg/Glass.ocg}/GlassHit1.ogg | Bin .../Materials.ocg/Glass.ocg}/GlassHit2.ogg | Bin .../Materials.ocg/Glass.ocg}/GlassShatter.ogg | Bin .../Metal.ocg}/DullMetalHit1.ogg | Bin .../Metal.ocg}/DullMetalHit2.ogg | Bin .../Metal.ocg}/DullMetalHit3.ogg | Bin .../Metal.ocg}/LightMetalHit1.ogg | Bin .../Metal.ocg}/LightMetalHit2.ogg | Bin .../Materials.ocg/Rock.ocg}/RockHit1.ogg | Bin .../Materials.ocg/Rock.ocg}/RockHit2.ogg | Bin .../Materials.ocg/Rock.ocg}/RockHit3.ogg | Bin .../Materials.ocg/Rock.ocg}/Rockfall1.wav | Bin .../Materials.ocg/Rock.ocg}/Rockfall2.wav | Bin .../Materials.ocg/Wood.ocg}/DullWoodHit1.ogg | Bin .../Materials.ocg/Wood.ocg}/DullWoodHit2.ogg | Bin .../Materials.ocg/Wood.ocg}/WoodCreak1.ogg | Bin .../Materials.ocg/Wood.ocg}/WoodCreak2.ogg | Bin .../Materials.ocg/Wood.ocg}/WoodCreak3.ogg | Bin .../Materials.ocg/Wood.ocg}/WoodHit1.ogg | Bin .../Materials.ocg/Wood.ocg}/WoodHit2.ogg | Bin .../Materials.ocg/Wood.ocg}/WoodHit3.ogg | Bin .../Sound.ocg/{ => Hits.ocg}/OrganicHit1.ogg | Bin .../Sound.ocg/{ => Hits.ocg}/OrganicHit2.ogg | Bin .../{ => Hits.ocg}/ProjectileHitLiving1.ogg | Bin .../{ => Hits.ocg}/ProjectileHitLiving2.ogg | Bin planet/Sound.ocg/{ => Hits.ocg}/SoftHit1.ogg | Bin planet/Sound.ocg/{ => Hits.ocg}/SoftHit2.ogg | Bin .../Sound.ocg/{ => Hits.ocg}/SoftTouch1.ogg | Bin .../Sound.ocg/{ => Hits.ocg}/SoftTouch2.ogg | Bin .../Sound.ocg/{ => Liquids.ocg}/Boiling.ogg | Bin .../Sound.ocg/{ => Liquids.ocg}/Bubble1.ogg | Bin .../Sound.ocg/{ => Liquids.ocg}/Bubble2.ogg | Bin .../Sound.ocg/{ => Liquids.ocg}/Bubble3.ogg | Bin .../Sound.ocg/{ => Liquids.ocg}/Corrode.ogg | Bin .../Sound.ocg/{ => Liquids.ocg}/Pshshsh.ogg | Bin planet/Sound.ocg/{ => Liquids.ocg}/Sizzle.ogg | Bin .../{ => Liquids.ocg}/SmokeSizzle.ogg | Bin .../Sound.ocg/{ => Liquids.ocg}/Splash1.wav | Bin .../Sound.ocg/{ => Liquids.ocg}/Splash2.wav | Bin .../Sound.ocg/{ => Liquids.ocg}/Splash3.wav | Bin .../{ => Liquids.ocg}/Waterdrop1.wav | Bin .../{ => Liquids.ocg}/Waterdrop2.wav | Bin .../Arrow.ocg/HitGround.ogg} | Bin .../Arrow.ocg/Shoot1.ogg} | Bin .../Arrow.ocg/Shoot2.ogg} | Bin .../Arrow.ocg/Shoot3.ogg} | Bin .../Balloon.ocg/Inflate.wav} | Bin .../Balloon.ocg/Pop.wav} | Bin .../Boompack.ocg/Fly.ogg} | Bin .../Boompack.ocg/Launch.ogg} | Bin .../{ => Objects.ocg}/Catapult_Launch.ogg | Bin planet/Sound.ocg/{ => Objects.ocg}/Clonk.ogg | Bin .../Sound.ocg/{ => Objects.ocg}/Connect.ogg | Bin .../{ => Objects.ocg}/DiamondDigOut.ogg | Bin .../{ => Objects.ocg}/Electrical.ogg | Bin .../{ => Objects.ocg/Pickaxe.ocg}/Clang1.wav | Bin .../{ => Objects.ocg/Pickaxe.ocg}/Clang2.wav | Bin .../{ => Objects.ocg/Pickaxe.ocg}/Clang3.wav | Bin .../Plane.ocg}/PlaneCrash.ogg | Bin .../Plane.ocg}/PropellerLoop.ogg | Bin .../WallKit.ocg/Click.wav} | Bin .../WallKit.ocg/Lock.wav} | Bin .../Weapons.ocg/Bow.ocg/Draw.ogg} | Bin .../Weapons.ocg/Bow.ocg}/GetArrow1.ogg | Bin .../Weapons.ocg/Bow.ocg}/GetArrow2.ogg | Bin .../Weapons.ocg/Bow.ocg/Load1.ogg} | Bin .../Weapons.ocg/Bow.ocg/Load2.ogg} | Bin .../Weapons.ocg/Bow.ocg}/PutAwayBow.ogg | Bin .../Weapons.ocg/Bow.ocg/Shoot1.ogg} | Bin .../Weapons.ocg/Bow.ocg/Shoot2.ogg} | Bin .../Weapons.ocg/Bow.ocg/Shoot3.ogg} | Bin .../Weapons.ocg/Javelin.ocg/Draw.ogg} | Bin .../Weapons.ocg/Javelin.ocg/HitGround.ogg} | Bin .../Weapons.ocg/Javelin.ocg/Throw1.ogg} | Bin .../Weapons.ocg/Javelin.ocg/Throw2.ogg} | Bin .../Weapons.ocg/Javelin.ocg/Throw3.ogg} | Bin .../Musket.ocg}/BulletHitGround1.ogg | Bin .../Musket.ocg}/BulletHitGround2.ogg | Bin .../Musket.ocg}/BulletHitGround3.ogg | Bin .../Weapons.ocg/Musket.ocg}/BulletShot1.ogg | Bin .../Weapons.ocg/Musket.ocg}/BulletShot2.ogg | Bin .../Weapons.ocg/Musket.ocg}/GunShoot1.ogg | Bin .../Weapons.ocg/Musket.ocg}/GunShoot2.ogg | Bin .../Weapons.ocg/Musket.ocg}/GunShoot3.ogg | Bin .../Weapons.ocg/Musket.ocg}/GunShoot4.ogg | Bin .../Weapons.ocg/Musket.ocg}/GunShoot5.ogg | Bin .../Weapons.ocg/Shield.ocg/MetalHit1.ogg} | Bin .../Weapons.ocg/Shield.ocg/MetalHit2.ogg} | Bin .../Weapons.ocg/Shield.ocg/MetalHit3.ogg} | Bin .../Weapons.ocg/Shield.ocg/MetalHit4.ogg} | Bin .../Shield.ocg}/WeaponHitShield.ogg | Bin .../Weapons.ocg/Shield.ocg/WoodHit1.ogg} | Bin .../Weapons.ocg/Shield.ocg/WoodHit2.ogg} | Bin .../Weapons.ocg/Shield.ocg/WoodHit3.ogg} | Bin .../Weapons.ocg}/WeaponHit1.ogg | Bin .../Weapons.ocg}/WeaponHit2.ogg | Bin .../Weapons.ocg}/WeaponHit3.ogg | Bin .../Weapons.ocg}/WeaponSwing1.ogg | Bin .../Weapons.ocg}/WeaponSwing2.ogg | Bin .../Weapons.ocg}/WeaponSwing3.ogg | Bin .../Windbag.ocg/Charge.ogg} | Bin .../Windbag.ocg/ChargeStop.ogg} | Bin .../Windbag.ocg/Gust.ogg} | Bin .../Chest.ocg/Close.ogg} | Bin .../Chest.ocg/Open.ogg} | Bin .../Elevator.ocg/Drilling.ogg} | Bin .../Elevator.ocg/Moving.ogg} | Bin .../Elevator.ocg/Start.ogg} | Bin .../Elevator.ocg/Stop.ogg} | Bin .../{ => Structures.ocg}/FanLoop.ogg | Bin .../Furnace.ocg/Loop.ogg} | Bin .../Furnace.ocg/Start.ogg} | Bin .../Furnace.ocg/Stop.ogg} | Bin .../{ => Structures.ocg}/HingeCreak1.ogg | Bin .../{ => Structures.ocg}/HingeCreak2.ogg | Bin .../{ => Structures.ocg}/HingeCreak3.ogg | Bin .../{ => Structures.ocg}/Pumpjack.ogg | Bin .../{ => Structures.ocg}/SawmillRipcut.ogg | Bin .../{ => Structures.ocg}/SteamEngine.ogg | Bin .../StoneGate.ocg}/Chain.ogg | Bin .../StoneGate.ocg}/GateHit.ogg | Bin .../StoneGate.ocg}/GateMove.ogg | Bin .../{ => Structures.ocg}/WheelsTurn.ogg | Bin planet/Sound.ocg/{ => UI.ocg}/Cash.ogg | Bin planet/Sound.ocg/{ => UI.ocg}/Cleared.ogg | Bin planet/Sound.ocg/{ => UI.ocg}/Click.wav | Bin planet/Sound.ocg/{ => UI.ocg}/Click2.ogg | Bin .../Sound.ocg/{ => UI.ocg}/CloseViewport.ogg | Bin planet/Sound.ocg/{ => UI.ocg}/Ding.ogg | Bin planet/Sound.ocg/{ => UI.ocg}/Fanfare.wav | Bin planet/Sound.ocg/authors.txt | 67 +++++++++--------- planet/System.ocg/Fire.c | 6 +- planet/System.ocg/Object.c | 6 +- planet/Tests.ocf/Parameters.ocs/Script.c | 2 +- planet/Worlds.ocf/IronPeak.ocs/Script.c | 2 +- planet/Worlds.ocf/Krakatoa.ocs/Script.c | 6 +- .../Krakatoa.ocs/System.ocg/SeqIntro.c | 2 +- src/control/C4Control.cpp | 4 +- src/game/C4Game.cpp | 2 +- src/game/C4Viewport.cpp | 8 +-- src/gamescript/C4Effect.cpp | 4 +- src/gui/C4ChatDlg.cpp | 2 +- src/gui/C4GameLobby.cpp | 16 ++--- src/gui/C4GuiButton.cpp | 4 +- src/gui/C4GuiCheckBox.cpp | 2 +- src/gui/C4GuiContainers.cpp | 2 +- src/gui/C4GuiMenu.cpp | 6 +- src/gui/C4StartupNetDlg.cpp | 2 +- src/gui/C4StartupOptionsDlg.cpp | 2 +- src/gui/C4StartupPlrSelDlg.cpp | 6 +- src/gui/C4StartupPlrSelDlg.h | 2 +- src/gui/C4StartupScenSelDlg.cpp | 2 +- src/landscape/C4Material.cpp | 8 +-- src/network/C4Network2Dialogs.cpp | 4 +- src/object/C4Object.cpp | 4 +- src/player/C4Player.cpp | 10 +-- 416 files changed, 411 insertions(+), 408 deletions(-) rename planet/Sound.ocg/{ChippieBite1.wav => Animals.ocg/Chippie.ocg/Bite1.wav} (100%) rename planet/Sound.ocg/{ChippieBite2.wav => Animals.ocg/Chippie.ocg/Bite2.wav} (100%) rename planet/Sound.ocg/{ChippieChirp1.wav => Animals.ocg/Chippie.ocg/Chirp1.wav} (100%) rename planet/Sound.ocg/{ChippieChirp2.wav => Animals.ocg/Chippie.ocg/Chirp2.wav} (100%) rename planet/Sound.ocg/{ChippieChirp3.wav => Animals.ocg/Chippie.ocg/Chirp3.wav} (100%) rename planet/Sound.ocg/{ChippieTalk1.wav => Animals.ocg/Chippie.ocg/Talk1.wav} (100%) rename planet/Sound.ocg/{ChippieTalk2.wav => Animals.ocg/Chippie.ocg/Talk2.wav} (100%) rename planet/Sound.ocg/{FishMunch1.ogg => Animals.ocg/Fish.ocg/Munch1.ogg} (100%) rename planet/Sound.ocg/{MonsterDie.wav => Animals.ocg/Monster.ocg/Die.wav} (100%) rename planet/Sound.ocg/{MonsterGrowl1.wav => Animals.ocg/Monster.ocg/Growl1.wav} (100%) rename planet/Sound.ocg/{MonsterGrowl2.wav => Animals.ocg/Monster.ocg/Growl2.wav} (100%) rename planet/Sound.ocg/{MonsterGrowl3.wav => Animals.ocg/Monster.ocg/Growl3.wav} (100%) rename planet/Sound.ocg/{ => Animals.ocg}/MosquitoBuzz.ogg (100%) rename planet/Sound.ocg/{PukaDie.wav => Animals.ocg/Puka.ocg/Die.wav} (100%) rename planet/Sound.ocg/{PukaGulp.wav => Animals.ocg/Puka.ocg/Gulp.wav} (100%) rename planet/Sound.ocg/{PukaHiss1.wav => Animals.ocg/Puka.ocg/Hiss1.wav} (100%) rename planet/Sound.ocg/{PukaHiss2.wav => Animals.ocg/Puka.ocg/Hiss2.wav} (100%) rename planet/Sound.ocg/{PukaHurt1.wav => Animals.ocg/Puka.ocg/Hurt1.wav} (100%) rename planet/Sound.ocg/{PukaHurt2.wav => Animals.ocg/Puka.ocg/Hurt2.wav} (100%) rename planet/Sound.ocg/{PukaHurt3.wav => Animals.ocg/Puka.ocg/Hurt3.wav} (100%) rename planet/Sound.ocg/{PukaHurt3b.wav => Animals.ocg/Puka.ocg/Hurt4.wav} (100%) rename planet/Sound.ocg/{PukaTeleportIn.wav => Animals.ocg/Puka.ocg/TeleportIn.wav} (100%) rename planet/Sound.ocg/{PukaTeleportOut.wav => Animals.ocg/Puka.ocg/TeleportOut.wav} (100%) rename planet/Sound.ocg/{WipfAroof.wav => Animals.ocg/Wipf.ocg/Aroof.wav} (100%) rename planet/Sound.ocg/{ => Animals.ocg/Wipf.ocg}/Snuff1.wav (100%) rename planet/Sound.ocg/{ => Animals.ocg/Wipf.ocg}/Snuff2.wav (100%) rename planet/Sound.ocg/{ => Animals.ocg/Wipf.ocg}/Weep1.wav (100%) rename planet/Sound.ocg/{ => Animals.ocg/Wipf.ocg}/Weep2.wav (100%) rename planet/Sound.ocg/{WipfWhine.wav => Animals.ocg/Wipf.ocg/Whine.wav} (100%) rename planet/Sound.ocg/{ => Animals.ocg/Zap.ocg}/Zap1.ogg (100%) rename planet/Sound.ocg/{ => Animals.ocg/Zap.ocg}/Zap2.ogg (100%) rename planet/Sound.ocg/{ => Animals.ocg/Zap.ocg}/Zap3.ogg (100%) rename planet/Sound.ocg/{ => Animals.ocg/Zap.ocg}/Zap4.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Action.ocg}/Breathing.wav (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Action.ocg/Dig.ocg}/Dig1.wav (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Action.ocg/Dig.ocg}/Dig2.wav (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Action.ocg/Dig.ocg}/Dig3.wav (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Action.ocg/Dig.ocg}/Dig4.wav (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Action.ocg/Dig.ocg}/Dig5.wav (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Action.ocg}/Munch1.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/Roll.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/Rustle1.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/Rustle2.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/Rustle3.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/Rustle4.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/RustleLand.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/StepHard1.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/StepHard2.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/StepHard3.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/StepHard4.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/StepHard5.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/StepSoft1.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/StepSoft2.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/StepSoft3.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/StepSoft4.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/StepSoft5.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Movement.ocg}/StepSoft6.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Verbal.ocg}/Confirm1.wav (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Verbal.ocg}/Confirm2.wav (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Verbal.ocg}/Confirm3.wav (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Verbal.ocg}/Die.wav (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Verbal.ocg}/FDie.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Verbal.ocg}/FHurt1.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Verbal.ocg}/FHurt2.ogg (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Verbal.ocg}/Hurt1.wav (100%) rename planet/Sound.ocg/{ => Clonk.ocg/Verbal.ocg}/Hurt2.wav (100%) rename planet/Sound.ocg/{ => Environment.ocg}/BirdsLoop.ogg (100%) rename planet/Sound.ocg/{ => Environment.ocg/Disasters.ocg}/Earthquake.ogg (100%) rename planet/Sound.ocg/{ => Environment.ocg/Disasters.ocg}/EarthquakeEnd.ogg (100%) rename planet/Sound.ocg/{ => Environment.ocg/Tree.ocg}/Chop1.wav (100%) rename planet/Sound.ocg/{ => Environment.ocg/Tree.ocg}/Chop2.wav (100%) rename planet/Sound.ocg/{ => Environment.ocg/Tree.ocg}/Chop3.wav (100%) rename planet/Sound.ocg/{ => Environment.ocg/Tree.ocg}/Chop4.wav (100%) rename planet/Sound.ocg/{ => Environment.ocg/Tree.ocg}/Chop5.wav (100%) rename planet/Sound.ocg/{TreeCrack.ogg => Environment.ocg/Tree.ocg/Crack.ogg} (100%) rename planet/Sound.ocg/{TreeLanding.ogg => Environment.ocg/Tree.ocg/Landing.ogg} (100%) rename planet/Sound.ocg/{ => Environment.ocg}/Waterfall.ogg (100%) rename planet/Sound.ocg/{ => Environment.ocg}/WindLoop.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/Blast1.wav (100%) rename planet/Sound.ocg/{ => Fire.ocg}/Blast2.wav (100%) rename planet/Sound.ocg/{ => Fire.ocg}/Blast3.wav (100%) rename planet/Sound.ocg/{ => Fire.ocg}/BlastFirework.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/BlastLiquid1.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/BlastLiquid2.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/BlastMetal.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/Blowout.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/Cracker.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/Fire.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/Fireball.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/Fuse.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/FuseLoop.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/FuseShort.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/Inflame.ogg (100%) rename planet/Sound.ocg/{ => Fire.ocg}/Smoke.wav (100%) rename planet/Sound.ocg/{ => Hits.ocg}/GeneralHit1.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg}/GeneralHit2.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg}/IceHit1.wav (100%) rename planet/Sound.ocg/{ => Hits.ocg}/IceHit2.wav (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Glass.ocg}/GlassBreak.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Glass.ocg}/GlassHit1.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Glass.ocg}/GlassHit2.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Glass.ocg}/GlassShatter.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Metal.ocg}/DullMetalHit1.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Metal.ocg}/DullMetalHit2.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Metal.ocg}/DullMetalHit3.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Metal.ocg}/LightMetalHit1.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Metal.ocg}/LightMetalHit2.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Rock.ocg}/RockHit1.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Rock.ocg}/RockHit2.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Rock.ocg}/RockHit3.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Rock.ocg}/Rockfall1.wav (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Rock.ocg}/Rockfall2.wav (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Wood.ocg}/DullWoodHit1.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Wood.ocg}/DullWoodHit2.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Wood.ocg}/WoodCreak1.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Wood.ocg}/WoodCreak2.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Wood.ocg}/WoodCreak3.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Wood.ocg}/WoodHit1.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Wood.ocg}/WoodHit2.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg/Materials.ocg/Wood.ocg}/WoodHit3.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg}/OrganicHit1.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg}/OrganicHit2.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg}/ProjectileHitLiving1.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg}/ProjectileHitLiving2.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg}/SoftHit1.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg}/SoftHit2.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg}/SoftTouch1.ogg (100%) rename planet/Sound.ocg/{ => Hits.ocg}/SoftTouch2.ogg (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/Boiling.ogg (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/Bubble1.ogg (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/Bubble2.ogg (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/Bubble3.ogg (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/Corrode.ogg (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/Pshshsh.ogg (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/Sizzle.ogg (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/SmokeSizzle.ogg (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/Splash1.wav (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/Splash2.wav (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/Splash3.wav (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/Waterdrop1.wav (100%) rename planet/Sound.ocg/{ => Liquids.ocg}/Waterdrop2.wav (100%) rename planet/Sound.ocg/{ArrowHitGround.ogg => Objects.ocg/Arrow.ocg/HitGround.ogg} (100%) rename planet/Sound.ocg/{ArrowShoot1.ogg => Objects.ocg/Arrow.ocg/Shoot1.ogg} (100%) rename planet/Sound.ocg/{ArrowShoot2.ogg => Objects.ocg/Arrow.ocg/Shoot2.ogg} (100%) rename planet/Sound.ocg/{ArrowShoot3.ogg => Objects.ocg/Arrow.ocg/Shoot3.ogg} (100%) rename planet/Sound.ocg/{BalloonInflate.wav => Objects.ocg/Balloon.ocg/Inflate.wav} (100%) rename planet/Sound.ocg/{BalloonPop.wav => Objects.ocg/Balloon.ocg/Pop.wav} (100%) rename planet/Sound.ocg/{BoompackFly.ogg => Objects.ocg/Boompack.ocg/Fly.ogg} (100%) rename planet/Sound.ocg/{BoompackLaunch.ogg => Objects.ocg/Boompack.ocg/Launch.ogg} (100%) rename planet/Sound.ocg/{ => Objects.ocg}/Catapult_Launch.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg}/Clonk.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg}/Connect.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg}/DiamondDigOut.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg}/Electrical.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Pickaxe.ocg}/Clang1.wav (100%) rename planet/Sound.ocg/{ => Objects.ocg/Pickaxe.ocg}/Clang2.wav (100%) rename planet/Sound.ocg/{ => Objects.ocg/Pickaxe.ocg}/Clang3.wav (100%) rename planet/Sound.ocg/{ => Objects.ocg/Plane.ocg}/PlaneCrash.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Plane.ocg}/PropellerLoop.ogg (100%) rename planet/Sound.ocg/{WallKitClick.wav => Objects.ocg/WallKit.ocg/Click.wav} (100%) rename planet/Sound.ocg/{WallKitLock.wav => Objects.ocg/WallKit.ocg/Lock.wav} (100%) rename planet/Sound.ocg/{DrawBow.ogg => Objects.ocg/Weapons.ocg/Bow.ocg/Draw.ogg} (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Bow.ocg}/GetArrow1.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Bow.ocg}/GetArrow2.ogg (100%) rename planet/Sound.ocg/{BowLoad1.ogg => Objects.ocg/Weapons.ocg/Bow.ocg/Load1.ogg} (100%) rename planet/Sound.ocg/{BowLoad2.ogg => Objects.ocg/Weapons.ocg/Bow.ocg/Load2.ogg} (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Bow.ocg}/PutAwayBow.ogg (100%) rename planet/Sound.ocg/{BowShoot1.ogg => Objects.ocg/Weapons.ocg/Bow.ocg/Shoot1.ogg} (100%) rename planet/Sound.ocg/{BowShoot2.ogg => Objects.ocg/Weapons.ocg/Bow.ocg/Shoot2.ogg} (100%) rename planet/Sound.ocg/{BowShoot3.ogg => Objects.ocg/Weapons.ocg/Bow.ocg/Shoot3.ogg} (100%) rename planet/Sound.ocg/{DrawJavelin.ogg => Objects.ocg/Weapons.ocg/Javelin.ocg/Draw.ogg} (100%) rename planet/Sound.ocg/{JavelinHitGround.ogg => Objects.ocg/Weapons.ocg/Javelin.ocg/HitGround.ogg} (100%) rename planet/Sound.ocg/{ThrowJavelin1.ogg => Objects.ocg/Weapons.ocg/Javelin.ocg/Throw1.ogg} (100%) rename planet/Sound.ocg/{ThrowJavelin2.ogg => Objects.ocg/Weapons.ocg/Javelin.ocg/Throw2.ogg} (100%) rename planet/Sound.ocg/{ThrowJavelin3.ogg => Objects.ocg/Weapons.ocg/Javelin.ocg/Throw3.ogg} (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Musket.ocg}/BulletHitGround1.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Musket.ocg}/BulletHitGround2.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Musket.ocg}/BulletHitGround3.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Musket.ocg}/BulletShot1.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Musket.ocg}/BulletShot2.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Musket.ocg}/GunShoot1.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Musket.ocg}/GunShoot2.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Musket.ocg}/GunShoot3.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Musket.ocg}/GunShoot4.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Musket.ocg}/GunShoot5.ogg (100%) rename planet/Sound.ocg/{ShieldMetalHit1.ogg => Objects.ocg/Weapons.ocg/Shield.ocg/MetalHit1.ogg} (100%) rename planet/Sound.ocg/{ShieldMetalHit2.ogg => Objects.ocg/Weapons.ocg/Shield.ocg/MetalHit2.ogg} (100%) rename planet/Sound.ocg/{ShieldMetalHit3.ogg => Objects.ocg/Weapons.ocg/Shield.ocg/MetalHit3.ogg} (100%) rename planet/Sound.ocg/{ShieldMetalHit4.ogg => Objects.ocg/Weapons.ocg/Shield.ocg/MetalHit4.ogg} (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg/Shield.ocg}/WeaponHitShield.ogg (100%) rename planet/Sound.ocg/{ShieldWoodHit1.ogg => Objects.ocg/Weapons.ocg/Shield.ocg/WoodHit1.ogg} (100%) rename planet/Sound.ocg/{ShieldWoodHit2.ogg => Objects.ocg/Weapons.ocg/Shield.ocg/WoodHit2.ogg} (100%) rename planet/Sound.ocg/{ShieldWoodHit3.ogg => Objects.ocg/Weapons.ocg/Shield.ocg/WoodHit3.ogg} (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg}/WeaponHit1.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg}/WeaponHit2.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg}/WeaponHit3.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg}/WeaponSwing1.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg}/WeaponSwing2.ogg (100%) rename planet/Sound.ocg/{ => Objects.ocg/Weapons.ocg}/WeaponSwing3.ogg (100%) rename planet/Sound.ocg/{WindCharge.ogg => Objects.ocg/Windbag.ocg/Charge.ogg} (100%) rename planet/Sound.ocg/{WindChargeStop.ogg => Objects.ocg/Windbag.ocg/ChargeStop.ogg} (100%) rename planet/Sound.ocg/{WindGust.ogg => Objects.ocg/Windbag.ocg/Gust.ogg} (100%) rename planet/Sound.ocg/{ChestClose.ogg => Structures.ocg/Chest.ocg/Close.ogg} (100%) rename planet/Sound.ocg/{ChestOpen.ogg => Structures.ocg/Chest.ocg/Open.ogg} (100%) rename planet/Sound.ocg/{ElevatorDrilling.ogg => Structures.ocg/Elevator.ocg/Drilling.ogg} (100%) rename planet/Sound.ocg/{ElevatorMoving.ogg => Structures.ocg/Elevator.ocg/Moving.ogg} (100%) rename planet/Sound.ocg/{ElevatorStart.ogg => Structures.ocg/Elevator.ocg/Start.ogg} (100%) rename planet/Sound.ocg/{ElevatorStop.ogg => Structures.ocg/Elevator.ocg/Stop.ogg} (100%) rename planet/Sound.ocg/{ => Structures.ocg}/FanLoop.ogg (100%) rename planet/Sound.ocg/{FurnaceLoop.ogg => Structures.ocg/Furnace.ocg/Loop.ogg} (100%) rename planet/Sound.ocg/{FurnaceStart.ogg => Structures.ocg/Furnace.ocg/Start.ogg} (100%) rename planet/Sound.ocg/{FurnaceStop.ogg => Structures.ocg/Furnace.ocg/Stop.ogg} (100%) rename planet/Sound.ocg/{ => Structures.ocg}/HingeCreak1.ogg (100%) rename planet/Sound.ocg/{ => Structures.ocg}/HingeCreak2.ogg (100%) rename planet/Sound.ocg/{ => Structures.ocg}/HingeCreak3.ogg (100%) rename planet/Sound.ocg/{ => Structures.ocg}/Pumpjack.ogg (100%) rename planet/Sound.ocg/{ => Structures.ocg}/SawmillRipcut.ogg (100%) rename planet/Sound.ocg/{ => Structures.ocg}/SteamEngine.ogg (100%) rename planet/Sound.ocg/{ => Structures.ocg/StoneGate.ocg}/Chain.ogg (100%) rename planet/Sound.ocg/{ => Structures.ocg/StoneGate.ocg}/GateHit.ogg (100%) rename planet/Sound.ocg/{ => Structures.ocg/StoneGate.ocg}/GateMove.ogg (100%) rename planet/Sound.ocg/{ => Structures.ocg}/WheelsTurn.ogg (100%) rename planet/Sound.ocg/{ => UI.ocg}/Cash.ogg (100%) rename planet/Sound.ocg/{ => UI.ocg}/Cleared.ogg (100%) rename planet/Sound.ocg/{ => UI.ocg}/Click.wav (100%) rename planet/Sound.ocg/{ => UI.ocg}/Click2.ogg (100%) rename planet/Sound.ocg/{ => UI.ocg}/CloseViewport.ogg (100%) rename planet/Sound.ocg/{ => UI.ocg}/Ding.ogg (100%) rename planet/Sound.ocg/{ => UI.ocg}/Fanfare.wav (100%) diff --git a/planet/Arena.ocf/FrozenFortress.ocs/Script.c b/planet/Arena.ocf/FrozenFortress.ocs/Script.c index b6602534c..4141d8ba0 100644 --- a/planet/Arena.ocf/FrozenFortress.ocs/Script.c +++ b/planet/Arena.ocf/FrozenFortress.ocs/Script.c @@ -51,7 +51,7 @@ protected func Initialize() AddEffect("FillOtherChest", chest, 100, 5 * 36); AddEffect("SnowyWinter", nil, 100, 1); - Sound("WindLoop",true,20,nil,+1); + Sound("Environment::WindLoop",true,20,nil,+1); AddEffect("GeysirExplosion", nil, 100, 1); // Brick edges, notice the symmetric landscape. PlaceEdges(); diff --git a/planet/Arena.ocf/FrozenFortress.ocs/Scrolls.ocd/FrostboltScroll.ocd/Script.c b/planet/Arena.ocf/FrozenFortress.ocs/Scrolls.ocd/FrostboltScroll.ocd/Script.c index e7ce20c7b..8e6f8c6d2 100644 --- a/planet/Arena.ocf/FrozenFortress.ocs/Scrolls.ocd/FrostboltScroll.ocd/Script.c +++ b/planet/Arena.ocf/FrozenFortress.ocs/Scrolls.ocd/FrostboltScroll.ocd/Script.c @@ -14,8 +14,8 @@ func Initialize() public func ControlUse(object pClonk, int ix, int iy) { AddEffect("Frostbolt", nil, 100, 1, nil, GetID(), pClonk->GetOwner(), Angle(0,0,ix,iy),pClonk->GetX(), pClonk->GetY()); - Sound("Fireball"); - Sound("Fireball"); + Sound("Fire::Fireball"); + Sound("Fire::Fireball"); RemoveObject(); return 1; } @@ -68,7 +68,7 @@ public func FxFrostboltTimer(pTarget, effect, iEffectTime) { CreateObjectAbove(Dynamite,x,y,effect.owner)->BlueExplode(); var dummy = CreateObjectAbove(Dummy,x,y,-1); - dummy->Sound("GlassShatter"); + dummy->Sound("Hits::Materials::Glass::GlassShatter"); ScheduleCall(dummy, "RemoveObject", 36); for(var i=0; i<=60;i++) { diff --git a/planet/Arena.ocf/FrozenFortress.ocs/System.ocg/Explode.c b/planet/Arena.ocf/FrozenFortress.ocs/System.ocg/Explode.c index f663bb5df..7e0cc0348 100644 --- a/planet/Arena.ocf/FrozenFortress.ocs/System.ocg/Explode.c +++ b/planet/Arena.ocf/FrozenFortress.ocs/System.ocg/Explode.c @@ -7,7 +7,7 @@ global func BlueExplode(int level) // Sound must be created before object removal, for it to be played at the right position. var grade = BoundBy(level / 10 - 1, 1, 3); - Sound(Format("Blast%d", grade), false); + Sound(Format("Fire::Blast%d", grade), false); // Explosion parameters. var x = GetX(), y = GetY(); diff --git a/planet/Arena.ocf/Hideout.ocs/LifeGem.ocd/Script.c b/planet/Arena.ocf/Hideout.ocs/LifeGem.ocd/Script.c index 905adb436..60908ce6c 100644 --- a/planet/Arena.ocf/Hideout.ocs/LifeGem.ocd/Script.c +++ b/planet/Arena.ocf/Hideout.ocs/LifeGem.ocd/Script.c @@ -38,7 +38,7 @@ public func ControlUse(object clonk, int ix, int iy) // applies the healing effect even when the Clonk is at full HP // does this because you can block one source of damage AddEffect("GemHealing", clonk, 10, 4, nil, this->GetID()); - clonk->Sound("Breathing", false, 50, nil); + clonk->Sound("Clonk::Action::Breathing", false, 50, nil); this->RemoveObject(); return true; } diff --git a/planet/Arena.ocf/MoltenMonarch.ocs/System.ocg/King_Bow.c b/planet/Arena.ocf/MoltenMonarch.ocs/System.ocg/King_Bow.c index 176548fd1..e82bd8cc4 100644 --- a/planet/Arena.ocf/MoltenMonarch.ocs/System.ocg/King_Bow.c +++ b/planet/Arena.ocf/MoltenMonarch.ocs/System.ocg/King_Bow.c @@ -24,7 +24,7 @@ public func FinishedAiming(object clonk, int angle) AddEffect("ExplosiveArrow",arrow,100,1,this); arrow->SetClrModulation(RGB(255,128,0)); } - Sound("BowShoot?"); + Sound("Objects::Weapons::Bow::Shoot?"); } } diff --git a/planet/Arena.ocf/MoltenMonarch.ocs/System.ocg/King_Javelin.c b/planet/Arena.ocf/MoltenMonarch.ocs/System.ocg/King_Javelin.c index 2b0d4b17a..9acfa07d4 100644 --- a/planet/Arena.ocf/MoltenMonarch.ocs/System.ocg/King_Javelin.c +++ b/planet/Arena.ocf/MoltenMonarch.ocs/System.ocg/King_Javelin.c @@ -35,7 +35,7 @@ public func DoThrow(object clonk, int angle) javelin->AddEffect("Flight",javelin,1,1,javelin,nil); javelin->AddEffect("HitCheck",javelin,1,1,nil,nil,clonk); - Sound("ThrowJavelin?"); + Sound("Objects::Weapons::Javelin::Throw?"); aiming = -1; clonk->UpdateAttach(); diff --git a/planet/Arena.ocf/MoltenMonarch.ocs/System.ocg/King_Musket.c b/planet/Arena.ocf/MoltenMonarch.ocs/System.ocg/King_Musket.c index 3e90441b1..2b9f761cc 100644 --- a/planet/Arena.ocf/MoltenMonarch.ocs/System.ocg/King_Musket.c +++ b/planet/Arena.ocf/MoltenMonarch.ocs/System.ocg/King_Musket.c @@ -38,7 +38,7 @@ private func FireWeapon(object clonk, int angle) loaded = false; SetProperty("PictureTransformation",Trans_Mul(Trans_Translate(1500,0,-1500),Trans_Rotate(170,0,1,0),Trans_Rotate(30,0,0,1))); - Sound("GunShoot?"); + Sound("Objects::Weapons::Musket::GunShoot?"); // Muzzle Flash & gun smoke var IX=Sin(180-angle,MuskFront); diff --git a/planet/Arena.ocf/Overcast.ocs/Script.c b/planet/Arena.ocf/Overcast.ocs/Script.c index 146d1d302..88b066a1b 100644 --- a/planet/Arena.ocf/Overcast.ocs/Script.c +++ b/planet/Arena.ocf/Overcast.ocs/Script.c @@ -18,7 +18,7 @@ protected func Initialize() //Enviroment. Cloud->Place(25); SetSkyAdjust(RGBa(250,250,255,128),RGB(200,200,220)); - Sound("BirdsLoop", true, 100, nil, 1); + Sound("Environment::BirdsLoop", true, 100, nil, 1); // Brick edges at horizontal moving bricks. var x=[525, 436, 436, 525, 812, 812, 716, 716, 573, 573, 213, 213]; diff --git a/planet/Arena.ocf/Overcast.ocs/Scrolls.ocd/FireballScroll.ocd/Script.c b/planet/Arena.ocf/Overcast.ocs/Scrolls.ocd/FireballScroll.ocd/Script.c index f94e758d2..610b5e4c6 100644 --- a/planet/Arena.ocf/Overcast.ocs/Scrolls.ocd/FireballScroll.ocd/Script.c +++ b/planet/Arena.ocf/Overcast.ocs/Scrolls.ocd/FireballScroll.ocd/Script.c @@ -9,8 +9,8 @@ public func ControlUse(object pClonk, int ix, int iy) { AddEffect("Fireball", nil, 100, 1, nil, GetID(), pClonk->GetOwner(), Angle(0,0,ix,iy),pClonk->GetX(), pClonk->GetY()); - Sound("Fireball"); - Sound("Fireball"); + Sound("Fire::Fireball"); + Sound("Fire::Fireball"); RemoveObject(); return 1; } diff --git a/planet/Arena.ocf/ThunderousSkies.ocs/Script.c b/planet/Arena.ocf/ThunderousSkies.ocs/Script.c index eab296073..b9787b0de 100644 --- a/planet/Arena.ocf/ThunderousSkies.ocs/Script.c +++ b/planet/Arena.ocf/ThunderousSkies.ocs/Script.c @@ -22,7 +22,7 @@ protected func Initialize() //Enviroment. //SetSkyAdjust(RGBa(250,250,255,128),RGB(200,200,220)); SetSkyParallax(1, 20,20, 0,0, nil, nil); - Sound("BirdsLoop",true,100,nil,+1); + Sound("Environment::BirdsLoop",true,100,nil,+1); CreateObjectAbove(Column,650,379); CreateObjectAbove(Column,350,409); diff --git a/planet/Arena.ocf/ThunderousSkies.ocs/Scrolls.ocd/FireballScroll.ocd/Script.c b/planet/Arena.ocf/ThunderousSkies.ocs/Scrolls.ocd/FireballScroll.ocd/Script.c index d4bf2de47..0217fda60 100644 --- a/planet/Arena.ocf/ThunderousSkies.ocs/Scrolls.ocd/FireballScroll.ocd/Script.c +++ b/planet/Arena.ocf/ThunderousSkies.ocs/Scrolls.ocd/FireballScroll.ocd/Script.c @@ -9,8 +9,8 @@ public func ControlUse(object pClonk, int ix, int iy) { AddEffect("Fireball", nil, 100, 1, nil, GetID(), pClonk->GetOwner(), Angle(0,0,ix,iy),pClonk->GetX(), pClonk->GetY()); - Sound("Fireball"); - Sound("Fireball"); + Sound("Fire::Fireball"); + Sound("Fire::Fireball"); RemoveObject(); return 1; } diff --git a/planet/Arena.ocf/ThunderousSkies.ocs/Scrolls.ocd/ThunderScroll.ocd/Script.c b/planet/Arena.ocf/ThunderousSkies.ocs/Scrolls.ocd/ThunderScroll.ocd/Script.c index 96ac0b2bf..57120f750 100644 --- a/planet/Arena.ocf/ThunderousSkies.ocs/Scrolls.ocd/ThunderScroll.ocd/Script.c +++ b/planet/Arena.ocf/ThunderousSkies.ocs/Scrolls.ocd/ThunderScroll.ocd/Script.c @@ -8,7 +8,7 @@ public func ControlUse(object pClonk) { - Sound("Blast3"); + Sound("Fire::Blast3"); Exit(0,-GetY()); AddEffect("ThunderStrike",nil,100,1,nil,this->GetID(),pClonk->GetOwner(),this->GetX()-5); RemoveObject(); diff --git a/planet/Arena.ocf/ThunderousSkies.ocs/System.ocg/FlyingArrowpack.c b/planet/Arena.ocf/ThunderousSkies.ocs/System.ocg/FlyingArrowpack.c index c19e65811..9a7dc746e 100644 --- a/planet/Arena.ocf/ThunderousSkies.ocs/System.ocg/FlyingArrowpack.c +++ b/planet/Arena.ocf/ThunderousSkies.ocs/System.ocg/FlyingArrowpack.c @@ -5,7 +5,7 @@ func Fall(int from) { - Sound("BowShoot?"); + Sound("Objects::Weapons::Bow::Shoot?"); for(var i=0; i < 10; i++ ) { var arrow = TakeObject(); diff --git a/planet/Decoration.ocd/Relics.ocd/Bone.ocd/Script.c b/planet/Decoration.ocd/Relics.ocd/Bone.ocd/Script.c index b7ffc3180..353d40a04 100644 --- a/planet/Decoration.ocd/Relics.ocd/Bone.ocd/Script.c +++ b/planet/Decoration.ocd/Relics.ocd/Bone.ocd/Script.c @@ -2,7 +2,7 @@ protected func Hit() { - Sound("GeneralHit*"); + Sound("Hits::GeneralHit*"); return 1; } diff --git a/planet/Decoration.ocd/Relics.ocd/Skull.ocd/Script.c b/planet/Decoration.ocd/Relics.ocd/Skull.ocd/Script.c index a710234d3..fbdce072d 100644 --- a/planet/Decoration.ocd/Relics.ocd/Skull.ocd/Script.c +++ b/planet/Decoration.ocd/Relics.ocd/Skull.ocd/Script.c @@ -2,7 +2,7 @@ protected func Hit() { - Sound("GeneralHit*"); + Sound("Hits::GeneralHit*"); return 1; } diff --git a/planet/Defense.ocf/Defense.ocd/Homebase.ocd/BuyMenu.ocd/Script.c b/planet/Defense.ocf/Defense.ocd/Homebase.ocd/BuyMenu.ocd/Script.c index 0b044fc23..fa6d0cdf7 100644 --- a/planet/Defense.ocf/Defense.ocd/Homebase.ocd/BuyMenu.ocd/Script.c +++ b/planet/Defense.ocf/Defense.ocd/Homebase.ocd/BuyMenu.ocd/Script.c @@ -182,7 +182,7 @@ public func ClickBuyButton(int callback_idx, entry_id, int player) { if (player != homebase[0]->GetOwner()) return false; // wat? if (homebase[0]->OnBuySelection(callback_idx)) return true; - Sound("DullMetalHit3", true, nil, player); + Sound("Hits::Materials::Metal::DullMetalHit3", true, nil, player); } return false; } diff --git a/planet/Defense.ocf/Defense.ocd/Homebase.ocd/Script.c b/planet/Defense.ocf/Defense.ocd/Homebase.ocd/Script.c index 85d24851e..4e068185b 100644 --- a/planet/Defense.ocf/Defense.ocd/Homebase.ocd/Script.c +++ b/planet/Defense.ocf/Defense.ocd/Homebase.ocd/Script.c @@ -198,14 +198,14 @@ public func OnBuySelection(int callback_idx) { if (GetWealth(plr) < entry.cost) return false; DoWealth(plr, -entry.cost); - Sound("Cash", true, nil, plr); + Sound("UI::Cash", true, nil, plr); // Some items cost only once if (entry.free_rebuy) entry.cost = nil; } else { // Still some feedback even on free selections - Sound("Waterdrop1", true, nil, plr); + Sound("Liquids::Waterdrop1", true, nil, plr); } // Technology? if (entry.callback) @@ -269,7 +269,7 @@ public func SellItem(item) if (item.GidlValue) { DoWealth(GetOwner(), item.GidlValue); - Sound("Cash", true, nil, GetOwner()); + Sound("UI::Cash", true, nil, GetOwner()); } is_selling = true; // no item re-buy during sale var success = item->RemoveObject(); diff --git a/planet/Defense.ocf/FightForGidl.ocs/Script.c b/planet/Defense.ocf/FightForGidl.ocs/Script.c index e82548cd2..5baa65703 100644 --- a/planet/Defense.ocf/FightForGidl.ocs/Script.c +++ b/planet/Defense.ocf/FightForGidl.ocs/Script.c @@ -165,7 +165,7 @@ func LaunchWave(int wave) { var wave_spawn_time = 0; CustomMessage(Format("$MsgWave$: %s", wave, wave_data.Name)); - Sound("Ding"); + Sound("UI::Ding"); for (var enemy in ForceVal2Array(wave_data.Enemies)) if (enemy) { if (enemy.Delay) @@ -240,7 +240,7 @@ func OnWaveCleared(int wave) DoWealthForAll(bounty); } CustomMessage(Format("$MsgWaveCleared$%s| ", wave, bounty_msg)); - Sound("Ding"); + Sound("UI::Ding"); // Fade out corpses if (g_object_fade) for (var obj in FindObjects(Find_Or(Find_And(Find_ID(Clonk), Find_Not(Find_OCF(OCF_Alive))), Find_ID(Catapult)))) diff --git a/planet/Defense.ocf/Windmill.ocs/Boomattack.ocd/Script.c b/planet/Defense.ocf/Windmill.ocs/Boomattack.ocd/Script.c index 02f24f57c..83d277fd7 100644 --- a/planet/Defense.ocf/Windmill.ocs/Boomattack.ocd/Script.c +++ b/planet/Defense.ocf/Windmill.ocs/Boomattack.ocd/Script.c @@ -77,7 +77,7 @@ protected func Hit() { //Message("I have hit something"); if(GetEffect("Flight",this)) DoFireworks(); - else Sound("WoodHit"); + else Sound("Hits::Materials::Wood::WoodHit*"); } protected func HitObject() diff --git a/planet/Defense.ocf/Windmill.ocs/Script.c b/planet/Defense.ocf/Windmill.ocs/Script.c index a43c48fa1..4a1adf6df 100644 --- a/planet/Defense.ocf/Windmill.ocs/Script.c +++ b/planet/Defense.ocf/Windmill.ocs/Script.c @@ -28,7 +28,7 @@ func Initialize() PlaceGrass(100, 800, 1400); SetSkyParallax(0,25,25,0,0,0,0); AddEffect("BoomAttack", nil, 100, 35); - Sound("WindLoop",true,40,nil,+1); + Sound("Environment::WindLoop",true,40,nil,+1); } global func FxBoomAttackTimer(object target, effect, int time) diff --git a/planet/Experimental.ocd/Ambience.ocd/Script.c b/planet/Experimental.ocd/Ambience.ocd/Script.c index 21d86e5a3..feaec5fe0 100644 --- a/planet/Experimental.ocd/Ambience.ocd/Script.c +++ b/planet/Experimental.ocd/Ambience.ocd/Script.c @@ -84,7 +84,7 @@ func InitializeEnvironments() var overground = this.env_overground = new Environment {}; overground->SetMusic("overground"); overground.CheckPlayer = this.EnvCheck_Overground; - overground->AddSound("Ding", 100); + overground->AddSound("UI::Ding", 100); AddEnvironment(overground, 0); return true; } diff --git a/planet/Experimental.ocd/LiftTower.ocd/Hook.ocd/Script.c b/planet/Experimental.ocd/LiftTower.ocd/Hook.ocd/Script.c index 6a8c767b1..ae05b424b 100644 --- a/planet/Experimental.ocd/LiftTower.ocd/Hook.ocd/Script.c +++ b/planet/Experimental.ocd/LiftTower.ocd/Hook.ocd/Script.c @@ -100,7 +100,7 @@ public func Interact(object clonk) protected func Hit() { - Sound("MetalHit?"); + Sound("Hits::Materials::Metal::LightMetalHit?"); } func Construction(object constructor) diff --git a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/CableLine.ocd/Script.c b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/CableLine.ocd/Script.c index 9648ebc5e..1285d2fec 100644 --- a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/CableLine.ocd/Script.c +++ b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/CableLine.ocd/Script.c @@ -152,7 +152,7 @@ public func SetConnectedObjects(obj1, obj2) protected func LineBreak(bool no_msg) { - Sound("LineBreak"); + Sound("Objects::Connect"); if (!no_msg) BreakMessage(); return; diff --git a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/CableReel.ocd/Script.c b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/CableReel.ocd/Script.c index fcbf4eacb..c1ee43d36 100644 --- a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/CableReel.ocd/Script.c +++ b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Structures.ocd/Crossing.ocd/CableReel.ocd/Script.c @@ -2,7 +2,7 @@ protected func Hit() { - Sound("RockHit?"); + Sound("Hits::Materials::Rock::RockHit?"); } public func IsToolProduct() { return true; } @@ -26,7 +26,7 @@ protected func ControlUse(object clonk, int x, int y) { // Power line is already connected to obj -> remove line. line->RemoveObject(); - Sound("Connect"); + Sound("Objects::Connect"); clonk->Message("$TxtLineRemoval$"); return true; } @@ -39,7 +39,7 @@ protected func ControlUse(object clonk, int x, int y) line->SetActionTargets(line->GetActionTarget(0), obj); else return; - Sound("Connect"); + Sound("Objects::Connect"); line->SetAction("Wait"); line->UpdateDraw(); obj->AddCableConnection(line); @@ -52,7 +52,7 @@ protected func ControlUse(object clonk, int x, int y) { line = CreateObjectAbove(CableLine, 0, 0, NO_OWNER); line->SetActionTargets(this, obj); - Sound("Connect"); + Sound("Objects::Connect"); clonk->Message("$TxtConnect$", obj->GetName()); return true; } diff --git a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Vehicles.ocd/Lorry.ocd/Script.c b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Vehicles.ocd/Lorry.ocd/Script.c index 106918af5..001c081e0 100644 --- a/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Vehicles.ocd/Lorry.ocd/Script.c +++ b/planet/Experimental.ocf/CableLorrys.ocs/CableCars.ocd/Vehicles.ocd/Lorry.ocd/Script.c @@ -60,7 +60,7 @@ protected func RejectCollect(id object_id, object obj) { if (ContentsCount() < this->MaxContentsCount()) { - Sound("Clonk"); + Sound("Objects::Clonk"); return false; } if (obj->Contained()) diff --git a/planet/Experimental.ocf/OCTier.ocs/OCTier.ocd/Script.c b/planet/Experimental.ocf/OCTier.ocs/OCTier.ocd/Script.c index 6db095b1d..02c84ef8f 100644 --- a/planet/Experimental.ocf/OCTier.ocs/OCTier.ocd/Script.c +++ b/planet/Experimental.ocf/OCTier.ocs/OCTier.ocd/Script.c @@ -21,7 +21,7 @@ func StopWalk() func Footstep() { if (GetMaterialVal("DigFree", "Material", GetMaterial(0,10)) == 0) - Sound("StepHard?"); + Sound("Clonk::Movement::StepHard?"); else { var dir = Sign(GetXDir()); @@ -34,7 +34,7 @@ func Footstep() B = clr & 0xff, }; CreateParticle("Dust", PV_Random(dir * -5, dir * -3), 8, PV_Random(dir * 2, dir * 1), PV_Random(-2, -3), PV_Random(36, 2 * 36), particles, 5); - Sound("StepSoft?"); + Sound("Clonk::Movement::StepSoft?"); } } diff --git a/planet/Experimental.ocf/Raiders.ocs/CastleParts.ocd/Floor.ocd/Script.c b/planet/Experimental.ocf/Raiders.ocs/CastleParts.ocd/Floor.ocd/Script.c index 0a6ba55f6..7cde5bd99 100644 --- a/planet/Experimental.ocf/Raiders.ocs/CastleParts.ocd/Floor.ocd/Script.c +++ b/planet/Experimental.ocf/Raiders.ocs/CastleParts.ocd/Floor.ocd/Script.c @@ -25,7 +25,7 @@ private func CheckBurden() private func BreakRight() { - Sound("TreeCrack"); + Sound("Environment::Tree::Crack"); CastObjects(Wood, 2, 15, 20, 1, 180, 90); if (GetPhase() == 1) { @@ -42,7 +42,7 @@ private func BreakRight() private func BreakLeft() { - Sound("TreeCrack"); + Sound("Environment::Tree::Crack"); CastObjects(Wood, 2, 15, -20, 1, 180, 90); if (GetPhase() == 2) { diff --git a/planet/Missions.ocf/DarkCastle.ocs/System.ocg/SeqIntro.c b/planet/Missions.ocf/DarkCastle.ocs/System.ocg/SeqIntro.c index 07eee9a3b..15b9c8659 100644 --- a/planet/Missions.ocf/DarkCastle.ocs/System.ocg/SeqIntro.c +++ b/planet/Missions.ocf/DarkCastle.ocs/System.ocg/SeqIntro.c @@ -160,7 +160,7 @@ func Intro_Stop() func Intro_PlaneHit() { // Plane hit ground! Continue sequence. - Sound("PlaneCrash", true); + Sound("Objects::Plane::PlaneCrash", true); var particles = Particles_Smoke(true); particles.Size = PV_Linear(PV_Random(20, 60), PV_Random(50, 100)); CreateParticle("Smoke", PV_Random(-30,30), PV_Random(-30,30), PV_Random(-60, 60), PV_Random(-20,0), PV_Random(200, 500), particles, 20); diff --git a/planet/Missions.ocf/DeepSeaMining.ocs/CrystalCommunicator.ocd/Script.c b/planet/Missions.ocf/DeepSeaMining.ocs/CrystalCommunicator.ocd/Script.c index db567fe7c..18f1ed32b 100644 --- a/planet/Missions.ocf/DeepSeaMining.ocs/CrystalCommunicator.ocd/Script.c +++ b/planet/Missions.ocf/DeepSeaMining.ocs/CrystalCommunicator.ocd/Script.c @@ -199,7 +199,7 @@ public func StartCommunication() Attach = ATTACH_Front | ATTACH_MoveRelative, }; // Run effects - Sound("CrystalCommCharge"); + Sound("CrystalCommunicator::CrystalCommCharge"); time = 0; AddTimer(this.PreActivity, 5); } @@ -222,13 +222,13 @@ private func PreActivity() else gem_target->CreateParticle("StarFlash", x, y, -x, -y, 10, small_flash_particle, 10); } - if (time == 20) Sound("CrystalCommBoost"); + if (time == 20) Sound("CrystalCommunicator::CrystalCommBoost"); if (time > 50) { RemoveTimer(this.PreActivity); time = 0; CreateParticle("StarFlash", PV_Random(-12, +12), PV_Random(-12, +12), PV_Random(-10, +10),PV_Random(-10, +10), PV_Random(20, 100), large_flash_particle, 10); - Sound("CrystalCommWumm"); + Sound("CrystalCommunicator::CrystalCommWumm"); SetAction("Active"); AddTimer(this.Activity, 1); } @@ -265,12 +265,12 @@ private func Activity() // Next char to send if (send_char == GetChar(".")) { - Sound("CrystalCommToneA"); + Sound("CrystalCommunicator::CrystalCommToneA"); next_send_time = time + 13; } else { - Sound("CrystalCommToneB"); + Sound("CrystalCommunicator::CrystalCommToneB"); next_send_time = time + 27; } } @@ -346,7 +346,7 @@ local ActMap = { Delay = 0, Length = 1, NextAction = "Active", - Sound = "CrystalCommActive", + Sound = "CrystalCommunicator::CrystalCommActive", }, }; diff --git a/planet/Missions.ocf/DeepSeaMining.ocs/System.ocg/SeqIntro.c b/planet/Missions.ocf/DeepSeaMining.ocs/System.ocg/SeqIntro.c index cbd9fb4a6..5e9d63ad5 100644 --- a/planet/Missions.ocf/DeepSeaMining.ocs/System.ocg/SeqIntro.c +++ b/planet/Missions.ocf/DeepSeaMining.ocs/System.ocg/SeqIntro.c @@ -116,8 +116,8 @@ func Intro_10() { g_intro_sky_moving = false; Schedule(this, "SetSkyParallax(0, 20, 20, ++this.intro_skyscroll_xdir, 0)", 10, -this.intro_skyscroll_xdir); - GetHero()->Sound("Hurt1"); - GetHero()->Sound("Hurt2"); + GetHero()->Sound("Clonk::Verbal::Hurt1"); + GetHero()->Sound("Clonk::Verbal::Hurt2"); this.plane.rdir = 0; this.plane->StartInstantFlight(this.plane->GetR(), 15); MessageBoxAll("$Intro10$", GetHero(), true); // aaaah diff --git a/planet/Missions.ocf/DeepSeaMining.ocs/System.ocg/SeqOutro.c b/planet/Missions.ocf/DeepSeaMining.ocs/System.ocg/SeqOutro.c index 89de3f261..097b08d1e 100644 --- a/planet/Missions.ocf/DeepSeaMining.ocs/System.ocg/SeqOutro.c +++ b/planet/Missions.ocf/DeepSeaMining.ocs/System.ocg/SeqOutro.c @@ -95,7 +95,7 @@ func Outro_10() func Outro_11() { - Sound("Fanfare"); + Sound("UI::Fanfare"); return GameOver(); } diff --git a/planet/Missions.ocf/Raid.ocs/Key.ocd/Script.c b/planet/Missions.ocf/Raid.ocs/Key.ocd/Script.c index 368cccdc4..56afe49b3 100644 --- a/planet/Missions.ocf/Raid.ocs/Key.ocd/Script.c +++ b/planet/Missions.ocf/Raid.ocs/Key.ocd/Script.c @@ -22,6 +22,6 @@ func ControlUseStart(object clonk, int ix, int iy) func Hit() { - Sound("GlassHit?"); + Sound("Hits::Materials::Glass::GlassHit?"); return true; } diff --git a/planet/Missions.ocf/Raid.ocs/System.ocg/DlgNewton.c b/planet/Missions.ocf/Raid.ocs/System.ocg/DlgNewton.c index 643f98d90..e247c9f97 100644 --- a/planet/Missions.ocf/Raid.ocs/System.ocg/DlgNewton.c +++ b/planet/Missions.ocf/Raid.ocs/System.ocg/DlgNewton.c @@ -296,7 +296,7 @@ func FxNewtonHammeringTimer(object c, proplist fx, int time) { // Hammer backswing this.anim = c->PlayAnimation("StrikePickaxe", 10, Anim_Linear(b,b,a, Newton_Hammer_SwingTime, ANIM_Remove), Anim_Const(1000)); - c->Sound("Clang?"); + c->Sound("Objects::Pickaxe::Clang?"); var x = (c->GetDir()*2-1) * 9; var y = -16; c->CreateParticle("Dust", x,y, PV_Random(-10, 10), PV_Random(-10, 20), PV_Random(10, 20), new Particles_Dust() { R=120, G=100, B=80 }, 10); diff --git a/planet/Missions.ocf/Raid.ocs/System.ocg/DlgPyrit.c b/planet/Missions.ocf/Raid.ocs/System.ocg/DlgPyrit.c index 4fcbd822f..990ce94a2 100644 --- a/planet/Missions.ocf/Raid.ocs/System.ocg/DlgPyrit.c +++ b/planet/Missions.ocf/Raid.ocs/System.ocg/DlgPyrit.c @@ -237,7 +237,7 @@ func Pyrit_HitFx() var x = (GetDir()*2-1) * 14; var y = 4; CreateParticle("StarSpark", x*9/10,y*9/10, PV_Random(-20, 20), PV_Random(-20, 20), PV_Random(10, 20), Particles_Glimmer(), 10); - Sound("Clang?"); + Sound("Objects::Pickaxe::Clang?"); return true; } diff --git a/planet/Missions.ocf/Raid.ocs/System.ocg/DlgRocky.c b/planet/Missions.ocf/Raid.ocs/System.ocg/DlgRocky.c index c6f4ca6dd..5aad1ad70 100644 --- a/planet/Missions.ocf/Raid.ocs/System.ocg/DlgRocky.c +++ b/planet/Missions.ocf/Raid.ocs/System.ocg/DlgRocky.c @@ -78,7 +78,7 @@ func FxRockyPickaxeingTimer(object c, proplist fx, int time) c->SetDir(DIR_Right); var len = c->GetAnimationLength("StrikePickaxe"); this.anim = c->PlayAnimation("StrikePickaxe", CLONK_ANIM_SLOT_Arms, Anim_Linear(0,0,len, Rocky_Pickaxe_SwingTime, ANIM_Remove), Anim_Const(1000)); - c->Sound("Clang?"); + c->Sound("Objects::Pickaxe::Clang?"); var x = (c->GetDir()*2-1) * 9; var y = 16; c->CreateParticle("StarSpark", x,y, PV_Random(-20, 20), PV_Random(-20, 20), 20, c.pickaxe_particle, Random(10)+3); diff --git a/planet/Missions.ocf/Raid.ocs/System.ocg/Plane.c b/planet/Missions.ocf/Raid.ocs/System.ocg/Plane.c index 5be509412..73a1aed0f 100644 --- a/planet/Missions.ocf/Raid.ocs/System.ocg/Plane.c +++ b/planet/Missions.ocf/Raid.ocs/System.ocg/Plane.c @@ -32,7 +32,7 @@ func FuelCheck(object clonk) if (!FindContents(MetalBarrel)) { Dialogue->MessageBox("$PlaneNoOil$", clonk, clonk); - clonk->Sound("WipfWhine"); + clonk->Sound("Animals::Wipf::Whine"); return false; } return true; diff --git a/planet/Missions.ocf/Raid.ocs/System.ocg/SeqAttack.c b/planet/Missions.ocf/Raid.ocs/System.ocg/SeqAttack.c index 705322cc5..91745f6d0 100644 --- a/planet/Missions.ocf/Raid.ocs/System.ocg/SeqAttack.c +++ b/planet/Missions.ocf/Raid.ocs/System.ocg/SeqAttack.c @@ -144,7 +144,7 @@ func Attack_DropBomb(int plane_idx, int delay) bomb->SetXDir(plane->GetXDir() + (i-2) * 10); bomb->Fuse(true); // fuse and explode on hit } - plane->Sound("BombDrop"); + plane->Sound("Goal_Raid::BombDrop"); return true; } diff --git a/planet/Missions.ocf/Raid.ocs/System.ocg/SpinWheel.c b/planet/Missions.ocf/Raid.ocs/System.ocg/SpinWheel.c index b34380902..42a00fa84 100644 --- a/planet/Missions.ocf/Raid.ocs/System.ocg/SpinWheel.c +++ b/planet/Missions.ocf/Raid.ocs/System.ocg/SpinWheel.c @@ -23,7 +23,7 @@ func CheckLock(object clonk) if (!key) { Dialogue->MessageBox("$DoorNoKey$", clonk, clonk); - clonk->Sound("WipfWhine"); + clonk->Sound("Animals::Wipf::Whine"); return false; } // too far away? (may happen when callback is from key) @@ -36,6 +36,6 @@ func CheckLock(object clonk) Dialogue->MessageBox("$DoorUnlocked$", clonk, clonk, nil, true); this.unlocked = true; key->RemoveObject(); - Sound("Click"); + Sound("UI::Click"); return true; } \ No newline at end of file diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Chassis.ocd/Script.c b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Chassis.ocd/Script.c index 4789bd8a5..f28782c2b 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Chassis.ocd/Script.c +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Chassis.ocd/Script.c @@ -10,7 +10,7 @@ private func Hit() { - Sound("WoodHit"); + Sound("Hits::Materials::Wood::WoodHit*"); } public func Definition(proplist def) diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Engine.ocd/Script.c b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Engine.ocd/Script.c index 1a2b7afa1..412a0eeef 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Engine.ocd/Script.c +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Engine.ocd/Script.c @@ -9,7 +9,7 @@ private func Hit() { - Sound("WoodHit"); + Sound("Hits::Materials::Wood::WoodHit*"); } func IsToolProduct() { return true; } diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Propeller.ocd/Script.c b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Propeller.ocd/Script.c index c8cea042b..408055c74 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Propeller.ocd/Script.c +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Propeller.ocd/Script.c @@ -9,7 +9,7 @@ private func Hit() { - Sound("WoodHit"); + Sound("Hits::Materials::Wood::WoodHit*"); } public func Definition(proplist def) diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Script.c b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Script.c index 0355beb3c..5112b8c27 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Script.c +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Script.c @@ -53,7 +53,7 @@ func AddPart(object part) { part->RemoveRestoreMode(); part->RemoveObject(); - Sound("Ding", true); + Sound("UI::Ding", true); SetProgress(progress+1); return true; } diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Skids.ocd/Script.c b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Skids.ocd/Script.c index 05c76d4ad..1a27724ac 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Skids.ocd/Script.c +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Skids.ocd/Script.c @@ -10,7 +10,7 @@ private func Hit() { - Sound("WoodHit"); + Sound("Hits::Materials::Wood::WoodHit*"); } public func Definition(proplist def) diff --git a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Wings.ocd/Script.c b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Wings.ocd/Script.c index 32a416a78..3f9592438 100644 --- a/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Wings.ocd/Script.c +++ b/planet/Missions.ocf/Skylands.ocs/Plane.ocd/Wings.ocd/Script.c @@ -10,7 +10,7 @@ private func Hit() { - Sound("WoodHit"); + Sound("Hits::Materials::Wood::WoodHit*"); } public func Definition(proplist def) diff --git a/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/Script.c b/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/Script.c index 27a6993c3..70e8468db 100644 --- a/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/Script.c +++ b/planet/Missions.ocf/Skylands.ocs/Scaffold.ocd/Script.c @@ -215,7 +215,7 @@ public func Reinforce(int direction) } UpdateInteractionMenus(this.GetExtensionMenuEntries); - Sound("DullWoodHit1"); + Sound("Hits::Materials::Wood::DullWoodHit1"); } /* Destruction */ diff --git a/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/DlgPyrit.c b/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/DlgPyrit.c index 3f28d57f1..c1ef6ec91 100644 --- a/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/DlgPyrit.c +++ b/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/DlgPyrit.c @@ -122,7 +122,7 @@ func Pyrit_HitFx() var x = (GetDir()*2-1) * 14; var y = 4; CreateParticle("StarSpark", x*9/10,y*9/10, PV_Random(-20, 20), PV_Random(-20, 20), PV_Random(10, 20), Particles_Glimmer(), 10); - Sound("Clang?"); + Sound("Objects::Pickaxe::Clang?"); return true; } diff --git a/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/GoldBarSpecial.c b/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/GoldBarSpecial.c index 4e26ba1b7..8d2a7d971 100644 --- a/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/GoldBarSpecial.c +++ b/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/GoldBarSpecial.c @@ -30,7 +30,7 @@ func DoSellEffect(container) fm->FadeOut(2, 10); fm->SetSpeed(0, -5); fm->SetMessage("+1{{GoldBar}}"); - container->Sound("Cash"); + container->Sound("UI::Cash"); var dust_particles = { diff --git a/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/Plane.c b/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/Plane.c index f5d05775d..99862e871 100644 --- a/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/Plane.c +++ b/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/Plane.c @@ -18,7 +18,7 @@ func FuelCheck(object clonk) if (!FindContents(MetalBarrel)) { Dialogue->MessageBox("$PlaneNoOil$", clonk, clonk); - clonk->Sound("WipfWhine"); + clonk->Sound("Animals::Wipf::Whine"); return false; } return true; diff --git a/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/SeqIntro.c b/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/SeqIntro.c index c3462c9b9..f1d8da91a 100644 --- a/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/SeqIntro.c +++ b/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/SeqIntro.c @@ -78,7 +78,7 @@ func Intro_2() { // Plane drop sound when it enters view range if (this.plane->GetY() > 900) - Sound("PlaneDrop", true); + Sound("Goal_TreasureHunt::PlaneDrop", true); else ScheduleSame(2); return true; @@ -87,7 +87,7 @@ func Intro_2() func Intro_PlaneHit() { // Plane hit ground! Continue sequence. - Sound("PlaneCrash", true); + Sound("Objects::Plane::PlaneCrash", true); SetR(-90); var particles = Particles_Smoke(true); particles.Size = PV_Linear(PV_Random(20, 60), PV_Random(50, 100)); diff --git a/planet/Objects.ocd/Animals.ocd/Chippie.ocd/Egg.ocd/Script.c b/planet/Objects.ocd/Animals.ocd/Chippie.ocd/Egg.ocd/Script.c index 62642b1f6..650df9ad3 100644 --- a/planet/Objects.ocd/Animals.ocd/Chippie.ocd/Egg.ocd/Script.c +++ b/planet/Objects.ocd/Animals.ocd/Chippie.ocd/Egg.ocd/Script.c @@ -90,7 +90,7 @@ public func Hit(int x, int y) } SetRDir(0); - Sound("SoftHit*"); + Sound("Hits::SoftHit*"); var particles = { @@ -150,7 +150,7 @@ private func Hatch() var c = CreateObject(Chippie, 0, 0, GetOwner()); c->SetCon(50); - c->Sound("ChippieChirp*", false, 25); + c->Sound("Animals::Chippie::Chirp*", false, 25); var particles = { diff --git a/planet/Objects.ocd/Animals.ocd/Chippie.ocd/Script.c b/planet/Objects.ocd/Animals.ocd/Chippie.ocd/Script.c index 42d86bccb..e331cf949 100644 --- a/planet/Objects.ocd/Animals.ocd/Chippie.ocd/Script.c +++ b/planet/Objects.ocd/Animals.ocd/Chippie.ocd/Script.c @@ -42,7 +42,7 @@ public func Death() PV_Random(-20, 20), PV_Random(-20, 20), PV_Random(20, 60), particles, 60); } - Sound("ChippieChirp*", false, 50); + Sound("Animals::Chippie::Chirp*", false, 50); RemoveObject(); } @@ -117,7 +117,7 @@ private func FxJumpCheckTimer(target, effect, time) private func ClawTo(object obj) { // Play the sound on the object, because the chippie turns invisible. - obj->Sound("ChippieBite*", false, 50); + obj->Sound("Animals::Chippie::Bite*", false, 50); energy_sucked += 5 * 1000; obj->DoEnergy(-5, false, FX_Call_EngGetPunched, GetOwner()); @@ -221,7 +221,7 @@ private func FxActivityTimer(target, effect, time) else if(!Random(20) && !GetEffect("DanceCooldown", this)) { - Sound("ChippieTalk*"); + Sound("Animals::Chippie::Talk*"); var cnt = 0; for(var obj in FindObjects(Find_Distance(100), Find_ID(GetID()), Find_Allied(GetOwner()), Sort_Distance())) diff --git a/planet/Objects.ocd/Animals.ocd/Fish.ocd/Script.c b/planet/Objects.ocd/Animals.ocd/Fish.ocd/Script.c index 9d08fd630..a9752e90d 100644 --- a/planet/Objects.ocd/Animals.ocd/Fish.ocd/Script.c +++ b/planet/Objects.ocd/Animals.ocd/Fish.ocd/Script.c @@ -387,7 +387,7 @@ func FxIsBeingEatenAdd(target, effect) func DoJump() { SetAction("Jump"); - Sound("SoftTouch*"); + Sound("Hits::SoftTouch*"); var x_dir = RandomX(ActMap.Jump.Speed/2, ActMap.Jump.Speed); if (GetComDir() == COMD_Left) x_dir *= -1; diff --git a/planet/Objects.ocd/Animals.ocd/Mosquito.ocd/Script.c b/planet/Objects.ocd/Animals.ocd/Mosquito.ocd/Script.c index 7c815df8d..c6334266c 100644 --- a/planet/Objects.ocd/Animals.ocd/Mosquito.ocd/Script.c +++ b/planet/Objects.ocd/Animals.ocd/Mosquito.ocd/Script.c @@ -71,7 +71,7 @@ private func GetAttraction(proplist coordinates) { // GetAttraction will only be called for the swarm master, perfect to have just one being make sound if(!Random(30)) - Sound("MosquitoBuzz", nil,nil,nil,nil, 200); + Sound("Animals::MosquitoBuzz", nil,nil,nil,nil, 200); if (!lovely_place) lovely_place = CreateArray(3); if (!lovely_place[1]) diff --git a/planet/Objects.ocd/Animals.ocd/Piranha.ocd/Script.c b/planet/Objects.ocd/Animals.ocd/Piranha.ocd/Script.c index e2024f1e3..9781d2696 100644 --- a/planet/Objects.ocd/Animals.ocd/Piranha.ocd/Script.c +++ b/planet/Objects.ocd/Animals.ocd/Piranha.ocd/Script.c @@ -101,7 +101,7 @@ func DoEat(object obj) private func BiteEffect() { - Sound("FishMunch*"); + Sound("Animals::Fish::Munch*"); } // Make this piranha a little larger than the mesh. diff --git a/planet/Objects.ocd/Animals.ocd/PiranhaSmall.ocd/Script.c b/planet/Objects.ocd/Animals.ocd/PiranhaSmall.ocd/Script.c index df03311de..48f8ac731 100644 --- a/planet/Objects.ocd/Animals.ocd/PiranhaSmall.ocd/Script.c +++ b/planet/Objects.ocd/Animals.ocd/PiranhaSmall.ocd/Script.c @@ -79,7 +79,7 @@ private func UpdateVision() private func BiteEffect() { - Sound("FishMunch*", nil, nil, nil, nil, nil, 100); + Sound("Animals::Fish::Munch*", nil, nil, nil, nil, nil, 100); } local Name = "$Name$"; diff --git a/planet/Objects.ocd/Animals.ocd/Puka.ocd/Script.c b/planet/Objects.ocd/Animals.ocd/Puka.ocd/Script.c index 53661b9f2..37a019e75 100644 --- a/planet/Objects.ocd/Animals.ocd/Puka.ocd/Script.c +++ b/planet/Objects.ocd/Animals.ocd/Puka.ocd/Script.c @@ -90,7 +90,7 @@ private func RandomizeColor() public func CatchBlow(int damage, object from) { - Schedule(this, "Sound(\"PukaHurt*\")", RandomX(5, 20)); + Schedule(this, "Sound(\"Animals::Puka::Hurt*\")", RandomX(5, 20)); } private func CheckStuck() @@ -161,7 +161,7 @@ private func StopHangle() public func Death() { AddEffect("IntDeathSparks", this, 1, 1, this); - SoundAt("PukaDie"); + SoundAt("Animals::Puka::Die"); } private func FxIntDeathSparksStart(object target, effect fx, temp) @@ -270,7 +270,7 @@ private func ActivityWalking() { if (Random(3)) { - Schedule(this, "Sound(\"PukaGulp\")", 40); + Schedule(this, "Sound(\"Animals::Puka::Gulp\")", 40); return SetAction("LookAround"); } return SetAction("ScratchFace"); @@ -422,7 +422,7 @@ private func FxIntTeleportStart(object target, effect fx, temp) PV_Random(xdir - 5, xdir + 5), PV_Random(ydir - 5, ydir + 5), PV_Random(1, 5), fx.particles, 200); - SoundAt("PukaTeleportOut"); + SoundAt("Animals::Puka::TeleportOut"); } private func FxIntTeleportTimer(object target, effect fx, int time) @@ -492,7 +492,7 @@ private func FxIntTeleportStop(object target, effect fx, int reason, temp) PV_Random(xdir - 5, xdir + 5), PV_Random(ydir - 5, ydir + 5), PV_Random(1, 5), fx.particles, 200); - SoundAt("PukaTeleportIn"); + SoundAt("Animals::Puka::TeleportIn"); } public func TryStartTeleport() @@ -634,7 +634,7 @@ private func ShockWater() AddEffect("Sparkle", this, 1, 1, this); - Sound("PukaHiss*"); + Sound("Animals::Puka::Hiss*"); return true; } diff --git a/planet/Objects.ocd/Animals.ocd/Squid.ocd/Script.c b/planet/Objects.ocd/Animals.ocd/Squid.ocd/Script.c index d15a10774..6c7271005 100644 --- a/planet/Objects.ocd/Animals.ocd/Squid.ocd/Script.c +++ b/planet/Objects.ocd/Animals.ocd/Squid.ocd/Script.c @@ -348,7 +348,7 @@ private func UpdateSwim() private func DoJump() { SetAction("Jump"); - Sound("SoftTouch*"); + Sound("Hits::SoftTouch*"); var x_dir = RandomX(ActMap.Jump.Speed/2, ActMap.Jump.Speed); if (GetComDir() == COMD_Left) x_dir *= -1; diff --git a/planet/Objects.ocd/Animals.ocd/Wipf.ocd/Script.c b/planet/Objects.ocd/Animals.ocd/Wipf.ocd/Script.c index 1db41bcaf..5fb1c13d4 100644 --- a/planet/Objects.ocd/Animals.ocd/Wipf.ocd/Script.c +++ b/planet/Objects.ocd/Animals.ocd/Wipf.ocd/Script.c @@ -517,7 +517,7 @@ public func Eat(object food) { DoEnergy(food->~NutritionalValue()); food->RemoveObject(); - Sound("Munch?"); + Sound("Clonk::Action::Munch?"); SetAction("Eat"); } return; @@ -539,7 +539,7 @@ public func IsDead() protected func Death(int killed_by) { - Sound("WipfAroof"); + Sound("Animals::Wipf::Aroof"); return; } @@ -571,7 +571,7 @@ protected func CatchBlow() { if (IsDead()) return; - Sound("Weep?"); + Sound("Animals::Wipf::Weep?"); return; } diff --git a/planet/Objects.ocd/Animals.ocd/Zaphive.ocd/Script.c b/planet/Objects.ocd/Animals.ocd/Zaphive.ocd/Script.c index a3c5a9361..514be2144 100644 --- a/planet/Objects.ocd/Animals.ocd/Zaphive.ocd/Script.c +++ b/planet/Objects.ocd/Animals.ocd/Zaphive.ocd/Script.c @@ -70,7 +70,7 @@ private func Hit2() // Could be instantly dead if (zap) zap->SetEnraged(); - Sound("OrganicHit?"); + Sound("Hits::OrganicHit?"); CreateParticle("WoodChip", 0,0, PV_Random(-2,2), -4, PV_Random(36 * 3, 36 * 10), Particles_Straw(), 5); RemoveObject(); } diff --git a/planet/Objects.ocd/Animals.ocd/Zaphive.ocd/Zap.ocd/Script.c b/planet/Objects.ocd/Animals.ocd/Zaphive.ocd/Zap.ocd/Script.c index 938c72975..ddf36c66c 100644 --- a/planet/Objects.ocd/Animals.ocd/Zaphive.ocd/Zap.ocd/Script.c +++ b/planet/Objects.ocd/Animals.ocd/Zaphive.ocd/Zap.ocd/Script.c @@ -99,7 +99,7 @@ private func GetAttraction(proplist coordinates) } // GetAttraction will only be called for the swarm master, perfect to have just one being make sound if(!Random(20)) - Sound("Zap?", nil,nil,nil,nil, 200, Random(100)); + Sound("Animals::Zap::Zap?", nil,nil,nil,nil, 200, Random(100)); coordinates.x = home->GetX() + Random(20)-10; coordinates.y = home->GetY() + Random(20)-10; @@ -170,7 +170,7 @@ private func CheckTurn() private func AngryBuzz() { - Sound("Zap?", nil,nil,nil,nil, nil, -Random(100)); + Sound("Animals::Zap::Zap?", nil,nil,nil,nil, nil, -Random(100)); } /*-- Saving --*/ diff --git a/planet/Objects.ocd/Clonk.ocd/Animations.ocd/Script.c b/planet/Objects.ocd/Clonk.ocd/Animations.ocd/Script.c index 19bc2725b..67e39ae7d 100644 --- a/planet/Objects.ocd/Clonk.ocd/Animations.ocd/Script.c +++ b/planet/Objects.ocd/Clonk.ocd/Animations.ocd/Script.c @@ -395,7 +395,7 @@ func GetCurrentWalkAnimation() func Footstep() { if (GetMaterialVal("DigFree", "Material", GetMaterial(0,10)) == 0) - Sound("StepHard?"); + Sound("Clonk::Movement::StepHard?"); else { var dir = Sign(GetXDir()); @@ -408,7 +408,7 @@ func Footstep() B = clr & 0xff, }; CreateParticle("Dust", PV_Random(dir * -2, dir * -1), 8, PV_Random(dir * 2, dir * 1), PV_Random(-2, -3), PV_Random(36, 2 * 36), particles, 5); - Sound("StepSoft?"); + Sound("Clonk::Movement::StepSoft?"); } } @@ -769,7 +769,7 @@ func FxFallTimer(object target, effect, int timer) } if(timer == 2 && GetYDir() < 1) { - Sound("Rustle?"); + Sound("Clonk::Movement::Rustle?"); } if(GetYDir() > 55 && GetAction() == "Jump") @@ -1035,7 +1035,7 @@ func FxIntSwimTimer(pTarget, effect, iTime) }; CreateParticle("Wave", 0, -4, (RandomX(-5,5)-(-1+2*GetDir())*4)/4, 0, 16, particles); } - Sound("Splash?"); + Sound("Liquids::Splash?"); } // Animation speed by X if(effect.animation_name != "Swim") @@ -1109,7 +1109,7 @@ func DoKneel(bool create_dust) SetXDir(0); SetAction("Kneel"); - Sound("RustleLand"); + Sound("Clonk::Movement::RustleLand"); PlayAnimation("KneelDown", CLONK_ANIM_SLOT_Movement, Anim_Linear(0, 0, GetAnimationLength("KneelDown"), iKneelDownSpeed, ANIM_Remove), Anim_Linear(0, 0, 1000, 5, ANIM_Remove)); ScheduleCall(this, "EndKneel", iKneelDownSpeed, 1); @@ -1150,7 +1150,7 @@ func DoRoll() func OnStartRoll() { SetTurnForced(GetDir()); - Sound("Roll"); + Sound("Clonk::Movement::Roll"); if(GetDir() == 1) lAnim.rollDir = 1; else lAnim.rollDir = -1; @@ -1237,7 +1237,7 @@ func FxIntDigStart(pTarget, effect, fTmp) UpdateAttach(); // Sound - Sound("Dig?"); + Sound("Clonk::Action::Dig::Dig?"); // Set proper turn type SetTurnType(0); @@ -1247,7 +1247,7 @@ func FxIntDigTimer(pTarget, effect, iTime) { if(iTime % 36 == 0) { - Sound("Dig?"); + Sound("Clonk::Action::Dig::Dig?"); } if( (iTime-18) % 36 == 0 || iTime > 35) { diff --git a/planet/Objects.ocd/Clonk.ocd/Script.c b/planet/Objects.ocd/Clonk.ocd/Script.c index 782817215..287d696ab 100644 --- a/planet/Objects.ocd/Clonk.ocd/Script.c +++ b/planet/Objects.ocd/Clonk.ocd/Script.c @@ -113,9 +113,9 @@ protected func CatchBlow() protected func Hurt() { if(gender == 0) - Sound("Hurt?"); + Sound("Clonk::Verbal::Hurt?"); else - Sound("FHurt?"); + Sound("Clonk::Verbal::FHurt?"); } protected func Grab(object pTarget, bool fGrab) @@ -149,9 +149,9 @@ protected func Death(int killed_by) if (!this.silent_death) { if(gender == 0) - Sound("Die"); + Sound("Clonk::Verbal::Die"); else - Sound("FDie"); + Sound("Clonk::Verbal::FDie"); DeathAnnounce(); } @@ -190,7 +190,7 @@ public func Eat(object food) { Heal(food->NutritionalValue()); food->RemoveObject(); - Sound("Munch?"); + Sound("Clonk::Action::Munch?"); SetAction("Eat"); } } diff --git a/planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingAcid.ocd/Bubble.ocd/Script.c b/planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingAcid.ocd/Bubble.ocd/Script.c index 0ab65d7f6..d2f380d14 100644 --- a/planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingAcid.ocd/Bubble.ocd/Script.c +++ b/planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingAcid.ocd/Bubble.ocd/Script.c @@ -25,7 +25,7 @@ private func FxMoveTimer(object target, effect fx, int time) { if (!GBackLiquid(0, -3) && !fx.is_explosive) SetGraphics("3"); - Sound("Bubble*"); + Sound("Liquids::Bubble*"); FadeOut(50, true); } diff --git a/planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingLava.ocd/Bubble.ocd/Script.c b/planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingLava.ocd/Bubble.ocd/Script.c index ed6d2d157..d5d9635e5 100644 --- a/planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingLava.ocd/Bubble.ocd/Script.c +++ b/planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingLava.ocd/Bubble.ocd/Script.c @@ -17,7 +17,7 @@ public func Construction() } AddEffect("Move", this, 1, 2, this); - Sound("Bubble*"); + Sound("Liquids::Bubble*"); return; } diff --git a/planet/Objects.ocd/Environment.ocd/Disasters.ocd/Earthquake.ocd/Script.c b/planet/Objects.ocd/Environment.ocd/Disasters.ocd/Earthquake.ocd/Script.c index b52860eb4..16cc69014 100644 --- a/planet/Objects.ocd/Environment.ocd/Disasters.ocd/Earthquake.ocd/Script.c +++ b/planet/Objects.ocd/Environment.ocd/Disasters.ocd/Earthquake.ocd/Script.c @@ -66,15 +66,15 @@ protected func FxIntEarthquakeStart(object target, effect) { // Start sound at quake local coordinates. // < Maikel> Global until someone implements non-object local sounds - Sound("Earthquake", true, 100, nil, 1); + Sound("Environment::Disasters::Earthquake", true, 100, nil, 1); return FX_OK; } protected func FxIntEarthquakeStop(object target, effect) { // Stop sound. - Sound("Earthquake", true, 100, nil, -1); - Sound("EarthquakeEnd",true); + Sound("Environment::Disasters::Earthquake", true, 100, nil, -1); + Sound("Environment::Disasters::EarthquakeEnd",true); return FX_OK; } diff --git a/planet/Objects.ocd/Environment.ocd/Disasters.ocd/Rockfall.ocd/Script.c b/planet/Objects.ocd/Environment.ocd/Disasters.ocd/Rockfall.ocd/Script.c index a7977da71..d63660f2d 100644 --- a/planet/Objects.ocd/Environment.ocd/Disasters.ocd/Rockfall.ocd/Script.c +++ b/planet/Objects.ocd/Environment.ocd/Disasters.ocd/Rockfall.ocd/Script.c @@ -191,7 +191,7 @@ protected func Hit(int dx, int dy) // Acid kills rockfall if (GetMaterialVal("Corrosive", "Material", GetMaterial())) { - Sound("Pshshsh"); + Sound("Liquids::Pshshsh"); var sz = Max(GetCon()/10, 5); var particles = new Particles_Dust() { Size = sz*3, }; if (is_explosive) @@ -244,7 +244,7 @@ protected func Hit(int dx, int dy) } // Sound. - Sound("EarthquakeEnd", nil, 3 * GetCon() / 2); + Sound("Environment::Disasters::EarthquakeEnd", nil, 3 * GetCon() / 2); StonyObjectHit(dx, dy); return; } @@ -289,7 +289,7 @@ private func SplitRock() CreateParticle("SmokeDirty", PV_Random(-5, 5), PV_Random(-5, 5), 0, PV_Random(-2, 0), PV_Random(50, 100), rock_explode, 8); // Some sound effects. - Sound("EarthquakeEnd", nil, 100); + Sound("Environment::Disasters::EarthquakeEnd", nil, 100); RemoveObject(); return; diff --git a/planet/Objects.ocd/Environment.ocd/Stalactite.ocd/Script.c b/planet/Objects.ocd/Environment.ocd/Stalactite.ocd/Script.c index 1a5ab0671..1e201a353 100644 --- a/planet/Objects.ocd/Environment.ocd/Stalactite.ocd/Script.c +++ b/planet/Objects.ocd/Environment.ocd/Stalactite.ocd/Script.c @@ -43,7 +43,7 @@ private func Hit() if (GetR() != 0) height *= -1; CreateParticle("SmokeDirty", PV_Random(-width, width), PV_Random(0, height), PV_Random(-5, 5), PV_Random(-5, 15), PV_Random(10, 60), particles, 200); - Sound("Rockfall*"); + Sound("Hits::Materials::Rock::Rockfall*"); for (var i = 0; i < 4; i++) { @@ -180,7 +180,7 @@ private func DrawWaterSource() private func DoWaterdrop() { if (Random(9)) return; - Sound("Waterdrop*"); + Sound("Liquids::Waterdrop*"); } local Name = "$Name$"; diff --git a/planet/Objects.ocd/Environment.ocd/Waterfall.ocd/Script.c b/planet/Objects.ocd/Environment.ocd/Waterfall.ocd/Script.c index 55701ba73..3c22301a8 100644 --- a/planet/Objects.ocd/Environment.ocd/Waterfall.ocd/Script.c +++ b/planet/Objects.ocd/Environment.ocd/Waterfall.ocd/Script.c @@ -31,7 +31,7 @@ protected func FxIntWaterfallStart(object target, proplist effect, int temporary effect.Strength = strength; effect.Material = mat; // Start sound. - target->Sound("Waterfall", false, 5 * effect.Strength, nil, 1); + target->Sound("Environment::Waterfall", false, 5 * effect.Strength, nil, 1); return 1; } @@ -48,7 +48,7 @@ protected func FxIntWaterfallStop(object target, proplist effect, bool temporary if (temporary) return 1; // Stop sound. - target->Sound("Waterfall", false, 5 * effect.Strength, nil, -1); + target->Sound("Environment::Waterfall", false, 5 * effect.Strength, nil, -1); return 1; } @@ -87,7 +87,7 @@ public func SetSoundLocation(int x, int y) // Update sound. var effect = GetEffect("IntWaterfall", this); if (effect) - Sound("Waterfall", false, 5 * effect.Strength, nil, 1); + Sound("Environment::Waterfall", false, 5 * effect.Strength, nil, 1); return; } diff --git a/planet/Objects.ocd/Goals.ocd/Parkour.ocd/CheckPoint.ocd/Script.c b/planet/Objects.ocd/Goals.ocd/Parkour.ocd/CheckPoint.ocd/Script.c index c2738b390..f1e318f20 100644 --- a/planet/Objects.ocd/Goals.ocd/Parkour.ocd/CheckPoint.ocd/Script.c +++ b/planet/Objects.ocd/Goals.ocd/Parkour.ocd/CheckPoint.ocd/Script.c @@ -224,7 +224,7 @@ protected func CheckForClonks() { var team_clear = !ClearedByTeam(team); cleared_by_plr[plrid] = true; - Sound("Cleared", false, 100, plr); + Sound("UI::Cleared", false, 100, plr); cp_con->AddPlayerClearedCP(plr, this); // Notify parkour goal. if (ClearedByTeam(team) && team_clear) cp_con->AddTeamClearedCP(team, this); // Notify parkour goal. @@ -232,7 +232,7 @@ protected func CheckForClonks() // Check finish status. if (cp_mode & PARKOUR_CP_Finish) { - Sound("Cleared", false, 100, plr); + Sound("UI::Cleared", false, 100, plr); cleared_by_plr[plrid] = true; if (team) { diff --git a/planet/Objects.ocd/HUD.ocd/ObjectInteractionMenu.ocd/Script.c b/planet/Objects.ocd/HUD.ocd/ObjectInteractionMenu.ocd/Script.c index 8e1e59c9d..7ef332a4a 100644 --- a/planet/Objects.ocd/HUD.ocd/ObjectInteractionMenu.ocd/Script.c +++ b/planet/Objects.ocd/HUD.ocd/ObjectInteractionMenu.ocd/Script.c @@ -531,12 +531,12 @@ public func OnMoveAllToClicked(int menu_id) if (transfered > 0) { - Sound("SoftTouch*", true, nil, GetOwner()); + Sound("Hits::SoftTouch*", true, nil, GetOwner()); return; } else { - Sound("BalloonPop", true, nil, GetOwner()); + Sound("Objects::Balloon::Pop", true, nil, GetOwner()); return; } } @@ -869,7 +869,7 @@ private func OnContentsSelection(symbol, extra_data) if (!other_target->~IsContainer()) { // Todo: other sound for "nope". - Sound("LightMetalHit*", nil, 10, GetController(), nil, nil, -50); + Sound("Hits::Materials::Metal::LightMetalHit*", nil, 10, GetController(), nil, nil, -50); return; } @@ -926,12 +926,12 @@ private func OnContentsSelection(symbol, extra_data) // Did we at least transfer one item? if (successful_transfers > 0) { - Sound("SoftTouch*", true, nil, GetOwner()); + Sound("Hits::SoftTouch*", true, nil, GetOwner()); return true; } else { - Sound("BalloonPop", true, nil, GetOwner()); + Sound("Objects::Balloon::Pop", true, nil, GetOwner()); return false; } } diff --git a/planet/Objects.ocd/Helpers.ocd/Clock.ocd/Script.c b/planet/Objects.ocd/Helpers.ocd/Clock.ocd/Script.c index 0ca021ca1..dec44bf73 100644 --- a/planet/Objects.ocd/Helpers.ocd/Clock.ocd/Script.c +++ b/planet/Objects.ocd/Helpers.ocd/Clock.ocd/Script.c @@ -63,7 +63,7 @@ public func SetTime(int to_time) var play_for = GetOwner(); if (play_for == NO_OWNER) play_for = nil; - Sound("Click", true, 80, play_for); + Sound("UI::Click", true, 80, play_for); } clock_gui_menu.text.Text = Format("%02d:%02d", color, minutes, seconds); GuiUpdate(clock_gui_menu, clock_gui_id); diff --git a/planet/Objects.ocd/Helpers.ocd/Sequence.ocd/Script.c b/planet/Objects.ocd/Helpers.ocd/Sequence.ocd/Script.c index 316bdd209..df04995ce 100644 --- a/planet/Objects.ocd/Helpers.ocd/Sequence.ocd/Script.c +++ b/planet/Objects.ocd/Helpers.ocd/Sequence.ocd/Script.c @@ -34,7 +34,7 @@ public func Start(string name, int progress, ...) } started = true; // Sound effect. - Sound("Ding", true); + Sound("UI::Ding", true); // Call start function of this scene. var fn_start = Format("%s_Start", seq_name); if (!Call(fn_start, ...)) @@ -108,7 +108,7 @@ public func Stop(bool no_remove) // Per-player sequence callback. RemovePlayer(plr); } - Sound("Ding", true); + Sound("UI::Ding", true); started = false; // Call stop function of this scene. var fn_init = Format("~%s_Stop", seq_name); diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c index bf7ed7f38..b614181c4 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Bread.ocd/Script.c @@ -2,7 +2,7 @@ protected func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } /* Eating */ diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c index 02f78a892..5990f600b 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/CookedMushroom.ocd/Script.c @@ -8,7 +8,7 @@ protected func Construction() func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } /* Eating */ diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Flour.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Flour.ocd/Script.c index df75134de..2b21c20aa 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Flour.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Flour.ocd/Script.c @@ -2,7 +2,7 @@ protected func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } public func IsWindmillProduct() { return true; } diff --git a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Sproutberry.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Sproutberry.ocd/Script.c index 618940b0e..0835f7cd7 100644 --- a/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Sproutberry.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Foodstuff.ocd/Sproutberry.ocd/Script.c @@ -2,7 +2,7 @@ protected func Hit() { - Sound("SoftHit1"); + Sound("Hits::SoftHit1"); } public func Construction() diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Cloth.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Cloth.ocd/Script.c index 8a52f188e..d78a0a69d 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Cloth.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Cloth.ocd/Script.c @@ -12,7 +12,7 @@ public func GetCarryTransform(clonk) private func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } public func IsLoomProduct() { return true; } diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/CottonSeed.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/CottonSeed.ocd/Script.c index 19e69e590..2639edadb 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/CottonSeed.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/CottonSeed.ocd/Script.c @@ -14,7 +14,7 @@ public func GetCarryBone() { return "main"; } private func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } public func IsFuel() { return true; } diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Diamond.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Diamond.ocd/Script.c index 64696b429..c141fd21b 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Diamond.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Diamond.ocd/Script.c @@ -2,7 +2,7 @@ public func Hit() { - Sound("GlassHit?"); + Sound("Hits::Materials::Glass::GlassHit?"); return 1; } diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Diamond.ocd/Socket.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Diamond.ocd/Socket.ocd/Script.c index 58e1cdfcf..0520552dc 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Diamond.ocd/Socket.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Diamond.ocd/Socket.ocd/Script.c @@ -132,7 +132,7 @@ private func CheckFree(bool by_dig_free) AddEffect("MuchSparkle", this, 1, 1, this); this.Visibility = VIS_All; // Also, some sound (delayed for audibility on visibility change) - if (by_dig_free) ScheduleCall(this, Global.Sound, 1,1, "DiamondDigOut"); + if (by_dig_free) ScheduleCall(this, Global.Sound, 1,1, "Objects::DiamondDigOut"); } } @@ -188,7 +188,7 @@ public func OnHitByPickaxe() if(!c) return; if(Random(3)) return; - Sound("RockHit*"); + Sound("Hits::Materials::Rock::RockHit*"); DetachMesh(attached_mesh); c->Exit(0, 0, 0, RandomX(-3, 3), RandomX(-3, -1), RandomX(-20, 20)); } diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Earth.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Earth.ocd/Script.c index 7a50308cf..7d4720247 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Earth.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Earth.ocd/Script.c @@ -14,7 +14,7 @@ protected func Hit() { CastPXS("Earth", GetMaterialAmount() * GetStackCount(), 18); - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); RemoveObject(); return 1; } diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Firestone.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Firestone.ocd/Script.c index f304dc0c2..545e7141b 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Firestone.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Firestone.ocd/Script.c @@ -16,7 +16,7 @@ func Hit() func Fuse() { - Sound("FuseShort"); + Sound("Fire::FuseShort"); CreateParticle("Fire", 0, 0, PV_Random(-5, 5), PV_Random(-15, 5), PV_Random(10, 40), Particles_Glimmer(), 5); return true; } diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/GoldBar.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/GoldBar.ocd/Script.c index 68c981841..2448b7aa2 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/GoldBar.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/GoldBar.ocd/Script.c @@ -2,7 +2,7 @@ protected func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); return 1; } diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Ice.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Ice.ocd/Script.c index b292eecac..8cba07ec2 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Ice.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Ice.ocd/Script.c @@ -2,7 +2,7 @@ protected func Hit() { - Sound("IceHit?"); + Sound("Hits::IceHit?"); } protected func Construction() diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Loam.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Loam.ocd/Script.c index 342fd34f6..3b39b39d7 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Loam.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Loam.ocd/Script.c @@ -12,7 +12,7 @@ protected func Construction() // Impact sound func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } public func RejectUse(object clonk) diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Metal.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Metal.ocd/Script.c index 6c2890471..cc7b0a505 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Metal.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Metal.ocd/Script.c @@ -8,7 +8,7 @@ protected func Construction() protected func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); return 1; } diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Ruby.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Ruby.ocd/Script.c index ff1512f5b..1ad9abffe 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Ruby.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Ruby.ocd/Script.c @@ -52,6 +52,6 @@ func OnSale(int to_player, object sale_base) func Hit() { - Sound("GlassHit*"); + Sound("Hits::Materials::Glass::GlassHit*"); return true; } \ No newline at end of file diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Seeds.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Seeds.ocd/Script.c index 28fd572fc..0d7233b68 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Seeds.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Seeds.ocd/Script.c @@ -41,7 +41,7 @@ public func ControlUse(object clonk, int x, int y, bool box) protected func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } public func IsMillIngredient() { return true; } diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Sulphur.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Sulphur.ocd/Script.c index 391463e5d..a5b51b336 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Sulphur.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Sulphur.ocd/Script.c @@ -9,7 +9,7 @@ protected func Construction() protected func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } local Collectible = 1; diff --git a/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/Script.c index 1ac0f528b..6d791d200 100644 --- a/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Resources.ocd/Wood.ocd/Script.c @@ -2,7 +2,7 @@ protected func Hit() { - Sound("WoodHit?"); + Sound("Hits::Materials::Wood::WoodHit?"); return 1; } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/Script.c index 672883461..afc399357 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Axe.ocd/Script.c @@ -196,7 +196,7 @@ func FxIntAxeTimer(object clonk, effect, int time) //This block is executed when the axe hits the tree if((time + 25) % axe_swing_time == 1) { - Sound("Chop?"); + Sound("Environment::Tree::Chop?"); //Which direction does the clonk face? var x = 10; @@ -243,7 +243,7 @@ func FxIntSplitTimer(object clonk, effect, int time) //This block is executed when the axe hits the tree if ((time + 25) % axe_swing_time == 1) { - Sound("Chop?"); + Sound("Environment::Tree::Chop?"); //Which direction does the clonk face? var x = 10; @@ -346,7 +346,7 @@ func CheckStrike(iTime) DoWeaponSlow(obj, 200); // sound and done. We can only hit one target - Sound("WeaponHit?", false); + Sound("Objects::Weapons::WeaponHit?", false); break; } } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/BalloonDeployed.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/BalloonDeployed.ocd/Script.c index 226be3fad..f45ce0ecd 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/BalloonDeployed.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/BalloonDeployed.ocd/Script.c @@ -156,7 +156,7 @@ public func OnProjectileHit() { // Pop the balloon and tumble the rider. CreateParticle("Air", 0, -10, PV_Random(-10, 10), PV_Random(-10, 10), 10, Particles_Air(), 30); - Sound("BalloonPop"); + Sound("Objects::Balloon::Pop"); if (rider) { rider->SetAction("Tumble"); diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/Script.c index 613a6cc37..f9a8780bc 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Balloon.ocd/Script.c @@ -19,7 +19,7 @@ public func ControlUseStart(object clonk) balloon->SetParent(this); // Sound. - Sound("BalloonInflate"); + Sound("Objects::Balloon::Inflate"); // Make the clonk ride the balloon. clonk->SetAction("Ride", balloon); @@ -44,7 +44,7 @@ public func QueryRejectDeparture(object clonk) public func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } public func IsInventorProduct() { return true; } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/Script.c index b684b8ffb..45f7514ca 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/MetalBarrel.ocd/Script.c @@ -9,13 +9,13 @@ private func Hit() { - Sound("DullMetalHit?"); + Sound("Hits::Materials::Metal::DullMetalHit?"); if (iVolume >= 1) { if (GBackLiquid(0, 7) && GetMaterial(0, 7) != szLiquid) return 0; EmptyBarrel(GetR()); - Sound("Splash1"); + Sound("Liquids::Splash1"); } } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/Script.c index d5698fd52..143403e49 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/Script.c @@ -30,13 +30,13 @@ protected func Initialize() private func Hit() { - Sound("DullWoodHit?"); + Sound("Hits::Materials::Wood::DullWoodHit?"); if (iVolume >= 1) { if (GBackLiquid(0, 3) && GetMaterial(0, 3) != szLiquid) return 0; EmptyBarrel(GetR()); - Sound("Splash1"); + Sound("Liquids::Splash1"); } } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/Script.c index 6f4c3a18a..72ec1efe1 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Boompack.ocd/Script.c @@ -111,7 +111,7 @@ protected func FxFlightTimer(object pTarget, effect, int iEffectTime) JumpOff(rider,30); } - if(!Random(105)) Sound("Cracker"); + if(!Random(105)) Sound("Fire::Cracker"); if(fuel<=0) { @@ -169,7 +169,7 @@ protected func Hit() JumpOff(rider); } //Message("I have hit something",this); - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); if(GetEffect("Flight",this)) DoFireworks(); } @@ -211,9 +211,9 @@ func Launch(int angle, object clonk) SetCategory(C4D_Vehicle); Exit(); - Sound("BoompackLaunch"); + Sound("Objects::Boompack::Launch"); AddEffect("Flight",this,150,1,this); - Sound("BoompackFly", false, 60, nil, 1); + Sound("Objects::Boompack::Fly", false, 60, nil, 1); //AddEffect("HitCheck", this, 1,1, nil,nil, clonk, true); //Ride the rocket! @@ -245,7 +245,7 @@ func DoFireworks() { RemoveEffect("Flight",this); Fireworks(); - Sound("BlastFirework", false, 200); + Sound("Fire::BlastFirework", false, 200); Explode(30); } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/Script.c index 3574cc3ce..b01720ce6 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/Script.c @@ -113,7 +113,7 @@ private func Spill(int angle) protected func Hit() { - Sound("DullWoodHit?"); + Sound("Hits::Materials::Wood::DullWoodHit?"); } // Can collect IsBucketMaterial? diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/Script.c index e42f82cbb..ef2f796f2 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Crate.ocd/Script.c @@ -47,14 +47,14 @@ private func Open() { StopAnimation(crateanim); crateanim = PlayAnimation("Open", 5, Anim_Linear(0, 0, GetAnimationLength("Open"), 22, ANIM_Hold), Anim_Const(1000)); - Sound("ChestOpen"); + Sound("Structures::Chest::Open"); } private func Close() { StopAnimation(crateanim); crateanim = PlayAnimation("Close", 5, Anim_Linear(0, 0, GetAnimationLength("Close"), 15, ANIM_Hold), Anim_Const(1000)); - Sound("ChestClose"); + Sound("Structures::Chest::Close"); } protected func Definition(def) @@ -68,7 +68,7 @@ public func IsContainer() { return true; } func Hit() { - Sound("DullWoodHit?"); + Sound("Hits::Materials::Wood::DullWoodHit?"); } local Name = "$Name$"; diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c index 93a08e634..71e3ab4ce 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c @@ -61,7 +61,7 @@ private func Place(object clonk, int x, int y, bool box) if(box) SetReady(); // put into ... - Sound("Connect"); + Sound("Objects::Connect"); Exit(pos[0], pos[1], Angle(pos[0],pos[1])); SetPosition(clonk->GetX()+pos[0], clonk->GetY()+pos[1]); return true; @@ -74,7 +74,7 @@ public func Fuse() if (GetAction() != "Fuse") { if (!FindObject(Find_Category(C4D_StaticBack), Find_Func("IsFuse"), Find_ActionTargets(this))) - Sound("Fuse"); + Sound("Fire::Fuse"); SetAction("Fuse"); // Object can't be collected anymore when it fuses. this.Collectible = false; @@ -96,7 +96,7 @@ private func GetWall(int angle) return false; } -protected func Hit() { Sound("GeneralHit?"); } +protected func Hit() { Sound("Hits::GeneralHit?"); } protected func Incineration(int caused_by) { @@ -185,7 +185,7 @@ local ActMap = { Delay = 1, Length = 1, FacetBase = 1, - Sound = "Fusing", + Sound = "Fire::FuseLoop", StartCall = "Fusing" }, Ready = { diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Fuse.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Fuse.ocd/Script.c index fab70ef6d..60355d2f0 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Fuse.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Fuse.ocd/Script.c @@ -63,7 +63,7 @@ protected func FxIntFusingStart(object target, proplist effect, int temporary) if (temporary) return FX_OK; SetAction("Fusing"); - Sound("FuseLoop", false, 75, nil, 1); + Sound("Fire::FuseLoop", false, 75, nil, 1); return FX_OK; } @@ -106,7 +106,7 @@ protected func FxIntFusingStop(object target, proplist effect, int reason, bool { if (temporary) return FX_OK; - Sound("FuseLoop", false, 75, nil, -1); + Sound("Fire::FuseLoop", false, 75, nil, -1); return FX_OK; } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Igniter.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Igniter.ocd/Script.c index 90df8c4a5..425ea4acd 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Igniter.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Igniter.ocd/Script.c @@ -9,7 +9,7 @@ private func Hit() { - Sound("DullMetalHit?"); + Sound("Hits::Materials::Metal::DullMetalHit?"); } public func HoldingEnabled() { return true; } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c index afc8e537c..14a0cf3ee 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/DynamiteBox.ocd/Script.c @@ -31,7 +31,7 @@ public func Initialize() private func Hit() { - Sound("DullWoodHit?"); + Sound("Hits::Materials::Wood::DullWoodHit?"); } public func HoldingEnabled() { return true; } @@ -52,7 +52,7 @@ public func ControlUse(object clonk, int x, int y) wire = CreateObject(Fuse); wire->Connect(dynamite, this); - Sound("Connect"); + Sound("Objects::Connect"); wires[count - 1] = wire; count--; @@ -167,7 +167,7 @@ protected func Incineration(int caused_by) { ActivateFuse(); if (!GetEffect("Fuse", this)) AddEffect("Fuse", this, 100, 1, this); - Sound("Fuse"); + Sound("Fire::Fuse"); SetController(caused_by); return; } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Hook.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Hook.ocd/Script.c index d6ddd102a..9a4f27d4b 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Hook.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Hook.ocd/Script.c @@ -46,7 +46,7 @@ public func Launch(int angle, int str, object shooter, object bow) SetXDir(xdir); SetYDir(ydir); SetR(angle); - Sound("ArrowShoot?"); + Sound("Objects::Arrow::Shoot?"); AddEffect("InFlight", this, 1, 1, this); } @@ -61,7 +61,7 @@ private func Stick() { if (GetEffect("InFlight",this)) { - Sound("ArrowHitGround"); + Sound("Objects::Arrow::HitGround"); RemoveEffect("InFlight",this); diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Script.c index dc73258df..1004d67d4 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Script.c @@ -7,7 +7,7 @@ func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } local fAiming; @@ -186,7 +186,7 @@ public func FinishedAiming(object clonk, int angle) hook->Exit(); hook->Launch(angle, 100, clonk, this); DetachMesh(hook_attach); - Sound("BowShoot?"); + Sound("Objects::Weapons::Bow::Shoot?"); // Open the hand to let the string go and play the fire animation PlayAnimation("Fire", 6, Anim_Linear(0, 0, GetAnimationLength("Fire"), animation_set["ShootTime"], ANIM_Hold), Anim_Const(1000)); diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Lantern.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Lantern.ocd/Script.c index 6452cae4b..101f69f79 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Lantern.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Lantern.ocd/Script.c @@ -28,7 +28,7 @@ public func TurnOff() private func Hit() { - Sound("GlassHit?"); + Sound("Hits::Materials::Glass::GlassHit?"); } private func Hit2() @@ -39,8 +39,8 @@ private func Hit2() // Cast some particles. // TODO? // Sound effects. - Sound("GlassBreak"); - Sound("Inflame"); + Sound("Hits::Materials::Glass::GlassBreak"); + Sound("Fire::Inflame"); Explode(10, true); } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/Script.c index bbab3962e..9601354af 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pickaxe.ocd/Script.c @@ -123,7 +123,7 @@ protected func DoSwing(object clonk, int ix, int iy) Size = PV_KeyFrames(0, 0, 0, 200, PV_Random(2, 50), 1000, 0), }; CreateParticle("Dust", x2, y2, PV_Random(-3, 3), PV_Random(-3, -3), PV_Random(18, 1 * 36), particles, 3); - Sound("Dig?"); + Sound("Clonk::Action::Dig::Dig?"); } //It's solid, but not diggable. So it is a hard mineral. else @@ -138,7 +138,7 @@ protected func DoSwing(object clonk, int ix, int iy) spark.OnCollision = PC_Bounce(); } CreateParticle("StarSpark", x2*9/10,y2*9/10, PV_Random(-30, 30), PV_Random(-30, 30), PV_Random(10, 50), spark, 30); - Sound("Clang?", nil, nil, nil, nil, nil, pitch); + Sound("Objects::Pickaxe::Clang?", nil, nil, nil, nil, nil, pitch); } // Do blastfree after landscape checks are made. Otherwise, mat always returns as "tunnel" diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c index 0782f5153..ba44d0e1d 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c @@ -11,7 +11,7 @@ local Rebuy = true; protected func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } public func IsToolProduct() { return true; } @@ -44,7 +44,7 @@ protected func ControlUse(object clonk, int x, int y) // Create and connect pipe. var pipe = CreateObjectAbove(PipeLine, 0, 0, NO_OWNER); pipe->SetActionTargets(this, liquid_pump); - Sound("Connect"); + Sound("Objects::Connect"); // If liquid pump has no source yet, create one. if (!liquid_pump->GetSource()) diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/PowderKeg.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/PowderKeg.ocd/Script.c index 279f332bb..a9c57b997 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/PowderKeg.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/PowderKeg.ocd/Script.c @@ -125,7 +125,7 @@ public func OnProjectileHit() func Hit() { - Sound("DullWoodHit?"); + Sound("Hits::Materials::Wood::DullWoodHit?"); } public func SaveScenarioObject(props) diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgeLoosePlank.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgeLoosePlank.ocd/Script.c index 65f9cae4a..a4ffea4fb 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgeLoosePlank.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgeLoosePlank.ocd/Script.c @@ -2,7 +2,7 @@ protected func Hit() { - Sound("WoodHit?"); + Sound("Hits::Materials::Wood::WoodHit?"); return 1; } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c index 6846b54ea..7d60dcde4 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c @@ -262,7 +262,7 @@ public func SetLineTransform(object obj, int r, int xoff, int yoff, int length, public func Hit() { - Sound("WoodHit?"); + Sound("Hits::Materials::Wood::WoodHit?"); } local ActMap = { diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/Script.c index 6b1d08fd8..ac83f144e 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/Script.c @@ -469,7 +469,7 @@ public func GetLadderData(int index) public func Hit() { - Sound("WoodHit?"); + Sound("Hits::Materials::Wood::WoodHit?"); } // Save unrolled ladders in scenario. diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/Script.c index f525d4531..81df04966 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Shovel.ocd/Script.c @@ -2,7 +2,7 @@ private func Hit() { - Sound("WoodHit?"); + Sound("Hits::Materials::Wood::WoodHit?"); } private func Destruction() diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/Script.c index 5bab4ac25..76998e978 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Sickle.ocd/Script.c @@ -7,7 +7,7 @@ private func Hit() { - Sound("WoodHit?"); + Sound("Hits::Materials::Wood::WoodHit?"); } public func GetCarryMode() { return CARRY_HandBack; } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/TeleGlove.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/TeleGlove.ocd/Script.c index 0c8b97813..dc4c0f69d 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/TeleGlove.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/TeleGlove.ocd/Script.c @@ -71,7 +71,7 @@ private func StartUsage(object clonk) //Animations and effects for TeleGlove - Sound("Electrical",nil,nil,nil,+1); + Sound("Objects::Electrical",nil,nil,nil,+1); PlayAnimation("Opening", -5, Anim_Linear(0,0,GetAnimationLength("Opening"), 10, ANIM_Hold), Anim_Const(1000)); anim_spin = PlayAnimation("Spin",5, Anim_Linear(0,0,GetAnimationLength("Spin"), 40, ANIM_Loop), Anim_Const(1000)); @@ -258,7 +258,7 @@ protected func ControlUseCancel(object clonk, int ix, int iy) protected func CancelUse(object clonk) { EndUsage(clonk); - Sound("Electrical",nil,nil,nil,-1); + Sound("Objects::Electrical",nil,nil,nil,-1); if(aiming = 1) PlayAnimation("Closing", -5, Anim_Linear(0,0,GetAnimationLength("Closing"), 10, ANIM_Hold), Anim_Const(1000)); StopAnimation(anim_spin); aiming = 0; @@ -269,7 +269,7 @@ protected func CancelUse(object clonk) func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } func IsInventorProduct() { return true; } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Torch.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Torch.ocd/Script.c index 0426ca906..e5b471b92 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Torch.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Torch.ocd/Script.c @@ -22,7 +22,7 @@ protected func Initialize() private func Hit() { - Sound("WoodHit?"); + Sound("Hits::Materials::Wood::WoodHit?"); return; } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/WallKit.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/WallKit.ocd/Script.c index 6f049b7b5..e92358ed2 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/WallKit.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/WallKit.ocd/Script.c @@ -8,7 +8,7 @@ func MaxStackCount() { return 4; } func ControlUseStart(object clonk, int x, int y) { - clonk->Sound("WallKitClick"); + clonk->Sound("Objects::WallKit::Click"); SetPreview(clonk,x,y); return true; } @@ -46,7 +46,7 @@ private func CreateBridge(object clonk, int x, int y) x = clonk->GetX(); y = clonk->GetY(); DrawMaterialQuad(BridgeMaterial, x + c.x1 - c.dxm, y + c.y1 - c.dym, x + c.x1 + c.dxp, y + c.y1 + c.dyp, x + c.x2 + c.dxp, y + c.y2 + c.dyp, x + c.x2 - c.dxm, y + c.y2 - c.dym, DMQ_Bridge); - clonk->Sound("WallKitLock"); + clonk->Sound("Objects::WallKit::Lock"); return true; } @@ -105,7 +105,7 @@ func StopPreview(object clonk) func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); return true; } diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c index 34384970b..0e4d2a722 100644 --- a/planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c @@ -17,7 +17,7 @@ protected func Initialize() protected func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); return; } @@ -87,8 +87,8 @@ public func FxIntReloadTimer(object target, proplist effect, int time) { if (effect.sound) { - Sound("WindCharge", false, nil, nil, -1); - Sound("WindChargeStop"); + Sound("Objects::Windbag::Charge", false, nil, nil, -1); + Sound("Objects::Windbag::ChargeStop"); effect.sound = false; } return FX_OK; @@ -104,7 +104,7 @@ public func FxIntReloadTimer(object target, proplist effect, int time) { if (!effect.sound) { - Sound("WindCharge", false, nil, nil, 1); + Sound("Objects::Windbag::Charge", false, nil, nil, 1); effect.sound = true; } @@ -127,8 +127,8 @@ public func FxIntReloadStop(object target, proplist effect, int reason, bool tem return FX_OK; if (effect.sound) { - Sound("WindCharge", false, nil, nil, -1); - Sound("WindChargeStop"); + Sound("Objects::Windbag::Charge", false, nil, nil, -1); + Sound("Objects::Windbag::ChargeStop"); } return FX_OK; } @@ -159,7 +159,7 @@ public func FxIntBurstWindStart(object target, proplist effect, int temp, object effect.y = clonk->GetY(); effect.angle = Angle(0, 0, x, y); // Sound effect. - Sound("WindGust"); + Sound("Objects::Windbag::Gust"); // Particle effect. for (var dr = 12; dr < 32; dr++) { diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/Script.c index 26863a9f2..3e66d5e5e 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Arrow.ocd/Script.c @@ -30,7 +30,7 @@ public func Launch(int angle, int str, object shooter) SetXDir(xdir); SetYDir(ydir); SetR(angle); - Sound("ArrowShoot?"); + Sound("Objects::Arrow::Shoot?"); // Shooter controls the arrow for correct kill tracing. SetController(shooter->GetController()); @@ -71,9 +71,9 @@ public func HitObject(object obj) if (WeaponCanHit(obj)) { if (obj->GetAlive()) - Sound("ProjectileHitLiving?"); + Sound("Hits::ProjectileHitLiving?"); else - Sound("ArrowHitGround"); + Sound("Objects::Arrow::HitGround"); obj->~OnProjectileHit(this); WeaponDamage(obj, dmg, FX_Call_EngObjHit, true); @@ -89,7 +89,7 @@ public func HitObject(object obj) public func Hit() { if (GetEffect("InFlight",this)) - Sound("ArrowHitGround"); + Sound("Objects::Arrow::HitGround"); Stick(); } diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Script.c index d0356d8d3..7f96a8836 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Bow.ocd/Script.c @@ -11,7 +11,7 @@ private func Hit() { - Sound("WoodHit?"); + Sound("Hits::Materials::Wood::WoodHit?"); } local fAiming; @@ -98,7 +98,7 @@ public func DuringLoad(object clonk) { return AddArrow(clonk); } // Called during loading then the arrow is added to the animation public func AddArrow(object clonk) { - Sound("BowLoad?"); + Sound("Objects::Weapons::Bow::Load?"); iArrowMesh = clonk->AttachMesh(HelpArrow, "pos_hand1", "main", nil); } @@ -144,7 +144,7 @@ public func FinishedAiming(object clonk, int angle) { var arrow = Contents(0)->TakeObject(); arrow->Launch(angle,100,clonk); - Sound("BowShoot?"); + Sound("Objects::Weapons::Bow::Shoot?"); } } @@ -208,12 +208,12 @@ func RejectCollect(id arrowid, object arrows) /* func Selection() { - Sound("DrawBow"); + Sound("Objects::Weapons::Bow::Draw"); } func Deselection() { - Sound("PutAwayBow"); + Sound("Objects::Weapons::Bow::PutAwayBow"); } */ diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c index 31c933fa7..ea1fb534b 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c @@ -4,7 +4,7 @@ private func Hit() { - Sound("WoodHit?"); + Sound("Hits::Materials::Wood::WoodHit?"); } public func GetCarryMode() { return CARRY_HandBack; } diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/Script.c index d99104a31..a466d65df 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/GrenadeLauncher.ocd/Script.c @@ -11,7 +11,7 @@ func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } local fAiming; @@ -163,7 +163,7 @@ private func FireWeapon(object clonk, int angle) loaded = false; SetProperty("PictureTransformation",Trans_Mul(Trans_Translate(1500,0,-1500),Trans_Rotate(170,0,1,0),Trans_Rotate(30,0,0,1))); - Sound("GunShoot?"); + Sound("Objects::Weapons::Musket::GunShoot?"); // Muzzle Flash & gun smoke if(Abs(Normalize(angle,-180)) > 90) diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Script.c index 9f9b3a5e0..478d5542a 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Script.c @@ -35,10 +35,10 @@ func FxFuseBurnTimer(object bomb, int num, int timer) var y = -Cos(GetR(), i); CreateParticle("Smoke", x, y, x, y, PV_Random(18, 36), Particles_Smoke(), 2); - if(timer == 1) Sound("FuseLoop",nil,nil,nil,+1); + if(timer == 1) Sound("Fire::FuseLoop",nil,nil,nil,+1); if(timer >= 90) { - Sound("FuseLoop",nil,nil,nil,-1); + Sound("Fire::FuseLoop",nil,nil,nil,-1); DoExplode(); return -1; } @@ -57,9 +57,9 @@ func DoExplode() i--; } if(GBackLiquid()) - Sound("BlastLiquid2"); + Sound("Fire::BlastLiquid2"); else - Sound("BlastMetal"); + Sound("Fire::BlastMetal"); CreateParticle("Smoke", PV_Random(-30, 30), PV_Random(-30, 30), 0, 0, PV_Random(40, 60), Particles_Smoke(), 60); Explode(30); } diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Shrapnel.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Shrapnel.ocd/Script.c index b67aeaf70..b8b40f8a3 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Shrapnel.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/IronBomb.ocd/Shrapnel.ocd/Script.c @@ -25,7 +25,7 @@ protected func Hit() { ShakeFree(6); RemoveEffect("HitCheck",this); - Sound("BulletHitGround?"); + Sound("Objects::Weapons::Musket::BulletHitGround?"); CreateParticle("StarSpark", 0, 0, PV_Random(-20, 20), PV_Random(-20, 20), PV_Random(10, 20), Particles_Glimmer(), 3); RemoveObject(); @@ -33,7 +33,7 @@ protected func Hit() public func HitObject(object obj) { - Sound("ProjectileHitLiving?"); + Sound("Hits::ProjectileHitLiving?"); if (WeaponCanHit(obj)) { diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c index 98c3b753a..99521dec4 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c @@ -50,7 +50,7 @@ public func ControlUseStart(object clonk, int x, int y) ControlUseHolding(clonk, x, y); - Sound("DrawJavelin"); + Sound("Objects::Weapons::Javelin::Draw"); return 1; } @@ -116,7 +116,7 @@ public func DoThrow(object clonk, int angle) javelin->AddEffect("Flight",javelin,1,1,javelin,nil); javelin->AddEffect("HitCheck",javelin,1,1,nil,nil,clonk); - Sound("ThrowJavelin?"); + Sound("Objects::Weapons::Javelin::Throw?"); aiming = -1; clonk->UpdateAttach(); @@ -134,9 +134,9 @@ public func HitObject(object obj) if (WeaponCanHit(obj)) { if (obj->GetAlive()) - Sound("ProjectileHitLiving?"); + Sound("Hits::ProjectileHitLiving?"); else - Sound("JavelinHitGround"); + Sound("Objects::Weapons::Javelin::HitGround"); obj->~OnProjectileHit(this); WeaponDamage(obj, dmg, FX_Call_EngObjHit, true); @@ -152,10 +152,10 @@ protected func Hit() if(GetEffect("Flight",this)) { Stick(); - Sound("JavelinHitGround"); + Sound("Objects::Weapons::Javelin::HitGround"); } else - Sound("WoodHit?"); + Sound("Hits::Materials::Wood::WoodHit?"); } protected func Stick() diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Ammo.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Ammo.ocd/Script.c index 5a5a9ab17..677774ecd 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Ammo.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Ammo.ocd/Script.c @@ -16,7 +16,7 @@ protected func Hit() { RemoveEffect("HitCheck",this); - Sound("BulletHitGround?"); + Sound("Objects::Weapons::Musket::BulletHitGround?"); CreateParticle("StarSpark", 0, 0, PV_Random(-20, 20), PV_Random(-20, 20), PV_Random(10, 20), Particles_Glimmer(), 3); @@ -42,7 +42,7 @@ public func Launch(object shooter, int angle, int dist, int speed, int offset_x, CreateObjectAbove(BulletTrail,0,0)->Set(2, 200, this); // sound - Sound("BulletShot?"); + Sound("Objects::Weapons::Musket::BulletShot?"); } public func HitObject(object obj) @@ -50,9 +50,9 @@ public func HitObject(object obj) if (WeaponCanHit(obj)) { if (obj->GetAlive()) - Sound("ProjectileHitLiving?"); + Sound("Hits::ProjectileHitLiving?"); else - Sound("BulletHitGround?"); + Sound("Objects::Weapons::Musket::BulletHitGround?"); obj->~OnProjectileHit(this); WeaponDamage(obj, this->ProjectileDamage(), FX_Call_EngObjHit, false); diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Script.c index 9c1c625d3..4f951b88f 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Musket.ocd/Script.c @@ -11,7 +11,7 @@ func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } local fAiming; @@ -163,7 +163,7 @@ private func FireWeapon(object clonk, int angle) loaded = false; SetProperty("PictureTransformation",Trans_Mul(Trans_Translate(1500,0,-1500),Trans_Rotate(170,0,1,0),Trans_Rotate(30,0,0,1))); - Sound("GunShoot?"); + Sound("Objects::Weapons::Musket::GunShoot?"); // Muzzle Flash & gun smoke var x = Sin(angle, 20); diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/Script.c index 8323d6aad..495de9fb1 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Shield.ocd/Script.c @@ -163,7 +163,7 @@ private func AdjustSolidMaskHelper() func Hit() { - Sound("DullMetalHit?"); + Sound("Hits::Materials::Metal::DullMetalHit?"); } func OnWeaponHitCheckStop() @@ -179,7 +179,7 @@ func HitByWeapon(by, iDamage) var angle_diff = Abs(Normalize(shield_angle-object_angle,-180)); if (angle_diff > 45) return 0; - Sound("ShieldMetalHit?"); + Sound("Objects::Weapons::Shield::MetalHit?"); // bash him hard! ApplyWeaponBash(by, 100, iAngle); @@ -247,7 +247,7 @@ func FxShieldStopControlQueryCatchBlow(object target, effect, object obj) // dont collect blocked objects AddEffect("NoCollection", obj, 1, 30); - Sound("ShieldMetalHit?"); + Sound("Objects::Weapons::Shield::MetalHit?"); return true; } diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/SmokeBomb.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/SmokeBomb.ocd/Script.c index 9573d4bbf..47490a8ba 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/SmokeBomb.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/SmokeBomb.ocd/Script.c @@ -31,7 +31,7 @@ public func Fuse() protected func Hit() { - Sound("MetalHit?"); + Sound("Hits::Materials::Metal::DullMetalHit?"); return; } @@ -63,8 +63,8 @@ protected func FxIntSmokeBombStart(object target, proplist effect, int temp) Phase = PV_Random(0, 15) }; // Sound. - Sound("Smoke.wav", false, 100, nil, +1); - Sound("SmokeSizzle", false, 100, nil, +1); + Sound("Fire::Smoke", false, 100, nil, +1); + Sound("Liquids::SmokeSizzle", false, 100, nil, +1); // Make non-collectible. this.Collectible = false; return FX_OK; @@ -102,8 +102,8 @@ protected func FxIntSmokeBombStop(object target, proplist effect, int reason, bo if (temp) return FX_OK; // Sound. - Sound("Smoke.wav", false, 100, nil, -1); - Sound("SmokeSizzle", false, 100, nil, -1); + Sound("Fire::Smoke", false, 100, nil, -1); + Sound("Liquids::SmokeSizzle", false, 100, nil, -1); RemoveObject(); return FX_OK; } diff --git a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/Script.c index ae928ff44..88094e0cf 100644 --- a/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/Script.c +++ b/planet/Objects.ocd/Items.ocd/Weapons.ocd/Sword.ocd/Script.c @@ -8,7 +8,7 @@ local movement_effect; func Hit() { - Sound("LightMetalHit?"); + Sound("Hits::Materials::Metal::LightMetalHit?"); } public func Initialize() @@ -108,7 +108,7 @@ public func ControlUse(object clonk, int x, int y) magic_number = ObjectNumber(); StartWeaponHitCheckEffect(clonk, length, 1); - this->Sound("WeaponSwing?"); + this->Sound("Objects::Weapons::WeaponSwing?"); return true; } @@ -226,7 +226,7 @@ func CheckStrike(iTime) continue; // Sound before damage to prevent null pointer access if callbacks delete this - Sound("WeaponHit?", false); + Sound("Objects::Weapons::WeaponHit?", false); // fixed damage (9) var damage = SwordDamage(shield); diff --git a/planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionSite.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionSite.ocd/Script.c index bf5d36aa4..fb17575b8 100644 --- a/planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionSite.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionSite.ocd/Script.c @@ -102,7 +102,7 @@ public func OnInteractionControl(id symbol, string action, object clonk) if (action == "abort") { if (!Deconstruct()) - Sound("Click*", false, nil, clonk->GetOwner()); + Sound("UI::Click*", false, nil, clonk->GetOwner()); } } diff --git a/planet/Objects.ocd/Libraries.ocd/Goal.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/Goal.ocd/Script.c index dc069de7b..7fb8b4a5b 100644 --- a/planet/Objects.ocd/Libraries.ocd/Goal.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/Goal.ocd/Script.c @@ -86,7 +86,7 @@ protected func AllGoalsFulfilled() // Custom scenario goal evaluation? if (GameCall("OnGoalsFulfilled")) return true; // We're done. Play some sound and schedule game over call - Sound("Fanfare", true); + Sound("UI::Fanfare", true); AddEffect("IntGoalDone", nil, 1, 30, nil, Library_Goal); } diff --git a/planet/Objects.ocd/Libraries.ocd/LampPost.ocd/Lamp.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/LampPost.ocd/Lamp.ocd/Script.c index 07375bb6b..f893716f0 100644 --- a/planet/Objects.ocd/Libraries.ocd/LampPost.ocd/Lamp.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/LampPost.ocd/Lamp.ocd/Script.c @@ -76,7 +76,7 @@ public func ControlUse(object clonk) } else { TurnOn(); } - Sound("Click2"); + Sound("UI::Click2"); return true; } diff --git a/planet/Objects.ocd/Libraries.ocd/Plants.ocd/Tree.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/Plants.ocd/Tree.ocd/Script.c index d671f3fd6..8f374db08 100644 --- a/planet/Objects.ocd/Libraries.ocd/Plants.ocd/Tree.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/Plants.ocd/Tree.ocd/Script.c @@ -261,7 +261,7 @@ public func ChopDown() i--; } } - Sound("TreeCrack"); + Sound("Environment::Tree::Crack"); AddEffect("TreeFall", this, 1, 1, this); } @@ -300,7 +300,7 @@ private func FxTreeFallTimer(object target, proplist effect) if (Abs(target->GetR()) > 80) { target->SetRDir(0); - if (target->GetCon() > 50) target->Sound("TreeLanding", false); + if (target->GetCon() > 50) target->Sound("Environment::Tree::Landing", false); return -1; } //check every frame if the tree is stuck and stop rotation in that case this is necessary as a tree could get stuck before reaching 80 degrees diff --git a/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Base.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Base.ocd/Script.c index 1376f5f52..077740433 100644 --- a/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Base.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Base.ocd/Script.c @@ -372,7 +372,7 @@ func DoSell(object pObj, int iPlr, bool bRight) DoSell(pContents, iPlr); // Give the player the cash DoWealth(iPlr, GetSellValue(pObj)); - Sound("Cash", 0, 100, iPlr+1); // TODO: get sound + Sound("UI::Cash", 0, 100, iPlr+1); // TODO: get sound if(pObj.Rebuy) ChangeBaseMaterial(pObj->GetID(), 1); // right clicked? then sell other objects too diff --git a/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Structure.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Structure.ocd/Script.c index 34f925597..ddbb132be 100644 --- a/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Structure.ocd/Script.c +++ b/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Structure.ocd/Script.c @@ -282,7 +282,7 @@ public func OnRepairSelected(id symbol, string action, object cursor) if (!hammer) { PlayerMessage(cursor->GetOwner(), "$YouNeedAHammer$"); - Sound("Click2", nil, nil, cursor->GetOwner()); + Sound("UI::Click2", nil, nil, cursor->GetOwner()); return; } @@ -307,7 +307,7 @@ public func OnRepairSelected(id symbol, string action, object cursor) if (total_repair_value == 0) { PlayerMessage(cursor->GetOwner(), "$YouNeedMaterials$"); - Sound("Click2", nil, nil, cursor->GetOwner()); + Sound("UI::Click2", nil, nil, cursor->GetOwner()); return; } @@ -327,7 +327,7 @@ public func OnRepairSelected(id symbol, string action, object cursor) lib_structure.repair_materials = new_list; // todo: add sound for repairing.. - Sound("Ding"); + Sound("UI::Ding"); } // On hovering, show a list of materials that are needed for repairing the structure. diff --git a/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/Script.c index a0f3a5b57..d68c4c77f 100644 --- a/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/ChemicalLab.ocd/Script.c @@ -29,26 +29,26 @@ public func OnProductionStart(id product) { AddEffect("Working", this, 100, 1, this); hold_production = false; - Sound("Boiling", false, nil, nil, 1); + Sound("Liquids::Boiling", false, nil, nil, 1); } public func OnProductionHold(id product) { hold_production = true; - Sound("Boiling", false, nil, nil, -1); - Sound("Blowout"); + Sound("Liquids::Boiling", false, nil, nil, -1); + Sound("Fire::Blowout"); } public func OnProductionContinued(id product) { hold_production = false; - Sound("Boiling", false, nil, nil, 1); + Sound("Liquids::Boiling", false, nil, nil, 1); } public func OnProductionFinish(id product) { RemoveEffect("Working", this); - Sound("Boiling", false, nil, nil, -1); + Sound("Liquids::Boiling", false, nil, nil, -1); } protected func FxWorkingTimer() diff --git a/planet/Objects.ocd/Structures.ocd/Chest.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Chest.ocd/Script.c index 2a52860ce..9148e326d 100644 --- a/planet/Objects.ocd/Structures.ocd/Chest.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Chest.ocd/Script.c @@ -53,7 +53,7 @@ private func Open() return; is_open = true; PlayAnimation("Open", 5, Anim_Linear(0, 0, GetAnimationLength("Open"), 22, ANIM_Hold), Anim_Const(1000)); - Sound("ChestOpen"); + Sound("Structures::Chest::Open"); } private func Close() @@ -62,7 +62,7 @@ private func Close() return; is_open = false; PlayAnimation("Close", 5, Anim_Linear(0, 0, GetAnimationLength("Close"), 15, ANIM_Hold), Anim_Const(1000)); - Sound("ChestClose"); + Sound("Structures::Chest::Close"); } public func NoConstructionFlip() { return true; } diff --git a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c index ea2f3215d..1f2ba9bc7 100644 --- a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c @@ -147,7 +147,7 @@ public func ExecuteSync() SetSolidMask(0, 3, 48, 3, -24, 23); partner->SetSolidMask(0, 0, 0, 0, 0, 0); - Sound("Click"); + Sound("UI::Click"); } // sets additional vertices to partner's position @@ -337,7 +337,7 @@ private func FxFetchVehiclesTimer(object target, proplist effect, int time) } vehicle->SetPosition(x, GetY() + GetBottom() - 3 - vehicle->GetBottom()); AddEffect("ElevatorControl", vehicle, 30, 5, vehicle, nil, this); - Sound("Connect"); + Sound("Objects::Connect"); } return FX_OK; @@ -612,7 +612,7 @@ public func ControlUseStart(object clonk, int x, int y) if (IsSlave()) return Control2Master("ControlUseStart", clonk, x, y); MoveTo(GetY() + y, 0, nil, true); - Sound("Click", nil, nil, clonk->GetOwner()); + Sound("UI::Click", nil, nil, clonk->GetOwner()); // Do not trigger a UseStop-callback. return false; } @@ -642,7 +642,7 @@ public func ControlUp(object clonk) // what is that player even doing if (GetY() <= elevator->GetY() + 20) { - Sound("Click", nil, nil, clonk->GetOwner()); + Sound("UI::Click", nil, nil, clonk->GetOwner()); return true; } @@ -736,7 +736,7 @@ local ActMap = { Length = 1, PhaseCall = "Drilling", NextAction = "Drill", - Sound = "ElevatorDrilling", + Sound = "Structures::Elevator::Drilling", DigFree = 1 } }; diff --git a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Script.c index a762369c7..e35a8ef4f 100644 --- a/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Elevator.ocd/Script.c @@ -128,7 +128,7 @@ public func StartEngine(int direction, bool silent) if (!silent) { - Sound("ElevatorStart", nil, nil, nil, nil, 400); + Sound("Structures::Elevator::Start", nil, nil, nil, nil, 400); ScheduleCall(this, "EngineLoop", 34); } if (wheel_anim == nil) // If for some reason the animation has stopped @@ -153,16 +153,16 @@ public func StartEngine(int direction, bool silent) public func EngineLoop() { - Sound("ElevatorMoving", nil, nil, nil, 1, 400); + Sound("Structures::Elevator::Moving", nil, nil, nil, 1, 400); } public func StopEngine(bool silent) { if (!silent) { - Sound("ElevatorMoving", nil, nil, nil, -1); + Sound("Structures::Elevator::Moving", nil, nil, nil, -1); ClearScheduleCall(this, "EngineLoop"); - Sound("ElevatorStop", nil, nil, nil, nil, 400); + Sound("Structures::Elevator::Stop", nil, nil, nil, nil, 400); } if (wheel_anim == nil) return; diff --git a/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c index 7eb11b1b1..69231f00a 100644 --- a/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c @@ -196,7 +196,7 @@ public func Collection(object obj) if (obj->~IsValuable() && !obj->~QueryOnSell(obj->GetController())) { DoWealth(obj->GetController(), obj->GetValue()); - Sound("Cash"); + Sound("UI::Cash"); // OnSale callback to object e.g. for goal updates obj->~OnSale(obj->GetController(), this); if (obj) obj->RemoveObject(); diff --git a/planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c index b546e0f45..ced340b4c 100644 --- a/planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c @@ -37,7 +37,7 @@ private func ProductionTime(id toProduce) { return 290; } public func OnProductionStart(id product) { AddEffect("Smelting", this, 100, 1, this); - Sound("FurnaceStart"); + Sound("Structures::Furnace::Start"); return; } @@ -63,7 +63,7 @@ func CollectionZone() func Collection() { - Sound("Clonk"); + Sound("Objects::Clonk"); return; } @@ -79,7 +79,7 @@ public func FxSmeltingTimer(object target, proplist effect, int time) // Furnace sound after some time. if (time == 30) - Sound("FurnaceLoop", false, 100, nil, +1); + Sound("Structures::Furnace::Loop", false, 100, nil, +1); // Pour after some time. if(time == 244) @@ -87,7 +87,7 @@ public func FxSmeltingTimer(object target, proplist effect, int time) //Molten metal hits cast... Sizzling sound if (time == 256) - Sound("Sizzle"); + Sound("Liquids::Sizzle"); // Fire from the pouring exit. if (Inside(time, 244, 290)) @@ -96,8 +96,8 @@ public func FxSmeltingTimer(object target, proplist effect, int time) if (time == 290) { SetMeshMaterial("Metal", 1); - Sound("FurnaceLoop", false ,100, nil, -1); - Sound("FurnaceStop"); + Sound("Structures::Furnace::Loop", false ,100, nil, -1); + Sound("Structures::Furnace::Stop"); return -1; } return 1; diff --git a/planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c index dc03014e7..7e2fcbd76 100644 --- a/planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c @@ -540,7 +540,7 @@ local ActMap = { Name = "Pump", Length = 30, Delay = 3, - Sound = "Pumpjack", + Sound = "Structures::Pumpjack", NextAction = "Pump", StartCall = "CheckState", PhaseCall = "Pumping" diff --git a/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c index 8d20a2552..490a33c35 100644 --- a/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Sawmill.ocd/Script.c @@ -41,7 +41,7 @@ public func IsInteractable() { return false; } private func Collection(object obj) { - Sound("Clonk"); + Sound("Objects::Clonk"); Saw(obj); } @@ -244,7 +244,7 @@ private func SpinOn(int diff) rotate = 0; SetMeshMaterial("SawmillBlade.Spin", 2); running = true; - Sound("SawmillRipcut", nil, nil, nil, +1); + Sound("Structures::SawmillRipcut", nil, nil, nil, +1); Sound("Sawmill::EngineLoop", nil, nil, nil, +1); } @@ -260,7 +260,7 @@ private func SpinOff(int call) running = false; spin = 50; SetMeshMaterial("SawmillBlade", 2); - Sound("SawmillRipcut", nil, nil, nil, -1); + Sound("Structures::SawmillRipcut", nil, nil, nil, -1); SetProperty("MeshTransformation", Trans_Rotate(-20, 0, 1, 0)); } if (call == 1) spin = 75; diff --git a/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/Script.c index fa6a1ab7e..4e8086110 100644 --- a/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/SteamEngine.ocd/Script.c @@ -43,7 +43,7 @@ protected func RejectCollect(id item, object obj) protected func Collection(object obj, bool put) { - Sound("Clonk"); + Sound("Objects::Clonk"); } public func ContentsCheck() @@ -112,7 +112,7 @@ public func OnPowerProductionStop(int amount) // Start call from working action. protected func WorkStart() { - Sound("SteamEngine", false, nil, nil, 1); + Sound("Structures::SteamEngine", false, nil, nil, 1); return; } @@ -155,7 +155,7 @@ protected func WorkStop() protected func WorkAbort() { // Sound can be safely stopped here since this action will always end with an abort call. - Sound("SteamEngine", false, nil, nil, -1); + Sound("Structures::SteamEngine", false, nil, nil, -1); return; } diff --git a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c index e9921645c..8e53319bf 100644 --- a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c @@ -18,7 +18,7 @@ public func OpenDoor() { ForceDigFree(); SetComDir(COMD_Up); - Sound("GateMove"); + Sound("Structures::StoneGate::GateMove"); return; } @@ -26,7 +26,7 @@ public func CloseDoor() { ForceDigFree(); SetComDir(COMD_Down); - Sound("GateMove"); + Sound("Structures::StoneGate::GateMove"); return; } @@ -46,7 +46,7 @@ private func IsClosed() protected func Hit() { - Sound("GateHit"); + Sound("Structures::StoneGate::GateHit"); return; } diff --git a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c index 8fb70dc75..73818352b 100644 --- a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c @@ -26,7 +26,7 @@ public func ControlUp(object clonk) } targetdoor->OpenDoor(); SetAction("SpinLeft"); - Sound("Chain"); + Sound("Structures::StoneGate::Chain"); } } @@ -43,7 +43,7 @@ public func ControlDown(object clonk) } targetdoor->CloseDoor(); SetAction("SpinRight"); - Sound("Chain"); + Sound("Structures::StoneGate::Chain"); } } diff --git a/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/Script.c index 84ab65630..be105c962 100644 --- a/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/WindGenerator.ocd/Script.c @@ -104,7 +104,7 @@ public func Wind2Turn() wheel->SetRDir(current_wind * 90, MinRevolutionTime()); // Make some sounds. if (Abs(current_wind) >= 10 && Random(15 - Abs(current_wind / 10)) < 5) - Sound(["WoodCreak?","HingeCreak?"][Random(2)], false, nil, nil, nil, 75); + Sound(["Hits::Materials::Wood::WoodCreak?","Structures::HingeCreak?"][Random(2)], false, nil, nil, nil, 75); return; } diff --git a/planet/Objects.ocd/Structures.ocd/Windmill.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/Windmill.ocd/Script.c index 9819a0660..833405d1a 100644 --- a/planet/Objects.ocd/Structures.ocd/Windmill.ocd/Script.c +++ b/planet/Objects.ocd/Structures.ocd/Windmill.ocd/Script.c @@ -52,7 +52,7 @@ public func CollectionZone() protected func Collection() { - Sound("Clonk"); + Sound("Objects::Clonk"); return; } @@ -97,7 +97,7 @@ public func Wind2Turn() wheel->SetRDir(current_wind * 90, MinRevolutionTime()); // Make some sounds. if (Abs(current_wind) >= 10 && Random(15 - Abs(current_wind / 10)) < 5) - Sound(["WoodCreak?","HingeCreak?"][Random(2)], false, nil, nil, nil, 75); + Sound(["Hits::Materials::Wood::WoodCreak?","Structures::HingeCreak?"][Random(2)], false, nil, nil, nil, 75); return; } diff --git a/planet/Objects.ocd/System.ocg/Effects.c b/planet/Objects.ocd/System.ocg/Effects.c index e120059e2..60db61fb1 100644 --- a/planet/Objects.ocd/System.ocg/Effects.c +++ b/planet/Objects.ocd/System.ocg/Effects.c @@ -15,9 +15,9 @@ global func ExplosionEffect(int level, int x, int y, int smoothness, bool silent { var grade = BoundBy(level / 10 - 1, 1, 3); if(GBackLiquid(x, y)) - SoundAt(Format("BlastLiquid%d",grade), x, y); + SoundAt(Format("Fire::BlastLiquid%d",grade), x, y); else - SoundAt(Format("Blast%d", grade), x, y); + SoundAt(Format("Fire::Blast%d", grade), x, y); } // possibly init particle definitions? diff --git a/planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c b/planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c index cc17b5271..b3160ec21 100644 --- a/planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c +++ b/planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c @@ -40,7 +40,7 @@ public func ChopDown() } } // Effect - Sound("TreeCrack"); + Sound("Environment::Tree::Crack"); AddEffect("TreeFall", this, 1, 1, nil, Library_Plant); } diff --git a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c index d5f233c93..1bc012c90 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c +++ b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c @@ -94,7 +94,7 @@ private func FireBullet(object ammo) var shot = ammo->TakeObject(); var angle = this->GetR(); shot->Launch(this, angle, 35, 200); - Sound("GunShoot?"); + Sound("Objects::Weapons::Musket::GunShoot?"); // Muzzle Flash & gun smoke var IX = Sin(GetR(), 30); @@ -488,9 +488,9 @@ private func PropellerSpeedTimer() private func SetPropellerSound(int speed) { if (speed <= 0) - return Sound("PropellerLoop",0,100,nil,-1); + return Sound("Objects::Plane::PropellerLoop",0,100,nil,-1); else - return Sound("PropellerLoop",0,100,nil,1,0,(speed-100)*2/3); + return Sound("Objects::Plane::PropellerLoop",0,100,nil,1,0,(speed-100)*2/3); } /* Properties */ diff --git a/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/Script.c index b18368551..9e4b3dc71 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/Script.c +++ b/planet/Objects.ocd/Vehicles.ocd/Airship.ocd/Script.c @@ -118,7 +118,7 @@ public func FxIntAirshipMovementTimer(object target, proplist effect, int time) { // Fade pitch from -45 to 0 enginesound += 5; - Sound("FanLoop",nil,nil,nil, 1, 0, enginesound - 50); + Sound("Structures::FanLoop",nil,nil,nil, 1, 0, enginesound - 50); } } else if(enginesound) @@ -126,9 +126,9 @@ public func FxIntAirshipMovementTimer(object target, proplist effect, int time) // Fade pitch from 0 to minimum -45, then turn off enginesound = Max(enginesound - 10); if (enginesound) - Sound("FanLoop", nil, nil, nil, 1, 0, enginesound - 50); + Sound("Structures::FanLoop", nil, nil, nil, 1, 0, enginesound - 50); else - Sound("FanLoop", nil, nil, nil, -1); + Sound("Structures::FanLoop", nil, nil, nil, -1); } // Wind movement if in the air @@ -314,7 +314,7 @@ func AirshipDeath() burntairship->Incinerate(); //Make sure engine sound is gone - Sound("FanLoop",nil,nil,nil,-1); + Sound("Structures::FanLoop",nil,nil,nil,-1); //This object has served its purpose. Explode(27); diff --git a/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/Script.c index 66102aa78..db53bcdfd 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/Script.c +++ b/planet/Objects.ocd/Vehicles.ocd/Cannon.ocd/Script.c @@ -86,7 +86,7 @@ private func CheckForKeg(object clonk) { keg->Exit(); keg->Enter(this); - Sound("WoodHit?"); + Sound("Hits::Materials::Wood::WoodHit?"); } else // No keg, stop using cannon. { @@ -262,7 +262,7 @@ protected func DoFire(object iammo, object clonk, int angle) CreateParticle("Smoke", px, py, PV_Random(x - 20, x + 20), PV_Random(y - 20, y + 20), PV_Random(40, 60), Particles_Smoke(), 20); CreateMuzzleFlash(px, py, r / angPrec, 60); //sound - Sound("Blast3"); + Sound("Fire::Blast3"); } local ActMap = { diff --git a/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/Script.c index 2cec56aba..e09dbea86 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/Script.c +++ b/planet/Objects.ocd/Vehicles.ocd/Catapult.ocd/Script.c @@ -141,7 +141,7 @@ protected func DoFire(object clonk, int power) aim_anim = PlayAnimation("ArmPosition", 1, Anim_Linear(GetAnimationPosition(aim_anim),0, GetAnimationLength("ArmPosition"), 3, ANIM_Hold), Anim_Const(1000)); //Sound - Sound("Catapult_Launch"); + Sound("Objects::Catapult_Launch"); var projectile = nil; if (Contents(0)) diff --git a/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/Script.c index 0865e1723..8f70810f9 100644 --- a/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/Script.c +++ b/planet/Objects.ocd/Vehicles.ocd/Lorry.ocd/Script.c @@ -37,7 +37,7 @@ public func IsToolProduct() { return true; } protected func Hit3() { - Sound("DullMetalHit?"); + Sound("Hits::Materials::Metal::DullMetalHit?"); } /*-- Contents --*/ @@ -52,7 +52,7 @@ protected func RejectCollect(id object_id, object obj) // Objects can still be collected. if (ContentsCount() < this->MaxContentsCount()) { - Sound("Clonk"); + Sound("Objects::Clonk"); return false; } @@ -66,7 +66,7 @@ protected func RejectCollect(id object_id, object obj) { obj->SetYDir(-2); obj->SetRDir(0); - Sound("SoftHit*"); + Sound("Hits::SoftHit*"); } } // Reject collection. @@ -119,12 +119,12 @@ public func TurnWheels() if (Abs(GetXDir()) > 1 && !wheel_sound) { if (!wheel_sound) - Sound("WheelsTurn", false, nil, nil, 1); + Sound("Structures::WheelsTurn", false, nil, nil, 1); wheel_sound = true; } else if (wheel_sound && !GetXDir()) { - Sound("WheelsTurn", false, nil, nil, -1); + Sound("Structures::WheelsTurn", false, nil, nil, -1); wheel_sound = false; } } diff --git a/planet/Parkour.ocf/Boomshire.ocs/Script.c b/planet/Parkour.ocf/Boomshire.ocs/Script.c index bae54bb47..1772c9b13 100644 --- a/planet/Parkour.ocf/Boomshire.ocs/Script.c +++ b/planet/Parkour.ocf/Boomshire.ocs/Script.c @@ -6,7 +6,7 @@ private func Initialize() // Create dynamite below the first lava basin DrawMaterialQuad("Tunnel",1378,1327-5,1860,1327-5,1860,1330,1387,1330,1); - //Sound("BirdsLoop",true,100,nil,+1); + //Sound("Environment::BirdsLoop",true,100,nil,+1); Cloud->Place(40); PlaceObjects(Rock,50,"Earth"); PlaceObjects(Loam,25,"Earth"); diff --git a/planet/Parkour.ocf/Boomshire.ocs/System.ocg/SpinWheel.c b/planet/Parkour.ocf/Boomshire.ocs/System.ocg/SpinWheel.c index c1257d644..570e3ad24 100644 --- a/planet/Parkour.ocf/Boomshire.ocs/System.ocg/SpinWheel.c +++ b/planet/Parkour.ocf/Boomshire.ocs/System.ocg/SpinWheel.c @@ -15,7 +15,7 @@ public func ControlUp(object clonk) if (GetAction() == "Still") { SetAction("SpinLeft"); - Sound("Chain"); + Sound("Structures::StoneGate::Chain"); var arrw= CreateObjectAbove(Arrow, -370, 50,-1); arrw->Launch(40,80, clonk); arrw->SetGraphics("1"); diff --git a/planet/Parkour.ocf/BristleRidge.ocs/Script.c b/planet/Parkour.ocf/BristleRidge.ocs/Script.c index ab4ac3562..34debc365 100644 --- a/planet/Parkour.ocf/BristleRidge.ocs/Script.c +++ b/planet/Parkour.ocf/BristleRidge.ocs/Script.c @@ -44,7 +44,7 @@ protected func Initialize() } // Create a little mood. - Sound("BirdsLoop", true, 100, nil, 1); + Sound("Environment::BirdsLoop", true, 100, nil, 1); Cloud->Place(30); PlaceGrass(200); return; diff --git a/planet/Parkour.ocf/Maze.ocs/SprayCan.ocd/Script.c b/planet/Parkour.ocf/Maze.ocs/SprayCan.ocd/Script.c index e5651d8bf..3e1acb791 100644 --- a/planet/Parkour.ocf/Maze.ocs/SprayCan.ocd/Script.c +++ b/planet/Parkour.ocf/Maze.ocs/SprayCan.ocd/Script.c @@ -25,7 +25,7 @@ func SetPaintCol(int idx) // Impact sound func Hit() { - Sound("GeneralHit?"); + Sound("Hits::GeneralHit?"); } // Item activation @@ -90,7 +90,7 @@ local ActMap = { Length = 1, Delay = 1, Name = "Spraying", - Sound = "SprayCan", + Sound = "SprayCan::SprayCan", NextAction = "Spraying", } }; diff --git a/planet/Parkour.ocf/ShiverPeak.ocs/Script.c b/planet/Parkour.ocf/ShiverPeak.ocs/Script.c index 7e0e9845d..b61a18535 100644 --- a/planet/Parkour.ocf/ShiverPeak.ocs/Script.c +++ b/planet/Parkour.ocf/ShiverPeak.ocs/Script.c @@ -55,7 +55,7 @@ protected func Initialize() // Snow AddEffect("Snowfall", nil, 1, 2); //Wind - Sound("WindLoop", true, 40, nil, +1); + Sound("Environment::WindLoop", true, 40, nil, +1); // Spawn some chests with items around the map. for (var i = 0; i < 10; i++) diff --git a/planet/Parkour.ocf/VolcanoEscapeEx.ocs/BigVolcano.ocd/Script.c b/planet/Parkour.ocf/VolcanoEscapeEx.ocs/BigVolcano.ocd/Script.c index 914cd5b81..68069d33e 100644 --- a/planet/Parkour.ocf/VolcanoEscapeEx.ocs/BigVolcano.ocd/Script.c +++ b/planet/Parkour.ocf/VolcanoEscapeEx.ocs/BigVolcano.ocd/Script.c @@ -113,7 +113,7 @@ func Execute() // gfx var particle_speed = blast_size * 3; CreateParticle("FireDense", PV_Random(x - 1, x + 1), PV_Random(y - 4, y - 2), PV_Random(-particle_speed, particle_speed), PV_Random(-particle_speed, particle_speed), PV_Random(30, 40), Particles_Fire(), 5); - if (!Random(5)) SoundAt("RockHit*", x,y-3, 100); + if (!Random(5)) SoundAt("Hits::Materials::Rock::RockHit*", x,y-3, 100); } else if (speed <=50) { diff --git a/planet/Sound.ocg/ChippieBite1.wav b/planet/Sound.ocg/Animals.ocg/Chippie.ocg/Bite1.wav similarity index 100% rename from planet/Sound.ocg/ChippieBite1.wav rename to planet/Sound.ocg/Animals.ocg/Chippie.ocg/Bite1.wav diff --git a/planet/Sound.ocg/ChippieBite2.wav b/planet/Sound.ocg/Animals.ocg/Chippie.ocg/Bite2.wav similarity index 100% rename from planet/Sound.ocg/ChippieBite2.wav rename to planet/Sound.ocg/Animals.ocg/Chippie.ocg/Bite2.wav diff --git a/planet/Sound.ocg/ChippieChirp1.wav b/planet/Sound.ocg/Animals.ocg/Chippie.ocg/Chirp1.wav similarity index 100% rename from planet/Sound.ocg/ChippieChirp1.wav rename to planet/Sound.ocg/Animals.ocg/Chippie.ocg/Chirp1.wav diff --git a/planet/Sound.ocg/ChippieChirp2.wav b/planet/Sound.ocg/Animals.ocg/Chippie.ocg/Chirp2.wav similarity index 100% rename from planet/Sound.ocg/ChippieChirp2.wav rename to planet/Sound.ocg/Animals.ocg/Chippie.ocg/Chirp2.wav diff --git a/planet/Sound.ocg/ChippieChirp3.wav b/planet/Sound.ocg/Animals.ocg/Chippie.ocg/Chirp3.wav similarity index 100% rename from planet/Sound.ocg/ChippieChirp3.wav rename to planet/Sound.ocg/Animals.ocg/Chippie.ocg/Chirp3.wav diff --git a/planet/Sound.ocg/ChippieTalk1.wav b/planet/Sound.ocg/Animals.ocg/Chippie.ocg/Talk1.wav similarity index 100% rename from planet/Sound.ocg/ChippieTalk1.wav rename to planet/Sound.ocg/Animals.ocg/Chippie.ocg/Talk1.wav diff --git a/planet/Sound.ocg/ChippieTalk2.wav b/planet/Sound.ocg/Animals.ocg/Chippie.ocg/Talk2.wav similarity index 100% rename from planet/Sound.ocg/ChippieTalk2.wav rename to planet/Sound.ocg/Animals.ocg/Chippie.ocg/Talk2.wav diff --git a/planet/Sound.ocg/FishMunch1.ogg b/planet/Sound.ocg/Animals.ocg/Fish.ocg/Munch1.ogg similarity index 100% rename from planet/Sound.ocg/FishMunch1.ogg rename to planet/Sound.ocg/Animals.ocg/Fish.ocg/Munch1.ogg diff --git a/planet/Sound.ocg/MonsterDie.wav b/planet/Sound.ocg/Animals.ocg/Monster.ocg/Die.wav similarity index 100% rename from planet/Sound.ocg/MonsterDie.wav rename to planet/Sound.ocg/Animals.ocg/Monster.ocg/Die.wav diff --git a/planet/Sound.ocg/MonsterGrowl1.wav b/planet/Sound.ocg/Animals.ocg/Monster.ocg/Growl1.wav similarity index 100% rename from planet/Sound.ocg/MonsterGrowl1.wav rename to planet/Sound.ocg/Animals.ocg/Monster.ocg/Growl1.wav diff --git a/planet/Sound.ocg/MonsterGrowl2.wav b/planet/Sound.ocg/Animals.ocg/Monster.ocg/Growl2.wav similarity index 100% rename from planet/Sound.ocg/MonsterGrowl2.wav rename to planet/Sound.ocg/Animals.ocg/Monster.ocg/Growl2.wav diff --git a/planet/Sound.ocg/MonsterGrowl3.wav b/planet/Sound.ocg/Animals.ocg/Monster.ocg/Growl3.wav similarity index 100% rename from planet/Sound.ocg/MonsterGrowl3.wav rename to planet/Sound.ocg/Animals.ocg/Monster.ocg/Growl3.wav diff --git a/planet/Sound.ocg/MosquitoBuzz.ogg b/planet/Sound.ocg/Animals.ocg/MosquitoBuzz.ogg similarity index 100% rename from planet/Sound.ocg/MosquitoBuzz.ogg rename to planet/Sound.ocg/Animals.ocg/MosquitoBuzz.ogg diff --git a/planet/Sound.ocg/PukaDie.wav b/planet/Sound.ocg/Animals.ocg/Puka.ocg/Die.wav similarity index 100% rename from planet/Sound.ocg/PukaDie.wav rename to planet/Sound.ocg/Animals.ocg/Puka.ocg/Die.wav diff --git a/planet/Sound.ocg/PukaGulp.wav b/planet/Sound.ocg/Animals.ocg/Puka.ocg/Gulp.wav similarity index 100% rename from planet/Sound.ocg/PukaGulp.wav rename to planet/Sound.ocg/Animals.ocg/Puka.ocg/Gulp.wav diff --git a/planet/Sound.ocg/PukaHiss1.wav b/planet/Sound.ocg/Animals.ocg/Puka.ocg/Hiss1.wav similarity index 100% rename from planet/Sound.ocg/PukaHiss1.wav rename to planet/Sound.ocg/Animals.ocg/Puka.ocg/Hiss1.wav diff --git a/planet/Sound.ocg/PukaHiss2.wav b/planet/Sound.ocg/Animals.ocg/Puka.ocg/Hiss2.wav similarity index 100% rename from planet/Sound.ocg/PukaHiss2.wav rename to planet/Sound.ocg/Animals.ocg/Puka.ocg/Hiss2.wav diff --git a/planet/Sound.ocg/PukaHurt1.wav b/planet/Sound.ocg/Animals.ocg/Puka.ocg/Hurt1.wav similarity index 100% rename from planet/Sound.ocg/PukaHurt1.wav rename to planet/Sound.ocg/Animals.ocg/Puka.ocg/Hurt1.wav diff --git a/planet/Sound.ocg/PukaHurt2.wav b/planet/Sound.ocg/Animals.ocg/Puka.ocg/Hurt2.wav similarity index 100% rename from planet/Sound.ocg/PukaHurt2.wav rename to planet/Sound.ocg/Animals.ocg/Puka.ocg/Hurt2.wav diff --git a/planet/Sound.ocg/PukaHurt3.wav b/planet/Sound.ocg/Animals.ocg/Puka.ocg/Hurt3.wav similarity index 100% rename from planet/Sound.ocg/PukaHurt3.wav rename to planet/Sound.ocg/Animals.ocg/Puka.ocg/Hurt3.wav diff --git a/planet/Sound.ocg/PukaHurt3b.wav b/planet/Sound.ocg/Animals.ocg/Puka.ocg/Hurt4.wav similarity index 100% rename from planet/Sound.ocg/PukaHurt3b.wav rename to planet/Sound.ocg/Animals.ocg/Puka.ocg/Hurt4.wav diff --git a/planet/Sound.ocg/PukaTeleportIn.wav b/planet/Sound.ocg/Animals.ocg/Puka.ocg/TeleportIn.wav similarity index 100% rename from planet/Sound.ocg/PukaTeleportIn.wav rename to planet/Sound.ocg/Animals.ocg/Puka.ocg/TeleportIn.wav diff --git a/planet/Sound.ocg/PukaTeleportOut.wav b/planet/Sound.ocg/Animals.ocg/Puka.ocg/TeleportOut.wav similarity index 100% rename from planet/Sound.ocg/PukaTeleportOut.wav rename to planet/Sound.ocg/Animals.ocg/Puka.ocg/TeleportOut.wav diff --git a/planet/Sound.ocg/WipfAroof.wav b/planet/Sound.ocg/Animals.ocg/Wipf.ocg/Aroof.wav similarity index 100% rename from planet/Sound.ocg/WipfAroof.wav rename to planet/Sound.ocg/Animals.ocg/Wipf.ocg/Aroof.wav diff --git a/planet/Sound.ocg/Snuff1.wav b/planet/Sound.ocg/Animals.ocg/Wipf.ocg/Snuff1.wav similarity index 100% rename from planet/Sound.ocg/Snuff1.wav rename to planet/Sound.ocg/Animals.ocg/Wipf.ocg/Snuff1.wav diff --git a/planet/Sound.ocg/Snuff2.wav b/planet/Sound.ocg/Animals.ocg/Wipf.ocg/Snuff2.wav similarity index 100% rename from planet/Sound.ocg/Snuff2.wav rename to planet/Sound.ocg/Animals.ocg/Wipf.ocg/Snuff2.wav diff --git a/planet/Sound.ocg/Weep1.wav b/planet/Sound.ocg/Animals.ocg/Wipf.ocg/Weep1.wav similarity index 100% rename from planet/Sound.ocg/Weep1.wav rename to planet/Sound.ocg/Animals.ocg/Wipf.ocg/Weep1.wav diff --git a/planet/Sound.ocg/Weep2.wav b/planet/Sound.ocg/Animals.ocg/Wipf.ocg/Weep2.wav similarity index 100% rename from planet/Sound.ocg/Weep2.wav rename to planet/Sound.ocg/Animals.ocg/Wipf.ocg/Weep2.wav diff --git a/planet/Sound.ocg/WipfWhine.wav b/planet/Sound.ocg/Animals.ocg/Wipf.ocg/Whine.wav similarity index 100% rename from planet/Sound.ocg/WipfWhine.wav rename to planet/Sound.ocg/Animals.ocg/Wipf.ocg/Whine.wav diff --git a/planet/Sound.ocg/Zap1.ogg b/planet/Sound.ocg/Animals.ocg/Zap.ocg/Zap1.ogg similarity index 100% rename from planet/Sound.ocg/Zap1.ogg rename to planet/Sound.ocg/Animals.ocg/Zap.ocg/Zap1.ogg diff --git a/planet/Sound.ocg/Zap2.ogg b/planet/Sound.ocg/Animals.ocg/Zap.ocg/Zap2.ogg similarity index 100% rename from planet/Sound.ocg/Zap2.ogg rename to planet/Sound.ocg/Animals.ocg/Zap.ocg/Zap2.ogg diff --git a/planet/Sound.ocg/Zap3.ogg b/planet/Sound.ocg/Animals.ocg/Zap.ocg/Zap3.ogg similarity index 100% rename from planet/Sound.ocg/Zap3.ogg rename to planet/Sound.ocg/Animals.ocg/Zap.ocg/Zap3.ogg diff --git a/planet/Sound.ocg/Zap4.ogg b/planet/Sound.ocg/Animals.ocg/Zap.ocg/Zap4.ogg similarity index 100% rename from planet/Sound.ocg/Zap4.ogg rename to planet/Sound.ocg/Animals.ocg/Zap.ocg/Zap4.ogg diff --git a/planet/Sound.ocg/Breathing.wav b/planet/Sound.ocg/Clonk.ocg/Action.ocg/Breathing.wav similarity index 100% rename from planet/Sound.ocg/Breathing.wav rename to planet/Sound.ocg/Clonk.ocg/Action.ocg/Breathing.wav diff --git a/planet/Sound.ocg/Dig1.wav b/planet/Sound.ocg/Clonk.ocg/Action.ocg/Dig.ocg/Dig1.wav similarity index 100% rename from planet/Sound.ocg/Dig1.wav rename to planet/Sound.ocg/Clonk.ocg/Action.ocg/Dig.ocg/Dig1.wav diff --git a/planet/Sound.ocg/Dig2.wav b/planet/Sound.ocg/Clonk.ocg/Action.ocg/Dig.ocg/Dig2.wav similarity index 100% rename from planet/Sound.ocg/Dig2.wav rename to planet/Sound.ocg/Clonk.ocg/Action.ocg/Dig.ocg/Dig2.wav diff --git a/planet/Sound.ocg/Dig3.wav b/planet/Sound.ocg/Clonk.ocg/Action.ocg/Dig.ocg/Dig3.wav similarity index 100% rename from planet/Sound.ocg/Dig3.wav rename to planet/Sound.ocg/Clonk.ocg/Action.ocg/Dig.ocg/Dig3.wav diff --git a/planet/Sound.ocg/Dig4.wav b/planet/Sound.ocg/Clonk.ocg/Action.ocg/Dig.ocg/Dig4.wav similarity index 100% rename from planet/Sound.ocg/Dig4.wav rename to planet/Sound.ocg/Clonk.ocg/Action.ocg/Dig.ocg/Dig4.wav diff --git a/planet/Sound.ocg/Dig5.wav b/planet/Sound.ocg/Clonk.ocg/Action.ocg/Dig.ocg/Dig5.wav similarity index 100% rename from planet/Sound.ocg/Dig5.wav rename to planet/Sound.ocg/Clonk.ocg/Action.ocg/Dig.ocg/Dig5.wav diff --git a/planet/Sound.ocg/Munch1.ogg b/planet/Sound.ocg/Clonk.ocg/Action.ocg/Munch1.ogg similarity index 100% rename from planet/Sound.ocg/Munch1.ogg rename to planet/Sound.ocg/Clonk.ocg/Action.ocg/Munch1.ogg diff --git a/planet/Sound.ocg/Roll.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/Roll.ogg similarity index 100% rename from planet/Sound.ocg/Roll.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/Roll.ogg diff --git a/planet/Sound.ocg/Rustle1.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/Rustle1.ogg similarity index 100% rename from planet/Sound.ocg/Rustle1.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/Rustle1.ogg diff --git a/planet/Sound.ocg/Rustle2.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/Rustle2.ogg similarity index 100% rename from planet/Sound.ocg/Rustle2.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/Rustle2.ogg diff --git a/planet/Sound.ocg/Rustle3.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/Rustle3.ogg similarity index 100% rename from planet/Sound.ocg/Rustle3.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/Rustle3.ogg diff --git a/planet/Sound.ocg/Rustle4.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/Rustle4.ogg similarity index 100% rename from planet/Sound.ocg/Rustle4.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/Rustle4.ogg diff --git a/planet/Sound.ocg/RustleLand.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/RustleLand.ogg similarity index 100% rename from planet/Sound.ocg/RustleLand.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/RustleLand.ogg diff --git a/planet/Sound.ocg/StepHard1.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepHard1.ogg similarity index 100% rename from planet/Sound.ocg/StepHard1.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepHard1.ogg diff --git a/planet/Sound.ocg/StepHard2.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepHard2.ogg similarity index 100% rename from planet/Sound.ocg/StepHard2.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepHard2.ogg diff --git a/planet/Sound.ocg/StepHard3.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepHard3.ogg similarity index 100% rename from planet/Sound.ocg/StepHard3.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepHard3.ogg diff --git a/planet/Sound.ocg/StepHard4.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepHard4.ogg similarity index 100% rename from planet/Sound.ocg/StepHard4.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepHard4.ogg diff --git a/planet/Sound.ocg/StepHard5.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepHard5.ogg similarity index 100% rename from planet/Sound.ocg/StepHard5.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepHard5.ogg diff --git a/planet/Sound.ocg/StepSoft1.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepSoft1.ogg similarity index 100% rename from planet/Sound.ocg/StepSoft1.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepSoft1.ogg diff --git a/planet/Sound.ocg/StepSoft2.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepSoft2.ogg similarity index 100% rename from planet/Sound.ocg/StepSoft2.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepSoft2.ogg diff --git a/planet/Sound.ocg/StepSoft3.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepSoft3.ogg similarity index 100% rename from planet/Sound.ocg/StepSoft3.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepSoft3.ogg diff --git a/planet/Sound.ocg/StepSoft4.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepSoft4.ogg similarity index 100% rename from planet/Sound.ocg/StepSoft4.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepSoft4.ogg diff --git a/planet/Sound.ocg/StepSoft5.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepSoft5.ogg similarity index 100% rename from planet/Sound.ocg/StepSoft5.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepSoft5.ogg diff --git a/planet/Sound.ocg/StepSoft6.ogg b/planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepSoft6.ogg similarity index 100% rename from planet/Sound.ocg/StepSoft6.ogg rename to planet/Sound.ocg/Clonk.ocg/Movement.ocg/StepSoft6.ogg diff --git a/planet/Sound.ocg/Confirm1.wav b/planet/Sound.ocg/Clonk.ocg/Verbal.ocg/Confirm1.wav similarity index 100% rename from planet/Sound.ocg/Confirm1.wav rename to planet/Sound.ocg/Clonk.ocg/Verbal.ocg/Confirm1.wav diff --git a/planet/Sound.ocg/Confirm2.wav b/planet/Sound.ocg/Clonk.ocg/Verbal.ocg/Confirm2.wav similarity index 100% rename from planet/Sound.ocg/Confirm2.wav rename to planet/Sound.ocg/Clonk.ocg/Verbal.ocg/Confirm2.wav diff --git a/planet/Sound.ocg/Confirm3.wav b/planet/Sound.ocg/Clonk.ocg/Verbal.ocg/Confirm3.wav similarity index 100% rename from planet/Sound.ocg/Confirm3.wav rename to planet/Sound.ocg/Clonk.ocg/Verbal.ocg/Confirm3.wav diff --git a/planet/Sound.ocg/Die.wav b/planet/Sound.ocg/Clonk.ocg/Verbal.ocg/Die.wav similarity index 100% rename from planet/Sound.ocg/Die.wav rename to planet/Sound.ocg/Clonk.ocg/Verbal.ocg/Die.wav diff --git a/planet/Sound.ocg/FDie.ogg b/planet/Sound.ocg/Clonk.ocg/Verbal.ocg/FDie.ogg similarity index 100% rename from planet/Sound.ocg/FDie.ogg rename to planet/Sound.ocg/Clonk.ocg/Verbal.ocg/FDie.ogg diff --git a/planet/Sound.ocg/FHurt1.ogg b/planet/Sound.ocg/Clonk.ocg/Verbal.ocg/FHurt1.ogg similarity index 100% rename from planet/Sound.ocg/FHurt1.ogg rename to planet/Sound.ocg/Clonk.ocg/Verbal.ocg/FHurt1.ogg diff --git a/planet/Sound.ocg/FHurt2.ogg b/planet/Sound.ocg/Clonk.ocg/Verbal.ocg/FHurt2.ogg similarity index 100% rename from planet/Sound.ocg/FHurt2.ogg rename to planet/Sound.ocg/Clonk.ocg/Verbal.ocg/FHurt2.ogg diff --git a/planet/Sound.ocg/Hurt1.wav b/planet/Sound.ocg/Clonk.ocg/Verbal.ocg/Hurt1.wav similarity index 100% rename from planet/Sound.ocg/Hurt1.wav rename to planet/Sound.ocg/Clonk.ocg/Verbal.ocg/Hurt1.wav diff --git a/planet/Sound.ocg/Hurt2.wav b/planet/Sound.ocg/Clonk.ocg/Verbal.ocg/Hurt2.wav similarity index 100% rename from planet/Sound.ocg/Hurt2.wav rename to planet/Sound.ocg/Clonk.ocg/Verbal.ocg/Hurt2.wav diff --git a/planet/Sound.ocg/BirdsLoop.ogg b/planet/Sound.ocg/Environment.ocg/BirdsLoop.ogg similarity index 100% rename from planet/Sound.ocg/BirdsLoop.ogg rename to planet/Sound.ocg/Environment.ocg/BirdsLoop.ogg diff --git a/planet/Sound.ocg/Earthquake.ogg b/planet/Sound.ocg/Environment.ocg/Disasters.ocg/Earthquake.ogg similarity index 100% rename from planet/Sound.ocg/Earthquake.ogg rename to planet/Sound.ocg/Environment.ocg/Disasters.ocg/Earthquake.ogg diff --git a/planet/Sound.ocg/EarthquakeEnd.ogg b/planet/Sound.ocg/Environment.ocg/Disasters.ocg/EarthquakeEnd.ogg similarity index 100% rename from planet/Sound.ocg/EarthquakeEnd.ogg rename to planet/Sound.ocg/Environment.ocg/Disasters.ocg/EarthquakeEnd.ogg diff --git a/planet/Sound.ocg/Chop1.wav b/planet/Sound.ocg/Environment.ocg/Tree.ocg/Chop1.wav similarity index 100% rename from planet/Sound.ocg/Chop1.wav rename to planet/Sound.ocg/Environment.ocg/Tree.ocg/Chop1.wav diff --git a/planet/Sound.ocg/Chop2.wav b/planet/Sound.ocg/Environment.ocg/Tree.ocg/Chop2.wav similarity index 100% rename from planet/Sound.ocg/Chop2.wav rename to planet/Sound.ocg/Environment.ocg/Tree.ocg/Chop2.wav diff --git a/planet/Sound.ocg/Chop3.wav b/planet/Sound.ocg/Environment.ocg/Tree.ocg/Chop3.wav similarity index 100% rename from planet/Sound.ocg/Chop3.wav rename to planet/Sound.ocg/Environment.ocg/Tree.ocg/Chop3.wav diff --git a/planet/Sound.ocg/Chop4.wav b/planet/Sound.ocg/Environment.ocg/Tree.ocg/Chop4.wav similarity index 100% rename from planet/Sound.ocg/Chop4.wav rename to planet/Sound.ocg/Environment.ocg/Tree.ocg/Chop4.wav diff --git a/planet/Sound.ocg/Chop5.wav b/planet/Sound.ocg/Environment.ocg/Tree.ocg/Chop5.wav similarity index 100% rename from planet/Sound.ocg/Chop5.wav rename to planet/Sound.ocg/Environment.ocg/Tree.ocg/Chop5.wav diff --git a/planet/Sound.ocg/TreeCrack.ogg b/planet/Sound.ocg/Environment.ocg/Tree.ocg/Crack.ogg similarity index 100% rename from planet/Sound.ocg/TreeCrack.ogg rename to planet/Sound.ocg/Environment.ocg/Tree.ocg/Crack.ogg diff --git a/planet/Sound.ocg/TreeLanding.ogg b/planet/Sound.ocg/Environment.ocg/Tree.ocg/Landing.ogg similarity index 100% rename from planet/Sound.ocg/TreeLanding.ogg rename to planet/Sound.ocg/Environment.ocg/Tree.ocg/Landing.ogg diff --git a/planet/Sound.ocg/Waterfall.ogg b/planet/Sound.ocg/Environment.ocg/Waterfall.ogg similarity index 100% rename from planet/Sound.ocg/Waterfall.ogg rename to planet/Sound.ocg/Environment.ocg/Waterfall.ogg diff --git a/planet/Sound.ocg/WindLoop.ogg b/planet/Sound.ocg/Environment.ocg/WindLoop.ogg similarity index 100% rename from planet/Sound.ocg/WindLoop.ogg rename to planet/Sound.ocg/Environment.ocg/WindLoop.ogg diff --git a/planet/Sound.ocg/Blast1.wav b/planet/Sound.ocg/Fire.ocg/Blast1.wav similarity index 100% rename from planet/Sound.ocg/Blast1.wav rename to planet/Sound.ocg/Fire.ocg/Blast1.wav diff --git a/planet/Sound.ocg/Blast2.wav b/planet/Sound.ocg/Fire.ocg/Blast2.wav similarity index 100% rename from planet/Sound.ocg/Blast2.wav rename to planet/Sound.ocg/Fire.ocg/Blast2.wav diff --git a/planet/Sound.ocg/Blast3.wav b/planet/Sound.ocg/Fire.ocg/Blast3.wav similarity index 100% rename from planet/Sound.ocg/Blast3.wav rename to planet/Sound.ocg/Fire.ocg/Blast3.wav diff --git a/planet/Sound.ocg/BlastFirework.ogg b/planet/Sound.ocg/Fire.ocg/BlastFirework.ogg similarity index 100% rename from planet/Sound.ocg/BlastFirework.ogg rename to planet/Sound.ocg/Fire.ocg/BlastFirework.ogg diff --git a/planet/Sound.ocg/BlastLiquid1.ogg b/planet/Sound.ocg/Fire.ocg/BlastLiquid1.ogg similarity index 100% rename from planet/Sound.ocg/BlastLiquid1.ogg rename to planet/Sound.ocg/Fire.ocg/BlastLiquid1.ogg diff --git a/planet/Sound.ocg/BlastLiquid2.ogg b/planet/Sound.ocg/Fire.ocg/BlastLiquid2.ogg similarity index 100% rename from planet/Sound.ocg/BlastLiquid2.ogg rename to planet/Sound.ocg/Fire.ocg/BlastLiquid2.ogg diff --git a/planet/Sound.ocg/BlastMetal.ogg b/planet/Sound.ocg/Fire.ocg/BlastMetal.ogg similarity index 100% rename from planet/Sound.ocg/BlastMetal.ogg rename to planet/Sound.ocg/Fire.ocg/BlastMetal.ogg diff --git a/planet/Sound.ocg/Blowout.ogg b/planet/Sound.ocg/Fire.ocg/Blowout.ogg similarity index 100% rename from planet/Sound.ocg/Blowout.ogg rename to planet/Sound.ocg/Fire.ocg/Blowout.ogg diff --git a/planet/Sound.ocg/Cracker.ogg b/planet/Sound.ocg/Fire.ocg/Cracker.ogg similarity index 100% rename from planet/Sound.ocg/Cracker.ogg rename to planet/Sound.ocg/Fire.ocg/Cracker.ogg diff --git a/planet/Sound.ocg/Fire.ogg b/planet/Sound.ocg/Fire.ocg/Fire.ogg similarity index 100% rename from planet/Sound.ocg/Fire.ogg rename to planet/Sound.ocg/Fire.ocg/Fire.ogg diff --git a/planet/Sound.ocg/Fireball.ogg b/planet/Sound.ocg/Fire.ocg/Fireball.ogg similarity index 100% rename from planet/Sound.ocg/Fireball.ogg rename to planet/Sound.ocg/Fire.ocg/Fireball.ogg diff --git a/planet/Sound.ocg/Fuse.ogg b/planet/Sound.ocg/Fire.ocg/Fuse.ogg similarity index 100% rename from planet/Sound.ocg/Fuse.ogg rename to planet/Sound.ocg/Fire.ocg/Fuse.ogg diff --git a/planet/Sound.ocg/FuseLoop.ogg b/planet/Sound.ocg/Fire.ocg/FuseLoop.ogg similarity index 100% rename from planet/Sound.ocg/FuseLoop.ogg rename to planet/Sound.ocg/Fire.ocg/FuseLoop.ogg diff --git a/planet/Sound.ocg/FuseShort.ogg b/planet/Sound.ocg/Fire.ocg/FuseShort.ogg similarity index 100% rename from planet/Sound.ocg/FuseShort.ogg rename to planet/Sound.ocg/Fire.ocg/FuseShort.ogg diff --git a/planet/Sound.ocg/Inflame.ogg b/planet/Sound.ocg/Fire.ocg/Inflame.ogg similarity index 100% rename from planet/Sound.ocg/Inflame.ogg rename to planet/Sound.ocg/Fire.ocg/Inflame.ogg diff --git a/planet/Sound.ocg/Smoke.wav b/planet/Sound.ocg/Fire.ocg/Smoke.wav similarity index 100% rename from planet/Sound.ocg/Smoke.wav rename to planet/Sound.ocg/Fire.ocg/Smoke.wav diff --git a/planet/Sound.ocg/GeneralHit1.ogg b/planet/Sound.ocg/Hits.ocg/GeneralHit1.ogg similarity index 100% rename from planet/Sound.ocg/GeneralHit1.ogg rename to planet/Sound.ocg/Hits.ocg/GeneralHit1.ogg diff --git a/planet/Sound.ocg/GeneralHit2.ogg b/planet/Sound.ocg/Hits.ocg/GeneralHit2.ogg similarity index 100% rename from planet/Sound.ocg/GeneralHit2.ogg rename to planet/Sound.ocg/Hits.ocg/GeneralHit2.ogg diff --git a/planet/Sound.ocg/IceHit1.wav b/planet/Sound.ocg/Hits.ocg/IceHit1.wav similarity index 100% rename from planet/Sound.ocg/IceHit1.wav rename to planet/Sound.ocg/Hits.ocg/IceHit1.wav diff --git a/planet/Sound.ocg/IceHit2.wav b/planet/Sound.ocg/Hits.ocg/IceHit2.wav similarity index 100% rename from planet/Sound.ocg/IceHit2.wav rename to planet/Sound.ocg/Hits.ocg/IceHit2.wav diff --git a/planet/Sound.ocg/GlassBreak.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Glass.ocg/GlassBreak.ogg similarity index 100% rename from planet/Sound.ocg/GlassBreak.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Glass.ocg/GlassBreak.ogg diff --git a/planet/Sound.ocg/GlassHit1.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Glass.ocg/GlassHit1.ogg similarity index 100% rename from planet/Sound.ocg/GlassHit1.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Glass.ocg/GlassHit1.ogg diff --git a/planet/Sound.ocg/GlassHit2.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Glass.ocg/GlassHit2.ogg similarity index 100% rename from planet/Sound.ocg/GlassHit2.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Glass.ocg/GlassHit2.ogg diff --git a/planet/Sound.ocg/GlassShatter.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Glass.ocg/GlassShatter.ogg similarity index 100% rename from planet/Sound.ocg/GlassShatter.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Glass.ocg/GlassShatter.ogg diff --git a/planet/Sound.ocg/DullMetalHit1.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Metal.ocg/DullMetalHit1.ogg similarity index 100% rename from planet/Sound.ocg/DullMetalHit1.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Metal.ocg/DullMetalHit1.ogg diff --git a/planet/Sound.ocg/DullMetalHit2.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Metal.ocg/DullMetalHit2.ogg similarity index 100% rename from planet/Sound.ocg/DullMetalHit2.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Metal.ocg/DullMetalHit2.ogg diff --git a/planet/Sound.ocg/DullMetalHit3.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Metal.ocg/DullMetalHit3.ogg similarity index 100% rename from planet/Sound.ocg/DullMetalHit3.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Metal.ocg/DullMetalHit3.ogg diff --git a/planet/Sound.ocg/LightMetalHit1.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Metal.ocg/LightMetalHit1.ogg similarity index 100% rename from planet/Sound.ocg/LightMetalHit1.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Metal.ocg/LightMetalHit1.ogg diff --git a/planet/Sound.ocg/LightMetalHit2.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Metal.ocg/LightMetalHit2.ogg similarity index 100% rename from planet/Sound.ocg/LightMetalHit2.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Metal.ocg/LightMetalHit2.ogg diff --git a/planet/Sound.ocg/RockHit1.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Rock.ocg/RockHit1.ogg similarity index 100% rename from planet/Sound.ocg/RockHit1.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Rock.ocg/RockHit1.ogg diff --git a/planet/Sound.ocg/RockHit2.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Rock.ocg/RockHit2.ogg similarity index 100% rename from planet/Sound.ocg/RockHit2.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Rock.ocg/RockHit2.ogg diff --git a/planet/Sound.ocg/RockHit3.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Rock.ocg/RockHit3.ogg similarity index 100% rename from planet/Sound.ocg/RockHit3.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Rock.ocg/RockHit3.ogg diff --git a/planet/Sound.ocg/Rockfall1.wav b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Rock.ocg/Rockfall1.wav similarity index 100% rename from planet/Sound.ocg/Rockfall1.wav rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Rock.ocg/Rockfall1.wav diff --git a/planet/Sound.ocg/Rockfall2.wav b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Rock.ocg/Rockfall2.wav similarity index 100% rename from planet/Sound.ocg/Rockfall2.wav rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Rock.ocg/Rockfall2.wav diff --git a/planet/Sound.ocg/DullWoodHit1.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/DullWoodHit1.ogg similarity index 100% rename from planet/Sound.ocg/DullWoodHit1.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/DullWoodHit1.ogg diff --git a/planet/Sound.ocg/DullWoodHit2.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/DullWoodHit2.ogg similarity index 100% rename from planet/Sound.ocg/DullWoodHit2.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/DullWoodHit2.ogg diff --git a/planet/Sound.ocg/WoodCreak1.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/WoodCreak1.ogg similarity index 100% rename from planet/Sound.ocg/WoodCreak1.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/WoodCreak1.ogg diff --git a/planet/Sound.ocg/WoodCreak2.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/WoodCreak2.ogg similarity index 100% rename from planet/Sound.ocg/WoodCreak2.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/WoodCreak2.ogg diff --git a/planet/Sound.ocg/WoodCreak3.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/WoodCreak3.ogg similarity index 100% rename from planet/Sound.ocg/WoodCreak3.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/WoodCreak3.ogg diff --git a/planet/Sound.ocg/WoodHit1.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/WoodHit1.ogg similarity index 100% rename from planet/Sound.ocg/WoodHit1.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/WoodHit1.ogg diff --git a/planet/Sound.ocg/WoodHit2.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/WoodHit2.ogg similarity index 100% rename from planet/Sound.ocg/WoodHit2.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/WoodHit2.ogg diff --git a/planet/Sound.ocg/WoodHit3.ogg b/planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/WoodHit3.ogg similarity index 100% rename from planet/Sound.ocg/WoodHit3.ogg rename to planet/Sound.ocg/Hits.ocg/Materials.ocg/Wood.ocg/WoodHit3.ogg diff --git a/planet/Sound.ocg/OrganicHit1.ogg b/planet/Sound.ocg/Hits.ocg/OrganicHit1.ogg similarity index 100% rename from planet/Sound.ocg/OrganicHit1.ogg rename to planet/Sound.ocg/Hits.ocg/OrganicHit1.ogg diff --git a/planet/Sound.ocg/OrganicHit2.ogg b/planet/Sound.ocg/Hits.ocg/OrganicHit2.ogg similarity index 100% rename from planet/Sound.ocg/OrganicHit2.ogg rename to planet/Sound.ocg/Hits.ocg/OrganicHit2.ogg diff --git a/planet/Sound.ocg/ProjectileHitLiving1.ogg b/planet/Sound.ocg/Hits.ocg/ProjectileHitLiving1.ogg similarity index 100% rename from planet/Sound.ocg/ProjectileHitLiving1.ogg rename to planet/Sound.ocg/Hits.ocg/ProjectileHitLiving1.ogg diff --git a/planet/Sound.ocg/ProjectileHitLiving2.ogg b/planet/Sound.ocg/Hits.ocg/ProjectileHitLiving2.ogg similarity index 100% rename from planet/Sound.ocg/ProjectileHitLiving2.ogg rename to planet/Sound.ocg/Hits.ocg/ProjectileHitLiving2.ogg diff --git a/planet/Sound.ocg/SoftHit1.ogg b/planet/Sound.ocg/Hits.ocg/SoftHit1.ogg similarity index 100% rename from planet/Sound.ocg/SoftHit1.ogg rename to planet/Sound.ocg/Hits.ocg/SoftHit1.ogg diff --git a/planet/Sound.ocg/SoftHit2.ogg b/planet/Sound.ocg/Hits.ocg/SoftHit2.ogg similarity index 100% rename from planet/Sound.ocg/SoftHit2.ogg rename to planet/Sound.ocg/Hits.ocg/SoftHit2.ogg diff --git a/planet/Sound.ocg/SoftTouch1.ogg b/planet/Sound.ocg/Hits.ocg/SoftTouch1.ogg similarity index 100% rename from planet/Sound.ocg/SoftTouch1.ogg rename to planet/Sound.ocg/Hits.ocg/SoftTouch1.ogg diff --git a/planet/Sound.ocg/SoftTouch2.ogg b/planet/Sound.ocg/Hits.ocg/SoftTouch2.ogg similarity index 100% rename from planet/Sound.ocg/SoftTouch2.ogg rename to planet/Sound.ocg/Hits.ocg/SoftTouch2.ogg diff --git a/planet/Sound.ocg/Boiling.ogg b/planet/Sound.ocg/Liquids.ocg/Boiling.ogg similarity index 100% rename from planet/Sound.ocg/Boiling.ogg rename to planet/Sound.ocg/Liquids.ocg/Boiling.ogg diff --git a/planet/Sound.ocg/Bubble1.ogg b/planet/Sound.ocg/Liquids.ocg/Bubble1.ogg similarity index 100% rename from planet/Sound.ocg/Bubble1.ogg rename to planet/Sound.ocg/Liquids.ocg/Bubble1.ogg diff --git a/planet/Sound.ocg/Bubble2.ogg b/planet/Sound.ocg/Liquids.ocg/Bubble2.ogg similarity index 100% rename from planet/Sound.ocg/Bubble2.ogg rename to planet/Sound.ocg/Liquids.ocg/Bubble2.ogg diff --git a/planet/Sound.ocg/Bubble3.ogg b/planet/Sound.ocg/Liquids.ocg/Bubble3.ogg similarity index 100% rename from planet/Sound.ocg/Bubble3.ogg rename to planet/Sound.ocg/Liquids.ocg/Bubble3.ogg diff --git a/planet/Sound.ocg/Corrode.ogg b/planet/Sound.ocg/Liquids.ocg/Corrode.ogg similarity index 100% rename from planet/Sound.ocg/Corrode.ogg rename to planet/Sound.ocg/Liquids.ocg/Corrode.ogg diff --git a/planet/Sound.ocg/Pshshsh.ogg b/planet/Sound.ocg/Liquids.ocg/Pshshsh.ogg similarity index 100% rename from planet/Sound.ocg/Pshshsh.ogg rename to planet/Sound.ocg/Liquids.ocg/Pshshsh.ogg diff --git a/planet/Sound.ocg/Sizzle.ogg b/planet/Sound.ocg/Liquids.ocg/Sizzle.ogg similarity index 100% rename from planet/Sound.ocg/Sizzle.ogg rename to planet/Sound.ocg/Liquids.ocg/Sizzle.ogg diff --git a/planet/Sound.ocg/SmokeSizzle.ogg b/planet/Sound.ocg/Liquids.ocg/SmokeSizzle.ogg similarity index 100% rename from planet/Sound.ocg/SmokeSizzle.ogg rename to planet/Sound.ocg/Liquids.ocg/SmokeSizzle.ogg diff --git a/planet/Sound.ocg/Splash1.wav b/planet/Sound.ocg/Liquids.ocg/Splash1.wav similarity index 100% rename from planet/Sound.ocg/Splash1.wav rename to planet/Sound.ocg/Liquids.ocg/Splash1.wav diff --git a/planet/Sound.ocg/Splash2.wav b/planet/Sound.ocg/Liquids.ocg/Splash2.wav similarity index 100% rename from planet/Sound.ocg/Splash2.wav rename to planet/Sound.ocg/Liquids.ocg/Splash2.wav diff --git a/planet/Sound.ocg/Splash3.wav b/planet/Sound.ocg/Liquids.ocg/Splash3.wav similarity index 100% rename from planet/Sound.ocg/Splash3.wav rename to planet/Sound.ocg/Liquids.ocg/Splash3.wav diff --git a/planet/Sound.ocg/Waterdrop1.wav b/planet/Sound.ocg/Liquids.ocg/Waterdrop1.wav similarity index 100% rename from planet/Sound.ocg/Waterdrop1.wav rename to planet/Sound.ocg/Liquids.ocg/Waterdrop1.wav diff --git a/planet/Sound.ocg/Waterdrop2.wav b/planet/Sound.ocg/Liquids.ocg/Waterdrop2.wav similarity index 100% rename from planet/Sound.ocg/Waterdrop2.wav rename to planet/Sound.ocg/Liquids.ocg/Waterdrop2.wav diff --git a/planet/Sound.ocg/ArrowHitGround.ogg b/planet/Sound.ocg/Objects.ocg/Arrow.ocg/HitGround.ogg similarity index 100% rename from planet/Sound.ocg/ArrowHitGround.ogg rename to planet/Sound.ocg/Objects.ocg/Arrow.ocg/HitGround.ogg diff --git a/planet/Sound.ocg/ArrowShoot1.ogg b/planet/Sound.ocg/Objects.ocg/Arrow.ocg/Shoot1.ogg similarity index 100% rename from planet/Sound.ocg/ArrowShoot1.ogg rename to planet/Sound.ocg/Objects.ocg/Arrow.ocg/Shoot1.ogg diff --git a/planet/Sound.ocg/ArrowShoot2.ogg b/planet/Sound.ocg/Objects.ocg/Arrow.ocg/Shoot2.ogg similarity index 100% rename from planet/Sound.ocg/ArrowShoot2.ogg rename to planet/Sound.ocg/Objects.ocg/Arrow.ocg/Shoot2.ogg diff --git a/planet/Sound.ocg/ArrowShoot3.ogg b/planet/Sound.ocg/Objects.ocg/Arrow.ocg/Shoot3.ogg similarity index 100% rename from planet/Sound.ocg/ArrowShoot3.ogg rename to planet/Sound.ocg/Objects.ocg/Arrow.ocg/Shoot3.ogg diff --git a/planet/Sound.ocg/BalloonInflate.wav b/planet/Sound.ocg/Objects.ocg/Balloon.ocg/Inflate.wav similarity index 100% rename from planet/Sound.ocg/BalloonInflate.wav rename to planet/Sound.ocg/Objects.ocg/Balloon.ocg/Inflate.wav diff --git a/planet/Sound.ocg/BalloonPop.wav b/planet/Sound.ocg/Objects.ocg/Balloon.ocg/Pop.wav similarity index 100% rename from planet/Sound.ocg/BalloonPop.wav rename to planet/Sound.ocg/Objects.ocg/Balloon.ocg/Pop.wav diff --git a/planet/Sound.ocg/BoompackFly.ogg b/planet/Sound.ocg/Objects.ocg/Boompack.ocg/Fly.ogg similarity index 100% rename from planet/Sound.ocg/BoompackFly.ogg rename to planet/Sound.ocg/Objects.ocg/Boompack.ocg/Fly.ogg diff --git a/planet/Sound.ocg/BoompackLaunch.ogg b/planet/Sound.ocg/Objects.ocg/Boompack.ocg/Launch.ogg similarity index 100% rename from planet/Sound.ocg/BoompackLaunch.ogg rename to planet/Sound.ocg/Objects.ocg/Boompack.ocg/Launch.ogg diff --git a/planet/Sound.ocg/Catapult_Launch.ogg b/planet/Sound.ocg/Objects.ocg/Catapult_Launch.ogg similarity index 100% rename from planet/Sound.ocg/Catapult_Launch.ogg rename to planet/Sound.ocg/Objects.ocg/Catapult_Launch.ogg diff --git a/planet/Sound.ocg/Clonk.ogg b/planet/Sound.ocg/Objects.ocg/Clonk.ogg similarity index 100% rename from planet/Sound.ocg/Clonk.ogg rename to planet/Sound.ocg/Objects.ocg/Clonk.ogg diff --git a/planet/Sound.ocg/Connect.ogg b/planet/Sound.ocg/Objects.ocg/Connect.ogg similarity index 100% rename from planet/Sound.ocg/Connect.ogg rename to planet/Sound.ocg/Objects.ocg/Connect.ogg diff --git a/planet/Sound.ocg/DiamondDigOut.ogg b/planet/Sound.ocg/Objects.ocg/DiamondDigOut.ogg similarity index 100% rename from planet/Sound.ocg/DiamondDigOut.ogg rename to planet/Sound.ocg/Objects.ocg/DiamondDigOut.ogg diff --git a/planet/Sound.ocg/Electrical.ogg b/planet/Sound.ocg/Objects.ocg/Electrical.ogg similarity index 100% rename from planet/Sound.ocg/Electrical.ogg rename to planet/Sound.ocg/Objects.ocg/Electrical.ogg diff --git a/planet/Sound.ocg/Clang1.wav b/planet/Sound.ocg/Objects.ocg/Pickaxe.ocg/Clang1.wav similarity index 100% rename from planet/Sound.ocg/Clang1.wav rename to planet/Sound.ocg/Objects.ocg/Pickaxe.ocg/Clang1.wav diff --git a/planet/Sound.ocg/Clang2.wav b/planet/Sound.ocg/Objects.ocg/Pickaxe.ocg/Clang2.wav similarity index 100% rename from planet/Sound.ocg/Clang2.wav rename to planet/Sound.ocg/Objects.ocg/Pickaxe.ocg/Clang2.wav diff --git a/planet/Sound.ocg/Clang3.wav b/planet/Sound.ocg/Objects.ocg/Pickaxe.ocg/Clang3.wav similarity index 100% rename from planet/Sound.ocg/Clang3.wav rename to planet/Sound.ocg/Objects.ocg/Pickaxe.ocg/Clang3.wav diff --git a/planet/Sound.ocg/PlaneCrash.ogg b/planet/Sound.ocg/Objects.ocg/Plane.ocg/PlaneCrash.ogg similarity index 100% rename from planet/Sound.ocg/PlaneCrash.ogg rename to planet/Sound.ocg/Objects.ocg/Plane.ocg/PlaneCrash.ogg diff --git a/planet/Sound.ocg/PropellerLoop.ogg b/planet/Sound.ocg/Objects.ocg/Plane.ocg/PropellerLoop.ogg similarity index 100% rename from planet/Sound.ocg/PropellerLoop.ogg rename to planet/Sound.ocg/Objects.ocg/Plane.ocg/PropellerLoop.ogg diff --git a/planet/Sound.ocg/WallKitClick.wav b/planet/Sound.ocg/Objects.ocg/WallKit.ocg/Click.wav similarity index 100% rename from planet/Sound.ocg/WallKitClick.wav rename to planet/Sound.ocg/Objects.ocg/WallKit.ocg/Click.wav diff --git a/planet/Sound.ocg/WallKitLock.wav b/planet/Sound.ocg/Objects.ocg/WallKit.ocg/Lock.wav similarity index 100% rename from planet/Sound.ocg/WallKitLock.wav rename to planet/Sound.ocg/Objects.ocg/WallKit.ocg/Lock.wav diff --git a/planet/Sound.ocg/DrawBow.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/Draw.ogg similarity index 100% rename from planet/Sound.ocg/DrawBow.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/Draw.ogg diff --git a/planet/Sound.ocg/GetArrow1.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/GetArrow1.ogg similarity index 100% rename from planet/Sound.ocg/GetArrow1.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/GetArrow1.ogg diff --git a/planet/Sound.ocg/GetArrow2.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/GetArrow2.ogg similarity index 100% rename from planet/Sound.ocg/GetArrow2.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/GetArrow2.ogg diff --git a/planet/Sound.ocg/BowLoad1.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/Load1.ogg similarity index 100% rename from planet/Sound.ocg/BowLoad1.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/Load1.ogg diff --git a/planet/Sound.ocg/BowLoad2.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/Load2.ogg similarity index 100% rename from planet/Sound.ocg/BowLoad2.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/Load2.ogg diff --git a/planet/Sound.ocg/PutAwayBow.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/PutAwayBow.ogg similarity index 100% rename from planet/Sound.ocg/PutAwayBow.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/PutAwayBow.ogg diff --git a/planet/Sound.ocg/BowShoot1.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/Shoot1.ogg similarity index 100% rename from planet/Sound.ocg/BowShoot1.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/Shoot1.ogg diff --git a/planet/Sound.ocg/BowShoot2.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/Shoot2.ogg similarity index 100% rename from planet/Sound.ocg/BowShoot2.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/Shoot2.ogg diff --git a/planet/Sound.ocg/BowShoot3.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/Shoot3.ogg similarity index 100% rename from planet/Sound.ocg/BowShoot3.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Bow.ocg/Shoot3.ogg diff --git a/planet/Sound.ocg/DrawJavelin.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Javelin.ocg/Draw.ogg similarity index 100% rename from planet/Sound.ocg/DrawJavelin.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Javelin.ocg/Draw.ogg diff --git a/planet/Sound.ocg/JavelinHitGround.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Javelin.ocg/HitGround.ogg similarity index 100% rename from planet/Sound.ocg/JavelinHitGround.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Javelin.ocg/HitGround.ogg diff --git a/planet/Sound.ocg/ThrowJavelin1.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Javelin.ocg/Throw1.ogg similarity index 100% rename from planet/Sound.ocg/ThrowJavelin1.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Javelin.ocg/Throw1.ogg diff --git a/planet/Sound.ocg/ThrowJavelin2.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Javelin.ocg/Throw2.ogg similarity index 100% rename from planet/Sound.ocg/ThrowJavelin2.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Javelin.ocg/Throw2.ogg diff --git a/planet/Sound.ocg/ThrowJavelin3.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Javelin.ocg/Throw3.ogg similarity index 100% rename from planet/Sound.ocg/ThrowJavelin3.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Javelin.ocg/Throw3.ogg diff --git a/planet/Sound.ocg/BulletHitGround1.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/BulletHitGround1.ogg similarity index 100% rename from planet/Sound.ocg/BulletHitGround1.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/BulletHitGround1.ogg diff --git a/planet/Sound.ocg/BulletHitGround2.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/BulletHitGround2.ogg similarity index 100% rename from planet/Sound.ocg/BulletHitGround2.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/BulletHitGround2.ogg diff --git a/planet/Sound.ocg/BulletHitGround3.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/BulletHitGround3.ogg similarity index 100% rename from planet/Sound.ocg/BulletHitGround3.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/BulletHitGround3.ogg diff --git a/planet/Sound.ocg/BulletShot1.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/BulletShot1.ogg similarity index 100% rename from planet/Sound.ocg/BulletShot1.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/BulletShot1.ogg diff --git a/planet/Sound.ocg/BulletShot2.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/BulletShot2.ogg similarity index 100% rename from planet/Sound.ocg/BulletShot2.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/BulletShot2.ogg diff --git a/planet/Sound.ocg/GunShoot1.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/GunShoot1.ogg similarity index 100% rename from planet/Sound.ocg/GunShoot1.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/GunShoot1.ogg diff --git a/planet/Sound.ocg/GunShoot2.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/GunShoot2.ogg similarity index 100% rename from planet/Sound.ocg/GunShoot2.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/GunShoot2.ogg diff --git a/planet/Sound.ocg/GunShoot3.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/GunShoot3.ogg similarity index 100% rename from planet/Sound.ocg/GunShoot3.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/GunShoot3.ogg diff --git a/planet/Sound.ocg/GunShoot4.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/GunShoot4.ogg similarity index 100% rename from planet/Sound.ocg/GunShoot4.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/GunShoot4.ogg diff --git a/planet/Sound.ocg/GunShoot5.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/GunShoot5.ogg similarity index 100% rename from planet/Sound.ocg/GunShoot5.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Musket.ocg/GunShoot5.ogg diff --git a/planet/Sound.ocg/ShieldMetalHit1.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/MetalHit1.ogg similarity index 100% rename from planet/Sound.ocg/ShieldMetalHit1.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/MetalHit1.ogg diff --git a/planet/Sound.ocg/ShieldMetalHit2.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/MetalHit2.ogg similarity index 100% rename from planet/Sound.ocg/ShieldMetalHit2.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/MetalHit2.ogg diff --git a/planet/Sound.ocg/ShieldMetalHit3.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/MetalHit3.ogg similarity index 100% rename from planet/Sound.ocg/ShieldMetalHit3.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/MetalHit3.ogg diff --git a/planet/Sound.ocg/ShieldMetalHit4.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/MetalHit4.ogg similarity index 100% rename from planet/Sound.ocg/ShieldMetalHit4.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/MetalHit4.ogg diff --git a/planet/Sound.ocg/WeaponHitShield.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/WeaponHitShield.ogg similarity index 100% rename from planet/Sound.ocg/WeaponHitShield.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/WeaponHitShield.ogg diff --git a/planet/Sound.ocg/ShieldWoodHit1.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/WoodHit1.ogg similarity index 100% rename from planet/Sound.ocg/ShieldWoodHit1.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/WoodHit1.ogg diff --git a/planet/Sound.ocg/ShieldWoodHit2.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/WoodHit2.ogg similarity index 100% rename from planet/Sound.ocg/ShieldWoodHit2.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/WoodHit2.ogg diff --git a/planet/Sound.ocg/ShieldWoodHit3.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/WoodHit3.ogg similarity index 100% rename from planet/Sound.ocg/ShieldWoodHit3.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/Shield.ocg/WoodHit3.ogg diff --git a/planet/Sound.ocg/WeaponHit1.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/WeaponHit1.ogg similarity index 100% rename from planet/Sound.ocg/WeaponHit1.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/WeaponHit1.ogg diff --git a/planet/Sound.ocg/WeaponHit2.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/WeaponHit2.ogg similarity index 100% rename from planet/Sound.ocg/WeaponHit2.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/WeaponHit2.ogg diff --git a/planet/Sound.ocg/WeaponHit3.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/WeaponHit3.ogg similarity index 100% rename from planet/Sound.ocg/WeaponHit3.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/WeaponHit3.ogg diff --git a/planet/Sound.ocg/WeaponSwing1.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/WeaponSwing1.ogg similarity index 100% rename from planet/Sound.ocg/WeaponSwing1.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/WeaponSwing1.ogg diff --git a/planet/Sound.ocg/WeaponSwing2.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/WeaponSwing2.ogg similarity index 100% rename from planet/Sound.ocg/WeaponSwing2.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/WeaponSwing2.ogg diff --git a/planet/Sound.ocg/WeaponSwing3.ogg b/planet/Sound.ocg/Objects.ocg/Weapons.ocg/WeaponSwing3.ogg similarity index 100% rename from planet/Sound.ocg/WeaponSwing3.ogg rename to planet/Sound.ocg/Objects.ocg/Weapons.ocg/WeaponSwing3.ogg diff --git a/planet/Sound.ocg/WindCharge.ogg b/planet/Sound.ocg/Objects.ocg/Windbag.ocg/Charge.ogg similarity index 100% rename from planet/Sound.ocg/WindCharge.ogg rename to planet/Sound.ocg/Objects.ocg/Windbag.ocg/Charge.ogg diff --git a/planet/Sound.ocg/WindChargeStop.ogg b/planet/Sound.ocg/Objects.ocg/Windbag.ocg/ChargeStop.ogg similarity index 100% rename from planet/Sound.ocg/WindChargeStop.ogg rename to planet/Sound.ocg/Objects.ocg/Windbag.ocg/ChargeStop.ogg diff --git a/planet/Sound.ocg/WindGust.ogg b/planet/Sound.ocg/Objects.ocg/Windbag.ocg/Gust.ogg similarity index 100% rename from planet/Sound.ocg/WindGust.ogg rename to planet/Sound.ocg/Objects.ocg/Windbag.ocg/Gust.ogg diff --git a/planet/Sound.ocg/ChestClose.ogg b/planet/Sound.ocg/Structures.ocg/Chest.ocg/Close.ogg similarity index 100% rename from planet/Sound.ocg/ChestClose.ogg rename to planet/Sound.ocg/Structures.ocg/Chest.ocg/Close.ogg diff --git a/planet/Sound.ocg/ChestOpen.ogg b/planet/Sound.ocg/Structures.ocg/Chest.ocg/Open.ogg similarity index 100% rename from planet/Sound.ocg/ChestOpen.ogg rename to planet/Sound.ocg/Structures.ocg/Chest.ocg/Open.ogg diff --git a/planet/Sound.ocg/ElevatorDrilling.ogg b/planet/Sound.ocg/Structures.ocg/Elevator.ocg/Drilling.ogg similarity index 100% rename from planet/Sound.ocg/ElevatorDrilling.ogg rename to planet/Sound.ocg/Structures.ocg/Elevator.ocg/Drilling.ogg diff --git a/planet/Sound.ocg/ElevatorMoving.ogg b/planet/Sound.ocg/Structures.ocg/Elevator.ocg/Moving.ogg similarity index 100% rename from planet/Sound.ocg/ElevatorMoving.ogg rename to planet/Sound.ocg/Structures.ocg/Elevator.ocg/Moving.ogg diff --git a/planet/Sound.ocg/ElevatorStart.ogg b/planet/Sound.ocg/Structures.ocg/Elevator.ocg/Start.ogg similarity index 100% rename from planet/Sound.ocg/ElevatorStart.ogg rename to planet/Sound.ocg/Structures.ocg/Elevator.ocg/Start.ogg diff --git a/planet/Sound.ocg/ElevatorStop.ogg b/planet/Sound.ocg/Structures.ocg/Elevator.ocg/Stop.ogg similarity index 100% rename from planet/Sound.ocg/ElevatorStop.ogg rename to planet/Sound.ocg/Structures.ocg/Elevator.ocg/Stop.ogg diff --git a/planet/Sound.ocg/FanLoop.ogg b/planet/Sound.ocg/Structures.ocg/FanLoop.ogg similarity index 100% rename from planet/Sound.ocg/FanLoop.ogg rename to planet/Sound.ocg/Structures.ocg/FanLoop.ogg diff --git a/planet/Sound.ocg/FurnaceLoop.ogg b/planet/Sound.ocg/Structures.ocg/Furnace.ocg/Loop.ogg similarity index 100% rename from planet/Sound.ocg/FurnaceLoop.ogg rename to planet/Sound.ocg/Structures.ocg/Furnace.ocg/Loop.ogg diff --git a/planet/Sound.ocg/FurnaceStart.ogg b/planet/Sound.ocg/Structures.ocg/Furnace.ocg/Start.ogg similarity index 100% rename from planet/Sound.ocg/FurnaceStart.ogg rename to planet/Sound.ocg/Structures.ocg/Furnace.ocg/Start.ogg diff --git a/planet/Sound.ocg/FurnaceStop.ogg b/planet/Sound.ocg/Structures.ocg/Furnace.ocg/Stop.ogg similarity index 100% rename from planet/Sound.ocg/FurnaceStop.ogg rename to planet/Sound.ocg/Structures.ocg/Furnace.ocg/Stop.ogg diff --git a/planet/Sound.ocg/HingeCreak1.ogg b/planet/Sound.ocg/Structures.ocg/HingeCreak1.ogg similarity index 100% rename from planet/Sound.ocg/HingeCreak1.ogg rename to planet/Sound.ocg/Structures.ocg/HingeCreak1.ogg diff --git a/planet/Sound.ocg/HingeCreak2.ogg b/planet/Sound.ocg/Structures.ocg/HingeCreak2.ogg similarity index 100% rename from planet/Sound.ocg/HingeCreak2.ogg rename to planet/Sound.ocg/Structures.ocg/HingeCreak2.ogg diff --git a/planet/Sound.ocg/HingeCreak3.ogg b/planet/Sound.ocg/Structures.ocg/HingeCreak3.ogg similarity index 100% rename from planet/Sound.ocg/HingeCreak3.ogg rename to planet/Sound.ocg/Structures.ocg/HingeCreak3.ogg diff --git a/planet/Sound.ocg/Pumpjack.ogg b/planet/Sound.ocg/Structures.ocg/Pumpjack.ogg similarity index 100% rename from planet/Sound.ocg/Pumpjack.ogg rename to planet/Sound.ocg/Structures.ocg/Pumpjack.ogg diff --git a/planet/Sound.ocg/SawmillRipcut.ogg b/planet/Sound.ocg/Structures.ocg/SawmillRipcut.ogg similarity index 100% rename from planet/Sound.ocg/SawmillRipcut.ogg rename to planet/Sound.ocg/Structures.ocg/SawmillRipcut.ogg diff --git a/planet/Sound.ocg/SteamEngine.ogg b/planet/Sound.ocg/Structures.ocg/SteamEngine.ogg similarity index 100% rename from planet/Sound.ocg/SteamEngine.ogg rename to planet/Sound.ocg/Structures.ocg/SteamEngine.ogg diff --git a/planet/Sound.ocg/Chain.ogg b/planet/Sound.ocg/Structures.ocg/StoneGate.ocg/Chain.ogg similarity index 100% rename from planet/Sound.ocg/Chain.ogg rename to planet/Sound.ocg/Structures.ocg/StoneGate.ocg/Chain.ogg diff --git a/planet/Sound.ocg/GateHit.ogg b/planet/Sound.ocg/Structures.ocg/StoneGate.ocg/GateHit.ogg similarity index 100% rename from planet/Sound.ocg/GateHit.ogg rename to planet/Sound.ocg/Structures.ocg/StoneGate.ocg/GateHit.ogg diff --git a/planet/Sound.ocg/GateMove.ogg b/planet/Sound.ocg/Structures.ocg/StoneGate.ocg/GateMove.ogg similarity index 100% rename from planet/Sound.ocg/GateMove.ogg rename to planet/Sound.ocg/Structures.ocg/StoneGate.ocg/GateMove.ogg diff --git a/planet/Sound.ocg/WheelsTurn.ogg b/planet/Sound.ocg/Structures.ocg/WheelsTurn.ogg similarity index 100% rename from planet/Sound.ocg/WheelsTurn.ogg rename to planet/Sound.ocg/Structures.ocg/WheelsTurn.ogg diff --git a/planet/Sound.ocg/Cash.ogg b/planet/Sound.ocg/UI.ocg/Cash.ogg similarity index 100% rename from planet/Sound.ocg/Cash.ogg rename to planet/Sound.ocg/UI.ocg/Cash.ogg diff --git a/planet/Sound.ocg/Cleared.ogg b/planet/Sound.ocg/UI.ocg/Cleared.ogg similarity index 100% rename from planet/Sound.ocg/Cleared.ogg rename to planet/Sound.ocg/UI.ocg/Cleared.ogg diff --git a/planet/Sound.ocg/Click.wav b/planet/Sound.ocg/UI.ocg/Click.wav similarity index 100% rename from planet/Sound.ocg/Click.wav rename to planet/Sound.ocg/UI.ocg/Click.wav diff --git a/planet/Sound.ocg/Click2.ogg b/planet/Sound.ocg/UI.ocg/Click2.ogg similarity index 100% rename from planet/Sound.ocg/Click2.ogg rename to planet/Sound.ocg/UI.ocg/Click2.ogg diff --git a/planet/Sound.ocg/CloseViewport.ogg b/planet/Sound.ocg/UI.ocg/CloseViewport.ogg similarity index 100% rename from planet/Sound.ocg/CloseViewport.ogg rename to planet/Sound.ocg/UI.ocg/CloseViewport.ogg diff --git a/planet/Sound.ocg/Ding.ogg b/planet/Sound.ocg/UI.ocg/Ding.ogg similarity index 100% rename from planet/Sound.ocg/Ding.ogg rename to planet/Sound.ocg/UI.ocg/Ding.ogg diff --git a/planet/Sound.ocg/Fanfare.wav b/planet/Sound.ocg/UI.ocg/Fanfare.wav similarity index 100% rename from planet/Sound.ocg/Fanfare.wav rename to planet/Sound.ocg/UI.ocg/Fanfare.wav diff --git a/planet/Sound.ocg/authors.txt b/planet/Sound.ocg/authors.txt index 4e8a73218..2f36d04bb 100644 --- a/planet/Sound.ocg/authors.txt +++ b/planet/Sound.ocg/authors.txt @@ -4,33 +4,34 @@ CC Attribution 3.0 license (http://creativecommons.org/licenses/by/3.0/) Author Work(s) =============================================================================== -Ringwaul - MonsterGrowl*, MonsterDie, Snuff*, WipfAroof, WipfWhine, ChestOpen, ChestClose, WindCharge*, WindGust, Clang* +Ringwaul - Monster/Growl*, Monster/Die, Wipf/Snuff*, Wipf/Aroof, Wipf/Whine, Chest/Open, Chest/Close + - Winbag/Charge, Winbag/ChargeStop, Winbag/Gust, Pickaxe/Clang1-3 +Checkmaty - ProjectileHitLiving*, Arrow/HitGround, Arrow/Shoot1/3, Bow/Draw, Bow/GetArrow1-2, Bow/Load1-2, Bow/PutAwayBow, Shoot1-3, + Javelin/Draw, Javelin/HitGround, Javelin/Throw1-3, WeaponHit1-3, WeaponSwing1-3, Shield/WeaponHitShield, Shield/MetalHit1-4, + Shield/WoodHit1-3, Musket/GunShot1-5, Musket/BulletShot1-2, Musket/BulletHitGround1-3 Clonkonaut - Confirm*, FDie -Checkmaty - ProjectileHitLiving*, Sword*, DrawJavelin*, ThrowJavelin*, JavelinHitGround, BulletHit*, - ShieldMetalHit*, ShieldWoodHit*, BowLoad*, BowShoot*, DrawBow*, PutAwayBow*, GunShoot*, - ArrowHitGround, ArrowShoot -ala - Bubble1-3, Zap1-4, GlassBreak, Rockfall1-2, Waterdrop1-2, OrganicHit1-2 - PukaGulp, PukaHiss1-2, PukaHurt1-3b - PukaTeleportIn/Out based on work by parnellij (CC0) - http://www.freesound.org/people/parnellij/sounds/74892/ - ChippieChirp1-3, ChippieTalk1-2, ChippieBite1-2 +Pullover aus Milch - PropellerLoop + dobroide - BirdsLoop (http://www.freesound.org/people/dobroide/sounds/54746/) -Benboncan - Blast*/BlastMetal (http://www.freesound.org/people/Benboncan/sounds/73005/) +Benboncan - Blast*, BlastMetal (http://www.freesound.org/people/Benboncan/sounds/73005/) Stickinthemud - Clonk (http://www.freesound.org/people/Stickinthemud/sounds/27526/) BlastMetal (http://www.freesound.org/people/Stickinthemud/sounds/27531/) Toby Knowles - Fanfare (http://www.freesound.org/people/tobyk/sounds/26198/) ERH - WindLoop (http://www.freesound.org/people/ERH/sounds/34338/) TicTacShutUp - Click (http://www.freesound.org/people/TicTacShutUp/sounds/406/) -CGEffex - Splash* (http://www.freesound.org/people/CGEffex/sounds/98335/) +CGEffex - Splash1-3 (http://www.freesound.org/people/CGEffex/sounds/98335/) Mirors_ - Pshshsh (http://www.freesound.org/people/Mirors_/sounds/81205/) juskiddink - SoftHit1 (http://www.freesound.org/people/juskiddink/sounds/108617/) jenc - BlastMetal (http://www.freesound.org/people/jenc/sounds/511/) -gelo_papas - BalloonInflate (http://www.freesound.org/people/gelo_papas/sounds/52070/) + - Elevator/Drilling (http://www.freesound.org/people/jenc/sounds/519/) +gelo_papas - Balloon/Inflate (http://www.freesound.org/people/gelo_papas/sounds/52070/) FreqMan - Cash (http://www.freesound.org/people/FreqMan/sounds/31377/) fresco - Munch1 (http://www.freesound.org/people/fresco/sounds/48933/) cambra - FanLoop (http://www.freesound.org/people/Cambra/sounds/102710/) Halleck - Electrical (http://www.freesound.org/people/Halleck/sounds/19483/) digifishmusic - LiquidBlast2 (http://www.freesound.org/people/digifishmusic/sounds/45439/) -HerbertBoland - WoodHit* (http://www.freesound.org/people/HerbertBoland/sounds/33206/) +HerbertBoland - WoodHit1-3 (http://www.freesound.org/people/HerbertBoland/sounds/33206/) + - Clonk/StepSoft1-6, Clonk/StepHard1-5 by HerbertBoland (http://www.freesound.org/people/HerbertBoland/sounds/31962/) Erdie - LightMetalHit1 (http://www.freesound.org/people/Erdie/sounds/27826/) Anton - DullWoodHit1 (http://www.freesound.org/people/Anton/sounds/1257/) CGEffex - Inflame (http://www.freesound.org/people/CGEffex/sounds/94102/) @@ -42,32 +43,33 @@ qubodup - Sizzle (http://www.freesound.org/people/qubodup/sounds/194635/ Aiwha - Ding (modified) (http://freesound.org/people/Aiwha/sounds/196106/) discokingmusic - Connect (http://www.freesound.org/people/discokingmusic/sounds/271387/) luffy - SmokeSizzle (https://www.freesound.org/people/luffy/sounds/17299/) -Pullover - PropellerLoop (aus Milch (EngineLoop)) -Sergenious - GateHit (http://www.freesound.org/people/Sergenious/sounds/55820/) -daveincamas - Chain (http://www.freesound.org/people/daveincamas/sounds/44076/) -Traveler - Pop (http://www.freesound.org/people/Traveler/sounds/16064/) -jenc - ElevatorDrilling (http://www.freesound.org/people/jenc/sounds/519/) -pempi - ElevatorMoving, ElevatorStart, ElevatorStop (http://www.freesound.org/people/pempi/sounds/33873/) -Stephen Hall - Dig* (http://www.freesound.org/people/shall555/sounds/72199/) +pempi - Elevator/Start, Elevator/Moving, Elevator/Stop (http://www.freesound.org/people/pempi/sounds/33873/) +Traveler - Pop (http://www.freesound.org/people/Traveler/sounds/16064/) +Pat - Clonk/Roll, Clonk/Rustle1-4, Clonk/RustleLand, (http://www.freesound.org/people/pwausc1/sounds/118259/) +Stephen Hall - Clonk/Dig1-5 (http://www.freesound.org/people/shall555/sounds/72199/) +broumbroum - Cleared (http://www.freesound.org/people/broumbroum/sounds/50565/) +Sergenious - StoneDoor/GateHit(http://www.freesound.org/people/Sergenious/sounds/55820/) +daveincamas - StoneDoor/Chain (http://www.freesound.org/people/daveincamas/sounds/44076/) +volivieri - Waterfall (http://www.freesound.org/people/volivieri/sounds/38390/) +Julien Matthey - Fireball (http://www.freesound.org/people/Julien%20Matthey/sounds/105016/) +Connum - GlassShatter (http://www.freesound.org/people/Connum/sounds/66520/) +sarge4267 - BlastFireworks (http://www.freesound.org/people/sarge4267/sounds/102720/?page=2#comment) +soundscalpel.com - BlastFireworks (http://www.freesound.org/people/soundscalpel.com/sounds/110391) +Christian James Muise - Tree/Chop1-5.wav (http://www.freesound.org/people/hazure/sounds/23700/) +primeval_polypod - Boompack/Fly (http://www.freesound.org/people/primeval_polypod/sounds/158894/) Sven2 - GateMove (adapted from GateHit), IceHit* (adapted from GlassHit*), PlaneCrash, DiamondDigOut (adapted from GlassHit), FishMunch1 (adapted from Munch), Wallkit*, OpenBuyMenu, CloseBuyMenu CloseViewport (based on WaterBottleBoing by empraetorius (https://freesound.org/people/empraetorius/sounds/201260/) Corrode (based on Pshshsh from Mirors_ http://www.freesound.org/people/Mirors_/sounds/81205/) -primeval_polypod- BoompackFly (http://www.freesound.org/people/primeval_polypod/sounds/158894/) (adapted) -soundscalpel.com, sarge4267 - BlastFirework (adapted from: http://www.freesound.org/people/soundscalpel.com/sounds/110391/, http://www.freesound.org/people/sarge4267/sounds/102720/) -Christian James Muise - Chop* (http://www.freesound.org/people/hazure/sounds/23700/) -broumbroum - Cleared (http://www.freesound.org/people/broumbroum/sounds/50565/) -volivieri - Waterfall (http://www.freesound.org/people/volivieri/sounds/38390/) -Pat - Roll, Rustle1, Rustle2, Rustle3, Rustle4, RustleLand (http://www.freesound.org/people/pwausc1/sounds/118259/) -HerbertBoland - StepSoft1, StepSoft2, StepSoft3, StepSoft4, StepSoft5, StepSoft6, StepHard1, StepHard2, StepHard3, StepHard4, StepHard5 (http://www.freesound.org/people/HerbertBoland/sounds/31962/) -Julien Matthey - Fireball (http://www.freesound.org/people/Julien%20Matthey/sounds/105016/) -Connum - GlassShatter (http://www.freesound.org/people/Connum/sounds/66520/) Zapper - Breathing +The following sounds use two sources: + + The following sound effects are licensed under the CC 0 license (public domain): -mrmayo - BalloonPop (http://www.freesound.org/people/mrmayo/sounds/77039/) +mrmayo - Balloon/Pop (http://www.freesound.org/people/mrmayo/sounds/77039/) adcbicycle - SoftTouch* (http://www.freesound.org/people/adcbicycle/sounds/13878/ and http://www.freesound.org/people/adcbicycle/sounds/13914/) - SoftHit2 (http://www.freesound.org/people/adcbicycle/sounds/13866/) - GeneralHit1 (http://www.freesound.org/people/adcbicycle/sounds/13860/) @@ -82,15 +84,16 @@ thecheeseman - Hurt*, Die (http://www.freesound.org/people/thecheeseman/) 110110010, - CatapultLaunch (http://www.freesound.org/people/110110010/sounds/66396/, http://www.freesound.org/people/schluppipuppie/sounds/12833/) schluppipuppie Oddworld - LiquidBlast1 (http://www.freesound.org/people/Oddworld/sounds/75328/) -mbezzola - RockHit* (http://www.freesound.org/people/mbezzola/sounds/105282/) +mbezzola - RockHit1-3 (http://www.freesound.org/people/mbezzola/sounds/105282/) RytmenPinnen - Fuse/FuseLoop/FuseShort (http://www.freesound.org/people/RytmenPinnen/sounds/102264/) kibibu - LightMetalHit2 (http://www.freesound.org/people/kibibu/sounds/22435/) prozaciswack - Earthquake (http://www.freesound.org/people/prozaciswack/sounds/82722/) -alienistcog - WoodCreak* (http://freesound.org/people/alienistcog/sounds/123712/) +alienistcog - WoodCreak1-3 (http://freesound.org/people/alienistcog/sounds/123712/) fryzu82 - Boiling (http://freesound.org/people/fryzu82/sounds/142333/) Adam_N - Blowout (http://freesound.org/people/Adam_N/sounds/166126/) BenNevis - SteamEngine (http://freesound.org/people/BenNevis/sounds/203175/) felix.blume - Pumpjack (http://freesound.org/people/felix.blume/sounds/203990/) Kane53126 - Click2 (http://www.freesound.org/people/Kane53126/sounds/257944/) Zywx - MosquitoBuzz (http://www.freesound.org/people/Zywx/sounds/188708/) -tc630 - FurnaceStart, FurnaceStop, FurnaceLoop (http://www.freesound.org/people/tc630/sounds/47835/) +tc630 - Furnace/Start, Furnace/Stop, Furnace/Loop(http://www.freesound.org/people/tc630/sounds/47835/) +kolczok - SawmillRipcut(http://freesound.org/people/kolczok/sounds/198988/) \ No newline at end of file diff --git a/planet/System.ocg/Fire.c b/planet/System.ocg/Fire.c index 6694d7139..b8c00831d 100644 --- a/planet/System.ocg/Fire.c +++ b/planet/System.ocg/Fire.c @@ -268,9 +268,9 @@ global func FxFireStart(object target, proplist effect, int temp, int caused_by, // Set values if ((4 * effect.width * effect.height) > 500) - target->Sound("Inflame", false, 100); + target->Sound("Fire::Inflame", false, 100); if (target->GetMass() >= 100) - if (target->Sound("Fire", false, 100, nil, 1)) + if (target->Sound("Fire::Fire", false, 100, nil, 1)) effect.fire_sound = true; // callback @@ -486,7 +486,7 @@ global func FxFireStop(object target, proplist effect, int reason, bool temp) } // stop sound if (effect.fire_sound) - target->Sound("Fire", false, 100, nil, -1); + target->Sound("Fire::Fire", false, 100, nil, -1); // callback target->~Extinguishing(); // done, success diff --git a/planet/System.ocg/Object.c b/planet/System.ocg/Object.c index 563bc62db..7aa8ad83f 100644 --- a/planet/System.ocg/Object.c +++ b/planet/System.ocg/Object.c @@ -236,12 +236,12 @@ global func StonyObjectHit(int x, int y) while(!GBackSolid(x*i, y*i) && i < average_obj_size) i++; // Check if digfree if (!GetMaterialVal("DigFree", "Material", GetMaterial(x*i, y*i)) && GBackSolid(x*i, y*i)) - return Sound("RockHit?"); + return Sound("Hits::Materials::Rock::RockHit?"); // Else play standard sound if (Distance(0,0,xdir,ydir) > 10) - return Sound("SoftTouch?"); + return Sound("Hits::SoftTouch?"); else - return Sound("SoftHit?"); + return Sound("Hits::SoftHit?"); } // Removes all objects of the given type. diff --git a/planet/Tests.ocf/Parameters.ocs/Script.c b/planet/Tests.ocf/Parameters.ocs/Script.c index 4db340607..83c560dc9 100644 --- a/planet/Tests.ocf/Parameters.ocs/Script.c +++ b/planet/Tests.ocf/Parameters.ocs/Script.c @@ -21,7 +21,7 @@ func GotNugget() { --num_to_collect; if (num_to_collect == 0) GameCall("Finished"); - Sound("Cash"); + Sound("UI::Cash"); RemoveObject(); } diff --git a/planet/Worlds.ocf/IronPeak.ocs/Script.c b/planet/Worlds.ocf/IronPeak.ocs/Script.c index 409f3ad40..f7034ebcc 100644 --- a/planet/Worlds.ocf/IronPeak.ocs/Script.c +++ b/planet/Worlds.ocf/IronPeak.ocs/Script.c @@ -178,7 +178,7 @@ global func FxSnowStormStart(object target, proplist effect) // Always a strong wind, either to the left or the right. effect.wind = (2 * Random(2) - 1) * (90 + Random(10)); // Accordingly a stormy sound. - Sound("WindLoop.ogg", true, 50, nil, 1); + Sound("Environment::WindLoop", true, 50, nil, 1); return 1; } diff --git a/planet/Worlds.ocf/Krakatoa.ocs/Script.c b/planet/Worlds.ocf/Krakatoa.ocs/Script.c index b3a820a52..f0665b37a 100644 --- a/planet/Worlds.ocf/Krakatoa.ocs/Script.c +++ b/planet/Worlds.ocf/Krakatoa.ocs/Script.c @@ -268,7 +268,7 @@ global func FxBigEruptionStart(object target, proplist effect, int temporary, in // Duration of 6-9 seconds. effect.Duration = (6 + Random(4)) * 36; // Use earthquake sound for this eruption. - Sound("Earthquake", true, 100, nil, 1); + Sound("Environment::Disasters::Earthquake", true, 100, nil, 1); // Shake also the viewport a bit on a big eruption. ShakeViewport(3200, x, y); return FX_OK; @@ -315,8 +315,8 @@ global func FxBigEruptionStop(object target, proplist effect, int reason, bool t if (temporary) return FX_OK; // Stop eruption sound. - Sound("Earthquake", true, 100, nil, -1); - Sound("EarthquakeEnd",true); + Sound("Environment::Disasters::Earthquake", true, 100, nil, -1); + Sound("Environment::Disasters::EarthquakeEnd",true); return FX_OK; } diff --git a/planet/Worlds.ocf/Krakatoa.ocs/System.ocg/SeqIntro.c b/planet/Worlds.ocf/Krakatoa.ocs/System.ocg/SeqIntro.c index 6b91ccfb9..616a0b98e 100644 --- a/planet/Worlds.ocf/Krakatoa.ocs/System.ocg/SeqIntro.c +++ b/planet/Worlds.ocf/Krakatoa.ocs/System.ocg/SeqIntro.c @@ -141,7 +141,7 @@ public func Intro_6() public func Intro_PlaneHit() { // Airplane hit ground! Continue sequence. - Sound("PlaneCrash", true); + Sound("Objects::Plane::PlaneCrash", true); var particles = Particles_Smoke(true); particles.Size = PV_Linear(PV_Random(20, 60), PV_Random(50, 100)); CreateParticle("Smoke", PV_Random(-30,30), PV_Random(-30,30), PV_Random(-60, 60), PV_Random(-20,0), PV_Random(200, 500), particles, 20); diff --git a/src/control/C4Control.cpp b/src/control/C4Control.cpp index 96fb46c48..7fc082892 100644 --- a/src/control/C4Control.cpp +++ b/src/control/C4Control.cpp @@ -191,7 +191,7 @@ void C4ControlSet::Execute() const if (Game.Parameters.isLeague()) { Log("/set maxplayer disabled in league!"); - C4GUI::GUISound("Error"); + C4GUI::GUISound("UI::Error"); break; } // set it @@ -840,7 +840,7 @@ void C4ControlSyncCheck::Execute() const LogFatal("Network: Synchronization loss!"); LogFatal(FormatString("Network: %s Frm %i Ctrl %i Rnc %i Cpx %i PXS %i MMi %i Obc %i Oei %i Sct %i", szThis, Frame,ControlTick,RandomCount,AllCrewPosX,PXSCount,MassMoverIndex,ObjectCount,ObjectEnumerationIndex, SectShapeSum).getData()); LogFatal(FormatString("Network: %s Frm %i Ctrl %i Rnc %i Cpx %i PXS %i MMi %i Obc %i Oei %i Sct %i", szOther, SyncCheck.Frame,SyncCheck.ControlTick,SyncCheck.RandomCount,SyncCheck.AllCrewPosX,SyncCheck.PXSCount,SyncCheck.MassMoverIndex,SyncCheck.ObjectCount,SyncCheck.ObjectEnumerationIndex, SyncCheck.SectShapeSum).getData()); - StartSoundEffect("SyncError"); + StartSoundEffect("UI::SyncError"); #ifdef _DEBUG // Debug safe C4GameSaveNetwork SaveGame(false); diff --git a/src/game/C4Game.cpp b/src/game/C4Game.cpp index 4ff0e3032..ee4502a02 100644 --- a/src/game/C4Game.cpp +++ b/src/game/C4Game.cpp @@ -1982,7 +1982,7 @@ bool C4Game::QuickSave(const char *strFilename, const char *strTitle, bool fForc // Must not be the scenario file that is currently open if (ItemIdentical(ScenarioFilename, strSavePath.getData())) { - StartSoundEffect("Error"); + StartSoundEffect("UI::Error"); ::GraphicsSystem.FlashMessage(LoadResStr("IDS_GAME_NOSAVEONCURR")); Log(LoadResStr("IDS_GAME_FAILSAVEGAME")); return false; diff --git a/src/game/C4Viewport.cpp b/src/game/C4Viewport.cpp index b3e5bc04a..b334c4366 100644 --- a/src/game/C4Viewport.cpp +++ b/src/game/C4Viewport.cpp @@ -860,7 +860,7 @@ bool C4ViewportList::CloseViewport(C4Viewport * cvp) { FirstViewport = cvp->Next; delete cvp; - StartSoundEffect("Click"); + StartSoundEffect("UI::CloseViewport"); } // Take out of the chain else for (C4Viewport * prev = FirstViewport; prev; prev = prev->Next) @@ -869,7 +869,7 @@ bool C4ViewportList::CloseViewport(C4Viewport * cvp) { prev->Next = cvp->Next; delete cvp; - StartSoundEffect("Click"); + StartSoundEffect("UI::CloseViewport"); } } // Recalculate viewports @@ -909,7 +909,7 @@ bool C4ViewportList::CreateViewport(int32_t iPlayer, bool fSilent) } // Action sound if (GetViewportCount()!=iLastCount) if (!fSilent) - StartSoundEffect("CloseViewport"); + StartSoundEffect("UI::CloseViewport"); return true; } @@ -953,7 +953,7 @@ bool C4ViewportList::CloseViewport(int32_t iPlayer, bool fSilent) // Recalculate viewports RecalculateViewports(); // Action sound - if (!fSilent) StartSoundEffect("CloseViewport"); + if (!fSilent) StartSoundEffect("UI::CloseViewport"); } return true; } diff --git a/src/gamescript/C4Effect.cpp b/src/gamescript/C4Effect.cpp index 6dbd1065e..957dceaf4 100644 --- a/src/gamescript/C4Effect.cpp +++ b/src/gamescript/C4Effect.cpp @@ -616,8 +616,8 @@ void Splash(int32_t tx, int32_t ty, int32_t amt, C4Object *pByObj) } // Splash sound if (amt>=20) - StartSoundEffect("Splash2", false, 50, pByObj); - else if (amt>1) StartSoundEffect("Splash1", false, 50, pByObj); + StartSoundEffect("Liquids::Splash2", false, 50, pByObj); + else if (amt>1) StartSoundEffect("Liquids::Splash1", false, 50, pByObj); } void Smoke(int32_t tx, int32_t ty, int32_t level, DWORD dwClr) diff --git a/src/gui/C4ChatDlg.cpp b/src/gui/C4ChatDlg.cpp index 24974f716..4ce9841ad 100644 --- a/src/gui/C4ChatDlg.cpp +++ b/src/gui/C4ChatDlg.cpp @@ -233,7 +233,7 @@ void C4ChatControl::ChatSheet::DoError(const char *szError) { AddTextLine(szError, C4GUI_ErrorFontClr); } - C4GUI::GUISound("Error"); + C4GUI::GUISound("UI::Error"); } void C4ChatControl::ChatSheet::Update(bool fLock) diff --git a/src/gui/C4GameLobby.cpp b/src/gui/C4GameLobby.cpp index 15113ea20..35c8efbc4 100644 --- a/src/gui/C4GameLobby.cpp +++ b/src/gui/C4GameLobby.cpp @@ -318,19 +318,19 @@ namespace C4GameLobby // changing away from countdown? if (eCountdownState == CDS_Countdown) { - StopSoundEffect("Elevator", NULL); - if (eToState != CDS_Start) StartSoundEffect("Pshshsh"); + StopSoundEffect("Structures::Elevator::Moving", NULL); + if (eToState != CDS_Start) StartSoundEffect("Liquids::Pshshsh"); } // change to game start? if (eToState == CDS_Start) { // announce it! - StartSoundEffect("Blast3"); + StartSoundEffect("Fire::Blast3"); } else if (eToState == CDS_Countdown) { - StartSoundEffect("Fuse"); - StartSoundEffect("Elevator", true); + StartSoundEffect("Fire::Fuse"); + StartSoundEffect("Structures::Elevator::Moving", true); } if (eToState == CDS_Countdown || eToState == CDS_LongCountdown) { @@ -381,7 +381,7 @@ namespace C4GameLobby { // first countdown message OnLog(Pkt.GetCountdownMsg(!fWasCountdown).getData(), C4GUI_LogFontClr2); - StartSoundEffect("Command"); + StartSoundEffect("Hits::Materials::Wood::WoodHit*"); } } @@ -441,7 +441,7 @@ namespace C4GameLobby if (!szInputText || !*szInputText) { // do some error sound then - C4GUI::GUISound("Error"); + C4GUI::GUISound("UI::Error"); } else { @@ -542,7 +542,7 @@ namespace C4GameLobby { if (pChatBox) { - StartSoundEffect("Error"); + StartSoundEffect("UI::Error"); pChatBox->AddTextLine(szErrMsg, &::GraphicsResource.TextFont, C4GUI_ErrorFontClr, true, true); pChatBox->ScrollToBottom(); } diff --git a/src/gui/C4GuiButton.cpp b/src/gui/C4GuiButton.cpp index a7bcd475f..3c3da05a1 100644 --- a/src/gui/C4GuiButton.cpp +++ b/src/gui/C4GuiButton.cpp @@ -187,7 +187,7 @@ namespace C4GUI // already down? if (fDown) return; // play sound - GUISound("ArrowHit"); + GUISound("Objects::Arrow::HitGround"); // set down fDown = true; } @@ -197,7 +197,7 @@ namespace C4GUI // already up? if (!fDown) return; // play sound - GUISound(fPress ? "Click" : "ArrowHit"); + GUISound(fPress ? "UI::Click" : "Objects::Arrow::HitGround"); // set up fDown = false; } diff --git a/src/gui/C4GuiCheckBox.cpp b/src/gui/C4GuiCheckBox.cpp index 31dd85017..f5ae18bf5 100644 --- a/src/gui/C4GuiCheckBox.cpp +++ b/src/gui/C4GuiCheckBox.cpp @@ -74,7 +74,7 @@ namespace C4GUI // user can't toggle if disabled if (fByUser && !fEnabled) return; // sound - if (fByUser) GUISound("ArrowHit"); + if (fByUser) GUISound("Objects::Arrow::HitGround"); // toggle state fChecked = !fChecked; // callback (last call; may destroy element) diff --git a/src/gui/C4GuiContainers.cpp b/src/gui/C4GuiContainers.cpp index 0074708c9..6ddd4160f 100644 --- a/src/gui/C4GuiContainers.cpp +++ b/src/gui/C4GuiContainers.cpp @@ -448,7 +448,7 @@ namespace C4GUI } } // sound effekt when buttons are pressed - if ((fTopDown || fBottomDown) != fPrevDown) GUISound("ArrowHit"); + if ((fTopDown || fBottomDown) != fPrevDown) GUISound("Objects::Arrow::HitGround"); } void ScrollBar::DoDragging(CMouse &rMouse, int32_t iX, int32_t iY, DWORD dwKeyParam) diff --git a/src/gui/C4GuiMenu.cpp b/src/gui/C4GuiMenu.cpp index 905a52dea..cc820696c 100644 --- a/src/gui/C4GuiMenu.cpp +++ b/src/gui/C4GuiMenu.cpp @@ -170,7 +170,7 @@ namespace C4GUI void ContextMenu::Abort(bool fByUser) { // effect - if (fByUser) GUISound("DoorClose"); + if (fByUser) GUISound("Buildings::DoorClose"); // simply del menu: dtor will remove itself delete this; } @@ -477,7 +477,7 @@ namespace C4GUI // set target this->pTarget = pTarget; // effect :) - GUISound("DoorOpen"); + GUISound("Buildings::DoorOpen"); // done } @@ -540,7 +540,7 @@ namespace C4GUI // close all menus (deletes this class!) w/o sound GetScreen()->AbortContext(false); // sound - GUISound("Click"); + GUISound("UI::Click"); // do CB pCallback->OnOK(pTarget); // free CB class diff --git a/src/gui/C4StartupNetDlg.cpp b/src/gui/C4StartupNetDlg.cpp index b5838f00d..bbdcd3f5a 100644 --- a/src/gui/C4StartupNetDlg.cpp +++ b/src/gui/C4StartupNetDlg.cpp @@ -1121,7 +1121,7 @@ void C4StartupNetDlg::DoRefresh() if (tLastRefresh && tNow < tLastRefresh + C4NetMinRefreshInterval) { // avoid hammering on refresh key - C4GUI::GUISound("Error"); + C4GUI::GUISound("UI::Error"); return; } tLastRefresh = tNow; diff --git a/src/gui/C4StartupOptionsDlg.cpp b/src/gui/C4StartupOptionsDlg.cpp index 024be041b..b1b9cb1e0 100644 --- a/src/gui/C4StartupOptionsDlg.cpp +++ b/src/gui/C4StartupOptionsDlg.cpp @@ -1405,7 +1405,7 @@ void C4StartupOptionsDlg::OnSoundVolumeSliderChange(int32_t iNewVal) // sound system reads this value directly Config.Sound.SoundVolume = iNewVal; // test sound - StartSoundEffect("ArrowHit", false, 100, NULL); + StartSoundEffect("Objects::Arrow::HitGround", false, 100, NULL); } void C4StartupOptionsDlg::OnRXSoundCheck(C4GUI::Element *pCheckBox) diff --git a/src/gui/C4StartupPlrSelDlg.cpp b/src/gui/C4StartupPlrSelDlg.cpp index 9c49514d7..a266552dc 100644 --- a/src/gui/C4StartupPlrSelDlg.cpp +++ b/src/gui/C4StartupPlrSelDlg.cpp @@ -359,7 +359,7 @@ void C4StartupPlrSelDlg::CrewListItem::OnDeathMessageSet(const StdStrBuf &rsNewM // save RewriteCore(); // acoustic feedback - C4GUI::GUISound("Connect"); + C4GUI::GUISound("Objects::Connect"); } void C4StartupPlrSelDlg::CrewListItem::RewriteCore() @@ -846,7 +846,7 @@ void C4StartupPlrSelDlg::OnCrewBtn(C4GUI::Control *btn) void C4StartupPlrSelDlg::SetPlayerMode() { // change view to listing players - C4GUI::GUISound("DoorClose"); + C4GUI::GUISound("Buildings::DoorClose"); StdStrBuf LastPlrFilename; LastPlrFilename.Copy(static_cast(CurrPlayer.Grp.GetFullName())); CurrPlayer.Grp.Close(); @@ -875,7 +875,7 @@ void C4StartupPlrSelDlg::SetCrewMode(PlayerListItem *pSel) strCrew.getData(), C4GUI::Ico_Player); return; } - C4GUI::GUISound("DoorOpen"); + C4GUI::GUISound("Buildings::DoorOpen"); eMode = PSDM_Crew; UpdatePlayerList(); UpdateSelection(); diff --git a/src/gui/C4StartupPlrSelDlg.h b/src/gui/C4StartupPlrSelDlg.h index aa7de4b54..e8b9f8db3 100644 --- a/src/gui/C4StartupPlrSelDlg.h +++ b/src/gui/C4StartupPlrSelDlg.h @@ -179,7 +179,7 @@ private: void UpdatePlayerList(); // refill pPlrListBox with players in player folder, or with crew in selected player void UpdateSelection(); void OnSelChange(class C4GUI::Element *pEl) { UpdateSelection(); } - void OnSelDblClick(class C4GUI::Element *pEl) { C4GUI::GUISound("Click"); OnPropertyBtn(NULL); } + void OnSelDblClick(class C4GUI::Element *pEl) { C4GUI::GUISound("UI::Click"); OnPropertyBtn(NULL); } void UpdateActivatedPlayers(); // update Config.General.Participants by currently activated players void SelectItem(const StdStrBuf &Filename, bool fActivate); // find item by filename and select (and activate it, if desired) diff --git a/src/gui/C4StartupScenSelDlg.cpp b/src/gui/C4StartupScenSelDlg.cpp index 2af442da9..1c0b5c581 100644 --- a/src/gui/C4StartupScenSelDlg.cpp +++ b/src/gui/C4StartupScenSelDlg.cpp @@ -1929,7 +1929,7 @@ void C4StartupScenSelDlg::OnButtonScenario(C4GUI::Control *pEl) void C4StartupScenSelDlg::DeselectAll() { // Deselect all so current folder info is displayed - if (GetFocus()) C4GUI::GUISound("ArrowHit"); + if (GetFocus()) C4GUI::GUISound("Objects::Arrow::HitGround"); SetFocus(NULL, true); if (pMapData) pMapData->ResetSelection(); UpdateSelection(); diff --git a/src/landscape/C4Material.cpp b/src/landscape/C4Material.cpp index 7854872a9..96311b1f5 100644 --- a/src/landscape/C4Material.cpp +++ b/src/landscape/C4Material.cpp @@ -751,7 +751,7 @@ bool C4MaterialMap::mrfPoof(C4MaterialReaction *pReaction, int32_t &iX, int32_t case meePXSPos: // PXS check before movement: Kill both landscape and PXS mat ::Landscape.ExtractMaterial(iLSPosX,iLSPosY,false); if (!Random(3)) Smoke(iX,iY,3); - if (!Random(3)) StartSoundEffectAt("Pshshsh", iX, iY); + if (!Random(3)) StartSoundEffectAt("Liquids::Pshshsh", iX, iY); return true; case meePXSMove: // PXS movement @@ -763,7 +763,7 @@ bool C4MaterialMap::mrfPoof(C4MaterialReaction *pReaction, int32_t &iX, int32_t // Always kill both landscape and PXS mat ::Landscape.ExtractMaterial(iLSPosX,iLSPosY,false); if (!Random(3)) Smoke(iX,iY,3); - if (!Random(3)) StartSoundEffectAt("Pshshsh", iX, iY); + if (!Random(3)) StartSoundEffectAt("Liquids::Pshshsh", iX, iY); return true; } // not handled @@ -794,7 +794,7 @@ bool C4MaterialMap::mrfCorrode(C4MaterialReaction *pReaction, int32_t &iX, int32 { Smoke(iX, iY, 3 + Random(3)); } - if (!Random(20)) StartSoundEffectAt("Corrode", iX, iY); + if (!Random(20)) StartSoundEffectAt("Liquids::Corrode", iX, iY); return true; } } @@ -821,7 +821,7 @@ bool C4MaterialMap::mrfCorrode(C4MaterialReaction *pReaction, int32_t &iX, int32 { Smoke(iX,iY,3+Random(3)); } - if (!Random(20)) StartSoundEffectAt("Corrode", iX, iY); + if (!Random(20)) StartSoundEffectAt("Liquids::Corrode", iX, iY); return true; } // Else: dead. Insert material here diff --git a/src/network/C4Network2Dialogs.cpp b/src/network/C4Network2Dialogs.cpp index edc778f33..a80d582a0 100644 --- a/src/network/C4Network2Dialogs.cpp +++ b/src/network/C4Network2Dialogs.cpp @@ -723,7 +723,7 @@ void C4GameOptionButtons::OnPasswordSet(const StdStrBuf &rsNewPassword) SCopy(szPass, Config.Network.LastPassword, CFG_MaxString); } // acoustic feedback - C4GUI::GUISound("Connect"); + C4GUI::GUISound("Objects::Connect"); } void C4GameOptionButtons::UpdatePasswordBtn() @@ -753,7 +753,7 @@ void C4GameOptionButtons::OnCommentSet(const StdStrBuf &rsNewComment) // message feedback Log(LoadResStr("IDS_NET_COMMENTCHANGED")); // acoustic feedback - C4GUI::GUISound("Connect"); + C4GUI::GUISound("Objects::Connect"); } void C4GameOptionButtons::SetCountdown(bool fToVal) diff --git a/src/object/C4Object.cpp b/src/object/C4Object.cpp index cc7be8650..a6f151429 100644 --- a/src/object/C4Object.cpp +++ b/src/object/C4Object.cpp @@ -1013,7 +1013,7 @@ bool C4Object::ExecLife() { // message GameMsgObject(FormatString(LoadResStr("IDS_OBJ_BIRTHDAY"),GetName (), Info->TotalPlayingTime / 3600 / 5).getData(),this); - StartSoundEffect("Trumpet",false,100,this); + StartSoundEffect("UI::Trumpet",false,100,this); } Info->Age = iNewAge; @@ -1834,7 +1834,7 @@ bool C4Object::Promote(int32_t torank, bool exception, bool fForceRankName) // call to object Call(PSF_Promotion); - StartSoundEffect("Trumpet",0,100,this); + StartSoundEffect("UI::Trumpet",0,100,this); return true; } diff --git a/src/player/C4Player.cpp b/src/player/C4Player.cpp index daa7f9486..55cd61850 100644 --- a/src/player/C4Player.cpp +++ b/src/player/C4Player.cpp @@ -666,8 +666,8 @@ bool C4Player::DoWealth(int32_t iChange) { if (LocalControl) { - if (iChange>0) StartSoundEffect("Cash"); - if (iChange<0) StartSoundEffect("UnCash"); + if (iChange>0) StartSoundEffect("UI::Cash"); + if (iChange<0) StartSoundEffect("UI::UnCash"); } SetWealth(Wealth+iChange); @@ -752,7 +752,7 @@ void C4Player::Surrender() Surrendered=true; Eliminated=true; RetireDelay=C4RetireDelay; - StartSoundEffect("Eliminated"); + StartSoundEffect("UI::Eliminated"); Log(FormatString(LoadResStr("IDS_PRC_PLRSURRENDERED"),GetName()).getData()); } @@ -771,7 +771,7 @@ bool C4Player::SetHostility(int32_t iOpponent, int32_t hostile, bool fSilent) // no announce in first frame, or if specified if (!Game.FrameCounter || fSilent) return true; // Announce - StartSoundEffect("Trumpet"); + StartSoundEffect("UI::Trumpet"); Log(FormatString(LoadResStr(hostile ? "IDS_PLR_HOSTILITY" : "IDS_PLR_NOHOSTILITY"), GetName(),opponent->GetName()).getData()); // Success @@ -1448,7 +1448,7 @@ void C4Player::Eliminate() if (Eliminated) return; Eliminated=true; RetireDelay=C4RetireDelay; - StartSoundEffect("Eliminated"); + StartSoundEffect("UI::Eliminated"); Log(FormatString(LoadResStr("IDS_PRC_PLRELIMINATED"),GetName()).getData()); // Early client deactivation check