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

Toolboxes Update (#985)

Browse Source
This commit is contained in:
Swept
2020-05-24 16:56:19 +00:00
committed by GitHub
parent 78a9cc640a
commit 67143b1371
42 changed files with 581 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/EntryPoint.cs
View File

@@ -68,6 +68,9 @@ namespace Content.Client
"Explosive",
"OnUseTimerTrigger",
"ToolboxElectricalFill",
"ToolboxEmergencyFill",
"WarpPoint",
"ToolboxGoldFill",
"ToolLockerFill",
"EmitSoundOnUse",
"FootstepModifier",

10
Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using Content.Shared.GameObjects.Components.Power;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
@@ -16,6 +16,7 @@ namespace Content.Client.GameObjects.Components.Power
private Animation _buildingAnimation;
private Animation _insertingMetalAnimation;
private Animation _insertingGlassAnimation;
private Animation _insertingGoldAnimation;
public override void LoadData(YamlMappingNode node)
{
@@ -24,6 +25,7 @@ namespace Content.Client.GameObjects.Components.Power
_buildingAnimation = PopulateAnimation("autolathe_building", "autolathe_building_unlit", 0.5f);
_insertingMetalAnimation = PopulateAnimation("autolathe_inserting_metal_plate", "autolathe_inserting_unlit", 0.9f);
_insertingGlassAnimation = PopulateAnimation("autolathe_inserting_glass_plate", "autolathe_inserting_unlit", 0.9f);
_insertingGoldAnimation = PopulateAnimation("autolathe_inserting_gold_plate", "autolathe_inserting_unlit", 0.9f);
}
private Animation PopulateAnimation(string sprite, string spriteUnlit, float length)
@@ -91,6 +93,12 @@ namespace Content.Client.GameObjects.Components.Power
animPlayer.Play(_insertingGlassAnimation, AnimationKey);
}
break;
case LatheVisualState.InsertingGold:
if (!animPlayer.HasRunningAnimation(AnimationKey))
{
animPlayer.Play(_insertingGoldAnimation, AnimationKey);
}
break;
default:
throw new ArgumentOutOfRangeException();
}

10
Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using Content.Shared.GameObjects.Components.Power;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
@@ -16,6 +16,7 @@ namespace Content.Client.GameObjects.Components.Power
private Animation _buildingAnimation;
private Animation _insertingMetalAnimation;
private Animation _insertingGlassAnimation;
private Animation _insertingGoldAnimation;
public override void LoadData(YamlMappingNode node)
{
@@ -24,6 +25,7 @@ namespace Content.Client.GameObjects.Components.Power
_buildingAnimation = PopulateAnimation("protolathe_building", 0.9f);
_insertingMetalAnimation = PopulateAnimation("protolathe_metal", 0.9f);
_insertingGlassAnimation = PopulateAnimation("protolathe_glass", 0.9f);
_insertingGoldAnimation = PopulateAnimation("protolathe_gold", 0.9f);
}
private Animation PopulateAnimation(string sprite, float length)
@@ -87,6 +89,12 @@ namespace Content.Client.GameObjects.Components.Power
animPlayer.Play(_insertingGlassAnimation, AnimationKey);
}
break;
case LatheVisualState.InsertingGold:
if (!animPlayer.HasRunningAnimation(AnimationKey))
{
animPlayer.Play(_insertingGoldAnimation, AnimationKey);
}
break;
default:
throw new ArgumentOutOfRangeException();
}