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

Edgefication (#590)

Browse Source 
* bloat

* bloat 2

* bloat 3

* final bloat

* Update icon.ico

* Create integration_test_run.bat

* Arggh

* Disable some tests

* revert roomfill clearexisting changes
This commit is contained in:
Ed
2024-11-18 14:40:52 +03:00
committed by GitHub
parent ef6f23e4b8
commit d67f7619c4
287 changed files with 432 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Atmos/Components/FlammableComponent.cs
View File

@@ -84,7 +84,7 @@ namespace Content.Server.Atmos.Components
public ProtoId<AlertPrototype> FireAlert = "Fire";
/// <summary>
/// CrystallPunk fireplace fuel
/// CrystallEdge fireplace fuel
/// </summary>
[DataField]
public float CP14FireplaceFuel = 10f;

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

@@ -317,10 +317,10 @@ namespace Content.Server.Atmos.EntitySystems
_ignitionSourceSystem.SetIgnited(uid, false);
//CrystallPunk bonfire moment
//CrystallEdge bonfire moment
var ev = new OnFireChangedEvent(flammable.OnFire);
RaiseLocalEvent(uid, ref ev);
//CrystallPunk bonfire moment end
//CrystallEdge bonfire moment end
UpdateAppearance(uid, flammable);
}
@@ -344,10 +344,10 @@ namespace Content.Server.Atmos.EntitySystems
_adminLogger.Add(LogType.Flammable, $"{ToPrettyString(uid):target} set on fire by {ToPrettyString(ignitionSource):actor}");
flammable.OnFire = true;
//CrystallPunk fireplace moment
//CrystallEdge fireplace moment
var ev = new OnFireChangedEvent(flammable.OnFire);
RaiseLocalEvent(uid, ref ev);
//CrystallPunk fireplace moment end
//CrystallEdge fireplace moment end
}
UpdateAppearance(uid, flammable);

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

@@ -14,7 +14,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem
base.Initialize();
SubscribeLocalEvent<AmbientOnPoweredComponent, PowerChangedEvent>(HandlePowerChange);
SubscribeLocalEvent<AmbientOnPoweredComponent, PowerNetBatterySupplyEvent>(HandlePowerSupply);
SubscribeLocalEvent<CP14FlammableAmbientSoundComponent, OnFireChangedEvent>(OnFireChanged); //CrystallPunk bonfire moment
SubscribeLocalEvent<CP14FlammableAmbientSoundComponent, OnFireChangedEvent>(OnFireChanged); //CrystallEdge bonfire moment
}
private void HandlePowerSupply(EntityUid uid, AmbientOnPoweredComponent component, ref PowerNetBatterySupplyEvent args)
@@ -27,10 +27,10 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem
SetAmbience(uid, args.Powered);
}
//CrystallPunk bonfire moment
//CrystallEdge bonfire moment
private void OnFireChanged(Entity<CP14FlammableAmbientSoundComponent> ent, ref OnFireChangedEvent args)
{
SetAmbience(ent, args.OnFire);
}
//CrystallPunk bonfire moment end
//CrystallEdge bonfire moment end
}

4
Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
View File

@@ -37,14 +37,14 @@ namespace Content.Server.Damage.Systems
{
if (!TerminatingOrDeleted(args.Target))
{
//CrystallPunk Melee upgrade
//CrystallEdge Melee upgrade
var damage = component.Damage;
if (TryComp<CP14SharpenedComponent>(uid, out var sharp))
damage *= sharp.Sharpness;
var dmg = _damageable.TryChangeDamage(args.Target, damage, component.IgnoreResistances, origin: args.Component.Thrower);
//CrystallPunk Melee upgrade end
//CrystallEdge Melee upgrade end
// Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
if (dmg != null && HasComp<MobStateComponent>(args.Target))

4
Content.Server/GameTicking/GameTicker.Spawning.cs
View File

@@ -240,7 +240,7 @@ namespace Content.Server.GameTicking
_chatSystem.DispatchStationAnnouncement(station,
Loc.GetString("latejoin-arrival-announcement-special",
("character", MetaData(mob).EntityName),
("gender", character.Gender), // CrystallPunk-LastnameGender
("gender", character.Gender), // CrystallEdge-LastnameGender
("entity", mob),
("job", CultureInfo.CurrentCulture.TextInfo.ToTitleCase(jobName))),
Loc.GetString("latejoin-arrival-sender"),
@@ -252,7 +252,7 @@ namespace Content.Server.GameTicking
_chatSystem.DispatchStationAnnouncement(station,
Loc.GetString("latejoin-arrival-announcement",
("character", MetaData(mob).EntityName),
("gender", character.Gender), // CrystallPunk-LastnameGender
("gender", character.Gender), // CrystallEdge-LastnameGender
("entity", mob),
("job", CultureInfo.CurrentCulture.TextInfo.ToTitleCase(jobName))),
Loc.GetString("latejoin-arrival-sender"),

18
Content.Server/Procedural/DungeonSystem.Rooms.cs
View File

@@ -130,7 +130,6 @@ public sealed partial class DungeonSystem
var finalRoomRotation = roomTransform.Rotation();
/*
if (clearExisting)
{
var point1 = Vector2.Transform(-room.Size / 2, roomTransform);
@@ -156,7 +155,6 @@ public sealed partial class DungeonSystem
}
}
}
*/
var roomCenter = (room.Offset + room.Size / 2f) * grid.TileSize;
var tileOffset = -roomCenter + grid.TileSizeHalfVector;
@@ -185,14 +183,14 @@ public sealed partial class DungeonSystem
_tiles.Add((rounded, tileRef.Tile));
//CP14 clearExisting variant
if (clearExisting)
{
var anchored = _maps.GetAnchoredEntities((gridUid, grid), rounded);
foreach (var ent in anchored)
{
QueueDel(ent);
}
}
//if (clearExisting)
//{
// var anchored = _maps.GetAnchoredEntities((gridUid, grid), rounded);
// foreach (var ent in anchored)
// {
// QueueDel(ent);
// }
//}
//CP14 clearExisting variant end
}
}

2
Content.Server/Sprite/RandomSpriteSystem.cs
View File

@@ -39,7 +39,7 @@ public sealed class RandomSpriteSystem: SharedRandomSpriteSystem
component.Selected.EnsureCapacity(groups.Count);
Color? previousColor = component.CP14InheritBaseColor; //CrystallPunk
Color? previousColor = component.CP14InheritBaseColor; //CrystallEdge
foreach (var group in groups)
{

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

@@ -130,12 +130,12 @@ public sealed class TemperatureSystem : EntitySystem
public void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false,
TemperatureComponent? temperature = null)
{
//CrystallPunk may try place on heater and entity, and solutions
//CrystallEdge may try place on heater and entity, and solutions
//if (!Resolve(uid, ref temperature, false))
// return;
if (temperature == null)
return;
//CrystallPunk may try place on heater and entity, and solutions END
//CrystallEdge may try place on heater and entity, and solutions END
if (!ignoreHeatResistance)
{

2
Content.Server/_CP14/RoundSeed/CP14RoundSeedComponent.cs
View File

@@ -1,5 +1,5 @@
/*
* All right reserved to CrystallPunk.
* All right reserved to CrystallEdge.
*
* BUT this file is sublicensed under MIT License
*

2
Content.Server/_CP14/RoundSeed/CP14RoundSeedSystem.cs
View File

@@ -1,5 +1,5 @@
/*
* All right reserved to CrystallPunk.
* All right reserved to CrystallEdge.
*
* BUT this file is sublicensed under MIT License
*