Load Fx Screen: vibrato.

minigdx · Mar 17, 2024 · 78d5f68 · 78d5f68
1 parent 500970f
commit 78d5f68
Show file tree

Hide file tree

Showing 7 changed files with 412 additions and 34 deletions.
diff --git a/tiny-cli/src/jvmMain/resources/sfx/data/sfx-0.sfx b/tiny-cli/src/jvmMain/resources/sfx/data/sfx-0.sfx
@@ -1,5 +1,5 @@
 tiny-sfx 255 127
-1 01 00 00 FF 00 00 00 00 00 00
+1 01 00 00 FF 00 01 6C 00 00 00
 036815 036815 036615 010D0A 010D0A 010D0A 052F15 052F2A 052F4A 052F6A 044B8A 044DAA 044BD4 0448F4 044AFF 044B00
 1
 0 01 00 00 FF 00 00 00 00 00 00

diff --git a/tiny-cli/src/jvmMain/resources/sfx/editor.ldtk b/tiny-cli/src/jvmMain/resources/sfx/editor.ldtk
@@ -11,7 +11,7 @@
 	"iid": "d3199780-d7b0-11ee-9c45-618e61de5acd",
 	"jsonVersion": "1.5.3",
 	"appBuildId": 473703,
-	"nextUid": 63,
+	"nextUid": 68,
 	"identifierStyle": "Capitalize",
 	"toc": [],
 	"worldLayout": "Free",
@@ -1918,6 +1918,190 @@
 					"tilesetUid": null
 				}
 			]
