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

Merge pull request #6301 from Phrohdoh/TibSunFixes

Browse Source 
Tiberian Sun visual fixes.
This commit is contained in:
Matthias Mailänder
2014-08-23 11:19:31 +02:00
parent 152aad9cf9 4abee8682f
commit 60a3196bb2
4 changed files with 97 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mods/ts/rules/structures.yaml
View File

@@ -96,9 +96,11 @@ GAPILE:
Type: Wood Type: Wood
RevealsShroud: RevealsShroud:
Range: 5c0 Range: 5c0
RallyPoint:
RallyPoint: 2,3
Exit@1: Exit@1:
SpawnOffset: -2730,2730,0 SpawnOffset: -256,1051,0
ExitCell: 0,2 ExitCell: 2,3
Production: Production:
Produces: Infantry Produces: Infantry
PrimaryBuilding: PrimaryBuilding:
@@ -166,8 +168,8 @@ GAWEAP:
BuildPaletteOrder: 50 BuildPaletteOrder: 50
Owner: gdi Owner: gdi
Building: Building:
Footprint: ___ xxx === Footprint: xxx= xxx= xxx=
Dimensions: 3,3 Dimensions: 4,3
Health: Health:
HP: 1000 HP: 1000
RevealsShroud: RevealsShroud:
@@ -177,8 +179,8 @@ GAWEAP:
RallyPoint: RallyPoint:
RallyPoint: 6,5 RallyPoint: 6,5
Exit@1: Exit@1:
SpawnOffset: -170,1024,0 SpawnOffset: -170,0,0
ExitCell: 3,3 ExitCell: 4,2
Production: Production:
Produces: Vehicle Produces: Vehicle
PrimaryBuilding: PrimaryBuilding:
@@ -275,8 +277,10 @@ NAHAND:
RevealsShroud: RevealsShroud:
Range: 5c0 Range: 5c0
Exit@1: Exit@1:
SpawnOffset: -2730,2730,0 SpawnOffset: 0,2048,0
ExitCell: 0,2 ExitCell: 3,3
RallyPoint:
RallyPoint: 3,3
Production: Production:
Produces: Infantry Produces: Infantry
PrimaryBuilding: PrimaryBuilding:
@@ -303,8 +307,8 @@ NAWEAP:
BuildPaletteOrder: 50 BuildPaletteOrder: 50
Owner: nod Owner: nod
Building: Building:
Footprint: ___ xxx === Footprint: xxx= xxx= xxx=
Dimensions: 3,3 Dimensions: 4,3
Health: Health:
HP: 1000 HP: 1000
RevealsShroud: RevealsShroud:
@@ -314,8 +318,8 @@ NAWEAP:
RallyPoint: RallyPoint:
RallyPoint: 6,5 RallyPoint: 6,5
Exit@1: Exit@1:
SpawnOffset: -170,1024,0 SpawnOffset: -170,0,0
ExitCell: 3,3 ExitCell: 4,2
Production: Production:
Produces: Vehicle Produces: Vehicle
PrimaryBuilding: PrimaryBuilding:
@@ -613,8 +617,8 @@ GARADR:
ProvidesCustomPrerequisite: ProvidesCustomPrerequisite:
Prerequisite: radar Prerequisite: radar
Building: Building:
Footprint: ___ xxx xxx Footprint: xx xx
Dimensions: 3,3 Dimensions: 2,2
Health: Health:
HP: 800 HP: 800
Armor: Armor:

3
mods/ts/rules/vehicles.yaml
View File

@@ -494,7 +494,7 @@ MMCH:
Valued: Valued:
Cost: 800 Cost: 800
Tooltip: Tooltip:
Name: Medium Mech Name: Titan
Buildable: Buildable:
Queue: Vehicle Queue: Vehicle
BuildPaletteOrder: 30 BuildPaletteOrder: 30
@@ -584,6 +584,7 @@ SMECH:
SpawnsCorpse: false SpawnsCorpse: false
Selectable: Selectable:
Voices: Mech Voices: Mech
Bounds: 16, 32
BIKE: BIKE:
Inherits: ^Vehicle Inherits: ^Vehicle

