Бафф эсвордов и игрушечных мечей

space-sunrise · Dec 26, 2024 · 4f61457 · 4f61457
1 parent eab23ce
commit 4f61457
Show file tree

Hide file tree

Showing 10 changed files with 195 additions and 90 deletions.
diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
@@ -8714,3 +8714,68 @@
     type: Add
   id: 608
   time: '2024-12-26T02:41:49.774848+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\
+      \ \u043F\u0440\u044B\u0433\u0430\u0442\u044C \u0441\u043A\u0432\u043E\u0437\u044C\
+      \ \u0441\u0442\u0435\u043D\u044B."
+    type: Fix
+  - message: "\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\
+      \ \u043F\u0440\u044B\u0433\u0430\u0442\u044C \u043B\u0435\u0436\u0430."
+    type: Fix
+  - message: "\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\
+      \ \u043E\u0434\u043D\u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E \u0432\
+      \u044B\u043F\u043E\u043B\u043D\u044F\u0442\u044C \u043F\u0440\u044B\u0436\u043E\
+      \u043A \u0438 \u0441\u0430\u043B\u044C\u0442\u043E."
+    type: Fix
+  - message: "\u041D\u0430 \u043F\u0440\u044B\u0436\u043E\u043A \u043F\u0440\u043E\
+      \u0431\u0435\u043B\u043E\u043C \u0438 \u043F\u0430\u043D\u0435\u043B\u044C\u044E\
+      \ \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439 \u043E\u0431\u0449\u0438\u0439\
+      \ \u043A\u0443\u043B\u0434\u0430\u0443\u043D."
+    type: Fix
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432\u044B \u043C\u043E\u0436\
+      \u0435\u0442\u0435 \u043E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0437\
+      \u0432\u0443\u043A \u043F\u0440\u044B\u0436\u043A\u0430 \u0432 \u043D\u0430\u0441\
+      \u0442\u0440\u043E\u0439\u043A\u0430\u0445."
+    type: Tweak
+  - message: "\u0421\u0430\u043B\u044C\u0442\u043E \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u043F\u043E\u0437\u0432\u043E\u043B\u044F\u0435\u0442 \u0443\u043A\u043B\u043E\
+      \u043D\u044F\u0442\u044C\u0441\u044F \u043E\u0442 \u043F\u0443\u043B\u044C."
+    type: Tweak
+  - message: "\u0410\u0442\u0430\u043A\u0443\u044F \u0434\u0432\u043E\u0439\u043D\u044B\
+      \u043C \u044D\u043D\u0435\u0440\u0433\u043E \u043C\u0435\u0447\u0435\u043C \u0432\
+      \u044B \u0431\u0443\u0434\u0435\u0442\u0435 \u0434\u0435\u043B\u0430\u0442\u044C\
+      \ \u0441\u0430\u043B\u044C\u0442\u043E."
+    type: Tweak
+  - message: "\u0414\u0435\u043B\u0430\u044F \u0441\u0430\u043B\u044C\u0442\u043E\
+      \ \u0438\u043B\u0438 \u043F\u0440\u044B\u0436\u043E\u043A \u0435\u0441\u0442\
+      \u044C \u0448\u0430\u043D\u0441 1/1000 \u0441\u043B\u043E\u043C\u0430\u0442\u044C\
+      \ \u0448\u0435\u044E."
+    type: Tweak
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u043D\u0438\
+      \u0445\u043E\u043F."
+    type: Add
+  id: 609
+  time: '2024-12-26T03:17:25.379959+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u042D\u043D\u0435\u0440\u0433\u043E \u043C\u0435\u0447\u0438 \u0432\
+      \u0435\u0440\u043D\u0443\u043B\u0438 \u0431\u044B\u043B\u0443\u044E \u0441\u0438\
+      \u043B\u0443."
+    type: Tweak
+  - message: "\u0412 \u0430\u043F\u043B\u0438\u043D\u043A \u0441\u0438\u043D\u0434\
+      \u0438\u043A\u0430\u0442\u0430 \u0432\u0435\u0440\u043D\u0443\u043B\u0441\u044F\
+      \ \u043E\u0433\u043D\u0435\u043D\u044B\u0439 \u0442\u043E\u043F\u043E\u0440."
+    type: Tweak
+  - message: "\u0418\u0433\u0440\u0443\u0448\u0435\u0447\u043D\u044B\u0435 \u043C\u0435\
+      \u0447\u0438 \u0442\u0435\u043F\u0435\u0440\u044C \u0431\u043E\u043B\u044C\u0448\
+      \u0435 \u043F\u043E\u0445\u043E\u0436\u0438 \u043D\u0430 \u043D\u0430\u0441\u0442\
+      \u043E\u044F\u0449\u0438\u0435."
+    type: Tweak
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\
+      \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043A\u0440\u0430\u0444\u0442\
+      \u0430 \u0434\u0432\u043E\u0439\u043D\u043E\u0433\u043E \u0438\u0433\u0440\u0443\
+      \u0448\u0435\u0447\u043D\u043E\u0433\u043E \u043C\u0435\u0447\u0430."
+    type: Tweak
+  id: 610
+  time: '2024-12-26T03:28:30.039559+00:00'
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/melee/biocode.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/melee/biocode.ftl
@@ -4,6 +4,9 @@ ent-EnergySwordDoubleBiocode = { ent-EnergySwordDouble }
 ent-EnergySwordBiocode = { ent-EnergySword }
     .suffix = БИОКОД
     .desc = { ent-EnergySword.desc }
