diff --git a/Content.Shared/Clothing/SharedMagbootsComponent.cs b/Content.Shared/Clothing/SharedMagbootsComponent.cs index 16ba948abb..3c0eee1885 100644 --- a/Content.Shared/Clothing/SharedMagbootsComponent.cs +++ b/Content.Shared/Clothing/SharedMagbootsComponent.cs @@ -5,6 +5,8 @@ using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; using Robust.Shared.Serialization; +using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.ViewVariables; namespace Content.Shared.Clothing { @@ -23,9 +25,15 @@ namespace Content.Shared.Clothing EntitySystem.Get().RefreshMovementSpeedModifiers(container.Owner); } } + [DataField("walkMoveCoeffecient", required: true)] + [ViewVariables(VVAccess.ReadWrite)] + public float WalkMoveCoeffecient = 0.85f; - public float WalkSpeedModifier => On ? 0.85f : 1; - public float SprintSpeedModifier => On ? 0.65f : 1; + [DataField("sprintMoveCoeffecient", required: true)] + [ViewVariables(VVAccess.ReadWrite)] + public float SprintMoveCoeffecient = 0.65f; + public float WalkSpeedModifier => On ? WalkMoveCoeffecient : 1; + public float SprintSpeedModifier => On ? SprintMoveCoeffecient : 1; [Serializable, NetSerializable] public sealed class MagbootsComponentState : ComponentState diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 58f5197904..c138eb716c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -110,7 +110,7 @@ - id: ClothingEyesGlassesMeson - id: ClothingBeltChiefEngineerFilled - id: ClothingHeadHatBeretEngineering - - id: ClothingShoesBootsMag + - id: ClothingShoesBootsMagAdv - id: ClothingHandsGlovesColorYellow - id: CigarCase prob: 0.15 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 11a647d703..e0e0ddd562 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -13,3 +13,18 @@ - type: ItemActions actions: - actionType: ToggleMagboots + +- type: entity + parent: ClothingShoesBootsMag + id: ClothingShoesBootsMagAdv + name: advanced magboots + description: State-of-the-art magnetic boots that do not slow down their wearer. + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/magboots-advanced.rsi + state: icon + - type: Clothing + sprite: Clothing/Shoes/Boots/magboots-advanced.rsi + - type: Magboots + walkMoveCoeffecient: 1 + sprintMoveCoeffecient: 1 diff --git a/Resources/Prototypes/Objectives/traitorObjectives..yml b/Resources/Prototypes/Objectives/traitorObjectives..yml index ce788a3e07..0a9a901c9c 100644 --- a/Resources/Prototypes/Objectives/traitorObjectives..yml +++ b/Resources/Prototypes/Objectives/traitorObjectives..yml @@ -110,9 +110,9 @@ prototype: IDComputerCircuitboard - type: objective - id: MagbootsStealObjective #Replace this with CE magboots when we get those + id: MagbootsStealObjective issuer: syndicate - difficultyOverride: 1.75 + difficultyOverride: 2.75 requirements: - !type:TraitorRequirement {} - !type:IncompatibleConditionsRequirement @@ -120,7 +120,7 @@ - DieCondition conditions: - !type:StealCondition - prototype: ClothingShoesBootsMag + prototype: ClothingShoesBootsMagAdv - type: objective id: SupplyConsoleBoardStealObjective diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png new file mode 100644 index 0000000000..48fc736462 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png new file mode 100644 index 0000000000..81c024c2da Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon.png new file mode 100644 index 0000000000..ed83a21a61 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/inhand-left.png new file mode 100644 index 0000000000..758f9af214 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/inhand-right.png new file mode 100644 index 0000000000..73408854d2 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json new file mode 100644 index 0000000000..8d56bf0c2b --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/commit/3d319f6157acc1c1cd9ebcb0f6f12641e051cf91", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "on-equipped-FEET", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-on" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET.png new file mode 100644 index 0000000000..03bed4bbc9 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-inhand-left.png new file mode 100644 index 0000000000..d942e801c8 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-inhand-right.png new file mode 100644 index 0000000000..d208b01083 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-inhand-right.png differ