From 312e867431510abb54fa849e5e5af0bd0b0f21d8 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Thu, 16 Jan 2025 13:55:49 -0600 Subject: [PATCH 1/6] the PR --- .../Locale/en-US/research/technologies.ftl | 2 +- .../Nyanotrasen/Research/experimental.yml | 4 +- Resources/Prototypes/Research/arsenal.yml | 55 ++++++++++++------- Resources/Prototypes/_DV/Research/arsenal.yml | 26 ++++----- 4 files changed, 51 insertions(+), 36 deletions(-) diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 91a803da6ea..901cb071e97 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -22,7 +22,7 @@ research-technology-portable-fission = Portable Fission research-technology-space-scanning = Space Scanning research-technology-excavation = Mass Excavation -research-technology-draconic-munitions = Draconic Munitions +research-technology-draconic-munitions = Exotic Munitions research-technology-uranium-munitions = Uranium Munitions research-technology-explosive-technology = Explosive Technology research-technology-special-means = Special Means diff --git a/Resources/Prototypes/Nyanotrasen/Research/experimental.yml b/Resources/Prototypes/Nyanotrasen/Research/experimental.yml index 7c89c0f7d04..3b356445711 100644 --- a/Resources/Prototypes/Nyanotrasen/Research/experimental.yml +++ b/Resources/Prototypes/Nyanotrasen/Research/experimental.yml @@ -12,7 +12,9 @@ recipeUnlocks: - ClothingHeadHelmetInsulated - ClothingHeadCage - # - ShellSoulbreaker # DeltaV - Placing it under Exotic Ammunition because that's what it is. + - MagazineBoxSpecialHoly + - MagazineBoxSpecialMindbreaker + - BoxShellSoulbreaker - type: technology id: Metempsychosis diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index a768ac45639..9bd55fccd58 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -21,6 +21,19 @@ - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary - MagazineBoxSpecialIncendiary # DeltaV + # DeltaV - Merges uranium and incend ammo techs, adds 38 special uranium rounds + - MagazineRifleUranium + - MagazinePistolUranium + - MagazineLightRifleUranium + - SpeedLoaderMagnumUranium + - MagazineBoxPistolUranium + - MagazineBoxMagnumUranium + - MagazineBoxLightRifleUranium + - MagazineBoxRifleUranium + - BoxShotgunUranium + - SpeedLoaderSpecialUranium + - MagazineBoxSpecialUranium + # End of modified code - type: technology id: WeaponizedLaserManipulation @@ -61,28 +74,28 @@ - MagazineBoxSpecialRubber # End of modified code -- type: technology - id: UraniumMunitions - name: research-technology-uranium-munitions - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: uranium - discipline: Arsenal - tier: 2 # DeltaV moved to t2 from t1 - cost: 7500 - recipeUnlocks: - - MagazineRifleUranium - - MagazinePistolUranium - - MagazineLightRifleUranium - - SpeedLoaderMagnumUranium - - MagazineBoxPistolUranium - - MagazineBoxMagnumUranium - - MagazineBoxLightRifleUranium - - MagazineBoxRifleUranium - - BoxShotgunUranium +#- type: technology +# id: UraniumMunitions +# name: research-technology-uranium-munitions +# icon: +# sprite: Objects/Materials/Sheets/other.rsi +# state: uranium +# discipline: Arsenal +# tier: 2 # DeltaV moved to t2 from t1 +# cost: 7500 +# recipeUnlocks: +# - MagazineRifleUranium +# - MagazinePistolUranium +# - MagazineLightRifleUranium +# - SpeedLoaderMagnumUranium +# - MagazineBoxPistolUranium +# - MagazineBoxMagnumUranium +# - MagazineBoxLightRifleUranium +# - MagazineBoxRifleUranium +# - BoxShotgunUranium # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree - - SpeedLoaderSpecialUranium - - MagazineBoxSpecialUranium +# - SpeedLoaderSpecialUranium +# - MagazineBoxSpecialUranium # End of modified code - type: technology diff --git a/Resources/Prototypes/_DV/Research/arsenal.yml b/Resources/Prototypes/_DV/Research/arsenal.yml index 33bb8cd88d7..4eec70ab301 100644 --- a/Resources/Prototypes/_DV/Research/arsenal.yml +++ b/Resources/Prototypes/_DV/Research/arsenal.yml @@ -1,18 +1,18 @@ # Tier 2 -- type: technology - id: ExoticAmmunition - name: research-technology-exotic-ammunition - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi - state: beanbag - discipline: Arsenal - tier: 1 - cost: 7500 - recipeUnlocks: - - MagazineBoxSpecialHoly - - MagazineBoxSpecialMindbreaker - - BoxShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo +#- type: technology +# id: ExoticAmmunition +# name: research-technology-exotic-ammunition +# icon: +# sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi +# state: beanbag +# discipline: Arsenal +# tier: 1 +# cost: 7500 +# recipeUnlocks: +# - MagazineBoxSpecialHoly +# - MagazineBoxSpecialMindbreaker +# - BoxShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo - type: technology id: EnergyGuns From 7dc4eb7dfc1bfa2112059f65356b4e85d03b6e7e Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Thu, 16 Jan 2025 16:55:37 -0600 Subject: [PATCH 2/6] unfucks FTL --- Resources/Locale/en-US/research/technologies.ftl | 2 +- Resources/Prototypes/Research/arsenal.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 901cb071e97..000225b43e5 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -22,7 +22,7 @@ research-technology-portable-fission = Portable Fission research-technology-space-scanning = Space Scanning research-technology-excavation = Mass Excavation -research-technology-draconic-munitions = Exotic Munitions +research-technology-draconic-munitions = Draonic Munitions research-technology-uranium-munitions = Uranium Munitions research-technology-explosive-technology = Explosive Technology research-technology-special-means = Special Means diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 9bd55fccd58..7ac4d87bfaa 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -2,7 +2,7 @@ - type: technology id: DraconicMunitions - name: research-technology-draconic-munitions + name: research-technology-exotic-ammunition # DeltaV - name change to Exotic Ammunition icon: sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi state: incendiarydisplay From 12ae4e62e04d9664c43530e4a9780f6e4d055a91 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Thu, 16 Jan 2025 18:00:06 -0600 Subject: [PATCH 3/6] should be fixed --- .../Locale/en-US/research/technologies.ftl | 2 +- Resources/Prototypes/Research/arsenal.yml | 56 +++++++------------ Resources/Prototypes/_DV/Research/arsenal.yml | 44 ++++++++++----- 3 files changed, 53 insertions(+), 49 deletions(-) diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 000225b43e5..91a803da6ea 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -22,7 +22,7 @@ research-technology-portable-fission = Portable Fission research-technology-space-scanning = Space Scanning research-technology-excavation = Mass Excavation -research-technology-draconic-munitions = Draonic Munitions +research-technology-draconic-munitions = Draconic Munitions research-technology-uranium-munitions = Uranium Munitions research-technology-explosive-technology = Explosive Technology research-technology-special-means = Special Means diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 7ac4d87bfaa..4b12dc3507f 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -1,39 +1,25 @@ # Tier 1 -- type: technology - id: DraconicMunitions - name: research-technology-exotic-ammunition # DeltaV - name change to Exotic Ammunition - icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi - state: incendiarydisplay - discipline: Arsenal - tier: 2 # DeltaV moved to t2 from t1 - cost: 10000 - recipeUnlocks: - - BoxShotgunIncendiary - - MagazineRifleIncendiary - - MagazinePistolIncendiary - - MagazineLightRifleIncendiary - - SpeedLoaderMagnumIncendiary - - MagazineShotgunIncendiary - - MagazineBoxPistolIncendiary - - MagazineBoxMagnumIncendiary - - MagazineBoxLightRifleIncendiary - - MagazineBoxRifleIncendiary - - MagazineBoxSpecialIncendiary # DeltaV - # DeltaV - Merges uranium and incend ammo techs, adds 38 special uranium rounds - - MagazineRifleUranium - - MagazinePistolUranium - - MagazineLightRifleUranium - - SpeedLoaderMagnumUranium - - MagazineBoxPistolUranium - - MagazineBoxMagnumUranium - - MagazineBoxLightRifleUranium - - MagazineBoxRifleUranium - - BoxShotgunUranium - - SpeedLoaderSpecialUranium - - MagazineBoxSpecialUranium - # End of modified code +#- type: technology # DeltaV merged draconic and uranium munitions and moved to our namespace +# id: DraconicMunitions +# name: research-technology-draconic-muntions +# icon: +# sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi +# state: incendiarydisplay +# discipline: Arsenal +# tier: 2 # DeltaV moved to t2 from t1 +# cost: 10000 +# recipeUnlocks: +# - BoxShotgunIncendiary +# - MagazineRifleIncendiary +# - MagazinePistolIncendiary +# - MagazineLightRifleIncendiary +# - SpeedLoaderMagnumIncendiary +# - MagazineShotgunIncendiary +# - MagazineBoxPistolIncendiary +# - MagazineBoxMagnumIncendiary +# - MagazineBoxLightRifleIncendiary +# - MagazineBoxRifleIncendiary - type: technology id: WeaponizedLaserManipulation @@ -74,7 +60,7 @@ - MagazineBoxSpecialRubber # End of modified code -#- type: technology +#- type: technology # DeltaV merged draconic and uranium munitions and moved to our namespace # id: UraniumMunitions # name: research-technology-uranium-munitions # icon: diff --git a/Resources/Prototypes/_DV/Research/arsenal.yml b/Resources/Prototypes/_DV/Research/arsenal.yml index 4eec70ab301..9c4d2070987 100644 --- a/Resources/Prototypes/_DV/Research/arsenal.yml +++ b/Resources/Prototypes/_DV/Research/arsenal.yml @@ -1,18 +1,36 @@ # Tier 2 -#- type: technology -# id: ExoticAmmunition -# name: research-technology-exotic-ammunition -# icon: -# sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi -# state: beanbag -# discipline: Arsenal -# tier: 1 -# cost: 7500 -# recipeUnlocks: -# - MagazineBoxSpecialHoly -# - MagazineBoxSpecialMindbreaker -# - BoxShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo +- type: technology + id: ExoticAmmunition + name: research-technology-exotic-ammunition + icon: + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: beanbag + discipline: Arsenal + tier: 1 + cost: 7500 + recipeUnlocks: + - MagazineRifleUranium + - MagazinePistolUranium + - MagazineLightRifleUranium + - SpeedLoaderMagnumUranium + - MagazineBoxPistolUranium + - MagazineBoxMagnumUranium + - MagazineBoxLightRifleUranium + - MagazineBoxRifleUranium + - BoxShotgunUranium + - SpeedLoaderSpecialUranium + - MagazineBoxSpecialUraniummmo + - BoxShotgunIncendiary + - MagazineRifleIncendiary + - MagazinePistolIncendiary + - MagazineLightRifleIncendiary + - SpeedLoaderMagnumIncendiary + - MagazineShotgunIncendiary + - MagazineBoxPistolIncendiary + - MagazineBoxMagnumIncendiary + - MagazineBoxLightRifleIncendiary + - MagazineBoxRifleIncendiary - type: technology id: EnergyGuns From 8105fd1b6788ff3c42aaac94981a86b1f28f3ffb Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Fri, 17 Jan 2025 13:32:35 -0600 Subject: [PATCH 4/6] yml typo --- Resources/Prototypes/_DV/Research/arsenal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Research/arsenal.yml b/Resources/Prototypes/_DV/Research/arsenal.yml index 9c4d2070987..697f485a035 100644 --- a/Resources/Prototypes/_DV/Research/arsenal.yml +++ b/Resources/Prototypes/_DV/Research/arsenal.yml @@ -20,7 +20,7 @@ - MagazineBoxRifleUranium - BoxShotgunUranium - SpeedLoaderSpecialUranium - - MagazineBoxSpecialUraniummmo + - MagazineBoxSpecialUranium - BoxShotgunIncendiary - MagazineRifleIncendiary - MagazinePistolIncendiary From 1d8f68f1a37faf9f98181f92f2d25bedac29abe1 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 22 Jan 2025 08:44:57 -0600 Subject: [PATCH 5/6] per maint request --- Resources/Prototypes/Nyanotrasen/Research/experimental.yml | 1 - Resources/Prototypes/_DV/Research/arsenal.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Research/experimental.yml b/Resources/Prototypes/Nyanotrasen/Research/experimental.yml index 3b356445711..9d5be497e51 100644 --- a/Resources/Prototypes/Nyanotrasen/Research/experimental.yml +++ b/Resources/Prototypes/Nyanotrasen/Research/experimental.yml @@ -12,7 +12,6 @@ recipeUnlocks: - ClothingHeadHelmetInsulated - ClothingHeadCage - - MagazineBoxSpecialHoly - MagazineBoxSpecialMindbreaker - BoxShellSoulbreaker diff --git a/Resources/Prototypes/_DV/Research/arsenal.yml b/Resources/Prototypes/_DV/Research/arsenal.yml index 697f485a035..87e0fb0c7c2 100644 --- a/Resources/Prototypes/_DV/Research/arsenal.yml +++ b/Resources/Prototypes/_DV/Research/arsenal.yml @@ -31,6 +31,7 @@ - MagazineBoxMagnumIncendiary - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary + - MagazineBoxSpecialHoly - type: technology id: EnergyGuns From 458c402a0a5590380abeb239cc3438f666b77708 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 22 Jan 2025 09:35:32 -0600 Subject: [PATCH 6/6] 1 more maint request --- Resources/Prototypes/Research/arsenal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 4b12dc3507f..afe54704f07 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -7,7 +7,7 @@ # sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi # state: incendiarydisplay # discipline: Arsenal -# tier: 2 # DeltaV moved to t2 from t1 +# tier: 1 # cost: 10000 # recipeUnlocks: # - BoxShotgunIncendiary @@ -67,7 +67,7 @@ # sprite: Objects/Materials/Sheets/other.rsi # state: uranium # discipline: Arsenal -# tier: 2 # DeltaV moved to t2 from t1 +# tier: 1 # cost: 7500 # recipeUnlocks: # - MagazineRifleUranium