Merge pull request #151 from MegaDaimond/master

Warden uplink

Resources/Prototypes/Roles/Jobs/Security/warden.yml

@@ -41,6 +41,7 @@
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolMk58Nonlethal
+    pocket2: LPPHOSUplinkShop
     socks: LPPClothingUnderSocksNorm
     underwear: LPPBoxer
   underwear: LPPBriefs

Resources/Prototypes/_LostParadise/Entities/Objects/Devices/TacticalShop.yml

@@ -67,3 +67,30 @@
     balance:
       Telecrystal: 100
 
+- type: entity
+  parent: BaseItem
+  id: LPPHOSUplinkShop
+  name: Планшет закупа СБ
+  description: Планшет для смотрителя СБ, позволяющий закупиться снаряжением под себя.
+  suffix: Аплинк СБ
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Objects/Devices/HOSshop.rsi
+    state: icon
+  - type: UserInterface
+    interfaces:
+    - key: enum.StoreUiKey.Key
+      type: StoreBoundUserInterface
+  - type: ActivatableUI
+    key: enum.StoreUiKey.Key
+  - type: Store
+    preset: LPPStorePresetHOS
+    balance:
+      LPPCentcoin: 12
+
+- type: currency
+  id: LPPCentcoin
+  displayName: Центкоин
+  cash:
+    1: LPPCentcoin
+  canWithdraw: false

Resources/Prototypes/_LostParadise/Entities/Objects/Specific/Security/security.yml

@@ -34,13 +34,55 @@
       wideAnimationRotation: -135
       damage:
         types:
-          Blunt: 0
+          Blunt: 3
     - type: StaminaDamageOnHit
-      damage: 17
+      damage: 35
       sound: /Audio/Weapons/click.ogg
     - type: Sprite
       sprite: Objects/Weapons/Melee/truncheon.rsi
       state: icon
     - type: GuideHelp
       guides:
       - Security
+
+- type: entity
+  name: ЦентКоин
+  parent: BaseItem
+  id: LPPCentcoin
+  suffix: 10 Коинов
+  description: Монетка, содержащая в себе пару грамм блюспейс кристалла, а так же одноразовые модули для телепортации объектов.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Objects/Specific/Security/Centcoin.rsi
+    state: telecrystal
+  - type: Item
+    sprite: _LostParadise/Objects/Specific/Security/Centcoin.rsi
+    size: Tiny
+  - type: Stack
+    count: 10
+    stackType: Telecrystal
+  - type: StaticPrice
+    price: 0
+  - type: StackPrice
+    price: 200
+  - type: Currency
+    price:
+      LPPCentcoin: 1
+
+- type: entity
+  name: ЦентКоин
+  parent: BaseItem
+  id: LPPCentcoin1
+  description: Монетка, содержащая в себе пару грамм блюспейс кристалла, а так же одноразовые модули для телепортации объектов.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Objects/Specific/Security/Centcoin.rsi
+    state: telecrystal
+  - type: Item
+    sprite: _LostParadise/Objects/Specific/Security/Centcoin.rsi
+    size: Tiny
+  - type: StackPrice
+    price: 200
+  - type: Currency
+    price:
+      LPPCentcoin: 1

Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -21,11 +21,11 @@
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
   - type: HitscanBatteryAmmoProvider
-    proto: RedMediumLaser
-    fireCost: 200
+    proto: Pulse
+    fireCost: 400
   - type: Battery
-    maxCharge: 2000
-    startingCharge: 2000
+    maxCharge: 4800
+    startingCharge: 4800
 
 - type: entity
   name: Cutter

Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/dominator.yml

@@ -9,17 +9,48 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mode-disabler
+      shader: unshaded
+      map: [ "Firemode" ]
     - state: mag-unshaded-4
       map: ["enum.GunVisualLayers.MagUnshaded"]
       shader: unshaded
+  - type: Clothing
+    quickEquip: false # Frontier
+    slots: # Frontier
+    - Back # Frontier
+    - suitStorage # Frontier
+    sprite: LPP/Objects/Weapons/Guns/Battery/dominator.rsi
+  - type: Gun
+    soundGunshot:
+      path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg
+    soundEmpty:
+      path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg
   - type: Battery
-    maxCharge: 1000
-    startingCharge: 1000
-  - type: HitscanBatteryAmmoProvider
-    proto: RedMediumLaser
+    maxCharge: 2500
+    startingCharge: 2500
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletDisabler
     fireCost: 100
+  - type: EnergyGun
+    fireModes:
+    - proto: BulletDisabler
+      fireCost: 100
+      name: disable
+      state: disabler
+    - proto: BulletEnergyGunLaser
+      fireCost: 200
+      name: kill
+      state: lethal
   - type: MagazineVisuals
     magState: mag
     steps: 5
     zeroVisible: true
   - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.EnergyGunFireModeVisuals.State:
+        Firemode:
+          Disabler: { state: mode-disabler }
+          Lethal: { state: mode-lethal }
+          Special: { state: mode-stun }

Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/batons.yml

@@ -56,19 +56,19 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Blunt: 1
+        Blunt: 3
     bluntStaminaDamageFactor: 2.0
     angle: 60
     animation: WeaponArcSlash
   - type: StaminaDamageOnHit
-    damage: 20
+    damage: 37
   - type: StaminaDamageOnCollide
-    damage: 8
+    damage: 20
   - type: Item
     heldPrefix: off
     size: Normal
   - type: DisarmMalus
-    malus: 0.225
+    malus: 0.125
   - type: Appearance
   - type: StaticPrice
     price: 100

Resources/Prototypes/_LostParadise/Store/categories.yml

@@ -123,3 +123,33 @@
 #  id: DeltaAllies
 #  name: store-category-delta-allies
 #  priority: 7
+
+- type: storeCategory
+  id: LPPhosweapon
+  name: Вооружение
+  priority: 0
+
+- type: storeCategory
+  id: LPPhosarmor
+  name: Броня
+  priority: 1
+
+- type: storeCategory
+  id: LPPhosammo
+  name: Боеприпасы
+  priority: 2
+
+- type: storeCategory
+  id: LPPhosbrigmed
+  name: Бригмед
+  priority: 3
+
+- type: storeCategory
+  id: LPPhosbrigtech
+  name: Бригтех
+  priority: 4
+
+- type: storeCategory
+  id: LPPmisc
+  name: Разное
+  priority: 5

Resources/Prototypes/_LostParadise/Store/presets.yml

@@ -38,3 +38,16 @@
   - LPPDeltaImplants
   currencyWhitelist:
   - Telecrystal
+
+- type: storePreset
+  id: LPPStorePresetHOS
+  storeName: Head of Security additional supplies
+  categories:
+  - LPPhosweapon
+  - LPPhosarmor
+  - LPPhosammo
+  - LPPhosbrigmed
+  - LPPhosbrigtech
+  - LPPmisc
+  currencyWhitelist:
+  - LPPCentcoin

Resources/Textures/_LostParadise/Objects/Devices/HOSshop.rsi/meta.json

@@ -0,0 +1,34 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Coviddoctor resprited by MegaDaimond",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon",
+        "delays": [
+          [
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2,
+            0.2
+          ]
+        ]
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
+  }

Resources/Textures/_LostParadise/Objects/Specific/Security/Centcoin.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited byt MegaDaimond",
+    "states": [
+        {
+            "name": "telecrystal"
+        },
+		{
+		  "name": "inhand-left",
+		  "directions": 4
+		},
+		{
+		  "name": "inhand-right",
+		  "directions": 4
+		}
+    ]
+}