Merge 2808a5cd34 into fd5b16abb3

Content.Client/Turrets/DeployableTurretSystem.cs

@@ -93,8 +93,12 @@ public sealed partial class DeployableTurretSystem : SharedDeployableTurretSyste
         ent.Comp.VisualState = state;
 
         // Toggle layer visibility
-        _sprite.LayerSetVisible((ent.Owner, sprite), DeployableTurretVisuals.Weapon, (targetState & DeployableTurretState.Deployed) > 0);
-        _sprite.LayerSetVisible((ent.Owner, sprite), PowerDeviceVisualLayers.Powered, HasAmmo(ent) && targetState == DeployableTurretState.Retracted);
+        // BEGIN DeltaV - New Turret Sprites
+        var isFullyDeployed = targetState == DeployableTurretState.Deployed || targetState == DeployableTurretState.Firing;
+        _sprite.LayerSetVisible((ent.Owner, sprite), DeployableTurretVisuals.Weapon, isFullyDeployed);
+
+        _sprite.LayerSetVisible((ent.Owner, sprite), PowerDeviceVisualLayers.Powered, HasAmmo(ent));
+        // END DeltaV
 
         // Change the visual state
         switch (targetState)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -1222,7 +1222,7 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: Ammo
-    muzzleFlash: MuzzleFlashEffectHeavyLaser
+    muzzleFlash: MuzzleFlashSentryLethal # DeltaV - New Turret Sprites
   - type: Sprite
     sprite: _Impstation/Objects/Weapons/Guns/Projectiles/energybolts.rsi # imp
     layers:
@@ -1241,7 +1241,7 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: Ammo
-    muzzleFlash: MuzzleFlashEffectOmnilaser
+    muzzleFlash: MuzzleFlashSentryDisable # DeltaV - New Turret Sprites
   - type: Sprite
     sprite: _Impstation/Objects/Weapons/Guns/Projectiles/energybolts.rsi # imp
     layers:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_base.yml

@@ -106,7 +106,7 @@
   abstract: true
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Turrets/sentry_turret.rsi
+    sprite: _DV/Objects/Weapons/Guns/Turrets/EnergySentry/energy_sentry.rsi # DeltaV - New Turret Sprites
     drawdepth: FloorObjects
     granularLayersRendering: true
     layers:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_energy.yml

@@ -29,20 +29,14 @@
           - MachineLayer
         hard: false
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Turrets/sentry_turret.rsi
+    sprite: _DV/Objects/Weapons/Guns/Turrets/EnergySentry/energy_sentry.rsi # DeltaV - New Turret Sprites
     drawdepth: HighFloorObjects
     granularLayersRendering: true
     layers:
     - state: support
       renderingStrategy: NoRotation
-    - state: base_shadow
-      map: [ "shadow" ]
     - state: base
       map: [ "base" ]
-    - state: stun
-      map: [ "enum.DeployableTurretVisuals.Weapon" ]
-      shader: "unshaded"
-      visible: false
     - state: cover_closed
       map: [ "enum.DeployableTurretVisuals.Turret" ]
       renderingStrategy: NoRotation
@@ -51,6 +45,12 @@
       shader: "unshaded"
       renderingStrategy: NoRotation
       visible: false
+    # BEGIN DeltaV - New Turret Sprites
+    - state: stun
+      map: [ "enum.DeployableTurretVisuals.Weapon" ]
+      shader: "unshaded"
+      visible: false
+      # END DeltaV
     - state: panel
       map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       renderingStrategy: NoRotation
@@ -166,6 +166,8 @@
   id: WeaponEnergyTurretSecurity
   suffix: Security
   components:
+  - type: Sprite # DeltaV - New Turret Sprites
+    sprite: _DV/Objects/Weapons/Guns/Turrets/EnergySentry/security_sentry.rsi
   - type: AccessReader
     access: [["StationAi"], ["Security"]]
   - type: TurretTargetSettings
@@ -184,6 +186,8 @@
   id: WeaponEnergyTurretCommand
   suffix: Command
   components:
+  - type: Sprite # DeltaV - New Turret Sprites
+    sprite: _DV/Objects/Weapons/Guns/Turrets/EnergySentry/command_sentry.rsi
   - type: AccessReader
     access: [["StationAi"], ["Command"]]
   - type: StationAiTurret #DeltaV

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -204,3 +204,23 @@
       color: lightgreen
   - type: TimedDespawn
     lifetime: 0.08
