diff --git a/mods/sp/Authors.txt b/mods/sp/Authors.txt index cb0d05c6b..4e2eacb51 100644 --- a/mods/sp/Authors.txt +++ b/mods/sp/Authors.txt @@ -256,6 +256,8 @@ other CnC game, then its made by Nolt. Stygs: > Devil's Tongue > Mobile War Factory + Stingerr: + > GDI DropShip from Tiberian Sun MK. II! Windawz: > CABAL, Scrin and Forgotten UI remasters > SP Icon and logo remake @@ -397,4 +399,3 @@ warrior002.the.official: > Queen > Core Defender > Cabal Air Generic - \ No newline at end of file diff --git a/mods/sp/bits/gdi/vehicles/dshp2.shp b/mods/sp/bits/gdi/vehicles/dshp2.shp new file mode 100644 index 000000000..93ccade5d Binary files /dev/null and b/mods/sp/bits/gdi/vehicles/dshp2.shp differ diff --git a/mods/sp/rules/aircraft.yaml b/mods/sp/rules/aircraft.yaml index b23a6a781..ceb6dbc68 100644 --- a/mods/sp/rules/aircraft.yaml +++ b/mods/sp/rules/aircraft.yaml @@ -188,18 +188,19 @@ ORCAB: DSHP: Inherits: ^Helicopter Inherits@PIPS: ^CargoPips + Inherits@SHADOW: ^AircraftShadow Valued: Cost: 1000 Tooltip: Name: Dropship Aircraft: CruiseAltitude: 8c0 - TurnSpeed: 40 + TurnSpeed: 32 Speed: 150 InitialFacing: 0 Repulsable: false + VTOL: true AltitudeVelocity: 200 - VTOL: false TakeoffSounds: dropup1.aud LandingSounds: dropdwn1.aud Health: @@ -212,21 +213,15 @@ DSHP: AfterUnloadDelay: 0 UnloadVoice: Move OwnerChangedAffectsPassengers: false - #SpawnActorOnDeath: - # Actor: DSHP.Husk - # RequiresCondition: airborne + Selectable: + Bounds: 2709,3135,0,-1423 + SpawnActorOnDeath: + Actor: DSHP.Husk + RequiresCondition: airborne RenderSprites: - WithVoxelBody: - RenderVoxels: - Scale: 20 - -WithFacingSpriteBody: BodyOrientation: QuantizedFacings: 0 CameraPitch: 85 - -MapEditorData: - -Selectable: - -SelectionDecorations: - Interactable: DSHP.HIGH: Inherits: DSHP @@ -235,16 +230,13 @@ DSHP.HIGH: TurnSpeed: 256 Speed: 20480 ## fast enough to make map size affect little to production IdleBehavior: LeaveMap - VTOL: true RejectsOrders: GrantConditionAboveAltitude: MinAltitude: 13312 #13c0 Condition: outofsight RenderSprites: Image: dshp - RenderVoxels: - Image: dshp - WithVoxelBody: + WithFacingSpriteBody: RequiresCondition: !outofsight -Targetable@AIRBORNE: -Targetable@GROUND: diff --git a/mods/sp/rules/husks.yaml b/mods/sp/rules/husks.yaml index e33fe035c..f1020a3df 100644 --- a/mods/sp/rules/husks.yaml +++ b/mods/sp/rules/husks.yaml @@ -161,6 +161,20 @@ TRNSPORT.scr.Husk: Image: scrsmoke Palette: jascblue +DSHP.Husk + Inherits: ^BigAircraftHusk + Tooltip: + Name: Drop Ship + Aircraft: + TurnSpeed: 20 + Speed: 149 + WithShadow: + WithFacingSpriteBody: + BodyOrientation: + QuantizedFacings: 32 + RenderSprites: + Image: dshp + APACHE.Husk: Inherits: ^AircraftHusk Tooltip: diff --git a/mods/sp/sequences/civseq.yaml b/mods/sp/sequences/civseq.yaml index 264f6db25..1952bb932 100644 --- a/mods/sp/sequences/civseq.yaml +++ b/mods/sp/sequences/civseq.yaml @@ -1745,28 +1745,6 @@ napost: Offset: 0, 0 -DepthSprite: -dshp: - emp-overlay: - Filename: dot.shp - veins: - Filename: dot.shp - cloud: - Filename: dot.shp - smoketrailsmall: - Filename: smoketrailsmall.shp - Length: * - sparks: - Filename: sparks3.shp - Length: * - muzzle: - Filename: dot.shp - shield: - Filename: dot.shp - dummy: - Filename: dot.shp - idle: - Filename: dot.shp - nafnce: Defaults: Filename: nafnce.shp diff --git a/mods/sp/sequences/gdiseq.yaml b/mods/sp/sequences/gdiseq.yaml index 837e178d4..f87e2e0e2 100644 --- a/mods/sp/sequences/gdiseq.yaml +++ b/mods/sp/sequences/gdiseq.yaml @@ -2293,6 +2293,20 @@ gafire: TilesetFilenames: Offset: 0, 0 +dshp: + Inherits: ^EmpOverlay + Defaults: + Filename: dshp2.shp + Offset: 0,0,64 + ZRamp: 1 + Start: 0 + stand: + Facings: -32 + idle: + Facings: -32 + run: + Facings: -32 + ionbeammini: Defaults: Filename: ionbeammini.shp diff --git a/mods/sp/sequences/voxels.yaml b/mods/sp/sequences/voxels.yaml index 7daa6951e..a05c97858 100644 --- a/mods/sp/sequences/voxels.yaml +++ b/mods/sp/sequences/voxels.yaml @@ -74,9 +74,6 @@ scrin: apache: idle: -dshp: - idle: - 4tnk: idle: turret: 4tnktur