Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Adds some extra toys to the arcade machine (#10637)

Browse Source
This commit is contained in:
Flipp Syder
2022-08-16 02:57:39 -07:00
committed by GitHub
parent ed8414c800
commit 0396f8eb9d
9 changed files with 85 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
View File

@@ -8,6 +8,8 @@ using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
// TODO: ECS.
namespace Content.Server.Arcade.Components
{
[RegisterComponent]
@@ -54,7 +56,11 @@ namespace Content.Server.Arcade.Components
{
"ToyMouse", "ToyAi", "ToyNuke", "ToyAssistant", "ToyGriffin", "ToyHonk", "ToyIan",
"ToyMarauder", "ToyMauler", "ToyGygax", "ToyOdysseus", "ToyOwlman", "ToyDeathRipley",
"ToyPhazon", "ToyFireRipley", "ToyReticence", "ToyRipley", "ToySeraph", "ToyDurand", "ToySkeleton"
"ToyPhazon", "ToyFireRipley", "ToyReticence", "ToyRipley", "ToySeraph", "ToyDurand", "ToySkeleton",
"FoamCrossbow", "RevolverCapGun", "PlushieLizard", "PlushieSpaceLizard",
"PlushieNuke", "PlushieCarp", "PlushieRatvar", "PlushieNar", "PlushieSnake", "Basketball", "Football",
"PlushieRouny", "PlushieBee", "PlushieSlime", "BalloonCorgi", "ToySword", "CrayonBox", "BoxDonkSoftBox", "BoxCartridgeCap",
"HarmonicaInstrument", "OcarinaInstrument", "RecorderInstrument", "GunpetInstrument", "BirdToyInstrument"
};
protected override void Initialize()

9
Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs
View File

@@ -12,6 +12,9 @@ namespace Content.Server.Weapon.Melee.EnergySword
public bool Activated = false;
[DataField("isSharp")]
public bool IsSharp = true;
/// <summary>
/// RGB cycle rate for hacked e-swords.
/// </summary>
@@ -40,10 +43,10 @@ namespace Content.Server.Weapon.Melee.EnergySword
Color.MediumOrchid
};
[DataField("litDamageBonus", required: true)]
public DamageSpecifier LitDamageBonus = default!;
[DataField("litDamageBonus")]
public DamageSpecifier LitDamageBonus = new();
[DataField("litDisarmMalus", required: true)]
[DataField("litDisarmMalus")]
public float litDisarmMalus = 0.6f;
}
}

6
Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs
View File

@@ -80,7 +80,8 @@ namespace Content.Server.Weapon.Melee.EnergySword
if(TryComp<MeleeWeaponComponent>(comp.Owner, out var weaponComp))
weaponComp.HitSound = comp.OnHitOff;
RemComp<SharpComponent>(comp.Owner);
if (comp.IsSharp)
RemComp<SharpComponent>(comp.Owner);
SoundSystem.Play(comp.DeActivateSound.GetSound(), Filter.Pvs(comp.Owner, entityManager: EntityManager), comp.Owner);
@@ -97,7 +98,8 @@ namespace Content.Server.Weapon.Melee.EnergySword
_item.SetSize(comp.Owner, 9999, item);
}
EnsureComp<SharpComponent>(comp.Owner);
if (comp.IsSharp)
EnsureComp<SharpComponent>(comp.Owner);
if(TryComp<MeleeWeaponComponent>(comp.Owner, out var weaponComp))
weaponComp.HitSound = comp.OnHitOn;