From 5033c2c6c206f9bfcfd81cc2832ce04efee6414a Mon Sep 17 00:00:00 2001 From: Aristeas <94058548+ari-steas@users.noreply.github.com> Date: Wed, 2 Apr 2025 10:22:50 -0500 Subject: [PATCH 1/2] Iowa Visibility Fix --- .../CoreParts/Large Calibre/380mmAPAmmo.cs | 93 +------------------ .../CoreParts/Large Calibre/380mmHEAmmo.cs | 6 +- .../CoreParts/Large Calibre/380mmQuadGun.cs | 2 +- .../Large Calibre/381mmGunTwinAlt.cs | 2 +- .../CoreParts/Large Calibre/381mmTwinGun.cs | 2 +- 5 files changed, 10 insertions(+), 95 deletions(-) diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/380mmAPAmmo.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/380mmAPAmmo.cs index b50730355..88da056d5 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/380mmAPAmmo.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/380mmAPAmmo.cs @@ -173,73 +173,12 @@ partial class Parts CustomSound = "", }, }, - Ewar = new EwarDef - { - Enable = false, // Enables the EWAR , Electronic-Warfare System - Type = EnergySink, // EnergySink, Emp, Offense, Nav, Dot, AntiSmart, JumpNull, Anchor, Tractor, Pull, Push, - Mode = Effect, // Effect , Field - Strength = 10000f, - Radius = 100f, // Meters - Duration = 100, // In Ticks - StackDuration = true, // Combined Durations - Depletable = true, - MaxStacks = 10, // Max Debuffs at once - NoHitParticle = false, - /* - EnergySink : Targets & Shutdowns Power Supplies, such as Batteries & Reactor - Emp : Targets & Shutdown any Block capable of being powered - Offense : Targets & Shutdowns Weaponry - Nav : Targets & Shutdown Gyros, Thrusters, or Locks them down - Dot : Deals Damage to Blocks in radius - AntiSmart : Effects & Scrambles the Targeting List of Affected Missiles - JumpNull : Shutdown & Stops any Active Jumps, or JumpDrive Units in radius - Tractor : Affects target with Physics - Pull : Affects target with Physics - Push : Affects target with Physics - Anchor : Affects target with Physics - - */ - Force = new PushPullDef - { - ForceFrom = ProjectileLastPosition, // ProjectileLastPosition, ProjectileOrigin, HitPosition, TargetCenter, TargetCenterOfMass - ForceTo = HitPosition, // ProjectileLastPosition, ProjectileOrigin, HitPosition, TargetCenter, TargetCenterOfMass - Position = TargetCenterOfMass, // ProjectileLastPosition, ProjectileOrigin, HitPosition, TargetCenter, TargetCenterOfMass - DisableRelativeMass = false, - TractorRange = 0, - ShooterFeelsForce = false, - }, - Field = new FieldDef - { - Interval = 0, // Time between each pulse, in game ticks (60 == 1 second). - PulseChance = 0, // Chance from 0 - 100 that an entity in the field will be hit by any given pulse. - GrowTime = 0, // How many ticks it should take the field to grow to full size. - HideModel = false, // Hide the projectile model if it has one. - ShowParticle = false, // Set to show block damage effect when ewared. - TriggerRange = 250f, //range at which fields are triggered - Particle = new ParticleDef // Particle effect to generate at the field's position. - { - Name = "", // SubtypeId of field particle effect. - Extras = new ParticleOptionDef - { - Scale = 1, // Scale of effect. - }, - }, - }, - }, - Beams = new BeamDef - { - Enable = false, // Enable beam behaviour. Please have 3600 RPM, when this Setting is enabled. Please do not fire Beams into Voxels. - VirtualBeams = false, // Only one damaging beam, but with the effectiveness of the visual beams combined (better performance). - ConvergeBeams = false, // When using virtual beams, converge the visual beams to the location of the real beam. - RotateRealBeam = false, // The real beam is rotated between all visual beams, instead of centered between them. - OneParticle = false, // Only spawn one particle hit per beam weapon. - }, Trajectory = new TrajectoryDef { Guidance = None, // None, Remote, TravelTo, Smart, DetectTravelTo, DetectSmart, DetectFixed TargetLossDegree = 80f, // Degrees, Is pointed forward TargetLossTime = 0, // 0 is disabled, Measured in game ticks (6 = 100ms, 60 = 1 seconds, etc..). - MaxLifeTime = 2000, // 0 is disabled, Measured in game ticks (6 = 100ms, 60 = 1 seconds, etc..). Please have a value for this, It stops Bad things. + MaxLifeTime = 600, // 0 is disabled, Measured in game ticks (6 = 100ms, 60 = 1 seconds, etc..). Please have a value for this, It stops Bad things. AccelPerSec = 0f, // Meters Per Second. This is the spawning Speed of the Projectile, and used by turning. DesiredSpeed = 1300, // voxel phasing if you go above 5100 MaxTrajectory = 10000f, // Max Distance the projectile or beam can Travel. @@ -248,30 +187,6 @@ partial class Parts SpeedVariance = Random(start: 0, end: 0), // subtracts value from DesiredSpeed. Be warned, you can make your projectile go backwards. RangeVariance = Random(start: 5, end: 10), // subtracts value from MaxTrajectory MaxTrajectoryTime = 0, // How long the weapon must fire before it reaches MaxTrajectory. - Smarts = new SmartsDef - { - Inaccuracy = 5f, // 0 is perfect, hit accuracy will be a random num of meters between 0 and this value. - Aggressiveness = 1f, // controls how responsive tracking is. - MaxLateralThrust = 0.5, // controls how sharp the trajectile may turn - TrackingDelay = 1, // Measured in Shape diameter units traveled. - MaxChaseTime = 450, // Measured in game ticks (6 = 100ms, 60 = 1 seconds, etc..). - OverideTarget = true, // when set to true ammo picks its own target, does not use hardpoint's. - CheckFutureIntersection = false, // Utilize obstacle avoidance? - MaxTargets = 3, // Number of targets allowed before ending, 0 = unlimited - NoTargetExpire = false, // Expire without ever having a target at TargetLossTime - Roam = false, // Roam current area after target loss - KeepAliveAfterTargetLoss = false, // Whether to stop early death of projectile on target loss - OffsetRatio = 0f, // The ratio to offset the random direction (0 to 1) - OffsetTime = 0, // how often to offset degree, measured in game ticks (6 = 100ms, 60 = 1 seconds, etc..) - }, - Mines = new MinesDef // Note: This is being investigated. Please report to Github, any issues. - { - DetectRadius = 0, - DeCloakRadius = 0, - FieldTime = 0, - Cloak = false, - Persist = false, - }, }, AmmoGraphics = new GraphicDef { @@ -333,13 +248,13 @@ partial class Parts Lines = new LineDef { TracerMaterial = "ProjectileTrailLine", // WeaponLaser, ProjectileTrailLine, WarpBubble, etc.. - ColorVariance = Random(start: 1.0f, end: 1.3f), // multiply the color by random values within range. + ColorVariance = Random(start: 0f, end: 0f), // multiply the color by random values within range. WidthVariance = Random(start: 0f, end: 0.1f), // adds random value to default width (negatives shrinks width) Tracer = new TracerBaseDef { Enable = true, - Length = 10f, - Width = 0.1f, + Length = 20f, + Width = 0.25f, Color = Color(red: 25f, green: 25f, blue: 24f, alpha: 0.8f), }, Trail = new TrailDef diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/380mmHEAmmo.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/380mmHEAmmo.cs index ec1b72944..188ea5d5e 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/380mmHEAmmo.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/380mmHEAmmo.cs @@ -333,13 +333,13 @@ partial class Parts Lines = new LineDef { TracerMaterial = "ProjectileTrailLine", // WeaponLaser, ProjectileTrailLine, WarpBubble, etc.. - ColorVariance = Random(start: 1.0f, end: 1.3f), // multiply the color by random values within range. + ColorVariance = Random(start: 0f, end: 0f), // multiply the color by random values within range. WidthVariance = Random(start: 0f, end: 0.1f), // adds random value to default width (negatives shrinks width) Tracer = new TracerBaseDef { Enable = true, - Length = 10f, - Width = 0.1f, + Length = 20f, + Width = 0.25f, Color = Color(red: 40.80f, green: 8.20f, blue: 1.6f, alpha: 0.1f), }, Trail = new TrailDef diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/380mmQuadGun.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/380mmQuadGun.cs index 88858f125..44358720a 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/380mmQuadGun.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/380mmQuadGun.cs @@ -189,7 +189,7 @@ partial class Parts { }, }, Ammos = new[] { - FA380mmShell,FA380mmAPShell // Must list all primary, shrapnel, and pattern ammos. + FA380mmShell, FA380mmAPShell, // Must list all primary, shrapnel, and pattern ammos. }, //Animations = Weapon75_Animation, //Upgrades = UpgradeModules, diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/381mmGunTwinAlt.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/381mmGunTwinAlt.cs index a3192bd78..e86e4ab83 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/381mmGunTwinAlt.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/381mmGunTwinAlt.cs @@ -187,7 +187,7 @@ partial class Parts { }, }, Ammos = new[] { - FA380mmShell,FA380mmAPShell // Must list all primary, shrapnel, and pattern ammos. + FA380mmShell, FA380mmAPShell, // Must list all primary, shrapnel, and pattern ammos. }, //Animations = Weapon75_Animation, //Upgrades = UpgradeModules, diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/381mmTwinGun.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/381mmTwinGun.cs index ed6583ebb..818c8d032 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/381mmTwinGun.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/381mmTwinGun.cs @@ -187,7 +187,7 @@ partial class Parts { }, }, Ammos = new[] { - FA380mmShell,FA380mmAPShell,// Must list all primary, shrapnel, and pattern ammos. + FA380mmShell, FA380mmAPShell, // Must list all primary, shrapnel, and pattern ammos. }, //Animations = Weapon75_Animation, //Upgrades = UpgradeModules, From e7ab413d5387102a11b3bceb8eaf5c85f416443b Mon Sep 17 00:00:00 2001 From: Aristeas <94058548+ari-steas@users.noreply.github.com> Date: Wed, 2 Apr 2025 10:24:17 -0500 Subject: [PATCH 2/2] assorted FAS formatting edits --- .../Data/Scripts/CoreParts/Large Calibre/406mmGun.cs | 2 +- .../Data/Scripts/CoreParts/Large Calibre/406mmalt.cs | 2 +- .../Data/Scripts/CoreParts/Medium Calibre/203mmTripleGun.cs | 2 +- .../Data/Scripts/CoreParts/Medium Calibre/203mmTwinGun.cs | 2 +- .../Data/Scripts/CoreParts/Small Calibre/127mmMark12.cs | 2 +- .../Data/Scripts/CoreParts/Small Calibre/127mmMark24.cs | 2 +- .../Data/Scripts/CoreParts/Small Calibre/127mmMark32.cs | 2 +- .../Data/Scripts/CoreParts/Small Calibre/127mmMark56.cs | 2 +- .../Scripts/CoreParts/Small Calibre/152mmTripleUSI127mmCON.cs | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/406mmGun.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/406mmGun.cs index b3640043d..29dd9ed71 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/406mmGun.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/406mmGun.cs @@ -191,7 +191,7 @@ partial class Parts { }, }, Ammos = new[] { - FA380mmShell,FA380mmAPShell // Must list all primary, shrapnel, and pattern ammos. + FA380mmShell, FA380mmAPShell, // Must list all primary, shrapnel, and pattern ammos. }, //Animations = FA16InchRecoil, //Upgrades = UpgradeModules, diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/406mmalt.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/406mmalt.cs index da2b04a92..2dd99cc0f 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/406mmalt.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Large Calibre/406mmalt.cs @@ -191,7 +191,7 @@ partial class Parts { }, }, Ammos = new[] { - FA380mmShell,FA380mmAPShell // Must list all primary, shrapnel, and pattern ammos. + FA380mmShell, FA380mmAPShell, // Must list all primary, shrapnel, and pattern ammos. }, //Animations = FA16InchRecoil, //Upgrades = UpgradeModules, diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Medium Calibre/203mmTripleGun.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Medium Calibre/203mmTripleGun.cs index 2deb08a9f..c08133782 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Medium Calibre/203mmTripleGun.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Medium Calibre/203mmTripleGun.cs @@ -193,7 +193,7 @@ partial class Parts { }, }, Ammos = new[] { - APShell203, HEShell203 // Must list all primary, shrapnel, and pattern ammos. + APShell203, HEShell203, // Must list all primary, shrapnel, and pattern ammos. }, //Animations = Weapon75_Animation, //Upgrades = UpgradeModules, diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Medium Calibre/203mmTwinGun.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Medium Calibre/203mmTwinGun.cs index 869048020..b8f7a1a96 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Medium Calibre/203mmTwinGun.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Medium Calibre/203mmTwinGun.cs @@ -192,7 +192,7 @@ partial class Parts { }, }, Ammos = new[] { - APShell203, HEShell203 // Must list all primary, shrapnel, and pattern ammos. + APShell203, HEShell203, // Must list all primary, shrapnel, and pattern ammos. }, //Animations = Weapon75_Animation, //Upgrades = UpgradeModules, diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark12.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark12.cs index 27f8b1540..cc721d7af 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark12.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark12.cs @@ -184,7 +184,7 @@ partial class Parts { }, }, Ammos = new[] { - FA5InchShell, FA5SAPShell // Must list all primary, shrapnel, and pattern ammos. + FA5InchShell, FA5SAPShell, // Must list all primary, shrapnel, and pattern ammos. }, //Animations = Weapon75_Animation, //Upgrades = UpgradeModules, diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark24.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark24.cs index bde56d017..f474702c3 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark24.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark24.cs @@ -184,7 +184,7 @@ partial class Parts { }, }, Ammos = new[] { - FA5InchShell,FA5SAPShell // Must list all primary, shrapnel, and pattern ammos. + FA5InchShell, FA5SAPShell, // Must list all primary, shrapnel, and pattern ammos. }, //Animations = Weapon75_Animation, //Upgrades = UpgradeModules, diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark32.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark32.cs index 36cd5c97f..6d379263a 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark32.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark32.cs @@ -185,7 +185,7 @@ partial class Parts { }, }, Ammos = new[] { - FA5InchShell,FA5SAPShell // Must list all primary, shrapnel, and pattern ammos. + FA5InchShell, FA5SAPShell, // Must list all primary, shrapnel, and pattern ammos. }, //Animations = Weapon75_Animation, //Upgrades = UpgradeModules, diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark56.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark56.cs index f9189a61c..255f2287b 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark56.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/127mmMark56.cs @@ -185,7 +185,7 @@ partial class Parts { }, }, Ammos = new[] { - FA5InchShell,FA5SAPShell // Must list all primary, shrapnel, and pattern ammos. + FA5InchShell, FA5SAPShell, // Must list all primary, shrapnel, and pattern ammos. }, //Animations = Weapon75_Animation, //Upgrades = UpgradeModules, diff --git a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/152mmTripleUSI127mmCON.cs b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/152mmTripleUSI127mmCON.cs index e269ef293..e86995807 100644 --- a/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/152mmTripleUSI127mmCON.cs +++ b/Weapon Mods/TaitMod_Fletcher/Data/Scripts/CoreParts/Small Calibre/152mmTripleUSI127mmCON.cs @@ -193,7 +193,7 @@ partial class Parts { }, }, Ammos = new[] { - FA5InchShell,FA5SAPShell // Must list all primary, shrapnel, and pattern ammos. + FA5InchShell, FA5SAPShell, // Must list all primary, shrapnel, and pattern ammos. }, //Animations = Weapon75_Animation, //Upgrades = UpgradeModules,