juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Birch tree (#1154)

Browse Source 
* birch

* wooden birch log and planks

* birch tile crafting

* add birch to worldgen

* Update grasslands.yml

* wooden planks (any)

* universal wood crafting

* birch wall
This commit is contained in:
Ed
2025-04-09 15:54:38 +03:00
committed by GitHub
parent d201dc0695
commit 0decd375e4
95 changed files with 1062 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Content.Server/Construction/ConstructionSystem.Initial.cs
View File

@@ -2,6 +2,7 @@ using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Content.Server.Construction.Components;
using Content.Shared._CP14.Workbench.Prototypes;
using Content.Shared.ActionBlocker;
using Content.Shared.Construction;
using Content.Shared.Construction.Prototypes;
@@ -236,6 +237,36 @@ namespace Content.Server.Construction
}
break;
//CP14 stack group support
case CP14StackGroupConstructionGraphStep stackGroupStep:
foreach (var entity in new HashSet<EntityUid>(EnumerateNearby(user)))
{
if (!stackGroupStep.EntityValid(entity, out var stack))
continue;
if (used.Contains(entity))
continue;
var splitStack = _stackSystem.Split(entity, stackGroupStep.Amount, user.ToCoordinates(0, 0), stack);
if (splitStack == null)
continue;
if (string.IsNullOrEmpty(stackGroupStep.Store))
{
if (!_container.Insert(splitStack.Value, container))
continue;
}
else if (!_container.Insert(splitStack.Value, GetContainer(stackGroupStep.Store)))
continue;
handled = true;
break;
}
break;
//CP14 stack group support end
}
if (handled == false)

4
Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs
View File

@@ -97,13 +97,13 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem
foreach (var req in recipe.Requirements)
{
req.PostCraft(EntityManager, placedEntities, args.User);
req.PostCraft(EntityManager, _proto, placedEntities, args.User);
}
//We teleport result to workbench AFTER craft.
foreach (var resultEntity in resultEntities)
{
_transform.SetCoordinates(resultEntity, Transform(ent).Coordinates.Offset(new Vector2(_random.NextFloat(-0.5f, 0.5f), _random.NextFloat(-0.5f, 0.5f))));
_transform.SetCoordinates(resultEntity, Transform(ent).Coordinates.Offset(new Vector2(_random.NextFloat(-0.25f, 0.25f), _random.NextFloat(-0.25f, 0.25f))));
}
UpdateUIRecipes(ent, args.User);