From 382066479c01da60542bfab2fa8b91bbfa571192 Mon Sep 17 00:00:00 2001 From: Ducks <97200673+TwoDucksOnnaPlane@users.noreply.github.com> Date: Fri, 18 Oct 2024 11:23:28 -0700 Subject: [PATCH 1/6] porting vulcan changed from grimbly --- .../Entities/Objects/Weapons/Guns/Rifles/rifles.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 5dba7d27f1..7ec4651dc8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -11,11 +11,19 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] + - type: GunWieldBonus + minAngle: -20 + maxAngle: -50 - type: Gun - fireRate: 2 + minAngle: 21 + maxAngle: 54 + angleIncrease: 6 + angleDecay: 24 + fireRate: 6 selectedMode: SemiAuto availableModes: - SemiAuto + - Burst - type: ChamberMagazineAmmoProvider - type: ItemSlots slots: From d8f9db13125041f7f109f79ec1cdb91bf92ee44e Mon Sep 17 00:00:00 2001 From: Ducks <97200673+TwoDucksOnnaPlane@users.noreply.github.com> Date: Fri, 18 Oct 2024 16:03:04 -0700 Subject: [PATCH 2/6] rename .30 rifle projectiles to .30 and buff damage --- .../Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml index be6a07e486..d713342bd0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml @@ -1,6 +1,7 @@ +# Used by the Vulcan, L6SAW, Mark 1, Ceremonial Mark 1, and the AKMS. Basically just all .30 rifles. - type: entity id: BulletHeavyRifle - name: bullet (.20 rifle) + name: bullet (.30 rifle) parent: BaseBullet noSpawn: true components: From aa5b0393c09c2952acb12688f5aff907ea467621 Mon Sep 17 00:00:00 2001 From: Ducks <97200673+TwoDucksOnnaPlane@users.noreply.github.com> Date: Fri, 18 Oct 2024 16:03:56 -0700 Subject: [PATCH 3/6] actually buff .30 instead of just renaming the projectile --- .../Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml index d713342bd0..39135e4962 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml @@ -8,7 +8,7 @@ - type: Projectile damage: types: - Piercing: 19 + Piercing: 24 - type: entity id: BulletMinigun From 201efdac2fc31da4cb34b0aafd8486f1a74e910c Mon Sep 17 00:00:00 2001 From: Ducks <97200673+TwoDucksOnnaPlane@users.noreply.github.com> Date: Fri, 18 Oct 2024 16:04:59 -0700 Subject: [PATCH 4/6] wrong fucking file ffs --- .../Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml index 39135e4962..be6a07e486 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml @@ -1,14 +1,13 @@ -# Used by the Vulcan, L6SAW, Mark 1, Ceremonial Mark 1, and the AKMS. Basically just all .30 rifles. - type: entity id: BulletHeavyRifle - name: bullet (.30 rifle) + name: bullet (.20 rifle) parent: BaseBullet noSpawn: true components: - type: Projectile damage: types: - Piercing: 24 + Piercing: 19 - type: entity id: BulletMinigun From 0a332e9baf17c0e8701e2dd12d93f0ad73f9e0d1 Mon Sep 17 00:00:00 2001 From: Ducks <97200673+TwoDucksOnnaPlane@users.noreply.github.com> Date: Fri, 18 Oct 2024 16:15:51 -0700 Subject: [PATCH 5/6] buff rifle rounds that should be buffed and add comments on the others --- .../Ammunition/Projectiles/heavy_rifle.yml | 3 ++- .../Ammunition/Projectiles/light_rifle.yml | 22 ++++++++++--------- .../Guns/Ammunition/Projectiles/rifle.yml | 14 ++++++------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml index be6a07e486..4f86f4032a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml @@ -1,3 +1,4 @@ +# pretty sure this is unused lmao - type: entity id: BulletHeavyRifle name: bullet (.20 rifle) @@ -8,7 +9,7 @@ damage: types: Piercing: 19 - +# least minigun still exists - type: entity id: BulletMinigun name: minigun bullet (.10 rifle) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index 3a0df2ac6c..e59e5335ec 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -1,17 +1,18 @@ +# Used by the Vulcan, L6SAW, Mark 1, Ceremonial Mark 1, and the AKMS. Basically just all .30 rifles. - type: entity id: BulletLightRifle - name: bullet (.20 rifle) + name: bullet (.30 rifle) parent: BaseBullet noSpawn: true components: - type: Projectile damage: types: - Piercing: 19 + Piercing: 24 - type: entity id: BulletLightRiflePractice - name: bullet (.20 rifle practice) + name: bullet (.30 rifle practice) parent: BaseBulletPractice noSpawn: true components: @@ -22,7 +23,7 @@ - type: entity id: BulletLightRifleRubber - name: bullet (.20 rifle rubber) + name: bullet (.30 rifle rubber) parent: BaseBulletRubber noSpawn: true components: @@ -34,23 +35,24 @@ - type: entity id: BulletLightRifleIncendiary parent: BaseBulletIncendiary - name: bullet (.20 rifle incendiary) + name: bullet (.30 rifle incendiary) noSpawn: true components: - type: Projectile damage: types: - Blunt: 3 - Heat: 16 + Blunt: 5 + Heat: 19 - type: entity id: BulletLightRifleUranium parent: BaseBulletUranium - name: bullet (.20 rifle uranium) + name: bullet (.30 rifle uranium) noSpawn: true components: - type: Projectile damage: types: - Radiation: 9 - Piercing: 10 + Radiation: 10 + Piercing: 5 + ignoreResistances: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index 2113916cf5..9f6b35c950 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 17 + Piercing: 24 - type: entity id: BulletRiflePractice @@ -40,9 +40,9 @@ - type: Projectile damage: types: - Blunt: 2 - Heat: 15 - + Blunt: 4 + Heat: 20 + - type: entity id: BulletRifleUranium parent: BaseBulletUranium @@ -52,6 +52,6 @@ - type: Projectile damage: types: - Radiation: 7 - Piercing: 8 - + Radiation: 10 + Piercing: 5 + ignoreResistances: true From fc58422c20cebd32c4150e72e72f1bea888385d5 Mon Sep 17 00:00:00 2001 From: Ducks <97200673+TwoDucksOnnaPlane@users.noreply.github.com> Date: Fri, 18 Oct 2024 16:47:20 -0700 Subject: [PATCH 6/6] yaml linter unfail --- .../Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index e59e5335ec..3877e19444 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -55,4 +55,4 @@ types: Radiation: 10 Piercing: 5 - ignoreResistances: true + ignoreResistances: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index 9f6b35c950..79e3b1987e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -54,4 +54,4 @@ types: Radiation: 10 Piercing: 5 - ignoreResistances: true + ignoreResistances: true