Merge pull request #113 from MegaDaimond/master

Обновление каталога и ребаланс цен

Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml

@@ -4,7 +4,7 @@
     sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi
     state: base
   product: CrateArmoryGrand
-  cost: 5500
+  cost: 10500
   category: Armory
   group: market
 
@@ -14,7 +14,7 @@
     sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi
     state: icon
   product: CrateArmoryUniversal
-  cost: 6500
+  cost: 12500
   category: Armory
   group: market
 
@@ -24,26 +24,26 @@
     sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi
     state: icon
   product: CrateArmoryAdjutant
-  cost: 10000
+  cost: 14500
   category: Armory
   group: market
 
 - type: cargoProduct
   id: ArmoryEnergyGun
-  icon: 
+  icon:
     sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi
     state: icon
   product: CrateArmoryEnergyGun
-  cost: 5500
+  cost: 9500
   category: Armory
   group: market
- 
+
 - type: cargoProduct
   id: ArmoryEnergyGunMini
   icon:
     sprite: DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi
     state: icon
   product: CrateArmoryEnergyGunMini
-  cost: 3500
+  cost: 4000
   category: Armory
   group: market

Resources/Prototypes/_LostParadise/Catalog/Cargo/cargo_crate.yml

@@ -11,10 +11,10 @@
 - type: cargoProduct
   id: LPPCratehunterHasLanded
   icon:
-    sprite: _LostParadise/Objects/Weapons/Guns/Snipers/marsrifle.rsi
+    sprite: _LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi
     state: icon
   product: LPPCratehunter
-  cost: 15000
+  cost: 10500
   category: cargoproduct-category-name-security
   group: market
 
@@ -27,3 +27,13 @@
   cost: 19000
   category: cargoproduct-category-name-security
   group: market
+
+- type: cargoProduct
+  id: LPPCrateCrateCivilianDefensehasLanded
+  icon:
+    sprite: _LostParadise/Objects/Weapons/Guns/Snipers/marsrifle.rsi
+    state: icon
+  product: LPPCratecivdef
+  cost: 10000
+  category: cargoproduct-category-name-security
+  group: market

Resources/Prototypes/_LostParadise/Entities/Clothing/Back/backpack.yml

@@ -94,3 +94,15 @@
   components:
   - type: Sprite
     sprite: _LostParadise/Clothing/Back/Backpacks/upgbacpacks.rsi
+
+- type: entity
+  parent: ClothingBackpack
+  id: LPPClothingBackpackHunter
+  name: туристический рюкзак
+  description: Прочный рюкзак с дополнительными карманами, что значительно повышает вместимость и при этом никак не сковывает движения носителя.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Back/Backpacks/backhunter.rsi
+  - type: Storage
+    grid:
+    - 0,0,7,3

Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/magboots.yml

@@ -96,3 +96,27 @@
     - WhitelistChameleon
   - type: StaticPrice
     price: 450
+
+- type: entity
+  parent: ClothingShoesBootsMag
+  id: LPPClothingShoesBootsMagHunter
+  name: магнитные сапоги охотника на карпов
+  description: Коммерческие магнитные сапоги дли тех, кто предпочитает охотиться в невесомости либо при слабой гравитации.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Shoes/Boots/huntermagboots.rsi
+    state: icon
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Shoes/Boots/huntermagboots.rsi
+  - type: Magboots
+    toggleAction: ActionToggleMagbootsAdvanced
+  - type: ClothingSpeedModifier
+    walkModifier: 0.9
+    sprintModifier: 0.9
+    enabled: false
+  - type: NoSlip
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: StaticPrice
+    price: 450

Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml

@@ -1,26 +1,45 @@
  - type: entity
-   id: LPPCratehunter
+   id: LPPCratecivdef
    parent: CrateSecgear
-   name: набор охотника
-   description: Содержит набор оружия, а так же скафандр, самое то для охотны на космическу фауну. Требует доступ службы безопасности для открытия.
+   name: набор гражданской обороны
+   description: Ооооо моя оборона... Содержит оружие не самого высокого качества, но зато в большом количестве для вооружения гражданских лиц в случае ЧС. Ящик какой-то хлипкий... Требует доступ службы безопасности для открытия.
    components:
    - type: Destructible
      thresholds:
      - trigger:
         !type:DamageTrigger
-        damage: 3000
-       behaviors:
-       - !type:DoActsBehavior
-         acts: ["Destruction"]
-       - !type:PlaySoundBehavior
-         sound:
-           collection: MetalBreak
+        damage: 250
    - type: StorageFill
      contents:
        - id: LPPWeaponMarsRifle
+         amount: 3
        - id: LPPMagazineRifleMars
-       - id: LPPweaponPibodi
+         amount: 9
        - id: LPPMagazineBoxHunting
+         amount: 3
+       - id: MagazineBoxMagnum
+       - id: LPPWeaponSniperLeverPravoved
+
+ - type: entity
+   id: LPPCratehunter
+   parent: CratePrivateSecure
+   name: набор охотника
+   description: Содержит набор оружия, а так же скафандр, самое то для охоты на космическу фауну.
+   components:
+   - type: Destructible
+     thresholds:
+     - trigger:
+        !type:DamageTrigger
+        damage: 250
+   - type: StorageFill
+     contents:
+       - id: LPPweaponPibodi
        - id: LPPClothingOuterHardsuitHunter
-      #  - id: LPPWeaponBattleCutter
-      #  - id: LPPWeaponCutterMagazine
+       - id: LPPClothingBackpackHunter
+       - id: LPPClothingShoesBootsMagHunter
+       - id: JetpackVoidFilled
+       - id: ClothingHandsGlovesCombat
+       - id: DoubleEmergencyOxygenTank
+       - id: WeaponLaserSvalinn
+       - id: ClothingBeltSalvageWebbing
+       - id: MedkitFilled

Resources/Textures/_LostParadise/Clothing/Back/Backpacks/backhunter.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by MegaDaimond",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_LostParadise/Clothing/Shoes/Boots/huntermagboots.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3d319f6157acc1c1cd9ebcb0f6f12641e051cf91 and resprited by MegaDaimond",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-on"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4
+    }
+  ]
+}