|
@@ -90,7 +90,7 @@
|
|
|
{
|
|
{
|
|
|
"command": "EVENT_WAIT",
|
|
"command": "EVENT_WAIT",
|
|
|
"args": {
|
|
"args": {
|
|
|
- "time": 1,
|
|
|
|
|
|
|
+ "time": 0.5,
|
|
|
"frames": 30
|
|
"frames": 30
|
|
|
},
|
|
},
|
|
|
"id": "a21ed51b-4d6c-4300-9a5c-57886c410182"
|
|
"id": "a21ed51b-4d6c-4300-9a5c-57886c410182"
|
|
@@ -105,9 +105,45 @@
|
|
|
"value": 10
|
|
"value": 10
|
|
|
},
|
|
},
|
|
|
"otherActorId": "$self$",
|
|
"otherActorId": "$self$",
|
|
|
- "__collapseElse": true,
|
|
|
|
|
|
|
+ "__collapseElse": false,
|
|
|
"__collapse": false
|
|
"__collapse": false
|
|
|
},
|
|
},
|
|
|
|
|
+ "children": {
|
|
|
|
|
+ "true": [
|
|
|
|
|
+ {
|
|
|
|
|
+ "command": "EVENT_SET_VALUE",
|
|
|
|
|
+ "args": {
|
|
|
|
|
+ "variable": "L1",
|
|
|
|
|
+ "value": {
|
|
|
|
|
+ "type": "true"
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
|
|
+ "id": "2b765ef3-efb0-4ae0-90ac-c9d0d3b4cd6d"
|
|
|
|
|
+ }
|
|
|
|
|
+ ],
|
|
|
|
|
+ "false": [
|
|
|
|
|
+ {
|
|
|
|
|
+ "command": "EVENT_SET_VALUE",
|
|
|
|
|
+ "args": {
|
|
|
|
|
+ "variable": "L1",
|
|
|
|
|
+ "value": {
|
|
|
|
|
+ "type": "false"
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
|
|
+ "id": "24d4dcea-ce18-4adc-890b-dd6759978437"
|
|
|
|
|
+ }
|
|
|
|
|
+ ]
|
|
|
|
|
+ },
|
|
|
|
|
+ "id": "c2f0cdcc-f9e9-49bf-8d9c-f62a542f1eb7"
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ "command": "EVENT_LOOP_WHILE",
|
|
|
|
|
+ "args": {
|
|
|
|
|
+ "condition": {
|
|
|
|
|
+ "type": "variable",
|
|
|
|
|
+ "value": "L1"
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
"children": {
|
|
"children": {
|
|
|
"true": [
|
|
"true": [
|
|
|
{
|
|
{
|
|
@@ -163,14 +199,16 @@
|
|
|
},
|
|
},
|
|
|
"moveType": "horizontal",
|
|
"moveType": "horizontal",
|
|
|
"useCollisions": true,
|
|
"useCollisions": true,
|
|
|
- "__comment": true
|
|
|
|
|
|
|
+ "__comment": true,
|
|
|
|
|
+ "__collapse": true
|
|
|
},
|
|
},
|
|
|
"id": "ddd0a62c-3fde-49c6-8ef8-bba024330df8"
|
|
"id": "ddd0a62c-3fde-49c6-8ef8-bba024330df8"
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
"command": "EVENT_ACTOR_PUSH",
|
|
"command": "EVENT_ACTOR_PUSH",
|
|
|
"args": {
|
|
"args": {
|
|
|
- "continue": true
|
|
|
|
|
|
|
+ "continue": true,
|
|
|
|
|
+ "__collapse": false
|
|
|
},
|
|
},
|
|
|
"id": "23334933-bd00-4ae1-a3b0-b2de1a33850f"
|
|
"id": "23334933-bd00-4ae1-a3b0-b2de1a33850f"
|
|
|
}
|
|
}
|
|
@@ -186,8 +224,9 @@
|
|
|
"property": "pxpos"
|
|
"property": "pxpos"
|
|
|
},
|
|
},
|
|
|
"y": {
|
|
"y": {
|
|
|
- "type": "number",
|
|
|
|
|
- "value": 0
|
|
|
|
|
|
|
+ "type": "property",
|
|
|
|
|
+ "target": "player",
|
|
|
|
|
+ "property": "pypos"
|
|
|
},
|
|
},
|
|
|
"moveType": "horizontal",
|
|
"moveType": "horizontal",
|
|
|
"useCollisions": true
|
|
"useCollisions": true
|
|
@@ -259,8 +298,9 @@
|
|
|
"property": "pxpos"
|
|
"property": "pxpos"
|
|
|
},
|
|
},
|
|
|
"y": {
|
|
"y": {
|
|
|
- "type": "number",
|
|
|
|
|
- "value": 0
|
|
|
|
|
|
|
+ "type": "property",
|
|
|
|
|
+ "target": "player",
|
|
|
|
|
+ "property": "pypos"
|
|
|
},
|
|
},
|
|
|
"moveType": "horizontal",
|
|
"moveType": "horizontal",
|
|
|
"useCollisions": true
|
|
"useCollisions": true
|
|
@@ -275,10 +315,9 @@
|
|
|
},
|
|
},
|
|
|
"id": "f9212125-f118-419b-b8e3-adf44e6490da"
|
|
"id": "f9212125-f118-419b-b8e3-adf44e6490da"
|
|
|
}
|
|
}
|
|
|
- ],
|
|
|
|
|
- "false": []
|
|
|
|
|
|
|
+ ]
|
|
|
},
|
|
},
|
|
|
- "id": "c2f0cdcc-f9e9-49bf-8d9c-f62a542f1eb7"
|
|
|
|
|
|
|
+ "id": "9f89963c-79e8-4f3b-b9e4-74b416c1dd3b"
|
|
|
}
|
|
}
|
|
|
],
|
|
],
|
|
|
"hit1Script": [],
|
|
"hit1Script": [],
|