+
+- type: entity
+  parent: MuzzleFlashEffectHeavyLaser
+  id: MuzzleFlashSentryLethal
+  components:
+  - type: Sprite
+    layers:
+    - shader: unshaded
+      sprite: _DV/Objects/Weapons/Guns/Projectiles/muzzleflash.rsi
+      state: turretlethal
+
+- type: entity
+  parent: MuzzleFlashEffectOmnilaser
+  id: MuzzleFlashSentryDisable
+  components:
+  - type: Sprite
+    layers:
+    - shader: unshaded
+      sprite: _DV/Objects/Weapons/Guns/Projectiles/muzzleflash.rsi
+      state: turretdisable

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/turrets.yml

@@ -21,6 +21,8 @@
   id: WeaponEnergyTurretCentralCommand
   suffix: CentComm
   components:
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/Turrets/EnergySentry/centcom_sentry.rsi
   - type: AccessReader
     access: [["CentralCommand"]]
   - type: StationAiTurret

Resources/Textures/_DV/Objects/Weapons/Guns/Projectiles/muzzleflash.rsi/meta.json

@@ -0,0 +1,33 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Retextured by AppleSmithWorks (github) for Delta-V",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "turretlethal",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "turretdisable",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Turrets/EnergySentry/centcom_sentry.rsi/meta.json

@@ -0,0 +1,92 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Retextured by AppleSmithWorks (github) for Delta-V",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "stun",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "lethal",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "destroyed"
+        },
+        {
+            "name": "support"
+        },
+        {
+            "name": "cover_closed"
+        },
+        {
+            "name": "cover_open"
+        },
+        {
+            "name": "cover_opening",
+            "delays": [
+                [
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07
+                ]
+            ]
+        },
+        {
+            "name": "cover_closing",
+            "delays": [
+                [
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07
+                ]
+            ]
+        },
+        {
+            "name": "cover_light_on"
+        },
+        {
+            "name": "panel"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Turrets/EnergySentry/command_sentry.rsi/meta.json

@@ -0,0 +1,92 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Retextured by AppleSmithWorks (github) for Delta-V",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "stun",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "lethal",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "destroyed"
+        },
+        {
+            "name": "support"
+        },
+        {
+            "name": "cover_closed"
+        },
+        {
+            "name": "cover_open"
+        },
+        {
+            "name": "cover_opening",
+            "delays": [
+                [
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07
+                ]
+            ]
+        },
+        {
+            "name": "cover_closing",
+            "delays": [
+                [
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07
+                ]
+            ]
+        },
+        {
+            "name": "cover_light_on"
+        },
+        {
+            "name": "panel"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Turrets/EnergySentry/energy_sentry.rsi/meta.json

@@ -0,0 +1,92 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Retextured by AppleSmithWorks (github) for Delta-V",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "stun",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "lethal",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "destroyed"
+        },
+        {
+            "name": "support"
+        },
+        {
+            "name": "cover_closed"
+        },
+        {
+            "name": "cover_open"
+        },
+        {
+            "name": "cover_opening",
+            "delays": [
+                [
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07
+                ]
+            ]
+        },
+        {
+            "name": "cover_closing",
+            "delays": [
+                [
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07
+                ]
+            ]
+        },
+        {
+            "name": "cover_light_on"
+        },
+        {
+            "name": "panel"
+        }
+    ]
+}

Resources/Textures/_DV/Objects/Weapons/Guns/Turrets/EnergySentry/security_sentry.rsi/meta.json

@@ -0,0 +1,92 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Retextured by AppleSmithWorks (github) for Delta-V",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "stun",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "lethal",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "destroyed"
+        },
+        {
+            "name": "support"
+        },
+        {
+            "name": "cover_closed"
+        },
+        {
+            "name": "cover_open"
+        },
+        {
+            "name": "cover_opening",
+            "delays": [
+                [
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07
+                ]
+            ]
+        },
+        {
+            "name": "cover_closing",
+            "delays": [
+                [
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07
+                ]
+            ]
+        },
+        {
+            "name": "cover_light_on"
+        },
+        {
+            "name": "panel"
+        }
+    ]
+}