From a04915403f9b285eddc34721adf01626728060d4 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Sep 2016 05:19:14 +0200 Subject: [PATCH 1/7] Fix TS spawnpoint, waypoint and camera depth sorting Makes them visible in editor. --- mods/ts/sequences/misc.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index cd1ff8357d..96ed0c47c0 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -70,16 +70,19 @@ mpspawn: idle: Length: * ZRamp: 1 + Offset: 0, 0, 24 waypoint: idle: Length: * ZRamp: 1 + Offset: 0, 0, 24 camera: idle: Length: * ZRamp: 1 + Offset: 0, 0, 24 clock: idle: gclock2 From c3946d9371e04e031b1e6be188614b07ebcd1005 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Sep 2016 05:35:46 +0200 Subject: [PATCH 2/7] Fix depth sorting and offset of several civilian structures --- mods/ts/sequences/civilian.yaml | 46 +++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/mods/ts/sequences/civilian.yaml b/mods/ts/sequences/civilian.yaml index 96b43e7410..3ea8e72390 100644 --- a/mods/ts/sequences/civilian.yaml +++ b/mods/ts/sequences/civilian.yaml @@ -104,7 +104,7 @@ aban18: ^bboard1x1: Defaults: - Offset: 0, -12 + Offset: 0, -12, 6 idle: ShadowStart: 2 damaged-idle: @@ -120,6 +120,15 @@ aban18: Start: 1 ShadowStart: 3 +^bboard2x1: + Defaults: + Offset: -12, -18 + idle: + ShadowStart: 2 + damaged-idle: + Start: 1 + ShadowStart: 3 + bboard01: Inherits: ^bboard1x1 @@ -160,13 +169,13 @@ bboard13: Inherits: ^bboard1x1 bboard14: - Inherits: ^bboard1x2 + Inherits: ^bboard2x1 bboard15: - Inherits: ^bboard1x2 + Inherits: ^bboard2x1 bboard16: - Inherits: ^bboard1x2 + Inherits: ^bboard2x1 ^cabase: Defaults: @@ -187,12 +196,21 @@ bboard16: Inherits: ^cabase Defaults: Offset: 12, -18, 18 + DepthSpriteOffset: 12, 0 + UseTilesetCode: true + +^ca2x1: + Inherits: ^cabase + Defaults: + Offset: -12, -18, 18 + DepthSpriteOffset: -12, 0 UseTilesetCode: true ^ca2x3: Inherits: ^cabase Defaults: Offset: 12, -30, 30 + DepthSpriteOffset: 12, 0 UseTilesetCode: true ^ca3x3: @@ -244,7 +262,7 @@ ca0012: Inherits: ^ca1x2 ca0013: - Inherits: ^ca1x2 + Inherits: ^ca2x1 ca0014: Inherits: ^ca1x1 @@ -369,21 +387,31 @@ capyr03: Inherits: ^cabase Defaults: Offset: 12, -30, 30 + DepthSpriteOffset: 12, 0 + +^city3x2: + Inherits: ^cabase + Defaults: + Offset: -12, -30, 30 + DepthSpriteOffset: -12, 0 ^city3x5: Inherits: ^cabase Defaults: Offset: 24, -48, 48 + DepthSpriteOffset: 24, 0 ^city4x2: Inherits: ^cabase Defaults: Offset: -24, -36, 36 + DepthSpriteOffset: -24, 0 ^city4x3: Inherits: ^cabase Defaults: Offset: -12, -42, 42 + DepthSpriteOffset: -12, 0 city01: Inherits: ^city4x2 @@ -392,13 +420,13 @@ city02: Inherits: ^city2x3 city03: - Inherits: ^city2x3 + Inherits: ^city3x2 city04: - Inherits: ^city2x3 + Inherits: ^city3x2 city05: - Inherits: ^city2x3 + Inherits: ^city3x2 city06: Inherits: ^city4x2 @@ -432,6 +460,8 @@ city15: city16: Inherits: ^city4x2 + Defaults: + DepthSpriteOffset: -10, 0 city17: Inherits: ^city4x3 From e5fcf1d5f6e857d095167f0344ff4b07ef0c53c0 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 22 Oct 2016 02:37:11 +0200 Subject: [PATCH 3/7] Fine-tune depth-sorting and offsets of temperate 4x2 TS civ buildings --- mods/ts/sequences/civilian.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mods/ts/sequences/civilian.yaml b/mods/ts/sequences/civilian.yaml index 3ea8e72390..16da14594d 100644 --- a/mods/ts/sequences/civilian.yaml +++ b/mods/ts/sequences/civilian.yaml @@ -405,7 +405,7 @@ capyr03: Inherits: ^cabase Defaults: Offset: -24, -36, 36 - DepthSpriteOffset: -24, 0 + DepthSpriteOffset: -24, 48 ^city4x3: Inherits: ^cabase @@ -415,6 +415,8 @@ capyr03: city01: Inherits: ^city4x2 + Defaults: + Offset: -12, -30, 36 city02: Inherits: ^city2x3 @@ -433,6 +435,8 @@ city06: city07: Inherits: ^city4x2 + Defaults: + Offset: -12, -30, 36 city08: Inherits: ^city2x2 @@ -461,7 +465,7 @@ city15: city16: Inherits: ^city4x2 Defaults: - DepthSpriteOffset: -10, 0 + Offset: -24, -30, 36 city17: Inherits: ^city4x3 From 41dc76ef06734bd51ecff41997197a9c5d5ad86b Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 22 Oct 2016 02:36:10 +0200 Subject: [PATCH 4/7] Fix Kodiak, Montauk, hospital & deployed ICBM depth sorting --- mods/ts/sequences/civilian.yaml | 3 +++ mods/ts/sequences/structures.yaml | 1 + 2 files changed, 4 insertions(+) diff --git a/mods/ts/sequences/civilian.yaml b/mods/ts/sequences/civilian.yaml index 16da14594d..a8c5e4d7a2 100644 --- a/mods/ts/sequences/civilian.yaml +++ b/mods/ts/sequences/civilian.yaml @@ -344,6 +344,7 @@ cacrsh05: cahosp: Defaults: DepthSprite: isodepth.shp + DepthSpriteOffset: 12, 0 UseTilesetCode: true Offset: 12, -42, 42 idle: @@ -547,6 +548,7 @@ gaoldcc6: gakodk: Defaults: DepthSprite: isodepth.shp + DepthSpriteOffset: -24, 0 UseTilesetCode: true Offset: -24, -36, 36 idle: @@ -642,6 +644,7 @@ galite: namntk: Defaults: DepthSprite: isodepth.shp + DepthSpriteOffset: 24, 0 UseTilesetCode: true Offset: 24, -24, 24 idle: diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index 36bee1e570..84f75cc61b 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -893,6 +893,7 @@ gaicbm: Offset: 0, -12, 12 UseTilesetCode: true DepthSprite: isodepth.shp + DepthSpriteOffset: -12, 6 idle: ShadowStart: 3 damaged-idle: From 67d5df9da50aa6b8d00b1dd6257b60661a04862c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 22 Oct 2016 02:59:42 +0200 Subject: [PATCH 5/7] Fix TS snow civ buildings depth sorting --- mods/ts/sequences/civilian.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mods/ts/sequences/civilian.yaml b/mods/ts/sequences/civilian.yaml index a8c5e4d7a2..ef3b3010c0 100644 --- a/mods/ts/sequences/civilian.yaml +++ b/mods/ts/sequences/civilian.yaml @@ -27,26 +27,31 @@ ammocrat: Inherits: ^abanbase Defaults: Offset: 36, -42, 42 + DepthSpriteOffset: 24, 0 ^aban2x6: Inherits: ^abanbase Defaults: Offset: 48, -48, 48 + DepthSpriteOffset: 36, 0 ^aban3x2: Inherits: ^abanbase Defaults: Offset: -12, -30, 30 + DepthSpriteOffset: -12, 0 ^aban4x2: Inherits: ^abanbase Defaults: Offset: -24, -36, 36 + DepthSpriteOffset: -24, 0 ^aban5x3: Inherits: ^abanbase Defaults: Offset: -24, -48, 48 + DepthSpriteOffset: -24, 0 aban01: Inherits: ^aban2x6 From 271cdcf8a82760085977263f04597c952b3fcdd5 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Sep 2016 05:42:38 +0200 Subject: [PATCH 6/7] Resize TS starting forces -changed light starting forces to be equally balanced -slightly increased medium starting forces -moderately increased heavy starting forces --- mods/ts/rules/world.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml index f466036d5d..f5be068913 100644 --- a/mods/ts/rules/world.yaml +++ b/mods/ts/rules/world.yaml @@ -116,7 +116,7 @@ World: ClassName: Light Factions: gdi BaseActor: mcv - SupportActors: e1,e1,e1,e2,e2 + SupportActors: e1,e1,e1,smech InnerSupportRadius: 3 OuterSupportRadius: 5 MPStartUnits@light.nod: @@ -124,7 +124,7 @@ World: ClassName: Light Factions: nod BaseActor: mcv - SupportActors: e1,e1,e1,e3,e3 + SupportActors: e1,e1,e1,bggy InnerSupportRadius: 3 OuterSupportRadius: 5 MPStartUnits@med.gdi: @@ -132,7 +132,7 @@ World: ClassName: Medium Factions: gdi BaseActor: mcv - SupportActors: e1,e1,e2,jumpjet,smech + SupportActors: e1,e1,e2,e2,jumpjet,smech InnerSupportRadius: 3 OuterSupportRadius: 5 MPStartUnits@med.nod: @@ -140,7 +140,7 @@ World: ClassName: Medium Factions: nod BaseActor: mcv - SupportActors: e1,e1,e3,cyborg,bggy + SupportActors: e1,e1,e3,e3,cyborg,bggy InnerSupportRadius: 3 OuterSupportRadius: 5 MPStartUnits@heavy.gdi: @@ -148,7 +148,7 @@ World: ClassName: Heavy Factions: gdi BaseActor: mcv - SupportActors: e1,e2,e2,smech,mmch + SupportActors: e1,e1,e2,e2,jumpjet,smech,smech,mmch InnerSupportRadius: 3 OuterSupportRadius: 5 MPStartUnits@heavy.nod: @@ -156,7 +156,7 @@ World: ClassName: Heavy Factions: nod BaseActor: mcv - SupportActors: e1,e3,bggy,bike,ttnk + SupportActors: e1,e1,e3,e3,cyborg,bggy,bike,ttnk InnerSupportRadius: 3 OuterSupportRadius: 5 MPStartLocations: From 677fcefb34a49a9f9eee58658815f8f431353a9c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 23 Oct 2016 17:04:30 +0200 Subject: [PATCH 7/7] Fix deployed sensor array depth sorting and snow sprite --- mods/ts/sequences/vehicles.yaml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/mods/ts/sequences/vehicles.yaml b/mods/ts/sequences/vehicles.yaml index 592beecaa5..f4a9a45a10 100644 --- a/mods/ts/sequences/vehicles.yaml +++ b/mods/ts/sequences/vehicles.yaml @@ -47,23 +47,22 @@ hvr: lpst.gdi: Inherits: ^VehicleOverlays idle: gadpsa - Offset: 0, -12 + DepthSprite: isodepth.shp + DepthSpriteOffset: -6, -6 + Offset: 0, -12, 12 + UseTilesetCode: true ShadowStart: 3 make: gadpsamk - Offset: 0, -12 + DepthSprite: isodepth.shp + DepthSpriteOffset: -6, -6 + Offset: 0, -12, 12 + UseTilesetCode: true Length: 36 ShadowStart: 36 icon: sidebar-gdi|lpsticon lpst.nod: - Inherits: ^VehicleOverlays - idle: gadpsa - Offset: 0, -12 - ShadowStart: 3 - make: gadpsamk - Offset: 0, -12 - Length: 36 - ShadowStart: 36 + Inherits: lpst.gdi icon: sidebar-nod|lpsticon repair: