Melting molds (#347)
* temp tweak * add metall bars * melting molds * add sawing molds table * sawing sounds * fix
@@ -47,21 +47,6 @@ public sealed class EntityHeaterSystem : EntitySystem
|
||||
_temperature.ChangeHeat(ent, energy);
|
||||
}
|
||||
}
|
||||
|
||||
//CrystallPunk bonfire
|
||||
var flammbaleQuery = EntityQueryEnumerator<CP14FlammableEntityHeaterComponent, ItemPlacerComponent, FlammableComponent>();
|
||||
while (flammbaleQuery.MoveNext(out var uid, out var heater, out var placer, out var flammable))
|
||||
{
|
||||
if (!flammable.OnFire)
|
||||
return;
|
||||
|
||||
var energy = flammable.FireStacks * deltaTime * heater.EnergyPerFireStack;
|
||||
foreach (var ent in placer.PlacedEntities)
|
||||
{
|
||||
_temperature.ChangeHeat(ent, energy);
|
||||
}
|
||||
}
|
||||
//CrystallPunk bonfire end
|
||||
}
|
||||
|
||||
private void OnExamined(EntityUid uid, EntityHeaterComponent comp, ExaminedEvent args)
|
||||
|
||||
@@ -9,5 +9,5 @@ namespace Content.Server._CP14.Temperature;
|
||||
public sealed partial class CP14FlammableEntityHeaterComponent : Component
|
||||
{
|
||||
[DataField]
|
||||
public float EnergyPerFireStack = 300f;
|
||||
public float DegreesPerStack = 300f;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ namespace Content.Server._CP14.Temperature;
|
||||
/// <summary>
|
||||
/// allows you to heat the temperature of solutions depending on the number of stacks of fire
|
||||
/// </summary>
|
||||
[RegisterComponent, Access(typeof(CP14SolutionTemperatureSystem))]
|
||||
[RegisterComponent, Access(typeof(CP14TemperatureSystem))]
|
||||
public sealed partial class CP14FlammableSolutionHeaterComponent : Component
|
||||
{
|
||||
[DataField]
|
||||
|
||||
@@ -3,7 +3,7 @@ namespace Content.Server._CP14.Temperature;
|
||||
/// <summary>
|
||||
/// passively returns the solution temperature to the standard
|
||||
/// </summary>
|
||||
[RegisterComponent, Access(typeof(CP14SolutionTemperatureSystem))]
|
||||
[RegisterComponent, Access(typeof(CP14TemperatureSystem))]
|
||||
public sealed partial class CP14SolutionTemperatureComponent : Component
|
||||
{
|
||||
[DataField]
|
||||
|
||||
@@ -1,34 +1,60 @@
|
||||
using Content.Server.Atmos.Components;
|
||||
using Content.Server.Chemistry.Containers.EntitySystems;
|
||||
using Content.Server.Temperature.Components;
|
||||
using Content.Server.Temperature.Systems;
|
||||
using Content.Shared.Chemistry.Components.SolutionManager;
|
||||
using Content.Shared.Chemistry.EntitySystems;
|
||||
using Content.Shared.FixedPoint;
|
||||
using Content.Shared.Placeable;
|
||||
using Robust.Shared.Timing;
|
||||
|
||||
namespace Content.Server._CP14.Temperature;
|
||||
|
||||
public sealed partial class CP14SolutionTemperatureSystem : EntitySystem
|
||||
public sealed partial class CP14TemperatureSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
|
||||
[Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
|
||||
[Dependency] private readonly IGameTiming _timing = default!;
|
||||
[Dependency] private readonly TemperatureSystem _temperature = default!;
|
||||
|
||||
private TimeSpan _updateTick = TimeSpan.FromSeconds(1f);
|
||||
private readonly TimeSpan _updateTick = TimeSpan.FromSeconds(1f);
|
||||
private TimeSpan _timeToNextUpdate = TimeSpan.Zero;
|
||||
|
||||
public override void Update(float frameTime)
|
||||
{
|
||||
base.Update(frameTime);
|
||||
|
||||
FlammableEntityHeating(frameTime);
|
||||
|
||||
if (_timing.CurTime <= _timeToNextUpdate)
|
||||
return;
|
||||
|
||||
_timeToNextUpdate = _timing.CurTime + _updateTick;
|
||||
|
||||
FlammableHeating();
|
||||
NormalizeTemperature();
|
||||
FlammableSolutionHeating();
|
||||
NormalizeSolutionTemperature();
|
||||
}
|
||||
|
||||
private void NormalizeTemperature()
|
||||
private float GetTargetTemperature(FlammableComponent flammable, CP14FlammableSolutionHeaterComponent heater)
|
||||
{
|
||||
return flammable.FireStacks * heater.DegreesPerStack;
|
||||
}
|
||||
|
||||
private void FlammableEntityHeating(float frameTime)
|
||||
{
|
||||
var flammableQuery = EntityQueryEnumerator<CP14FlammableEntityHeaterComponent, ItemPlacerComponent, FlammableComponent>();
|
||||
while (flammableQuery.MoveNext(out var uid, out var heater, out var placer, out var flammable))
|
||||
{
|
||||
if (!flammable.OnFire)
|
||||
return;
|
||||
|
||||
var energy = flammable.FireStacks * frameTime * heater.DegreesPerStack;
|
||||
foreach (var ent in placer.PlacedEntities)
|
||||
{
|
||||
_temperature.ChangeHeat(ent, energy);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void NormalizeSolutionTemperature()
|
||||
{
|
||||
var query = EntityQueryEnumerator<CP14SolutionTemperatureComponent, SolutionContainerManagerComponent>();
|
||||
while (query.MoveNext(out var uid, out var temp, out var container))
|
||||
@@ -40,7 +66,8 @@ public sealed partial class CP14SolutionTemperatureSystem : EntitySystem
|
||||
}
|
||||
}
|
||||
}
|
||||
private void FlammableHeating()
|
||||
|
||||
private void FlammableSolutionHeating()
|
||||
{
|
||||
var query =
|
||||
EntityQueryEnumerator<CP14FlammableSolutionHeaterComponent, ItemPlacerComponent, FlammableComponent>();
|
||||
@@ -54,10 +81,9 @@ public sealed partial class CP14SolutionTemperatureSystem : EntitySystem
|
||||
if (!TryComp<SolutionContainerManagerComponent>(heatingEntity, out var container))
|
||||
continue;
|
||||
|
||||
var targetT = flammable.FireStacks * heater.DegreesPerStack;
|
||||
foreach (var (_, soln) in _solutionContainer.EnumerateSolutions((heatingEntity, container)))
|
||||
{
|
||||
if (TryAffectTemp(soln.Comp.Solution.Temperature, targetT, soln.Comp.Solution.Volume, out var newT))
|
||||
if (TryAffectTemp(soln.Comp.Solution.Temperature, GetTargetTemperature(flammable, heater), soln.Comp.Solution.Volume, out var newT))
|
||||
_solutionContainer.SetTemperature(soln, newT);
|
||||
}
|
||||
}
|
||||
@@ -71,7 +97,7 @@ public sealed partial class CP14SolutionTemperatureSystem : EntitySystem
|
||||
if (mass == 0)
|
||||
return false;
|
||||
|
||||
newT = (float) (oldT + ((targetT - oldT) / mass) * power);
|
||||
newT = (float) (oldT + (targetT - oldT) / mass * power);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
using Content.Shared._CP14.Workbench.Prototypes;
|
||||
using Robust.Shared.Audio;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
namespace Content.Server._CP14.Workbench;
|
||||
@@ -12,4 +13,7 @@ public sealed partial class CP14WorkbenchComponent : Component
|
||||
|
||||
[DataField]
|
||||
public List<ProtoId<CP14WorkbenchRecipePrototype>> Recipes = new();
|
||||
|
||||
[DataField]
|
||||
public SoundSpecifier CraftSound = new SoundCollectionSpecifier("CP14Hammering");
|
||||
}
|
||||
|
||||
@@ -137,7 +137,7 @@ public sealed class CP14WorkbenchSystem : SharedCP14WorkbenchSystem
|
||||
};
|
||||
|
||||
_doAfter.TryStartDoAfter(doAfterArgs);
|
||||
_audio.PlayPvs(recipe.CraftSound, workbench);
|
||||
_audio.PlayPvs(recipe.OverrideCraftSound ?? workbench.Comp.CraftSound, workbench);
|
||||
}
|
||||
|
||||
private List<CP14WorkbenchRecipePrototype> GetPossibleCrafts(Entity<CP14WorkbenchComponent> workbench, HashSet<EntityUid> ingrediEnts)
|
||||
|
||||
@@ -18,7 +18,7 @@ public sealed partial class CP14WorkbenchRecipePrototype : IPrototype
|
||||
public TimeSpan CraftTime = TimeSpan.FromSeconds(1f);
|
||||
|
||||
[DataField]
|
||||
public SoundSpecifier CraftSound = new SoundCollectionSpecifier("CP14Hammering");
|
||||
public SoundSpecifier? OverrideCraftSound;
|
||||
|
||||
[DataField]
|
||||
public Dictionary<EntProtoId, int> Entities = new();
|
||||
|
||||
@@ -46,4 +46,9 @@
|
||||
- files: ["nailing1.ogg", "nailing2.ogg", "nailing3.ogg", "nailing4.ogg"]
|
||||
license: "CC-BY-4.0"
|
||||
copyright: 'by InspectorJ of Freesound.org. Cropped and mixed from stereo to mono.'
|
||||
source: "https://freesound.org/people/InspectorJ/sounds/406048/"
|
||||
source: "https://freesound.org/people/InspectorJ/sounds/406048/"
|
||||
|
||||
- files: ["sawing1.ogg", "sawing2.ogg", "sawing3.ogg", "sawing4.ogg", "sawing5.ogg"]
|
||||
license: "CC0-1.0"
|
||||
copyright: 'by deleted_user_7146007 of Freesound.org. Cropped and mixed from stereo to mono.'
|
||||
source: "https://freesound.org/people/deleted_user_7146007/sounds/383725/"
|
||||
BIN
Resources/Audio/_CP14/Items/sawing1.ogg
Normal file
BIN
Resources/Audio/_CP14/Items/sawing2.ogg
Normal file
BIN
Resources/Audio/_CP14/Items/sawing3.ogg
Normal file
BIN
Resources/Audio/_CP14/Items/sawing4.ogg
Normal file
BIN
Resources/Audio/_CP14/Items/sawing5.ogg
Normal file
134
Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml
Normal file
@@ -0,0 +1,134 @@
|
||||
- type: entity
|
||||
id: CP14CopperBar1
|
||||
parent: BaseItem
|
||||
name: copper bar
|
||||
suffix: 1
|
||||
description: A heavy, slightly green, piece of refined copper
|
||||
components:
|
||||
- type: Item
|
||||
size: Normal
|
||||
- type: Sprite
|
||||
sprite: _CP14/Objects/Materials/copper_bar.rsi
|
||||
layers:
|
||||
- state: bar
|
||||
map: ["base"]
|
||||
- type: Appearance
|
||||
- type: Stack
|
||||
stackType: CP14CopperBar
|
||||
count: 1
|
||||
baseLayer: base
|
||||
layerStates:
|
||||
- bar
|
||||
- bar_2
|
||||
- bar_3
|
||||
- type: Material
|
||||
- type: PhysicalComposition # точно ли это нужно?
|
||||
materialComposition:
|
||||
CP14Copper: 100
|
||||
|
||||
- type: entity
|
||||
id: CP14CopperBar5
|
||||
parent: CP14CopperBar1
|
||||
suffix: 5
|
||||
components:
|
||||
- type: Stack
|
||||
count: 5
|
||||
|
||||
- type: entity
|
||||
id: CP14CopperBar10
|
||||
parent: CP14CopperBar1
|
||||
suffix: 10
|
||||
components:
|
||||
- type: Stack
|
||||
count: 10
|
||||
|
||||
|
||||
|
||||
- type: entity
|
||||
id: CP14IronBar1
|
||||
parent: BaseItem
|
||||
name: iron bar
|
||||
suffix: 1
|
||||
description: A heavy piece of refined iron
|
||||
components:
|
||||
- type: Item
|
||||
size: Normal
|
||||
- type: Sprite
|
||||
sprite: _CP14/Objects/Materials/iron_bar.rsi
|
||||
layers:
|
||||
- state: bar
|
||||
map: ["base"]
|
||||
- type: Appearance
|
||||
- type: Stack
|
||||
stackType: CP14IronBar
|
||||
count: 1
|
||||
baseLayer: base
|
||||
layerStates:
|
||||
- bar
|
||||
- bar_2
|
||||
- bar_3
|
||||
- type: Material
|
||||
- type: PhysicalComposition # точно ли это нужно?
|
||||
materialComposition:
|
||||
CP14Iron: 100
|
||||
|
||||
- type: entity
|
||||
id: CP14IronBar5
|
||||
parent: CP14IronBar1
|
||||
suffix: 5
|
||||
components:
|
||||
- type: Stack
|
||||
count: 5
|
||||
|
||||
- type: entity
|
||||
id: CP14IronBar10
|
||||
parent: CP14IronBar1
|
||||
suffix: 10
|
||||
components:
|
||||
- type: Stack
|
||||
count: 10
|
||||
|
||||
|
||||
|
||||
- type: entity
|
||||
id: CP14GoldBar1
|
||||
parent: BaseItem
|
||||
name: gold bar
|
||||
description: A warm to the touch, soft piece of refined gold.
|
||||
components:
|
||||
- type: Item
|
||||
size: Normal
|
||||
- type: Sprite
|
||||
sprite: _CP14/Objects/Materials/gold_bar.rsi
|
||||
layers:
|
||||
- state: bar
|
||||
map: ["base"]
|
||||
- type: Appearance
|
||||
- type: Stack
|
||||
stackType: CP14GoldBar
|
||||
count: 1
|
||||
baseLayer: base
|
||||
layerStates:
|
||||
- bar
|
||||
- bar_2
|
||||
- bar_3
|
||||
- type: Material
|
||||
- type: PhysicalComposition # точно ли это нужно?
|
||||
materialComposition:
|
||||
CP14Gold: 100
|
||||
|
||||
- type: entity
|
||||
id: CP14GoldBar5
|
||||
parent: CP14GoldBar1
|
||||
suffix: 5
|
||||
components:
|
||||
- type: Stack
|
||||
count: 5
|
||||
|
||||
- type: entity
|
||||
id: CP14GoldBar10
|
||||
parent: CP14GoldBar1
|
||||
suffix: 10
|
||||
components:
|
||||
- type: Stack
|
||||
count: 10
|
||||
@@ -0,0 +1,101 @@
|
||||
- type: entity
|
||||
id: CP14MeltingMoldBase
|
||||
abstract: true
|
||||
parent: BaseItem
|
||||
name: melting mold
|
||||
description: Wooden board for casting the metal into the required molds.
|
||||
components:
|
||||
- type: Item
|
||||
size: Normal
|
||||
- type: Sprite
|
||||
sprite: _CP14/Objects/Specific/Blacksmith/melting_molds.rsi
|
||||
|
||||
- type: entity
|
||||
id: CP14MeltingMoldBlank
|
||||
parent: CP14MeltingMoldBase
|
||||
name: black melting mold
|
||||
description: An empty mold for casting metal. You can cut any shape you need in it on the pattern cutting table.
|
||||
components:
|
||||
- type: Sprite
|
||||
layers:
|
||||
- state: blank
|
||||
|
||||
- type: entity
|
||||
id: CP14MeltingMoldDaggers
|
||||
parent: CP14MeltingMoldBase
|
||||
name: dagger blade mold
|
||||
components:
|
||||
- type: Sprite
|
||||
layers:
|
||||
- state: blank
|
||||
- state: dagger
|
||||
|
||||
- type: entity
|
||||
id: CP14MeltingMoldNails
|
||||
parent: CP14MeltingMoldBase
|
||||
name: mails mold
|
||||
components:
|
||||
- type: Sprite
|
||||
layers:
|
||||
- state: blank
|
||||
- state: nails
|
||||
|
||||
- type: entity
|
||||
id: CP14MeltingMoldPickaxe
|
||||
parent: CP14MeltingMoldBase
|
||||
name: pickaxe head mold
|
||||
components:
|
||||
- type: Sprite
|
||||
layers:
|
||||
- state: blank
|
||||
- state: pickaxe
|
||||
|
||||
- type: entity
|
||||
id: CP14MeltingMoldShovel
|
||||
parent: CP14MeltingMoldBase
|
||||
name: shovel head mold
|
||||
components:
|
||||
- type: Sprite
|
||||
layers:
|
||||
- state: blank
|
||||
- state: shovel
|
||||
|
||||
- type: entity
|
||||
id: CP14MeltingMoldSickle
|
||||
parent: CP14MeltingMoldBase
|
||||
name: sickle blade mold
|
||||
components:
|
||||
- type: Sprite
|
||||
layers:
|
||||
- state: blank
|
||||
- state: sickle
|
||||
|
||||
- type: entity
|
||||
id: CP14MeltingMoldSword
|
||||
parent: CP14MeltingMoldBase
|
||||
name: sword blade mold
|
||||
components:
|
||||
- type: Sprite
|
||||
layers:
|
||||
- state: blank
|
||||
- state: sword
|
||||
|
||||
- type: entity
|
||||
id: CP14MeltingMoldThrowableSpear
|
||||
parent: CP14MeltingMoldBase
|
||||
name: throwable spearhead mold
|
||||
components:
|
||||
- type: Sprite
|
||||
layers:
|
||||
- state: blank
|
||||
- state: throwable_spear
|
||||
|
||||
- type: entity
|
||||
id: CP14MeltingMoldTwoHandedSword
|
||||
parent: CP14MeltingMoldBase
|
||||
name: two-handed sword blade mold
|
||||
components:
|
||||
- type: Sprite
|
||||
layers:
|
||||
- state: blank
|
||||
- state: two_handed_sword
|
||||
@@ -19,7 +19,7 @@
|
||||
description: A piece of pale, heavy copper.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: _CP14/Objects/Materials/ore_copper.rsi
|
||||
sprite: _CP14/Objects/Materials/copper_ore.rsi
|
||||
layers:
|
||||
- state: ore1
|
||||
map: ["random"]
|
||||
@@ -31,7 +31,7 @@
|
||||
description: A piece of cold, heavy iron.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: _CP14/Objects/Materials/ore_iron.rsi
|
||||
sprite: _CP14/Objects/Materials/iron_ore.rsi
|
||||
layers:
|
||||
- state: ore1
|
||||
map: ["random"]
|
||||
@@ -43,7 +43,7 @@
|
||||
description: A piece of soft, pure gold.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: _CP14/Objects/Materials/ore_gold.rsi
|
||||
sprite: _CP14/Objects/Materials/gold_ore.rsi
|
||||
layers:
|
||||
- state: ore1
|
||||
map: ["random"]
|
||||
|
||||
@@ -4,32 +4,10 @@
|
||||
id: CP14BaseWorkbench
|
||||
abstract: true
|
||||
components:
|
||||
- type: Fixtures
|
||||
fixtures:
|
||||
fix1:
|
||||
shape:
|
||||
!type:PhysShapeAabb
|
||||
bounds: "-0.45,-0.45,0.45,0.45"
|
||||
density: 55
|
||||
mask:
|
||||
- TabletopMachineMask
|
||||
layer:
|
||||
- Impassable
|
||||
- MidImpassable
|
||||
- LowImpassable
|
||||
hard: false
|
||||
fix2:
|
||||
shape:
|
||||
!type:PhysShapeAabb
|
||||
bounds: "-0.45,-0.45,0.45,0.45"
|
||||
density: 55
|
||||
mask:
|
||||
- TableMask
|
||||
layer:
|
||||
- TableLayer
|
||||
- type: Climbable
|
||||
- type: Clickable
|
||||
- type: PlaceableSurface
|
||||
- type: InteractionOutline
|
||||
- type: CP14Workbench
|
||||
craftSpeed: 1
|
||||
|
||||
@@ -44,10 +22,10 @@
|
||||
- type: Sprite
|
||||
snapCardinals: true
|
||||
sprite: _CP14/Structures/Furniture/workbench.rsi
|
||||
state: icon
|
||||
state: workbench
|
||||
- type: Icon
|
||||
sprite: _CP14/Structures/Furniture/workbench.rsi
|
||||
state: icon
|
||||
state: workbench
|
||||
- type: Damageable
|
||||
damageContainer: Inorganic
|
||||
damageModifierSet: Wood
|
||||
@@ -76,7 +54,7 @@
|
||||
spawn:
|
||||
CP14WoodenPlanks1:
|
||||
min: 1
|
||||
max: 1
|
||||
max: 2
|
||||
- type: FootstepModifier
|
||||
footstepSoundCollection:
|
||||
collection: FootstepWood
|
||||
@@ -89,4 +67,68 @@
|
||||
- type: CP14Workbench
|
||||
recipes:
|
||||
- CP14Bucket
|
||||
- CP14BaseBarrel
|
||||
- CP14BaseBarrel
|
||||
|
||||
- type: entity
|
||||
id: CP14WorkbenchMeltingMolds
|
||||
parent:
|
||||
- CP14BaseWorkbench
|
||||
- CP14BaseWooden
|
||||
name: sawing melting molds table
|
||||
description: Specialized table that allows you to cut out molds for metal smelting.
|
||||
components:
|
||||
- type: Sprite
|
||||
snapCardinals: true
|
||||
sprite: _CP14/Structures/Furniture/workbench.rsi
|
||||
state: melting_crafter
|
||||
- type: Icon
|
||||
sprite: _CP14/Structures/Furniture/workbench.rsi
|
||||
state: melting_crafter
|
||||
- type: Damageable
|
||||
damageContainer: Inorganic
|
||||
damageModifierSet: Wood
|
||||
- type: Destructible
|
||||
thresholds:
|
||||
- trigger:
|
||||
!type:DamageTypeTrigger
|
||||
damageType: Heat
|
||||
damage: 40
|
||||
behaviors:
|
||||
- !type:DoActsBehavior
|
||||
acts: ["Destruction"]
|
||||
- !type:PlaySoundBehavior
|
||||
sound:
|
||||
collection: WoodDestroy
|
||||
- trigger:
|
||||
!type:DamageTrigger
|
||||
damage: 60
|
||||
behaviors:
|
||||
- !type:DoActsBehavior
|
||||
acts: ["Destruction"]
|
||||
- !type:PlaySoundBehavior
|
||||
sound:
|
||||
collection: WoodDestroy
|
||||
- !type:SpawnEntitiesBehavior
|
||||
spawn:
|
||||
CP14WoodenPlanks1:
|
||||
min: 1
|
||||
max: 2
|
||||
- type: FootstepModifier
|
||||
footstepSoundCollection:
|
||||
collection: FootstepWood
|
||||
- type: FireVisuals
|
||||
sprite: _CP14/Effects/fire.rsi
|
||||
normalState: full
|
||||
- type: CP14Workbench
|
||||
craftSound:
|
||||
collection: CP14Sawing
|
||||
recipes:
|
||||
- CP14MeltingMoldBlank
|
||||
- CP14MeltingMoldDaggers
|
||||
- CP14MeltingMoldNails
|
||||
- CP14MeltingMoldPickaxe
|
||||
- CP14MeltingMoldShovel
|
||||
- CP14MeltingMoldSickle
|
||||
- CP14MeltingMoldSword
|
||||
- CP14MeltingMoldThrowableSpear
|
||||
- CP14MeltingMoldTwoHandedSword
|
||||
@@ -32,4 +32,31 @@
|
||||
unit: materials-unit-piece
|
||||
icon: { sprite: _CP14/Objects/Materials/nails.rsi, state: nail_2 }
|
||||
color: "#555963"
|
||||
price: 0 #?
|
||||
|
||||
- type: material
|
||||
id: CP14Copper
|
||||
stackEntity: CP14CopperBar1
|
||||
name: cp14-material-copper
|
||||
unit: materials-unit-bar
|
||||
icon: { sprite: _CP14/Objects/Materials/copper_bar.rsi, state: bar_2 }
|
||||
color: "#9a5e22"
|
||||
price: 0 #?
|
||||
|
||||
- type: material
|
||||
id: CP14Iron
|
||||
stackEntity: CP14IronBar1
|
||||
name: cp14-material-iron
|
||||
unit: materials-unit-bar
|
||||
icon: { sprite: _CP14/Objects/Materials/iron_bar.rsi, state: bar_2 }
|
||||
color: "#9093a1"
|
||||
price: 0 #?
|
||||
|
||||
- type: material
|
||||
id: CP14Gold
|
||||
stackEntity: CP14GoldBar1
|
||||
name: cp14-material-gold
|
||||
unit: materials-unit-bar
|
||||
icon: { sprite: _CP14/Objects/Materials/gold_bar.rsi, state: bar_2 }
|
||||
color: "#FFD700"
|
||||
price: 0 #?
|
||||
@@ -2,5 +2,5 @@
|
||||
id: CP14Gold
|
||||
name: gold ore
|
||||
sprite:
|
||||
sprite: _CP14/Objects/Materials/ore_gold.rsi
|
||||
sprite: _CP14/Objects/Materials/gold_ore.rsi
|
||||
state: ore1
|
||||
@@ -101,7 +101,7 @@
|
||||
category: construction-category-furniture
|
||||
icon:
|
||||
sprite: _CP14/Structures/Furniture/workbench.rsi
|
||||
state: icon
|
||||
state: workbench
|
||||
objectType: Structure
|
||||
placementMode: SnapgridCenter
|
||||
canBuildInImpassable: false
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
- type: CP14Recipe
|
||||
id: CP14MeltingMoldBlank
|
||||
craftTime: 2
|
||||
stacks:
|
||||
CP14WoodenPlanks: 2
|
||||
result: CP14MeltingMoldBlank
|
||||
|
||||
- type: CP14Recipe
|
||||
id: CP14MeltingMoldDaggers
|
||||
craftTime: 2
|
||||
entities:
|
||||
CP14MeltingMoldBlank: 1
|
||||
result: CP14MeltingMoldDaggers
|
||||
|
||||
- type: CP14Recipe
|
||||
id: CP14MeltingMoldNails
|
||||
craftTime: 2
|
||||
entities:
|
||||
CP14MeltingMoldBlank: 1
|
||||
result: CP14MeltingMoldNails
|
||||
|
||||
- type: CP14Recipe
|
||||
id: CP14MeltingMoldPickaxe
|
||||
craftTime: 2
|
||||
entities:
|
||||
CP14MeltingMoldBlank: 1
|
||||
result: CP14MeltingMoldPickaxe
|
||||
|
||||
- type: CP14Recipe
|
||||
id: CP14MeltingMoldShovel
|
||||
craftTime: 2
|
||||
entities:
|
||||
CP14MeltingMoldBlank: 1
|
||||
result: CP14MeltingMoldShovel
|
||||
|
||||
- type: CP14Recipe
|
||||
id: CP14MeltingMoldSickle
|
||||
craftTime: 2
|
||||
entities:
|
||||
CP14MeltingMoldBlank: 1
|
||||
result: CP14MeltingMoldSickle
|
||||
|
||||
- type: CP14Recipe
|
||||
id: CP14MeltingMoldSword
|
||||
craftTime: 2
|
||||
entities:
|
||||
CP14MeltingMoldBlank: 1
|
||||
result: CP14MeltingMoldSword
|
||||
|
||||
- type: CP14Recipe
|
||||
id: CP14MeltingMoldThrowableSpear
|
||||
craftTime: 2
|
||||
entities:
|
||||
CP14MeltingMoldBlank: 1
|
||||
result: CP14MeltingMoldThrowableSpear
|
||||
|
||||
- type: CP14Recipe
|
||||
id: CP14MeltingMoldTwoHandedSword
|
||||
craftTime: 2
|
||||
entities:
|
||||
CP14MeltingMoldBlank: 1
|
||||
result: CP14MeltingMoldTwoHandedSword
|
||||
@@ -19,4 +19,13 @@
|
||||
- /Audio/_CP14/Items/nailing1.ogg
|
||||
- /Audio/_CP14/Items/nailing2.ogg
|
||||
- /Audio/_CP14/Items/nailing3.ogg
|
||||
- /Audio/_CP14/Items/nailing4.ogg
|
||||
- /Audio/_CP14/Items/nailing4.ogg
|
||||
|
||||
- type: soundCollection
|
||||
id: CP14Sawing
|
||||
files:
|
||||
- /Audio/_CP14/Items/sawing1.ogg
|
||||
- /Audio/_CP14/Items/sawing2.ogg
|
||||
- /Audio/_CP14/Items/sawing3.ogg
|
||||
- /Audio/_CP14/Items/sawing4.ogg
|
||||
- /Audio/_CP14/Items/sawing5.ogg
|
||||
@@ -24,4 +24,25 @@
|
||||
name: nails
|
||||
spawn: CP14Nail1
|
||||
icon: { sprite: _CP14/Objects/Materials/nails.rsi, state: nail_2 }
|
||||
maxCount: 10
|
||||
|
||||
- type: stack
|
||||
id: CP14CopperBar
|
||||
name: copper bars
|
||||
spawn: CP14CopperBar1
|
||||
icon: { sprite: _CP14/Objects/Materials/copper_bar.rsi, state: bar_2 }
|
||||
maxCount: 10
|
||||
|
||||
- type: stack
|
||||
id: CP14IronBar
|
||||
name: iron bars
|
||||
spawn: CP14IronBar1
|
||||
icon: { sprite: _CP14/Objects/Materials/iron_bar.rsi, state: bar_2 }
|
||||
maxCount: 10
|
||||
|
||||
- type: stack
|
||||
id: CP14GoldBar
|
||||
name: gold bars
|
||||
spawn: CP14GoldBar1
|
||||
icon: { sprite: _CP14/Objects/Materials/gold_bar.rsi, state: bar_2 }
|
||||
maxCount: 10
|
||||
|
After Width: | Height: | Size: 308 B |
|
After Width: | Height: | Size: 424 B |
|
After Width: | Height: | Size: 505 B |
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"version": 1,
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"license": "All rights reserved for the CrystallPunk14 project only",
|
||||
"copyright": "Created by TheShuEd (Github) for CrystallPunk14",
|
||||
"states": [
|
||||
{
|
||||
"name": "bar"
|
||||
},
|
||||
{
|
||||
"name": "bar_2"
|
||||
},
|
||||
{
|
||||
"name": "bar_3"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
Before Width: | Height: | Size: 368 B After Width: | Height: | Size: 368 B |
|
Before Width: | Height: | Size: 442 B After Width: | Height: | Size: 442 B |
|
Before Width: | Height: | Size: 440 B After Width: | Height: | Size: 440 B |
BIN
Resources/Textures/_CP14/Objects/Materials/gold_bar.rsi/bar.png
Normal file
|
After Width: | Height: | Size: 325 B |
|
After Width: | Height: | Size: 446 B |
|
After Width: | Height: | Size: 479 B |
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"version": 1,
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"license": "All rights reserved for the CrystallPunk14 project only",
|
||||
"copyright": "Created by TheShuEd (Github) for CrystallPunk14",
|
||||
"states": [
|
||||
{
|
||||
"name": "bar"
|
||||
},
|
||||
{
|
||||
"name": "bar_2"
|
||||
},
|
||||
{
|
||||
"name": "bar_3"
|
||||
}
|
||||
]
|
||||
}
|
||||
BIN
Resources/Textures/_CP14/Objects/Materials/gold_ore.rsi/ore1.png
Normal file
|
After Width: | Height: | Size: 434 B |
BIN
Resources/Textures/_CP14/Objects/Materials/gold_ore.rsi/ore2.png
Normal file
|
After Width: | Height: | Size: 389 B |
BIN
Resources/Textures/_CP14/Objects/Materials/gold_ore.rsi/ore3.png
Normal file
|
After Width: | Height: | Size: 398 B |
BIN
Resources/Textures/_CP14/Objects/Materials/iron_bar.rsi/bar.png
Normal file
|
After Width: | Height: | Size: 312 B |
|
After Width: | Height: | Size: 428 B |
|
After Width: | Height: | Size: 498 B |
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"version": 1,
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"license": "All rights reserved for the CrystallPunk14 project only",
|
||||
"copyright": "Created by TheShuEd (Github) for CrystallPunk14",
|
||||
"states": [
|
||||
{
|
||||
"name": "bar"
|
||||
},
|
||||
{
|
||||
"name": "bar_2"
|
||||
},
|
||||
{
|
||||
"name": "bar_3"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
Before Width: | Height: | Size: 386 B After Width: | Height: | Size: 386 B |
|
Before Width: | Height: | Size: 432 B After Width: | Height: | Size: 432 B |
|
Before Width: | Height: | Size: 446 B After Width: | Height: | Size: 446 B |
|
Before Width: | Height: | Size: 416 B |
|
Before Width: | Height: | Size: 410 B |
|
Before Width: | Height: | Size: 390 B |
|
After Width: | Height: | Size: 493 B |
|
After Width: | Height: | Size: 217 B |
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"version": 1,
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"license": "All rights reserved for the CrystallPunk14 project only",
|
||||
"copyright": "Created by TheShuEd (Github) for CrystallPunk14",
|
||||
"states": [
|
||||
{
|
||||
"name": "blank"
|
||||
},
|
||||
{
|
||||
"name": "dagger"
|
||||
},
|
||||
{
|
||||
"name": "nails"
|
||||
},
|
||||
{
|
||||
"name": "pickaxe"
|
||||
},
|
||||
{
|
||||
"name": "shovel"
|
||||
},
|
||||
{
|
||||
"name": "sickle"
|
||||
},
|
||||
{
|
||||
"name": "sword"
|
||||
},
|
||||
{
|
||||
"name": "throwable_spear"
|
||||
},
|
||||
{
|
||||
"name": "two_handed_sword"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 276 B |
|
After Width: | Height: | Size: 256 B |
|
After Width: | Height: | Size: 326 B |
|
After Width: | Height: | Size: 407 B |
|
After Width: | Height: | Size: 262 B |
|
After Width: | Height: | Size: 210 B |
|
After Width: | Height: | Size: 235 B |
|
After Width: | Height: | Size: 445 B |
@@ -8,7 +8,10 @@
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "icon"
|
||||
"name": "workbench"
|
||||
},
|
||||
{
|
||||
"name": "melting_crafter"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 408 B After Width: | Height: | Size: 408 B |