Random tweaks (#1701)

* weather overlay offset * sack head clothing * remove raid * less mushrooms, less muhrooms hat * Update CP14VampireRuleSystem.cs * Update base_clothing.yml * fix * Revert "Update base_clothing.yml" This reverts commit e51d13fe77. * Update backpacks.yml * ашч * double game preset * Delete parts.yml * Update sack.yml * Update sack.yml * g * remove raids * fuck you
2025-08-24 15:58:35 +03:00
parent 66d382d5ec
commit 3c534069a4
25 changed files with 320 additions and 394 deletions
--- a/Content.Client/Overlays/StencilOverlay.Weather.cs
+++ b/Content.Client/Overlays/StencilOverlay.Weather.cs
@@ -18,6 +18,7 @@ public sealed partial class StencilOverlay
        var worldAABB = args.WorldAABB;
        var worldBounds = args.WorldBounds;
        var position = args.Viewport.Eye?.Position.Position ?? Vector2.Zero;
+        var eye = args.Viewport.Eye; //CP14

        // Cut out the irrelevant bits via stencil
        // This is why we don't just use parallax; we might want specific tiles to get drawn over
@@ -45,10 +46,17 @@ public sealed partial class StencilOverlay
                        continue;
                    }

-                    var gridTile = new Box2(tile.GridIndices * grid.Comp.TileSize,
-                        (tile.GridIndices + Vector2i.One) * grid.Comp.TileSize);
-
-                    worldHandle.DrawRect(gridTile, Color.White);
+                    //CP14 offset - required for isometric walls
+                    if (eye is not null)
+                    {
+                        Angle rotation = eye.Rotation * -1f;
+                        var offset = rotation.ToWorldVec() * -0.5f;
+                        var gridTile = new Box2(
+                            tile.GridIndices * grid.Comp.TileSize + offset,
+                            (tile.GridIndices + Vector2i.One) * grid.Comp.TileSize + offset);
+                        worldHandle.DrawRect(gridTile, Color.White);
+                    }
+                    //CP14 offset end
                }
            }

--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -31,7 +31,9 @@ public sealed partial class AdminVerbSystem
    private static readonly EntProtoId DefaultThiefRule = "Thief";
    private static readonly ProtoId<StartingGearPrototype> PirateGearId = "PirateGear";
    //CP14
-    private static readonly EntProtoId CP14VampireRule = "CP14GameRuleVampireClanBattle";
+    private static readonly EntProtoId CP14VampireUnnameable = "CP14GameRuleVampireClanUnnameable";
+    private static readonly EntProtoId CP14VampireDevourers = "CP14GameRuleVampireClanDevourers";
+    private static readonly EntProtoId CP14VampireNightChildrens = "CP14GameRuleVampireClanNightChildrens";
    //CP14 end

    private static readonly EntProtoId ParadoxCloneRuleId = "ParadoxCloneSpawn";
@@ -52,20 +54,47 @@ public sealed partial class AdminVerbSystem

        var targetPlayer = targetActor.PlayerSession;

-        Verb vampire = new()
+        Verb vampire3 = new()
        {
-            Text = Loc.GetString("cp14-admin-verb-text-make-vampire"),
+            Text = Loc.GetString("cp14-admin-verb-text-make-vampire") + ": " + Loc.GetString("cp14-vampire-fraction-name-night-childrens"),
            Category = VerbCategory.Antag,
-            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_CP14/Actions/Spells/vampire.rsi"),
-                "bite"),
+            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_CP14/Interface/Misc/vampire_icons.rsi"), "NightChildrens"),
            Act = () =>
            {
-                _antag.ForceMakeAntag<CP14VampireRuleComponent>(targetPlayer, CP14VampireRule);
+                _antag.ForceMakeAntag<CP14VampireRuleComponent>(targetPlayer, CP14VampireNightChildrens);
            },
            Impact = LogImpact.High,
            Message = Loc.GetString("cp14-admin-verb-make-vampire"),
        };
