Double toy E-sword + balance changes + fix (#352)

* Double toy E-sword + fix colors of the toy sword + balance for my previous items * убрано отражение * Update toys.yml
Rxup · Nov 28, 2023 · 48c51d4 · 48c51d4
1 parent 14e95e0
commit 48c51d4
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 6 deletions.
diff --git a/Resources/Locale/ru-RU/backmen/prototypes/entities/objects/fun/toys.ftl b/Resources/Locale/ru-RU/backmen/prototypes/entities/objects/fun/toys.ftl
@@ -0,0 +1,2 @@
+ent-DoubleToySword = двухклинковый игрушечный меч
+    .desc = Новый пластиковый меч от Sandy-Cat! Теперь с двумя клинками!
diff --git a/Resources/Prototypes/Backmen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Backmen/Entities/Clothing/Belt/belts.yml
@@ -33,7 +33,7 @@
   - type: Clothing
     sprite: Backmen/Clothing/Belt/demoman.rsi
   - type: Storage
-    maxSlots: 8
+    maxSlots: 10
     whitelist:
       tags:
         - CableCoil

diff --git a/Resources/Prototypes/Backmen/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Backmen/Entities/Objects/Fun/toys.yml
@@ -82,4 +82,53 @@
           bounds: "-0.2,-0.2,0.2,0.2"
         density: 30
         mask:
-        - ItemMask 
+        - ItemMask
+
+- type: entity
+  id: DoubleToySword
+  name: double bladed toy sword
+  description: New Sandy-Cat plastic sword! Now with 2 blades!
+  components:
+    - type: EnergySword
+      isSharp: false
+      litDisarmMalus: 0.7
+    - type: Wieldable
+    - type: Sprite
+      sprite: Objects/Weapons/Melee/e_sword_double.rsi
+      layers:
+        - state: e_sword_double
+        - state: e_sword_double_blade
+          color: "#FFFFFF"
+          visible: false
+          shader: unshaded
+          map: [ "blade" ]
+    - type: Item
+      size: Small
+      sprite: Objects/Weapons/Melee/e_sword_double.rsi
+    - type: UseDelay
+      delay: 1.5
+    - type: PointLight
+      enabled: false
+      radius: 2
+      energy: 2
+      color: white
+      netsync: false
+    - type: Appearance
+    - type: ToggleableLightVisuals
+      spriteLayer: blade
+      inhandVisuals:
+        left:
+          - state: inhand-left-blade
+            shader: unshaded
+        right:
+          - state: inhand-right-blade
+            shader: unshaded
+    - type: DisarmMalus
+      malus: 0
+    - type: StaminaDamageOnHit
+      damage: 12
+    - type: MeleeWeapon
+      attackRate: 1.5
+      damage:
+        types:
+          Blunt: 0
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -515,6 +515,8 @@
         orGroup: GiftPool
       - id: ToySword
         orGroup: GiftPool
+      - id: DoubleToySword # Backmen
+        orGroup: GiftPool
       - id: RevolverCapGun
         orGroup: GiftPool
       - id: ToyRubberDuck
@@ -570,6 +572,8 @@
         orGroup: GiftPool
       - id: ToySword
         orGroup: GiftPool
+      - id: DoubleToySword # Backmen
+        orGroup: GiftPool
       - id: BalloonSyn
         prob: 0.6
         orGroup: GiftPool

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -827,8 +827,6 @@
   components:
     - type: EnergySword
       isSharp: false
-      colorOptions:
-        - DodgerBlue
     - type: Sprite
       sprite: Objects/Weapons/Melee/e_sword.rsi
       layers:

diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -110,8 +110,8 @@
         - proto: WaterTankHighCapacity
         - proto: WeldingFuelTankHighCapacity
           cost: 3
-        - proto: BluespacePillCanister
-          cost: 2
+        - proto: BluespacePillCanister # Backmen
+          cost: 1
 
 # Mob loot table
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-DoubleToySword = двухклинковый игрушечный меч
		.desc = Новый пластиковый меч от Sandy-Cat! Теперь с двумя клинками!