+ent-FireAxeFlamingBiocode = { ent-FireAxeFlaming }
+    .suffix = БИОКОД
+    .desc = { ent-FireAxeFlaming.desc }
 ent-EnergyShieldBiocode = { ent-EnergyShield }
     .suffix = БИОКОД
     .desc = { ent-EnergyShield.desc }

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1337,28 +1337,26 @@
   description: New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing!
   components:
     - type: EnergySword
-      colorOptions:
-        - DodgerBlue
     - type: ItemToggle
       soundActivate:
         path: /Audio/Weapons/ebladeon.ogg
       soundDeactivate:
         path: /Audio/Weapons/ebladeoff.ogg
+      deactivateUnequippedHand: true # Sunrise-Edit
     - type: ItemToggleActiveSound
       activeSound:
         path: /Audio/Weapons/ebladehum.ogg
     - type: Sprite
-      sprite: Objects/Fun/toy_sword.rsi
+      sprite: Objects/Weapons/Melee/e_sword.rsi
       layers:
-        - state: e_sword
-        - state: e_sword_blade
-          color: "#FFFFFF"
-          visible: false
-          shader: unshaded
-          map: [ "blade" ]
+      - state: e_sword
+      - state: e_sword_blade
+        color: "#FFFFFF"
+        visible: false
+        shader: unshaded
+        map: [ "blade" ]
     - type: Item
-      size: Small
-      sprite: Objects/Fun/toy_sword.rsi
+      sprite: Objects/Weapons/Melee/e_sword-inhands.rsi
     - type: UseDelay
       delay: 1.0
     - type: PointLight
@@ -1400,6 +1398,12 @@
         path: /Audio/Weapons/eblademiss.ogg
         params:
           variation: 0.125
+    - type: Construction
+      graph: ToySwordDoubledGraph
+      node: start
+    - type: Tag
+      tags:
+      - ToySword
 
 - type: entity
   parent: BasePlushie

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -9,7 +9,7 @@
       path: /Audio/Weapons/ebladeon.ogg
     soundDeactivate:
       path: /Audio/Weapons/ebladeoff.ogg
-    deactivateUnequippedHand: true
+    deactivateUnequippedHand: true # Sunrise-Edit
   - type: ItemToggleActiveSound
     activeSound:
       path: /Audio/Weapons/ebladehum.ogg
@@ -40,15 +40,15 @@
         variation: 0.125
     activatedDamage:
       types:
-        Slash: 10
-        Heat: 10
-        Structural: 20
+        Slash: 15
+        Heat: 15
+        Structural: 40
   - type: MeleeWeapon
     wideAnimationRotation: -135
     attackRate: 1
     damage:
       types:
-        Blunt: 1
+        Blunt: 4.5
   - type: Item
     size: Small
   - type: UseDelay
@@ -72,7 +72,7 @@
   - type: Reflect
     reflectProb: .35
     spread: 45
-    needActiveHand: true
+    needActiveHand: true # Sunrise-Edit
   # Sunrise-start
   - type: Tag
     tags:
@@ -121,9 +121,9 @@
         volume: -3
         variation: 0.250
     activatedDamage:
-        types:
-            Slash: 10
-            Heat: 10
+      types:
+        Slash: 10
+        Heat: 10
     deactivatedSecret: true
   - type: ItemToggleActiveSound
     activeSound:
@@ -140,12 +140,12 @@
   - type: Sprite
     sprite: Objects/Weapons/Melee/e_dagger_loud.rsi
     layers:
-      - state: e_sword
-      - state: e_sword_blade
-        color: "#FFFFFF"
-        visible: false
-        shader: unshaded
-        map: [ "blade" ]
+    - state: e_sword
+    - state: e_sword_blade
+      color: "#FFFFFF"
+      visible: false
+      shader: unshaded
+      map: [ "blade" ]
   - type: MeleeWeapon
     wideAnimationRotation: 145
     attackRate: 1
