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

bugfixes and ENG OBT preparation (#1015)

Browse Source 
* bugfixes and OBT preparation

* Update CP14CargoSystem.cs
This commit is contained in:
Ed
2025-03-12 20:14:50 +03:00
committed by GitHub
parent 18373b65ac
commit dcacd8f8da
7 changed files with 1978 additions and 4232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/_CP14/Cargo/CP14CargoSystem.cs
View File

@@ -7,6 +7,7 @@ using Content.Shared._CP14.Cargo;
using Content.Shared._CP14.Cargo.Prototype;
using Content.Shared._CP14.Currency;
using Content.Shared.Paper;
using Content.Shared.Stacks;
using Content.Shared.Throwing;
using Robust.Server.GameObjects;
using Robust.Shared.Prototypes;
@@ -218,7 +219,13 @@ public sealed partial class CP14CargoSystem : CP14SharedCargoSystem
{
if (TryComp<CP14CurrencyComponent>(stored, out var currency))
{
cash += currency.Currency;
//fix currency calculation
var c = currency.Currency;
if (TryComp<StackComponent>(stored, out var stack))
c *= stack.Count;
cash += c;
QueueDel(stored);
}
}

9
Content.Server/_CP14/UniqueLoot/CP14UniqueLootSystem.cs
View File

@@ -19,10 +19,11 @@ public sealed partial class CP14UniqueLootSystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
SubscribeLocalEvent<RoundRestartCleanupEvent>(OnCleanup);
SubscribeLocalEvent<CP14UniqueLootSpawnerComponent, MapInitEvent>(OnMapInit);
RefreshUniqueLoot();
}
private void OnMapInit(Entity<CP14UniqueLootSpawnerComponent> ent, ref MapInitEvent args)
@@ -39,14 +40,10 @@ public sealed partial class CP14UniqueLootSystem : EntitySystem
QueueDel(ent);
}
private void OnRoundStart(RoundStartingEvent ev)
{
RefreshUniqueLoot();
}
private void OnCleanup(RoundRestartCleanupEvent ev)
{
_uniqueLootCount.Clear();
RefreshUniqueLoot();
}
private void RefreshUniqueLoot()

10
Content.Shared/Localizations/ContentLocalizationManager.cs
View File

@@ -10,8 +10,8 @@ namespace Content.Shared.Localizations
[Dependency] private readonly ILocalizationManager _loc = default!;
// If you want to change your codebase's language, do it here.
//public const string Culture = "en-US";
public const string Culture = "ru-RU";
public const string Culture = "en-US";
//public const string Culture = "ru-RU";
/// <summary>
/// Custom format strings used for parsing and displaying minutes:seconds timespans.
@@ -29,9 +29,9 @@ namespace Content.Shared.Localizations
var culture = new CultureInfo(Culture);
_loc.LoadCulture(culture);
// Uncomment for Ru localization
var fallbackCulture = new CultureInfo("en-US");
_loc.LoadCulture(fallbackCulture);
_loc.SetFallbackCluture(fallbackCulture);
//var fallbackCulture = new CultureInfo("en-US");
//_loc.LoadCulture(fallbackCulture);
//_loc.SetFallbackCluture(fallbackCulture);
//
_loc.AddFunction(culture, "PRESSURE", FormatPressure);

8
Resources/ConfigPresets/_CP14/Dev.toml
View File

@@ -1,5 +1,5 @@
[whitelist]
enabled = true
enabled = false
[log]
path = "logs"
@@ -14,13 +14,13 @@ bindto = "::,0.0.0.0"
max_connections = 100
[game]
hostname = "⚔️ CrystallEdge Alpha [RU] ⚔️ Status: Whitelist only"
hostname = "⚔️ CrystallEdge Alpha [EN] ⚔️ Status: Open playtest"
desc = "History of the City of Sword and Magic. A social economic sandbox reinventing the Space Station 14 concept in fantasy style"
lobbyenabled = true
soft_max_players = 40
maxplayers = 80
lobbyduration = 300
role_timers = true
role_timers = false
[server]
rules_file = "CP14SandboxRU"
@@ -61,4 +61,4 @@ enable_during_round = true
[cp14]
discord_auth_enabled = true
closet_beta_test = true
closet_beta_test = false

