xtex/quaedam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: adjust noise parameters

Browse Source
This commit is contained in:
xtex 2023-07-29 16:10:03 +08:00
parent a575f183b4
commit 7fcd199b9f
Signed by: xtex
GPG Key ID: B918086ED8045B91
2 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/main/kotlin/quaedam/projection/misc/NoiseProjection.kt
View File

@ -70,18 +70,24 @@ object NoiseProjection {
} }
private fun playRandomNoise(random: RandomSource, game: Minecraft) { private fun playRandomNoise(random: RandomSource, game: Minecraft) {
val volumeFactor = random.nextInt(100)
val sound = SimpleSoundInstance( val sound = SimpleSoundInstance(
soundEvent.get().location, soundEvent.get().location,
SoundSource.AMBIENT, SoundSource.AMBIENT,
random.nextFloat() * 0.6f + 0.7f, when (volumeFactor) {
in 0..8 -> random.nextFloat() * 0.65f
in 10..15 -> random.nextFloat() * 0.5f + 0.5f
in 21..50 -> random.nextFloat() * 0.3f
else -> random.nextFloat() * 0.2f
},
random.nextFloat() + 0.4f, random.nextFloat() + 0.4f,
RandomSource.create(random.nextLong()), RandomSource.create(random.nextLong()),
false, false,
0, 0,
SoundInstance.Attenuation.NONE, SoundInstance.Attenuation.NONE,
random.nextFloat() * 24.0 - 12, random.nextFloat() * 28.0 - 14,
random.nextFloat() * 24.0 - 12,
random.nextFloat() * 12.0 - 2, random.nextFloat() * 12.0 - 2,
random.nextFloat() * 28.0 - 14,
true true
) )
game.soundManager.playDelayed(sound, random.nextInt(3)) game.soundManager.playDelayed(sound, random.nextInt(3))
@ -95,7 +101,7 @@ object NoiseProjectionBlock : EntityProjectionBlock<NoiseProjectionEffect>(creat
} }
data class NoiseProjectionEffect(var rate: Int = 10, var amount: Int = 3) : ProjectionEffect(), data class NoiseProjectionEffect(var rate: Int = 120, var amount: Int = 3) : ProjectionEffect(),
ProjectionEffectShell.Provider { ProjectionEffectShell.Provider {
companion object { companion object {

42
common/src/main/resources/assets/quaedam/sounds.json
View File

@ -98,23 +98,55 @@
"quaedam.projection.noise": { "quaedam.projection.noise": {
"sounds": [ "sounds": [
{ {
"name": "entity.villager.work_librarian", "name": "entity.villager.work_armorer",
"weight": 2, "type": "event"
},
{
"name": "entity.villager.work_butcher",
"type": "event"
},
{
"name": "entity.villager.work_cartographer",
"type": "event" "type": "event"
}, },
{ {
"name": "entity.villager.work_cleric", "name": "entity.villager.work_cleric",
"weight": 2, "type": "event"
},
{
"name": "entity.villager.work_farmer",
"type": "event"
},
{
"name": "entity.villager.work_fisherman",
"type": "event"
},
{
"name": "entity.villager.work_fletcher",
"type": "event"
},
{
"name": "entity.villager.work_leatherworker",
"type": "event"
},
{
"name": "entity.villager.work_librarian",
"type": "event" "type": "event"
}, },
{ {
"name": "entity.villager.work_mason", "name": "entity.villager.work_mason",
"weight": 2,
"type": "event" "type": "event"
}, },
{ {
"name": "entity.villager.work_shepherd", "name": "entity.villager.work_shepherd",
"weight": 2, "type": "event"
},
{
"name": "entity.villager.work_toolsmith",
"type": "event"
},
{
"name": "entity.villager.work_weaponsmith",
"type": "event" "type": "event"
} }
] ]