diff --git a/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Generation.cs b/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Generation.cs index 6dc9c12a0b..0c401426d7 100644 --- a/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Generation.cs +++ b/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Generation.cs @@ -4,12 +4,16 @@ using Content.Server._CP14.Demiplane.Components; using Content.Server._CP14.Demiplane.Jobs; using Content.Shared._CP14.Demiplane.Components; using Content.Shared._CP14.Demiplane.Prototypes; +using Content.Shared._CP14.MagicManacostModify; +using Content.Shared.Examine; using Content.Shared.Interaction.Events; +using Content.Shared.Verbs; using Robust.Shared.CPUJob.JobQueues; using Robust.Shared.CPUJob.JobQueues.Queues; using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Random; +using Robust.Shared.Utility; namespace Content.Server._CP14.Demiplane; @@ -19,10 +23,70 @@ public sealed partial class CP14DemiplaneSystem private readonly List<(CP14SpawnRandomDemiplaneJob Job, CancellationTokenSource CancelToken)> _expeditionJobs = new(); private const double JobMaxTime = 0.002; + [Dependency] private readonly ExamineSystemShared _examine = default!; + private void InitGeneration() { SubscribeLocalEvent(GeneratorMapInit); SubscribeLocalEvent(GeneratorUsedInHand); + + SubscribeLocalEvent>(OnVerbExamine); + } + + private void OnVerbExamine(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess) + return; + + var markup = GetDemiplanExamine(ent.Comp); + _examine.AddDetailedExamineVerb( + args, + ent.Comp, + markup, + Loc.GetString("cp14-demiplan-examine"), + "/Textures/Interface/VerbIcons/dot.svg.192dpi.png"); //TODO custom icon + } + + private FormattedMessage GetDemiplanExamine(CP14DemiplaneGeneratorDataComponent comp) + { + var msg = new FormattedMessage(); + + if (!_proto.TryIndex(comp.Location, out var indexedLocation)) + return msg; + + msg.AddMarkupOrThrow( + indexedLocation.Name is not null && _random.Prob(indexedLocation.ExamineProb) + ? Loc.GetString("cp14-demiplane-examine-title", ("location", Loc.GetString(indexedLocation.Name))) + : Loc.GetString("cp14-demiplane-examine-title-unknown")); + + List modifierNames = new(); + foreach (var modifier in comp.Modifiers) + { + if (!_proto.TryIndex(modifier, out var indexedModifier)) + continue; + + if (!_random.Prob(indexedModifier.ExamineProb)) + continue; + + if (indexedModifier.Name is null) + continue; + + if (modifierNames.Contains(indexedModifier.Name.Value)) + continue; + + modifierNames.Add(indexedModifier.Name.Value); + } + + if (modifierNames.Count > 0) + { + msg.AddMarkupOrThrow("\n" + Loc.GetString("cp14-demiplane-examine-modifiers")); + foreach (var name in modifierNames) + { + msg.AddMarkupOrThrow("\n- " + Loc.GetString(name)); + } + } + + return msg; } private void UpdateGeneration(float frameTime) diff --git a/Content.Shared/_CP14/Demiplane/Prototypes/CP14DemiplaneLocationPrototype.cs b/Content.Shared/_CP14/Demiplane/Prototypes/CP14DemiplaneLocationPrototype.cs index 2590e4bde1..cdccb4e876 100644 --- a/Content.Shared/_CP14/Demiplane/Prototypes/CP14DemiplaneLocationPrototype.cs +++ b/Content.Shared/_CP14/Demiplane/Prototypes/CP14DemiplaneLocationPrototype.cs @@ -26,4 +26,10 @@ public sealed partial class CP14DemiplaneLocationPrototype : IPrototype /// [DataField] public List> Tags = new(); + + [DataField] + public LocId? Name; + + [DataField] + public float ExamineProb = 0.75f; } diff --git a/Content.Shared/_CP14/Demiplane/Prototypes/CP14DemiplaneModifierPrototype.cs b/Content.Shared/_CP14/Demiplane/Prototypes/CP14DemiplaneModifierPrototype.cs index 34bc691777..fa016862d5 100644 --- a/Content.Shared/_CP14/Demiplane/Prototypes/CP14DemiplaneModifierPrototype.cs +++ b/Content.Shared/_CP14/Demiplane/Prototypes/CP14DemiplaneModifierPrototype.cs @@ -59,4 +59,10 @@ public sealed partial class CP14DemiplaneModifierPrototype : IPrototype /// [DataField] public List> RequiredTags = new(); + + [DataField] + public LocId? Name; + + [DataField] + public float ExamineProb = 0.75f; } diff --git a/Resources/Locale/en-US/_CP14/demiplane/examine.ftl b/Resources/Locale/en-US/_CP14/demiplane/examine.ftl new file mode 100644 index 0000000000..11f70e867a --- /dev/null +++ b/Resources/Locale/en-US/_CP14/demiplane/examine.ftl @@ -0,0 +1,6 @@ +cp14-demiplan-examine = Examine the demiplane + +cp14-demiplane-examine-title = Looking into the demiplane crystal, you may find that this demiplane leads to [color=yellow]{$location}[/color]. +cp14-demiplane-examine-title-unknown = Looking into the demiplane crystal, you can't figure out where it leads. + +cp14-demiplane-examine-modifiers = You may notice a presence here: \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/demiplane/locations.ftl b/Resources/Locale/en-US/_CP14/demiplane/locations.ftl new file mode 100644 index 0000000000..d010ca38f9 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/demiplane/locations.ftl @@ -0,0 +1,3 @@ +cp14-demiplane-location-cave = Dark caves +cp14-demiplane-location-cave-grass = Overgrown caves +cp14-demiplane-location-grassland-island = Green Island \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl new file mode 100644 index 0000000000..2abebfff97 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl @@ -0,0 +1,19 @@ +cp14-modifier-gold-ore = gold ore +cp14-modifier-iron-ore = iron ore +cp14-modifier-copper-ore = copper ore +cp14-modifier-quartz-crystal = quartz crystals +cp14-modifier-dayflin = dayflins +cp14-modifier-fly-agaric = fly agaric +cp14-modifier-blue-amanita = azure amanita +cp14-modifier-blood-flower = blood flowers +cp14-modifier-wild-sage = wild Sage +cp14-modifier-lumisroom = lumishrooms +cp14-modifier-explosive = explosive mines +cp14-modifier-ruins = ancient ruins +cp14-modifier-xeno = xenomorphs +cp14-modifier-zombie = swarms of undead +cp14-modifier-dyno = prehistoric fauna +cp14-modifier-mole = predatory moles +cp14-modifier-rabbits = rabbits +cp14-modifier-boars = wild boars +cp14-modifier-chasm = bottomless chasms diff --git a/Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl b/Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl index 63c88241e3..85ba907653 100644 --- a/Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl +++ b/Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl @@ -12,5 +12,5 @@ cp14-store-buy-alchemy-bureaucracy-desc = Feather pens, inkwells and a big stack cp14-store-buy-alchemy-farm-seeds-name = Seeds for farming cp14-store-buy-alchemy-farm-seeds-desc = A set of different seeds, for farming of all kinds! Don't limit yourself, buy several boxes at once, just in case the farmers eat everything and don't have any food left to process into seeds. -cp14-store-buy-alchemy-demiplan-name = Demiplan key -cp14-store-buy-alchemy-demiplan-desc = An unstable pocket dimension where doom or riches may await you? What could be better for your adventurers? Buy from us for a couple of gold pieces - resell to them for more, or bail them out. \ No newline at end of file +cp14-store-buy-alchemy-demiplan-name = 10 demiplane Keys +cp14-store-buy-alchemy-demiplan-desc = Unstable pocket dimensions where doom or riches may await you? What could be better for your adventurers? Buy from us for a couple of gold pieces - resell to them for more, or bail them out. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/examine.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/examine.ftl new file mode 100644 index 0000000000..85d1e49773 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/demiplane/examine.ftl @@ -0,0 +1,6 @@ +cp14-demiplan-examine = Изучить демиплан + +cp14-demiplane-examine-title = Вглядываясь в кристалл демиплана, вы можете обнаружить, что этот демиплан ведет в [color=yellow]{$location}[/color]. +cp14-demiplane-examine-title-unknown = Вглядываясь в кристалл демиплана, вы не можете понять куда он ведет. + +cp14-demiplane-examine-modifiers = Вы можете заметить здесь присутствие: \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/locations.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/locations.ftl new file mode 100644 index 0000000000..20f8324013 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/demiplane/locations.ftl @@ -0,0 +1,3 @@ +cp14-demiplane-location-cave = Темные пещеры +cp14-demiplane-location-cave-grass = Заросшие пещеры +cp14-demiplane-location-grassland-island = Зеленый остров \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl new file mode 100644 index 0000000000..0695434386 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl @@ -0,0 +1,19 @@ +cp14-modifier-gold-ore = золотой руды +cp14-modifier-iron-ore = железной руды +cp14-modifier-copper-ore = медной руды +cp14-modifier-quartz-crystal = кварцевых кристаллов +cp14-modifier-dayflin = днецветов +cp14-modifier-fly-agaric = мухоморов +cp14-modifier-blue-amanita = лазурной аманиты +cp14-modifier-blood-flower = кровоцветов +cp14-modifier-wild-sage = дикого Шалфея +cp14-modifier-lumisroom = люмигрибов +cp14-modifier-explosive = взрывных мин +cp14-modifier-ruins = древних руин +cp14-modifier-xeno = ксеноморфов +cp14-modifier-zombie = толп нежити +cp14-modifier-dyno = доисторической фауны +cp14-modifier-mole = хищных кротов +cp14-modifier-rabbits = кроликов +cp14-modifier-boars = диких кабанов +cp14-modifier-chasm = бездонных пропастей diff --git a/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl b/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl index ade672b2f5..4cd7b3a9b2 100644 --- a/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl +++ b/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl @@ -12,5 +12,5 @@ cp14-store-buy-alchemy-bureaucracy-desc = Ручки, чернильницы и cp14-store-buy-alchemy-farm-seeds-name = Семена для фермерства cp14-store-buy-alchemy-farm-seeds-desc = Набор разных семян, для фермерства всех видов! Не ограничивайте себя, купите сразу несколько ящиков, на случай, если фермеры все съедят и не оставят еды на переработку в семена. -cp14-store-buy-alchemy-demiplan-name = Ключ демиплана -cp14-store-buy-alchemy-demiplan-desc = Нестабильное карманное измерение, в котором вас может поджидать гибель или богатства? Что может быть лучше для ваших авантюристов? Купите у нас за пару золотых - перепродайте им подороже, или под залог. \ No newline at end of file +cp14-store-buy-alchemy-demiplan-name = 10 ключей демиплана +cp14-store-buy-alchemy-demiplan-desc = Нестабильные карманные измерения, в котором вас может поджидать гибель или богатства? Что может быть лучше для ваших авантюристов? Купите у нас за пару золотых - перепродайте им подороже, или под залог. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml index 33c5b54d97..fef441775b 100644 --- a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml @@ -59,4 +59,20 @@ - id: CP14SeedCucumber amount: 3 - id: CP14SeedTomato - amount: 3 \ No newline at end of file + amount: 3 + +- type: entity + parent: CP14BrassChest + id: CP14BrassChestFilledDemiplanes + suffix: Demiplanes + components: + - type: StorageFill + contents: + - id: CP14DemiplanKey + amount: 9 + - id: CP14DemiplanKey + amount: 1 + prob: 0.5 + - id: CP14DemiplanKey + amount: 1 + prob: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/subdimensionGenTEST.yml b/Resources/Prototypes/_CP14/Entities/subdimensionGenTEST.yml index b2aacf45cb..80ccd5e466 100644 --- a/Resources/Prototypes/_CP14/Entities/subdimensionGenTEST.yml +++ b/Resources/Prototypes/_CP14/Entities/subdimensionGenTEST.yml @@ -26,26 +26,6 @@ difficultyLimit: 0.75 maxModifiers: 6 -- type: entity - id: CP14DemiplanKeyHard - parent: CP14BaseSubdimensionalKey - name: hard demiplan key - hard - components: - - type: CP14DemiplaneGeneratorData - rewardLimit: 2.25 - difficultyLimit: 1.75 - maxModifiers: 10 - -- type: entity - id: CP14DemiplanKeyHardcore - parent: CP14BaseSubdimensionalKey - name: demiplan key - HARDCORE - components: - - type: CP14DemiplaneGeneratorData - rewardLimit: 4.25 - difficultyLimit: 2.75 - maxModifiers: 15 - - type: entity id: CP14DemiplanRiftCore categories: [ ForkFiltered ] diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves.yml index fb4b6f6bda..9e4e6f6e28 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves.yml @@ -1,6 +1,7 @@ - type: cp14DemiplaneLocation id: T1Caves locationConfig: CP14DemiplaneCaves + name: cp14-demiplane-location-cave tags: - CP14DemiplaneCave - CP14DemiplaneUnderground diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves_ring.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves_ring.yml index 57d16cbb77..034a9e85d4 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves_ring.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves_ring.yml @@ -1,6 +1,7 @@ - type: cp14DemiplaneLocation id: T1CavesRing locationConfig: CP14DemiplaneCavesRing + name: cp14-demiplane-location-cave tags: - CP14DemiplaneCave - CP14DemiplaneUnderground diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grass_geode.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grass_geode.yml index be43562228..8a148aef81 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grass_geode.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grass_geode.yml @@ -1,6 +1,7 @@ - type: cp14DemiplaneLocation id: T1GrassGeode locationConfig: CP14DemiplaneGrassGeode + name: cp14-demiplane-location-cave-grass tags: - CP14DemiplaneCave - CP14DemiplaneGrass diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml index 3c12395405..f068e41d1e 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml @@ -1,6 +1,7 @@ - type: cp14DemiplaneLocation id: T1GrasslandIsland locationConfig: CP14DemiplaneGrasslandIsland + name: cp14-demiplane-location-grassland-island tags: - CP14DemiplaneCave - CP14DemiplaneOpenSky diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island_ring.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island_ring.yml index fd4b7b43ab..47f29cc93a 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island_ring.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island_ring.yml @@ -1,6 +1,7 @@ - type: cp14DemiplaneLocation id: T1GrasslandIslandRing locationConfig: CP14DemiplaneGrasslandIslandRing + name: cp14-demiplane-location-grassland-island tags: - CP14DemiplaneOpenSky - CP14DemiplaneGrass diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml index 4d0eb05920..35b5f6f806 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml @@ -1,5 +1,6 @@ - type: cp14DemiplaneModifier id: GoldOre + name: cp14-modifier-gold-ore unique: false reward: 0.5 requiredTags: @@ -15,6 +16,7 @@ - type: cp14DemiplaneModifier id: IronOre + name: cp14-modifier-iron-ore unique: false reward: 0.4 requiredTags: @@ -30,6 +32,7 @@ - type: cp14DemiplaneModifier id: CopperOre + name: cp14-modifier-copper-ore unique: false reward: 0.3 requiredTags: @@ -45,6 +48,7 @@ - type: cp14DemiplaneModifier id: QuartzCrystal + name: cp14-modifier-quartz-crystal reward: 0.1 requiredTags: - CP14DemiplaneCave @@ -59,6 +63,7 @@ - type: cp14DemiplaneModifier id: QuartzCrystalRubies + name: cp14-modifier-quartz-crystal reward: 0.2 generationWeight: 0.1 requiredTags: @@ -75,6 +80,7 @@ - type: cp14DemiplaneModifier id: QuartzCrystalTopazes + name: cp14-modifier-quartz-crystal reward: 0.2 generationWeight: 0.1 requiredTags: @@ -91,6 +97,7 @@ - type: cp14DemiplaneModifier id: QuartzCrystalEmeralds + name: cp14-modifier-quartz-crystal reward: 0.2 generationWeight: 0.1 requiredTags: @@ -109,6 +116,7 @@ - type: cp14DemiplaneModifier id: QuartzCrystalSapphires + name: cp14-modifier-quartz-crystal reward: 0.2 generationWeight: 0.1 requiredTags: @@ -127,6 +135,7 @@ - type: cp14DemiplaneModifier id: QuartzCrystalAmethysts + name: cp14-modifier-quartz-crystal reward: 0.2 generationWeight: 0.1 requiredTags: @@ -143,6 +152,7 @@ - type: cp14DemiplaneModifier id: QuartzCrystalDiamonds + name: cp14-modifier-quartz-crystal reward: 0.2 generationWeight: 0.1 requiredTags: @@ -160,6 +170,7 @@ - type: cp14DemiplaneModifier id: Dayflin + name: cp14-modifier-dayflin reward: 0.2 requiredTags: - CP14DemiplaneGrass @@ -175,8 +186,27 @@ minGroupSize: 3 maxGroupSize: 5 +- type: cp14DemiplaneModifier + id: FlyAgaric + name: cp14-modifier-fly-agaric + reward: 0.2 + requiredTags: + - CP14DemiplaneGrass + layers: + - !type:OreDunGen + tileMask: + - CP14FloorBase + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + entity: CP14GatherableFlyAgaric + count: 10 + minGroupSize: 3 + maxGroupSize: 5 + - type: cp14DemiplaneModifier id: BlueAmanita + name: cp14-modifier-blue-amanita reward: 0.2 requiredTags: - CP14DemiplaneGrass @@ -193,6 +223,7 @@ - type: cp14DemiplaneModifier id: BloodFlower + name: cp14-modifier-blood-flower reward: 0.2 requiredTags: - CP14DemiplaneGrass @@ -209,6 +240,7 @@ - type: cp14DemiplaneModifier id: WildSage + name: cp14-modifier-wild-sage reward: 0.2 requiredTags: - CP14DemiplaneGrass @@ -226,6 +258,7 @@ - type: cp14DemiplaneModifier id: LumiShroom + name: cp14-modifier-lumisroom reward: 0.2 requiredTags: - CP14DemiplaneUnderground @@ -243,6 +276,7 @@ - type: cp14DemiplaneModifier id: Explosive + name: cp14-modifier-explosive difficulty: 0.4 generationWeight: 0.25 layers: @@ -254,6 +288,7 @@ - type: cp14DemiplaneModifier id: Ruins + name: cp14-modifier-ruins reward: 0.35 generationWeight: 2 layers: @@ -265,6 +300,7 @@ - type: cp14DemiplaneModifier id: EnemyXeno + name: cp14-modifier-xeno difficulty: 0.5 requiredTags: - CP14DemiplaneUnderground @@ -282,6 +318,7 @@ - type: cp14DemiplaneModifier id: EnemyZombie + name: cp14-modifier-zombie difficulty: 0.4 generationWeight: 1.5 layers: @@ -293,6 +330,7 @@ - type: cp14DemiplaneModifier id: EnemyDyno + name: cp14-modifier-dyno difficulty: 0.5 requiredTags: - CP14DemiplaneOpenSky @@ -306,6 +344,7 @@ - type: cp14DemiplaneModifier id: SmallHydra + name: cp14-modifier-dyno difficulty: 0.5 requiredTags: - CP14DemiplaneGrass @@ -318,7 +357,8 @@ - type: cp14DemiplaneModifier id: EnemyMole - difficulty: 0.5 + name: cp14-modifier-mole + difficulty: 0.4 requiredTags: - CP14DemiplaneUnderground - CP14DemiplaneCave @@ -327,23 +367,13 @@ tileMask: - CP14FloorBase entity: CP14MobMonsterMole - count: 5 + count: 6 minGroupSize: 1 - maxGroupSize: 2 - -- type: cp14DemiplaneModifier - id: EnemyMagmawind - difficulty: 0.3 - generationWeight: 0.4 - layers: - - !type:OreDunGen - entity: CP14MobWatcherMagmawing - count: 5 - minGroupSize: 2 - maxGroupSize: 3 + maxGroupSize: 1 - type: cp14DemiplaneModifier id: Rabbits + name: cp14-modifier-rabbits reward: 0.2 generationWeight: 0.4 requiredTags: @@ -361,6 +391,7 @@ - type: cp14DemiplaneModifier id: Boar + name: cp14-modifier-boars reward: 0.2 difficulty: 0.2 generationWeight: 0.4 @@ -379,6 +410,7 @@ - type: cp14DemiplaneModifier id: Chasm + name: cp14-modifier-chasm difficulty: 0.2 generationWeight: 0.6 layers: diff --git a/Resources/Prototypes/_CP14/Store/buy.yml b/Resources/Prototypes/_CP14/Store/buy.yml index e75312a7d1..b7510d7fc2 100644 --- a/Resources/Prototypes/_CP14/Store/buy.yml +++ b/Resources/Prototypes/_CP14/Store/buy.yml @@ -63,10 +63,10 @@ CP14BrassChestFilledFarmSeeds: 1 - type: storePositionBuy - id: Demiplan + id: Demiplane name: cp14-store-buy-alchemy-demiplan-name desc: cp14-store-buy-alchemy-demiplan-desc - code: DEMIPLAN + code: DEMIPLANE icon: sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift.rsi state: pulse @@ -76,4 +76,4 @@ services: - !type:CP14BuyItemsService product: - CP14DemiplanKey: 1 \ No newline at end of file + CP14BrassChestFilledDemiplanes: 1 \ No newline at end of file