5799
Resources/Maps/_CP14/comoss.yml
View File

File diff suppressed because it is too large Load Diff

373
Resources/Maps/_CP14/comoss_d.yml
View File

@@ -4,7 +4,7 @@ meta:
engineVersion: 247.2.0
forkId: ""
forkVersion: ""
time: 03/08/2025 19:59:26
time: 03/12/2025 16:28:52
entityCount: 23487
maps:
- 1
@@ -94361,155 +94361,6 @@ entities:
- type: ItemPlacer
placedEntities:
- 2240
- proto: CP14WoodenChest
entities:
- uid: 2470
components:
- type: Transform
pos: -5.5,-6.5
parent: 2
- uid: 4268
components:
- type: Transform
pos: -13.5,-31.5
parent: 2
- uid: 4828
components:
- type: Transform
pos: 6.5,-5.5
parent: 2
- uid: 4850
components:
- type: Transform
pos: -3.5,6.5
parent: 2
- uid: 4893
components:
- type: Transform
pos: 6.5,-4.5
parent: 2
- uid: 4894
components:
- type: Transform
pos: 6.5,-3.5
parent: 2
- uid: 8968
components:
- type: Transform
pos: 86.5,38.5
parent: 2
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents:
- 8970
- 8969
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- uid: 8971
components:
- type: Transform
pos: 87.5,38.5
parent: 2
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents:
- 8973
- 8972
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- uid: 8974
components:
- type: Transform
pos: 85.5,38.5
parent: 2
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents:
- 8979
- 8978
- 8977
- 8976
- 8975
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- uid: 9022
components:
- type: Transform
pos: 77.5,30.5
parent: 2
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents:
- 9033
- 9032
- 9031
- 9030
- 9029
- 9028
- 9027
- 9026
- 9025
- 9024
- 9023
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- uid: 17508
components:
- type: Transform
pos: 23.5,1.5
parent: 2
- proto: CP14WoodenChestFilledAlchemy
entities:
- uid: 12843
components:
- type: Transform
pos: -47.5,-73.5
parent: 2
- proto: CP14WoodenChestFilledCheese
entities:
- uid: 8943
components:
- type: Transform
pos: 85.5,30.5
parent: 2
- type: EntityStorage
air:
volume: 200
immutable: False
temperature: 293.14673
moles:
- 1.7459903
- 6.568249
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- proto: CP14Bucket
entities:
- uid: 692
@@ -99740,6 +99591,10 @@ entities:
showEnts: False
occludes: False
ent: null
outerClothing: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
- type: ActiveUserInterface
- uid: 4822
components:
@@ -99800,6 +99655,10 @@ entities:
showEnts: False
occludes: False
ent: null
outerClothing: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
- uid: 8120
components:
- type: Transform
@@ -99860,6 +99719,10 @@ entities:
showEnts: False
occludes: False
ent: null
outerClothing: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
- uid: 8149
components:
- type: Transform
@@ -99920,6 +99783,10 @@ entities:
showEnts: False
occludes: False
ent: null
outerClothing: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
- uid: 9086
components:
- type: Transform
@@ -99980,6 +99847,10 @@ entities:
showEnts: False
occludes: False
ent: null
outerClothing: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
- proto: CP14MetalBeerMug
entities:
- uid: 7025
@@ -109871,10 +109742,11 @@ entities:
parent: 2
- proto: CP14SafeMerchant2
entities:
- uid: 2688
- uid: 4894
components:
- type: Transform
pos: 4.5,-2.5
rot: 1.5707963267948966 rad
pos: 4.5,-3.5
parent: 2
- proto: CP14Scissors
entities:
@@ -110385,6 +110257,18 @@ entities:
- type: Transform
pos: 56.5,55.5
parent: 2
- proto: CP14SpawnUniqueTradepost
entities:
- uid: 4163
components:
- type: Transform
pos: -4.5,-10.5
parent: 2
- uid: 4176
components:
- type: Transform
pos: 51.5,-12.5
parent: 2
- proto: CP14SpellScrollDemiplaneInfiltration
entities:
- uid: 5562
@@ -110813,20 +110697,6 @@ entities:
- type: Transform
pos: 52.5,-12.5
parent: 2
- proto: CP14SpawnUniqueTradepost
entities:
- uid: 4176
components:
- type: Transform
pos: 51.5,-12.5
parent: 2
- proto: CP14SpawnUniqueTradepost
entities:
- uid: 4163
components:
- type: Transform
pos: -4.5,-10.5
parent: 2
- proto: CP14VialSmall
entities:
- uid: 2159
@@ -111637,14 +111507,6 @@ entities:
parent: 2
- type: Fixtures
fixtures: {}
- uid: 4814
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 4.5,-3.5
parent: 2
- type: Fixtures
fixtures: {}
- uid: 4879
components:
- type: Transform
@@ -111676,6 +111538,13 @@ entities:
parent: 2
- type: Fixtures
fixtures: {}
- uid: 8327
components:
- type: Transform
pos: 5.5,-2.5
parent: 2
- type: Fixtures
fixtures: {}
- uid: 11568
components:
- type: Transform
@@ -126102,6 +125971,12 @@ entities:
parent: 2
- proto: CP14WoodenCabinetMerchant
entities:
- uid: 2688
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 6.5,-3.5
parent: 2
- uid: 5135
components:
- type: Transform
@@ -126114,6 +125989,148 @@ entities:
- type: Transform
pos: 8.5,-33.5
parent: 2
- uid: 2470
components:
- type: Transform
pos: -5.5,-6.5
parent: 2
- uid: 4268
components:
- type: Transform
pos: -13.5,-31.5
parent: 2
- uid: 4828
components:
- type: Transform
pos: 6.5,-5.5
parent: 2
- uid: 4850
components:
- type: Transform
pos: -3.5,6.5
parent: 2
- uid: 4893
components:
- type: Transform
pos: 6.5,-4.5
parent: 2
- uid: 8968
components:
- type: Transform
pos: 86.5,38.5
parent: 2
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents:
- 8970
- 8969
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- uid: 8971
components:
- type: Transform
pos: 87.5,38.5
parent: 2
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents:
- 8973
- 8972
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- uid: 8974
components:
- type: Transform
pos: 85.5,38.5
parent: 2
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents:
- 8979
- 8978
- 8977
- 8976
- 8975
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- uid: 9022
components:
- type: Transform
pos: 77.5,30.5
parent: 2
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents:
- 9033
- 9032
- 9031
- 9030
- 9029
- 9028
- 9027
- 9026
- 9025
- 9024
- 9023
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- uid: 17508
components:
- type: Transform
pos: 23.5,1.5
parent: 2
- proto: CP14WoodenChestFilledAlchemy
entities:
- uid: 12843
components:
- type: Transform
pos: -47.5,-73.5
parent: 2
- proto: CP14WoodenChestFilledCheese
entities:
- uid: 8943
components:
- type: Transform
pos: 85.5,30.5
parent: 2
- type: EntityStorage
air:
volume: 200
immutable: False
temperature: 293.14673
moles:
- 1.7459903
- 6.568249
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- proto: CP14WoodenChestFrame
entities:
- uid: 17
@@ -126165,6 +126182,14 @@ entities:
- type: Transform
pos: 21.5,1.5
parent: 2
- proto: CP14WoodenClosetMerchantFilled
entities:
- uid: 4814
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 4.5,-2.5
parent: 2
- proto: CP14WoodenDoor
entities:
- uid: 5336

2
Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/sell.yml
View File

@@ -76,7 +76,7 @@
- type: storePositionSell
id: Wood
price: 20
price: 5
factions:
- SpiceStream
- HelmirWeapon