diff --git a/assets/mods/basegame/audio/effects/door/wooden_close.1.ogg b/assets/mods/basegame/audio/effects/door/wooden_close.1.ogg new file mode 100644 index 000000000..1bfa37fb4 --- /dev/null +++ b/assets/mods/basegame/audio/effects/door/wooden_close.1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:196ada9824d458c4627b0be71a0191eb33bb351716ce8c390ba722a695e3029f +size 6695 diff --git a/assets/mods/basegame/audio/effects/door/wooden_close.2.ogg b/assets/mods/basegame/audio/effects/door/wooden_close.2.ogg new file mode 100644 index 000000000..1ded1e9bf --- /dev/null +++ b/assets/mods/basegame/audio/effects/door/wooden_close.2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bb92362cc1b320aafb23ce8d627e8b0d730b577a382cc03f38acb87fe88b351 +size 5904 diff --git a/assets/mods/basegame/audio/effects/door/wooden_close.3.ogg b/assets/mods/basegame/audio/effects/door/wooden_close.3.ogg new file mode 100644 index 000000000..f3ba79225 --- /dev/null +++ b/assets/mods/basegame/audio/effects/door/wooden_close.3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aefea0f5ae09a0d46c8c5b07b4a4371c734d32a1b0e80cbed636820c46156266 +size 6556 diff --git a/assets/mods/basegame/audio/effects/door/wooden_open.1.ogg b/assets/mods/basegame/audio/effects/door/wooden_open.1.ogg new file mode 100644 index 000000000..a0342575f --- /dev/null +++ b/assets/mods/basegame/audio/effects/door/wooden_open.1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e61ea3623d0309c4a3bd108505c5f621d09dcf36f772e6fe4bdd04cfb9cb8410 +size 6477 diff --git a/assets/mods/basegame/audio/effects/door/wooden_open.2.ogg b/assets/mods/basegame/audio/effects/door/wooden_open.2.ogg new file mode 100644 index 000000000..a469ff405 --- /dev/null +++ b/assets/mods/basegame/audio/effects/door/wooden_open.2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6bf737f3dffb2e4ac946be9ceac58f4e95290eaf68ff362b4973130b97909628 +size 7073 diff --git a/assets/mods/basegame/audio/effects/door/wooden_open.3.ogg b/assets/mods/basegame/audio/effects/door/wooden_open.3.ogg new file mode 100644 index 000000000..35cc3e0ab --- /dev/null +++ b/assets/mods/basegame/audio/effects/door/wooden_open.3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:107b0088229a575170b4ee523155c8cec85158a7eaeb8d1ac207f2faf2297f90 +size 6874 diff --git a/src/net/torvald/terrarum/CreditSingleton.kt b/src/net/torvald/terrarum/CreditSingleton.kt index 3b858bd64..989cf6b88 100644 --- a/src/net/torvald/terrarum/CreditSingleton.kt +++ b/src/net/torvald/terrarum/CreditSingleton.kt @@ -285,13 +285,15 @@ Sound from -$BULLET Footstep sound recordings: +$BULLET Foleys: - - GRSS_01..06.ogg - - GRVL_01..07.ogg - - ROCK_01..09.ogg - - SAND_01..04.ogg - - WOOD_01..03.ogg + - steps/GRSS.*.ogg + - steps/GRVL.*.ogg + - steps/ROCK.*.ogg + - steps/SAND.*.ogg + - steps/WOOD.*.ogg + - door/wooden_open.*.ogg + - door/wooden_close.*.ogg Copyright (C) 2020, 2021, 2022 Nox Sound Sound from diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSwingingDoorBase.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSwingingDoorBase.kt index d7f1a1887..eebf4901c 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSwingingDoorBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSwingingDoorBase.kt @@ -35,6 +35,8 @@ open class FixtureSwingingDoorBase : FixtureBase { var doorOpenedHoldLength: Second = 0.25f var nameKey = "DOOR_BASE" // goes into the savegame var nameKeyReadFromLang = true // goes into the savegame + var audioIdForOpening = "effects.door.wooden_open" + var audioIdForClosing = "effects.door.wooden_close" /* END OF CUTOMISABLE PARAMETERS */ private var tilewiseHitboxWidth = tw * 2 - twClosed @@ -164,35 +166,38 @@ open class FixtureSwingingDoorBase : FixtureBase { shadeBoxList[0].light = Cvec(0) } - open protected fun closeDoor(doorHandler: Int) { + protected open fun closeDoor(doorHandler: Int) { if (doorState != 0) { (sprite!! as SheetSpriteAnimation).currentRow = 0 doorState = 0 placeActorBlocks() lastDoorHandler = doorHandler if (!isOpacityActuallyLuminosity) setOpacity() + Terrarum.audioCodex.getRandomAudio(audioIdForClosing)?.let { startAudio(it) } } doorCloseQueued = false } - open protected fun openToRight(doorHandler: Int) { + protected open fun openToRight(doorHandler: Int) { if (doorState != 1) { (sprite!! as SheetSpriteAnimation).currentRow = 1 doorState = 1 placeActorBlocks() lastDoorHandler = doorHandler if (!isOpacityActuallyLuminosity) unsetOpacity() + Terrarum.audioCodex.getRandomAudio(audioIdForOpening)?.let { startAudio(it) } } doorCloseQueued = false } - open protected fun openToLeft(doorHandler: Int) { + protected open fun openToLeft(doorHandler: Int) { if (doorState != -1) { (sprite!! as SheetSpriteAnimation).currentRow = 2 doorState = -1 placeActorBlocks() lastDoorHandler = doorHandler if (!isOpacityActuallyLuminosity) unsetOpacity() + Terrarum.audioCodex.getRandomAudio(audioIdForOpening)?.let { startAudio(it) } } doorCloseQueued = false }