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

fixes

Browse Source
This commit is contained in:
Ed
2024-04-20 12:45:25 +03:00
parent bb24ead3b9
commit af734dc5c2
20 changed files with 38 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Atmos/EntitySystems/FlammableSystem.cs
View File

@@ -1,3 +1,4 @@
using Content.Server._CP14.Temperature;
using Content.Server.Administration.Logs;
using Content.Server.Atmos.Components;
using Content.Server.IgnitionSource;
@@ -27,7 +28,6 @@ using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Events;
using Robust.Shared.Physics.Systems;
using Robust.Shared.Random;
using Content.Server.CrystallPunk.Temperature;
namespace Content.Server.Atmos.EntitySystems
{

6
Content.Server/Audio/AmbientSoundSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.CrystallPunk.Temperature;
using Content.Server._CP14.Temperature;
using Content.Server.Power.Components;
using Content.Server.Power.EntitySystems;
using Content.Shared.Audio;
@@ -13,7 +13,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem
base.Initialize();
SubscribeLocalEvent<AmbientOnPoweredComponent, PowerChangedEvent>(HandlePowerChange);
SubscribeLocalEvent<AmbientOnPoweredComponent, PowerNetBatterySupplyEvent>(HandlePowerSupply);
SubscribeLocalEvent<CPFlammableAmbientSoundComponent, OnFireChangedEvent>(OnFireChanged); //CrystallPunk bonfire moment
SubscribeLocalEvent<CP14FlammableAmbientSoundComponent, OnFireChangedEvent>(OnFireChanged); //CrystallPunk bonfire moment
}
private void HandlePowerSupply(EntityUid uid, AmbientOnPoweredComponent component, ref PowerNetBatterySupplyEvent args)
@@ -27,7 +27,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem
}
//CrystallPunk bonfire moment
private void OnFireChanged(Entity<CPFlammableAmbientSoundComponent> ent, ref OnFireChangedEvent args)
private void OnFireChanged(Entity<CP14FlammableAmbientSoundComponent> ent, ref OnFireChangedEvent args)
{
SetAmbience(ent, args.OnFire);
}

4
Content.Server/Temperature/Systems/EntityHeaterSystem.cs
View File

@@ -1,5 +1,5 @@
using Content.Server._CP14.Temperature;
using Content.Server.Atmos.Components;
using Content.Server.CrystallPunk.Temperature;
using Content.Server.Power.Components;
using Content.Server.Temperature.Components;
using Content.Shared.Examine;
@@ -49,7 +49,7 @@ public sealed class EntityHeaterSystem : EntitySystem
}
//CrystallPunk bonfire
var flammbaleQuery = EntityQueryEnumerator<CPFlammableEntityHeaterComponent, ItemPlacerComponent, FlammableComponent>();
var flammbaleQuery = EntityQueryEnumerator<CP14FlammableEntityHeaterComponent, ItemPlacerComponent, FlammableComponent>();
while (flammbaleQuery.MoveNext(out var uid, out _, out var placer, out var flammable))
{
if (!flammable.OnFire)

4
Content.Server/_CP14/Temperature/CPFireSpreadComponent.cs → Content.Server/_CP14/Temperature/CP14FireSpreadComponent.cs
View File

@@ -4,8 +4,8 @@ namespace Content.Server._CP14.Temperature;
/// A component that allows fire to spread to nearby objects. The basic mechanics of a spreading fire
/// </summary>
[RegisterComponent, Access(typeof(CPFireSpreadSystem))]
public sealed partial class CPFireSpreadComponent : Component
[RegisterComponent, Access(typeof(CP14FireSpreadSystem))]
public sealed partial class CP14FireSpreadComponent : Component
{
/// <summary>
/// radius of ignition of neighboring objects

9
Content.Server/_CP14/Temperature/CPFireSpreadSystem.cs → Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs
View File

@@ -1,12 +1,11 @@
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.CrystallPunk.Temperature;
using Robust.Shared.Random;
using Robust.Shared.Timing;
namespace Content.Server._CP14.Temperature;
public sealed partial class CPFireSpreadSystem : EntitySystem
public sealed partial class CP14FireSpreadSystem : EntitySystem
{
[Dependency] private readonly FlammableSystem _flammable = default!;
@@ -18,10 +17,10 @@ public sealed partial class CPFireSpreadSystem : EntitySystem
public override void Initialize()
{
SubscribeLocalEvent <CPFireSpreadComponent, OnFireChangedEvent>(OnCompInit);
SubscribeLocalEvent <CP14FireSpreadComponent, OnFireChangedEvent>(OnCompInit);
}
private void OnCompInit(Entity<CPFireSpreadComponent> ent, ref OnFireChangedEvent args)
private void OnCompInit(Entity<CP14FireSpreadComponent> ent, ref OnFireChangedEvent args)
{
if (!args.OnFire)
return;
@@ -34,7 +33,7 @@ public sealed partial class CPFireSpreadSystem : EntitySystem
{
base.Update(frameTime);
var query = EntityQueryEnumerator<CPFireSpreadComponent, FlammableComponent>();
var query = EntityQueryEnumerator<CP14FireSpreadComponent, FlammableComponent>();
while (query.MoveNext(out var uid, out var spread, out var flammable))
{
if (!flammable.OnFire)

4
Content.Server/_CP14/Temperature/CPFlammableAmbientSoundComponent.cs → Content.Server/_CP14/Temperature/CP14FlammableAmbientSoundComponent.cs
View File

@@ -1,12 +1,12 @@
using Content.Server.Temperature.Systems;
namespace Content.Server.CrystallPunk.Temperature;
namespace Content.Server._CP14.Temperature;
/// <summary>
/// CTurn on and turn off AmbientSound when Flammable OnFire os changed
/// </summary>
[RegisterComponent, Access(typeof(EntityHeaterSystem))]
public sealed partial class CPFlammableAmbientSoundComponent : Component
public sealed partial class CP14FlammableAmbientSoundComponent : Component
{
}

4
Content.Server/_CP14/Temperature/CPFlammableEntityHeaterComponent.cs → Content.Server/_CP14/Temperature/CP14FlammableEntityHeaterComponent.cs
View File

@@ -1,11 +1,11 @@
using Content.Server.Temperature.Systems;
namespace Content.Server.CrystallPunk.Temperature;
namespace Content.Server._CP14.Temperature;
/// <summary>
/// Adds thermal energy from FlammableComponent to entities with <see cref="TemperatureComponent"/> placed on it.
/// </summary>
[RegisterComponent, Access(typeof(EntityHeaterSystem))]
public sealed partial class CPFlammableEntityHeaterComponent : Component
public sealed partial class CP14FlammableEntityHeaterComponent : Component
{
}

2
Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml
View File

@@ -53,7 +53,7 @@
- type: Clothing
sprite: _CP14/Clothing/Cloak/yellowhoodie.rsi
- type: ToggleableClothing
clothingPrototype: CPClothingHeadHoodieYellow
clothingPrototype: CP14ClothingHeadHoodieYellow
requiredSlot:
- cloak
slot: head

2
Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml
View File

@@ -28,7 +28,7 @@
- type: MeleeWeapon
attackRate: 1.8
wideAnimationRotation: 225
wideAnimation: CPWeaponArcSlash
wideAnimation: CP14WeaponArcSlash
damage:
types:
Slash: 5

2
Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml
View File

@@ -20,7 +20,7 @@
attackRate: 1.4
range: 1.2
wideAnimationRotation: 225
wideAnimation: CPWeaponArcSlash
wideAnimation: CP14WeaponArcSlash
damage:
types:
Slash: 10

2
Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml
View File

@@ -19,7 +19,7 @@
- type: MeleeWeapon
attackRate: 1.5
wideAnimationRotation: 225
wideAnimation: CPWeaponArcSlash
wideAnimation: CP14WeaponArcSlash
cPAnimationLength: 0.18
damage:
types:

2
Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml
View File

@@ -16,7 +16,7 @@
- type: MeleeWeapon
attackRate: 0.7
wideAnimationRotation: 205
wideAnimation: CPWeaponArcSlash
wideAnimation: CP14WeaponArcSlash
damage:
types:
Blunt: 25

2
Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml
View File

@@ -27,7 +27,7 @@
- type: MeleeWeapon
attackRate: 1.5
wideAnimationRotation: 225
wideAnimation: CPWeaponArcSlash
wideAnimation: CP14WeaponArcSlash
cPAnimationLength: 0.18
damage:
types:

2
Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml
View File

@@ -19,7 +19,7 @@
- type: MeleeWeapon
attackRate: 1
wideAnimationRotation: -115
wideAnimation: CPWeaponArcThrust
wideAnimation: CP14WeaponArcThrust
damage:
types:
Piercing: 24

2
Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml
View File

@@ -24,7 +24,7 @@
- type: MeleeWeapon
attackRate: 0.5
wideAnimationRotation: 205
wideAnimation: CPWeaponArcSlash
wideAnimation: CP14WeaponArcSlash
damage:
types:
Slash: 5

10
Resources/Prototypes/_CP14/Entities/Objects/coins.yml
View File

@@ -5,7 +5,7 @@
components:
- type: Tag
tags:
- CPCoin
- CP14Coin
- type: Item
size: Tiny
- type: Stack
@@ -39,7 +39,7 @@
- state: coin10
map: ["base"]
- type: Stack
stackType: CPCopperCoin
stackType: CP14CopperCoin
- type: entity
id: CP14CopperCoin5
@@ -76,7 +76,7 @@
- state: coin10
map: ["base"]
- type: Stack
stackType: CPSilverCoin
stackType: CP14SilverCoin
- type: entity
id: CP14SilverCoin5
@@ -113,7 +113,7 @@
- state: coin10
map: ["base"]
- type: Stack
stackType: CPGoldCoin
stackType: CP14GoldCoin
- type: entity
id: CP14GoldCoin5
@@ -150,7 +150,7 @@
- state: coin10
map: ["base"]
- type: Stack
stackType: CPPlatinumCoin
stackType: CP14PlatinumCoin
- type: entity
id: CP14PlatinumCoin5

4
Resources/Prototypes/_CP14/Entities/Structures/Decoration/bonfire.yml
View File

@@ -43,7 +43,7 @@
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: CPFlammableAmbientSound
- type: CP14FlammableAmbientSound
- type: AmbientSound
enabled: false
volume: -5
@@ -75,4 +75,4 @@
whitelist:
components:
- Temperature
- type: CPFlammableEntityHeater
- type: CP14FlammableEntityHeater

2
Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/chests.yml
View File

@@ -2,7 +2,7 @@
parent:
- CP14ChestGeneric
- CP14BaseWooden
id: CPWoodenChest
id: CP14WoodenChest
name: wooden chest
description: A simple wooden chest for easy storage of junk.
components:

20
Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml
View File

@@ -36,9 +36,6 @@
sprite: _CP14/Structures/Walls/cave_stone_copper.rsi
- type: Icon
sprite: _CP14/Structures/Walls/cave_stone_copper.rsi
- type: IconSmooth
key: CPwall
base: stone
- type: Destructible
thresholds:
- trigger:
@@ -54,7 +51,7 @@
volume: -6
- !type:SpawnEntitiesBehavior
spawn:
CPOreCopper:
CP14OreCopper:
min: 1
max: 5
@@ -69,9 +66,6 @@
sprite: _CP14/Structures/Walls/cave_stone_iron.rsi
- type: Icon
sprite: _CP14/Structures/Walls/cave_stone_iron.rsi
- type: IconSmooth
key: CPwall
base: stone
- type: Destructible
thresholds:
- trigger:
@@ -87,7 +81,7 @@
volume: -6
- !type:SpawnEntitiesBehavior
spawn:
CPOreIron:
CP14OreIron:
min: 1
max: 5
@@ -102,9 +96,6 @@
sprite: _CP14/Structures/Walls/cave_stone_silver.rsi
- type: Icon
sprite: _CP14/Structures/Walls/cave_stone_silver.rsi
- type: IconSmooth
key: CPwall
base: stone
- type: Destructible
thresholds:
- trigger:
@@ -120,7 +111,7 @@
volume: -6
- !type:SpawnEntitiesBehavior
spawn:
CPOreSilver:
CP14OreSilver:
min: 1
max: 5
@@ -135,9 +126,6 @@
sprite: _CP14/Structures/Walls/cave_stone_gold.rsi
- type: Icon
sprite: _CP14/Structures/Walls/cave_stone_gold.rsi
- type: IconSmooth
key: CPwall
base: stone
- type: Destructible
thresholds:
- trigger:
@@ -153,6 +141,6 @@
volume: -6
- !type:SpawnEntitiesBehavior
spawn:
CPOreGold:
CP14OreGold:
min: 1
max: 5

4
Resources/Prototypes/_CP14/Entities/base.yml
View File

@@ -8,7 +8,7 @@
- type: Tag
tags:
- Wooden
- type: CPFlammableAmbientSound
- type: CP14FlammableAmbientSound
- type: AmbientSound
enabled: false
volume: -5
@@ -35,4 +35,4 @@
- type: FireVisuals
sprite: _CP14/Effects/fire.rsi
normalState: small
- type: CPFireSpread
- type: CP14FireSpread