Merge pull request #1353 from ThatReformedEngineer/gun_ranges_cherrypick

Gun ranges cherrypick

Author: evergreenBloom

Resources/Prototypes/_Crescent/Entities/Turrets/Hybrid/projectiles.yml

@@ -7,7 +7,7 @@
   components:
   - type: ProjectileIFF
     visualType: Circle
-    color: Purple
+    color: "#ea86f7" #you have no idea how hard it was to see the previous IFF color
   - type: Projectile
     ignoreWeaponGrid: true
     damage:
@@ -19,7 +19,7 @@
     color: purple
     energy: 0.5
   - type: TimedDespawn
-    lifetime: 1
+    lifetime: 7 #roughly 560m range
   - type: Fixtures
     fixtures:
       projectile:
@@ -54,7 +54,7 @@
   components:
   - type: ProjectileIFF
     visualType: Circle
-    color: Purple
+    color: "#ea86f7"
   - type: ShipWeaponProjectile
   - type: Projectile
     ignoreWeaponGrid: true
@@ -74,7 +74,7 @@
     color: orange
     energy: 0.5
   - type: TimedDespawn
-    lifetime: 1.5
+    lifetime: 14 #roughly 1,050m range
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
     layers:
@@ -88,7 +88,7 @@
   components:
   - type: ProjectileIFF
     visualType: Circle
-    color: Purple
+    color: "#ea86f7"
   - type: ShipWeaponProjectile
   - type: Projectile
     ignoreWeaponGrid: true
@@ -108,8 +108,8 @@
     color: orange
     energy: 0.5
   - type: TimedDespawn
-    lifetime: 1.5
+    lifetime: 21 #roughly 1470m range
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
     layers:
-      - state: blastwave
+      - state: blastwave

Resources/Prototypes/_Crescent/Entities/Turrets/Missile/projectiles.yml

@@ -319,7 +319,7 @@
         Structural: 225
         Blunt: 60
   - type: TimedDespawn
-    lifetime: 8
+    lifetime: 11 #roughly 1,035-1,060-1,075m range depending on shipgun
   - type: Sprite
     sprite: _Crescent/Objects/Turrets/Ammunition/Projectiles/arbalest.rsi
     layers:
@@ -386,7 +386,7 @@
         Structural: 225
         Blunt: 60
   - type: TimedDespawn
-    lifetime: 12
+    lifetime: 14 #roughly 1,345-1,360-1,375m range depending on shipgun
   - type: Sprite
     sprite: _Crescent/Objects/Turrets/Ammunition/Projectiles/arbalest.rsi
     layers:
@@ -453,7 +453,7 @@
         Structural: 275
         Blunt: 60
   - type: TimedDespawn
-    lifetime: 5
+    lifetime: 7 #roughly 795-810-825m range depending on shipgun
   - type: Sprite
     sprite: _Crescent/Objects/Turrets/Ammunition/Projectiles/arbalest.rsi
     layers:
@@ -522,7 +522,7 @@
         Structural: 275
         Blunt: 60
   - type: TimedDespawn
-    lifetime: 12
+    lifetime: 18 #roughly 1,480m range
   - type: Sprite
     sprite: _Crescent/Objects/Turrets/Ammunition/Projectiles/gargoyle.rsi
     layers:
@@ -546,7 +546,7 @@
     acceleration: 25
     topSpeed: 80
     fieldOfView: 75
-    defaultSeekingRange: 1000
+    defaultSeekingRange: 1500
     guidanceAlgorithm: PurePursuit
   - type: Fixtures
     fixtures:
@@ -590,7 +590,7 @@
         Structural: 275
         Blunt: 60
   - type: TimedDespawn
-    lifetime: 15
+    lifetime: 23 #roughly 1,880m range
   - type: Sprite
     sprite: _Crescent/Objects/Turrets/Ammunition/Projectiles/gargoyle.rsi
     layers:
@@ -781,4 +781,4 @@
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-      - !type:ExplodeBehavior
+      - !type:ExplodeBehavior

Resources/Prototypes/_Crescent/Entities/Turrets/Projectile/projectiles.yml

@@ -19,7 +19,7 @@
     color: orange
     energy: 0.5
   - type: TimedDespawn
-    lifetime: 3.5
+    lifetime: 6 #roughly 480m range
   - type: Fixtures
     fixtures:
       projectile:
@@ -67,7 +67,7 @@
     color: orange
     energy: 0.5
   - type: TimedDespawn
-    lifetime: 5.5
+    lifetime: 9 #roughly 720m range
   - type: Fixtures
     fixtures:
       projectile:
@@ -122,7 +122,7 @@
     color: orange
     energy: 0.5
   - type: TimedDespawn
-    lifetime: 2
+    lifetime: 4 #roughly 320m range
   - type: Fixtures
     fixtures:
       projectile:
@@ -170,7 +170,7 @@
     color: orange
     energy: 0.5
   - type: TimedDespawn
-    lifetime: 2
+    lifetime: 8 #roughly 640-680m range depending on shipgun
   - type: Fixtures
     fixtures:
       projectile:
@@ -218,7 +218,7 @@
     color: orange
     energy: 0.5
   - type: TimedDespawn
-    lifetime: 5
+    lifetime: 10 #roughly 800-850m range depending on shipgun
   - type: Fixtures
     fixtures:
       projectile:
@@ -273,7 +273,7 @@
     color: orange
     energy: 0.5
   - type: TimedDespawn
-    lifetime: 3
+    lifetime: 5 #roughly 400-425m range depending on shipgun
   - type: Sprite
     sprite: _NF/Objects/SpaceArtillery/pdtcasing.rsi
     layers:
@@ -663,4 +663,4 @@
     energy: 0.5
   - type: ProjectileIFF
     visualType: Circle
-    color: White
+    color: White