Skip to content

Commit 4011a2c

Browse files
authored
Merge pull request #1790 from blkerby/door-closing-animation
Add isDoorImmediatelyClosed property
2 parents 2c3c806 + dbf5f5d commit 4011a2c

5 files changed

Lines changed: 14 additions & 4 deletions

File tree

region/brinstar/green/Green Brinstar Main Shaft.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,9 @@
100100
"nodeAddress": "0x0018d06",
101101
"doorOrientation": "left",
102102
"doorEnvironments": [{"physics": "air"}],
103-
"spawnAt": 9,
103+
"isDoorImmediatelyClosed": true,
104104
"devNote": [
105-
"When entering this room in direct g-mode, the door is closed because of it being placed on the wrong location.",
106-
"The spawn at node here to its self, is to document that you can not return back to the left without exiting g-mode."
105+
"This door has a closing animation but it is wrongly placed a screen to the left."
107106
]
108107
},
109108
{

region/brinstar/pink/Pink Brinstar Power Bomb Room.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"nodeAddress": "0x0018e62",
1616
"doorOrientation": "right",
1717
"doorEnvironments": [{"physics": "air"}],
18+
"isDoorImmediatelyClosed": true,
1819
"locks": [
1920
{
2021
"name": "Mission Impossible Gray Lock (to Big Pink Upper)",

region/maridia/inner-pink/Halfie Climb Room.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
"nodeSubType": "blue",
5757
"nodeAddress": "0x001a8e8",
5858
"doorOrientation": "right",
59-
"doorEnvironments": [{"physics": "air"}]
59+
"doorEnvironments": [{"physics": "air"}],
60+
"isDoorImmediatelyClosed": true
6061
}
6162
],
6263
"enemies": [

region/region-readme.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ Door environments are mandatory on door nodes (except elevators). They are forbi
4747

4848
By default every door node has an implicit strat from the node to itself, for [unlocking the door](../strats.md#implicit-unlock-strats) in a standard way. This can be disabled by setting the node property `useImplicitDoorUnlocks` to false.
4949

50+
#### isDoorImmediatelyClosed
51+
52+
Most doors have a closing animation that occurs when entering through them. However, certain doors are immediately closed when the room is loaded. When entering through such a door in direct G-mode, the door will be closed, making it not possible to return back through the door without first exiting G-mode. It would also not be possible to get stuck inside the door shell using an X-ray climb setup.
53+
5054
#### spawnAt
5155
The `spawnAt` property is used to represent situations where Samus enters a room via a node, but can quickly end up at another node without user input. This is only relevant in situations where there are requirements for getting back to the door Samus entered through. When a node has a `null` value for this property, Samus simply spawns at that node as normal.
5256

schema/m3-room.schema.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,6 +1593,11 @@
15931593
"default": true,
15941594
"description": "Whether a standard strat should implicitly be included for unlocking this node if it is a door node."
15951595
},
1596+
"isDoorImmediatelyClosed": {
1597+
"type": "boolean",
1598+
"default": false,
1599+
"description": "Whether this door is immediately closed on entry, rather than having a closing animation."
1600+
},
15961601
"spawnAt": {
15971602
"type": "integer",
15981603
"title": "Node to spawn at",

0 commit comments

Comments
 (0)