Prelojka+bugfixes (#240)

Co-authored-by: Evgencheg <[email protected]>
Lost-Paradise-Project · Oct 4, 2024 · e080d25 · e080d25
1 parent 1e4c447
commit e080d25
Show file tree

Hide file tree

Showing 15 changed files with 168 additions and 18 deletions.
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -14,7 +14,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
     state: icon
   product: CrateArmoryShotgun
-  cost: 11000
+  cost: 12500
   category: cargoproduct-category-name-armory
   group: market
 

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
@@ -14,6 +14,6 @@
     sprite: Clothing/Head/Hardsuits/luxury.rsi
     state: icon
   product: CrateCargoLuxuryHardsuit
-  cost: 15000
+  cost: 6500
   category: cargoproduct-category-name-cargo
   group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -135,7 +135,7 @@
       - id: BoxID
       - id: BoxHeadset
       - id: IDComputerCircuitboard
-      - id: WeaponEnergyGunMini #LPP
+      - id: WeaponDisabler
       - id: ClothingOuterCoatHoPArmored # DeltaV
       - id: ClothingOuterArmorDuraVest # DeltaV - replaced HoP's armoured coat with a standard stabproof, pending HoPcoat resprite
       - id: CigarGoldCase

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -26,6 +26,7 @@
     # BreachingCharge: 8
     LPPClothingHandsGlovesTacticalFingerless: 1  # Lost Paradise - Добавление тактических беспалых боевых перчаток
     LPPTelebaton: 3 #LPP
+    ClothingBeltHolster: 3
   # security officers need to follow a diet regimen!
   contrabandInventory:
     FoodDonutHomer: 12

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -50,5 +50,8 @@
     ClothingHeadBandSkull: 1
     LPPClothingHeadSecHat: 2
     LPPClothingBalaclavawide: 4
+    ClothingOuterArmorBasic: 3
+    LPPClothingHeadHatRedBeanie: 3
+    LPPClothingHeadHatBlackBeanie: 3
   contrabandInventory:
     LPPClothingMaskKinkyMuzzle: 1
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -370,6 +370,13 @@
     - WhitelistChameleon
     - HidesHair
     - HidesNose
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.90
+        Heat: 0.90
 
 - type: entity
   parent: ClothingMaskGasERT

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -507,14 +507,14 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.8
+        Blunt: 0.7
+        Slash: 0.7
+        Piercing: 0.7
         Radiation: 0.5
         Caustic: 0.8
   - type: ClothingSpeedModifier
-    walkModifier: 0.85
-    sprintModifier: 0.9
+    walkModifier: 0.95
+    sprintModifier: 0.95
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitLuxury

diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -34,7 +34,7 @@
   - type: PowerCellVisuals
   - type: Riggable
   - type: HitscanBatteryAmmoProvider
-    proto: RedLightLaser
+    proto: LPPRedMediumLightLaser
     fireCost: 50
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
@@ -18,4 +18,4 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 8
+        Piercing: 10
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -125,9 +125,6 @@
     magState: mag
     steps: 5
     zeroVisible: true
-  - type: HitscanBatteryAmmoProvider
-    proto: LPPRedMediumLightLaser
-    fireCost: 100
 
 - type: entity
   name: retro laser blaster
@@ -617,7 +614,7 @@
     fireCost: 100
   - type: BatterySelfRecharger
     autoRecharge: true
-    autoRechargeRate: 30
+    autoRechargeRate: 20
   - type: MagazineVisuals
     magState: mag
     steps: 5

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -174,7 +174,11 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/SMGs/vector.rsi
   - type: Gun
-    fireRate: 6
+    minAngle: 1
+    maxAngle: 13
+    fireRate: 7
+    angleIncrease: 3
+    angleDecay: 15
     selectedMode: FullAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/atreides.ogg

diff --git a/Resources/Prototypes/_LostParadise/Catalog/Cargo/cargo_crate.yml b/Resources/Prototypes/_LostParadise/Catalog/Cargo/cargo_crate.yml
@@ -14,7 +14,7 @@
     sprite: _LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi
     state: icon
   product: LPPCratehunter
-  cost: 10500
+  cost: 12500
   category: cargoproduct-category-name-security
   group: market
 

diff --git a/Resources/Prototypes/_LostParadise/Catalog/Hos_catalog.yml b/Resources/Prototypes/_LostParadise/Catalog/Hos_catalog.yml
@@ -153,7 +153,7 @@
   id: LPPHosCatalogWeaponAdvancedLaser
   name: lpp-hos-catalog-weapon-advancedlaser-name
   description: lpp-hos-catalog-weapon-advancedlaser-desc
-  productEntity: WeaponEnergyGunPistol
+  productEntity: WeaponAdvancedLaser
   cost:
     LPPCentcoin: 6
   categories:

diff --git a/...ototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml b/...ototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml
@@ -165,5 +165,5 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 2
+        Piercing: 3
         Radiation: 8
diff --git a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/security.yml b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/security.yml
@@ -0,0 +1,138 @@
+#Снаряжение
+- type: loadout
+  id: LPPLoadoutSecurityEquipmentTruncheon
+  category: JobsSecurity
+  cost: 5
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - SecurityOfficer
+        - Warden
+        - HeadOfSecurity
+        - Brigmedic
+    - !type:CharacterPlaytimeRequirement
+      tracker: JobSecurityOfficer
+      min: 54000 # 20 часов
+  items:
+   - Truncheon
+
+- type: loadout
+  id: LPPLoadoutSecurityEquipmentEnergyGunMini
+  category: JobsSecurity
+  cost: 3
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutEquipmentSecurity
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+    - !type:CharacterPlaytimeRequirement
+      tracker: JobSecurityOfficer
+      min: 18000 # 5 часов
+  items:
+    - WeaponEnergyGunMini
+
+#Маски
+
+- type: loadout
+  id: LPPLoadoutSecurityEquipmentMaskGasSecurity
+  category: JobsSecurity
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMaskSecurity
+  items:
+    - ClothingMaskGasSecurity
+
+- type: loadout
+  id: LPPLoadoutSecurityEquipmentMaskBalaclavawide
+  category: JobsSecurity
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMaskSecurity
+  items:
+    - LPPClothingBalaclavawide
+
+- type: loadout
+  id: LoadoutClothingBreathMedicalSecurity
+  category: JobsSecurity
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutMaskSecurity
+    - !type:CharacterJobRequirement
+      jobs:
+        - Brigmedic
+  items:
+    - ClothingMaskBreathMedicalSecurity
+
+#Броня-куртки
+
+- type: loadout
+  id: LPPLoadoutClothingOuterArmorBasic
+  category: JobsSecurity
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutOuterSecurity
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingOuterArmorBasic
+
+#Голова
+
+- type: loadout
+  id: LPPLoadoutClothingHeadHatBlackBeanie
+  category: JobsSecurity
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutHeadSecurity
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - LPPClothingHeadHatBlackBeanie
+
+- type: loadout
+  id: LPPLoadoutClothingHeadHatRedBeanie
+  category: JobsSecurity
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutHeadSecurity
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - LPPClothingHeadHatRedBeanie
+
+#Шея
+
+- type: loadout
+  id: LoadoutSecurityBeltHolster
+  category: JobsSecurity
+  cost: 1
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBeltSecurity
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingBeltHolster