From 2de6ebd7f08ce3cfbbf2e8e4ec2c9accfb2fbf4a Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 5 Jul 2021 13:34:58 -0400 Subject: [PATCH 1/3] Fix Neighborhood Marbles2 physical sounds. These already existed in the PRP files but were not hooked up correctly. This adds all missing connections and fixes the way some objects were parented. - [PhysicalSndGroup] cSfxPhysSnd-Marble0[1-4]_0 added references to random sound mods for the physical sfx. - [CoordinateInterface] SfxMarble-(Hit|Roll)Emit0[1-4] changed parent object to MarblePhy0[1-4] as appropriate and set the parent transform offset to 0,0,0. Previously, this was parented to a root object that did not move. The other three marbles in the clock area will require the creation of new objects and will be done in another commit. --- compiled/dat/Neighborhood_District_nb01.prp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiled/dat/Neighborhood_District_nb01.prp b/compiled/dat/Neighborhood_District_nb01.prp index fc6e1aab..75137f25 100644 --- a/compiled/dat/Neighborhood_District_nb01.prp +++ b/compiled/dat/Neighborhood_District_nb01.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80997faf03a948704fe9359c3829af11a34a7e9adfe4845479504ff0b079d2d6 -size 7131501 +oid sha256:302a670d6bd694721d99c1cb2de0f7da731368dc4efdc97fb3708f93f09b3cd8 +size 7132909 From ad072b4a33a1b1e7d42c2ae1b14af1184a95ce80 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 14 Jul 2021 15:53:58 -0400 Subject: [PATCH 2/3] Revert "Fix Neighborhood Marbles2 physical sounds." This reverts commit 2de6ebd7f08ce3cfbbf2e8e4ec2c9accfb2fbf4a. The intention is to run a script over the PRP to automate this process and cleanup some of the strange object naming in the PRPs. --- compiled/dat/Neighborhood_District_nb01.prp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiled/dat/Neighborhood_District_nb01.prp b/compiled/dat/Neighborhood_District_nb01.prp index 75137f25..fc6e1aab 100644 --- a/compiled/dat/Neighborhood_District_nb01.prp +++ b/compiled/dat/Neighborhood_District_nb01.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:302a670d6bd694721d99c1cb2de0f7da731368dc4efdc97fb3708f93f09b3cd8 -size 7132909 +oid sha256:80997faf03a948704fe9359c3829af11a34a7e9adfe4845479504ff0b079d2d6 +size 7131501 From c7077991b2f91df8a6f76abfc7fcb53d0f001bcb Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 14 Jul 2021 16:33:49 -0400 Subject: [PATCH 3/3] Use CreateKickableSounds.py to fix nb01 firemarbles. This is a completely automated pass over nb01.prp with CreateKickableSounds.py from Hoikas/moul-utils using the nb01Marbles.json file. This is a good thing becuase the results are completely reproducible and some rather misleading object naming is cleaned up. --- compiled/dat/Neighborhood_District_nb01.prp | 4 +- sources/Neighborhood/nb01Marbles.json | 333 ++++++++++++++++++++ 2 files changed, 335 insertions(+), 2 deletions(-) create mode 100644 sources/Neighborhood/nb01Marbles.json diff --git a/compiled/dat/Neighborhood_District_nb01.prp b/compiled/dat/Neighborhood_District_nb01.prp index fc6e1aab..d2d668cc 100644 --- a/compiled/dat/Neighborhood_District_nb01.prp +++ b/compiled/dat/Neighborhood_District_nb01.prp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80997faf03a948704fe9359c3829af11a34a7e9adfe4845479504ff0b079d2d6 -size 7131501 +oid sha256:76aef9795d6cbb4a9959c09d9f07ed632d3d2fccb0e00c526bf1278807eea3fd +size 7151848 diff --git a/sources/Neighborhood/nb01Marbles.json b/sources/Neighborhood/nb01Marbles.json new file mode 100644 index 00000000..f2dd8e94 --- /dev/null +++ b/sources/Neighborhood/nb01Marbles.json @@ -0,0 +1,333 @@ +{ + "target": { + "age": "Neighborhood", + "page": "nb01" + }, + "soundGroups": { + "YellowFiremarble": { + "emitters": [ + { + "name": "SfxMarble-HitEmit03", + "type": "delete" + }, + { + "name": "SfxMarble-RollEmit03", + "type": "delete" + } + ] + }, + "WhiteFiremarble": { + "emitters": [ + { + "name": "SfxMarble-HitEmit04", + "type": "delete" + }, + { + "name": "SfxMarble-RollEmit04", + "type": "delete" + } + ] + }, + "BlueFiremarble": { + "emitters": [ + { + "name": "SfxMarble-HitEmit02", + "type": "delete" + }, + { + "name": "SfxMarble-RollEmit02", + "type": "delete" + } + ] + }, + "RedFiremarble": { + "emitters": [ + { + "name": "SfxMarble-HitEmit01", + "type": "delete" + }, + { + "name": "SfxMarble-RollEmit01", + "type": "delete" + } + ] + }, + "MarblePhy01": { + "type": "kUser1", + "emitters": [ + { + "name": "SfxMarble-HitEmit03", + "type": "delete" + }, + { + "name": "SfxMarble-RollEmit03", + "type": "delete" + }, + { + "name": "SfxMarble-RollEmit01", + "type": "roll", + "soundSettings": { + "desiredVolume": 0.498469 + }, + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_RollLp01.ogg", + "pFMarbleStn_RollLp02.ogg", + "pFMarbleStn_RollLp03.ogg" + ] + }, + { + "name": "SfxMarble-HitEmit01", + "type": "hit", + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_Hit01.ogg", + "pFMarbleStn_Hit02.ogg", + "pFMarbleStn_Hit03.ogg", + "pFMarbleStn_Hit04.ogg", + "pFMarbleStn_Hit05.ogg", + "pFMarbleStn_Hit06.ogg" + ] + } + ] + }, + "MarblePhy02": { + "type": "kUser1", + "emitters": [ + { + "name": "SfxMarble-HitEmit04", + "type": "delete" + }, + { + "name": "SfxMarble-RollEmit04", + "type": "delete" + }, + { + "name": "SfxMarble-RollEmit02", + "type": "roll", + "soundSettings": { + "desiredVolume": 0.498469 + }, + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_RollLp01.ogg", + "pFMarbleStn_RollLp02.ogg", + "pFMarbleStn_RollLp03.ogg" + ] + }, + { + "name": "SfxMarble-HitEmit02", + "type": "hit", + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_Hit01.ogg", + "pFMarbleStn_Hit02.ogg", + "pFMarbleStn_Hit03.ogg", + "pFMarbleStn_Hit04.ogg", + "pFMarbleStn_Hit05.ogg", + "pFMarbleStn_Hit06.ogg" + ] + } + ] + }, + "MarblePhy03": { + "type": "kUser1", + "emitters": [ + { + "name": "SfxMarble-HitEmit02", + "type": "delete" + }, + { + "name": "SfxMarble-RollEmit02", + "type": "delete" + }, + { + "name": "SfxMarble-RollEmit03", + "type": "roll", + "soundSettings": { + "desiredVolume": 0.498469 + }, + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_RollLp01.ogg", + "pFMarbleStn_RollLp02.ogg", + "pFMarbleStn_RollLp03.ogg" + ] + }, + { + "name": "SfxMarble-HitEmit03", + "type": "hit", + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_Hit01.ogg", + "pFMarbleStn_Hit02.ogg", + "pFMarbleStn_Hit03.ogg", + "pFMarbleStn_Hit04.ogg", + "pFMarbleStn_Hit05.ogg", + "pFMarbleStn_Hit06.ogg" + ] + } + ] + }, + "MarblePhy04": { + "type": "kUser1", + "emitters": [ + { + "name": "SfxMarble-HitEmit01", + "type": "delete" + }, + { + "name": "SfxMarble-RollEmit01", + "type": "delete" + }, + { + "name": "SfxMarble-RollEmit04", + "type": "roll", + "soundSettings": { + "desiredVolume": 0.498469 + }, + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_RollLp01.ogg", + "pFMarbleStn_RollLp02.ogg", + "pFMarbleStn_RollLp03.ogg" + ] + }, + { + "name": "SfxMarble-HitEmit04", + "type": "hit", + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_Hit01.ogg", + "pFMarbleStn_Hit02.ogg", + "pFMarbleStn_Hit03.ogg", + "pFMarbleStn_Hit04.ogg", + "pFMarbleStn_Hit05.ogg", + "pFMarbleStn_Hit06.ogg" + ] + } + ] + }, + "MarblePhy06": { + "type": "kUser1", + "emitters": [ + { + "name": "SfxMarble-RollEmit06", + "type": "roll", + "soundSettings": { + "desiredVolume": 0.498469 + }, + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_RollLp01.ogg", + "pFMarbleStn_RollLp02.ogg", + "pFMarbleStn_RollLp03.ogg" + ] + }, + { + "name": "SfxMarble-HitEmit06", + "type": "hit", + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_Hit01.ogg", + "pFMarbleStn_Hit02.ogg", + "pFMarbleStn_Hit03.ogg", + "pFMarbleStn_Hit04.ogg", + "pFMarbleStn_Hit05.ogg", + "pFMarbleStn_Hit06.ogg" + ] + } + ] + }, + "MarblePhy07": { + "type": "kUser1", + "emitters": [ + { + "name": "SfxMarble-RollEmit07", + "type": "roll", + "soundSettings": { + "desiredVolume": 0.498469 + }, + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_RollLp01.ogg", + "pFMarbleStn_RollLp02.ogg", + "pFMarbleStn_RollLp03.ogg" + ] + }, + { + "name": "SfxMarble-HitEmit07", + "type": "hit", + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_Hit01.ogg", + "pFMarbleStn_Hit02.ogg", + "pFMarbleStn_Hit03.ogg", + "pFMarbleStn_Hit04.ogg", + "pFMarbleStn_Hit05.ogg", + "pFMarbleStn_Hit06.ogg" + ] + } + ] + }, + "MarblePhy08": { + "type": "kUser1", + "emitters": [ + { + "name": "SfxMarble-RollEmit08", + "type": "roll", + "soundSettings": { + "desiredVolume": 0.498469 + }, + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_RollLp01.ogg", + "pFMarbleStn_RollLp02.ogg", + "pFMarbleStn_RollLp03.ogg" + ] + }, + { + "name": "SfxMarble-HitEmit08", + "type": "hit", + "eaxSettings": { + "enable": true + }, + "sounds": [ + "pFMarbleStn_Hit01.ogg", + "pFMarbleStn_Hit02.ogg", + "pFMarbleStn_Hit03.ogg", + "pFMarbleStn_Hit04.ogg", + "pFMarbleStn_Hit05.ogg", + "pFMarbleStn_Hit06.ogg" + ] + } + ] + } + } +}