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

Ru Alchemy playtest bugfixes (#188)

Browse Source 
* Update chromium_inverse.yml

* bufixes

* mortar fix

* fuel fix
This commit is contained in:
Ed
2024-05-30 13:22:25 +03:00
committed by GitHub
parent f0fa3af1ab
commit 70a1856736
11 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs
View File

@@ -102,7 +102,7 @@ public sealed class SolutionHeaterSystem : EntitySystem
foreach (var heatingEntity in placer.PlacedEntities)
{
if (!flammable.OnFire)
return;
continue;
if (!TryComp<SolutionContainerManagerComponent>(heatingEntity, out var container))
continue;

2
Content.Server/_CP14/Temperature/Fireplace/CP14FireplaceComponent.cs
View File

@@ -28,7 +28,7 @@ public sealed partial class CP14FireplaceComponent : Component
/// current fuel quantity
/// </summary>
[DataField]
public float CurrentFuel = 10f;
public float Fuel = 10f;
/// <summary>
/// how much fuel is wasted every "UpdateFrequency"

14
Content.Server/_CP14/Temperature/Fireplace/CP14FireplaceSystem.cs
View File

@@ -41,7 +41,9 @@ public sealed partial class CP14FireplaceSystem : EntitySystem
private bool TryFoundFuelInStorage(Entity<CP14FireplaceComponent> fireplace, out Entity<FlammableComponent>? fuel)
{
fuel = null;
var container = _containerSystem.GetContainer(fireplace, fireplace.Comp.ContainerId);
if (!_containerSystem.TryGetContainer(fireplace, fireplace.Comp.ContainerId, out var container))
return false;
if (container.ContainedEntities.Count == 0)
return false;
@@ -63,7 +65,7 @@ public sealed partial class CP14FireplaceSystem : EntitySystem
if (!TryComp<FlammableComponent>(uid, out var flammable))
return;
component.CurrentFuel += fuel.Comp.CP14FireplaceFuel;
component.Fuel += fuel.Comp.CP14FireplaceFuel;
if (flammable.OnFire)
_audio.PlayPvs(component.InsertFuelSound, uid);
@@ -93,9 +95,9 @@ public sealed partial class CP14FireplaceSystem : EntitySystem
fireplace.NextUpdateTime = _timing.CurTime + fireplace.UpdateFrequency;
if (fireplace.CurrentFuel >= fireplace.FuelDrainingPerUpdate)
if (fireplace.Fuel >= fireplace.FuelDrainingPerUpdate)
{
fireplace.CurrentFuel -= fireplace.FuelDrainingPerUpdate;
fireplace.Fuel -= fireplace.FuelDrainingPerUpdate;
UpdateAppearance(uid, fireplace);
flammable.FirestackFade = fireplace.FireFadeDelta;
}
@@ -114,13 +116,13 @@ public sealed partial class CP14FireplaceSystem : EntitySystem
if (!Resolve(uid, ref fireplace, ref appearance))
return;
if (fireplace.CurrentFuel < fireplace.FuelDrainingPerUpdate)
if (fireplace.Fuel < fireplace.FuelDrainingPerUpdate)
{
_appearance.SetData(uid, FireplaceFuelVisuals.Status, FireplaceFuelStatus.Empty, appearance);
return;
}
if (fireplace.CurrentFuel < fireplace.MaxFuelLimit / 2)
if (fireplace.Fuel < fireplace.MaxFuelLimit / 2)
_appearance.SetData(uid, FireplaceFuelVisuals.Status, FireplaceFuelStatus.Medium, appearance);
else
_appearance.SetData(uid, FireplaceFuelVisuals.Status, FireplaceFuelStatus.Full, appearance);

4
Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
View File

@@ -351,8 +351,10 @@ public abstract class SharedStorageSystem : EntitySystem
if (HasComp<PlaceableSurfaceComponent>(uid))
return;
if (HasComp<SolutionContainerManagerComponent>(uid) && !storageComp.CP14CanStorageSolutionManagers) //CP14 bandage
if (storageComp.CP14Ignorelist != null && storageComp.CP14Ignorelist.IsValid(args.Used))
{
return;
}
PlayerInsertHeldEntity(uid, args.User, storageComp);
// Always handle it, even if insertion fails.

7
Content.Shared/Storage/StorageComponent.cs
View File

@@ -123,13 +123,12 @@ namespace Content.Shared.Storage
[DataField, ViewVariables(VVAccess.ReadWrite)]
public StorageDefaultOrientation? DefaultStorageOrientation;
/// <summary>
/// CrystallPunk bandage. We need to put in both objects and liquids.
/// This avoids situations where a player puts a bucket into the cauldron
/// instead of pouring liquid from the bucket into the cauldron.
/// these items will be interrupted as early as the attempted interaction stage. Allows you to use some tools
/// </summary>
[DataField]
public bool CP14CanStorageSolutionManagers = true;
public EntityWhitelist? CP14Ignorelist;
[Serializable, NetSerializable]
public enum StorageUiKey : byte

9
Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml
View File

@@ -74,6 +74,9 @@
description: A device for conveniently grinding various materials into liquid
parent: BaseItem
components:
- type: Tag
tags:
- CP14Pestle
- type: Item
size: Tiny
- type: Sprite
@@ -138,7 +141,11 @@
fillBaseName: liq-
- type: Storage
maxItemSize: Normal
cP14CanStorageSolutionManagers: false
cP14Ignorelist:
components:
- Injector
tags:
- CP14Pestle
whitelist:
tags:
- CP14FitInMortar

4
Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_torch.yml
View File

@@ -54,8 +54,8 @@
types:
Heat: 0
- type: CP14Fireplace
maxFuelLimit: 150
currentFuel: 150
maxFuelLimit: 200
fuel: 200
- type: FireVisuals
sprite: _CP14/Structures/Furniture/wallmount_torch.rsi
normalState: fire

2
Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml
View File

@@ -65,7 +65,7 @@
suffix: DEBUG
components:
- type: CP14Fireplace
currentFuel: 100
fuel: 100
fuelDrainingPerUpdate: 0
- type: entity

4
Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml
View File

@@ -74,8 +74,8 @@
CP14BloodGrassSap:
amount: 0.5
products:
CP14BasicEffectEmpty: 0.5
CP14BasicEffectSatiateHunger: 0.25
CP14BasicEffectEmpty: 0.25
CP14BasicEffectSatiateHunger: 0.5
CP14BasicEffectHealBrute: 0.25
effects:
- !type:CP14AffectSolutionTemperature

18
Resources/Prototypes/_CP14/Recipes/Reactions/chromium_inverse.yml
View File

@@ -4,12 +4,12 @@
conserveEnergy: false
reactants:
CP14BasicEffectHealBrute:
amount: 1
amount: 0.5
CP14ChromiumSlime:
amount: 0.5
products:
CP14BasicEffectDamageBrute: 0.3
CP14BasicEffectEmpty: 0.2
CP14BasicEffectDamageBrute: 0.5
CP14BasicEffectEmpty: 0.5
effects:
- !type:CP14AffectSolutionTemperature
addTemperature: -350
@@ -24,8 +24,8 @@
CP14ChromiumSlime:
amount: 0.5
products:
CP14BasicEffectHealBrute: 0.3
CP14BasicEffectEmpty: 0.2
CP14BasicEffectHealBrute: 0.5
CP14BasicEffectEmpty: 0.5
effects:
- !type:CP14AffectSolutionTemperature
addTemperature: -350
@@ -40,8 +40,8 @@
CP14ChromiumSlime:
amount: 0.5
products:
CP14BasicEffectDamagePoison: 0.3
CP14BasicEffectEmpty: 0.2
CP14BasicEffectDamagePoison: 0.5
CP14BasicEffectEmpty: 0.5
effects:
- !type:CP14AffectSolutionTemperature
addTemperature: -350
@@ -56,8 +56,8 @@
CP14ChromiumSlime:
amount: 0.5
products:
CP14BasicEffectHealPoison: 0.3
CP14BasicEffectEmpty: 0.2
CP14BasicEffectHealPoison: 0.5
CP14BasicEffectEmpty: 0.5
effects:
- !type:CP14AffectSolutionTemperature
addTemperature: -350

5
Resources/Prototypes/_CP14/tags.yml
View File

@@ -17,4 +17,7 @@
id: CP14HerbalGathering
- type: Tag
id: CP14FitInMortar
id: CP14FitInMortar
- type: Tag
id: CP14Pestle