+		},
+		{
+			"identifier": "Fx",
+			"uid": 63,
+			"tags": [],
+			"exportToToc": false,
+			"allowOutOfBounds": false,
+			"doc": null,
+			"width": 16,
+			"height": 16,
+			"resizableX": false,
+			"resizableY": false,
+			"minWidth": null,
+			"maxWidth": null,
+			"minHeight": null,
+			"maxHeight": null,
+			"keepAspectRatio": false,
+			"tileOpacity": 1,
+			"fillOpacity": 1,
+			"lineOpacity": 1,
+			"hollow": false,
+			"color": "#2CE8F5",
+			"renderMode": "Rectangle",
+			"showName": true,
+			"tilesetId": null,
+			"tileRenderMode": "FitInside",
+			"tileRect": null,
+			"uiTileRect": null,
+			"nineSliceBorders": [],
+			"maxCount": 0,
+			"limitScope": "PerLevel",
+			"limitBehavior": "MoveLastOne",
+			"pivotX": 0,
+			"pivotY": 0,
+			"fieldDefs": [
+				{
+					"identifier": "Envelope",
+					"doc": null,
+					"__type": "EntityRef",
+					"uid": 64,
+					"type": "F_EntityRef",
+					"isArray": false,
+					"canBeNull": false,
+					"arrayMinLength": null,
+					"arrayMaxLength": null,
+					"editorDisplayMode": "RefLinkBetweenCenters",
+					"editorDisplayScale": 1,
+					"editorDisplayPos": "Above",
+					"editorLinkStyle": "CurvedArrow",
+					"editorDisplayColor": null,
+					"editorAlwaysShow": false,
+					"editorShowInWorld": true,
+					"editorCutLongValues": true,
+					"editorTextSuffix": null,
+					"editorTextPrefix": null,
+					"useForSmartColor": false,
+					"exportToToc": false,
+					"searchable": false,
+					"min": null,
+					"max": null,
+					"regex": null,
+					"acceptFileTypes": null,
+					"defaultOverride": null,
+					"textLanguageMode": null,
+					"symmetricalRef": false,
+					"autoChainRef": false,
+					"allowOutOfLevelRef": false,
+					"allowedRefs": "OnlySpecificEntity",
+					"allowedRefsEntityUid": 25,
+					"allowedRefTags": [],
+					"tilesetUid": null
+				},
+				{
+					"identifier": "Vibrato",
+					"doc": null,
+					"__type": "EntityRef",
+					"uid": 65,
+					"type": "F_EntityRef",
+					"isArray": false,
+					"canBeNull": false,
+					"arrayMinLength": null,
+					"arrayMaxLength": null,
+					"editorDisplayMode": "RefLinkBetweenCenters",
+					"editorDisplayScale": 1,
+					"editorDisplayPos": "Above",
+					"editorLinkStyle": "CurvedArrow",
+					"editorDisplayColor": null,
+					"editorAlwaysShow": false,
+					"editorShowInWorld": true,
+					"editorCutLongValues": true,
+					"editorTextSuffix": null,
+					"editorTextPrefix": null,
+					"useForSmartColor": false,
+					"exportToToc": false,
+					"searchable": false,
+					"min": null,
+					"max": null,
+					"regex": null,
+					"acceptFileTypes": null,
+					"defaultOverride": null,
+					"textLanguageMode": null,
+					"symmetricalRef": false,
+					"autoChainRef": false,
+					"allowOutOfLevelRef": false,
+					"allowedRefs": "OnlySpecificEntity",
+					"allowedRefsEntityUid": 36,
+					"allowedRefTags": [],
+					"tilesetUid": null
+				},
+				{
+					"identifier": "Sweep",
+					"doc": null,
+					"__type": "EntityRef",
+					"uid": 66,
+					"type": "F_EntityRef",
+					"isArray": false,
+					"canBeNull": false,
+					"arrayMinLength": null,
+					"arrayMaxLength": null,
+					"editorDisplayMode": "RefLinkBetweenCenters",
+					"editorDisplayScale": 1,
+					"editorDisplayPos": "Above",
+					"editorLinkStyle": "CurvedArrow",
+					"editorDisplayColor": null,
+					"editorAlwaysShow": false,
+					"editorShowInWorld": true,
+					"editorCutLongValues": true,
+					"editorTextSuffix": null,
+					"editorTextPrefix": null,
+					"useForSmartColor": false,
+					"exportToToc": false,
+					"searchable": false,
+					"min": null,
+					"max": null,
+					"regex": null,
+					"acceptFileTypes": null,
+					"defaultOverride": null,
+					"textLanguageMode": null,
+					"symmetricalRef": false,
+					"autoChainRef": false,
+					"allowOutOfLevelRef": false,
+					"allowedRefs": "OnlySpecificEntity",
+					"allowedRefsEntityUid": 37,
+					"allowedRefTags": [],
+					"tilesetUid": null
+				},
+				{
+					"identifier": "TiledNotes",
+					"doc": null,
+					"__type": "EntityRef",
+					"uid": 67,
+					"type": "F_EntityRef",
+					"isArray": false,
+					"canBeNull": false,
+					"arrayMinLength": null,
+					"arrayMaxLength": null,
+					"editorDisplayMode": "RefLinkBetweenCenters",
+					"editorDisplayScale": 1,
+					"editorDisplayPos": "Above",
+					"editorLinkStyle": "CurvedArrow",
+					"editorDisplayColor": null,
+					"editorAlwaysShow": false,
+					"editorShowInWorld": true,
+					"editorCutLongValues": true,
+					"editorTextSuffix": null,
+					"editorTextPrefix": null,
+					"useForSmartColor": false,
+					"exportToToc": false,
+					"searchable": false,
+					"min": null,
+					"max": null,
+					"regex": null,
+					"acceptFileTypes": null,
+					"defaultOverride": null,
+					"textLanguageMode": null,
+					"symmetricalRef": false,
+					"autoChainRef": false,
+					"allowOutOfLevelRef": false,
+					"allowedRefs": "OnlySpecificEntity",
+					"allowedRefsEntityUid": 27,
+					"allowedRefTags": [],
+					"tilesetUid": null
+				}
+			]
 		}
 	], "tilesets": [
 		{
@@ -4773,9 +4957,9 @@
 							"defUid": 9,
 							"px": [56,80],
 							"fieldInstances": [
-								{ "__identifier": "Label", "__type": "String", "__value": "Acceleration", "__tile": null, "defUid": 10, "realEditorValues": [{
+								{ "__identifier": "Label", "__type": "String", "__value": "Sweep", "__tile": null, "defUid": 10, "realEditorValues": [{
 									"id": "V_String",
-									"params": ["Acceleration"]
+									"params": ["Sweep"]
 								}] },
 								{ "__identifier": "Help", "__type": "String", "__value": "Speed of the sweep", "__tile": null, "defUid": 22, "realEditorValues": [{
 									"id": "V_String",
@@ -4935,11 +5119,67 @@
 							"defUid": 9,
 							"px": [56,104],
 							"fieldInstances": [
-								{ "__identifier": "Label", "__type": "String", "__value": null, "__tile": null, "defUid": 10, "realEditorValues": [] },
+								{ "__identifier": "Label", "__type": "String", "__value": "Acceleration", "__tile": null, "defUid": 10, "realEditorValues": [{
+									"id": "V_String",
+									"params": ["Acceleration"]
+								}] },
 								{ "__identifier": "Help", "__type": "String", "__value": null, "__tile": null, "defUid": 22, "realEditorValues": [] }
 							],
 							"__worldX": -128,
 							"__worldY": 240
+						},
+						{
+							"__identifier": "Fx",
+							"__grid": [19,11],
+							"__pivot": [0,0],
+							"__tags": [],
+							"__tile": null,
+							"__smartColor": "#2CE8F5",
+							"iid": "bf5e2790-d7b0-11ee-9c45-bde55a100c82",
+							"width": 16,
+							"height": 16,
+							"defUid": 63,
+							"px": [152,88],
+							"fieldInstances": [
+								{ "__identifier": "Envelope", "__type": "EntityRef", "__value": {
+									"entityIid": "23d6cd90-d7b0-11ee-9c45-ad1ff16e75a4",
+									"layerIid": "ec22d820-d7b0-11ee-9c45-8bfde102ddf7",
+									"levelIid": "ec22b110-d7b0-11ee-9c45-ab95af96fe31",
+									"worldIid": "d3199781-d7b0-11ee-9c45-11db300be03a"
+								}, "__tile": null, "defUid": 64, "realEditorValues": [{
+									"id": "V_String",
+									"params": ["23d6cd90-d7b0-11ee-9c45-ad1ff16e75a4"]
+								}] },
+								{ "__identifier": "Vibrato", "__type": "EntityRef", "__value": {
+									"entityIid": "b53b2880-d7b0-11ee-9c45-1305f3f9e32a",
+									"layerIid": "ec22d820-d7b0-11ee-9c45-8bfde102ddf7",
+									"levelIid": "ec22b110-d7b0-11ee-9c45-ab95af96fe31",
+									"worldIid": "d3199781-d7b0-11ee-9c45-11db300be03a"
+								}, "__tile": null, "defUid": 65, "realEditorValues": [{
+									"id": "V_String",
+									"params": ["b53b2880-d7b0-11ee-9c45-1305f3f9e32a"]
+								}] },
+								{ "__identifier": "Sweep", "__type": "EntityRef", "__value": {
+									"entityIid": "b121cfb0-d7b0-11ee-9c45-873cbd53dbe4",
+									"layerIid": "ec22d820-d7b0-11ee-9c45-8bfde102ddf7",
+									"levelIid": "ec22b110-d7b0-11ee-9c45-ab95af96fe31",
+									"worldIid": "d3199781-d7b0-11ee-9c45-11db300be03a"
+								}, "__tile": null, "defUid": 66, "realEditorValues": [{
+									"id": "V_String",
+									"params": ["b121cfb0-d7b0-11ee-9c45-873cbd53dbe4"]
+								}] },
+								{ "__identifier": "TiledNotes", "__type": "EntityRef", "__value": {
+									"entityIid": "e7cbddd0-d7b0-11ee-9c45-253ec4365407",
+									"layerIid": "ec22d820-d7b0-11ee-9c45-8bfde102ddf7",
+									"levelIid": "ec22b110-d7b0-11ee-9c45-ab95af96fe31",
+									"worldIid": "d3199781-d7b0-11ee-9c45-11db300be03a"
+								}, "__tile": null, "defUid": 67, "realEditorValues": [{
+									"id": "V_String",
+									"params": ["e7cbddd0-d7b0-11ee-9c45-253ec4365407"]
+								}] }
+							],
+							"__worldX": -32,
+							"__worldY": 224
 						}
 					]
 				},

diff --git a/tiny-cli/src/jvmMain/resources/sfx/editor/simplified/Fx/data.json b/tiny-cli/src/jvmMain/resources/sfx/editor/simplified/Fx/data.json
@@ -186,7 +186,7 @@
 				"height": 8,
 				"color": 14120515,
 				"customFields": {
-					"Label": "Acceleration",
+					"Label": "Sweep",
 					"Help": "Speed of the sweep"
 				}
 			},
@@ -214,7 +214,7 @@
 				"height": 8,
 				"color": 14120515,
 				"customFields": {
-					"Label": null,
+					"Label": "Acceleration",
 					"Help": null
 				}
 			}
@@ -302,6 +302,44 @@
 					}
 				}
 			}
+		],
+		"Fx": [
+			{
+				"id": "Fx",
+				"iid": "bf5e2790-d7b0-11ee-9c45-bde55a100c82",
+				"layer": "Entities",
+				"x": 152,
+				"y": 88,
+				"width": 16,
+				"height": 16,
+				"color": 2943221,
+				"customFields": {
+					"Envelope": {
+						"entityIid": "23d6cd90-d7b0-11ee-9c45-ad1ff16e75a4",
+						"layerIid": "ec22d820-d7b0-11ee-9c45-8bfde102ddf7",
+						"levelIid": "ec22b110-d7b0-11ee-9c45-ab95af96fe31",
+						"worldIid": "d3199781-d7b0-11ee-9c45-11db300be03a"
+					},
+					"Vibrato": {
+						"entityIid": "b53b2880-d7b0-11ee-9c45-1305f3f9e32a",
+						"layerIid": "ec22d820-d7b0-11ee-9c45-8bfde102ddf7",
+						"levelIid": "ec22b110-d7b0-11ee-9c45-ab95af96fe31",
+						"worldIid": "d3199781-d7b0-11ee-9c45-11db300be03a"
+					},
+					"Sweep": {
+						"entityIid": "b121cfb0-d7b0-11ee-9c45-873cbd53dbe4",
+						"layerIid": "ec22d820-d7b0-11ee-9c45-8bfde102ddf7",
+						"levelIid": "ec22b110-d7b0-11ee-9c45-ab95af96fe31",
+						"worldIid": "d3199781-d7b0-11ee-9c45-11db300be03a"
+					},
+					"TiledNotes": {
+						"entityIid": "e7cbddd0-d7b0-11ee-9c45-253ec4365407",
+						"layerIid": "ec22d820-d7b0-11ee-9c45-8bfde102ddf7",
+						"levelIid": "ec22b110-d7b0-11ee-9c45-ab95af96fe31",
+						"worldIid": "d3199781-d7b0-11ee-9c45-11db300be03a"
+					}
+				}
+			}
 		]
 	}
 }