Svalinn Experimental Battery Ammo Research [T3] (#22045)

diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 6a6a0e5ff29ffcea119fc50dd348fcb23d9e1895..efd1126eed2648261a06f37f7e2511212b228721 100644 (file)
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -42,6 +42,7 @@ research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry
 research-technology-wave-particle-harnessing = Wave Particle Harnessing
 research-technology-advanced-riot-control = Advanced Riot Control
 research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponry
+research-technology-experimental-battery-ammo = Experimental Battery Ammo
 
 research-technology-basic-robotics = Basic Robotics
 research-technology-basic-anomalous-research = Basic Anomalous Research

diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
index 01680dec3a0d6c3af902a06b94ae33585cad4fde..841288c479db2902ec835f5ea710af31e0927032 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -28,9 +28,13 @@
   - type: Tag
     tags:
       - DroneUsable
+      - PowerCell
   - type: Appearance
   - type: PowerCellVisuals
   - type: Riggable
+  - type: HitscanBatteryAmmoProvider
+    proto: RedLightLaser
+    fireCost: 50
 
 - type: entity
   name: potato battery
@@ -112,7 +116,7 @@
     startingCharge: 720
   - type: MachinePart
     part: PowerCell
-    rating: 2    
+    rating: 2
 
 - type: entity
   id: PowerCellMediumPrinted
@@ -151,7 +155,7 @@
   - type: MachinePart
     part: PowerCell
     rating: 3
-    
+
 - type: entity
   id: PowerCellHighPrinted
   suffix: Empty
@@ -189,7 +193,7 @@
   - type: MachinePart
     part: PowerCell
     rating: 4
-    
+
 - type: entity
   id: PowerCellHyperPrinted
   suffix: Empty

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index dc920caec042e761913ffdb76f97014de908f3e2..b4d3ce5b914ea825278750996bef1996d3341e0e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -31,6 +31,41 @@
   - type: StaticPrice
     price: 500
 
+- type: entity
+  id: BaseWeaponPowerCell
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Sprite
+  - type: Item
+    size: Huge
+  - type: AmmoCounter
+  - type: Gun
+    fireRate: 2
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+  - type: MagazineAmmoProvider
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: PowerCellSmall
+        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+        whitelist:
+          tags:
+            - PowerCell
+            - PowerCellSmall
+  - type: Appearance
+  - type: StaticPrice
+    price: 500
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+
 - type: entity
   id: BaseWeaponBatterySmall
   parent: BaseWeaponBattery
@@ -47,6 +82,43 @@
     slots:
     - Belt
 
+- type: entity
+  id: BaseWeaponPowerCellSmall
+  parent: BaseWeaponPowerCell
+  abstract: true
+  components:
+  - type: Item
+    size: Small
+  - type: Tag
+    tags:
+    - Sidearm
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Battery/taser.rsi
+    quickEquip: false
+    slots:
+    - Belt
+
+- type: entity
+  name: svalinn laser pistol
+  parent: BaseWeaponPowerCellSmall
+  id: WeaponLaserSvalinn
+  description: A cheap and widely used laser pistol.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/svalinn.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Item
+    sprite: Objects/Weapons/Guns/Battery/svalinn.rsi
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+
 - type: entity
   name: retro laser blaster
   parent: BaseWeaponBatterySmall

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index d2bb9efde38b34f8327763e920e1a101e114a5c4..f1f504f8f230d58e677e54c680aa98a8cdd22f6d 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -267,6 +267,7 @@
       - WeaponCrusherDagger
       - WeaponCrusherGlaive
       - WeaponForceGun
+      - WeaponLaserSvalinn
       - WeaponProtoKineticAccelerator
       - WeaponTetherGun
       - WeaponGrapplingGun

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 6c4ca989383454487c7cddb643243f00ff930d63..e576021b5a2cef80dc31a6b5b603c71ad7ba6cff 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -55,6 +55,14 @@
     Plastic: 750
     Gold: 500
 
+- type: latheRecipe
+  id: WeaponLaserSvalinn
+  result: WeaponLaserSvalinn
+  completetime: 5
+  materials:
+    Steel: 2000
+    Gold: 500
+
 - type: latheRecipe
   id: WeaponXrayCannon
   result: WeaponXrayCannon

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 0ff93e3a5526f4ec1a4f625e7a24efbafb22136c..e092b5e54fd68346c79c65568e9c048f3a507fae 100644 (file)
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -158,3 +158,15 @@
   cost: 15000
   recipeUnlocks:
   - WeaponAdvancedLaser
+
+- type: technology
+  id: ExperimentalBatteryAmmo
+  name: research-technology-experimental-battery-ammo
+  icon:
+    sprite: Objects/Weapons/Guns/Battery/svalinn.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 3
+  cost: 15000
+  recipeUnlocks:
+  - WeaponLaserSvalinn

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index a65ea0d5faba95ceb7b0f3e33abb66a170608a9e..69400c986f27d55be94b02b43e488d2cb92d4fb0 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -878,6 +878,9 @@
 - type: Tag
   id: PotatoBattery
 
+- type: Tag
+  id: PowerCell
+
 - type: Tag
   id: PowerCellSmall
 

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png
new file mode 100644 (file)
index 0000000..b5a65ed
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/base.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png
new file mode 100644 (file)
index 0000000..a85afab
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-0.png
new file mode 100644 (file)
index 0000000..f4e9e49
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-0.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-1.png
new file mode 100644 (file)
index 0000000..9d2a4d0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-2.png
new file mode 100644 (file)
index 0000000..88bab46
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-2.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-3.png
new file mode 100644 (file)
index 0000000..57142ee
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left-3.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..a2ed574
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-0.png
new file mode 100644 (file)
index 0000000..5b51ce4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-0.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-1.png
new file mode 100644 (file)
index 0000000..2e3c8ec
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-2.png
new file mode 100644 (file)
index 0000000..ea72601
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-2.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-3.png
new file mode 100644 (file)
index 0000000..3a9db1d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right-3.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..b23c4f3
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-0.png
new file mode 100644 (file)
index 0000000..2f4c8db
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-0.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png
new file mode 100644 (file)
index 0000000..a909704
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png
new file mode 100644 (file)
index 0000000..5b62a04
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-2.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png
new file mode 100644 (file)
index 0000000..f34af9b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-3.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png
new file mode 100644 (file)
index 0000000..046c132
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/mag-unshaded-4.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json
new file mode 100644 (file)
index 0000000..8e2e71f
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/svalinn.rsi/meta.json
@@ -0,0 +1,72 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from CEV Eris at commit https://github.com/discordia-space/CEV-Eris/commit/d75bd7c51620423bacf0b8accc8d29ffbfc387d8, edited by Emisse for SS14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left-0",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-0",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}