фиксы 8

Lost-Paradise-Project · Sep 6, 2024 · 370b483 · 370b483
1 parent 67c8fcb
commit 370b483
Show file tree

Hide file tree

Showing 9 changed files with 122 additions and 182 deletions.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -117,8 +117,9 @@
     - RobotTalk
   - type: PsionicInsulation
   - type: LanguageSpeaker   #для ТТС
-    speaks:
+    SpokenLanguages:
     - GalacticCommon
+    - RobotTalk
 
 - type: entity
   parent: MobSiliconBase

diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/NPCs/battle-chelnok/security.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/NPCs/battle-chelnok/security.yml
@@ -30,10 +30,10 @@
     moduleWhitelist:
       tags:
       - BorgModuleGeneric
-      - BorgModuleSecurity
+      - LPPBorgModuleSecurity
     hasMindState: robot_e
     noMindState: robot_e_r
-    name: security chellnock
+    # name: security chellnock
   - type: Construction
     node: security
   - type: Speech

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,12 @@
           Quantity: 5
         - ReagentId: Vitamin
           Quantity: 5
-      metabolisms:
-        Medicine:
-          effects:
-          - !type:HealthChange
-            damage:
-              groups:
-                Piercing: -2
+      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,12 @@
           Quantity: 15
         - ReagentId: Vitamin
           Quantity: 5
-      metabolisms:
-        Medicine:
-          effects:
-          - !type:HealthChange
-            damage:
-              groups:
-                Blunt: -2
+      medicine:
+        effects:
+        - !type:HealthChange
+          damage:
+            groups:
+              Piercing: -2
 
 - type: entity
   name: пвяник

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -67,98 +67,98 @@
       fireCost: 10
     - type: Appearance
 
-- type: entity
-  name: Borg-Disbaler
-  parent: BaseWeaponBatterySmall
-  id: LPPDisbalerBorg
-  noSpawn: true
-  description:
-  components:
-    - type: Tag
-      tags:
-        - Taser
-        - Sidearm
-    - type: Sprite
-      sprite: _LostParadise/Objects/Weapons/Guns/Battery/borg_disbaler.rsi
-      layers:
-        - state: base
-          map: ["enum.GunVisualLayers.Base"]
-        - state: mag-unshaded-4
-          map: ["enum.GunVisualLayers.MagUnshaded"]
-          shader: unshaded
-    - type: Gun
-      fireRate: 1.8
-      soundGunshot:
-        path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
-    - type: ProjectileBatteryAmmoProvider
-      proto: LPPBulletDisablerBorg
-      fireCost: 100
-    - type: Battery
-      maxCharge: 1500
-      startingCharge: 1500
-    - type: BatterySelfRecharger
-      autoRecharge: true
-      autoRechargeRate: 10
-    - type: Appearance
+# - type: entity
+#   name: Borg-Disbaler
+#   parent: BaseWeaponBatterySmall
+#   id: LPPDisbalerBorg
+#   noSpawn: true
+#   description:
+#   components:
+#     - type: Tag
+#       tags:
+#         - Taser
+#         - Sidearm
+#     - type: Sprite
+#       sprite: _LostParadise/Objects/Weapons/Guns/Battery/borg_disbaler.rsi
+#       layers:
+#         - state: base
+#           map: ["enum.GunVisualLayers.Base"]
+#         - state: mag-unshaded-4
+#           map: ["enum.GunVisualLayers.MagUnshaded"]
+#           shader: unshaded
+#     - type: Gun
+#       fireRate: 1.8
+#       soundGunshot:
+#         path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
+#     - type: ProjectileBatteryAmmoProvider
+#       proto: LPPBulletDisablerBorg
+#       fireCost: 100
+#     - type: Battery
+#       maxCharge: 1500
+#       startingCharge: 1500
+#     - type: BatterySelfRecharger
+#       autoRecharge: true
+#       autoRechargeRate: 10
+#     - type: Appearance
 