@@ -192,8 +192,8 @@
         variation: 0.250
     activatedDamage:
       types:
-        Slash: 6
-        Heat: 6
+        Slash: 10
+        Heat: 10
   - type: ComponentToggler
     components:
     - type: Sharp
@@ -207,12 +207,12 @@
   - type: Sprite
     sprite: Objects/Weapons/Melee/e_dagger.rsi
     layers:
-      - state: e_sword
-      - state: e_sword_blade
-        color: "#FFFFFF"
-        visible: false
-        shader: unshaded
-        map: [ "blade" ]
+    - state: e_sword
+    - state: e_sword_blade
+      color: "#FFFFFF"
+      visible: false
+      shader: unshaded
+      map: [ "blade" ]
   - type: Item
     size: Tiny
     sprite: Objects/Weapons/Melee/e_dagger.rsi
@@ -232,7 +232,7 @@
   - type: Reflect
     reflectProb: .15
     spread: 45
-    needActiveHand: true
+    needActiveHand: true # Sunrise-Edit
   - type: Tag
     tags:
     - Write
@@ -264,19 +264,19 @@
   components:
   - type: ItemToggleMeleeWeapon
     activatedDamage:
-        types:
-            Slash: 10
-            Heat: 12
+      types:
+        Slash: 10
+        Heat: 12
     deactivatedSecret: true
   - type: Sprite
     sprite: Objects/Weapons/Melee/e_cutlass.rsi
     layers:
-      - state: e_cutlass
-      - state: e_cutlass_blade
-        color: "#e95151"
-        visible: false
-        shader: unshaded
-        map: [ "blade" ]
+    - state: e_cutlass
+    - state: e_cutlass_blade
+      color: "#e95151"
+      visible: false
+      shader: unshaded
+      map: [ "blade" ]
   - type: Item
     sprite: Objects/Weapons/Melee/e_cutlass.rsi
 
@@ -304,10 +304,10 @@
         volume: 3
         variation: 0.250
     activatedDamage:
-        types:
-            Slash: 6
-            Heat: 6
-            Structural: 10
+      types:
+        Slash: 12
+        Heat: 12
+        Structural: 30
   - type: ItemToggleActiveSound
     activeSound:
       path: /Audio/Weapons/ebladehum.ogg
@@ -324,27 +324,27 @@
     wieldSound: null # esword light sound instead
   - type: MeleeWeapon
     wideAnimationRotation: -135
-    attackRate: 2
+    attackRate: 1.5
     angle: 100
     damage:
       types:
-        Blunt: 1
+        Blunt: 4.5
   - 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" ]
+    - 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-inhands.rsi
   - type: Reflect
-    reflectProb: .50
-    spread: 90
-    needActiveHand: true
+    reflectProb: .75
+    spread: 75
+    needActiveHand: true # Sunrise-Edit
   - type: FlipOnAttack # Sunrise-Edit
 
 - type: entity

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/EnergySwordDouble.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/EnergySwordDouble.yml
@@ -16,10 +16,36 @@
         steps:
         - tool: Screwing
           doAfter: 2
-    
+
     - node: deconstruct
       actions:
         - !type:GivePrototype
           prototype: EnergySwordBiocode
           amount: 2
-        - !type:DeleteEntity
+        - !type:DeleteEntity
+
+- type: constructionGraph
+  id: ToySwordDoubledGraph
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: ToySwordDoubledNode
+      steps:
+      - tag: ToySword
+        doAfter: 2
+
+  - node: ToySwordDoubledNode
+    entity: ToySwordDoubled
+    edges:
+    - to: deconstruct
+      steps:
+      - tool: Screwing
+        doAfter: 2
+
+  - node: deconstruct
+    actions:
+    - !type:GivePrototype
+      prototype: ToySword
+      amount: 2
+    - !type:DeleteEntity
diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
@@ -805,6 +805,20 @@
   categories:
   - UplinkWeaponry
 
+- type: listing
+  id: UplinkFireAxeFlaming
+  name: uplink-fire-axe-flaming-name
+  description: uplink-fire-axe-flaming-desc
+  icon: { sprite: Objects/Weapons/Melee/fireaxeflaming.rsi, state: icon }
+  productEntity: FireAxeFlamingBiocode
+  discountCategory: rareDiscounts
+  discountDownTo:
+    Telecrystal: 5
+  cost:
+    Telecrystal: 9
+  categories:
+  - UplinkWeaponry
+
 - type: listing
   id: UplinkPolytrinicAcidChemistryBottle
   name: uplink-polytrinic-acid-chemistry-bottle-name