-        args.Verbs.Add(vampire);
+        args.Verbs.Add(vampire3);
+
+        Verb vampire2 = new()
+        {
+            Text = Loc.GetString("cp14-admin-verb-text-make-vampire") + ": " + Loc.GetString("cp14-vampire-fraction-name-devourers"),
+            Category = VerbCategory.Antag,
+            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_CP14/Interface/Misc/vampire_icons.rsi"), "Devourers"),
+            Act = () =>
+            {
+                _antag.ForceMakeAntag<CP14VampireRuleComponent>(targetPlayer, CP14VampireDevourers);
+            },
+            Impact = LogImpact.High,
+            Message = Loc.GetString("cp14-admin-verb-make-vampire"),
+        };
+        args.Verbs.Add(vampire2);
+
+        Verb vampire1 = new()
+        {
+            Text = Loc.GetString("cp14-admin-verb-text-make-vampire") + ": " + Loc.GetString("cp14-vampire-fraction-name-unnameable"),
+            Category = VerbCategory.Antag,
+            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_CP14/Interface/Misc/vampire_icons.rsi"), "Unnameable"),
+            Act = () =>
+            {
+                _antag.ForceMakeAntag<CP14VampireRuleComponent>(targetPlayer, CP14VampireUnnameable);
+            },
+            Impact = LogImpact.High,
+            Message = Loc.GetString("cp14-admin-verb-make-vampire"),
+        };
+        args.Verbs.Add(vampire1);

        /* CP14 disable default antags
        var traitorName = Loc.GetString("admin-verb-text-make-traitor");
--- a/Content.Server/_CP14/GameTicking/Rules/CP14VampireRuleSystem.cs
+++ b/Content.Server/_CP14/GameTicking/Rules/CP14VampireRuleSystem.cs
@@ -82,6 +82,6 @@ public sealed class CP14VampireRuleSystem : GameRuleSystem<CP14VampireRuleCompon
            args.AddLine(Loc.GetString("cp14-vampire-clans-battle-clan-lose-desc"));
        }

-        args.AddLine(Loc.GetString("cp14-vampire-clans-battle-alive-people", ("percent", alivePercentage * 100)));
+        args.AddLine(Loc.GetString("cp14-vampire-clans-battle-alive-people", ("percent", MathF.Round(alivePercentage * 100))));
    }
 }
--- a/Content.Shared/_CP14/Vampire/Components/CP14ShowVampireFactionComponent.cs
+++ b/Content.Shared/_CP14/Vampire/Components/CP14ShowVampireFactionComponent.cs
@@ -6,7 +6,6 @@ namespace Content.Shared._CP14.Vampire.Components;
 [RegisterComponent]
 [NetworkedComponent]
 [AutoGenerateComponentState]
-[Access(typeof(CP14SharedVampireSystem))]
 public sealed partial class CP14ShowVampireFactionComponent : Component
 {
    [DataField, AutoNetworkedField]
--- a/Resources/Locale/ru-RU/_CP14/vampire/vampire.ftl
+++ b/Resources/Locale/ru-RU/_CP14/vampire/vampire.ftl
@@ -18,7 +18,7 @@ cp14-vampire-tree-examine-level = Эссенции: ([color=red]{$essence}/{$lef
 cp14-vampire-essence-holder-examine = В этой жертве есть еще [color=red]{$essence} эссенции крови[/color].

 cp14-vampire-tree-other-title = Прогресс других кланов:
-cp14-vampire-tree-other-info = "{$name}": [color=red]{$count}[/color] эссенции, [color=red]{$lvl}[/color] уровень.
+cp14-vampire-tree-other-info = "{$name}": [color=red]({$essence}/{$left})[/color] эссенции, [color=red]{$lvl}[/color] уровень.
 cp14-vampire-gather-essence-no-left = There is no more essence here!

 ## Announcements
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml
@@ -1,4 +1,4 @@
- # TODO: recolor woth tags --- normal backpack T0 --- color backpack T0
+ # TODO: recolor with tags --- normal backpack T0 --- color backpack T0

 # ========================
 # Base
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml
@@ -34,3 +34,5 @@
    interfaces:
      enum.StorageUiKey.Key:
        type: StorageBoundUserInterface
+  - type: StaticPrice
+    price: 10 #TODO get rid of this
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/myconide.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/myconide.yml
@@ -69,7 +69,7 @@
      amount: 2
    - id: CP14ClothingHeadaAgaricHelmet
      amount: 1
-      prob: 0.3
+      prob: 0.05
  - type: Food
  - type: SolutionContainerManager
    solutions:
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml
@@ -1,83 +0,0 @@
- type: entity
-  id: CP14SpawnPointTownRaid
-  parent: MarkerBase
-  abstract: true
-  name: town raid ghost role spawn point
-  suffix: Town Raid
-  categories: [ ForkFiltered ]
-  components:
-  - type: GhostRole
-    name: cp14-ghost-role-information-name-raid-undead
-    allowMovement: true
-    description: cp14-ghost-role-information-description-raid-undead
-    rules: cp14-ghost-role-information-rules-raid
-    mindRoles:
-    - CP14MindRoleRaidAntag
-    raffle:
-      settings: default
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: _CP14/Mobs/Species/Skeleton/parts.rsi
-        state: full
-
-# Easy
-
- type: entity
-  id: CP14MobUndeadSkeletonWizardTownRaid
-  parent: CP14MobUndeadSkeletonWizardT2
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: RandomSpawner
-    prototypes:
-    - CP14BaseMobGroupSpawner #VFX
-    chance: 1
-    deleteSpawnerAfterSpawn: false
-  - type: EntityTableSpawner
-    deleteSpawnerAfterSpawn: false
-    offset: 1
-    table: !type:GroupSelector
-      rolls: !type:RangeNumberSelector
-        range: 3, 5
-      children:
-      - id: CP14MobUndeadZombie
-        weight: 2
-      - id: CP14MobUndeadZombieGearEasy1
-      - id: CP14MobUndeadZombieGearEasy2
-      - id: CP14MobUndeadZombieGearEasy3
-  - type: Tag
-    tags:
-    - FootstepSound
-    - CP14RaidLeader
-  - type: CP14SkillStorage
-    skillPoints:
-      Memory:
-        max: 4
-    freeLearnedSkills:
-    - SwordMastery
-    - RapierMastery
-    - SkimitarMastery
-    - MetamagicT1
-    - MetamagicT2
-    - HydrosophistryT1
-    - HydrosophistryT2
-    - PyrokineticT1
-    - PyrokineticT2
-    - CP14ActionSpellManaConsume
-    - CP14ActionSpellManaGift
-    - CP14ActionSpellManaConsumeElf
-    - CP14ActionSpellManaGiftElf
-    - CP14ActionSpellMagicSplitting
-  - type: Loadout
-    prototypes:
-    - CP14MobSkeletonWizardTownRaid
-
- type: entity
-  id: CP14SpawnPointTownRaidUndeadEasy
-  parent: CP14SpawnPointTownRaid
-  suffix: Town Raid (Undead, Easy)
-  components:
-  - type: GhostRoleMobSpawner
-    prototype: CP14MobUndeadSkeletonWizardTownRaid
-
--- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/parts.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/parts.yml
@@ -1,24 +0,0 @@
- type: entity
-  id: CP14IngredientBase # An item intended for crafting
-  parent: BaseItem
-  abstract: true
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Tiny
-
-# Buckle
- type: entity
-  id: CP14IronBuckle
-  parent: CP14IngredientBase
-  name: iron buckle
-  description: A sturdy metal buckle for fastening straps and belts.
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Ingredients/buckle.rsi
-    state: icon
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 2 # 1/5 iron bar (10u)
-  - type: StaticPrice
-    price: 2
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml
@@ -1,29 +1,34 @@
 - type: entity
  name: produce sack
-  id: CP14SackFarming
-  parent: BaseStorageItem
-  description: A bag for various fruits, vegetables, plants and anything else that grows in the garden.
+  id: CP14SackFarming #Remove "Farming"
+  parent: 
+  - BaseStorageItem
+  - CP14ClothingHeadBase
+  description: Bag for quick transport of items
  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Objects/Storage/sack.rsi
    state: icon
  - type: Item
-    size: Ginormous
+    size: Huge
+    shape:
+    - 0,0,3,3
  - type: Storage
    maxItemSize: Normal
    grid:
-    - 0,0,6,3
+    - 0,0,3,3
    quickInsert: true
    areaInsert: true
-    whitelist:
-      tags:
-        - CP14FarmFood
-        - CP14FitInMortar
  - type: Dumpable
  - type: PhysicalComposition
    materialComposition:
-      CP14Cloth: 35
+      CP14Cloth: 55
+  - type: FlashImmunity
+  - type: IdentityBlocker
+  - type: EyeProtection
+  - type: IngestionBlocker
+  - type: Blindfold

 - type: entity
  id: CP14SackFarmingVegetables
@@ -34,19 +39,19 @@
  - type: StorageFill
    contents:
      - id: CP14Wheat
-        amount: 4
+        amount: 2
      - id: CP14FoodCabbage
        orGroup: LargeVegetables
-        amount: 3
+        amount: 2
      - id: CP14FoodPumpkin
        orGroup: LargeVegetables
-        amount: 3
+        amount: 2
      - id: CP14FoodPotato
-        amount: 3
+        amount: 2
      - id: CP14FoodCucumber
-        amount: 3
+        amount: 2
      - id: CP14FoodTomatoes
-        amount: 3
+        amount: 2

 - type: entity
  id: CP14SackFarmingApple
@@ -56,13 +61,10 @@
  - type: StorageFill
    contents:
      - id: CP14FoodApple
-        amount: 6
+        amount: 3
      - id: CP14FoodApple
-        amount: 5
+        amount: 3
        prob: 0.6
-      - id: CP14FoodApple
-        amount: 5
-        prob: 0.4

 - type: entity
  id: CP14SackFarmingWheat
@@ -72,34 +74,32 @@
  - type: StorageFill
    contents:
      - id: CP14Wheat
-        amount: 8
+        amount: 4
      - id: CP14Wheat
-        amount: 5
+        amount: 2
        prob: 0.6
-      - id: CP14Wheat
-        amount: 5
-        prob: 0.4

 - type: entity
  id: CP14SackFarmingSeed
-  parent: CP14SackFarming
+  parent: BaseStorageItem
  name: seed sack
  description: A sack for various plant seeds.
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Objects/Storage/sack.rsi
    state: seed
  - type: Item
-    size: Small
+    size: Normal
+    shape:
+    - 0,0,3,3
  - type: Storage
-    maxItemSize: Tiny
+    maxItemSize: Small
    grid:
-    - 0,0,6,3
+    - 0,0,3,3
    quickInsert: true
    areaInsert: true
-    whitelist:
-      tags:
-        - CP14FarmSeed
+  - type: Dumpable
  - type: PhysicalComposition
    materialComposition:
      CP14Cloth: 25
@@ -112,33 +112,22 @@
  - type: StorageFill
    contents:
      - id: CP14SeedWheat
-        amount: 4
+        amount: 1
      - id: CP14SeedWheat
-        amount: 2
+        amount: 1
        prob: 0.6
-      - id: CP14SeedWheat
-        amount: 1
-        prob: 0.4
-      - id: CP14SeedPumpkin
-        amount: 3
      - id: CP14SeedPumpkin
        amount: 1
-        prob: 0.4
      - id: CP14SeedCucumber
-        amount: 3
+        amount: 1
      - id: CP14SeedTomato
-        amount: 3
+        amount: 1
      - id: CP14SeedCabbage
-        amount: 2
+        amount: 1
      - id: CP14SeedPepper
-        amount: 2
-      - id: CP14SeedSage
-        amount: 2
+        amount: 1
      - id: CP14SeedSage
        amount: 1
-        prob: 0.4
-      - id: CP14SeedCotton
-        amount: 2
      - id: CP14SeedCotton
        amount: 1
        prob: 0.4
--- a/Resources/Prototypes/_CP14/GameRules/events.yml
+++ b/Resources/Prototypes/_CP14/GameRules/events.yml
@@ -22,43 +22,8 @@
  id: CP14BasicCalmEventsTable
  table: !type:AllSelector
    children:
-    - id: CP14TestRaidSpawn
    - id: CP14Storm

-#- type: entity
-#  parent: CP14BaseStationEventLongDelay
-#  id: CP14ZombiesSpawn
-#  components:
-#  - type: StationEvent
-#    startAnnouncement: cp14-event-announcement-demiplane-outbreak
-#    startAudio:
-#      path: /Audio/_CP14/Announce/event_boom.ogg
-#    earliestStart: 20
-#    minimumPlayers: 15
-#    weight: 5
-#    duration: 60
-#  - type: VentCrittersRule
-#    entries:
-#    - id: CP14MobGroupSpawnerZombie
-#      prob: 0.08
-
- type: entity
-  parent: CP14BaseStationEventShortDelay
-  id: CP14TestRaidSpawn
-  components:
-  - type: StationEvent
-    startAnnouncement: cp14-event-announcement-demiplane-outbreak
-    startAudio:
-      path: /Audio/_CP14/Announce/event_boom.ogg
-    earliestStart: 20
-    minimumPlayers: 15
-    weight: 1
-    duration: 60
-  - type: VentCrittersRule
-    specialEntries:
-    - id: CP14SpawnPointTownRaidUndeadEasy
-      prob: 0.001
-
 - type: entity
  parent: CP14BaseStationEventLongDelay
  id: CP14Storm
--- a/Resources/Prototypes/_CP14/GameRules/subgamemodes.yml
+++ b/Resources/Prototypes/_CP14/GameRules/subgamemodes.yml
@@ -1,78 +1,39 @@
 - type: entity
  parent: CP14BaseGameRule
-  id: CP14GameRuleVampireClanBattle
+  id: CP14GameRuleVampireClanBattleTriple
  components:
  - type: CP14VampireRule
+  - type: GameRule
+    minPlayers: 30
+  - type: SubGamemodes
+    rules:
+    - id: CP14GameRuleVampireClanUnnameable
+    - id: CP14GameRuleVampireClanDevourers
+    - id: CP14GameRuleVampireClanNightChildrens
+
+- type: entity
+  parent: CP14BaseGameRule
+  id: CP14GameRuleVampireClanBattleDouble
+  components:
+  - type: CP14VampireRule
+  - type: GameRule
+    minPlayers: 20
+  - type: SubGamemodes
+    rules:
+    - id: CP14GameRuleVampireClanDevourers
+    - id: CP14GameRuleVampireClanNightChildrens
+
+- type: entity
+  parent: CP14BaseGameRule
+  id: CP14GameRuleVampireClanUnnameable
+  components:
  - type: AntagObjectives
    objectives:
    - CP14VampireObjectiveBloodPurity
    - CP14VampireObjectiveDefenseVillage
-  - type: GameRule
-    minPlayers: 20
  - type: AntagSelection
    selectionTime: IntraPlayerSpawn
    definitions:
-    # Night children clan
-    - prefRoles: [ CP14Vampire ]
-      min: 1
-      max: 3
-      playerRatio: 2
-      lateJoinAdditional: true
-      mindRoles:
-      - CP14MindRoleVampire
-      components:
-      - type: CP14Vampire
-        faction: NightChildrens
-      - type: CP14ShowVampireFaction
-        faction: NightChildrens
-      - type: Hunger
-        hungerThresholdAlerts:
-          Peckish: CP14VampirePeckish
-          Starving: CP14VampireStarving
-          Dead: CP14VampireStarving
-        starvingSlowdownModifier: 1.1 #Speed Up when hunger!
-      - type: PassiveDamage
-        allowedStates:
-        - Alive
-        - Critical
-        damage:
-          groups:
-            Brute: -3
-      briefing:
-        text: cp14-roles-antag-vampire-briefing-night-childrens
-        color: "#630f24"
-        sound: "/Audio/_CP14/Ambience/Antag/vampire.ogg"
-    # Devourers clan
-    - prefRoles: [ CP14Vampire ]
-      min: 1
-      max: 3
-      playerRatio: 2
-      lateJoinAdditional: true
-      mindRoles:
-      - CP14MindRoleVampire
-      components:
-      - type: CP14Vampire
-        faction: Devourers
-      - type: CP14ShowVampireFaction
-        faction: Devourers
-      - type: Hunger
-        hungerThresholdAlerts:
-          Peckish: CP14VampirePeckish
-          Starving: CP14VampireStarving
-          Dead: CP14VampireStarving
-        starvingSlowdownModifier: 1.1 #Speed Up when hunger!
-      - type: PassiveDamage
-        allowedStates:
-        - Alive
-        - Critical
-        damage:
-          groups:
-            Brute: -3
-      briefing:
-        text: cp14-roles-antag-vampire-briefing-devourers
-        color: "#630f24"
-        sound: "/Audio/_CP14/Ambience/Antag/vampire.ogg"
-    # Unnameable clan
    - prefRoles: [ CP14Vampire ]
      min: 1
      max: 3
@@ -103,3 +64,84 @@
        color: "#630f24"
        sound: "/Audio/_CP14/Ambience/Antag/vampire.ogg"

+- type: entity
+  parent: CP14BaseGameRule
+  id: CP14GameRuleVampireClanDevourers
+  components:
+  - type: AntagObjectives
+    objectives:
+    - CP14VampireObjectiveBloodPurity
+    - CP14VampireObjectiveDefenseVillage
+  - type: AntagSelection
+    selectionTime: IntraPlayerSpawn
+    definitions:
+    - prefRoles: [ CP14Vampire ]
+      min: 1
+      max: 3
+      playerRatio: 2
+      lateJoinAdditional: true
+      mindRoles:
+      - CP14MindRoleVampire
+      components:
+      - type: CP14Vampire
+        faction: Devourers
+      - type: CP14ShowVampireFaction
+        faction: Devourers
+      - type: Hunger
+        hungerThresholdAlerts:
+          Peckish: CP14VampirePeckish
+          Starving: CP14VampireStarving
+          Dead: CP14VampireStarving
+        starvingSlowdownModifier: 1.1 #Speed Up when hunger!
+      - type: PassiveDamage
+        allowedStates:
+        - Alive
+        - Critical
+        damage:
+          groups:
+            Brute: -3
+      briefing:
+        text: cp14-roles-antag-vampire-briefing-devourers
+        color: "#630f24"
+        sound: "/Audio/_CP14/Ambience/Antag/vampire.ogg"
+
+- type: entity
+  parent: CP14BaseGameRule
+  id: CP14GameRuleVampireClanNightChildrens
+  components:
+  - type: AntagObjectives
+    objectives:
+    - CP14VampireObjectiveBloodPurity
+    - CP14VampireObjectiveDefenseVillage
+  - type: AntagSelection
+    selectionTime: IntraPlayerSpawn
+    definitions:
+    - prefRoles: [ CP14Vampire ]
+      min: 1
+      max: 3
+      playerRatio: 2
+      lateJoinAdditional: true
+      mindRoles:
+      - CP14MindRoleVampire
+      components:
+      - type: CP14Vampire
+        faction: NightChildrens
+      - type: CP14ShowVampireFaction
+        faction: NightChildrens
+      - type: Hunger
+        hungerThresholdAlerts:
+          Peckish: CP14VampirePeckish
+          Starving: CP14VampireStarving
+          Dead: CP14VampireStarving
+        starvingSlowdownModifier: 1.1 #Speed Up when hunger!
+      - type: PassiveDamage
+        allowedStates:
+        - Alive
+        - Critical
+        damage:
+          groups:
+            Brute: -3
+      briefing:
+        text: cp14-roles-antag-vampire-briefing-night-childrens
+        color: "#630f24"
+        sound: "/Audio/_CP14/Ambience/Antag/vampire.ogg"
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
@@ -304,8 +304,8 @@
    - !type:CP14OreDunGen
      entity: CP14MobMonsterMyconideFlyagaric
      count: 5
-      minGroupSize: 7
-      maxGroupSize: 12
+      minGroupSize: 5
+      maxGroupSize: 9

 - type: cp14LocationModifier
  id: MyconideLumish
@@ -320,8 +320,8 @@
    - !type:CP14OreDunGen
      entity: CP14MobMonsterMyconideLumish
      count: 5
-      minGroupSize: 7
-      maxGroupSize: 12
+      minGroupSize: 5
+      maxGroupSize: 9

 - type: cp14LocationModifier
  id: EnemyCackle
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Vampire/heart.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Vampire/heart.yml
@@ -0,0 +1,89 @@
+- type: constructionGraph
+  id: CP14VampireClanHeartUnnameable
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: CP14VampireClanHeartUnnameableFrame
+          completed:
+            - !type:SnapToGrid
+          steps:
+            - material: CP14Stone
+              amount: 10
+              doAfter: 2
+
+    - node: CP14VampireClanHeartUnnameableFrame
+      entity: CP14VampireClanHeartFrameUnnameable
+      edges:
+        - to: CP14VampireClanHeartUnnameable
+          completed:
+            - !type:SnapToGrid
+          conditions:
+            - !type:CP14AllVampireClanRequired
+              faction: Unnameable
+          steps:
+            - material: CP14BloodEssence
+              amount: 1
+              doAfter: 1
+    - node: CP14VampireClanHeartUnnameable
+      entity: CP14VampireClanHeartUnnameable
+
+- type: constructionGraph
+  id: CP14VampireClanHeartDevourers
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: CP14VampireClanHeartDevourersFrame
+          completed:
+            - !type:SnapToGrid
+          steps:
+            - material: CP14Stone
+              amount: 10
+              doAfter: 2
+
+    - node: CP14VampireClanHeartDevourersFrame
+      entity: CP14VampireClanHeartFrameDevourers
+      edges:
+        - to: CP14VampireClanHeartDevourers
+          completed:
+            - !type:SnapToGrid
+          conditions:
+            - !type:CP14AllVampireClanRequired
+              faction: Devourers
+          steps:
+            - material: CP14BloodEssence
+              amount: 1
+              doAfter: 2
+    - node: CP14VampireClanHeartDevourers
+      entity: CP14VampireClanHeartDevourers
+
+- type: constructionGraph
+  id: CP14VampireClanHeartNightChildren
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: CP14VampireClanHeartNightChildrenFrame
+          completed:
+            - !type:SnapToGrid
+          steps:
+            - material: CP14Stone
+              amount: 10
+              doAfter: 2
+
+    - node: CP14VampireClanHeartNightChildrenFrame
+      entity: CP14VampireClanHeartFrameNightChildrens
+      edges:
+        - to: CP14VampireClanHeartNightChildren
+          completed:
+            - !type:SnapToGrid
+          conditions:
+            - !type:CP14AllVampireClanRequired
+              faction: NightChildrens
+          steps:
+            - material: CP14BloodEssence
+              amount: 1
+              doAfter: 2
+    - node: CP14VampireClanHeartNightChildren
+      entity: CP14VampireClanHeartNightChildren
--- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Vampire/workbench.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Vampire/workbench.yml
@@ -12,95 +12,4 @@
              amount: 3
              doAfter: 2
    - node: CP14WorkbenchVampire
-      entity: CP14WorkbenchVampire
-
-
- type: constructionGraph
-  id: CP14VampireClanHeartUnnameable
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: CP14VampireClanHeartUnnameableFrame
-          completed:
-            - !type:SnapToGrid
-          steps:
-            - material: CP14Stone
-              amount: 10
-              doAfter: 2
-
-    - node: CP14VampireClanHeartUnnameableFrame
-      entity: CP14VampireClanHeartFrameUnnameable
-      edges:
-        - to: CP14VampireClanHeartUnnameable
-          completed:
-            - !type:SnapToGrid
-          conditions:
-            - !type:CP14AllVampireClanRequired
-              faction: Unnameable
-          steps:
-            - material: CP14BloodEssence
-              amount: 1
-              doAfter: 1
-    - node: CP14VampireClanHeartUnnameable
-      entity: CP14VampireClanHeartUnnameable
-
- type: constructionGraph
-  id: CP14VampireClanHeartDevourers
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: CP14VampireClanHeartDevourersFrame
-          completed:
-            - !type:SnapToGrid
-          steps:
-            - material: CP14Stone
-              amount: 10
-              doAfter: 2
-
-    - node: CP14VampireClanHeartDevourersFrame
-      entity: CP14VampireClanHeartFrameDevourers
-      edges:
-        - to: CP14VampireClanHeartDevourers
-          completed:
-            - !type:SnapToGrid
-          conditions:
-            - !type:CP14AllVampireClanRequired
-              faction: Unnameable
-          steps:
-            - material: CP14BloodEssence
-              amount: 1
-              doAfter: 2
-    - node: CP14VampireClanHeartDevourers
-      entity: CP14VampireClanHeartDevourers
-
- type: constructionGraph
-  id: CP14VampireClanHeartNightChildren
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: CP14VampireClanHeartNightChildrenFrame
-          completed:
-            - !type:SnapToGrid
-          steps:
-            - material: CP14Stone
-              amount: 10
-              doAfter: 2
-
-    - node: CP14VampireClanHeartNightChildrenFrame
-      entity: CP14VampireClanHeartFrameNightChildrens
-      edges:
-        - to: CP14VampireClanHeartNightChildren
-          completed:
-            - !type:SnapToGrid
-          conditions:
-            - !type:CP14AllVampireClanRequired
-              faction: Unnameable
-          steps:
-            - material: CP14BloodEssence
-              amount: 1
-              doAfter: 2
-    - node: CP14VampireClanHeartNightChildren
-      entity: CP14VampireClanHeartNightChildren
+      entity: CP14WorkbenchVampire
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
@@ -310,7 +310,7 @@
    protoId: CP14String
  - !type:StackResource
    stack: CP14Cloth
-    count: 3
+    count: 5
  result: CP14SackFarming

 - type: CP14Recipe
--- a/Resources/Prototypes/_CP14/Roles/Antags/misc.yml
+++ b/Resources/Prototypes/_CP14/Roles/Antags/misc.yml
@@ -5,13 +5,6 @@
  setPreference: false
  objective: cp14-ghost-role-information-rules-demiplane

- type: antag
-  id: CP14RaidAntag
-  name: cp14-role-type-raid-antag-name
-  antagonist: true
-  setPreference: false
-  objective: cp14-ghost-role-information-rules-raid
-
 - type: antag
  id: CP14Vampire
  name: cp14-roles-antag-vampire-name
--- a/Resources/Prototypes/_CP14/Roles/MindRoles/mind_roles.yml
+++ b/Resources/Prototypes/_CP14/Roles/MindRoles/mind_roles.yml
@@ -7,15 +7,6 @@
    roleType: CP14DemiplaneAntagonist
    antagPrototype: CP14DemiplaneAntag

- type: entity
-  parent: BaseMindRoleAntag
-  id: CP14MindRoleRaidAntag
-  name: Raid Antag Role
-  components:
-  - type: MindRole
-    roleType: CP14RaidAntagonist
-    antagPrototype: CP14RaidAntag
-
 - type: entity
  parent: BaseMindRoleAntag
  id: CP14MindRoleVampire
--- a/Resources/Prototypes/_CP14/game_presets.yml
+++ b/Resources/Prototypes/_CP14/game_presets.yml
@@ -32,15 +32,27 @@
    - CP14BasicStationEventScheduler

 - type: gamePreset
-  id: CP14VampireClansBattle
+  id: CP14VampireClansBattleDouble
  name: cp14-vampire-clans-battle
  description: cp14-vampire-clans-description
  showInVote: true
  cP14Allowed: true
  minPlayers: 20
+  maxPlayers: 29
  rules:
    - CP14BasicStationEventScheduler
-    - CP14GameRuleVampireClanBattle
+    - CP14GameRuleVampireClanBattleDouble
+
+- type: gamePreset
+  id: CP14VampireClansBattleTriple
+  name: cp14-vampire-clans-battle
+  description: cp14-vampire-clans-description
+  showInVote: true
+  cP14Allowed: true
+  minPlayers: 30
+  rules:
+    - CP14BasicStationEventScheduler
+    - CP14GameRuleVampireClanBattleTriple

 #- type: gamePreset
 #  id: CP14Survival
--- a/Resources/Prototypes/_CP14/secret_weights.yml
+++ b/Resources/Prototypes/_CP14/secret_weights.yml
@@ -1,5 +1,6 @@
 - type: weightedRandom
  id: Secret
  weights:
-    CP14Peaceful: 0.5
-    CP14VampireClansBattle: 0.5
+    CP14Peaceful: 1
+    CP14GameRuleVampireClanBattleTriple: 1
+    CP14GameRuleVampireClanBattleDouble: 1
--- a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/equipped-HELMET.png
+++ b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/equipped-HELMET.png
--- a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/icon.png
+++ b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/icon.png
--- a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json
@@ -1,17 +1,21 @@
 {
  "version": 1,
-  "license": "All right reserved",
-  "copyright": "Created by Artista. Seed sack By Ell_Good", 
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Created by artista.rar_furrista, helmet by TheShuEd",
  "size": {
-    "x": 32,
-    "y": 32
+    "x": 48,
+    "y": 48
  },
  "states": [
    {
-        "name": "icon"
+      "name": "icon"
    },
    {
      "name": "seed"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
    }
  ]
 }
--- a/Resources/Textures/_CP14/Objects/Storage/sack.rsi/seed.png
+++ b/Resources/Textures/_CP14/Objects/Storage/sack.rsi/seed.png