фиксы х7 вроде

Lost-Paradise-Project · Sep 5, 2024 · ba6bbb5 · ba6bbb5
1 parent 2dab7b8
commit ba6bbb5
Show file tree

Hide file tree

Showing 18 changed files with 379 additions and 387 deletions.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -540,7 +540,7 @@
     tags:
     - Trash
     - CannotSuicide
-    - DoorBumpOpener # DeltaV - After all, why not? Why shouldn't they be able to open doors?
+    # - DoorBumpOpener # DeltaV - After all, why not? Why shouldn't they be able to open doors?
     - VimPilot
   - type: CanEscapeInventory
   - type: NpcFactionMember

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1041,134 +1041,3 @@
         Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun
     soundHit:
       collection: MeatLaserImpact
-
-#---------------------LPP--------------------------
-
-- type: entity
-  id: BulletCutter
-  name: Cutter bolt
-  parent: BaseBullet
-  nospawn: true
-  description: Not too bad, but you still don't want to get hit by it.
-  components:
-  - type: Reflective
-    reflective:
-      - NonEnergy
-  - type: Sprite
-    noRot: false
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    layers:
-    - state: scatterlaser
-      shader: unshaded
-  - type: GatheringProjectile
-  - type: Projectile
-    DeleteOnCollide: false
-    damage:
-      types:
-        Blunt: 0.5
-  # Короткий срок пули
-  - type: TimedDespawn
-    lifetime: 0.2
-
-- type: entity
-  name : Cutter bolt
-  id: BulletCutter2
-  parent: BaseBullet
-  nospawn: true
-  components:
-  - type: Reflective
-    reflective:
-    - Energy
-  - type: FlyBySound
-    sound:
-      collection: EnergyMiss
-      params:
-        volume: 5
-  - type: Sprite
-    noRot: false
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    layers:
-    - state: scatterlaser
-      shader: unshaded
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-      projectile:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.15,-0.3,0.15,0.3"
-        hard: false
-        mask:
-        - Impassable
-        - BulletImpassable
-      fly-by: *flybyfixture
-  - type: Ammo
-  - type: StaminaDamageOnCollide
-    damage: 13
-  - type: Projectile
-    impactEffect: BulletImpactEffectDisabler
-    DeleteOnCollide: false
-    damage:
-      types:
-        Heat: 5
-        Slash: 9
-    soundHit:
-      path: "/Audio/LPP/Weapons/Guns/Gunshots/ion/ion_hit_1.ogg"
-    soundForce: true
-  - type: TimedDespawn
-    lifetime: 0.4
-  - type: GatheringProjectile
-
-- type: entity
-  name : battlecutter1
-  id: battlecuttershot
-  parent: BaseBullet
-  nospawn: true
-  components:
-  - type: Reflective
-    reflective:
-    - Energy
-  - type: FlyBySound
-    sound:
-      collection: EnergyMiss
-      params:
-        volume: 5
-  - type: Sprite
-    sprite: _LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi
-    layers:
-    - state: ion
-      shader: unshaded
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-      projectile:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.15,-0.3,0.15,0.3"
-        hard: false
-        mask:
-        - Impassable
-        - BulletImpassable
-      fly-by: *flybyfixture
-  - type: Ammo
-  - type: Projectile
-    impactEffect: BulletImpactEffectDisabler
-    damage:
-      types:
-        Blunt: 5
-        Slash: 10
-
-- type: hitscan
-  id: RedAILaser
-  damage:
-    types:
-      Heat: 1
-  muzzleFlash:
-    sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi
-    state: AILaser_3
-  travelFlash:
-    sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi
-    state: AILaser_2
-  impactFlash:
-    sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi
-    state: AILaser_1
diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/science.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Lockers/science.yml
@@ -1,20 +1,20 @@
-# - type: entity
-#   id: LockerExpeditorFilled
-#   suffix: Expeditor, Filled
-#   parent: LockerExpeditor
-#   components:
-#   - type: StorageFill
-#     contents:
-#       - id: LPPGatewayGun
-#       - id: ClothingHeadsetScience
-#       - id: LPPClothingUniformJumpsuitExpeditor
-#       - id: ClothingHandsGlovesCombat
-#       - id: MedkitFilled
-#         amount: 2
-#       - id: WeaponCrusher
-#       - id: LPPExpeditorCoat
-#       - id: BoxMRE
-#         amount: 2
-#       - id: OreBag
-#       - id: RadioHandheld
-#       - id: ClothingBeltUtilityFilled
+- type: entity
+  id: LockerExpeditorFilled
+  suffix: Expeditor, Filled
+  parent: LockerExpeditor
+  components:
+  - type: StorageFill
+    contents:
+      - id: LPPGatewayGun
+      - id: ClothingHeadsetScience
+      - id: LPPClothingUniformJumpsuitExpeditor
+      - id: ClothingHandsGlovesCombat
+      - id: MedkitFilled
+        amount: 2
+      - id: WeaponCrusher
+      - id: LPPExpeditorCoat
+      - id: BoxMRE
+        amount: 2
+      - id: OreBag
+      - id: RadioHandheld
+      - id: ClothingBeltUtilityFilled
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/base_lpp_backpack.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/base_lpp_backpack.yml
@@ -9,7 +9,6 @@
     tags: [] # ignore "WhitelistChameleon" tag
   - type: Storage
     maxItemSize: Large
