diff --git a/AUTHORS b/AUTHORS index 39994e493f..2f56a6ef72 100644 --- a/AUTHORS +++ b/AUTHORS @@ -47,8 +47,9 @@ Also thanks to: * Sascha Biedermann (bidifx) * Tim Mylemans (gecko) * Tirili + * Tristan Keating (Kilkakon) * Vladimir Komarov (VrKomarov) - + Past developers included: * Paul Chote (pchote) * Robert Pepperell (ytinasni) diff --git a/mods/cnc/bits/boaticnh.shp b/mods/cnc/bits/boaticnh.shp new file mode 100644 index 0000000000..1dc5f3ac5d Binary files /dev/null and b/mods/cnc/bits/boaticnh.shp differ diff --git a/mods/cnc/bits/c17icnh.shp b/mods/cnc/bits/c17icnh.shp new file mode 100644 index 0000000000..a57631c205 Binary files /dev/null and b/mods/cnc/bits/c17icnh.shp differ diff --git a/mods/cnc/bits/facticnh.shp b/mods/cnc/bits/facticnh.shp new file mode 100644 index 0000000000..80e51ec55e Binary files /dev/null and b/mods/cnc/bits/facticnh.shp differ diff --git a/mods/cnc/bits/htnkicnh.shp b/mods/cnc/bits/htnkicnh.shp new file mode 100644 index 0000000000..1b060ad452 Binary files /dev/null and b/mods/cnc/bits/htnkicnh.shp differ diff --git a/mods/cnc/bits/mhqicnh.shp b/mods/cnc/bits/mhqicnh.shp new file mode 100644 index 0000000000..d784fbc5b4 Binary files /dev/null and b/mods/cnc/bits/mhqicnh.shp differ diff --git a/mods/cnc/bits/missicnh.shp b/mods/cnc/bits/missicnh.shp new file mode 100644 index 0000000000..cc76c692ad Binary files /dev/null and b/mods/cnc/bits/missicnh.shp differ diff --git a/mods/cnc/bits/missmake.shp b/mods/cnc/bits/missmake.shp new file mode 100644 index 0000000000..d7a039f44b Binary files /dev/null and b/mods/cnc/bits/missmake.shp differ diff --git a/mods/cnc/bits/orcaicnh.shp b/mods/cnc/bits/orcaicnh.shp new file mode 100644 index 0000000000..4707c8b19d Binary files /dev/null and b/mods/cnc/bits/orcaicnh.shp differ diff --git a/mods/cnc/bits/tmplicnh.shp b/mods/cnc/bits/tmplicnh.shp new file mode 100644 index 0000000000..bc60fe3bb5 Binary files /dev/null and b/mods/cnc/bits/tmplicnh.shp differ diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 8afb0ace66..9f60af760a 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -152,6 +152,14 @@ C17: Inherits: ^Plane Tooltip: Name: Supply Aircraft + Description: Drops vehicle reinforcements on Airstrips + Icon: c17icnh + Buildable: + Queue: Aircraft + BuildPaletteOrder: 1000 + Owner: None + Valued: + Cost: 2000 Plane: ROT: 5 Speed: 35 @@ -176,6 +184,13 @@ A10: Tooltip: Name: A10 Bomber Icon: a10icnh + Description: Used to deliver Napalm strikes. + Buildable: + Queue: Aircraft + BuildPaletteOrder: 1000 + Owner: None + Valued: + Cost: 2000 Plane: ROT: 4 Speed: 40 diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 7e38ced7b8..c85b90e388 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -2,13 +2,16 @@ FACT: Inherits: ^Building - -Buildable: + Buildable: + Queue: Building + BuildPaletteOrder: 1000 + Owner: None Valued: Cost: 2000 Tooltip: Name: Construction Yard - Icon: mcvicnh Description: Builds structures + Icon: facticnh Building: Power: 15 Footprint: xxx xxx diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml index 2794051d27..79f0ea6bfe 100644 --- a/mods/cnc/rules/tech.yaml +++ b/mods/cnc/rules/tech.yaml @@ -80,3 +80,10 @@ MISS: Dimensions: 3,2 Tooltip: Name: Tech Center + Icon: missicnh + Buildable: + Queue: Building + BuildPaletteOrder: 1000 + Owner: None + Valued: + Cost: 2000 \ No newline at end of file diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 159987096a..347546beb0 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -473,10 +473,10 @@ MLRS: Name: Surface-to-Air Missile Launcher Icon: mlrsicnh Description: Powerful anti-air unit.\nCannot attack ground units. -# Buildable: -# BuildPaletteOrder: 70 -# Prerequisites: hq -# Owner: nod + Buildable: + BuildPaletteOrder: 70 + Prerequisites: hq + Owner: None Mobile: Speed: 6 Health: @@ -547,3 +547,27 @@ STNK: TargetableUnit: LeavesHusk: HuskActor: STNK.Husk + +MHQ: + Inherits: ^Vehicle + Valued: + Cost: 1000 + Tooltip: + Name: Mobile Headquarter + Icon: mhqicnh + Description: Base of operations + Health: + HP: 200 + Armor: + Type: Light + Mobile: + Speed: 6 + RevealsShroud: + Range: 6 + RenderUnitSpinner: + Offset: 0,6 + AttackMove: + JustMove: yes + Explodes: + Weapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall diff --git a/mods/cnc/sequences/map.yaml b/mods/cnc/sequences/map.yaml index beadcc6c6a..0cba56c377 100644 --- a/mods/cnc/sequences/map.yaml +++ b/mods/cnc/sequences/map.yaml @@ -725,6 +725,9 @@ miss: Start: 0 damaged-idle: Start: 1 + make: missmake + Start: 0 + Length: * miss.husk: idle: miss diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml index 1d104b0fc4..3c45021d27 100644 --- a/mods/d2k/rules/atreides.yaml +++ b/mods/d2k/rules/atreides.yaml @@ -1,7 +1,5 @@ CONYARDA: Inherits: ^CONYARD - Buildable: - Owner: atreides Transforms: IntoActor: mcva Offset:1,1 diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml index c1f5ba27e5..2aad623822 100644 --- a/mods/d2k/rules/harkonnen.yaml +++ b/mods/d2k/rules/harkonnen.yaml @@ -1,7 +1,5 @@ CONYARDH: Inherits: ^CONYARD - Buildable: - Owner: harkonnen Transforms: IntoActor: mcvh Offset:1,1 diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml index a8c24b1132..7fd7410197 100644 --- a/mods/d2k/rules/ordos.yaml +++ b/mods/d2k/rules/ordos.yaml @@ -1,7 +1,5 @@ CONYARDO: Inherits: ^CONYARD - Buildable: - Owner: ordos Transforms: IntoActor: mcvo Offset:1,1 diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index f8ae8ab81f..b74d92d3d6 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -5,6 +5,10 @@ Footprint: xxx xxx Dimensions: 3,2 Adjacent: 4 + Buildable: + Queue: Building + BuildPaletteOrder: 1000 + Owner: None Selectable: Bounds: 96,64 Health: @@ -616,10 +620,15 @@ STARPORTC: PALACEC: Inherits: ^PALACE - -Buildable: + Buildable: + Queue: Building + BuildPaletteOrder: 1000 + Owner: None Building: Footprint: xxx xxx Dimensions: 3,2 + RenderBuilding: + HasMakeAnimation: false HEAVYC: Inherits: ^HEAVY diff --git a/mods/d2k/sequences.yaml b/mods/d2k/sequences.yaml index 7e8dd35e93..d564e07a99 100644 --- a/mods/d2k/sequences.yaml +++ b/mods/d2k/sequences.yaml @@ -1390,4 +1390,10 @@ fire: Length: * 4: fire4 Start: 0 - Length: * \ No newline at end of file + Length: * + +palacec: + idle: + Start: 0 + damaged-idle: + Start: 1 \ No newline at end of file diff --git a/mods/ra/bits/missmake.shp b/mods/ra/bits/missmake.shp new file mode 100644 index 0000000000..dbb782534b Binary files /dev/null and b/mods/ra/bits/missmake.shp differ diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index 37c890c48f..eadc86ec7e 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -58,6 +58,8 @@ FCOM: Power: -200 Footprint: xx xx Dimensions: 2,2 + Valued: + Cost: 2000 Health: HP: 400 Armor: @@ -268,6 +270,8 @@ MISS: Building: Footprint: xxx xxx Dimensions: 3,2 + Valued: + Cost: 2000 Health: HP: 400 Armor: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index d233030210..e85b929148 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -1311,13 +1311,16 @@ FIX: FACF: Inherits: ^Building -# Buildable: -# BuildPaletteOrder: 900 -# Owner: allies -# Cost: 50 -# Description: Fake Construction Yard -# LongDesc: Looks like a Construction Yard. -# Hotkey: c + Valued: + Cost: 50 + Buildable: + BuildPaletteOrder: 900 + Owner: None + Hotkey: c + Queue: Defense + Tooltip: + Description: Fake Construction Yard + LongDesc: Looks like a Construction Yard. Building: Power: -2 Footprint: xxx xxx xxx @@ -1336,14 +1339,17 @@ FACF: WEAF: Inherits: ^Building -# Buildable: -# BuildPaletteOrder: 900 -# Prerequisites: proc -# Owner: allies -# Cost: 50 -# Description: Fake War Factory -# LongDesc: Looks like a War Factory. -# Hotkey: x + Valued: + Cost: 50 + Buildable: + BuildPaletteOrder: 900 + Prerequisites: proc + Owner: None + Hotkey: x + Queue: Defense + Tooltip: + Description: Fake War Factory + LongDesc: Looks like a War Factory. Building: Power: -2 Footprint: xxx xxx @@ -1365,16 +1371,15 @@ SYRF: Inherits: ^Building Valued: Cost: 50 + Buildable: + BuildPaletteOrder: 900 + Prerequisites: anypower + Owner: None + Hotkey: z + Queue: Defense Tooltip: - Name: Fake Shipyard -# Buildable: -# BuildPaletteOrder: 900 -# Prerequisites: anypower -# Owner: allies -# Cost: 50 -# Description: Fake Shipyard -# LongDesc: Looks like a Shipyard -# Hotkey: z + Description: Fake Shipyard + LongDesc: Looks like a Shipyard TargetableBuilding: TargetTypes: Ground, Water Building: @@ -1395,8 +1400,19 @@ SYRF: SPEF: Inherits: ^Building + Valued: + Cost: 50 TargetableBuilding: TargetTypes: Ground, Water + Buildable: + BuildPaletteOrder: 900 + Prerequisites: anypower + Owner: None + Hotkey: z + Queue: Defense + Tooltip: + Description: Fake Sub Pen + LongDesc: Looks like a Sub Pen Building: Power: -2 Footprint: xxx xxx xxx @@ -1419,14 +1435,13 @@ DOMF: Cost: 50 Tooltip: Name: Fake Radar Dome -# Buildable: -# BuildPaletteOrder: 900 -# Prerequisites: proc -# Owner: allies -# Cost: 50 -# Description: Fake Radar Dome -# LongDesc: Looks like a Radar Dome -# Hotkey: v + LongDesc: Looks like a Radar Dome + Buildable: + BuildPaletteOrder: 900 + Prerequisites: proc + Owner: None + Hotkey: v + Queue: Defense Building: Power: -2 Footprint: xx xx diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index bfa01cc835..266fe43b34 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -533,6 +533,11 @@ MRJ: Cost: 1000 Tooltip: Name: Mobile Radar Jammer + Description: Unarmed + Buildable: + Queue: Vehicle + BuildPaletteOrder: 1000 + Owner: None Health: HP: 200 Armor: diff --git a/mods/ra/sequences.yaml b/mods/ra/sequences.yaml index da3137462a..a332dc2f17 100644 --- a/mods/ra/sequences.yaml +++ b/mods/ra/sequences.yaml @@ -1835,6 +1835,9 @@ miss: Start: 0 damaged-idle: Start: 2 + make: missmake + Start: 0 + Length: * minp: idle: