Plasma sword update

Lost-Paradise-Project · Oct 14, 2024 · fd9e82d · fd9e82d
1 parent 9b0dabb
commit fd9e82d
Show file tree

Hide file tree

Showing 36 changed files with 480 additions and 46 deletions.
diff --git a/Resources/Locale/en-US/_LostParadise/research.ftl b/Resources/Locale/en-US/_LostParadise/research.ftl
@@ -16,3 +16,4 @@ lppresearch-technology-combat-utility = Боевая медицина
 lppresearch-technology-basic-administration-of-drugs = Базовое введение препаратов
 lppresearch-technology-basic-tracking = Базовое отслеживание
 lppresearch-technology-advanced-tracking = Продвинутое отслеживание
+lppresearch-combat-plasma-usage = Combat plasma usage
diff --git a/...US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl b/...US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl
@@ -0,0 +1,16 @@
+ent-LPPDrinkCamomileTeaBottleFull = camomile tea bottle
+    .desc = Bottle of chamomile tea is the perfect remedy for your peace of mind.
+ent-LPPDrinkMintTeaBottleFull = mint tea bottle
+    .desc = Bottle of refreshing peppermint tea, just looking at it makes you feel chilled.
+ent-LPPDrinkGingerTeaBottleFull = ginger tea bottle
+    .desc = Bottle of ginger tea, great for warming your soul.
+ent-LPPDrinkBerryTeaBottleFull = berry tea bottle
+    .desc = Bottle of berry tea with the rich flavor of summer berries.
+ent-LPPDrinkOrangeTeaBottleFull = orange tea bottle
+    .desc = Bottle of orange tea with citrus freshness.
+ent-LPPDrinkFlowerTeaBottleFull = flower tea bottle
+    .desc = Bottle of flower tea with subtle, delicate notes of flowers.
+ent-LPPDrinkTeaBottleFull = tea bottle
+    .desc = Bottle of regular tea, nothing special.
+ent-LPPDrinkGreenTeaBottleFull = green tea bottle
+    .desc = Bottle of green tea, nothing special either.
diff --git a/...le/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl b/...le/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl
@@ -0,0 +1,10 @@
+ent-LPPPlasmaSword = Plasma sword
+    .desc = A prototype weapon based on plasma technology, a small injection of plasma ignited by an incendiary device forms a blade of fire as long as there is plasma. Special cartridges are required for refueling.
+ent-LPPPlasmaCartridge = Plasma cartridge
+    .desc = Special cartridges containing high-pressure plasma for injection into a specialized container of plasma sword. Disposable.
+ent-LPPExperimentalPlasmaSword = Experimental plasma sword
+    .desc = A prototype weapon based on plasma technology, a small injection of plasma ignited by an incendiary device forms a blade of fire as long as there is plasma. This model self-replicates the plasma after a period of time.
+    .suffix = ERT
+ent-LPPPlasmaSwordEmpty = Plasma sword
+    .suffix = Empty
+    .desc = { ent-LPPPlasmaSword.desc }
diff --git a/.../en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl b/.../en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl
@@ -25,3 +25,5 @@ ent-LPPUnderpantsMat = Underpants machine
 ent-LPPWithSoftAnimals = With soft animals machine
     .desc = For when you need seeds fast. Hands down the best seed selection on the station!
     .suffix = Unlocked
+ent-LPPTeaVend = TeaVend
+    .desc = Perfect for those who want to cool down a bit.
diff --git a/Resources/Locale/ru-RU/_LostParadise/flavors.ftl b/Resources/Locale/ru-RU/_LostParadise/flavors.ftl
@@ -3,4 +3,4 @@ flavor-complex-mint-tea = как вечная мерзлота
 flavor-complex-ginger-tea = как жгучий перец
 flavor-complex-berry-tea = как ягодный компот
 flavor-complex-orange-tea = как выжаный апельсин
-flavor-complex-flower-tea = как цветочки
+flavor-complex-flower-tea = как цветочки
diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/reagents/consumable.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/reagents/consumable.ftl
@@ -9,4 +9,4 @@ reagent-desc-berry-tea = Чай с добавлением различных я
 reagent-name-orange-tea = апельсиновый чай
 reagent-desc-orange-tea = Чай с добавлением апельсина, имеет цитрусовый привкус.
 reagent-name-flower-tea = цветочный чай
