diff --git a/packs/smart_items/assets/ambient_sound_birds/composite.json b/packs/smart_items/assets/ambient_sound_birds/composite.json index 85fffb0c7..13d50cb8d 100644 --- a/packs/smart_items/assets/ambient_sound_birds/composite.json +++ b/packs/smart_items/assets/ambient_sound_birds/composite.json @@ -43,17 +43,21 @@ { "name": "Play once", "type": "play_sound", - "jsonPayload": "{\"src\":\"{assetPath}/birds_(1).mp3\"}" + "jsonPayload": "{\"src\":\"{assetPath}/birds_(1).mp3\"}", + "allowedInBasicView": true }, { "name": "Loop", "type": "play_sound", - "jsonPayload": "{\"loop\":true,\"src\":\"{assetPath}/birds_(1).mp3\"}" + "jsonPayload": "{\"loop\":true,\"src\":\"{assetPath}/birds_(1).mp3\"}", + "allowedInBasicView": true, + "basicViewId": "loop-sound" }, { "name": "Stop", "type": "stop_sound", - "jsonPayload": "{}" + "jsonPayload": "{}", + "allowedInBasicView": true } ] } @@ -81,6 +85,25 @@ } } } + }, + { + "name": "inspector::Config", + "data": { + "0": { + "json": { + "isBasicViewEnabled": true, + "componentName": "Ambient Sound", + "fields": [ + { + "name": "Sound", + "type": "asset-packs::Actions", + "basicViewId": "loop-sound", + "layout": "{\"src\": { \"field\": \"TextField\", \"type\": \"text\", \"label\": \"Sound Path\" } , \"volume\": { \"field\": \"RangeField\", \"label\": \"Volume\", \"step\": \"0.01\", \"min\": \"0\", \"max\": \"1\", \"default\": \"1\" } }" + } + ] + } + } + } } ] } \ No newline at end of file diff --git a/packs/smart_items/assets/ambient_sound_birds_alt/composite.json b/packs/smart_items/assets/ambient_sound_birds_alt/composite.json index 57d5a50ae..fd138d5be 100644 --- a/packs/smart_items/assets/ambient_sound_birds_alt/composite.json +++ b/packs/smart_items/assets/ambient_sound_birds_alt/composite.json @@ -43,17 +43,21 @@ { "name": "Play once", "type": "play_sound", - "jsonPayload": "{\"src\":\"{assetPath}/Field.mp3\"}" + "jsonPayload": "{\"src\":\"{assetPath}/Field.mp3\"}", + "allowedInBasicView": true }, { "name": "Loop", "type": "play_sound", - "jsonPayload": "{\"loop\":true,\"src\":\"{assetPath}/Field.mp3\"}" + "jsonPayload": "{\"loop\":true,\"src\":\"{assetPath}/Field.mp3\"}", + "allowedInBasicView": true, + "basicViewId": "loop-sound" }, { "name": "Stop", "type": "stop_sound", - "jsonPayload": "{}" + "jsonPayload": "{}", + "allowedInBasicView": true } ] } @@ -81,6 +85,25 @@ } } } + }, + { + "name": "inspector::Config", + "data": { + "0": { + "json": { + "isBasicViewEnabled": true, + "componentName": "Ambient Sound", + "fields": [ + { + "name": "Sound", + "type": "asset-packs::Actions", + "basicViewId": "loop-sound", + "layout": "{\"src\": { \"field\": \"TextField\", \"type\": \"text\", \"label\": \"Sound Path\" } , \"volume\": { \"field\": \"RangeField\", \"label\": \"Volume\", \"step\": \"0.01\", \"min\": \"0\", \"max\": \"1\", \"default\": \"1\" } }" + } + ] + } + } + } } ] } \ No newline at end of file diff --git a/packs/smart_items/assets/ambient_sound_city/composite.json b/packs/smart_items/assets/ambient_sound_city/composite.json index 940155eb3..f0aa56f22 100644 --- a/packs/smart_items/assets/ambient_sound_city/composite.json +++ b/packs/smart_items/assets/ambient_sound_city/composite.json @@ -43,17 +43,21 @@ { "name": "Play once", "type": "play_sound", - "jsonPayload": "{\"src\":\"{assetPath}/City.mp3\"}" + "jsonPayload": "{\"src\":\"{assetPath}/City.mp3\"}", + "allowedInBasicView": true }, { "name": "Loop", "type": "play_sound", - "jsonPayload": "{\"loop\":true,\"src\":\"{assetPath}/City.mp3\"}" + "jsonPayload": "{\"loop\":true,\"src\":\"{assetPath}/City.mp3\"}", + "allowedInBasicView": true, + "basicViewId": "loop-sound" }, { "name": "Stop", "type": "stop_sound", - "jsonPayload": "{}" + "jsonPayload": "{}", + "allowedInBasicView": true } ] } @@ -81,6 +85,25 @@ } } } + }, + { + "name": "inspector::Config", + "data": { + "0": { + "json": { + "isBasicViewEnabled": true, + "componentName": "Ambient Sound", + "fields": [ + { + "name": "Sound", + "type": "asset-packs::Actions", + "basicViewId": "loop-sound", + "layout": "{\"src\": { \"field\": \"TextField\", \"type\": \"text\", \"label\": \"Sound Path\" } , \"volume\": { \"field\": \"RangeField\", \"label\": \"Volume\", \"step\": \"0.01\", \"min\": \"0\", \"max\": \"1\", \"default\": \"1\" } }" + } + ] + } + } + } } ] } \ No newline at end of file diff --git a/packs/smart_items/assets/ambient_sound_crickets/composite.json b/packs/smart_items/assets/ambient_sound_crickets/composite.json index edd73fd02..87808ebf9 100644 --- a/packs/smart_items/assets/ambient_sound_crickets/composite.json +++ b/packs/smart_items/assets/ambient_sound_crickets/composite.json @@ -43,17 +43,21 @@ { "name": "Play once", "type": "play_sound", - "jsonPayload": "{\"src\":\"{assetPath}/Swamp.mp3\"}" + "jsonPayload": "{\"src\":\"{assetPath}/Swamp.mp3\"}", + "allowedInBasicView": true }, { "name": "Loop", "type": "play_sound", - "jsonPayload": "{\"loop\":true,\"src\":\"{assetPath}/Swamp.mp3\"}" + "jsonPayload": "{\"loop\":true,\"src\":\"{assetPath}/Swamp.mp3\"}", + "allowedInBasicView": true, + "basicViewId": "loop-sound" }, { "name": "Stop", "type": "stop_sound", - "jsonPayload": "{}" + "jsonPayload": "{}", + "allowedInBasicView": true } ] } @@ -81,6 +85,25 @@ } } } + }, + { + "name": "inspector::Config", + "data": { + "0": { + "json": { + "isBasicViewEnabled": true, + "componentName": "Ambient Sound", + "fields": [ + { + "name": "Sound", + "type": "asset-packs::Actions", + "basicViewId": "loop-sound", + "layout": "{\"src\": { \"field\": \"TextField\", \"type\": \"text\", \"label\": \"Sound Path\" } , \"volume\": { \"field\": \"RangeField\", \"label\": \"Volume\", \"step\": \"0.01\", \"min\": \"0\", \"max\": \"1\", \"default\": \"1\" } }" + } + ] + } + } + } } ] } \ No newline at end of file diff --git a/packs/smart_items/assets/ambient_sound_factory/composite.json b/packs/smart_items/assets/ambient_sound_factory/composite.json index e2fc8c6a2..bba2bb109 100644 --- a/packs/smart_items/assets/ambient_sound_factory/composite.json +++ b/packs/smart_items/assets/ambient_sound_factory/composite.json @@ -43,17 +43,21 @@ { "name": "Play once", "type": "play_sound", - "jsonPayload": "{\"src\":\"{assetPath}/Factory.mp3\"}" + "jsonPayload": "{\"src\":\"{assetPath}/Factory.mp3\"}", + "allowedInBasicView": true }, { "name": "Loop", "type": "play_sound", - "jsonPayload": "{\"loop\":true,\"src\":\"{assetPath}/Factory.mp3\"}" + "jsonPayload": "{\"loop\":true,\"src\":\"{assetPath}/Factory.mp3\"}", + "allowedInBasicView": true, + "basicViewId": "loop-sound" }, { "name": "Stop", "type": "stop_sound", - "jsonPayload": "{}" + "jsonPayload": "{}", + "allowedInBasicView": true } ] } @@ -81,6 +85,25 @@ } } } + }, + { + "name": "inspector::Config", + "data": { + "0": { + "json": { + "isBasicViewEnabled": true, + "componentName": "Ambient Sound", + "fields": [ + { + "name": "Sound", + "type": "asset-packs::Actions", + "basicViewId": "loop-sound", + "layout": "{\"src\": { \"field\": \"TextField\", \"type\": \"text\", \"label\": \"Sound Path\" } , \"volume\": { \"field\": \"RangeField\", \"label\": \"Volume\", \"step\": \"0.01\", \"min\": \"0\", \"max\": \"1\", \"default\": \"1\" } }" + } + ] + } + } + } } ] } \ No newline at end of file diff --git a/packs/smart_items/assets/ambient_sound_town/composite.json b/packs/smart_items/assets/ambient_sound_town/composite.json index 087033db3..d59aabc41 100644 --- a/packs/smart_items/assets/ambient_sound_town/composite.json +++ b/packs/smart_items/assets/ambient_sound_town/composite.json @@ -43,17 +43,21 @@ { "name": "Play once", "type": "play_sound", - "jsonPayload": "{\"src\":\"{assetPath}/Town.mp3\"}" + "jsonPayload": "{\"src\":\"{assetPath}/Town.mp3\"}", + "allowedInBasicView": true }, { "name": "Loop", "type": "play_sound", - "jsonPayload": "{\"loop\":true,\"src\":\"{assetPath}/Town.mp3\"}" + "jsonPayload": "{\"loop\":true,\"src\":\"{assetPath}/Town.mp3\"}", + "allowedInBasicView": true, + "basicViewId": "loop-sound" }, { "name": "Stop", "type": "stop_sound", - "jsonPayload": "{}" + "jsonPayload": "{}", + "allowedInBasicView": true } ] } @@ -81,6 +85,25 @@ } } } + }, + { + "name": "inspector::Config", + "data": { + "0": { + "json": { + "isBasicViewEnabled": true, + "componentName": "Ambient Sound", + "fields": [ + { + "name": "Sound", + "type": "asset-packs::Actions", + "basicViewId": "loop-sound", + "layout": "{\"src\": { \"field\": \"TextField\", \"type\": \"text\", \"label\": \"Sound Path\" } , \"volume\": { \"field\": \"RangeField\", \"label\": \"Volume\", \"step\": \"0.01\", \"min\": \"0\", \"max\": \"1\", \"default\": \"1\" } }" + } + ] + } + } + } } ] } \ No newline at end of file diff --git a/packs/smart_items/assets/arrow/composite.json b/packs/smart_items/assets/arrow/composite.json index 269779fac..cbc873c45 100644 --- a/packs/smart_items/assets/arrow/composite.json +++ b/packs/smart_items/assets/arrow/composite.json @@ -62,17 +62,32 @@ { "name": "Hide", "type": "set_visibility", - "jsonPayload": "{\"visible\":false,\"collider\":0}" + "jsonPayload": "{\"visible\":false,\"collider\":0}", + "allowedInBasicView": true }, { "name": "Show", "type": "set_visibility", - "jsonPayload": "{\"visible\":true,\"collider\":0}" + "jsonPayload": "{\"visible\":true,\"collider\":0}", + "allowedInBasicView": true } ] } } } + }, + { + "name": "inspector::Config", + "data": { + "0": { + "json": { + "isBasicViewEnabled": true, + "componentName": "Arrow", + "fields": [ + ] + } + } + } } ] } \ No newline at end of file diff --git a/packs/smart_items/assets/arrow_blue/composite.json b/packs/smart_items/assets/arrow_blue/composite.json index 64a1dc645..9cd272868 100644 --- a/packs/smart_items/assets/arrow_blue/composite.json +++ b/packs/smart_items/assets/arrow_blue/composite.json @@ -62,17 +62,32 @@ { "name": "Hide", "type": "set_visibility", - "jsonPayload": "{\"visible\":false,\"collider\":0}" + "jsonPayload": "{\"visible\":false,\"collider\":0}", + "allowedInBasicView": true }, { "name": "Show", "type": "set_visibility", - "jsonPayload": "{\"visible\":true,\"collider\":0}" + "jsonPayload": "{\"visible\":true,\"collider\":0}", + "allowedInBasicView": true } ] } } } + }, + { + "name": "inspector::Config", + "data": { + "0": { + "json": { + "isBasicViewEnabled": true, + "componentName": "Arrow", + "fields": [ + ] + } + } + } } ] } \ No newline at end of file diff --git a/packs/smart_items/assets/arrow_green/composite.json b/packs/smart_items/assets/arrow_green/composite.json index dd1ca668c..efb8d6082 100644 --- a/packs/smart_items/assets/arrow_green/composite.json +++ b/packs/smart_items/assets/arrow_green/composite.json @@ -62,17 +62,32 @@ { "name": "Hide", "type": "set_visibility", - "jsonPayload": "{\"visible\":false,\"collider\":0}" + "jsonPayload": "{\"visible\":false,\"collider\":0}", + "allowedInBasicView": true }, { "name": "Show", "type": "set_visibility", - "jsonPayload": "{\"visible\":true,\"collider\":0}" + "jsonPayload": "{\"visible\":true,\"collider\":0}", + "allowedInBasicView": true } ] } } } + }, + { + "name": "inspector::Config", + "data": { + "0": { + "json": { + "isBasicViewEnabled": true, + "componentName": "Arrow", + "fields": [ + ] + } + } + } } ] } \ No newline at end of file diff --git a/packs/smart_items/assets/bell/composite.json b/packs/smart_items/assets/bell/composite.json index 1293e2847..f7f168d6b 100644 --- a/packs/smart_items/assets/bell/composite.json +++ b/packs/smart_items/assets/bell/composite.json @@ -43,7 +43,7 @@ "eventType": 1, "eventInfo": { "button": 1, - "hoverText": "Press", + "hoverText": "Ring", "maxDistance": 10, "showFeedback": true } @@ -58,7 +58,9 @@ "data": { "0": { "json": { - "componentIds": [1042, 1020] + "componentIds": [ + "core::Animator", + "core::AudioSource"] } } } @@ -88,12 +90,14 @@ { "name": "Stop Sound", "type": "stop_sound", - "jsonPayload": "{}" + "jsonPayload": "{}", + "allowedInBasicView": true }, { "type": "batch", "name": "Ring", - "jsonPayload": "{\"actions\":[\"Play Sound\",\"Play Animation\"]}" + "jsonPayload": "{\"actions\":[\"Play Sound\",\"Play Animation\"]}", + "allowedInBasicView": true } ] } diff --git a/packs/smart_items/assets/celing_fan/ceiling_fan.glb b/packs/smart_items/assets/celing_fan/ceiling_fan.glb deleted file mode 100644 index 05e779c8e..000000000 Binary files a/packs/smart_items/assets/celing_fan/ceiling_fan.glb and /dev/null differ diff --git a/packs/smart_items/assets/celing_fan/composite.json b/packs/smart_items/assets/celing_fan/composite.json deleted file mode 100644 index 2d57edf5c..000000000 --- a/packs/smart_items/assets/celing_fan/composite.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "version": 1, - "components": [ - { - "name": "core::Animator", - "data": { - "0": { - "json": { - "states": [ - { - "clip": "Play", - "playing": true, - "weight": 1, - "speed": 1, - "loop": true, - "shouldReset": false - }, - { - "clip": "Stop", - "playing": false, - "weight": 1, - "speed": 1, - "loop": false, - "shouldReset": false - } - ] - } - } - } - }, - { - "name": "core::GltfContainer", - "data": { - "0": { - "json": { - "src": "{assetPath}/ceiling_fan.glb", - "visibleMeshesCollisionMask": 1, - "invisibleMeshesCollisionMask": 2 - } - } - } - }, - { - "name": "core-schema::Name", - "data": { - "0": { - "json": { - "value": "Celing Fan" - } - } - } - }, - { - "name": "asset-packs::Actions", - "data": { - "0": { - "json": { - "id": "{self}", - "value": [ - { - "name": "Start animation", - "type": "play_animation", - "jsonPayload": "{\"animation\":\"Play\",\"loop\":true}" - }, - { - "name": "Stop animation", - "type": "stop_animation", - "jsonPayload": "{}" - }, - { - "name": "Play sound", - "type": "play_sound", - "jsonPayload": "{\"src\":\"{assetPath}/fan_loop.mp3\",\"loop\":true,\"volume\":0.4}" - }, - { - "name": "Stop sound", - "type": "stop_sound", - "jsonPayload": "{}" - }, - { - "name": "Start", - "type": "set_state", - "jsonPayload": "{\"state\":\"On\"}" - }, - { - "name": "Stop", - "type": "set_state", - "jsonPayload": "{\"state\":\"Off\"}" - } - ] - } - } - } - }, - { - "name": "asset-packs::Triggers", - "data": { - "0": { - "json": { - "value": [ - { - "type": "on_state_change", - "conditions": [ - { - "id": "{self:asset-packs::States}", - "type": "when_state_is", - "value": "On" - } - ], - "operation": "and", - "actions": [ - { - "id": "{self:asset-packs::Actions}", - "name": "Start animation" - } - ] - }, - { - "type": "on_state_change", - "conditions": [ - { - "id": "{self:asset-packs::States}", - "type": "when_state_is", - "value": "Off" - } - ], - "operation": "and", - "actions": [ - { - "id": "{self:asset-packs::Actions}", - "name": "Stop animation" - } - ] - }, - { - "type": "on_spawn", - "conditions": [], - "operation": "and", - "actions": [ - { - "id": "{self:asset-packs::Actions}", - "name": "Start" - } - ] - } - ] - } - } - } - }, - { - "name": "asset-packs::States", - "data": { - "0": { - "json": { - "id": "{self}", - "value": [ - "On", - "Off" - ], - "defaultValue": "On" - } - } - } - } - ] -} \ No newline at end of file diff --git a/packs/smart_items/assets/celing_fan/data.json b/packs/smart_items/assets/celing_fan/data.json deleted file mode 100644 index 3f8dbde2f..000000000 --- a/packs/smart_items/assets/celing_fan/data.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "id": "8766f195-e084-4ac9-a0eb-582f5d37a1bd", - "name": "Celing Fan", - "category": "decorations", - "tags": [] -} diff --git a/packs/smart_items/assets/celing_fan/fan_loop.mp3 b/packs/smart_items/assets/celing_fan/fan_loop.mp3 deleted file mode 100644 index cafc9063c..000000000 Binary files a/packs/smart_items/assets/celing_fan/fan_loop.mp3 and /dev/null differ diff --git a/packs/smart_items/assets/celing_fan/thumbnail.png b/packs/smart_items/assets/celing_fan/thumbnail.png deleted file mode 100644 index 3245ec258..000000000 Binary files a/packs/smart_items/assets/celing_fan/thumbnail.png and /dev/null differ diff --git a/packs/smart_items/assets/metal_case/composite.json b/packs/smart_items/assets/metal_case/composite.json index 755a4bcee..8f6697847 100644 --- a/packs/smart_items/assets/metal_case/composite.json +++ b/packs/smart_items/assets/metal_case/composite.json @@ -59,9 +59,9 @@ "0": { "json": { "componentIds": [ - 1042, - 1020, - 2709697014 + "core::Animator", + "core::AudioSource", + "asset-packs::States" ] } } @@ -231,11 +231,7 @@ "0": { "json": { "id": "{self}", - "value": [ - "Opened", - "Closed", - "Toggle" - ], + "value": ["Opened", "Closed", "Toggle"], "defaultValue": "Closed" } } @@ -275,4 +271,4 @@ } } ] -} \ No newline at end of file +} diff --git a/packs/smart_items/assets/open_closed_signe/Closed_Sign.glb b/packs/smart_items/assets/open_closed_sign/Closed_Sign.glb similarity index 100% rename from packs/smart_items/assets/open_closed_signe/Closed_Sign.glb rename to packs/smart_items/assets/open_closed_sign/Closed_Sign.glb diff --git a/packs/smart_items/assets/open_closed_signe/NeonTube.mp3 b/packs/smart_items/assets/open_closed_sign/NeonTube.mp3 similarity index 100% rename from packs/smart_items/assets/open_closed_signe/NeonTube.mp3 rename to packs/smart_items/assets/open_closed_sign/NeonTube.mp3 diff --git a/packs/smart_items/assets/open_closed_signe/Open_Sign.glb b/packs/smart_items/assets/open_closed_sign/Open_Sign.glb similarity index 100% rename from packs/smart_items/assets/open_closed_signe/Open_Sign.glb rename to packs/smart_items/assets/open_closed_sign/Open_Sign.glb diff --git a/packs/smart_items/assets/open_closed_signe/composite.json b/packs/smart_items/assets/open_closed_sign/composite.json similarity index 81% rename from packs/smart_items/assets/open_closed_signe/composite.json rename to packs/smart_items/assets/open_closed_sign/composite.json index 000a5e470..e766dfac2 100644 --- a/packs/smart_items/assets/open_closed_signe/composite.json +++ b/packs/smart_items/assets/open_closed_sign/composite.json @@ -117,12 +117,14 @@ { "type": "set_state", "name": "Open", - "jsonPayload": "{\"state\":\"Open\"}" + "jsonPayload": "{\"state\":\"Open\"}", + "allowedInBasicView": true }, { "type": "set_state", "name": "Close", - "jsonPayload": "{\"state\":\"Closed\"}" + "jsonPayload": "{\"state\":\"Closed\"}", + "allowedInBasicView": true } ] } @@ -192,7 +194,7 @@ "id": "{513:asset-packs::Actions}", "name": "Hide" } - ] + ], "basicViewId": "trigger-when-activated" }, { "type": "on_state_change", @@ -217,7 +219,8 @@ "id": "{self:asset-packs::Actions}", "name": "Play sound" } - ] + ], + "basicViewId": "trigger-when-deactivated" } ] } @@ -238,6 +241,42 @@ } } } + }, { + "name": "core-schema::Sync-Components", + "data": { + "0": { + "json": { + "value": [ + "core::VisibilityComponent", + "core::AudioSource", + "asset-packs::States" + ] + } + } + } + }, + { + "name": "inspector::Config", + "data": { + "0": { + "json": { + "isBasicViewEnabled": true, + "componentName": "Open Close Sign", + "fields": [ + { + "name": "When Open", + "type": "asset-packs::Triggers", + "basicViewId": "trigger-when-activated" + }, + { + "name": "When Closed", + "type": "asset-packs::Triggers", + "basicViewId": "trigger-when-deactivated" + } + ] + } + } + } } ] } \ No newline at end of file diff --git a/packs/smart_items/assets/open_closed_signe/data.json b/packs/smart_items/assets/open_closed_sign/data.json similarity index 100% rename from packs/smart_items/assets/open_closed_signe/data.json rename to packs/smart_items/assets/open_closed_sign/data.json diff --git a/packs/smart_items/assets/open_closed_signe/thumbnail.png b/packs/smart_items/assets/open_closed_sign/thumbnail.png similarity index 100% rename from packs/smart_items/assets/open_closed_signe/thumbnail.png rename to packs/smart_items/assets/open_closed_sign/thumbnail.png diff --git a/packs/smart_items/assets/parrot/composite.json b/packs/smart_items/assets/parrot/composite.json index b8b9a9b20..4b6a1092e 100644 --- a/packs/smart_items/assets/parrot/composite.json +++ b/packs/smart_items/assets/parrot/composite.json @@ -43,7 +43,7 @@ "eventType": 1, "eventInfo": { "button": 1, - "hoverText": "Press", + "hoverText": "Poke", "maxDistance": 10, "showFeedback": true } @@ -58,7 +58,11 @@ "data": { "0": { "json": { - "componentIds": [1042, 1020, 2709697014] + "componentIds": [ + "core::Animator", + "core::AudioSource", + "asset-packs::States" + ] } } } @@ -103,12 +107,14 @@ { "type": "set_state", "name": "Trigger", - "jsonPayload": "{\"state\":\"Triggered\"}" + "jsonPayload": "{\"state\":\"Triggered\"}", + "allowedInBasicView": true }, { "type": "set_state", "name": "Disarm", - "jsonPayload": "{\"state\":\"Silent\"}" + "jsonPayload": "{\"state\":\"Silent\"}", + "allowedInBasicView": true } ] } @@ -201,7 +207,7 @@ "0": { "json": { "isBasicViewEnabled": true, - "componentName": "Button", + "componentName": "Parrot", "fields": [ { "name": "Hover Text", @@ -212,8 +218,7 @@ "type": "asset-packs::Triggers", "basicViewId": "trigger-when-clicked" } - ], - "assetId": "b7408c1a-6cc1-471d-980f-17cc83b0062f" + ] } } } diff --git a/packs/smart_items/assets/rising_pillar_genesis_city/composite.json b/packs/smart_items/assets/rising_pillar_genesis_city/composite.json index 624a25eee..03352e21c 100644 --- a/packs/smart_items/assets/rising_pillar_genesis_city/composite.json +++ b/packs/smart_items/assets/rising_pillar_genesis_city/composite.json @@ -66,7 +66,48 @@ "data": { "513": { "json": { - "componentIds": [1102, 2709697014, 1020] + "componentIds": [ + "core::Tween", + "asset-packs::States", + "core::AudioSource" + ] + } + } + } + }, + { + "name": "core::Tween", + "data": { + "0": { + "json": { + "duration": 5000, + "easingFunction": 0, + "mode": { + "$case": "move", + "move": { + "start": { + "x": 0, + "y": 0, + "z": 0 + }, + "end": { + "x": 0, + "y": 6, + "z": 0 + } + } + }, + "playing": false + } + } + } + }, + { + "name": "core::TweenSequence", + "data": { + "0": { + "json": { + "sequence": [] } } } @@ -123,19 +164,52 @@ { "name": "asset-packs::Triggers", "data": { - "513": { + "0": { "json": { "value": [ + { + "type": "on_tween_end", + "conditions": [ + { + "id": "{self:asset-packs::States}", + "type": "when_state_is", + "value": "GoingToEnd" + } + ], + "actions": [ + { + "id": "{self:asset-packs::Actions}", + "name": "Going to Start" + } + ], + "basicViewId": "trigger-when-end-reached" + }, + { + "type": "on_tween_end", + "conditions": [ + { + "id": "{self:asset-packs::States}", + "type": "when_state_is", + "value": "GoingToStart" + } + ], + "actions": [ + { + "id": "{self:asset-packs::Actions}", + "name": "Going to End" + } + ], + "basicViewId": "trigger-when-start-reached" + }, { "type": "on_state_change", - "conditions": [], - "operation": "and", "actions": [ { "id": "{self:asset-packs::Actions}", "name": "Play Sound" } - ] + ], + "conditions": [] } ] } @@ -176,8 +250,7 @@ "type": "asset-packs::Triggers", "basicViewId": "trigger-when-start-reached" } - ], - "assetId": "b38819e8-feb0-467b-8ae0-5b2216f28aac" + ] } } } diff --git a/packs/smart_items/assets/rising_pillar_pirates/composite.json b/packs/smart_items/assets/rising_pillar_pirates/composite.json index ce14ca7c2..6596e3069 100644 --- a/packs/smart_items/assets/rising_pillar_pirates/composite.json +++ b/packs/smart_items/assets/rising_pillar_pirates/composite.json @@ -59,7 +59,46 @@ "data": { "513": { "json": { - "componentIds": [1102, 2709697014, 1020] + "componentIds": [ "core::Tween", + "asset-packs::States", + "core::AudioSource"] + } + } + } + }, + { + "name": "core::Tween", + "data": { + "0": { + "json": { + "duration": 5000, + "easingFunction": 0, + "mode": { + "$case": "move", + "move": { + "start": { + "x": 0, + "y": 0, + "z": 0 + }, + "end": { + "x": 0, + "y": 6, + "z": 0 + } + } + }, + "playing": false + } + } + } + }, + { + "name": "core::TweenSequence", + "data": { + "0": { + "json": { + "sequence": [] } } } @@ -116,19 +155,52 @@ { "name": "asset-packs::Triggers", "data": { - "513": { + "0": { "json": { "value": [ + { + "type": "on_tween_end", + "conditions": [ + { + "id": "{self:asset-packs::States}", + "type": "when_state_is", + "value": "GoingToEnd" + } + ], + "actions": [ + { + "id": "{self:asset-packs::Actions}", + "name": "Going to Start" + } + ], + "basicViewId": "trigger-when-end-reached" + }, + { + "type": "on_tween_end", + "conditions": [ + { + "id": "{self:asset-packs::States}", + "type": "when_state_is", + "value": "GoingToStart" + } + ], + "actions": [ + { + "id": "{self:asset-packs::Actions}", + "name": "Going to End" + } + ], + "basicViewId": "trigger-when-start-reached" + }, { "type": "on_state_change", - "conditions": [], - "operation": "and", "actions": [ { "id": "{self:asset-packs::Actions}", "name": "Play Sound" } - ] + ], + "conditions": [] } ] } @@ -153,7 +225,7 @@ "513": { "json": { "isBasicViewEnabled": true, - "componentName": "Vertical Platform", + "componentName": "Rising Pillar", "fields": [ { "name": "Tween", diff --git a/packs/smart_items/assets/rising_pillar_sci_fi/composite.json b/packs/smart_items/assets/rising_pillar_sci_fi/composite.json index 8e1c868a7..6d218e80b 100644 --- a/packs/smart_items/assets/rising_pillar_sci_fi/composite.json +++ b/packs/smart_items/assets/rising_pillar_sci_fi/composite.json @@ -59,7 +59,48 @@ "data": { "513": { "json": { - "componentIds": [1102, 2709697014, 1020] + "componentIds": [ + "core::Tween", + "asset-packs::States", + "core::AudioSource" + ] + } + } + } + }, + { + "name": "core::Tween", + "data": { + "0": { + "json": { + "duration": 5000, + "easingFunction": 0, + "mode": { + "$case": "move", + "move": { + "start": { + "x": 0, + "y": 0, + "z": 0 + }, + "end": { + "x": 0, + "y": 6, + "z": 0 + } + } + }, + "playing": false + } + } + } + }, + { + "name": "core::TweenSequence", + "data": { + "0": { + "json": { + "sequence": [] } } } @@ -116,19 +157,52 @@ { "name": "asset-packs::Triggers", "data": { - "513": { + "0": { "json": { "value": [ + { + "type": "on_tween_end", + "conditions": [ + { + "id": "{self:asset-packs::States}", + "type": "when_state_is", + "value": "GoingToEnd" + } + ], + "actions": [ + { + "id": "{self:asset-packs::Actions}", + "name": "Going to Start" + } + ], + "basicViewId": "trigger-when-end-reached" + }, + { + "type": "on_tween_end", + "conditions": [ + { + "id": "{self:asset-packs::States}", + "type": "when_state_is", + "value": "GoingToStart" + } + ], + "actions": [ + { + "id": "{self:asset-packs::Actions}", + "name": "Going to End" + } + ], + "basicViewId": "trigger-when-start-reached" + }, { "type": "on_state_change", - "conditions": [], - "operation": "and", "actions": [ { "id": "{self:asset-packs::Actions}", "name": "Play Sound" } - ] + ], + "conditions": [] } ] } @@ -153,7 +227,7 @@ "513": { "json": { "isBasicViewEnabled": true, - "componentName": "Vertical Platform", + "componentName": "Rising Pillar", "fields": [ { "name": "Tween", @@ -169,8 +243,7 @@ "type": "asset-packs::Triggers", "basicViewId": "trigger-when-start-reached" } - ], - "assetId": "fc84ed7c-8667-4089-b259-abf96ff1afd7" + ] } } } diff --git a/packs/smart_items/assets/rising_pillar_temple/composite.json b/packs/smart_items/assets/rising_pillar_temple/composite.json index 134dae086..d2d69d258 100644 --- a/packs/smart_items/assets/rising_pillar_temple/composite.json +++ b/packs/smart_items/assets/rising_pillar_temple/composite.json @@ -18,7 +18,7 @@ "data": { "0": { "json": { - "value": "Vertical Magic Rock Alt" + "value": "Rising Pillar Temple_2" } } } @@ -28,7 +28,11 @@ "data": { "0": { "json": { - "componentIds": [1102, 2709697014, 1020] + "componentIds": [ + "core::Tween", + "asset-packs::States", + "core::AudioSource" + ] } } } @@ -44,14 +48,14 @@ "$case": "move", "move": { "start": { - "x": 23, + "x": 0, "y": 0, - "z": 22 + "z": 0 }, "end": { - "x": 23, - "y": 5, - "z": 22 + "x": 0, + "y": 6, + "z": 0 } } }, @@ -65,8 +69,7 @@ "data": { "0": { "json": { - "sequence": [], - "loop": 0 + "sequence": [] } } } @@ -79,13 +82,13 @@ "id": "{self}", "value": [ { - "name": "Go to Start", + "name": "Sink", "type": "batch", "jsonPayload": "{ \"actions\": [\"Going to Start\", \"Tween to Start\"] }", "allowedInBasicView": true }, { - "name": "Go to End", + "name": "Rise", "type": "batch", "jsonPayload": "{ \"actions\": [\"Going to End\", \"Tween to End\"] }", "allowedInBasicView": true @@ -103,12 +106,12 @@ { "name": "Tween to Start", "type": "start_tween", - "jsonPayload": "{\"type\":\"move_item\",\"end\":{\"x\":0,\"y\":-5,\"z\":0},\"relative\":true,\"interpolationType\":\"linear\",\"duration\":5}" + "jsonPayload": "{\"type\":\"move_item\",\"end\":{\"x\":0,\"y\":-6,\"z\":0},\"relative\":true,\"interpolationType\":\"linear\",\"duration\":5}" }, { "name": "Tween to End", "type": "start_tween", - "jsonPayload": "{\"type\":\"move_item\",\"end\":{\"x\":0,\"y\":5,\"z\":0},\"relative\":true,\"interpolationType\":\"linear\",\"duration\":5}" + "jsonPayload": "{\"type\":\"move_item\",\"end\":{\"x\":0,\"y\":6,\"z\":0},\"relative\":true,\"interpolationType\":\"linear\",\"duration\":5}" }, { "type": "play_sound", @@ -162,14 +165,13 @@ }, { "type": "on_state_change", - "conditions": [], - "operation": "and", "actions": [ { "id": "{self:asset-packs::Actions}", "name": "Play Sound" } - ] + ], + "conditions": [] } ] } @@ -182,7 +184,10 @@ "0": { "json": { "id": "{self}", - "value": ["GoingToEnd", "GoingToStart"], + "value": [ + "GoingToEnd", + "GoingToStart" + ], "defaultValue": "GoingToEnd" } } @@ -194,7 +199,7 @@ "0": { "json": { "isBasicViewEnabled": true, - "componentName": "Vertical Platform", + "componentName": "Rising Pillar", "fields": [ { "name": "Tween", @@ -210,11 +215,10 @@ "type": "asset-packs::Triggers", "basicViewId": "trigger-when-start-reached" } - ], - "assetId": "132c8f9d-5faa-4e14-b985-44562ccacc24" + ] } } } } ] -} +} \ No newline at end of file diff --git a/packs/smart_items/assets/rising_pillar_temple/data.json b/packs/smart_items/assets/rising_pillar_temple/data.json index 0305b1407..88d14123c 100644 --- a/packs/smart_items/assets/rising_pillar_temple/data.json +++ b/packs/smart_items/assets/rising_pillar_temple/data.json @@ -1,6 +1,6 @@ { - "id": "c9101f29-69f7-4f3b-8739-3d0a33651969", + "id": "0bc5bfff-e355-4258-9c11-c04f2cbe4f99", "name": "Rising Pillar Temple", - "category": "pillars", + "category": "custom", "tags": [] -} +} \ No newline at end of file diff --git a/packs/smart_items/assets/rising_pillar_temple/thumbnail.png b/packs/smart_items/assets/rising_pillar_temple/thumbnail.png index 35158a67e..9bc31a0f8 100644 Binary files a/packs/smart_items/assets/rising_pillar_temple/thumbnail.png and b/packs/smart_items/assets/rising_pillar_temple/thumbnail.png differ diff --git a/packs/smart_items/assets/siren/composite.json b/packs/smart_items/assets/siren/composite.json index 61a1599c5..99cafe666 100644 --- a/packs/smart_items/assets/siren/composite.json +++ b/packs/smart_items/assets/siren/composite.json @@ -38,7 +38,11 @@ "data": { "0": { "json": { - "componentIds": [1042, 1020, 2709697014] + "componentIds": [ + "core::Animator", + "core::AudioSource", + "asset-packs::States" + ] } } } @@ -68,12 +72,14 @@ { "name": "Trigger", "type": "set_state", - "jsonPayload": "{\"state\":\"Triggered\"}" + "jsonPayload": "{\"state\":\"Triggered\"}", + "allowedInBasicView": true }, { "name": "Disarm", "type": "set_state", - "jsonPayload": "{\"state\":\"Silent\"}" + "jsonPayload": "{\"state\":\"Silent\"}", + "allowedInBasicView": true }, { "type": "play_animation", diff --git a/packs/smart_items/assets/siren_sci_fi/composite.json b/packs/smart_items/assets/siren_sci_fi/composite.json index c48770a17..6d0c41897 100644 --- a/packs/smart_items/assets/siren_sci_fi/composite.json +++ b/packs/smart_items/assets/siren_sci_fi/composite.json @@ -59,9 +59,9 @@ "0": { "json": { "componentIds": [ - 1042, - 1020, - 2709697014 + "core::Animator", + "core::AudioSource", + "asset-packs::States" ] } } diff --git a/packs/smart_items/assets/vertical_hallway_door/composite.json b/packs/smart_items/assets/vertical_hallway_door/composite.json index 89ed1cc8e..b81440618 100644 --- a/packs/smart_items/assets/vertical_hallway_door/composite.json +++ b/packs/smart_items/assets/vertical_hallway_door/composite.json @@ -170,7 +170,11 @@ "data": { "0": { "json": { - "componentIds": [1042, 1020, 2709697014] + "componentIds": [ + "core::Animator", + "core::AudioSource", + "asset-packs::States" + ] } } }