diff --git a/Content.Client/_White/WeaponsModules/WeaponModulesVisuals.cs b/Content.Client/_White/WeaponsModules/WeaponModulesVisuals.cs index cdd8ef309d..109276264d 100644 --- a/Content.Client/_White/WeaponsModules/WeaponModulesVisuals.cs +++ b/Content.Client/_White/WeaponsModules/WeaponModulesVisuals.cs @@ -18,6 +18,7 @@ public sealed partial class WeaponModulesVisuals : VisualizerSystem(uid, ModuleVisualState.HandGuardModule, out var handguardModule, args.Component) && handguardModule.Length != 0 && handguardModule != "none") { @@ -31,6 +32,12 @@ public sealed partial class WeaponModulesVisuals : VisualizerSystem(uid, ModuleVisualState.AimModule, out var aimModule, args.Component) && aimModule.Length != 0 && aimModule != "none") + { + args.Sprite.LayerSetState(ModuleVisualState.AimModule, aimModule); + args.Sprite.LayerSetVisible(ModuleVisualState.AimModule, true); + } + if (AppearanceSystem.TryGetData(uid, Modules.Light, out var data, args.Component)) { if (TryComp(uid, out var pointLightComponent)) diff --git a/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs b/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs index 82edaec690..0540f54f80 100644 --- a/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs +++ b/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs @@ -1,4 +1,5 @@ using System.Diagnostics.CodeAnalysis; +using Content.Shared._White.Telescope; using Content.Shared._White.WeaponModules; using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Systems; @@ -11,7 +12,7 @@ public sealed class WeaponModulesSystem : EntitySystem { protected static readonly Dictionary Slots = new() { - { "handguard_module", ModuleVisualState.HandGuardModule }, { "barrel_module", ModuleVisualState.BarrelModule } + { "handguard_module", ModuleVisualState.HandGuardModule }, { "barrel_module", ModuleVisualState.BarrelModule }, { "aim_module", ModuleVisualState.AimModule } }; [Dependency] private readonly PointLightSystem _lightSystem = default!; @@ -36,6 +37,9 @@ public sealed class WeaponModulesSystem : EntitySystem SubscribeLocalEvent(AcceleratorModuleOnInsert); SubscribeLocalEvent(AcceleratorModuleOnEject); + + SubscribeLocalEvent(EightAimModuleOnInsert); + SubscribeLocalEvent(EightAimModuleOnEject); } private bool TryInsertModule(EntityUid module, EntityUid weapon, BaseModuleComponent component, @@ -154,6 +158,18 @@ public sealed class WeaponModulesSystem : EntitySystem _gunSystem.SetFireRate(weapon, component.OldFireRate + component.FireRateAdd); } + + private void EightAimModuleOnInsert(EntityUid module, AimModuleComponent component, EntGotInsertedIntoContainerMessage args) + { + EntityUid weapon = args.Container.Owner; + + if (!TryComp(weapon, out var gunComp)) return; + + if(!TryInsertModule(module, weapon, component, args.Container.ID, out var weaponModulesComponent)) + return; + + EnsureComp(weapon).Divisor = component.Divisor; + } #endregion #region EjectModules @@ -213,5 +229,15 @@ public sealed class WeaponModulesSystem : EntitySystem _gunSystem.SetFireRate(weapon, component.OldFireRate); } + + private void EightAimModuleOnEject(EntityUid module, AimModuleComponent component, EntGotRemovedFromContainerMessage args) + { + EntityUid weapon = args.Container.Owner; + + if(!TryEjectModule(module, weapon, args.Container.ID, out var weaponModulesComponent)) + return; + + RemComp(weapon); + } #endregion } diff --git a/Content.Shared/_White/WeaponModules/AimModuleComponent.cs b/Content.Shared/_White/WeaponModules/AimModuleComponent.cs new file mode 100644 index 0000000000..2421a00d58 --- /dev/null +++ b/Content.Shared/_White/WeaponModules/AimModuleComponent.cs @@ -0,0 +1,8 @@ +namespace Content.Shared._White.WeaponModules; + +[RegisterComponent] +public sealed partial class AimModuleComponent : BaseModuleComponent +{ + [ViewVariables(VVAccess.ReadWrite), DataField("divisor")] + public float Divisor = 0.3F; +} diff --git a/Content.Shared/_White/WeaponModules/BaseModuleComponent.cs b/Content.Shared/_White/WeaponModules/BaseModuleComponent.cs index 56a6f952e1..cfeae08f14 100644 --- a/Content.Shared/_White/WeaponModules/BaseModuleComponent.cs +++ b/Content.Shared/_White/WeaponModules/BaseModuleComponent.cs @@ -2,7 +2,6 @@ namespace Content.Shared._White.WeaponModules; - [RegisterComponent, NetworkedComponent] public partial class BaseModuleComponent : Component { diff --git a/Content.Shared/_White/WeaponModules/FlameHiderModuleComponent.cs b/Content.Shared/_White/WeaponModules/FlameHiderModuleComponent.cs index 94c9a9f02b..705b545e17 100644 --- a/Content.Shared/_White/WeaponModules/FlameHiderModuleComponent.cs +++ b/Content.Shared/_White/WeaponModules/FlameHiderModuleComponent.cs @@ -1,8 +1,5 @@ namespace Content.Shared._White.WeaponModules; -/// -/// This is used for... -/// [RegisterComponent] public sealed partial class FlameHiderModuleComponent : BaseModuleComponent { diff --git a/Content.Shared/_White/WeaponModules/WeaponModulesComponent.cs b/Content.Shared/_White/WeaponModules/WeaponModulesComponent.cs index 380fcb14f7..2db828cf4a 100644 --- a/Content.Shared/_White/WeaponModules/WeaponModulesComponent.cs +++ b/Content.Shared/_White/WeaponModules/WeaponModulesComponent.cs @@ -20,7 +20,8 @@ public partial class WeaponModulesComponent : Component public enum ModuleVisualState : byte { BarrelModule, - HandGuardModule + HandGuardModule, + AimModule } [Serializable, NetSerializable] diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 3ab4121740..8ab18cbcb8 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -285,6 +285,7 @@ - id: MagazinePistol - id: BoxMindshield - id: TagillaHammer + - id: EightAimModule - type: entity id: LockerFreezerVaultFilled suffix: Vault, Locked diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 080b8212db..ce6cb07e13 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -15,7 +15,6 @@ - Back - suitStorage - type: AmmoCounter - - type: WeaponModules - type: Gun fireRate: 5 selectedMode: FullAuto @@ -81,10 +80,15 @@ visible: false sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.HandGuardModule" ] + - state: aim_module + visible: false + sprite: White/Objects/Weapons/modulesOnWeapon.rsi + map: [ "enum.ModuleVisualState.AimModule" ] - type: Gun fireRate: 5 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ak.ogg + - type: WeaponModules - type: ChamberMagazineAmmoProvider soundRack: path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg @@ -122,12 +126,21 @@ whitelist: tags: - BaseBarrelModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseAimModule - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot handguard_module: !type:ContainerSlot barrel_module: !type:ContainerSlot + aim_module: !type:ContainerSlot - type: MagazineVisuals magState: mag steps: 1 @@ -201,11 +214,16 @@ visible: false sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.HandGuardModule" ] + - state: aim_module + visible: false + sprite: White/Objects/Weapons/modulesOnWeapon.rsi + map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing sprite: Objects/Weapons/Guns/Rifles/lecter.rsi - type: Gun soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + - type: WeaponModules - type: ItemSlots slots: gun_magazine: @@ -240,12 +258,21 @@ whitelist: tags: - BaseBarrelModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseAimModule - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot handguard_module: !type:ContainerSlot barrel_module: !type:ContainerSlot + aim_module: !type:ContainerSlot - type: MagazineVisuals magState: mag steps: 1 @@ -261,6 +288,7 @@ id: WeaponRifleLecterRubber suffix: Non-lethal components: + - type: WeaponModules - type: ItemSlots slots: gun_magazine: @@ -295,3 +323,11 @@ whitelist: tags: - BaseBarrelModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseAimModule diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index ab7968570a..95bb4556e0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -108,6 +108,10 @@ visible: false sprite: White/Objects/Weapons/modulesOnSMGs.rsi map: [ "enum.ModuleVisualState.HandGuardModule" ] + - state: aim_module + visible: false + sprite: White/Objects/Weapons/modulesOnSMGs.rsi + map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing sprite: Objects/Weapons/Guns/SMGs/c20r.rsi - type: Gun @@ -150,12 +154,21 @@ whitelist: tags: - BaseHandGuardModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseAimModule - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot handguard_module: !type:ContainerSlot barrel_module: !type:ContainerSlot + aim_module: !type:ContainerSlot - type: MagazineVisuals magState: mag steps: 6 @@ -186,6 +199,10 @@ visible: false sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.HandGuardModule" ] + - state: aim_module + visible: false + sprite: White/Objects/Weapons/modulesOnWeapon.rsi + map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing sprite: Objects/Weapons/Guns/SMGs/drozd.rsi - type: Gun @@ -230,12 +247,21 @@ whitelist: tags: - BaseHandGuardModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseAimModule - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot handguard_module: !type:ContainerSlot barrel_module: !type:ContainerSlot + aim_module: !type:ContainerSlot - type: MagazineVisuals magState: mag steps: 1 @@ -319,6 +345,10 @@ visible: false sprite: White/Objects/Weapons/modulesOnWeapon.rsi map: [ "enum.ModuleVisualState.HandGuardModule" ] + - state: aim_module + visible: false + sprite: White/Objects/Weapons/modulesOnWeapon.rsi + map: [ "enum.ModuleVisualState.AimModule" ] - type: Clothing sprite: Objects/Weapons/Guns/SMGs/wt550.rsi - type: ChamberMagazineAmmoProvider @@ -363,12 +393,21 @@ whitelist: tags: - BaseHandGuardModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 2 + whitelist: + tags: + - BaseAimModule - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot handguard_module: !type:ContainerSlot barrel_module: !type:ContainerSlot + aim_module: !type:ContainerSlot - type: MagazineVisuals magState: mag steps: 6 @@ -419,6 +458,14 @@ whitelist: tags: - BaseHandGuardModule + aim_module: + name: Aim Module + insertSound: /Audio/White/Gun/Modules/insertmodule.ogg + ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg + priority: 3 + whitelist: + tags: + - BaseAimModule - type: entity name: Vector diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 9036844cdf..692d097189 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -701,3 +701,12 @@ Plastic: 1000 Glass: 500 Gold: 1000 + +- type: latheRecipe + id: EightAimRecipe + result: EightAimModule + completetime: 15 + materials: + Steel: 500 + Plastic: 700 + Glass: 300 \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml index 9b08736e80..88799e627f 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml @@ -32,6 +32,23 @@ - 0,0,0,0 - type: Appearance +- type: entity + id: BaseAimModule + parent: BaseItem + abstract: true + components: + - type: Sprite + sprite: White/Objects/Weapons/modules.rsi + - type: Tag + tags: + - BaseAimModule + - type: Item + sprite: White/Objects/Weapons/modules.rsi + size: Small + shape: + - 0,0,0,0 + - type: Appearance + # modules - type: entity id: LightModule @@ -97,3 +114,16 @@ - type: Sprite state: accelerator - type: Appearance + +- type: entity + id: EightAimModule + description: 8X Aim Module for rifles. + name: "aim module" + parent: BaseAimModule + components: + - type: AimModule + value: "eightaim" + module_type: "aim_module" + - type: Sprite + state: eightaim + - type: Appearance \ No newline at end of file diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/_White/tags.yml index 74ec9443c5..3a54188103 100644 --- a/Resources/Prototypes/_White/tags.yml +++ b/Resources/Prototypes/_White/tags.yml @@ -75,3 +75,6 @@ - type: Tag id: BaseHandGuardModule + +- type: Tag + id: BaseAimModule diff --git a/Resources/Textures/White/Objects/Weapons/modules.rsi/aim_module.png b/Resources/Textures/White/Objects/Weapons/modules.rsi/aim_module.png new file mode 100644 index 0000000000..f6e4d623e4 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modules.rsi/aim_module.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modules.rsi/eightaim.png b/Resources/Textures/White/Objects/Weapons/modules.rsi/eightaim.png new file mode 100644 index 0000000000..f6e4d623e4 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modules.rsi/eightaim.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json index 9401ce0db7..30eee566b9 100644 --- a/Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json @@ -22,11 +22,17 @@ { "name": "accelerator" }, + { + "name": "eightaim" + }, { "name": "barrel_module" }, { "name": "handguard_module" + }, + { + "name": "aim_module" } ] } diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/aim_module.png b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/aim_module.png new file mode 100644 index 0000000000..a57a22c953 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/aim_module.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/eightaim.png b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/eightaim.png new file mode 100644 index 0000000000..a57a22c953 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/eightaim.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/meta.json index 78ae1a2f9f..760506a2c5 100644 --- a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/meta.json @@ -22,11 +22,17 @@ { "name": "accelerator" }, + { + "name": "eightaim" + }, { "name": "handguard_module" }, { "name": "barrel_module" + }, + { + "name": "aim_module" } ] } diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/aim_module.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/aim_module.png new file mode 100644 index 0000000000..a57a22c953 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/aim_module.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/eightaim.png b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/eightaim.png new file mode 100644 index 0000000000..a57a22c953 Binary files /dev/null and b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/eightaim.png differ diff --git a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json index f3ff9201d0..a095f38ac6 100644 --- a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json @@ -22,11 +22,17 @@ { "name": "accelerator" }, + { + "name": "eightaim" + }, { "name": "handguard_module" }, { "name": "barrel_module" + }, + { + "name": "aim_module" } ] }