-- type: entity
-  name: Robotics-laser
-  parent: BaseWeaponBattery
-  id: LPPBorgLaser
-  noSpawn: true
-  description:
-  components:
-    - type: Sprite
-      sprite: _LostParadise/Objects/Weapons/Guns/Battery/Cyborg/robotics_laser.rsi
-      layers:
-        - state: base
-          map: ["enum.GunVisualLayers.Base"]
-        - state: mag-unshaded-4
-          map: ["enum.GunVisualLayers.MagUnshaded"]
-          shader: unshaded
-    - type: Gun
-      selectedMode: SemiAuto
-      availableModes:
-      - SemiAuto
-      fireRate: 1.8
-    - type: HitscanBatteryAmmoProvider
-      proto: RedLaser
-      fireCost: 100
-    - type: Battery
-      maxCharge: 1000
-      startingCharge: 1000
-    - type: BatterySelfRecharger
-      autoRecharge: true
-      autoRechargeRate: 5
-    - type: Appearance
-
-- type: entity
-  name: Robotics-laser-advanced
-  parent: WeaponLaserCannon
-  id: LPPBorgLaserAdvanced
-  noSpawn: true
-  description:
-  components:
-    - type: Sprite
-      sprite: _LostParadise/Objects/Weapons/Guns/Battery/Cyborg/robotics_laser_advanced.rsi
-      layers:
-        - state: base
-          map: ["enum.GunVisualLayers.Base"]
-        - state: mag-unshaded-4
-          map: ["enum.GunVisualLayers.MagUnshaded"]
-          shader: unshaded
-    - type: Gun
-      fireRate: 1.5
-    - type: HitscanBatteryAmmoProvider
-      proto: RedHeavyLaser
-      fireCost: 100
-    - type: Battery
-      maxCharge: 900
-      startingCharge: 900
-    - type: BatterySelfRecharger
-      autoRecharge: true
-      autoRechargeRate: 5
-    - type: Appearance
+# - type: entity
+#   name: Robotics-laser
+#   parent: BaseWeaponBattery
+#   id: LPPBorgLaser
+#   noSpawn: true
+#   description:
+#   components:
+#     - type: Sprite
+#       sprite: _LostParadise/Objects/Weapons/Guns/Battery/Cyborg/robotics_laser.rsi
+#       layers:
+#         - state: base
+#           map: ["enum.GunVisualLayers.Base"]
+#         - state: mag-unshaded-4
+#           map: ["enum.GunVisualLayers.MagUnshaded"]
+#           shader: unshaded
+#     - type: Gun
+#       selectedMode: SemiAuto
+#       availableModes:
+#       - SemiAuto
+#       fireRate: 1.8
+#     - type: HitscanBatteryAmmoProvider
+#       proto: RedLaser
+#       fireCost: 100
+#     - type: Battery
+#       maxCharge: 1000
+#       startingCharge: 1000
+#     - type: BatterySelfRecharger
+#       autoRecharge: true
+#       autoRechargeRate: 5
+#     - type: Appearance
+#
+# - type: entity
+#   name: Robotics-laser-advanced
+#   parent: WeaponLaserCannon
+#   id: LPPBorgLaserAdvanced
+#   noSpawn: true
+#   description:
+#   components:
+#     - type: Sprite
+#       sprite: _LostParadise/Objects/Weapons/Guns/Battery/Cyborg/robotics_laser_advanced.rsi
+#       layers:
+#         - state: base
+#           map: ["enum.GunVisualLayers.Base"]
+#         - state: mag-unshaded-4
+#           map: ["enum.GunVisualLayers.MagUnshaded"]
+#           shader: unshaded
+#     - type: Gun
+#       fireRate: 1.5
+#     - type: HitscanBatteryAmmoProvider
+#       proto: RedHeavyLaser
+#       fireCost: 100
+#     - type: Battery
+#       maxCharge: 900
+#       startingCharge: 900
+#     - type: BatterySelfRecharger
+#       autoRecharge: true
+#       autoRechargeRate: 5
+#     - type: Appearance
 
 - type: entity
   name: chrono laser gun
@@ -218,60 +218,3 @@
     startingCharge: 4000
   - type: Item
     size: Large
-
-- type: entity
-  name: гибридный модуль S.O.L.E.I.L.
-  parent: BaseWeaponBatterySmall
-  id: LPPWeaponEnergyGunSoleil
-  description: Прототип гибридного лазерного "пистолета", представляющего из себя устройство, что цепляется на локоть, имеет летальный и нелетальный режимы стрельбы.
-  components:
-  - type: Sprite
-    sprite: _LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi
-    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
-    sprite: _LostParadise/Objects/Weapons/Guns/Battery/soleil.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: 750
-    startingCharge: 750
-  - type: ProjectileBatteryAmmoProvider
-    proto: BulletDisabler
-    fireCost: 50
-  - type: EnergyGun
-    fireModes:
-    - proto: BulletDisabler
-      fireCost: 50
-      name: disable
-      state: disabler
-    - proto: BulletEnergyGunLaser
-      fireCost: 75
-      name: lethal
-      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 }
-  - type: Tag
-    tags:
-    - Sidearm
-  - type: StaticPrice
-    price: 750
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Snipers/pravoved.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Snipers/pravoved.yml
@@ -25,7 +25,7 @@
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
   - type: BallisticAmmoProvider
-    autoCycle: false
+    # autoCycle: false
     capacity: 10
     proto: CartridgeMagnum
     whitelist:

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/mech_punch.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/mech_punch.yml
@@ -90,4 +90,6 @@
     items:
     - LPPMechPunch
     - LPPWeaponVulcan
+  - type: Tag
+    tags:
     - DoorBumpOpener
diff --git a/Resources/Prototypes/_LostParadise/Entities/Reagents/Fluffy.yml b/Resources/Prototypes/_LostParadise/Entities/Reagents/Fluffy.yml
@@ -480,3 +480,15 @@
     radius: 1.5
     energy: 1.6
     color: "#FC0FC0"
+
+
+- type: messagePack
+  id: FluffyAds
+  advertisements:
+  - advertisement-Fluffy-1
+  - advertisement-Fluffy-2
+  - advertisement-Fluffy-3
+  - advertisement-Fluffy-4
+  - advertisement-Fluffy-5
+  - advertisement-Fluffy-6
+  - advertisement-Fluffy-7
diff --git a/migration_script.sql b/migration_script.sql