From 69e9b94c5d8e2e71880120ae7997113d58c93252 Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Wed, 22 Nov 2017 10:18:46 +0300 Subject: [PATCH] Add Campaign Tooltip to D2K --- mods/d2k/maps/atreides-01a/map.yaml | 2 +- mods/d2k/maps/atreides-01b/map.yaml | 2 +- mods/d2k/maps/atreides-02a/map.yaml | 2 +- mods/d2k/maps/atreides-02b/map.yaml | 2 +- mods/d2k/maps/atreides-03a/map.yaml | 2 +- mods/d2k/maps/atreides-03b/map.yaml | 2 +- mods/d2k/maps/atreides-04/map.yaml | 2 +- mods/d2k/maps/atreides-05/map.yaml | 2 +- mods/d2k/maps/harkonnen-01a/map.yaml | 2 +- mods/d2k/maps/harkonnen-01b/map.yaml | 2 +- mods/d2k/maps/harkonnen-02a/map.yaml | 2 +- mods/d2k/maps/harkonnen-02b/map.yaml | 2 +- mods/d2k/maps/harkonnen-03a/map.yaml | 2 +- mods/d2k/maps/harkonnen-03b/map.yaml | 2 +- mods/d2k/maps/harkonnen-04/map.yaml | 2 +- mods/d2k/maps/harkonnen-05/map.yaml | 2 +- mods/d2k/maps/harkonnen-06a/map.yaml | 2 +- mods/d2k/maps/harkonnen-06b/map.yaml | 2 +- mods/d2k/maps/harkonnen-07/map.yaml | 2 +- mods/d2k/maps/harkonnen-09a/map.yaml | 2 +- mods/d2k/maps/ordos-01a/map.yaml | 2 +- mods/d2k/maps/ordos-01b/map.yaml | 2 +- mods/d2k/maps/ordos-02a/map.yaml | 2 +- mods/d2k/maps/ordos-02b/map.yaml | 2 +- mods/d2k/maps/ordos-03a/map.yaml | 2 +- mods/d2k/maps/ordos-03b/map.yaml | 2 +- mods/d2k/maps/ordos-04/map.yaml | 2 +- mods/d2k/rules/campaign-tooltips.yaml | 45 +++++++++++++++++++++++++++ mods/d2k/rules/defaults.yaml | 12 +++++++ mods/d2k/rules/structures.yaml | 2 ++ 30 files changed, 86 insertions(+), 27 deletions(-) create mode 100644 mods/d2k/rules/campaign-tooltips.yaml diff --git a/mods/d2k/maps/atreides-01a/map.yaml b/mods/d2k/maps/atreides-01a/map.yaml index ac7e49a8e5..b61de49670 100644 --- a/mods/d2k/maps/atreides-01a/map.yaml +++ b/mods/d2k/maps/atreides-01a/map.yaml @@ -111,4 +111,4 @@ Actors: Location: 13,13 Owner: Neutral -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/atreides-01b/map.yaml b/mods/d2k/maps/atreides-01b/map.yaml index 7ab45dcd6c..454c6049f9 100644 --- a/mods/d2k/maps/atreides-01b/map.yaml +++ b/mods/d2k/maps/atreides-01b/map.yaml @@ -110,4 +110,4 @@ Actors: Location: 22,20 Owner: Neutral -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/atreides-02a/map.yaml b/mods/d2k/maps/atreides-02a/map.yaml index c2363bd503..657ce78ecf 100644 --- a/mods/d2k/maps/atreides-02a/map.yaml +++ b/mods/d2k/maps/atreides-02a/map.yaml @@ -168,4 +168,4 @@ Actors: Owner: Neutral Location: 30,28 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/atreides-02b/map.yaml b/mods/d2k/maps/atreides-02b/map.yaml index dc5ef47b43..00b01f0e91 100644 --- a/mods/d2k/maps/atreides-02b/map.yaml +++ b/mods/d2k/maps/atreides-02b/map.yaml @@ -138,4 +138,4 @@ Actors: Owner: Neutral Location: 30,28 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/atreides-03a/map.yaml b/mods/d2k/maps/atreides-03a/map.yaml index a295ef86f7..e628459a28 100644 --- a/mods/d2k/maps/atreides-03a/map.yaml +++ b/mods/d2k/maps/atreides-03a/map.yaml @@ -135,4 +135,4 @@ Actors: Owner: Neutral Location: 39,30 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/atreides-03b/map.yaml b/mods/d2k/maps/atreides-03b/map.yaml index 99eab7e024..500a75d451 100644 --- a/mods/d2k/maps/atreides-03b/map.yaml +++ b/mods/d2k/maps/atreides-03b/map.yaml @@ -132,4 +132,4 @@ Actors: Owner: Neutral Location: 15,34 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/atreides-04/map.yaml b/mods/d2k/maps/atreides-04/map.yaml index 92344cc6f7..5029f5becc 100644 --- a/mods/d2k/maps/atreides-04/map.yaml +++ b/mods/d2k/maps/atreides-04/map.yaml @@ -413,6 +413,6 @@ Actors: Owner: Neutral Location: 56,54 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml Sequences: sequences.yaml diff --git a/mods/d2k/maps/atreides-05/map.yaml b/mods/d2k/maps/atreides-05/map.yaml index ae389a7772..8c6d42b0cf 100644 --- a/mods/d2k/maps/atreides-05/map.yaml +++ b/mods/d2k/maps/atreides-05/map.yaml @@ -363,4 +363,4 @@ Actors: Owner: Neutral Location: 49,4 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-01a/map.yaml b/mods/d2k/maps/harkonnen-01a/map.yaml index 545f7fedb2..7a8e53d810 100644 --- a/mods/d2k/maps/harkonnen-01a/map.yaml +++ b/mods/d2k/maps/harkonnen-01a/map.yaml @@ -106,4 +106,4 @@ Actors: Owner: Neutral Location: 29,7 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-01b/map.yaml b/mods/d2k/maps/harkonnen-01b/map.yaml index 2e07bbdc1b..d36cbb46a6 100644 --- a/mods/d2k/maps/harkonnen-01b/map.yaml +++ b/mods/d2k/maps/harkonnen-01b/map.yaml @@ -106,4 +106,4 @@ Actors: Owner: Neutral Location: 28,2 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-02a/map.yaml b/mods/d2k/maps/harkonnen-02a/map.yaml index d8ae0ce32f..5387bb6b4f 100644 --- a/mods/d2k/maps/harkonnen-02a/map.yaml +++ b/mods/d2k/maps/harkonnen-02a/map.yaml @@ -162,4 +162,4 @@ Actors: Owner: Neutral Location: 47,4 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-02b/map.yaml b/mods/d2k/maps/harkonnen-02b/map.yaml index 5564cf741a..49d3986607 100644 --- a/mods/d2k/maps/harkonnen-02b/map.yaml +++ b/mods/d2k/maps/harkonnen-02b/map.yaml @@ -144,4 +144,4 @@ Actors: Owner: Neutral Location: 23,16 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-03a/map.yaml b/mods/d2k/maps/harkonnen-03a/map.yaml index 016127c22e..78326ffd4d 100644 --- a/mods/d2k/maps/harkonnen-03a/map.yaml +++ b/mods/d2k/maps/harkonnen-03a/map.yaml @@ -177,4 +177,4 @@ Actors: Owner: Neutral Location: 29,2 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-03b/map.yaml b/mods/d2k/maps/harkonnen-03b/map.yaml index 9db34676ce..cafe141a6a 100644 --- a/mods/d2k/maps/harkonnen-03b/map.yaml +++ b/mods/d2k/maps/harkonnen-03b/map.yaml @@ -207,4 +207,4 @@ Actors: Owner: Neutral Location: 65,45 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-04/map.yaml b/mods/d2k/maps/harkonnen-04/map.yaml index 697abc930c..3653d6e0f9 100644 --- a/mods/d2k/maps/harkonnen-04/map.yaml +++ b/mods/d2k/maps/harkonnen-04/map.yaml @@ -379,4 +379,4 @@ Actors: Owner: Neutral Location: 22,91 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-05/map.yaml b/mods/d2k/maps/harkonnen-05/map.yaml index aa6fa409b2..38645c9428 100644 --- a/mods/d2k/maps/harkonnen-05/map.yaml +++ b/mods/d2k/maps/harkonnen-05/map.yaml @@ -512,4 +512,4 @@ Actors: Owner: Neutral Location: 2,29 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-06a/map.yaml b/mods/d2k/maps/harkonnen-06a/map.yaml index f7d7b6d820..a28398b27a 100644 --- a/mods/d2k/maps/harkonnen-06a/map.yaml +++ b/mods/d2k/maps/harkonnen-06a/map.yaml @@ -709,4 +709,4 @@ Actors: Owner: Neutral Location: 2,68 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-06b/map.yaml b/mods/d2k/maps/harkonnen-06b/map.yaml index c805d3be84..6be72981b2 100644 --- a/mods/d2k/maps/harkonnen-06b/map.yaml +++ b/mods/d2k/maps/harkonnen-06b/map.yaml @@ -646,4 +646,4 @@ Actors: Owner: Neutral Location: 2,9 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-07/map.yaml b/mods/d2k/maps/harkonnen-07/map.yaml index 3d1cfd969d..d4677163a5 100644 --- a/mods/d2k/maps/harkonnen-07/map.yaml +++ b/mods/d2k/maps/harkonnen-07/map.yaml @@ -767,4 +767,4 @@ Actors: Owner: Neutral Location: 2,27 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/harkonnen-09a/map.yaml b/mods/d2k/maps/harkonnen-09a/map.yaml index bbbce6ee34..31617dd37b 100644 --- a/mods/d2k/maps/harkonnen-09a/map.yaml +++ b/mods/d2k/maps/harkonnen-09a/map.yaml @@ -1038,4 +1038,4 @@ Actors: Owner: Neutral Location: 2,13 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-01a/map.yaml b/mods/d2k/maps/ordos-01a/map.yaml index c507bdef89..b31cb0208d 100644 --- a/mods/d2k/maps/ordos-01a/map.yaml +++ b/mods/d2k/maps/ordos-01a/map.yaml @@ -101,4 +101,4 @@ Actors: Owner: Neutral Location: 29,15 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-01b/map.yaml b/mods/d2k/maps/ordos-01b/map.yaml index cd494f5b3e..535e515800 100644 --- a/mods/d2k/maps/ordos-01b/map.yaml +++ b/mods/d2k/maps/ordos-01b/map.yaml @@ -101,4 +101,4 @@ Actors: Owner: Neutral Location: 24,2 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-02a/map.yaml b/mods/d2k/maps/ordos-02a/map.yaml index d17f788ea1..988b18f51f 100644 --- a/mods/d2k/maps/ordos-02a/map.yaml +++ b/mods/d2k/maps/ordos-02a/map.yaml @@ -152,4 +152,4 @@ Actors: Owner: Neutral Location: 25,17 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-02b/map.yaml b/mods/d2k/maps/ordos-02b/map.yaml index 01f49257bf..9dd6e79eda 100644 --- a/mods/d2k/maps/ordos-02b/map.yaml +++ b/mods/d2k/maps/ordos-02b/map.yaml @@ -137,4 +137,4 @@ Actors: Owner: Neutral Location: 9,8 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-03a/map.yaml b/mods/d2k/maps/ordos-03a/map.yaml index 97f551ed28..f2bde5ad5b 100644 --- a/mods/d2k/maps/ordos-03a/map.yaml +++ b/mods/d2k/maps/ordos-03a/map.yaml @@ -143,4 +143,4 @@ Actors: Owner: Harkonnen Location: 4,60 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-03b/map.yaml b/mods/d2k/maps/ordos-03b/map.yaml index 604d67beb1..1cc03734bb 100644 --- a/mods/d2k/maps/ordos-03b/map.yaml +++ b/mods/d2k/maps/ordos-03b/map.yaml @@ -254,4 +254,4 @@ Actors: Owner: Neutral Location: 2,20 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/maps/ordos-04/map.yaml b/mods/d2k/maps/ordos-04/map.yaml index 39b69e3b2a..8a2a9cbda7 100644 --- a/mods/d2k/maps/ordos-04/map.yaml +++ b/mods/d2k/maps/ordos-04/map.yaml @@ -523,4 +523,4 @@ Actors: Owner: Smugglers Location: 49,19 -Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml +Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/d2k/rules/campaign-tooltips.yaml b/mods/d2k/rules/campaign-tooltips.yaml new file mode 100644 index 0000000000..2fdf983e7f --- /dev/null +++ b/mods/d2k/rules/campaign-tooltips.yaml @@ -0,0 +1,45 @@ +^Vehicle: + Tooltip: + GenericVisibility: Enemy, Neutral + NeutralPrefix: Neutral + ShowOwnerRow: false + +^Tank: + Tooltip: + GenericVisibility: Enemy, Neutral + NeutralPrefix: Neutral + ShowOwnerRow: false + +^Infantry: + Tooltip: + GenericVisibility: Enemy, Neutral + NeutralPrefix: Neutral + ShowOwnerRow: false + +^Plane: + Tooltip: + GenericVisibility: Enemy, Neutral + NeutralPrefix: Neutral + ShowOwnerRow: false + +^Building: + Tooltip: + GenericVisibility: Enemy, Neutral + NeutralPrefix: Neutral + ShowOwnerRow: false + +^Husk: + Tooltip: + GenericVisibility: Enemy, Ally, Neutral + GenericStancePrefix: false + ShowOwnerRow: false + +^Crate: + Tooltip: + ShowOwnerRow: false + +wall: + Tooltip: + GenericVisibility: Enemy, Neutral + NeutralPrefix: Neutral + ShowOwnerRow: false diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index dfc0a26e14..1e20549547 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -164,6 +164,8 @@ ^Vehicle: Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor + Tooltip: + GenericName: Unit Huntable: Mobile: Crushes: crate, spicebloom @@ -232,6 +234,8 @@ Type: light HiddenUnderFog: Type: CenterPosition + Tooltip: + GenericName: Destroyed Unit ScriptTriggers: WithFacingSpriteBody: HitShape: @@ -256,6 +260,8 @@ ^AircraftHusk: Inherits: ^Husk + Tooltip: + GenericName: Unit WithShadow: FallsToEarth: Spins: False @@ -266,6 +272,8 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience Inherits@3: ^SpriteActor + Tooltip: + GenericName: Unit Huntable: Health: Armor: @@ -343,6 +351,8 @@ Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor Interactable: + Tooltip: + GenericName: Unit Huntable: AppearsOnRadar: UseLocation: true @@ -361,6 +371,8 @@ ^Building: Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor + Tooltip: + GenericName: Structure Huntable: SelectionDecorations: WithSpriteControlGroupDecoration: diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 65fc76d9e4..987e9a752f 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -13,6 +13,7 @@ TerrainTypes: Rock Tooltip: Name: Concrete + GenericName: Structure RenderSprites: KillsSelf: RemoveInstead: true @@ -698,6 +699,7 @@ wall: Value: 0 Tooltip: Name: Concrete Wall + GenericName: Structure AppearsOnRadar: Building: BuildSounds: CHUNG.WAV