From f63e15f5de9610999a284d60082d202773e7f85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 11 Jul 2021 16:15:35 +0200 Subject: [PATCH] Fix igloos being labeled as haystacks in-game. --- mods/cnc/rules/civilian.yaml | 24 ++++------------------- mods/cnc/rules/defaults.yaml | 38 ++++++++++++++++++++++++++++++++++++ mods/ra/rules/civilian.yaml | 12 ++---------- mods/ra/rules/defaults.yaml | 19 ++++++++++++++++++ 4 files changed, 63 insertions(+), 30 deletions(-) diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index 07dbd25c89..6a3d6898fc 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -244,36 +244,20 @@ V11.Husk: Name: Ludwig's House (Destroyed) V12: - Inherits: ^CivField + Inherits: ^CivHaystackOrIgloo SpawnActorOnDeath: Actor: V12.Husk - MapEditorData: - ExcludeTilesets: DESERT - Tooltip: - Name: Haystacks V12.Husk: - Inherits: ^CivBuildingHusk - MapEditorData: - ExcludeTilesets: DESERT - Tooltip: - Name: Haystacks (Destroyed) + Inherits: ^CivHaystackOrIglooHusk V13: - Inherits: ^CivField + Inherits: ^CivHaystackOrIgloo SpawnActorOnDeath: Actor: V13.Husk - MapEditorData: - ExcludeTilesets: DESERT - Tooltip: - Name: Haystacks V13.Husk: - Inherits: ^CivBuildingHusk - MapEditorData: - ExcludeTilesets: DESERT - Tooltip: - Name: Haystacks (Destroyed) + Inherits: ^CivHaystackOrIglooHusk V14: Inherits: ^CivField diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index e53a75c90b..a2c8146460 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -815,6 +815,25 @@ RenderSprites: Palette: terrain +^CivHaystackOrIgloo: + Inherits: ^CivField + MapEditorData: + ExcludeTilesets: DESERT + -Tooltip: + GrantConditionOnTileSet@WINTER: + Condition: winter + TileSets: SNOW, WINTER + Tooltip@WINTER: + Name: Igloo + RequiresCondition: winter + GenericVisibility: None + ShowOwnerRow: false + Tooltip@SUMMER: + Name: Haystacks + RequiresCondition: !winter + GenericVisibility: None + ShowOwnerRow: false + ^CivFieldHusk: Inherits@1: ^SpriteActor Interactable: @@ -833,6 +852,25 @@ MapEditorData: Categories: Husk +^CivHaystackOrIglooHusk: + Inherits: ^CivField + MapEditorData: + ExcludeTilesets: DESERT + -Tooltip: + GrantConditionOnTileSet@WINTER: + Condition: winter + TileSets: SNOW, WINTER + Tooltip@WINTER: + Name: Igloo (Destroyed) + RequiresCondition: winter + GenericVisibility: None + ShowOwnerRow: false + Tooltip@SUMMER: + Name: Haystacks (Destroyed) + RequiresCondition: !winter + GenericVisibility: None + ShowOwnerRow: false + ^Wall: Inherits@1: ^SpriteActor Inherits@shape: ^1x1Shape diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index 39a7d510e6..0586a31082 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -320,18 +320,10 @@ V11: ExcludeTilesets: DESERT, INTERIOR V12: - Inherits: ^CivField - MapEditorData: - ExcludeTilesets: DESERT, INTERIOR - Tooltip: - Name: Haystacks + Inherits: ^CivHaystackOrIgloo V13: - Inherits: ^CivField - MapEditorData: - ExcludeTilesets: DESERT, INTERIOR - Tooltip: - Name: Haystack + Inherits: ^CivHaystackOrIgloo V14: Inherits: ^CivField diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 69701734cc..c8f8e39250 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -891,6 +891,25 @@ ExcludeTilesets: INTERIOR Interactable: +^CivHaystackOrIgloo: + Inherits: ^CivField + MapEditorData: + ExcludeTilesets: DESERT, INTERIOR + -Tooltip: + GrantConditionOnTileSet@WINTER: + Condition: winter + TileSets: SNOW + Tooltip@WINTER: + Name: Igloo + RequiresCondition: winter + GenericVisibility: None + ShowOwnerRow: false + Tooltip@SUMMER: + Name: Haystacks + RequiresCondition: !winter + GenericVisibility: None + ShowOwnerRow: false + ^Tree: Inherits@1: ^SpriteActor Inherits@shape: ^1x1Shape