77
mods/ts/sequences/structures.yaml
View File

@@ -97,38 +97,48 @@ gapile:
idle: gtpile idle: gtpile
Start: 0 Start: 0
ShadowStart: 3 ShadowStart: 3
Offset: 0, -12
damaged-idle: gtpile damaged-idle: gtpile
Start: 1 Start: 1
ShadowStart: 4 ShadowStart: 4
Offset: 0, -12
critical-idle: gtpile critical-idle: gtpile
Start: 2 Start: 2
ShadowStart: 5 ShadowStart: 5
Offset: 0, -12
production-lights: gtpile_a production-lights: gtpile_a
Start: 0 Start: 0
Length: 7 Length: 7
Tick: 200 Tick: 200
Offset: 0, -12
damaged-production-lights: gtpile_a damaged-production-lights: gtpile_a
Start:7 Start:7
Length: 7 Length: 7
Tick: 200 Tick: 200
Offset: 0, -12
idle-light: gtpile_b idle-light: gtpile_b
Start: 0 Start: 0
Length: 7 Length: 7
Tick: 200 Tick: 200
Offset: 0, -12
damaged-idle-light: gtpile_b damaged-idle-light: gtpile_b
Start:7 Start:7
Length: 7 Length: 7
Tick: 200 Tick: 200
Offset: 0, -12
idle-flag: gtpile_c idle-flag: gtpile_c
Start:0 Start:0
Length: 7 Length: 7
Offset: 0, -12
damaged-idle-flag: gtpile_c damaged-idle-flag: gtpile_c
Start:7 Start:7
Length: 7 Length: 7
Offset: 0, -12
make: gtpilemk make: gtpilemk
Start: 0 Start: 0
Length: 20 Length: 20
ShadowStart: 20 ShadowStart: 20
Offset: 0, -12
icon: brrkicon icon: brrkicon
Start: 0 Start: 0
@@ -136,70 +146,87 @@ gaweap:
idle: gtweap idle: gtweap
Start: 0 Start: 0
ShadowStart: 3 ShadowStart: 3
Offset: -12, -28
damaged-idle: gtweap damaged-idle: gtweap
Start: 1 Start: 1
ShadowStart: 4 ShadowStart: 4
Offset: -12, -28
dead: gtweap dead: gtweap
Start: 2 Start: 2
ShadowStart: 5 ShadowStart: 5
Offset: -12, -28
production-lights-white: gtweap_a production-lights-white: gtweap_a
Start: 0 Start: 0
Length: 8 Length: 8
Tick: 100 Tick: 100
ZOffset: 2048 ZOffset: 2048
Offset: -12, -28
damaged-production-lights-white: gtweap_a damaged-production-lights-white: gtweap_a
Start: 8 Start: 8
Length: 8 Length: 8
Tick: 100 Tick: 100
ZOffset: 2048 ZOffset: 2048
Offset: -12, -28
production-lights-red: gtweap_b production-lights-red: gtweap_b
Start: 0 Start: 0
Length: 4 Length: 4
Tick: 120 Tick: 120
ZOffset: 2048 ZOffset: 2048
Offset: -12, -28
damaged-production-lights-red: gtweap_b damaged-production-lights-red: gtweap_b
Start: 4 Start: 4
Length: 4 Length: 4
Tick: 120 Tick: 120
ZOffset: 2048 ZOffset: 2048
Offset: -12, -28
idle-turbines: gtweap_c idle-turbines: gtweap_c
Start: 0 Start: 0
Length: 4 Length: 4
Tick: 80 Tick: 80
ZOffset: 2048 ZOffset: 2048
Offset: -12, -28
damaged-idle-turbines: gtweap_c damaged-idle-turbines: gtweap_c
Start: 0 Start: 0
Length: 4 Length: 4
Tick: 80 Tick: 80
ZOffset: 2048 ZOffset: 2048
Offset: -12, -28
build-top: gtweap_d build-top: gtweap_d
Start: 0 Start: 0
Length: 9 Length: 9
ShadowStart: 9 ShadowStart: 9
Offset: -12, -28
damaged-build-top: gtweap_d damaged-build-top: gtweap_d
Start: 0 Start: 0
Length: 9 Length: 9
ShadowStart: 9 ShadowStart: 9
Offset: -12, -28
idle-top: gtweap_2 idle-top: gtweap_2
Start: 0 Start: 0
Offset: -12, -28
damaged-idle-top: gtweap_2 damaged-idle-top: gtweap_2
Start: 1 Start: 1
Offset: -12, -28
make: gtweapmk make: gtweapmk
Start: 0 Start: 0
Length: 20 Length: 20
Tick: 80 Tick: 80
ShadowStart: 20 ShadowStart: 20
Offset: -12, -28
icon: weapicon icon: weapicon
Start: 0 Start: 0
bib: gtweapbb bib: gtweapbb
Start: 0 Start: 0
Length: 1 Length: 1
Offset: -12, -28
damaged-bib: gtweapbb damaged-bib: gtweapbb
Start: 1 Start: 1
Length: 1 Length: 1
Offset: -12, -28
critical-bib: gtweapbb critical-bib: gtweapbb
Start: 2 Start: 2
Length: 1 Length: 1
Offset: -12, -28
# TODO: gtweap_1 & gtweap_a & gtweap_b & gtweap_c are unused # TODO: gtweap_1 & gtweap_a & gtweap_b & gtweap_c are unused
napowr: napowr:
@@ -264,32 +291,40 @@ nahand:
idle: nthand idle: nthand
Start: 0 Start: 0
ShadowStart: 3 ShadowStart: 3
Offset: -14, -14
damaged-idle: nthand damaged-idle: nthand
Start: 1 Start: 1
ShadowStart: 4 ShadowStart: 4
Offset: -14, -14
critical-idle: nthand critical-idle: nthand
Start: 2 Start: 2
ShadowStart: 5 ShadowStart: 5
Offset: -14, -14
production-light: nthand_a production-light: nthand_a
Start: 0 Start: 0
Length: 5 Length: 5
Tick: 100 Tick: 100
Offset: -14, -14
damaged-production-light: nthand_a damaged-production-light: nthand_a
Start: 5 Start: 5
Length: 5 Length: 5
Tick: 100 Tick: 100
Offset: -14, -14
idle-lights: nthand_b idle-lights: nthand_b
Start: 0 Start: 0
Length: 8 Length: 8
Tick: 200 Tick: 200
Offset: -14, -14
damaged-idle-lights: nthand_b damaged-idle-lights: nthand_b
Start: 8 Start: 8
Length: 8 Length: 8
Tick: 200 Tick: 200
Offset: -14, -14
make: nthandmk make: nthandmk
Start: 0 Start: 0
Length: 15 Length: 15
ShadowStart: 15 ShadowStart: 15
Offset: -14, -14
icon: handicon icon: handicon
Start: 0 Start: 0
@@ -297,50 +332,63 @@ naweap:
idle: ntweap idle: ntweap
Start: 0 Start: 0
ShadowStart: 3 ShadowStart: 3
Offset: -12, -28
damaged-idle: ntweap damaged-idle: ntweap
Start: 1 Start: 1
ShadowStart: 4 ShadowStart: 4
Offset: -12, -28
dead: ntweap dead: ntweap
Start: 2 Start: 2
ShadowStart: 5 ShadowStart: 5
Offset: -12, -28
production-lights: ntweap_a production-lights: ntweap_a
Start: 0 Start: 0
Length: 16 Length: 16
Tick: 100 Tick: 100
ZOffset: 2048 ZOffset: 2048
Offset: -12, -28
damaged-production-lights: ntweap_a damaged-production-lights: ntweap_a
Start: 16 Start: 16
Length: 16 Length: 16
Tick: 100 Tick: 100
ZOffset: 2048 ZOffset: 2048
Offset: -12, -28
build-top: ntweap_b build-top: ntweap_b
Start: 0 Start: 0
Length: 10 Length: 10
ShadowStart: 10 ShadowStart: 10
Offset: -12, -28
damaged-build-top: ntweap_b damaged-build-top: ntweap_b
Start: 10 Start: 10
Length: 10 Length: 10
ShadowStart: 20 ShadowStart: 20
Offset: -12, -28
idle-top: ntweap_2 idle-top: ntweap_2
Start: 0 Start: 0
Offset: -12, -28
damaged-idle-top: ntweap_2 damaged-idle-top: ntweap_2
Start: 1 Start: 1
Offset: -12, -28
make: ntweapmk make: ntweapmk
Start: 0 Start: 0
Length: 22 Length: 22
Tick: 80 Tick: 80
ShadowStart: 22 ShadowStart: 22
Offset: -12, -28
icon: nwepicon icon: nwepicon
Start: 0 Start: 0
bib: ntweapbb bib: ntweapbb
Start: 0 Start: 0
Length: 1 Length: 1
Offset: -12, -28
damaged-bib: ntweapbb damaged-bib: ntweapbb
Start: 1 Start: 1
Length: 1 Length: 1
Offset: -12, -28
critical-bib: ntweapbb critical-bib: ntweapbb
Start: 2 Start: 2
Length: 1 Length: 1
Offset: -12, -28
# TODO: ntweap_1 & ntweap_b & ntweap_c are unused # TODO: ntweap_1 & ntweap_b & ntweap_c are unused
naradr: naradr:
@@ -401,24 +449,30 @@ garadr:
idle: gtradr idle: gtradr
Start: 0 Start: 0
ShadowStart: 3 ShadowStart: 3
Offset: 0, -14
damaged-idle: gtradr damaged-idle: gtradr
Start: 1 Start: 1
ShadowStart: 4 ShadowStart: 4
Offset: 0, -14
# critical-idle: gtradr #shows a destroyed radar dish # critical-idle: gtradr #shows a destroyed radar dish
# Start: 2 # Start: 2
# ShadowStart: 5 # ShadowStart: 5
# Offset: 0, -14
idle-dish: gtradr_a idle-dish: gtradr_a
Frames: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 Frames: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
Length: 28 Length: 28
Tick: 200 Tick: 200
Offset: 0, -14
damaged-idle-dish: gtradr_a damaged-idle-dish: gtradr_a
Frames: 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16 Frames: 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16
Length: 28 Length: 28
Tick: 240 Tick: 240
Offset: 0, -14
make: gtradrmk make: gtradrmk
Start: 0 Start: 0
Length: 20 Length: 20
ShadowStart: 20 ShadowStart: 20
Offset: 0, -14
icon: radricon icon: radricon
Start: 0 Start: 0
@@ -783,40 +837,47 @@ gahpad:
idle: gthpad idle: gthpad
Start: 0 Start: 0
ShadowStart: 3 ShadowStart: 3
Offset: 0, -14
damaged-idle: gthpad damaged-idle: gthpad
Start: 1 Start: 1
ShadowStart: 4 ShadowStart: 4
Offset: 0, -14
critical-idle: gthpad critical-idle: gthpad
Start: 2 Start: 2
ShadowStart: 5 ShadowStart: 5
Offset: 0, -14
idle-platform: gthpadbb idle-platform: gthpadbb
Start: 0 Start: 0
ShadowStart: 3 ShadowStart: 3
Offset: 0, -14
damaged-idle-platform: gthpadbb damaged-idle-platform: gthpadbb
Start: 1 Start: 1
ShadowStart: 4 ShadowStart: 4
Offset: 0, -14
critical-idle-platform: gthpadbb critical-idle-platform: gthpadbb
Start: 2 Start: 2
ShadowStart: 5 ShadowStart: 5
Offset: 0, -14
idle-lights: gthpad_a idle-lights: gthpad_a
Start: 0 Start: 0
Length: 8 Length: 8
Offset: 2,-12 Offset: 2,-26
Tick: 200 Tick: 200
damaged-idle-lights: gthpad_a damaged-idle-lights: gthpad_a
Start: 8 Start: 8
Length: 8 Length: 8
Offset: 16,-16 Offset: 16,-30
Tick: 200 Tick: 200
critical-idle-lights: gthpad_a critical-idle-lights: gthpad_a
Start: 16 Start: 16
Length: 8 Length: 8
Offset: 24,-24 Offset: 24,-38
Tick: 200 Tick: 200
make: gthpadmk make: gthpadmk
Start: 0 Start: 0
Length: 18 Length: 18
ShadowStart: 18 ShadowStart: 18
Offset: 0, -14
icon: heliicon icon: heliicon
Start: 0 Start: 0
@@ -865,37 +926,47 @@ proc: # TODO: unused narefn_a, narefn_b
idle: ntrefn idle: ntrefn
Start: 0 Start: 0
ShadowStart: 3 ShadowStart: 3
Offset: 0, -14
damaged-idle: ntrefn damaged-idle: ntrefn
Start: 1 Start: 1
ShadowStart: 4 ShadowStart: 4
Offset: 0, -14
critical-idle: ntrefn critical-idle: ntrefn
Start: 2 Start: 2
ShadowStart: 5 ShadowStart: 5
Offset: 0, -14
make: ntrefnmk make: ntrefnmk
Start: 0 Start: 0
Length: 20 Length: 20
ShadowStart: 20 ShadowStart: 20
Offset: 0, -14
idle-redlights: ntrefn_c idle-redlights: ntrefn_c
Start: 0 Start: 0
Length: 16 Length: 16
Tick: 120 Tick: 120
Offset: 0, -14
damaged-idle-redlights: ntrefn_c damaged-idle-redlights: ntrefn_c
Start: 0 Start: 0
Length: 16 Length: 16
Tick: 120 Tick: 120
Offset: 0, -14
critical-idle-redlights: ntrefn_c critical-idle-redlights: ntrefn_c
Start: 16 Start: 16
Length: 16 Length: 16
Tick: 200 Tick: 200
Offset: 0, -14
bib: ntrefnbb bib: ntrefnbb
Start: 0 Start: 0
Length: 1 Length: 1
Offset: 0, -14
damaged-bib: ntrefnbb damaged-bib: ntrefnbb
Start: 1 Start: 1
Length: 1 Length: 1
Offset: 0, -14
critical-bib: ntrefnbb critical-bib: ntrefnbb
Start: 2 Start: 2
Length: 1 Length: 1
Offset: 0, -14
icon: reficon icon: reficon
Start: 0 Start: 0

3
mods/ts/sequences/vehicles.yaml
View File

@@ -154,16 +154,19 @@ smech:
Start: 96 Start: 96
Facings: -8 Facings: -8
ShadowStart: 232 ShadowStart: 232
Offset: 0, 8
run: run:
Start: 0 Start: 0
Facings: -8 Facings: -8
Length: 12 Length: 12
ShadowStart: 136 ShadowStart: 136
Offset: 0, 8
shoot: shoot:
Start: 104 Start: 104
Length: 4 Length: 4
Facings: -8 Facings: -8
ShadowStart: 240 ShadowStart: 240
Tick: 100 Tick: 100
Offset: 0, 8
icon: smchicon icon: smchicon
Start: 0 Start: 0