From 6dabec6124459f7695c9c77cf829fa23f58bf272 Mon Sep 17 00:00:00 2001 From: penev92 Date: Thu, 18 Dec 2014 04:56:53 +0200 Subject: [PATCH] Add more tileset templates and voice notifications Add House Corrino Add Corrino-specific structures Remove "new" tileset entries and speech notifications for now --- mods/d2k/mod.yaml | 3 ++- mods/d2k/notifications.yaml | 1 + mods/d2k/rules/corrino.yaml | 25 +++++++++++++++++++++++++ mods/d2k/rules/structures.yaml | 22 ---------------------- mods/d2k/sequences/structures.yaml | 8 ++++---- 5 files changed, 32 insertions(+), 27 deletions(-) create mode 100644 mods/d2k/rules/corrino.yaml diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index d990db8fa5..398d2d0e9e 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -37,6 +37,7 @@ Rules: ./mods/d2k/rules/harkonnen.yaml ./mods/d2k/rules/ordos.yaml ./mods/d2k/rules/arrakis.yaml + ./mods/d2k/rules/corrino.yaml Sequences: ./mods/d2k/sequences/aircraft.yaml @@ -119,7 +120,7 @@ Translations: LoadScreen: LogoStripeLoadScreen Image: ./mods/d2k/uibits/loadscreen.png - Text: Filling Crates..., Breeding Sandworms... + Text: Filling Crates..., Breeding Sandworms..., Fuelling carryalls..., Deploying harvesters..., Preparing 'thopters..., Summoning mentats... ContentInstaller: MenuWidget: INSTALL_PANEL diff --git a/mods/d2k/notifications.yaml b/mods/d2k/notifications.yaml index 7548e642e2..d88ed6e04f 100644 --- a/mods/d2k/notifications.yaml +++ b/mods/d2k/notifications.yaml @@ -33,6 +33,7 @@ Speech: BuildingCaptured: CAPT WormSign: WSIGN WormAttack: WATTK + EnemyUnitsApproaching: ENEMY Sounds: DefaultVariant: .WAV diff --git a/mods/d2k/rules/corrino.yaml b/mods/d2k/rules/corrino.yaml new file mode 100644 index 0000000000..5223ddd4c8 --- /dev/null +++ b/mods/d2k/rules/corrino.yaml @@ -0,0 +1,25 @@ +CONYARDC: + Inherits: ^CONYARD + +STARPORTC: + Inherits: ^STARPORT + Buildable: + Prerequisites: ~conyarda, radar + +PALACEC: + Inherits: ^PALACE + Buildable: + Queue: Building + BuildPaletteOrder: 1000 + Prerequisites: ~conyarda, research + Building: + Footprint: =x= xxx xxx + Dimensions: 3,3 + RenderBuilding: + +HEAVYC: + Inherits: ^HEAVY + Buildable: + Queue: Building + BuildPaletteOrder: 1100 + Prerequisites: ~conyarda, refinery \ No newline at end of file diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 962e7a9841..62b11b2567 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -723,28 +723,6 @@ SIETCH: Power: Amount: 0 -STARPORTC: - Inherits: ^STARPORT - -Buildable: - -PALACEC: - Inherits: ^PALACE - Buildable: - Queue: Building - BuildPaletteOrder: 1000 - Prerequisites: ~disabled - Building: - Footprint: =x= xxx xxx - Dimensions: 3,3 - RenderBuilding: - -HEAVYC: - Inherits: ^HEAVY - Buildable: - Queue: Building - BuildPaletteOrder: 1100 - Prerequisites: ~disabled - CONYARD: Tooltip: Name: Construction Yard diff --git a/mods/d2k/sequences/structures.yaml b/mods/d2k/sequences/structures.yaml index a9e131546b..3087603d94 100644 --- a/mods/d2k/sequences/structures.yaml +++ b/mods/d2k/sequences/structures.yaml @@ -1550,7 +1550,7 @@ heavyo: Start: 4089 Offset: -30,-24 -palacec: # TODO: unused +palacec: idle: DATA Start: 3004 Offset: -48,48 @@ -1577,7 +1577,7 @@ palacec: # TODO: unused Offset: -48,48 Tick: 100 -starportc: # TODO: unused +starportc: idle: DATA Start: 2999 Offset: -48,48 @@ -1621,7 +1621,7 @@ starportc: # TODO: unused Start: 4020 Offset: -30,-24 -heavyc: # TODO: unused +heavyc: idle: DATA Start: 3001 Length: 1 @@ -1664,7 +1664,7 @@ heavyc: # TODO: unused Start: 4020 Offset: -30,-24 -conyardc: # TODO: unused +conyardc: idle: DATA Start: 3006 Offset: -48,64