Aftertest tweaks (#647)

* fix #641 * fix #639 * add copper, bloodflowers and wild sage into comoss island * remove additional alchemist and blacksmithes roles * more roundstart resources for alchemist and blacksmith * disable footprints system * cryo shuttle mechanic * update cargo ship * veryy magical * tips update * fix #635 * green cloak * Update T0_cure_poison.yml
2024-12-08 00:52:35 +03:00
parent 80be633aa1
commit 0662299120
25 changed files with 6268 additions and 6899 deletions
--- a/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs
+++ b/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs
@@ -1,8 +1,15 @@
+using System.Globalization;
+using System.Linq;
 using System.Numerics;
+using Content.Server.Chat.Systems;
+using Content.Server.Mind;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
+using Content.Server.Station.Systems;
 using Content.Shared._CP14.Cargo;
-using Content.Shared._CP14.Cargo.Prototype;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
+using Content.Shared.Roles.Jobs;
 using Robust.Shared.Map;
 using Robust.Shared.Random;

@@ -10,10 +17,14 @@ namespace Content.Server._CP14.Cargo;

 public sealed partial class CP14CargoSystem
 {
-    private EntityQuery<ArrivalsBlacklistComponent> _blacklistQuery;
+    [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
+    [Dependency] private readonly ChatSystem _chatSystem = default!;
+    [Dependency] private readonly MindSystem _mind = default!;
+    [Dependency] private readonly SharedJobSystem _job = default!;
+    [Dependency] private readonly StationJobsSystem _stationJobs = default!;
+
    private void InitializeShuttle()
    {
-        _blacklistQuery = GetEntityQuery<ArrivalsBlacklistComponent>();
        SubscribeLocalEvent<CP14TravelingStoreShipComponent, FTLCompletedEvent>(OnFTLCompleted);
    }

@@ -46,11 +57,14 @@ public sealed partial class CP14CargoSystem
    private void SendShuttleToStation(EntityUid shuttle, float startupTime = 0f)
    {
        var targetPoints = new List<EntityUid>();
-        var targetEnumerator = EntityQueryEnumerator<CP14TravelingStoreShipFTLTargetComponent, TransformComponent>(); //TODO - different method position location
+        var targetEnumerator =
+            EntityQueryEnumerator<CP14TravelingStoreShipFTLTargetComponent,
+                TransformComponent>(); //TODO - different method position location
        while (targetEnumerator.MoveNext(out var uid, out _, out _))
        {
            targetPoints.Add(uid);
        }
+
        if (targetPoints.Count == 0)
            return;

@@ -59,14 +73,23 @@ public sealed partial class CP14CargoSystem

        var shuttleComp = Comp<ShuttleComponent>(shuttle);

-        _shuttles.FTLToCoordinates(shuttle, shuttleComp, targetXform.Coordinates, targetXform.LocalRotation, hyperspaceTime: 5f, startupTime: startupTime);
+        _shuttles.FTLToCoordinates(shuttle,
+            shuttleComp,
+            targetXform.Coordinates,
+            targetXform.LocalRotation,
+            hyperspaceTime: 20f,
+            startupTime: startupTime);
    }

    private void SendShuttleToTradepost(EntityUid shuttle, EntityUid tradePostMap)
    {
        var shuttleComp = Comp<ShuttleComponent>(shuttle);

-        _shuttles.FTLToCoordinates(shuttle, shuttleComp, new EntityCoordinates(tradePostMap, Vector2.Zero), Angle.Zero, hyperspaceTime: 5f);
+        _shuttles.FTLToCoordinates(shuttle,
+            shuttleComp,
+            new EntityCoordinates(tradePostMap, Vector2.Zero),
+            Angle.Zero,
+            hyperspaceTime: 20f);
    }

    private void OnFTLCompleted(Entity<CP14TravelingStoreShipComponent> ent, ref FTLCompletedEvent args)
@@ -74,24 +97,68 @@ public sealed partial class CP14CargoSystem
        if (!TryComp<CP14StationTravelingStoreShipTargetComponent>(ent.Comp.Station, out var station))
            return;

-        if (station.TradePostMap is not null && Transform(ent).MapUid == Transform(station.TradePostMap.Value).MapUid)  //Landed on tradepost
+        if (station.TradePostMap is not null &&
+            Transform(ent).MapUid == Transform(station.TradePostMap.Value).MapUid) //Landed on tradepost
        {
            station.OnStation = false;

            var b = station.Balance;

+            PlayersPurgeJobs(ent);
+
            SellingThings((ent.Comp.Station, station)); // +balance
            TopUpBalance((ent.Comp.Station, station)); //+balance
            BuyToQueue((ent.Comp.Station, station)); //-balance +buyQueue
            TrySpawnBuyedThings((ent.Comp.Station, station));
            UpdateStorePositions((ent.Comp.Station, station));
        }
-        else   //Landed on station
+        else //Landed on station
        {
            station.OnStation = true;

            CashOut((ent.Comp.Station, station));
        }
+
        UpdateAllStores();
    }
+
+    private void PlayersPurgeJobs(Entity<CP14TravelingStoreShipComponent> ent)
+    {
+        var childrens = Transform(ent).ChildEnumerator;
+
+        HashSet<EntityUid> toDelete = new();
+        while (childrens.MoveNext(out var uid))
+        {
+            if (!_mind.TryGetMind(uid, out var mindId, out var mindComp))
+                continue;
+
+            if (!_job.MindTryGetJob(mindId, out var jobProto))
+                continue;
+
+            _adminLog.Add(LogType.Action,
+                LogImpact.High,
+                $"{ToPrettyString(uid):player} was leave the round on traveling merchant ship");
+
+            _chatSystem.DispatchStationAnnouncement(ent.Comp.Station,
+                Loc.GetString(
+                    "cp14-earlyleave-ship-announcement",
+                    ("character", mindComp.CharacterName ?? "Unknown"),
+                    ("entity", ent.Owner), // gender things for supporting downstreams with other languages
+                    ("job", CultureInfo.CurrentCulture.TextInfo.ToTitleCase(Loc.GetString(jobProto.Name)))
+                ),
+                Loc.GetString("cp14-ship-sender"),
+                playDefaultSound: false
+            );
+
+            _stationJobs.TryAdjustJobSlot(ent.Comp.Station, jobProto, 1, clamp: true);
+            toDelete.Add(uid);
+        }
+
+        while (toDelete.Count > 0)
+        {
+            var r = toDelete.First();
+            toDelete.Remove(r);
+            QueueDel(r);
+        }
+    }
 }
--- a/Content.Server/_CP14/Footprints/CP14FootprintsSystem.cs
+++ b/Content.Server/_CP14/Footprints/CP14FootprintsSystem.cs
@@ -8,7 +8,6 @@ using Content.Shared.Fluids.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Maps;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -30,8 +29,8 @@ public sealed class CP14FootprintsSystem : EntitySystem
    {
        base.Initialize();

-        SubscribeLocalEvent<Components.CP14FootprintTrailerComponent, MoveEvent>(OnTrailerMove);
-        SubscribeLocalEvent<Components.CP14FootprintTrailerComponent, StartCollideEvent>(OnTrailerCollide);
+        SubscribeLocalEvent<CP14FootprintTrailerComponent, MoveEvent>(OnTrailerMove);
+        SubscribeLocalEvent<CP14FootprintTrailerComponent, StartCollideEvent>(OnTrailerCollide);

        SubscribeLocalEvent<CP14FootprintHolderComponent, GotEquippedEvent>(OnHolderEquipped);
        SubscribeLocalEvent<CP14FootprintHolderComponent, GotUnequippedEvent>(OnHolderUnequipped);
@@ -135,6 +134,9 @@ public sealed class CP14FootprintsSystem : EntitySystem

    private void OnTrailerMove(Entity<Components.CP14FootprintTrailerComponent> ent, ref MoveEvent args)
    {
+        //Temporaly disabled
+        return;
+
        if (ent.Comp.holder is null)
            return;
        var footprint = ent.Comp.holder;
--- a/Content.Shared/Shuttles/Components/FTLMapComponent.cs
+++ b/Content.Shared/Shuttles/Components/FTLMapComponent.cs
@@ -18,7 +18,7 @@ public sealed partial class FTLMapComponent : Component
    /// What parallax to use for the background, immediately gets deffered to ParallaxComponent.
    /// </summary>
    [DataField]
-    public string Parallax = "Sky"; //CP14 parallax replacement
+    public string Parallax = "CP14Ocean"; //CP14 parallax replacement

    /// <summary>
    /// CP14 FTL map ambient color
--- a/Resources/Locale/en-US/_CP14/tips/tip.ftl
+++ b/Resources/Locale/en-US/_CP14/tips/tip.ftl
@@ -6,9 +6,12 @@ cp14-tips-5 = As an alchemist, if you mix some reagents together, you can no lon
 cp14-tips-6 = As an alchemist, remember to keep your cauldron off the stove or fire. Your potion may boil over, releasing a reagent cloud.
 cp14-tips-7 = You can use shields to parry enemy attacks! Hit the enemy with a shield strike immediately after his attack and you can knock the weapon out of his hands.
 cp14-tips-8 = If you run out of magic energy, you can still use spells and spend mana, but it will damage you and potentially render you unconscious!
-cp14-tips-9 = There are places in the world with positive or negative magical polarity. In these places, mana regenerates faster, or conversely, can be passively spent. To find such places, use the Aura Scanner.
+cp14-tips-9 = Don't go on the demiplanes alone, kids! The demiplanes are designed to be difficult for a group of 4 people.
 cp14-tips-10 = Tall bushes are good for hiding your character! But they slow you down a lot and make a lot of noise if you move in them.
 cp14-tips-11 = Don't forget to lock your doors if you don't want anyone to get in!
-cp14-tips-12 = DEBUG: Be careful with fire! Until we add ways to comfortably put out fires!
+cp14-tips-12 = You can examine the demiplane key to see what you can find in it. The information may be incomplete, but you can still navigate by it, and choose where you want to go.
 cp14-tips-13 = As a farmer, don't forget to water your vegetable garden! Plants die without watering.
-cp14-tips-14 = To pierce the dish, try combining different ingredients on a plate.
+cp14-tips-14 = To pierce the dish, try combining different ingredients on a plate.
+cp14-tips-15 = When you use the demiplane key, an unstable rift opens up that will draw in up to 4 nearby players after a while. 
+cp14-tips-16 = When moving between or from the demiplane, you can additionally grab a large item (or the corpse of a dead friend) by pulling it with you during the teleportation time.
+cp14-tips-17 = If you wish to leave the round, you may board a traveling ship. When it travels to the empire, you will leave the round and free up your role for another player.
--- a/Resources/Locale/en-US/_CP14/travelingStoreship/cryo.ftl
+++ b/Resources/Locale/en-US/_CP14/travelingStoreship/cryo.ftl
@@ -0,0 +1,2 @@
+cp14-ship-sender = A very magical announcement system
+cp14-earlyleave-ship-announcement = {$character} ({$job}) leaves the settlement on a merchant ship.
--- a/Resources/Locale/ru-RU/_CP14/tips/tip.ftl
+++ b/Resources/Locale/ru-RU/_CP14/tips/tip.ftl
@@ -6,9 +6,12 @@ cp14-tips-5 = Будучи алхимиком, если вы смешали ка
 cp14-tips-6 = Будучи алхимиком, не забывайте убрать ваш котелок с печки или костра. Ваше зелье может выкипеть, выпустив реагентное облако.
 cp14-tips-7 = Вы можете использовать щиты, чтобы парировать вражеские атаки! Попадите по противнику ударом щита сразу же после его атаки, и вы сможете выбить оружие из его рук.
 cp14-tips-8 = Если у вас кончилась магическая энергия, вы все еще можете использовать заклинания и тратить ману, но это будет наносить вам урон, и потенциально может лишить вас сознания!
-cp14-tips-9 = В мире существуют места, с положительной или отрицательной магической полярностью. В этих местах мана регенерирует быстрее, или наоборот, может пассивно тратиться. Чтобы найти такие места, используйте сканер ауры.
+cp14-tips-9 = Не ходите, дети, в демипланы в одиночку! Демипланы рассчитаны по сложности на группу из 4 человек.
 cp14-tips-10 = Высокие кусты неплохо прячут вашего персонажа! Но сильно замедляют передвижение и шумят, если вы двигаетесь в них.
 cp14-tips-11 = Не забывайте закрывать двери на ключ, если не хотите чтобы туда заходил кто попало!
-cp14-tips-12 = DEBUG: Будьте осторожны с огнем! Пока мы не добавили способов комфортно тушить пожары!
+cp14-tips-12 = Вы можете осмотреть ключ демиплана, чтобы узнать, что вы можете в нем найти. Информация может быть неполной, но по ней вы все равно можете ориентироваться, и выбирать куда вы хотите отправиться.
 cp14-tips-13 = Будучи фермером, не забывайте поливать свой огород! Растения умирают без полива.
-cp14-tips-14 = Чтобы пирготовить блюдо, попробуйте скомбинировать на тарелке разные игредиенты.
+cp14-tips-14 = Чтобы приготовить блюдо, попробуйте скомбинировать на тарелке разные игредиенты.
+cp14-tips-15 = Когда вы используете ключ демиплана, открывается нестабильный разлом, который через некоторое время затянет в себя до 4 ближайших игроков. 
+cp14-tips-16 = Перемещаясь между демипланом или из него, вы можете дополнительно захватить с собой большой предмет (или труп погибшего союзника), тяня его за собой во время момента телепортации.
+cp14-tips-17 = Если вы хотите покинуть раунд, вы можете сесть на странствующий корабль. Когда он отправится в империю, вы покинете раунд и освободите свою роль для другого игрока.
--- a/Resources/Locale/ru-RU/_CP14/travelingStoreship/cryo.ftl
+++ b/Resources/Locale/ru-RU/_CP14/travelingStoreship/cryo.ftl
@@ -0,0 +1,2 @@
+cp14-ship-sender = Очень магическая система оповещения
+cp14-earlyleave-ship-announcement = {$character} ({$job}) покидает поселение на торговом корабле.
--- a/Resources/Maps/_CP14/Ships/cargo_shuttle.yml
+++ b/Resources/Maps/_CP14/Ships/cargo_shuttle.yml
@@ -93,6 +93,39 @@ entities:
      rot: 3.141592653589793 rad
      pos: 0.5,-3.5
      parent: 1
+- proto: CP14BlueBottle
+  entities:
+  - uid: 73
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.1868525,4.558953
+      parent: 1
+- proto: CP14ChairWooden
+  entities:
+  - uid: 39
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.4904509,1.7075868
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 1.4735842,3.462273
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.495323,6.3642545
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.4109906,5.4531674
+      parent: 1
 - proto: CP14CurtainsRedOpened
  entities:
  - uid: 22
@@ -153,12 +186,6 @@ entities:
      parent: 1
 - proto: CP14FenceWoodSmallStraight
  entities:
-  - uid: 32
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,3.5
-      parent: 1
  - uid: 35
    components:
    - type: Transform
@@ -183,6 +210,32 @@ entities:
      rot: 3.141592653589793 rad
      pos: 0.5,6.5
      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 63
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,1.5
+      parent: 1
+- proto: CP14GreenBottle2
+  entities:
+  - uid: 75
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.0687864,6.6510777
+      parent: 1
 - proto: CP14IronDoorBankStaff
  entities:
  - uid: 50
@@ -190,24 +243,43 @@ entities:
    - type: Transform
      pos: 0.5,0.5
      parent: 1
+- proto: CP14OrangeBottle
+  entities:
+  - uid: 72
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.9675874,4.289
+      parent: 1
 - proto: CP14PaperFolderRed
  entities:
-  - uid: 63
+  - uid: 58
    components:
    - type: Transform
-      pos: -0.34691465,6.6029224
+      rot: 1.5707963267948966 rad
+      pos: 2.2494469,2.1800027
      parent: 1
-  - uid: 64
+  - uid: 68
    components:
    - type: Transform
-      pos: -0.50438666,6.4117675
+      rot: 1.5707963267948966 rad
+      pos: 2.4349785,2.4162087
      parent: 1
 - proto: CP14PenFeather
  entities:
-  - uid: 65
+  - uid: 52
    components:
    - type: Transform
-      pos: -0.34691465,6.0294585
+      rot: 1.5707963267948966 rad
+      pos: 2.300046,1.6063542
+      parent: 1
+- proto: CP14RedBottle
+  entities:
+  - uid: 74
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.4061184,4.289
      parent: 1
 - proto: CP14ShuttleWingBigL
  entities:
@@ -249,41 +321,35 @@ entities:
      parent: 1
 - proto: CP14TableWoodenCounter
  entities:
-  - uid: 39
+  - uid: 32
    components:
    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,4.5
      parent: 1
  - uid: 51
    components:
    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,5.5
-      parent: 1
-  - uid: 52
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,7.5
      parent: 1
  - uid: 53
    components:
    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,4.5
      parent: 1
  - uid: 54
    components:
    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,5.5
      parent: 1
  - uid: 56
    components:
    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,6.5
      parent: 1
  - uid: 61
    components:
@@ -291,20 +357,30 @@ entities:
      rot: 3.141592653589793 rad
      pos: 2.5,4.5
      parent: 1
- proto: CP14TravelingShop
-  entities:
-  - uid: 58
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,3.5
-      parent: 1
-  - uid: 59
+  - uid: 64
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 2.5,3.5
      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,1.5
+      parent: 1
 - proto: CP14WallMarbleBrick
  entities:
  - uid: 12
--- a/Resources/Maps/_CP14/comoss.yml
+++ b/Resources/Maps/_CP14/comoss.yml
--- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
@@ -21,19 +21,13 @@
        amount: 5
        #Random start resource
      - id: CP14VialSmallGroundQuartz
-        prob: 0.9
+      - id: CP14VialSmallGroundQuartz
      - id: CP14VialSmallBloodFlowerSap
-        prob: 0.7
      - id: CP14VialSmallAgaricMushroom
-        prob: 0.7
      - id: CP14VialSmallWildSage
-        prob: 0.7
      - id: CP14VialSmallBlueAmanita
-        prob: 0.7
      - id: CP14VialTinyChromiumSlime
-        prob: 0.3
      - id: CP14VialTinyLumiMushroom
-        prob: 0.3

 - type: entity
  parent: CP14WoodenCloset
@@ -111,9 +105,10 @@
    contents:
      - id: HandLabeler #TODO custom cp14 labeler
      - id: CP14WoodenPlanks10
-      - id: CP14Nail10
      - id: CP14CopperBar10
-      - id: CP14IronBar5
+      - id: CP14CopperBar10
+      - id: CP14IronBar10
+      - id: CP14GoldBar5

 - type: entity
  parent: CP14WoodenCloset
--- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
@@ -74,8 +74,14 @@
  id: CP14StationCrateLootFluff
  table: !type:GroupSelector
    children:
+    - id: CP14FoodPotato
+    - id: CP14AgaricMushroom #dont eat
+    - id: CP14Cloth10
+    - id: CP14CrayonWhite
    - !type:GroupSelector
      children:
+      - id: CP14ClothingCloakGreen
+      - id: CP14ClothingCloakWhite
      - id: CP14ClothingCloakFurcapeBlack
      - id: CP14ClothingCloakFurcapeBlue
      - id: CP14ClothingCloakRitualAttireLeather
@@ -84,10 +90,6 @@
      - id: CP14ClothingPantsSouthernMagician
      - id: CP14ClothingShirtMercenary
      - id: CP14ClothingShirtYellowWizard
-      - id: CP14FoodPotato
-      - id: CP14Cloth10
-      - id: CP14CrayonWhite
-        weight: 2
    - !type:GroupSelector
      children:
      - id: CP14DyeYellow
--- a/Resources/Prototypes/_CP14/Datasets/tips.yml
+++ b/Resources/Prototypes/_CP14/Datasets/tips.yml
@@ -2,4 +2,4 @@
  id: CP14Tips
  values:
    prefix: cp14-tips-
-    count: 14
+    count: 17
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_poison.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T0_cure_poison.yml
@@ -25,6 +25,7 @@
        damage:
          types:
            Poison: -10
+            Bloodloss: -10
            Caustic: -10
      - !type:Jitter
      - !type:ModifyBleedAmount
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/LightDarkness/T1_flash_light.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/LightDarkness/T1_flash_light.yml
@@ -33,6 +33,7 @@
    event: !type:CP14DelayedEntityWorldTargetActionEvent
      cooldown: 5
      castDelay: 0.5
+      breakOnMove: false

 - type: entity
  id: CP14RuneFlashLight
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/mercenary.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/mercenary.yml
@@ -34,8 +34,21 @@
 - type: entity
  parent: CP14ClothingCloakBase
  id: CP14ClothingCloakWhite
+  name: white cloak
+  description: A spacious white coat. For those who like to look aesthetically pleasing.
  components:
  - type: Sprite
    sprite: _CP14/Clothing/Cloak/Roles/General/white.rsi
  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Roles/General/white.rsi
+    sprite: _CP14/Clothing/Cloak/Roles/General/white.rsi
+
+- type: entity
+  parent: CP14ClothingCloakBase
+  id: CP14ClothingCloakGreen
+  name: green cloak
+  description: A spacious green coat. For those who like to look aesthetically pleasing.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Roles/General/green.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Roles/General/green.rsi
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml
@@ -26,19 +26,19 @@
 - type: entity
  id: CP14BiomeSpawnerGrassland
  parent: CP14BaseBiomeSpawner
-  suffix: Grassland
+  suffix: Comoss, grassland
  components:
  - type: Sprite
    layers:
      - state: grass
      - state: frame
  - type: CP14BiomeSpawner
-    biome: CP14GrasslandTestResult
+    biome: CP14GrasslandComossResources

 - type: entity
  id: CP14BiomeSpawnerCave
  parent: CP14BaseBiomeSpawner
-  suffix: Cave
+  suffix: Comoss, cave
  components:
  - type: Sprite
    layers:
@@ -47,7 +47,7 @@
        state: rock0
      - state: frame
  - type: CP14BiomeSpawner
-    biome: CP14CavesGeneric
+    biome: CP14CavesComossResources

 - type: entity
  id: CP14BiomeSpawnerCaveEmpty
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml
@@ -38,7 +38,7 @@
  - type: EntityStorage
    isCollidableWhenOpen: true
    enteringOffset: 0, -0.4
-    enteringRange: 0.06
+    enteringRange: 0.10
  - type: ContainerContainer
    containers:
      entity_storage: !type:Container
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
@@ -10,6 +10,7 @@
  - CP14ClothingCloakMaidArpon
  - CP14ClothingCloakRitualAttireLeather
  - CP14ClothingCloakWhite
+  - CP14ClothingCloakGreen

 - type: loadout
  id: CP14ClothingCloakFurcapeBlack
@@ -36,6 +37,11 @@
  equipment:
    cloak: CP14ClothingCloakWhite

+- type: loadout
+  id: CP14ClothingCloakGreen
+  equipment:
+    cloak: CP14ClothingCloakGreen
+
 # Eyes

 - type: loadoutGroup
--- a/Resources/Prototypes/_CP14/Maps/arenas.yml
+++ b/Resources/Prototypes/_CP14/Maps/arenas.yml
@@ -57,8 +57,8 @@
        - type: StationJobs
          availableJobs:
            CP14Adventurer: [ -1, -1 ]
-            CP14Alchemist: [ 2, 4 ]
-            CP14Blacksmith: [ 1, 2 ]
+            CP14Alchemist: [ 2, 2 ]
+            CP14Blacksmith: [ 1, 1 ]
            CP14Innkeeper: [ 3, 4 ]
            CP14Commandant: [1, 1]
            CP14Banker: [3, 4]
--- a/Resources/Prototypes/_CP14/Procedural/biome_markers.yml
+++ b/Resources/Prototypes/_CP14/Procedural/biome_markers.yml
@@ -1,9 +0,0 @@
-
- type: biomeMarkerLayer
-  id: CP14OreGold
-  entityMask:
-    CP14WallStone: CP14PlantPumpkinDeath
-  maxCount: 30
-  minGroupSize: 10
-  maxGroupSize: 15
-  radius: 4
--- a/Resources/Prototypes/_CP14/Procedural/biome_template_caves.yml
+++ b/Resources/Prototypes/_CP14/Procedural/biome_template_caves.yml
@@ -69,4 +69,53 @@
        domainWarpType: OpenSimplex2
        domainWarpAmp: 150
      entities:
-        - CP14FloorWater
+        - CP14FloorWater
+
+- type: biomeTemplate
+  id: CP14CavesComossResources
+  layers:
+    - !type:BiomeMetaLayer
+      template: CP14CavesFloor
+    - !type:BiomeEntityLayer # lumishrooms
+      threshold: 0.8
+      noise:
+        seed: 8
+        noiseType: OpenSimplex2
+        fractalType: Ridged
+        frequency: 0.045
+        octaves: 3
+        lacunarity: 1.8
+        gain: 0.7
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 120
+      allowedTiles:
+        - CP14FloorBase
+      entities:
+        - CP14GatherableLumiMushroom
+    #Walls
+    - !type:BiomeEntityLayer
+      threshold: -0.75
+      invert: true
+      noise:
+        seed: 0
+        noiseType: Perlin
+        fractalType: Ridged
+        octaves: 1
+        frequency: 0.05
+        gain: 0.5
+      allowedTiles:
+        - CP14FloorBase
+      entities:
+        - CP14WallStone
+    #Copper
+    - !type:BiomeEntityLayer
+      threshold: 0.5
+      noise:
+        seed: 20
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        frequency: 3
+      allowedTiles:
+        - CP14FloorBase
+      entities:
+        - CP14WallStoneCopperOre
--- a/Resources/Prototypes/_CP14/Procedural/biome_template_grasslands.yml
+++ b/Resources/Prototypes/_CP14/Procedural/biome_template_grasslands.yml
@@ -280,3 +280,96 @@
      entities:
        - CP14FloorWater
    # Lakes end
+
+- type: biomeTemplate
+  id: CP14GrasslandComossResources
+  layers:
+    - !type:BiomeMetaLayer
+      template: CP14Grassland
+    - !type:BiomeEntityLayer # blood flowers
+      threshold: 0.7
+      noise:
+        seed: 12
+        noiseType: OpenSimplex2
+        fractalType: Ridged
+        frequency: 0.05
+        octaves: 3
+        lacunarity: 1.8
+        gain: 0.7
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 120
+      allowedTiles:
+        - CP14FloorGrass
+        - CP14FloorGrassLight
+        - CP14FloorGrassTall
+      entities:
+        - CP14GatherableBloodFlower
+    - !type:BiomeEntityLayer # wild sage
+      threshold: 0.7
+      noise:
+        seed: 23
+        noiseType: OpenSimplex2
+        fractalType: Ridged
+        frequency: 0.05
+        octaves: 3
+        lacunarity: 1.8
+        gain: 0.7
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 120
+      allowedTiles:
+        - CP14FloorGrass
+        - CP14FloorGrassLight
+        - CP14FloorGrassTall
+      entities:
+        - CP14GatherableWildSage
+    - !type:BiomeMetaLayer
+      template: CP14GrasslandForest
+      threshold: 0.2
+      noise:
+        seed: 18
+        frequency: 0.02
+        fractalType: None
+    - !type:BiomeMetaLayer
+      template: CP14GrasslandHills
+      threshold: 0.4
+      noise:
+        seed: 14
+        frequency: 0.02
+        fractalType: None
+    # Lakes start
+    - !type:BiomeTileLayer
+      tile: CP14FloorSand
+      threshold: 0.55
+      noise:
+        seed: 14
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        frequency: 0.01
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 150
+    - !type:BiomeTileLayer
+      tile: CP14FloorDirt
+      threshold: 0.68
+      noise:
+        seed: 14
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        frequency: 0.01
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 150
+    - !type:BiomeEntityLayer
+      allowedTiles:
+        - CP14FloorDirt
+        - CP14FloorSand
+      threshold: 0.6
+      noise:
+        seed: 14
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        frequency: 0.01
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 150
+      entities:
+        - CP14FloorWater
+    # Lakes end
+  
--- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/green.rsi/equipped-CLOAK.png
+++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/green.rsi/equipped-CLOAK.png
--- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/green.rsi/icon.png
+++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/green.rsi/icon.png
--- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/green.rsi/meta.json
+++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/green.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CLA",
+    "copyright": "Created by TheShuEd",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-CLOAK",
+            "directions": 4
+        }
+    ]
+}