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..23da0eca2b5b --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/fun/toys.ftl @@ -0,0 +1,7 @@ +ent-ToyEnergySwordDouble = игрушечный двойной меч + .desc = Новый пластиковый двойной меч от Sandy-Cat! Имеет реалистичный звук и почти отражает все пули! Вжух! +ent-ToyEnergyShield = игрушечный щит + .desc = Совершено новый щит версии "Sind V2" от Sandy-Cat! Отражает все выстрелы с игрушечной лазерной винтовки! Почти как настоящий! +ent-PlasteelHammer = резиновый молоток + .desc = Этот молоток слишком тяжёлый, он точно резиновый? + .suffix = Пластановый diff --git a/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/starshine/store/uplink-catalog.ftl index e9b63869c53f..a4b28c6e8976 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 = Легендарный ремейк резинового молота, но сделан он из пластали. БОНЬК! diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index 04dc0b4fdd90..8d80376e7ca4 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 = Питон 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/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 5cb2e4bccddc..64a7b07bc3b3 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1853,4 +1853,4 @@ - !type:BuyerWhitelistCondition blacklist: components: - - SurplusBundle + - SurplusBundle \ No newline at end of file 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/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 65d2e4a0452e..d04457151c73 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -372,6 +372,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/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 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 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..92dfb06ddf92 --- /dev/null +++ b/Resources/Prototypes/Starshine/Entities/Objects/Fun/toys.yml @@ -0,0 +1,209 @@ +- type: entity + parent: BaseItem + id: ToyEnergySwordDouble + name: toy double-bladed energy sword + 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: + - 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: 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: 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 + passiveBlockModifier: + coefficients: + Blunt: 1.0 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.6 + activeBlockModifier: + coefficients: + Blunt: 1.2 + Slash: 0.85 + Piercing: 0.5 + Heat: 0.4 + flatReductions: + Heat: 0.01 + Piercing: 0.01 + - type: Appearance + - type: Damageable + damageContainer: Shield + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 18 + 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 + +- 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