diff --git a/core/src/main/assets/sounds/scan.mp3 b/core/src/main/assets/sounds/scan.mp3 new file mode 100644 index 000000000..f7ecaf489 Binary files /dev/null and b/core/src/main/assets/sounds/scan.mp3 differ diff --git a/core/src/main/assets/sounds/secret.mp3 b/core/src/main/assets/sounds/secret.mp3 index 934f9e60c..3bb2f157c 100644 Binary files a/core/src/main/assets/sounds/secret.mp3 and b/core/src/main/assets/sounds/secret.mp3 differ diff --git a/core/src/main/assets/sounds/sheep.mp3 b/core/src/main/assets/sounds/sheep.mp3 new file mode 100644 index 000000000..39947780d Binary files /dev/null and b/core/src/main/assets/sounds/sheep.mp3 differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java index 335a7ff94..81f5645e0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java @@ -182,6 +182,8 @@ public class Assets { public static final String CHARGEUP = "sounds/chargeup.mp3"; public static final String GAS = "sounds/gas.mp3"; public static final String CHAINS = "sounds/chains.mp3"; + public static final String SCAN = "sounds/scan.mp3"; + public static final String SHEEP = "sounds/sheep.mp3"; public static final String[] all = new String[]{ CLICK, BADGE, GOLD, @@ -194,7 +196,7 @@ public class Assets { DESCEND, EAT, READ, LULLABY, DRINK, SHATTER, ZAP, LIGHTNING, LEVELUP, DEATH, CHALLENGE, CURSED, TRAP, EVOKE, TOMB, ALERT, MELD, BOSS, BLAST, PLANT, RAY, BEACON, TELEPORT, CHARMS, MASTERY, PUFF, ROCKS, BURNING, FALLING, GHOST, SECRET, BONES, - BEE, DEGRADE, MIMIC, DEBUFF, CHARGEUP, GAS, CHAINS + BEE, DEGRADE, MIMIC, DEBUFF, CHARGEUP, GAS, CHAINS, SCAN, SHEEP }; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java index 1c7e68f1d..b5fd14a78 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java @@ -21,12 +21,14 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.SheepSprite; +import com.watabou.noosa.audio.Sample; import com.watabou.utils.Random; public class Sheep extends NPC { @@ -72,7 +74,10 @@ public class Sheep extends NPC { @Override public boolean interact(Char c) { sprite.showStatus( CharSprite.NEUTRAL, Messages.get(this, Random.element( LINE_KEYS )) ); - if (c == Dungeon.hero) Dungeon.hero.spendAndNext(1f); + if (c == Dungeon.hero) { + Dungeon.hero.spendAndNext(1f); + Sample.INSTANCE.play(Assets.Sounds.SHEEP, 1, Random.Float(0.91f, 1.1f)); + } return true; } } \ No newline at end of file diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java index 4bd1cb364..934fd77d4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java @@ -212,7 +212,7 @@ public class TalismanOfForesight extends Artifact { curUser.sprite.zap(target); curUser.spend(Actor.TICK); - Sample.INSTANCE.play(Assets.Sounds.TELEPORT); + Sample.INSTANCE.play(Assets.Sounds.SCAN); if (noticed) Sample.INSTANCE.play(Assets.Sounds.SECRET); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java index 5a4bf1525..8c3533be2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java @@ -61,7 +61,7 @@ public class WoollyBomb extends Bomb { } Sample.INSTANCE.play(Assets.Sounds.PUFF); - + Sample.INSTANCE.play(Assets.Sounds.SHEEP); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPolymorph.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPolymorph.java index d8e92eae7..d2b13061b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPolymorph.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPolymorph.java @@ -68,6 +68,8 @@ public class ScrollOfPolymorph extends ExoticScroll { TargetHealthIndicator.instance.target(null); GameScene.add(sheep); CellEmitter.get(sheep.pos).burst(Speck.factory(Speck.WOOL), 4); + Sample.INSTANCE.play(Assets.Sounds.PUFF); + Sample.INSTANCE.play(Assets.Sounds.SHEEP); } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java index 1e6ef9ba2..bbc07bc51 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java @@ -59,6 +59,7 @@ public class StoneOfFlock extends Runestone { } CellEmitter.get(cell).burst(Speck.factory(Speck.WOOL), 4); Sample.INSTANCE.play(Assets.Sounds.PUFF); + Sample.INSTANCE.play(Assets.Sounds.SHEEP); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java index cd9193fdd..5a3797450 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java @@ -300,6 +300,8 @@ public class CursedWand { TargetHealthIndicator.instance.target(null); GameScene.add(sheep); CellEmitter.get(sheep.pos).burst(Speck.factory(Speck.WOOL), 4); + Sample.INSTANCE.play(Assets.Sounds.PUFF); + Sample.INSTANCE.play(Assets.Sounds.SHEEP); } else { GLog.i(Messages.get(CursedWand.class, "nothing")); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlockTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlockTrap.java index 526a1329d..f0eda4cdc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlockTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlockTrap.java @@ -73,6 +73,7 @@ public class FlockTrap extends Trap { } } Sample.INSTANCE.play(Assets.Sounds.PUFF); + Sample.INSTANCE.play(Assets.Sounds.SHEEP); Actor.remove(this); return true; }