-reagent-desc-flower-tea = Чай с добавлением различных цветов.
+reagent-desc-flower-tea = Чай с добавлением различных цветов.
diff --git a/Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl b/Resources/Locale/ru-RU/_LostParadise/reagents/consumable.ftl
@@ -0,0 +1,12 @@
+reagent-name-camomile-tea = chamomile tea
+reagent-desc-camomile-tea = Tea with added chamomile, great for relaxation.
+reagent-name-mint-tea = mint tea
+reagent-desc-mint-tea = Tea with mint, thankfully not catnip...
+reagent-name-ginger-tea = ginger tea
+reagent-desc-ginger-tea = Tea with added ginger, rumored to be great for warming up.
+reagent-name-berry-tea = berry tea
+reagent-desc-berry-tea = Tea with a mix of various berries, hopefully none of them are poisonous.
+reagent-name-orange-tea = orange tea
+reagent-desc-orange-tea = Tea with added orange, has a citrusy flavor.
+reagent-name-flower-tea = flower tea
+reagent-desc-flower-tea = Tea with a blend of various flowers.
diff --git a/Resources/Locale/ru-RU/_LostParadise/research.ftl b/Resources/Locale/ru-RU/_LostParadise/research.ftl
@@ -16,3 +16,4 @@ lppresearch-technology-combat-utility = Боевая медицина
 lppresearch-technology-basic-administration-of-drugs = Базовое введение препаратов
 lppresearch-technology-basic-tracking = Базовое отслеживание
 lppresearch-technology-advanced-tracking = Продвинутое отслеживание
+lppresearch-combat-plasma-usage = Боевое применение плазмы
diff --git a/...le/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl b/...le/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/melee/plasma_sword.ftl
@@ -0,0 +1,10 @@
+ent-LPPPlasmaSword = Плазменный меч
+    .desc = Прототип оружия, основанный на плазменной технологии. Небольшая инъекция плазмы, поджигаемая зажигательным устройством, образует огненное лезвие, пока есть плазма. Для заправки требуются специальные картриджи.
+ent-LPPPlasmaCartridge = Плазменный картридж
+    .desc = Специальные картриджи, содержащие плазму высокого давления для введения в специализированный контейнер плазменного меча. Одноразовые.
+ent-LPPExperimentalPlasmaSword = Экспериментальный плазменный меч
+    .desc = Прототип оружия, основанный на плазменной технологии: небольшая инъекция плазмы, воспламеняемая зажигательным устройством, образует огненное лезвие, пока есть плазма. Через некоторое время эта модель самовоспроизводит плазму.
+    .suffix = ОБР
+ent-LPPPlasmaSwordEmpty = Плазменный меч
+    .suffix = Пустой
+    .desc = { ent-LPPPlasmaSword.desc }
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -43,7 +43,7 @@
     layers:
       - state: e_sword
       - state: e_sword_blade
-        color: "#FFFFFF"
+        color: purple
         visible: false
         shader: unshaded
         map: [ "blade" ]

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -856,6 +856,8 @@
       #LPP
       - LPPMagazineBoxMinigunPractice
       - LPPMagazineBoxMinigunRubber
+      - LPPRecipePlasmaSword
+      - LPPRecipePlasmaCartridge
       # End of modified code
   - type: MaterialStorage
     whitelist:

diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
@@ -216,45 +216,6 @@
   items:
     - ClothingBeltKatanaSheathFilledHoS
 
-- type: loadout
-  id: LoadoutCommandHoSC20r
-  category: JobsCommand
-  cost: 0
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutHoSWeapon
-    - !type:CharacterJobRequirement
-      jobs:
-        - HeadOfSecurity
-  items:
-    - WeaponSubMachineGunC20rHoS
-
-- type: loadout
-  id: LoadoutCommandHoSBulldog
-  category: JobsCommand
-  cost: 0
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutHoSWeapon
-    - !type:CharacterJobRequirement
-      jobs:
-        - HeadOfSecurity
-  items:
-    - WeaponShotgunBulldogHoS
-
-- type: loadout
-  id: LoadoutCommandHoSEnergySword
-  category: JobsCommand
-  cost: 0
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutHoSWeapon
-    - !type:CharacterJobRequirement
-      jobs:
-        - HeadOfSecurity
-  items:
-    - EnergySwordHoS
-
 - type: loadout
   id: LoadoutCommandHoSEnergyGun
   category: JobsCommand

diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -28,7 +28,7 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolN1984NonLethal
-    pocket2: FlashlightSeclite
+    pocket2: LPPExperimentalPlasmaSword
 
 - type: startingGear
   id: ERTLeaderGearEVA
@@ -45,7 +45,7 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolN1984NonLethal
-    pocket2: FlashlightSeclite
+    pocket2: LPPExperimentalPlasmaSword
 
 - type: startingGear
   id: ERTLeaderGearEVALecter
@@ -62,7 +62,7 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
     pocket1: MagazineRifle
