epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13162 from pchote/tunnel-enter-cursor

Browse Source 
Implement "Enter Tunnel" cursor
This commit is contained in:
reaperrr
2017-05-05 23:47:57 +02:00
committed by GitHub
parent f5ddea305a 1871715699
commit 22d8167d49
10 changed files with 290 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mods/ts/maps/arivruns/map.yaml
View File

@@ -1552,16 +1552,16 @@ Actors:
Owner: Neutral
Actor620: tuntop04
Owner: Neutral
Location: 145,5
Location: 146,5
Actor621: tuntop04
Owner: Neutral
Location: 116,9
Location: 117,9
Actor622: tuntop02
Owner: Neutral
Location: 144,-19
Location: 146,-19
Actor623: tuntop02
Owner: Neutral
Location: 115,-15
Location: 117,-15
Actor494: bridge1
Owner: Neutral
Location: 232,0

28
mods/ts/maps/springs/map.yaml
View File

@@ -806,49 +806,49 @@ Actors:
Owner: Neutral
Actor219: tuntop03
Owner: Neutral
Location: 68,-5
Location: 68,-4
Actor220: tuntop04
Owner: Neutral
Location: 73,-12
Location: 74,-12
Actor221: tuntop04
Owner: Neutral
Location: 107,-7
Location: 108,-7
Actor222: tuntop03
Owner: Neutral
Location: 109,4
Location: 109,5
Actor224: tuntop04
Owner: Neutral
Location: 87,28
Location: 88,28
Actor225: tuntop03
Owner: Neutral
Location: 73,34
Location: 73,35
Actor227: tuntop01
Owner: Neutral
Location: 60,34
Location: 60,35
Actor228: tuntop04
Owner: Neutral
Location: 42,13
Location: 43,13
Actor233: tuntop03
Owner: Neutral
Location: 93,-37
Location: 93,-36
Actor237: tuntop02
Owner: Neutral
Location: 107,-16
Location: 108,-16
Actor238: tuntop01
Owner: Neutral
Location: 77,-37
Location: 77,-36
Actor239: tuntop01
Owner: Neutral
Location: 95,4
Location: 95,5
Actor240: tuntop02
Owner: Neutral
Location: 73,-28
Actor234: tuntop02
Owner: Neutral
Location: 42,-2
Location: 43,-2
Actor236: tuntop01
Owner: Neutral
Location: 51,-5
Location: 51,-4
Actor235: tuntop02
Owner: Neutral
Location: 88,13

BIN
mods/ts/maps/sunstroke/map.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 33 KiB

39
mods/ts/maps/sunstroke/map.yaml
View File

@@ -2377,23 +2377,23 @@ Actors:
Actor679: srock05
Location: 144,-8
Owner: Neutral
# Actor680: lobrdg_r_nw
# Location: 152,-16
# Owner: Neutral
Actor680: lobrdg_r_nw
Location: 152,-17
Owner: Neutral
Actor681: bridge2
Location: 140,-3
Owner: Neutral
# Actor682: lobrdg_b
# Location: 153,-16
# Owner: Neutral
# Health: 50
Actor682: lobrdg_b
Location: 153,-17
Owner: Neutral
Health: 50
Actor683: srock04
Location: 145,-7
Owner: Neutral
# Actor684: lobrdg_b
# Location: 154,-16
# Owner: Neutral
# Health: 25
Actor684: lobrdg_b
Location: 154,-17
Owner: Neutral
Health: 25
Actor685: crat01
Location: 115,24
Owner: Neutral
@@ -2487,10 +2487,10 @@ Actors:
Actor715: crat03
Location: 105,50
Owner: Neutral
# Actor716: lobrdg_r_se
# Location: 171,-16
# Owner: Neutral
# Health: 50
Actor716: lobrdg_r_se
Location: 171,-17
Owner: Neutral
Health: 50
Actor717: trock05
Location: 189,-34
Owner: Neutral
@@ -2564,6 +2564,15 @@ Actors:
Owner: Creeps
Location: 58,23
Facing: 92
Actor741: tuntop04
Owner: Neutral
Location: 183,-43
Actor742: lobrdg_b_d
Owner: Neutral
Location: 155,-17
Actor743: lobrdg_b_d
Owner: Neutral
Location: 170,-17
Rules: rules.yaml

22
mods/ts/rules/defaults.yaml
View File

@@ -381,6 +381,8 @@
ReferencePoint: Bottom, Right
RequiresCondition: hospitalheal
RevealOnFire:
EntersTunnels:
Voice: Move
^RegularInfantryDeath:
WithDeathAnimation@normal:
@@ -565,6 +567,8 @@
Carryable:
RequiresCondition: !inside-tunnel
RevealOnFire:
EntersTunnels:
Voice: Move
^Tank:
Inherits: ^Vehicle
@@ -710,6 +714,8 @@
Guardable:
WithFacingSpriteBody:
RevealOnFire:
EntersTunnels:
Voice: Move
^BlossomTree:
Inherits@1: ^SpriteActor
@@ -870,9 +876,21 @@
TerrainType: Rail
^Tunnel:
Inherits: ^TerrainOverlay
RenderSprites:
Palette: terraindecoration
WithSpriteBody:
BodyOrientation:
UseClassicPerspectiveFudge: False
QuantizedFacings: 1
Building:
Dimensions: 3, 3
Footprint: ___ ___ ___
CustomSelectionSize:
CustomBounds: 220,220
CustomBounds: 144, 144
Targetable:
AlwaysVisible:
TunnelEntrance:
Dimensions: 3, 3
^Gate:
Inherits: ^Building

12
mods/ts/rules/misc.yaml
View File

@@ -213,12 +213,24 @@ TRACKS16:
TUNTOP01:
Inherits: ^Tunnel
TunnelEntrance:
RallyPoint: -3, 1
Sensor: 0, 1
TUNTOP02:
Inherits: ^Tunnel
TunnelEntrance:
RallyPoint: 1, -3
Sensor: 1, 0
TUNTOP03:
Inherits: ^Tunnel
TunnelEntrance:
RallyPoint: 3, 1
Sensor: 0, 1
TUNTOP04:
Inherits: ^Tunnel
TunnelEntrance:
RallyPoint: 1, 3
Sensor: 1, 0

12
mods/ts/sequences/misc.yaml
View File

@@ -614,24 +614,28 @@ tracks16:
^tuntop:
idle:
Offset: 0, -13, 42
ZRamp: 1
UseTilesetExtension: true
# Disabled to avoid glitches until shadow rendering is fixed
# Appears to be unused in the original game too
# ShadowStart: 1
tuntop01:
Inherits: ^tuntop
idle:
Offset: 24, -49, 36
tuntop02:
Inherits: ^tuntop
idle:
Offset: -24, -49, 36
tuntop03:
Inherits: ^tuntop
idle:
Offset: 24, -49, 24
tuntop04:
Inherits: ^tuntop
idle:
Offset: -24, -49, 24
dig:
idle: