tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Salvage mining, ore processing, and material clean-up (#7406)

Browse Source 
* adding stuff cuz new computer

* removed unused materials

* remove unused materials and such, lathe things

* material volume no longer hardcoded

* fixed mining system

* add 5 stacks of materials, and add them to the ore processor

* fix copyright for ores and handdrill

* comma momma

* whyyyyy

* more fixes to make the yaml linter happy

* i should get my eyes checked

* silver proper

* more cleanup

* leftovers

* remove more references to material doors

* couldn't bear to be without bearhide

* added uranium, added more lathe recipes

* copyright fix, stack fix

* ore processor sprite and such

* ore processing some binches

* MaterialCotton removal

* 1 uranium ore means 1 sheet

* fix merge conflict? idk

* time to ketchup

* lathe recognizes material volume again

* yaml cleanup

* forgot to remove adamantine lol

* re-added diamond for now

* diamond stacks

* functional ore processor

* added ignoreColor to lathe visuals

* ore processor machine board

* add board to industrial tech and circuit printer

* provided lathes their whitelists

* fix wonky ore spawning, added insert sound to lathe, adjusted ore chance

* re-added ore processor

* typos and cleanup

* Update Content.Client/Lathe/LatheSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Lathe/LatheSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* revert mapchange

* VV ignorecolor, pass entitymanager, move canceltoken to pickaxe, removed foreach from orespawn

* actually null canceltoken

* remove five-stacks, ore processor produces full stacks or single sheets/ingots

* VV proper

* adjust ore chances

* readd Cotton

* Update Content.Server/Mining/MineableSystem.cs

* tweaks

* Material is now dict (material, volume)

* removed unused property

* Space crystal -> space quartz

* forgor asteroid space quartz

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Chris V
2022-04-28 03:41:04 -07:00
committed by GitHub
parent 59f0ad5596
commit 94a0bc92b7
64 changed files with 707 additions and 1153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Content.Server/Mining/MineableSystem.cs
View File

@@ -1,11 +1,12 @@
using Content.Server.DoAfter;
using System.Threading;
using Content.Server.DoAfter;
using Content.Server.Mining.Components;
using Content.Shared.Damage;
using Content.Shared.Interaction;
using Content.Shared.Storage;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Player;
using Robust.Shared.Random;
namespace Content.Server.Mining;
@@ -13,6 +14,7 @@ public sealed class MineableSystem : EntitySystem
{
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly IRobustRandom _random = null!;
public override void Initialize()
{
@@ -20,7 +22,7 @@ public sealed class MineableSystem : EntitySystem
SubscribeLocalEvent<MineableComponent, InteractUsingEvent>(OnInteractUsing);
SubscribeLocalEvent<MiningDoafterCancel>(OnDoafterCancel);
SubscribeLocalEvent<MiningDoafterSuccess>(OnDoafterSuccess);
SubscribeLocalEvent<MineableComponent, MiningDoafterSuccess>(OnDoafterSuccess);
}
private void OnInteractUsing(EntityUid uid, MineableComponent component, InteractUsingEvent args)
@@ -28,45 +30,63 @@ public sealed class MineableSystem : EntitySystem
if (!TryComp<PickaxeComponent>(args.Used, out var pickaxe))
return;
if (pickaxe.MiningEntities.TryGetValue(uid, out var cancelToken))
{
cancelToken.Cancel();
pickaxe.MiningEntities.Remove(uid);
return;
}
// Can't mine too many entities at once.
if (pickaxe.MaxMiningEntities < pickaxe.MiningEntities.Count + 1)
return;
// Can't mine one object multiple times.
if (!pickaxe.MiningEntities.Add(uid))
return;
cancelToken = new CancellationTokenSource();
pickaxe.MiningEntities[uid] = cancelToken;
var doAfter = new DoAfterEventArgs(args.User, component.BaseMineTime * pickaxe.MiningTimeMultiplier, default, uid)
var doAfter = new DoAfterEventArgs(args.User, component.BaseMineTime * pickaxe.MiningTimeMultiplier, cancelToken.Token, uid)
{
BreakOnDamage = true,
BreakOnStun = true,
BreakOnTargetMove = true,
BreakOnUserMove = true,
MovementThreshold = 0.5f,
BroadcastCancelledEvent = new MiningDoafterCancel() { Pickaxe = args.Used, Rock = uid },
BroadcastFinishedEvent = new MiningDoafterSuccess() { Pickaxe = args.Used, Rock = uid }
MovementThreshold = 0.25f,
BroadcastCancelledEvent = new MiningDoafterCancel { Pickaxe = args.Used, Rock = uid },
TargetFinishedEvent = new MiningDoafterSuccess { Pickaxe = args.Used, Rock = uid, Player = args.User }
};
_doAfterSystem.DoAfter(doAfter);
}
private void OnDoafterSuccess(MiningDoafterSuccess ev)
private void OnDoafterSuccess(EntityUid uid, MineableComponent component, MiningDoafterSuccess ev)
{
if (!TryComp(ev.Pickaxe, out PickaxeComponent? pickaxe))
return;
_damageableSystem.TryChangeDamage(ev.Rock, pickaxe.Damage);
SoundSystem.Play(Filter.Pvs(ev.Rock), pickaxe.MiningSound.GetSound(), ev.Rock, AudioParams.Default);
SoundSystem.Play(Filter.Pvs(ev.Rock, entityManager: EntityManager), pickaxe.MiningSound.GetSound(), ev.Rock);
pickaxe.MiningEntities.Remove(ev.Rock);
var spawnOre = EntitySpawnCollection.GetSpawns(component.Ores, _random);
var playerPos = Transform(ev.Player).MapPosition;
var spawnPos = playerPos.Offset(_random.NextVector2(0.3f));
EntityManager.SpawnEntity(spawnOre[0], spawnPos);
pickaxe.MiningEntities.Remove(uid);
}
private void OnDoafterCancel(MiningDoafterCancel ev)
{
if (!TryComp(ev.Pickaxe, out PickaxeComponent? pickaxe))
if (!TryComp<PickaxeComponent>(ev.Pickaxe, out var pickaxe))
return;
pickaxe.MiningEntities.Remove(ev.Rock);
}
private sealed class MiningDoafterCancel : EntityEventArgs
{
public EntityUid Pickaxe;
public EntityUid Rock;
}
}
// grumble grumble
@@ -74,10 +94,6 @@ public sealed class MiningDoafterSuccess : EntityEventArgs
{
public EntityUid Pickaxe;
public EntityUid Rock;
public EntityUid Player;
}
public sealed class MiningDoafterCancel : EntityEventArgs
{
public EntityUid Pickaxe;
public EntityUid Rock;
}