diff --git a/core/src/main/assets/sounds/debuff.mp3 b/core/src/main/assets/sounds/debuff.mp3 index 582705368..7aa2c05cd 100644 Binary files a/core/src/main/assets/sounds/debuff.mp3 and b/core/src/main/assets/sounds/debuff.mp3 differ diff --git a/core/src/main/assets/sounds/dewdrop.mp3 b/core/src/main/assets/sounds/dewdrop.mp3 index 23da34466..ad4f5cfd0 100644 Binary files a/core/src/main/assets/sounds/dewdrop.mp3 and b/core/src/main/assets/sounds/dewdrop.mp3 differ diff --git a/core/src/main/assets/sounds/health_critical.mp3 b/core/src/main/assets/sounds/health_critical.mp3 index b23e4c3da..da1033bf8 100644 Binary files a/core/src/main/assets/sounds/health_critical.mp3 and b/core/src/main/assets/sounds/health_critical.mp3 differ diff --git a/core/src/main/assets/sounds/health_warn.mp3 b/core/src/main/assets/sounds/health_warn.mp3 index cec1f645e..d816904c7 100644 Binary files a/core/src/main/assets/sounds/health_warn.mp3 and b/core/src/main/assets/sounds/health_warn.mp3 differ diff --git a/core/src/main/assets/sounds/hit_arrow.mp3 b/core/src/main/assets/sounds/hit_arrow.mp3 new file mode 100644 index 000000000..aa8e64b52 Binary files /dev/null and b/core/src/main/assets/sounds/hit_arrow.mp3 differ diff --git a/core/src/main/assets/sounds/hit_strong.mp3 b/core/src/main/assets/sounds/hit_strong.mp3 index 8f477afa2..7388b8d7f 100644 Binary files a/core/src/main/assets/sounds/hit_strong.mp3 and b/core/src/main/assets/sounds/hit_strong.mp3 differ diff --git a/core/src/main/assets/sounds/item.mp3 b/core/src/main/assets/sounds/item.mp3 index dc67e92a6..242fbafa2 100644 Binary files a/core/src/main/assets/sounds/item.mp3 and b/core/src/main/assets/sounds/item.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 45b8b3142..335a7ff94 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java @@ -137,6 +137,7 @@ public class Assets { public static final String HIT_MAGIC = "sounds/hit_magic.mp3"; public static final String HIT_STRONG = "sounds/hit_strong.mp3"; public static final String HIT_PARRY = "sounds/hit_parry.mp3"; + public static final String HIT_ARROW = "sounds/hit_arrow.mp3"; public static final String ATK_SPIRITBOW = "sounds/atk_spiritbow.mp3"; public static final String ATK_CROSSBOW = "sounds/atk_crossbow.mp3"; public static final String HEALTH_WARN = "sounds/health_warn.mp3"; @@ -188,7 +189,7 @@ public class Assets { OPEN, UNLOCK, ITEM, DEWDROP, STEP, WATER, GRASS, TRAMPLE, STURDY, HIT, MISS, HIT_SLASH, HIT_STAB, HIT_CRUSH, HIT_MAGIC, HIT_STRONG, HIT_PARRY, - ATK_SPIRITBOW, ATK_CROSSBOW, HEALTH_WARN, HEALTH_CRITICAL, + HIT_ARROW, ATK_SPIRITBOW, ATK_CROSSBOW, HEALTH_WARN, HEALTH_CRITICAL, DESCEND, EAT, READ, LULLABY, DRINK, SHATTER, ZAP, LIGHTNING, LEVELUP, DEATH, CHALLENGE, CURSED, TRAP, EVOKE, TOMB, ALERT, MELD, BOSS, BLAST, PLANT, RAY, BEACON, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 4f17112de..2cf3fd517 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -1103,10 +1103,10 @@ public class Hero extends Char { flashIntensity = Math.min(1/3f, flashIntensity); //cap intensity at 1/3 GameScene.flash( (int)(0xFF*flashIntensity) << 16 ); if (isAlive()) { - if (flashIntensity >= 1/3f) { - Sample.INSTANCE.play(Assets.Sounds.HEALTH_CRITICAL); + if (flashIntensity >= 1/6f) { + Sample.INSTANCE.play(Assets.Sounds.HEALTH_CRITICAL, 1/3f + flashIntensity * 2f); } else { - Sample.INSTANCE.play(Assets.Sounds.HEALTH_WARN, flashIntensity * 3f); + Sample.INSTANCE.play(Assets.Sounds.HEALTH_WARN, 1/3f + flashIntensity * 4f); } } } @@ -1598,6 +1598,8 @@ public class Hero extends Char { @Override public void move( int step ) { + boolean wasHighGrass = Dungeon.level.map[step] == Terrain.HIGH_GRASS; + super.move( step ); if (!flying) { @@ -1608,7 +1610,11 @@ public class Hero extends Char { } else if (Dungeon.level.map[pos] == Terrain.GRASS || Dungeon.level.map[pos] == Terrain.EMBERS || Dungeon.level.map[pos] == Terrain.FURROWED_GRASS){ - Sample.INSTANCE.play( Assets.Sounds.GRASS, 1, Random.Float( 0.96f, 1.05f ) ); + if (step == pos && wasHighGrass) { + Sample.INSTANCE.play(Assets.Sounds.TRAMPLE, 1, Random.Float( 0.96f, 1.05f ) ); + } else { + Sample.INSTANCE.play( Assets.Sounds.GRASS, 1, Random.Float( 0.96f, 1.05f ) ); + } } else { Sample.INSTANCE.play( Assets.Sounds.STEP, 1, Random.Float( 0.96f, 1.05f ) ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java index b5e0c5578..c5b52db36 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java @@ -225,6 +225,8 @@ public class SpiritBow extends Weapon { { image = ItemSpriteSheet.SPIRIT_ARROW; + + hitSound = Assets.Sounds.HIT_ARROW; } @Override @@ -277,7 +279,7 @@ public class SpiritBow extends Weapon { @Override public void throwSound() { - Sample.INSTANCE.play( Assets.Sounds.ATK_SPIRITBOW ); + Sample.INSTANCE.play( Assets.Sounds.ATK_SPIRITBOW, 1, Random.Float(0.87f, 1.15f) ); } int flurryCount = -1; @@ -303,7 +305,7 @@ public class SpiritBow extends Weapon { user.busy(); - Sample.INSTANCE.play( Assets.Sounds.MISS, 0.6f, 0.6f, 1.5f ); + throwSound(); ((MissileSprite) user.sprite.parent.recycle(MissileSprite.class)). reset(user.sprite, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/Dart.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/Dart.java index ca9aebfd5..3021149bb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/Dart.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/Dart.java @@ -36,6 +36,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions; import com.watabou.noosa.audio.Sample; +import com.watabou.utils.Random; import java.util.ArrayList; @@ -43,7 +44,7 @@ public class Dart extends MissileWeapon { { image = ItemSpriteSheet.DART; - hitSound = Assets.Sounds.HIT_STAB; + hitSound = Assets.Sounds.HIT_ARROW; hitSoundPitch = 1.3f; tier = 1; @@ -130,7 +131,7 @@ public class Dart extends MissileWeapon { public void throwSound() { updateCrossbow(); if (bow != null) { - Sample.INSTANCE.play(Assets.Sounds.ATK_CROSSBOW); + Sample.INSTANCE.play(Assets.Sounds.ATK_CROSSBOW, 1, Random.Float(0.87f, 1.15f)); } else { super.throwSound(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/HighGrass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/HighGrass.java index eb52bd0d7..f6ea2a1fb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/HighGrass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/features/HighGrass.java @@ -60,9 +60,6 @@ public class HighGrass { freezeTrample = true; } else { Level.set(pos, Terrain.GRASS); - if (ch instanceof Hero){ - Sample.INSTANCE.play(Assets.Sounds.TRAMPLE, 1, Random.Float( 0.96f, 1.05f ) ); - } } } else { @@ -72,9 +69,6 @@ public class HighGrass { } else { Level.set(pos, Terrain.GRASS); } - if (ch instanceof Hero){ - Sample.INSTANCE.play(Assets.Sounds.TRAMPLE, 1, Random.Float( 0.96f, 1.05f ) ); - } int naturalismLevel = 0; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java index fa25e4459..c09d6474b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java @@ -207,7 +207,12 @@ public class AboutScene extends PixelScene { "_Pack: Onomatopoeia_ by _Adam N_\n" + "_Pack: Watermelon_ by _lolamadeus_\n" + "_metal chain_ by _Mediapaja2009_\n" + - "_Pack: Sword Clashes Pack_ by _JohnBuhr_\n", + "_Pack: Sword Clashes Pack_ by _JohnBuhr_\n" + + "_Pack: Metal Clangs and Pings_ by _wilhellboy_\n" + + "_Pack: Stabbing Stomachs & Crushing Skulls_ by _TheFilmLook_\n" + + "_Sheep bleating_ by _zachrau_\n" + + "_Lemon,Juicy,Squeeze,Fruit.wav_ by _Filipe Chagas_\n" + + "_Lemon,Squeeze,Squishy,Fruit.wav_ by _Filipe Chagas_", "www.freesound.org", "https://www.freesound.org"); freesound.setRect(transifex.left()-10, transifex.bottom() + 8, colWidth+20, 0);