Skip to content

Commit

Permalink
feat: Update smart items to use the new config component (#103)
Browse files Browse the repository at this point in the history 
* feat: Update smart items to use the new config component

* fix: Smart Item Fantasy Chest state comparation
  • Loading branch information
@cyaiox
cyaiox authored Mar 26, 2024
1 parent 657ac72 commit d2d67d9
Show file tree
Hide file tree
Showing 7 changed files with 370 additions and 151 deletions.
22 changes: 17 additions & 5 deletions packs/smart_items/assets/blue_button/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"id": "504cd7ac-2873-40d8-9172-13c9c24304b0",
"name": "Blue Button",
"category": "buttons",
"tags": [
"button"
],
"tags": ["button"],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/blue_button.glb"
Expand Down Expand Up @@ -37,10 +35,24 @@
"id": "{self:asset-packs::Actions}",
"name": "Play Sound"
}
]
],
"basicViewId": "trigger-when-clicked"
}
]
},
"core-schema::Sync-Components": { "value": ["core::Animator", "core::AudioSource"] }
"core-schema::Sync-Components": {
"value": ["core::Animator", "core::AudioSource"]
},
"inspector::Config": {
"isBasicViewEnabled": true,
"componentName": "Button",
"fields": [
{
"name": "When Clicked",
"type": "asset-packs::Triggers",
"basicViewId": "trigger-when-clicked"
}
]
}
}
}
131 changes: 97 additions & 34 deletions packs/smart_items/assets/fantasy_chest/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"id": "ff9257ec-9d62-404f-97c7-cf19c4035761",
"name": "Fantasy Chest",
"category": "chests",
"tags": [
"door"
],
"tags": ["door"],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/chest_fantasy.glb"
Expand All @@ -15,12 +13,20 @@
{
"name": "Open",
"type": "set_state",
"jsonPayload": "{ \"state\": \"Opened\" }"
"jsonPayload": "{ \"state\": \"Opened\" }",
"allowedInBasicView": true
},
{
"name": "Close",
"type": "set_state",
"jsonPayload": "{ \"state\": \"Closed\" }"
"jsonPayload": "{ \"state\": \"Closed\" }",
"allowedInBasicView": true
},
{
"name": "Open or Close",
"type": "set_state",
"jsonPayload": "{ \"state\": \"Toggle\" }",
"allowedInBasicView": true
},
{
"name": "Play Open Sound",
Expand Down Expand Up @@ -48,29 +54,54 @@
"value": [
{
"type": "on_click",
"conditions": [],
"actions": [],
"basicViewId": "trigger-when-clicked"
},
{
"type": "on_state_change",
"conditions": [
{
"id": "{self:asset-packs::States}",
"type": "when_state_is",
"value": "Closed"
"value": "Opened"
}
],
"actions": [
{
"id": "{self:asset-packs::Actions}",
"name": "Open"
"name": "Play Open Animation"
},
{
"id": "{self:asset-packs::Actions}",
"name": "Play Open Sound"
}
]
],
"basicViewId": "trigger-when-opened"
},
{
"type": "on_click",
"type": "on_state_change",
"conditions": [
{
"id": "{self:asset-packs::States}",
"type": "when_state_is",
"value": "Opened"
"value": "Closed"
}
],
"actions": [
{
"id": "{self:asset-packs::Actions}",
"name": "Play Close Animation"
},
{
"id": "{self:asset-packs::Actions}",
"name": "Play Close Sound"
}
],
"basicViewId": "trigger-when-closed"
},
{
"type": "on_spawn",
"actions": [
{
"id": "{self:asset-packs::Actions}",
Expand All @@ -80,63 +111,95 @@
},
{
"type": "on_state_change",
"operation": "and",
"conditions": [
{
"id": "{self:asset-packs::States}",
"type": "when_state_is",
"value": "Toggle"
},
{
"id": "{self:asset-packs::States}",
"type": "when_previous_state_is",
"value": "Opened"
}
],
"actions": [
{
"id": "{self:asset-packs::Actions}",
"name": "Play Open Animation"
},
{
"id": "{self:asset-packs::Actions}",
"name": "Play Open Sound"
"name": "Close"
}
]
},
{
"type": "on_state_change",
"operation": "and",
"conditions": [
{
"id": "{self:asset-packs::States}",
"type": "when_state_is",
"value": "Closed"
}
],
"actions": [
{
"id": "{self:asset-packs::Actions}",
"name": "Play Close Animation"
"value": "Toggle"
},
{
"id": "{self:asset-packs::Actions}",
"name": "Play Close Sound"
"id": "{self:asset-packs::States}",
"type": "when_previous_state_is",
"value": "Closed"
}
]
},
{
"type": "on_spawn",
],
"actions": [
{
"id": "{self:asset-packs::Actions}",
"name": "Close"
"name": "Open"
}
]
}
]
},
"asset-packs::States": {
"id": "{self}",
"value": [
"Opened",
"Closed"
],
"value": ["Opened", "Closed", "Toggle"],
"defaultValue": "Closed"
},
"core-schema::Sync-Components": { "value": ["core::Animator", "core::AudioSource", "asset-packs::States"] }
"core-schema::Sync-Components": {
"value": ["core::Animator", "core::AudioSource", "asset-packs::States"]
},
"core::PointerEvents": {
"pointerEvents": [
{
"eventType": 2,
"eventInfo": {
"button": 0,
"hoverText": "Open / Close",
"maxDistance": 10,
"showFeedback": true
}
}
]
},
"inspector::Config": {
"isBasicViewEnabled": true,
"componentName": "Chest",
"fields": [
{
"name": "Hover Text",
"type": "core::PointerEvents"
},
{
"name": "When Clicked",
"type": "asset-packs::Triggers",
"basicViewId": "trigger-when-clicked"
},
{
"name": "When Opened",
"type": "asset-packs::Triggers",
"basicViewId": "trigger-when-opened"
},
{
"name": "When Closed",
"type": "asset-packs::Triggers",
"basicViewId": "trigger-when-closed"
}
]
}
}
}
41 changes: 29 additions & 12 deletions packs/smart_items/assets/fantasy_lever/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"id": "649d5d96-18be-4f89-b592-f2dfce64b7fe",
"name": "Fantasy Lever",
"category": "levers",
"tags": [
"lever"
],
"tags": ["lever"],
"components": {
"core::GltfContainer": {
"src": "{assetPath}/lever_fantasy.glb"
Expand All @@ -15,12 +13,14 @@
{
"name": "Activate",
"type": "set_state",
"jsonPayload": "{ \"state\": \"Activated\" }"
"jsonPayload": "{ \"state\": \"Activated\" }",
"allowedInBasicView": true
},
{
"name": "Deactivate",
"type": "set_state",
"jsonPayload": "{ \"state\": \"Deactivated\" }"
"jsonPayload": "{ \"state\": \"Deactivated\" }",
"allowedInBasicView": true
},
{
"name": "Play Sound",
Expand Down Expand Up @@ -91,7 +91,8 @@
"id": "{self:asset-packs::Actions}",
"name": "Play Sound"
}
]
],
"basicViewId": "trigger-when-activated"
},
{
"type": "on_state_change",
Expand All @@ -111,18 +112,34 @@
"id": "{self:asset-packs::Actions}",
"name": "Play Sound"
}
]
],
"basicViewId": "trigger-when-deactivated"
}
]
},
"asset-packs::States": {
"id": "{self}",
"value": [
"Activated",
"Deactivated"
],
"value": ["Activated", "Deactivated"],
"defaultValue": "Deactivated"
},
"core-schema::Sync-Components": { "value": ["core::Animator", "core::AudioSource", "asset-packs::States"] }
"core-schema::Sync-Components": {
"value": ["core::Animator", "core::AudioSource", "asset-packs::States"]
},
"inspector::Config": {
"isBasicViewEnabled": true,
"componentName": "Lever",
"fields": [
{
"name": "When Activated",
"type": "asset-packs::Triggers",
"basicViewId": "trigger-when-activated"
},
{
"name": "When Deactivated",
"type": "asset-packs::Triggers",
"basicViewId": "trigger-when-deactivated"
}
]
}
}
}
Loading

0 comments on commit d2d67d9

Please sign in to comment.