-    pocket2: MagazineRifle
+    pocket2: LPPExperimentalPlasmaSword
   inhand:
     - AirTankFilled
 

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/plasma_sword.yml
@@ -0,0 +1,209 @@
+- type: entity
+  name: Plasma sword
+  parent: BaseItem
+  id: LPPPlasmaSword
+  description: "A prototype weapon based on plasma technology, a small injection of plasma ignited by an incendiary device forms a blade of fire as long as there is plasma. Special cartridges are required for refueling."
+  components:
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/welder_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/welder_drop.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/welder_drop.ogg
+  - type: Sprite
+    sprite: _LostParadise/Objects/Weapons/Melee/plasma_sword.rsi
+    layers:
+      - state: icon
+      - state: p_sword_blade
+        color: orange
+        visible: false
+        shader: unshaded
+        map: [ "blade" ]
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleVisuals.Toggled:
+        enum.ToggleVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+  - type: Item
+    size: Small
+    sprite: _LostParadise/Objects/Weapons/Melee/plasma_sword.rsi
+  - type: ItemToggle
+    predictable: false
+    soundActivate:
+      path: /Audio/Weapons/ebladeon.ogg
+      params:
+        variation: 0.125
+    soundDeactivate:
+      path: /Audio/Weapons/ebladeoff.ogg
+      params:
+        variation: 0.125
+  - type: ItemToggleMeleeWeapon
+    activatedSoundOnHit:
+      path: /Audio/Weapons/eblade1.ogg
+      params:
+        variation: 0.125
+    activatedSoundOnHitNoDamage:
+      path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg
+      params:
+        variation: 0.125
+    deactivatedSoundOnHitNoDamage:
+      collection: MetalThud
+    activatedSoundOnSwing:
+      path: /Audio/Weapons/eblademiss.ogg
+      params:
+        variation: 0.125
+    activatedDamage:
+        types:
+            Heat: 12.5
+            Slash: 2.5
+    attackRate: 0.75
+  - type: ItemToggleSize
+    activatedSize: Large
+  - type: ItemToggleHot
+  - type: ItemToggleDisarmMalus
+  - type: ItemToggleSharp
+    activatedDisarmMalus: 0.6
+  - type: ToggleableLightVisuals
+    spriteLayer: blade
+    inhandVisuals:
+      left:
+      - state: inhand-left-blade
+        shader: unshaded
+        color: orange
+      right:
+      - state: inhand-right-blade
+        shader: unshaded
+        color: orange
+  - type: UseDelay
+  - type: MeleeWeapon
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Blunt: 6
+    soundHit:
+      collection: MetalThud
+  - type: RefillableSolution
+    solution: refillable
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 30
+        maxVol: 30
+  - type: Welder
+    fuelReagent: Plasma
+    fuelConsumption: 0.1
+    fuelLitCost: 0.05
+    tankSafe: true
+  - type: PointLight
+    enabled: false
+    radius: 2
+    color: orange
+    netsync: false
+  - type: Appearance
+  - type: StaticPrice
+    price: 40
+  - type: IgnitionSource
+    temperature: 1200
+
+- type: entity
+  id: LPPPlasmaCartridge
+  parent: BaseItem
+  name: Plasma cartridge
+  description: "Special cartridges containing high-pressure plasma for injection into a specialized container of plasma sword. Disposable."
+  components:
+  - type: Item
+    size: Small
+    sprite: _LostParadise/Objects/Misc/Plasma_cartridge.rsi
+  - type: Sprite
+    sprite: _LostParadise/Objects/Misc/Plasma_cartridge.rsi
+    state: icon
+  - type: ReagentTank
+    tankType: Fuel
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 30
+  - type: InteractionOutline
+  - type: DrainableSolution
+    solution: tank
+  - type: ExaminableSolution
+    solution: tank
+  - type: EmitSoundOnPickup
+    sound: /Audio/SimpleStation14/Items/Handling/welder_pickup.ogg
+  - type: EmitSoundOnDrop
+    sound: /Audio/SimpleStation14/Items/Handling/welder_drop.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/welder_drop.ogg
+
+- type: entity
+  name: Experimental plasma sword
+  parent: LPPPlasmaSword
+  id: LPPExperimentalPlasmaSword
+  description: "A prototype weapon based on plasma technology, a small injection of plasma ignited by an incendiary device forms a blade of fire as long as there is plasma. This model self-replicates the plasma after a period of time."
+  suffix: ERT
+  components:
+  - type: Item
+    size: Small
+    sprite: _LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi
+  - type: Sprite
+    sprite: _LostParadise/Objects/Weapons/Melee/exp_plasma_sword.rsi
+    layers:
+      - state: icon
+      - state: p_sword_blade
+        color: purple
+        visible: false
+        shader: unshaded
+        map: [ "blade" ]
+  - type: ItemToggle
+    activatedDamage:
+        types:
+            Heat: 18
+            Slash: 7
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 35
+        maxVol: 35
+  - type: ToggleableLightVisuals
+    inhandVisuals:
+      left:
+      - state: inhand-left-blade
+        shader: unshaded
+        color: purple
+      right:
+      - state: inhand-right-blade
+        shader: unshaded
+        color: purple
+  - type: PointLight
+    enabled: false
+    radius: 2
+    color: purple
+  - type: SolutionRegeneration
+    solution: Welder
+    generated:
+      reagents:
+      - ReagentId: Plasma
+        Quantity: 0.05
+
+- type: entity
+  name: Plasma sword
+  parent: LPPPlasmaSword
+  id: LPPPlasmaSwordEmpty
+  suffix: Empty
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 0
+        maxVol: 30