From f9d2a58856e7183a6b4a61872efd45760f48285f Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Tue, 11 Jun 2024 12:15:05 +0300 Subject: [PATCH 01/18] Nerf --- Resources/Prototypes/Reagents/fun.yml | 2 +- Resources/Prototypes/Starshine/Reagents/fun.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index b4e9f050ae07..131b54c3dac0 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -333,7 +333,7 @@ - !type:HealthChange damage: types: - Poison: 0.25 + Poison: 0.10 - !type:Emote emote: Weh showInChat: true diff --git a/Resources/Prototypes/Starshine/Reagents/fun.yml b/Resources/Prototypes/Starshine/Reagents/fun.yml index 8cf2740aae7a..61aa314c03ab 100644 --- a/Resources/Prototypes/Starshine/Reagents/fun.yml +++ b/Resources/Prototypes/Starshine/Reagents/fun.yml @@ -13,7 +13,7 @@ - !type:HealthChange damage: types: - Poison: 0.25 + Poison: 0.10 - !type:Emote emote: Buzzing showInChat: true From 474d8c3296074ddac7abc300bfc63ce3a4662a60 Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Wed, 19 Jun 2024 11:23:23 +0300 Subject: [PATCH 02/18] Revert "Nerf" This reverts commit f9d2a58856e7183a6b4a61872efd45760f48285f. --- Resources/Prototypes/Reagents/fun.yml | 2 +- Resources/Prototypes/Starshine/Reagents/fun.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index 131b54c3dac0..b4e9f050ae07 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -333,7 +333,7 @@ - !type:HealthChange damage: types: - Poison: 0.10 + Poison: 0.25 - !type:Emote emote: Weh showInChat: true diff --git a/Resources/Prototypes/Starshine/Reagents/fun.yml b/Resources/Prototypes/Starshine/Reagents/fun.yml index 61aa314c03ab..8cf2740aae7a 100644 --- a/Resources/Prototypes/Starshine/Reagents/fun.yml +++ b/Resources/Prototypes/Starshine/Reagents/fun.yml @@ -13,7 +13,7 @@ - !type:HealthChange damage: types: - Poison: 0.10 + Poison: 0.25 - !type:Emote emote: Buzzing showInChat: true From af623e3f2ce68ee5c470915d30ff0e07dbbe158f Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Tue, 2 Jul 2024 17:27:55 +0300 Subject: [PATCH 03/18] toy energy weapon update --- .../Entities/Objects/Shields/shields.yml | 1 + .../Objects/Weapons/Melee/e_sword.yml | 5 + .../Starshine/Entities/Objects/Fun/toys.yml | 177 ++++++++++++++++++ 3 files changed, 183 insertions(+) create mode 100644 Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index cc4ebd26f9dd..714d1f8cf9aa 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -364,6 +364,7 @@ id: EnergyShield description: Exotic energy shield, when folded, can even fit in your pocket. components: + - type: EnergySword - type: ItemToggle soundActivate: path: /Audio/Weapons/ebladeon.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 592fe56b4758..49e97dcf5fd2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -111,6 +111,11 @@ Slash: 10 Heat: 10 deactivatedSecret: true + - type: DamageOtherOnHit + damage: + types: + Slash: 10 + Heat: 10 - type: ItemToggleActiveSound activeSound: path: /Audio/Weapons/ebladehum.ogg diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml new file mode 100644 index 000000000000..39026740762f --- /dev/null +++ b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml @@ -0,0 +1,177 @@ +- type: entity + parent: BaseItem + id: ToyEnergySwordDouble + name: toy double-bladed energy sword + 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 + - type: ItemToggleActiveSound + activeSound: + path: /Audio/Weapons/ebladehum.ogg + - 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-inhands.rsi + - type: UseDelay + delay: 1.0 + - type: PointLight + enabled: false + radius: 2 + energy: 2 + color: white + netsync: false + - type: Appearance + - type: ItemToggleDisarmMalus + activatedDisarmMalus: 0.7 + - type: Wieldable + - 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: 5 + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.1 + angle: 100 + damage: + types: + Blunt: 0 + - type: Reflect + enabled: false + reflectProb: .005 + minReflectProb: .0005 + spread: 75 + - type: ItemToggleMeleeWeapon + activatedSoundOnHit: + path: /Audio/Weapons/eblade1.ogg + params: + variation: 0.250 + activatedSoundOnHitNoDamage: + path: /Audio/Weapons/eblade1.ogg + params: + variation: 0.250 + activatedSoundOnSwing: + path: /Audio/Weapons/eblademiss.ogg + params: + variation: 0.125 + +- type: entity + name: toy energy shield + parent: BaseItem + id: ToyEnergyShield + description: New Sandy-Cat plastic shield! Comes with realistic sound and full color! Looks almost like the real thing! + components: + - type: EnergySword + - type: ItemToggle + soundActivate: + path: /Audio/Weapons/ebladeon.ogg + soundDeactivate: + path: /Audio/Weapons/ebladeoff.ogg + - type: ItemToggleActiveSound + activeSound: + path: /Audio/Weapons/ebladehum.ogg + - type: ItemToggleSize + activatedSize: Huge + - type: ItemToggleDisarmMalus + activatedDisarmMalus: 0.6 + - type: Sprite + sprite: Objects/Weapons/Melee/e_shield.rsi + layers: + - state: eshield-icon + - state: eshield-on + color: "#FFFFFF" + visible: false + shader: unshaded + map: [ "shield" ] + - type: Item + size: Small + sprite: Objects/Weapons/Melee/e_shield.rsi + heldPrefix: eshield + - type: UseDelay + delay: 0.5 + - type: ToggleableLightVisuals + spriteLayer: shield + inhandVisuals: + left: + - state: inhand-left-shield + shader: unshaded + right: + - state: inhand-right-shield + shader: unshaded + - type: PointLight + netsync: false + enabled: false + radius: 1.5 + energy: 2 + color: blue + - type: Reflect + enabled: false + reflectProb: 0.05 + innate: true + reflects: + - Energy + - type: Blocking + passiveBlockFraction: 0.01 + passiveBlockModifier: + coefficients: + Blunt: 0.01 + Slash: 0.01 + Piercing: 0.01 + Heat: 0.1 + activeBlockModifier: + coefficients: + Blunt: 0.01 + Slash: 0.01 + Piercing: 0.01 + Heat: 0.1 + flatReductions: + Heat: 0.1 + Piercing: 0.01 + - type: Appearance + - type: Damageable + damageContainer: Shield + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + BrokenEnergyShield: + min: 1 + max: 1 From 685de27fac47b2cde6c681ea0d93c94029259188 Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Wed, 3 Jul 2024 11:36:04 +0300 Subject: [PATCH 04/18] revert DamageOtherOnHit --- .../Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 49e97dcf5fd2..592fe56b4758 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -111,11 +111,6 @@ Slash: 10 Heat: 10 deactivatedSecret: true - - type: DamageOtherOnHit - damage: - types: - Slash: 10 - Heat: 10 - type: ItemToggleActiveSound activeSound: path: /Audio/Weapons/ebladehum.ogg From 8a3a5161cff7682286dd61f0193d27329e2d1f2a Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Sat, 6 Jul 2024 14:13:37 +0300 Subject: [PATCH 05/18] update --- .../Starshine/Entities/Objects/Fun/toys.yml | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml index 39026740762f..d5ea234f22f0 100644 --- a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml @@ -134,21 +134,20 @@ reflects: - Energy - type: Blocking - passiveBlockFraction: 0.01 passiveBlockModifier: coefficients: - Blunt: 0.01 - Slash: 0.01 - Piercing: 0.01 - Heat: 0.1 + Blunt: 1.0 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.6 activeBlockModifier: coefficients: - Blunt: 0.01 - Slash: 0.01 - Piercing: 0.01 - Heat: 0.1 + Blunt: 1.2 + Slash: 0.85 + Piercing: 0.5 + Heat: 0.4 flatReductions: - Heat: 0.1 + Heat: 0.01 Piercing: 0.01 - type: Appearance - type: Damageable @@ -157,7 +156,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 15 + damage: 18 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] From 8e89b3fb36284b1c9e0202b212da220cc11a58bb Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Sun, 7 Jul 2024 20:38:58 +0300 Subject: [PATCH 06/18] uplink --- .../Prototypes/Catalog/uplink_catalog.yml | 16 +++++++- .../Starshine/Entities/Objects/Fun/toys.yml | 37 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 5ef44b6b548d..e8bea690035b 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1935,7 +1935,7 @@ - SurplusBundle - type: listing - id: uplinkMinerSyndie + id: uplink name: uplink-syndie-miner-armor-name description: uplink-syndie-miner-armor-desc productEntity: ClothingOuterArmorMinerSyndie @@ -1948,6 +1948,20 @@ whitelist: - Miner +- type: listing + id: uplinkPlasteelHammer + name: uplink-plasteel-hammer-name + description: uplink-plasteel-hammer-desc + productEntity: PlasteelHammer + cost: + Telecrystal: 6 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Clown + #- type: listing # id: UplinkSyndicateMauler # name: uplink-mauler-name diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml index d5ea234f22f0..91c421009a19 100644 --- a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml @@ -174,3 +174,40 @@ BrokenEnergyShield: min: 1 max: 1 + +- type: entity + parent: BaseItem + id: PlasteelHammer + name: rubber hammer + description: This is a copy of the legendary rubber toy hammer, but made of plasteel. BONK! + components: + - type: Sprite + sprite: Objects/Fun/rubber_hammer.rsi + state: icon + - type: WeaponRandom + RandomDamageChance: 2E-05 + damageBonus: + types: + Blunt: 1000 + - type: StaminaDamageOnHit + damage: 25 + - type: Item + size: Small + sprite: Objects/Fun/rubber_hammer.rsi + - type: Appearance + - type: DisarmMalus + malus: 0 + - type: MeleeWeapon + soundHit: + collection: MetalThud + params: + variation: 0.03 + volume: 3 + soundNoDamage: + collection: MetalThud + params: + variation: 0.03 + volume: 3 + damage: + types: + Blunt: 12 From e212c4b9602d989335344a102a455e2ddd0e7add Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Sun, 7 Jul 2024 21:27:53 +0300 Subject: [PATCH 07/18] update --- Resources/Locale/ru-RU/store/uplink-catalog.ftl | 4 +++- Resources/Prototypes/Catalog/uplink_catalog.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index b31a9ebf21ec..028e52d09eb3 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -1,4 +1,4 @@ -# Вооружение +# Вооружение uplink-pistol-viper-name = Гадюка uplink-pistol-viper-desc = Небольшой, легко скрываемый, но маломощный пистолет. Оснащён полностью автоматическим ресивером. Использует патроны калибра .35 авто. uplink-revolver-python-name = Питон @@ -185,6 +185,8 @@ uplink-gatfruit-seeds-name = Пакет семян гатфрукта uplink-gatfruit-seeds-desc = И кто сказал, что пушки не растут на деревьях? uplink-rigged-boxing-gloves-name = Нечестные боксёрские перчатки uplink-rigged-boxing-gloves-desc = Порхай как бабочка, жаль как пчела. +uplink-plasteel-hammer-name = Пластановый молот +uplink-plasteel-hammer-desc = Легендарный ремейк резинового молота, но сделан он из пластали. БОНЬК! uplink-necronomicon-name = Некрономикон uplink-necronomicon-desc = Нечестивая книга, позволяющая призвать демонического фамильяра. uplink-holy-hand-grenade-name = Святая ручная граната diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index e8bea690035b..21f6db992a12 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1935,7 +1935,7 @@ - SurplusBundle - type: listing - id: uplink + id: uplinkMinerSyndie name: uplink-syndie-miner-armor-name description: uplink-syndie-miner-armor-desc productEntity: ClothingOuterArmorMinerSyndie From b51dafa1311800f12c5463f938626c9285771266 Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Sun, 7 Jul 2024 22:03:47 +0300 Subject: [PATCH 08/18] lokale fix --- Resources/Locale/ru-RU/starshine/fun/toys.ftl | 6 ++++++ .../Prototypes/Starshine/Entities/Objects/Fun/toys.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/ru-RU/starshine/fun/toys.ftl diff --git a/Resources/Locale/ru-RU/starshine/fun/toys.ftl b/Resources/Locale/ru-RU/starshine/fun/toys.ftl new file mode 100644 index 000000000000..1d18c89da18b --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/fun/toys.ftl @@ -0,0 +1,6 @@ +ent-ToyEnergySwordDouble = игрушечный двойной меч + .desc = Новый пластиковый двойной меч от Sandy-Cat! Имеет реалистичный звук и почти отражает все пули! Вжух! +ent-ToyEnergyShield = игрушечный щит + .desc = Совершено новый щит версии "Sind V2" от Sandy-Cat! Отражает все выстрелы с игрушечной лазерной винтовки! Почти как настоящий! +ent-PlasteelHammer = резиновый молоток + .desc = Такое чуство, что резиновый молоток на самом деле не резиновый..... \ No newline at end of file diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml index 91c421009a19..0e02cb70cba9 100644 --- a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml @@ -2,7 +2,7 @@ parent: BaseItem id: ToyEnergySwordDouble name: toy double-bladed energy sword - description: New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing! + description: New Sandy-Cat plastic double-bladed sword! Comes with realistic sound and full color! Looks almost like the real thing! components: - type: EnergySword colorOptions: From 7643d48bc56d4cbde22d806b81144ba44c21a348 Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Mon, 8 Jul 2024 16:32:12 +0300 Subject: [PATCH 09/18] lokale fix --- Resources/Locale/ru-RU/starshine/fun/toys.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/starshine/fun/toys.ftl b/Resources/Locale/ru-RU/starshine/fun/toys.ftl index 1d18c89da18b..347b4221a540 100644 --- a/Resources/Locale/ru-RU/starshine/fun/toys.ftl +++ b/Resources/Locale/ru-RU/starshine/fun/toys.ftl @@ -3,4 +3,5 @@ ent-ToyEnergyShield = игрушечный щит .desc = Совершено новый щит версии "Sind V2" от Sandy-Cat! Отражает все выстрелы с игрушечной лазерной винтовки! Почти как настоящий! ent-PlasteelHammer = резиновый молоток - .desc = Такое чуство, что резиновый молоток на самом деле не резиновый..... \ No newline at end of file + .desc = Такое чуство, что резиновый молоток на самом деле не резиновый..... + .suffix = Пластановый From a6d40a1bfd57b65003c2a45d669cc3688d54e858 Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Mon, 8 Jul 2024 16:41:59 +0300 Subject: [PATCH 10/18] rare --- Resources/Prototypes/Catalog/Fills/Crates/cargo.yml | 4 ++++ .../Entities/Objects/Consumable/Food/Containers/box.yml | 8 ++++++++ .../Prototypes/Entities/Objects/Decoration/present.yml | 4 ++++ .../Entities/Structures/Machines/Computers/arcades.yml | 2 ++ 4 files changed, 18 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index 7ef8a8262d60..ff63167c8b47 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -143,6 +143,10 @@ - id: Bola prob: 0.01 orGroup: Weapons + - id: ToyEnergyShield + prob: 0.01 + - id: ToyEnergySwordDouble + prob: 0.01 - id: ToySword prob: 0.01 orGroup: Weapons diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 5d9ddca94dd9..f25440c896c8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -535,6 +535,10 @@ orGroup: GiftPool - id: ToySword orGroup: GiftPool + - id: ToyEnergyShield + orGroup: GiftPool + - id: ToyEnergySwordDouble + orGroup: GiftPool - id: RevolverCapGun orGroup: GiftPool - id: ToyRubberDuck @@ -589,6 +593,10 @@ orGroup: GiftPool - id: ToySword orGroup: GiftPool + - id: ToyEnergyShield + orGroup: GiftPool + - id: ToyEnergySwordDouble + orGroup: GiftPool - id: BalloonSyn prob: 0.6 orGroup: GiftPool diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index c0ccf9ee4f49..d85ca76dd042 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -340,6 +340,10 @@ orGroup: GiftPool - id: ToySword orGroup: GiftPool + - id: ToyEnergyShield + orGroup: GiftPool + - id: ToyEnergySwordDouble + orGroup: GiftPool - id: RevolverCapGun orGroup: GiftPool - id: Ash diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index 8b2cb5d5c7b9..0160919a927b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -114,6 +114,8 @@ - BalloonNT - BalloonCorgi - ToySword + - ToyEnergySwordDouble + - ToyEnergyShield - CrayonBox - BoxDonkSoftBox - BoxCartridgeCap From 9525b9e2fefcf1ad92b7f2a51fe2372d6761992b Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Mon, 8 Jul 2024 16:51:41 +0300 Subject: [PATCH 11/18] fuck --- .../ru-RU/starshine/store/uplink-catalog.ftl | 6 ++++-- Resources/Locale/ru-RU/store/uplink-catalog.ftl | 2 -- Resources/Prototypes/Catalog/uplink_catalog.yml | 17 +---------------- .../Starshine/Catalog/uplink_catalog.yml | 14 +++++++++++++- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl index e9b63869c53f..4aeb7dcd5ff0 100644 --- a/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl @@ -1,4 +1,4 @@ -## Starshine +## Starshine uplink-bow-bundle-name = Набор композитного лука uplink-bow-bundle-desc = Скрытая угроза: Композитный лук, созданный компанией Cybersun. Имеет с собой колчан стрел. uplink-bow-compound-red-name = Кровавый композитный лук @@ -22,4 +22,6 @@ uplink-mauler-desc = Перекрашенный синдикатом марод uplink-clothing-pnv-name = ПНВ uplink-clothing-pnv-desc = Прибор ночного видения. uplink-m90gl-bundle-name = Набор m90-gl -uplink-m90gl-bundle-desc = Старая винтовка типа булпап. И нет, подствольник не настоящий. \ No newline at end of file +uplink-m90gl-bundle-desc = Старая винтовка типа булпап. И нет, подствольник не настоящий. +uplink-plasteel-hammer-name = Пластановый молот +uplink-plasteel-hammer-desc = Легендарный ремейк резинового молота, но сделан он из пластали. БОНЬК! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index 5796cf92dfa3..8d80376e7ca4 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -185,8 +185,6 @@ uplink-gatfruit-seeds-name = Пакет семян гатфрукта uplink-gatfruit-seeds-desc = И кто сказал, что пушки не растут на деревьях? uplink-rigged-boxing-gloves-name = Нечестные боксёрские перчатки uplink-rigged-boxing-gloves-desc = Порхай как бабочка, жаль как пчела. -uplink-plasteel-hammer-name = Пластановый молот -uplink-plasteel-hammer-desc = Легендарный ремейк резинового молота, но сделан он из пластали. БОНЬК! uplink-necronomicon-name = Некрономикон uplink-necronomicon-desc = Нечестивая книга, позволяющая призвать демонического фамильяра. uplink-holy-hand-grenade-name = Святая ручная граната diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 3c270f685b85..64a7b07bc3b3 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1853,19 +1853,4 @@ - !type:BuyerWhitelistCondition blacklist: components: - - SurplusBundle - -- type: listing - id: uplinkPlasteelHammer - name: uplink-plasteel-hammer-name - description: uplink-plasteel-hammer-desc - productEntity: PlasteelHammer - cost: - Telecrystal: 6 - categories: - - UplinkJob - conditions: - - !type:BuyerJobCondition - whitelist: - - Clown - \ No newline at end of file + - SurplusBundle \ No newline at end of file diff --git a/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml b/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml index 04876086f1e5..7d0e8f555792 100644 --- a/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Starshine/Catalog/uplink_catalog.yml @@ -113,7 +113,19 @@ categories: - UplinkWearables - +- type: listing + id: uplinkPlasteelHammer + name: uplink-plasteel-hammer-name + description: uplink-plasteel-hammer-desc + productEntity: PlasteelHammer + cost: + Telecrystal: 6 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Clown #- type: listing # id: UplinkSyndicateMauler From a5a3c33aa7b467d4a91d7025aad8de0226306a60 Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Mon, 8 Jul 2024 19:44:07 +0300 Subject: [PATCH 12/18] last update --- .../Graphs/fun/Toy_Energy_Shield.yml | 19 +++++++++++++++++++ .../Prototypes/Recipes/Construction/fun.yml | 12 ++++++++++++ .../Starshine/Entities/Objects/Fun/toys.yml | 3 +++ 3 files changed, 34 insertions(+) create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml b/Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml new file mode 100644 index 000000000000..b1f5cbb8f784 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml @@ -0,0 +1,19 @@ +- type: constructionGraph + id: Toy_Energy_Shield + start: start + graph: + - node: start + edges: + - to: Quiver + steps: + - material: Cable + amount: 2 + doAfter: 1 + - material: Cloth + amount: 5 + doAfter: 2 + - material: WoodPlank + amount: 1 + doAfter: 2 + - node: Toy_Energy_Shield + entity: ToyEnergyShield \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Construction/fun.yml b/Resources/Prototypes/Recipes/Construction/fun.yml index 46d43e73729c..d9d452a3251f 100644 --- a/Resources/Prototypes/Recipes/Construction/fun.yml +++ b/Resources/Prototypes/Recipes/Construction/fun.yml @@ -8,3 +8,15 @@ description: An air horn made from bananium. icon: { sprite: Objects/Fun/bananiumhorn.rsi, state: icon } objectType: Item + +- type: construction + name: toy energy shield + id: ToyEnergyShield + graph: Toy_Energy_Shield + startNode: start + targetNode: Toy_Energy_Shield + category: construction-category-weapons + description: New Sandy-Cat plastic energy shield! Comes with realistic sound and full color! Looks almost like the real thing! + icon: { sprite: Objects/Weapons/Melee/e_shield.rsi, state: eshield-on } + objectType: Item + diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml index 0e02cb70cba9..a1c01a6cd67c 100644 --- a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml @@ -152,6 +152,9 @@ - type: Appearance - type: Damageable damageContainer: Shield + - type: Construction + graph: Toy_Energy_Shield + node: Toy_Energy_Shield - type: Destructible thresholds: - trigger: From b7dc9b7703294daae25a75494d26e052b42b4d35 Mon Sep 17 00:00:00 2001 From: LAstronautL Date: Mon, 8 Jul 2024 19:45:05 +0300 Subject: [PATCH 13/18] Revert "last update" This reverts commit a5a3c33aa7b467d4a91d7025aad8de0226306a60. --- .../Graphs/fun/Toy_Energy_Shield.yml | 19 ------------------- .../Prototypes/Recipes/Construction/fun.yml | 12 ------------ .../Starshine/Entities/Objects/Fun/toys.yml | 3 --- 3 files changed, 34 deletions(-) delete mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml b/Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml deleted file mode 100644 index b1f5cbb8f784..000000000000 --- a/Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: constructionGraph - id: Toy_Energy_Shield - start: start - graph: - - node: start - edges: - - to: Quiver - steps: - - material: Cable - amount: 2 - doAfter: 1 - - material: Cloth - amount: 5 - doAfter: 2 - - material: WoodPlank - amount: 1 - doAfter: 2 - - node: Toy_Energy_Shield - entity: ToyEnergyShield \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Construction/fun.yml b/Resources/Prototypes/Recipes/Construction/fun.yml index d9d452a3251f..46d43e73729c 100644 --- a/Resources/Prototypes/Recipes/Construction/fun.yml +++ b/Resources/Prototypes/Recipes/Construction/fun.yml @@ -8,15 +8,3 @@ description: An air horn made from bananium. icon: { sprite: Objects/Fun/bananiumhorn.rsi, state: icon } objectType: Item - -- type: construction - name: toy energy shield - id: ToyEnergyShield - graph: Toy_Energy_Shield - startNode: start - targetNode: Toy_Energy_Shield - category: construction-category-weapons - description: New Sandy-Cat plastic energy shield! Comes with realistic sound and full color! Looks almost like the real thing! - icon: { sprite: Objects/Weapons/Melee/e_shield.rsi, state: eshield-on } - objectType: Item - diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml index a1c01a6cd67c..0e02cb70cba9 100644 --- a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml @@ -152,9 +152,6 @@ - type: Appearance - type: Damageable damageContainer: Shield - - type: Construction - graph: Toy_Energy_Shield - node: Toy_Energy_Shield - type: Destructible thresholds: - trigger: From 8ca16ea8299364454a23748ba2e49383ee740722 Mon Sep 17 00:00:00 2001 From: As Date: Tue, 9 Jul 2024 13:03:37 +0300 Subject: [PATCH 14/18] Revert "Revert "last update"" This reverts commit b7dc9b7703294daae25a75494d26e052b42b4d35. --- .../Graphs/fun/Toy_Energy_Shield.yml | 19 +++++++++++++++++++ .../Prototypes/Recipes/Construction/fun.yml | 12 ++++++++++++ .../Starshine/Entities/Objects/Fun/toys.yml | 3 +++ 3 files changed, 34 insertions(+) create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml b/Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml new file mode 100644 index 000000000000..a1e11dffb3c6 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml @@ -0,0 +1,19 @@ +- type: constructionGraph + id: ToyEnergyShield + start: start + graph: + - node: start + edges: + - to: ToyEnergyShield + steps: + - material: Cable + amount: 2 + doAfter: 1 + - material: Cloth + amount: 5 + doAfter: 2 + - material: WoodPlank + amount: 1 + doAfter: 2 + - node: ToyEnergyShield + entity: ToyEnergyShield diff --git a/Resources/Prototypes/Recipes/Construction/fun.yml b/Resources/Prototypes/Recipes/Construction/fun.yml index 46d43e73729c..d832a6d35597 100644 --- a/Resources/Prototypes/Recipes/Construction/fun.yml +++ b/Resources/Prototypes/Recipes/Construction/fun.yml @@ -8,3 +8,15 @@ description: An air horn made from bananium. icon: { sprite: Objects/Fun/bananiumhorn.rsi, state: icon } objectType: Item + +- type: construction + name: toy energy shield + id: ToyEnergyShield + graph: ToyEnergyShield + startNode: start + targetNode: ToyEnergyShield + category: construction-category-weapons + description: New Sandy-Cat plastic energy shield! Comes with realistic sound and full color! Looks almost like the real thing! + icon: { sprite: Objects/Weapons/Melee/e_shield.rsi, state: eshield-on } + objectType: Item + diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml index 0e02cb70cba9..c2a11149fe99 100644 --- a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml @@ -152,6 +152,9 @@ - type: Appearance - type: Damageable damageContainer: Shield + - type: Construction + graph: ToyEnergyShield + node: ToyEnergyShield - type: Destructible thresholds: - trigger: From 16ed37f5ee1bdebefa440566e63cdd9b5428ecaf Mon Sep 17 00:00:00 2001 From: Astronaut <85165800+lAstronautl@users.noreply.github.com> Date: Wed, 24 Jul 2024 21:12:11 +0300 Subject: [PATCH 15/18] revert craft --- .../Graphs/fun/Toy_Energy_Shield.yml | 19 ------------------- .../Prototypes/Recipes/Construction/fun.yml | 12 ------------ .../Starshine/Entities/Objects/Fun/toys.yml | 3 --- 3 files changed, 34 deletions(-) delete mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml b/Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml deleted file mode 100644 index a1e11dffb3c6..000000000000 --- a/Resources/Prototypes/Recipes/Construction/Graphs/fun/Toy_Energy_Shield.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: constructionGraph - id: ToyEnergyShield - start: start - graph: - - node: start - edges: - - to: ToyEnergyShield - steps: - - material: Cable - amount: 2 - doAfter: 1 - - material: Cloth - amount: 5 - doAfter: 2 - - material: WoodPlank - amount: 1 - doAfter: 2 - - node: ToyEnergyShield - entity: ToyEnergyShield diff --git a/Resources/Prototypes/Recipes/Construction/fun.yml b/Resources/Prototypes/Recipes/Construction/fun.yml index d832a6d35597..46d43e73729c 100644 --- a/Resources/Prototypes/Recipes/Construction/fun.yml +++ b/Resources/Prototypes/Recipes/Construction/fun.yml @@ -8,15 +8,3 @@ description: An air horn made from bananium. icon: { sprite: Objects/Fun/bananiumhorn.rsi, state: icon } objectType: Item - -- type: construction - name: toy energy shield - id: ToyEnergyShield - graph: ToyEnergyShield - startNode: start - targetNode: ToyEnergyShield - category: construction-category-weapons - description: New Sandy-Cat plastic energy shield! Comes with realistic sound and full color! Looks almost like the real thing! - icon: { sprite: Objects/Weapons/Melee/e_shield.rsi, state: eshield-on } - objectType: Item - diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml index c2a11149fe99..0e02cb70cba9 100644 --- a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml @@ -152,9 +152,6 @@ - type: Appearance - type: Damageable damageContainer: Shield - - type: Construction - graph: ToyEnergyShield - node: ToyEnergyShield - type: Destructible thresholds: - trigger: From 63dfab06bf0798a10769de6eaa7826f3e466c89e Mon Sep 17 00:00:00 2001 From: Astronaut <85165800+lAstronautl@users.noreply.github.com> Date: Wed, 7 Aug 2024 18:06:15 +0300 Subject: [PATCH 16/18] fix? --- Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml index 0e02cb70cba9..92dfb06ddf92 100644 --- a/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml @@ -36,8 +36,6 @@ color: white netsync: false - type: Appearance - - type: ItemToggleDisarmMalus - activatedDisarmMalus: 0.7 - type: Wieldable - type: ToggleableLightVisuals spriteLayer: blade @@ -95,8 +93,6 @@ path: /Audio/Weapons/ebladehum.ogg - type: ItemToggleSize activatedSize: Huge - - type: ItemToggleDisarmMalus - activatedDisarmMalus: 0.6 - type: Sprite sprite: Objects/Weapons/Melee/e_shield.rsi layers: From 1eb8d5640b9f4d1361acf64374ca2287eb34dac9 Mon Sep 17 00:00:00 2001 From: Astronaut <85165800+lAstronautl@users.noreply.github.com> Date: Wed, 7 Aug 2024 19:52:53 +0300 Subject: [PATCH 17/18] lokale --- Resources/Locale/ru-RU/starshine/fun/toys.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/starshine/fun/toys.ftl b/Resources/Locale/ru-RU/starshine/fun/toys.ftl index 347b4221a540..23da0eca2b5b 100644 --- a/Resources/Locale/ru-RU/starshine/fun/toys.ftl +++ b/Resources/Locale/ru-RU/starshine/fun/toys.ftl @@ -3,5 +3,5 @@ ent-ToyEnergyShield = игрушечный щит .desc = Совершено новый щит версии "Sind V2" от Sandy-Cat! Отражает все выстрелы с игрушечной лазерной винтовки! Почти как настоящий! ent-PlasteelHammer = резиновый молоток - .desc = Такое чуство, что резиновый молоток на самом деле не резиновый..... + .desc = Этот молоток слишком тяжёлый, он точно резиновый? .suffix = Пластановый From 0ac6ce9311b162b7a7b94f5259be6b3b7ae0f456 Mon Sep 17 00:00:00 2001 From: Astronaut <85165800+lAstronautl@users.noreply.github.com> Date: Thu, 8 Aug 2024 12:06:52 +0300 Subject: [PATCH 18/18] uh --- Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl index 4aeb7dcd5ff0..a4b28c6e8976 100644 --- a/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl @@ -24,4 +24,4 @@ uplink-clothing-pnv-desc = Прибор ночного видения. uplink-m90gl-bundle-name = Набор m90-gl uplink-m90gl-bundle-desc = Старая винтовка типа булпап. И нет, подствольник не настоящий. uplink-plasteel-hammer-name = Пластановый молот -uplink-plasteel-hammer-desc = Легендарный ремейк резинового молота, но сделан он из пластали. БОНЬК! \ No newline at end of file +uplink-plasteel-hammer-desc = Легендарный ремейк резинового молота, но сделан он из пластали. БОНЬК!