From d220760ed3a80e67f9695c76a227aed140037099 Mon Sep 17 00:00:00 2001 From: SnailPerson <97041048+SnailPerson@users.noreply.github.com> Date: Sun, 9 Jun 2024 22:10:47 +0200 Subject: [PATCH] Bench sound additions and adjustments Adjusted all bench sound sound distance values Added missing sound code for: - Vehicle bench - Engine bench - Propeller bench - Wheel bench --- .../mts/jsondefs/decors/custombench.json | 6 +- .../mts/jsondefs/decors/decorbench.json | 8 +- .../mts/jsondefs/decors/enginebench.json | 103 ++++++++++++++-- .../assets/mts/jsondefs/decors/gunbench.json | 4 +- .../mts/jsondefs/decors/instrumentbench.json | 6 +- .../assets/mts/jsondefs/decors/itembench.json | 8 +- .../mts/jsondefs/decors/propellerbench.json | 112 ++++++++++++++++-- .../assets/mts/jsondefs/decors/seatbench.json | 4 +- .../mts/jsondefs/decors/vehiclebench.json | 101 ++++++++++++++-- .../mts/jsondefs/decors/wheelbench.json | 102 ++++++++++++++-- 10 files changed, 406 insertions(+), 48 deletions(-) diff --git a/mccore/src/main/resources/assets/mts/jsondefs/decors/custombench.json b/mccore/src/main/resources/assets/mts/jsondefs/decors/custombench.json index a47646c69..48d1a4b25 100644 --- a/mccore/src/main/resources/assets/mts/jsondefs/decors/custombench.json +++ b/mccore/src/main/resources/assets/mts/jsondefs/decors/custombench.json @@ -43,7 +43,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 10.0, "maxDistanceVolume": 0.0 }, { @@ -64,7 +64,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 10.0, "maxDistanceVolume": 0.0 }, { @@ -85,7 +85,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 10.0, "maxDistanceVolume": 0.0 } ], diff --git a/mccore/src/main/resources/assets/mts/jsondefs/decors/decorbench.json b/mccore/src/main/resources/assets/mts/jsondefs/decors/decorbench.json index c1914d34a..cfed7c201 100644 --- a/mccore/src/main/resources/assets/mts/jsondefs/decors/decorbench.json +++ b/mccore/src/main/resources/assets/mts/jsondefs/decors/decorbench.json @@ -35,7 +35,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 6.0, "maxDistanceVolume": 0.0 }, { @@ -53,7 +53,7 @@ "looping": true, "minDistance": 0.0, "minDistanceVolume": 0.5, - "maxDistance": 15.0, + "maxDistance": 6.0, "maxDistanceVolume": 0.0 }, { @@ -75,7 +75,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 10.0, "maxDistanceVolume": 0.0 }, { @@ -90,7 +90,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 6.0, "maxDistanceVolume": 0.0 } ], diff --git a/mccore/src/main/resources/assets/mts/jsondefs/decors/enginebench.json b/mccore/src/main/resources/assets/mts/jsondefs/decors/enginebench.json index 33a512066..a55b910ac 100644 --- a/mccore/src/main/resources/assets/mts/jsondefs/decors/enginebench.json +++ b/mccore/src/main/resources/assets/mts/jsondefs/decors/enginebench.json @@ -1,10 +1,99 @@ { - "general": { - "name": "Engine Bench", - "materials": [], - "width": 1.0, - "height": 1.0, - "depth": 1.0, - "itemTypes": ["part"], "partTypes": ["engine_"] + "decor": { + "type": "generic", + "width": 1.0, + "height": 1.0, + "depth": 1.0, + "crafting": { + "itemTypes": [ + "part" + ], + "partTypes": [ + "engine_" + ] } + }, + "definitions": [ + { + "subName": "", + "name": "Engine Bench", + "extraMaterialLists": [ + [] + ] + } + ], + "rendering": { + "lightObjects": [], + "sounds": [ + { + "name": "mts:bench/enginebench_open0", + "soundVariations": [ + "mts:bench/enginebench_open0", + "mts:bench/enginebench_open1", + "mts:bench/enginebench_open2" + ], + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_interacting", + "clampMin": 1.0, + "clampMax": 1.0 + } + ], + "minDistance": 0.0, + "minDistanceVolume": 1.0, + "maxDistance": 10.0, + "maxDistanceVolume": 0.0 + }, + { + "name": "mts:bench/enginebench_craft0", + "soundVariations": [ + "mts:bench/enginebench_craft0", + "mts:bench/enginebench_craft1", + "mts:bench/enginebench_craft2" + ], + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_crafteditem", + "clampMin": 1.0, + "clampMax": 1.0 + } + ], + "minDistance": 0.0, + "minDistanceVolume": 1.0, + "maxDistance": 13.0, + "maxDistanceVolume": 0.0 + }, + { + "name": "mts:bench/enginebench_close0", + "soundVariations": [ + "mts:bench/enginebench_close0", + "mts:bench/enginebench_close1", + "mts:bench/enginebench_close2" + ], + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_interacting", + "clampMin": 0.0, + "clampMax": 0.0 + } + ], + "minDistance": 0.0, + "minDistanceVolume": 1.0, + "maxDistance": 10.0, + "maxDistanceVolume": 0.0 + } + ], + "modelType": "obj" + }, + "general": { + "name": "Engine Bench", + "materialLists": [ + [] + ], + "radarWidth": 0.0, + "radarRange": 0.0 + } } \ No newline at end of file diff --git a/mccore/src/main/resources/assets/mts/jsondefs/decors/gunbench.json b/mccore/src/main/resources/assets/mts/jsondefs/decors/gunbench.json index 81f680599..2284a4ae7 100644 --- a/mccore/src/main/resources/assets/mts/jsondefs/decors/gunbench.json +++ b/mccore/src/main/resources/assets/mts/jsondefs/decors/gunbench.json @@ -56,7 +56,7 @@ "looping": true, "minDistance": 0.0, "minDistanceVolume": 0.5, - "maxDistance": 15.0, + "maxDistance": 18.0, "maxDistanceVolume": 0.0 }, { @@ -77,7 +77,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 13.0, "maxDistanceVolume": 0.0 }, { diff --git a/mccore/src/main/resources/assets/mts/jsondefs/decors/instrumentbench.json b/mccore/src/main/resources/assets/mts/jsondefs/decors/instrumentbench.json index b0360abc0..21eeac7fc 100644 --- a/mccore/src/main/resources/assets/mts/jsondefs/decors/instrumentbench.json +++ b/mccore/src/main/resources/assets/mts/jsondefs/decors/instrumentbench.json @@ -39,7 +39,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 10.0, "maxDistanceVolume": 0.0 }, { @@ -59,7 +59,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 10.0, "maxDistanceVolume": 0.0 }, { @@ -79,7 +79,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 10.0, "maxDistanceVolume": 0.0 } ], diff --git a/mccore/src/main/resources/assets/mts/jsondefs/decors/itembench.json b/mccore/src/main/resources/assets/mts/jsondefs/decors/itembench.json index dbf9528f8..e6b700d67 100644 --- a/mccore/src/main/resources/assets/mts/jsondefs/decors/itembench.json +++ b/mccore/src/main/resources/assets/mts/jsondefs/decors/itembench.json @@ -35,7 +35,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 6.0, "maxDistanceVolume": 0.0 }, { @@ -53,7 +53,7 @@ "looping": true, "minDistance": 0.0, "minDistanceVolume": 0.5, - "maxDistance": 15.0, + "maxDistance": 6.0, "maxDistanceVolume": 0.0 }, { @@ -68,7 +68,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 10.0, "maxDistanceVolume": 0.0 }, { @@ -83,7 +83,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 6.0, "maxDistanceVolume": 0.0 } ], diff --git a/mccore/src/main/resources/assets/mts/jsondefs/decors/propellerbench.json b/mccore/src/main/resources/assets/mts/jsondefs/decors/propellerbench.json index ee091b06c..c6def6db3 100644 --- a/mccore/src/main/resources/assets/mts/jsondefs/decors/propellerbench.json +++ b/mccore/src/main/resources/assets/mts/jsondefs/decors/propellerbench.json @@ -1,11 +1,107 @@ { - "general": { - "name": "Propeller Bench", - "materials": [], - "width": 1.0, - "height": 1.0, - "depth": 1.0, - "itemTypes": ["part"], - "partTypes": ["propeller"] + "decor": { + "type": "generic", + "width": 1.0, + "height": 1.0, + "depth": 1.0, + "crafting": { + "itemTypes": [ + "part" + ], + "partTypes": [ + "propeller" + ] } + }, + "definitions": [ + { + "subName": "", + "name": "Propeller Bench", + "extraMaterialLists": [ + [] + ] + } + ], + "rendering": { + "lightObjects": [], + "sounds": [ + { + "name": "mts:bench/propellerbench_start", + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_interacting", + "clampMin": 1.0, + "clampMax": 1.0 + } + ], + "minDistance": 0.0, + "minDistanceVolume": 1.0, + "maxDistance": 15.0, + "maxDistanceVolume": 0.0 + }, + { + "name": "mts:bench/propellerbench_loop", + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_interacting", + "forwardsDelay": 15, + "reverseDelay": 15, + "clampMin": 1.0, + "clampMax": 1.0 + } + ], + "looping": true, + "minDistance": 0.0, + "minDistanceVolume": 0.8, + "maxDistance": 20.0, + "maxDistanceVolume": 0.0 + }, + { + "name": "mts:bench/propellerbench_craft0", + "soundVariations": [ + "mts:bench/propellerbench_craft0", + "mts:bench/propellerbench_craft1", + "mts:bench/propellerbench_craft2" + ], + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_crafteditem", + "clampMin": 1.0, + "clampMax": 1.0 + } + ], + "minDistance": 0.0, + "minDistanceVolume": 1.0, + "maxDistance": 20.0, + "maxDistanceVolume": 0.0 + }, + { + "name": "mts:bench/propellerbench_stop", + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_interacting", + "clampMin": 0.0, + "clampMax": 0.0 + } + ], + "minDistance": 0.0, + "minDistanceVolume": 1.0, + "maxDistance": 15.0, + "maxDistanceVolume": 0.0 + } + ], + "modelType": "obj" + }, + "general": { + "name": "Propeller Bench", + "materialLists": [ + [] + ], + "radarWidth": 0.0, + "radarRange": 0.0 + } } \ No newline at end of file diff --git a/mccore/src/main/resources/assets/mts/jsondefs/decors/seatbench.json b/mccore/src/main/resources/assets/mts/jsondefs/decors/seatbench.json index 0b11efd49..b68227401 100644 --- a/mccore/src/main/resources/assets/mts/jsondefs/decors/seatbench.json +++ b/mccore/src/main/resources/assets/mts/jsondefs/decors/seatbench.json @@ -58,7 +58,7 @@ "looping": true, "minDistance": 0.0, "minDistanceVolume": 0.5, - "maxDistance": 15.0, + "maxDistance": 20.0, "maxDistanceVolume": 0.0 }, { @@ -78,7 +78,7 @@ ], "minDistance": 0.0, "minDistanceVolume": 1.0, - "maxDistance": 15.0, + "maxDistance": 20.0, "maxDistanceVolume": 0.0 }, { diff --git a/mccore/src/main/resources/assets/mts/jsondefs/decors/vehiclebench.json b/mccore/src/main/resources/assets/mts/jsondefs/decors/vehiclebench.json index 4be0673e1..b66497f63 100644 --- a/mccore/src/main/resources/assets/mts/jsondefs/decors/vehiclebench.json +++ b/mccore/src/main/resources/assets/mts/jsondefs/decors/vehiclebench.json @@ -1,10 +1,97 @@ { - "general": { - "name": "Vehicle Bench", - "materials": [], - "width": 1.0, - "height": 1.0, - "depth": 1.0, - "itemTypes": ["vehicle"] + "decor": { + "type": "generic", + "width": 1.0, + "height": 1.0, + "depth": 1.0, + "crafting": { + "itemTypes": [ + "vehicle" + ] } + }, + "definitions": [ + { + "subName": "", + "name": "Vehicle Bench", + "extraMaterialLists": [ + [] + ] + } + ], + "rendering": { + "lightObjects": [], + "sounds": [ + { + "name": "mts:bench/vehiclebench_open0", + "soundVariations": [ + "mts:bench/vehiclebench_open0", + "mts:bench/vehiclebench_open1", + "mts:bench/vehiclebench_open2" + ], + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_interacting", + "clampMin": 1.0, + "clampMax": 1.0 + } + ], + "minDistance": 0.0, + "minDistanceVolume": 1.0, + "maxDistance": 6.0, + "maxDistanceVolume": 0.0 + }, + { + "name": "mts:bench/vehiclebench_craft0", + "soundVariations": [ + "mts:bench/vehiclebench_craft0", + "mts:bench/vehiclebench_craft1", + "mts:bench/vehiclebench_craft2" + ], + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_crafteditem", + "clampMin": 1.0, + "clampMax": 1.0 + } + ], + "minDistance": 0.0, + "minDistanceVolume": 1.0, + "maxDistance": 10.0, + "maxDistanceVolume": 0.0 + }, + { + "name": "mts:bench/vehiclebench_close0", + "soundVariations": [ + "mts:bench/vehiclebench_close0", + "mts:bench/vehiclebench_close1", + "mts:bench/vehiclebench_close2", + "mts:bench/vehiclebench_close3" + ], + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_interacting", + "clampMin": 0.0, + "clampMax": 0.0 + } + ], + "minDistance": 0.0, + "minDistanceVolume": 1.0, + "maxDistance": 6.0, + "maxDistanceVolume": 0.0 + } + ], + "modelType": "obj" + }, + "general": { + "name": "Vehicle Bench", + "materialLists": [ + [] + ], + "radarWidth": 0.0, + "radarRange": 0.0 + } } \ No newline at end of file diff --git a/mccore/src/main/resources/assets/mts/jsondefs/decors/wheelbench.json b/mccore/src/main/resources/assets/mts/jsondefs/decors/wheelbench.json index df2d78e6c..9c30db2b1 100644 --- a/mccore/src/main/resources/assets/mts/jsondefs/decors/wheelbench.json +++ b/mccore/src/main/resources/assets/mts/jsondefs/decors/wheelbench.json @@ -1,11 +1,97 @@ { - "general": { - "name": "Wheel Bench", - "materials": [], - "width": 1.0, - "height": 1.0, - "depth": 1.0, - "itemTypes": ["part"], - "partTypes": ["ground_"] + "decor": { + "type": "generic", + "width": 1.0, + "height": 1.0, + "depth": 1.0, + "crafting": { + "itemTypes": [ + "part" + ], + "partTypes": [ + "ground_" + ] } + }, + "definitions": [ + { + "subName": "", + "name": "Wheel Bench", + "extraMaterialLists": [ + [] + ] + } + ], + "rendering": { + "lightObjects": [], + "sounds": [ + { + "name": "mts:bench/wheelbench_open0", + "soundVariations": [ + "mts:bench/wheelbench_open0", + "mts:bench/wheelbench_open1" + ], + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_interacting", + "clampMin": 1.0, + "clampMax": 1.0 + } + ], + "minDistance": 0.0, + "minDistanceVolume": 1.0, + "maxDistance": 10.0, + "maxDistanceVolume": 0.0 + }, + { + "name": "mts:bench/wheelbench_craft0", + "soundVariations": [ + "mts:bench/wheelbench_craft0", + "mts:bench/wheelbench_craft1", + "mts:bench/wheelbench_craft2" + ], + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_crafteditem", + "clampMin": 1.0, + "clampMax": 1.0 + } + ], + "minDistance": 0.0, + "minDistanceVolume": 1.0, + "maxDistance": 15.0, + "maxDistanceVolume": 0.0 + }, + { + "name": "mts:bench/wheelbench_close0", + "soundVariations": [ + "mts:bench/wheelbench_close0", + "mts:bench/wheelbench_close1" + ], + "activeAnimations": [ + { + "animationType": "visibility", + "variable": "player_interacting", + "clampMin": 0.0, + "clampMax": 0.0 + } + ], + "minDistance": 0.0, + "minDistanceVolume": 1.0, + "maxDistance": 10.0, + "maxDistanceVolume": 0.0 + } + ], + "modelType": "obj" + }, + "general": { + "name": "Wheel Bench", + "materialLists": [ + [] + ], + "radarWidth": 0.0, + "radarRange": 0.0 + } } \ No newline at end of file