Added Energy Dagger as Research

new-frontiers-14 · Jan 13, 2025 · 69b5ce0 · 69b5ce0
1 parent 186e682
commit 69b5ce0
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
@@ -37,6 +37,7 @@ research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponr
 research-technology-experimental-battery-ammo = Experimental Battery Ammo
 research-technology-basic-shuttle-armament = Shuttle basic armament
 research-technology-advanced-shuttle-weapon = Advanced shuttle weapons
+research-technology-plasma-suspension = Plasma Suspension
 
 research-technology-basic-robotics = Basic Robotics
 research-technology-basic-anomalous-research = Basic Anomalous Research

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -93,7 +93,7 @@
 
 - type: entity
   name: energy dagger
-  parent: [BaseMeleeWeaponEnergy, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
+  parent: [BaseMeleeWeaponEnergy, BaseC2ContrabandUnredeemable] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
   id: EnergyDaggerLoud
   description: A not as loud and dangerous dagger with a beam made of pure, concentrated plasma. This one is completely undisguised.
   components:

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -609,6 +609,7 @@
       - WeaponXrayCannon
       - SpeedLoaderRifleHeavyIncendiary
       - SpeedLoaderRifleHeavyUranium
+      - EnergyDaggerLoud #Shouldn't be too powerful, only does 10 slash/10 heat, and there are more available weapons elsewhere
 
 - type: entity
   id: MercenaryTechFab
@@ -823,6 +824,7 @@
       - WeaponAntiqueLaserNF # After the changes made to windows shouldn't be that much of an issue now if it's widely available
       - WeaponLaserCarbine
       - WeaponDisabler
+      - EnergyDaggerLoud #Shouldn't be too powerful, only does 10 slash/10 heat, and there are more available weapons elsewhere
     ## Mags / Speedloaders / Clips
     ## Ammo boxes
       - BoxBeanbag

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml b/Resources/Prototypes/_NF/Recipes/Lathes/weapons.yml
@@ -149,3 +149,12 @@
     Glass: 500
     Plastic: 50
     Gold: 100
+
+- type: latheRecipe
+  id: EnergyDaggerLoud
+  parent: BaseWeaponRecipe
+  result: EnergyDaggerLoud
+  materials:
+    Steel: 700 
+    Gold: 300
+    Plasma: 1000
diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml
@@ -105,3 +105,16 @@
   - BlueprintClothingOuterHardsuitScaf
   technologyPrerequisites:
   - HardsuitsArmored
+
+- type: technology
+  id: PlasmaSuspension
+  name: research-technology-plasma-suspension
+  icon:
+    sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 3
+  cost: 10000
+  recipeUnlocks:
+  - EnergyDaggerLoud
+