-    maxTotalWeight: 14
   - type: Sprite
     sprite: Clothing/Back/Satchels/satchel.rsi
     visible: false

diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml
@@ -18,7 +18,7 @@
     layers:
     - state: icon
   - type: Construction
-    graph: smugglersbag
+    graph: SmugglersBag
     node: smugglersbag
 
 - type: entity

diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/BlueShieldGasMask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/BlueShieldGasMask.yml
@@ -8,7 +8,6 @@
     sprite: _LostParadise/Clothing/Mask/BlueShieldGasMask.rsi
   - type: Clothing
     sprite: _LostParadise/Clothing/Mask/BlueShieldGasMask.rsi
-    hideOnToggle: true
   - type: Armor
     modifiers:
       coefficients:

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/burger.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/burger.yml
@@ -19,13 +19,13 @@
           Quantity: 5
         - ReagentId: Vitamin
           Quantity: 5
-    metabolisms:
-    Medicine:
-      effects:
-      - !type:HealthChange
-        damage:
-          groups:
-            Piercing: -2
+      metabolisms:
+        Medicine:
+          effects:
+          - !type:HealthChange
+            damage:
+              groups:
+                Piercing: -2
   - type: Tag
     tags:
       - Meat
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/gingerbread.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/gingerbread.yml
@@ -20,13 +20,13 @@
           Quantity: 15
         - ReagentId: Vitamin
           Quantity: 5
-    metabolisms:
-    Medicine:
-      effects:
-      - !type:HealthChange
-        damage:
-          groups:
-            Blunt: -2
+      metabolisms:
+        Medicine:
+          effects:
+          - !type:HealthChange
+            damage:
+              groups:
+                Blunt: -2
 
 - type: entity
   name: пвяник
@@ -50,11 +50,11 @@
           Quantity: 228
         - ReagentId: Vitamin
           Quantity: 1337
-    metabolisms:
-    Medicine:
-      effects:
-      - !type:HealthChange
-        damage:
-          groups:
-            Radiaton: -20
-            Cell: -20
+      metabolisms:
+        Medicine:
+          effects:
+          - !type:HealthChange
+            damage:
+              groups:
+                Radiaton: -20
+                Cell: -20
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateVintageDemocracy.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateVintageDemocracy.yml
@@ -31,4 +31,3 @@
        - id: ClothingHandsMercGlovesCombat
        - id: LPPClothingHeadHatTacticalHelmetWrittenOff
        - id: LPPClothingNeckChain
-       - id: LPPCamogreen
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/RingStorage.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/RingStorage.yml
@@ -25,8 +25,11 @@
     - id: ClothingHandsRingTurk
       amount: 1
   - type: Appearance
+  - type: GenericVisualizer
     visuals:
-    - type: BagOpenCloseVisualizer
-      openIcon: box-open
+     enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: {state: box-open}
+          False: {state: box}
   - type: StaticPrice
     price: 500
diff --git a/...pes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/BattleCutterammo.yml b/...pes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/BattleCutterammo.yml
@@ -34,5 +34,5 @@
   - type: PowerCellVisuals
   - type: Riggable
   - type: ProjectileBatteryAmmoProvider
-    proto: battlecuttershot
+    proto: BulletCutter
     fireCost: 125