diff --git a/common/src/main/kotlin/quaedam/projection/swarm/ProjectedPersonEntity.kt b/common/src/main/kotlin/quaedam/projection/swarm/ProjectedPersonEntity.kt index 75bb6c9..0f87108 100644 --- a/common/src/main/kotlin/quaedam/projection/swarm/ProjectedPersonEntity.kt +++ b/common/src/main/kotlin/quaedam/projection/swarm/ProjectedPersonEntity.kt @@ -247,10 +247,10 @@ class ProjectedPersonEntity(entityType: EntityType, level: Le return null } - override fun getSoundVolume() = super.getSoundVolume() * (random.nextFloat() * 0.5f + 0.6f) + override fun getSoundVolume() = super.getSoundVolume() * (random.nextFloat() * 1.1f + 0.4f) - override fun getVoicePitch() = super.getVoicePitch() * (random.nextFloat() * 0.4f + 0.8f) + override fun getVoicePitch() = super.getVoicePitch() * (random.nextFloat() * 0.55f + 0.7f) - override fun getAmbientSoundInterval() = -(160 + random.nextInt(1000 - 160)) + override fun getAmbientSoundInterval() = 60 - random.nextInt(850) } \ No newline at end of file diff --git a/common/src/main/kotlin/quaedam/projection/swarm/SwarmProjectionEffect.kt b/common/src/main/kotlin/quaedam/projection/swarm/SwarmProjectionEffect.kt index 2296ac4..8bbe3bf 100644 --- a/common/src/main/kotlin/quaedam/projection/swarm/SwarmProjectionEffect.kt +++ b/common/src/main/kotlin/quaedam/projection/swarm/SwarmProjectionEffect.kt @@ -39,11 +39,9 @@ data class SwarmProjectionEffect( level.random.nextInt(area.minY(), area.maxY()), level.random.nextInt(area.minZ(), area.maxZ()), ) - spawnPos = spawnPos.atY(level.getHeight(Heightmap.Types.WORLD_SURFACE, spawnPos.x, spawnPos.z)) + spawnPos = spawnPos.atY(level.getHeight(Heightmap.Types.WORLD_SURFACE, spawnPos.x, spawnPos.z)).above() if (level.getBlockState(spawnPos.below()).isAir) return - if (!level.getBlockState(spawnPos).isAir) - return ProjectedPersonEntity.entity.get().spawn(level, spawnPos, MobSpawnType.TRIGGERED) } } diff --git a/common/src/main/resources/assets/quaedam/sounds.json b/common/src/main/resources/assets/quaedam/sounds.json index d5a239a..493db7f 100644 --- a/common/src/main/resources/assets/quaedam/sounds.json +++ b/common/src/main/resources/assets/quaedam/sounds.json @@ -55,6 +55,41 @@ "name": "entity.wandering_trader.yes", "weight": 3, "type": "event" + }, + { + "name": "quaedam:entity/projected_person/1", + "weight": 1, + "type": "file" + }, + { + "name": "quaedam:entity/projected_person/2", + "weight": 1, + "type": "file" + }, + { + "name": "quaedam:entity/projected_person/3", + "weight": 1, + "type": "file" + }, + { + "name": "quaedam:entity/projected_person/3", + "weight": 1, + "type": "file" + }, + { + "name": "quaedam:entity/projected_person/4", + "weight": 1, + "type": "file" + }, + { + "name": "quaedam:entity/projected_person/5", + "weight": 1, + "type": "file" + }, + { + "name": "quaedam:entity/projected_person/6", + "weight": 1, + "type": "file" } ] } diff --git a/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/1.ogg b/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/1.ogg new file mode 100644 index 0000000..317836e Binary files /dev/null and b/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/1.ogg differ diff --git a/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/2.ogg b/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/2.ogg new file mode 100644 index 0000000..5f963af Binary files /dev/null and b/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/2.ogg differ diff --git a/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/3.ogg b/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/3.ogg new file mode 100644 index 0000000..fc51405 Binary files /dev/null and b/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/3.ogg differ diff --git a/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/4.ogg b/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/4.ogg new file mode 100644 index 0000000..58a824b Binary files /dev/null and b/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/4.ogg differ diff --git a/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/5.ogg b/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/5.ogg new file mode 100644 index 0000000..03bc5b9 Binary files /dev/null and b/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/5.ogg differ diff --git a/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/6.ogg b/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/6.ogg new file mode 100644 index 0000000..42c5b52 Binary files /dev/null and b/common/src/main/resources/assets/quaedam/sounds/entity/projected_person/6.ogg differ