Add: necessary properties in action0 in order to support bridges over station feature from OpenTTD 15.0-beta3 #385
Conversation
|
No love for road stops and blocked pillar flags for both? |
|
I do not need road stops and do not have source code of NewGRF that could provide them. |
|
It's exactly the same as for rail stations, just a different property number (0x13 for minimum height) |
|
There's simpler solution than duplicating flag function, which most likely won't work. Edit: I may be wrong (didn't check the spec yet) |
Rito13
force-pushed
the
bridges_over_stations
branch
2 times, most recently
from
b6c9d49 to
b2c3f95
Compare
|
Don't think a class is the way to go - how about a function generator? (also, classes aren't named like that) |
Rito13
force-pushed
the
bridges_over_stations
branch
from
b2c3f95 to
f6fb09a
Compare
Rito13
force-pushed
the
bridges_over_stations
branch
7 times, most recently
from
05ef859 to
e9381a2
Compare
nml/actions/action0properties.py
Outdated
| if isinstance(value, ConstantNumeric): | ||
| value = Array([value, invert_function(value)] * prefered_size, value.pos) |
There was a problem hiding this comment.
This is not a good idea to me.
All tiles having the same pillar placement limitation is probably quite rare.
And always defining 20 tile types feels wasteful.
| def invert_bridge_pillars_flags(value): | ||
| out = ConstantNumeric(0, value.pos) | ||
| for i_flag, o_flag in [ | ||
| (global_constant_numbers["BRIDGE_PILLAR_CORNER_W"], global_constant_numbers["BRIDGE_PILLAR_CORNER_S"]), | ||
| (global_constant_numbers["BRIDGE_PILLAR_CORNER_S"], global_constant_numbers["BRIDGE_PILLAR_CORNER_W"]), | ||
| (global_constant_numbers["BRIDGE_PILLAR_CORNER_N"], global_constant_numbers["BRIDGE_PILLAR_CORNER_E"]), | ||
| (global_constant_numbers["BRIDGE_PILLAR_CORNER_E"], global_constant_numbers["BRIDGE_PILLAR_CORNER_N"]), | ||
| (global_constant_numbers["BRIDGE_PILLAR_EDGE_NE"], global_constant_numbers["BRIDGE_PILLAR_EDGE_NE"]), | ||
| (global_constant_numbers["BRIDGE_PILLAR_EDGE_SE"], global_constant_numbers["BRIDGE_PILLAR_EDGE_SW"]), | ||
| (global_constant_numbers["BRIDGE_PILLAR_EDGE_SW"], global_constant_numbers["BRIDGE_PILLAR_EDGE_SE"]), | ||
| (global_constant_numbers["BRIDGE_PILLAR_EDGE_NW"], global_constant_numbers["BRIDGE_PILLAR_EDGE_NW"]), | ||
| ]: | ||
| if value.value & (1 << i_flag): | ||
| out.value += 1 << o_flag | ||
| return out |
There was a problem hiding this comment.
This logic should not be here, it's a bad idea to assume that the flags can be flipped.
There was a problem hiding this comment.
Why not?
It is based on how station's sprite should be inverted.
There was a problem hiding this comment.
Because NML shouldn't be assuming anything. There's no rule that says sprites should be "inverted".
There was a problem hiding this comment.
Here picture clearly says that other values are invertible.
Rito13
force-pushed
the
bridges_over_stations
branch
from
e9381a2 to
f02ccc8
Compare
Rito13
changed the title
Allows to use bridges over stations feature.
Rito13
force-pushed
the
bridges_over_stations
branch
from
56caed4 to
cb611e3
Compare
…lars_flags so invert feature can be used for all tiles
Rito13
force-pushed
the
bridges_over_stations
branch
from
cb611e3 to
b45e186
Compare
|
superseded by #388 |
4 participants
Allows to use bridges over stations feature for rail stations.
Do not contain necessary additions to allow same feature for road stops and other station types.
Remains compatible with OpenTTD 14.0 and older.