LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.8.2: added new scan and sheep sfx, remastered secret sfx

Browse Source
This commit is contained in:
Evan Debenham 2020-07-29 13:34:11 -04:00
parent 9e6339aa7f
commit 0bb2056121
11 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/src/main/assets/sounds/scan.mp3 Normal file
View File

Binary file not shown.

BIN
core/src/main/assets/sounds/secret.mp3
View File

Binary file not shown.

BIN
core/src/main/assets/sounds/sheep.mp3 Normal file
View File

Binary file not shown.

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java
View File

@ -182,6 +182,8 @@ public class Assets {
public static final String CHARGEUP = "sounds/chargeup.mp3"; public static final String CHARGEUP = "sounds/chargeup.mp3";
public static final String GAS = "sounds/gas.mp3"; public static final String GAS = "sounds/gas.mp3";
public static final String CHAINS = "sounds/chains.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[]{ public static final String[] all = new String[]{
CLICK, BADGE, GOLD, CLICK, BADGE, GOLD,
@ -194,7 +196,7 @@ public class Assets {
DESCEND, EAT, READ, LULLABY, DRINK, SHATTER, ZAP, LIGHTNING, LEVELUP, DEATH, DESCEND, EAT, READ, LULLABY, DRINK, SHATTER, ZAP, LIGHTNING, LEVELUP, DEATH,
CHALLENGE, CURSED, TRAP, EVOKE, TOMB, ALERT, MELD, BOSS, BLAST, PLANT, RAY, BEACON, CHALLENGE, CURSED, TRAP, EVOKE, TOMB, ALERT, MELD, BOSS, BLAST, PLANT, RAY, BEACON,
TELEPORT, CHARMS, MASTERY, PUFF, ROCKS, BURNING, FALLING, GHOST, SECRET, BONES, 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
}; };
} }

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java
View File

@ -21,12 +21,14 @@
package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs; package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.SheepSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.SheepSprite;
import com.watabou.noosa.audio.Sample;
import com.watabou.utils.Random; import com.watabou.utils.Random;
public class Sheep extends NPC { public class Sheep extends NPC {
@ -72,7 +74,10 @@ public class Sheep extends NPC {
@Override @Override
public boolean interact(Char c) { public boolean interact(Char c) {
sprite.showStatus( CharSprite.NEUTRAL, Messages.get(this, Random.element( LINE_KEYS )) ); 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; return true;
} }
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java
View File

@ -212,7 +212,7 @@ public class TalismanOfForesight extends Artifact {
curUser.sprite.zap(target); curUser.sprite.zap(target);
curUser.spend(Actor.TICK); curUser.spend(Actor.TICK);
Sample.INSTANCE.play(Assets.Sounds.TELEPORT); Sample.INSTANCE.play(Assets.Sounds.SCAN);
if (noticed) Sample.INSTANCE.play(Assets.Sounds.SECRET); if (noticed) Sample.INSTANCE.play(Assets.Sounds.SECRET);
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java
View File

@ -61,7 +61,7 @@ public class WoollyBomb extends Bomb {
} }
Sample.INSTANCE.play(Assets.Sounds.PUFF); Sample.INSTANCE.play(Assets.Sounds.PUFF);
Sample.INSTANCE.play(Assets.Sounds.SHEEP);
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfPolymorph.java
View File

@ -68,6 +68,8 @@ public class ScrollOfPolymorph extends ExoticScroll {
TargetHealthIndicator.instance.target(null); TargetHealthIndicator.instance.target(null);
GameScene.add(sheep); GameScene.add(sheep);
CellEmitter.get(sheep.pos).burst(Speck.factory(Speck.WOOL), 4); CellEmitter.get(sheep.pos).burst(Speck.factory(Speck.WOOL), 4);
Sample.INSTANCE.play(Assets.Sounds.PUFF);
Sample.INSTANCE.play(Assets.Sounds.SHEEP);
} }
} }
} }

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfFlock.java
View File

@ -59,6 +59,7 @@ public class StoneOfFlock extends Runestone {
} }
CellEmitter.get(cell).burst(Speck.factory(Speck.WOOL), 4); CellEmitter.get(cell).burst(Speck.factory(Speck.WOOL), 4);
Sample.INSTANCE.play(Assets.Sounds.PUFF); Sample.INSTANCE.play(Assets.Sounds.PUFF);
Sample.INSTANCE.play(Assets.Sounds.SHEEP);
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java
View File

@ -300,6 +300,8 @@ public class CursedWand {
TargetHealthIndicator.instance.target(null); TargetHealthIndicator.instance.target(null);
GameScene.add(sheep); GameScene.add(sheep);
CellEmitter.get(sheep.pos).burst(Speck.factory(Speck.WOOL), 4); CellEmitter.get(sheep.pos).burst(Speck.factory(Speck.WOOL), 4);
Sample.INSTANCE.play(Assets.Sounds.PUFF);
Sample.INSTANCE.play(Assets.Sounds.SHEEP);
} else { } else {
GLog.i(Messages.get(CursedWand.class, "nothing")); GLog.i(Messages.get(CursedWand.class, "nothing"));
} }

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlockTrap.java
View File

@ -73,6 +73,7 @@ public class FlockTrap extends Trap {
} }
} }
Sample.INSTANCE.play(Assets.Sounds.PUFF); Sample.INSTANCE.play(Assets.Sounds.PUFF);
Sample.INSTANCE.play(Assets.Sounds.SHEEP);
Actor.remove(this); Actor.remove(this);
return true; return true;
} }