diff --git a/Content.Client/_CP14/DemiplaneTraveling/CP14DemiplaneMapWindow.xaml b/Content.Client/_CP14/DemiplaneTraveling/CP14DemiplaneMapWindow.xaml
index 59dac30aa9..2c41f04803 100644
--- a/Content.Client/_CP14/DemiplaneTraveling/CP14DemiplaneMapWindow.xaml
+++ b/Content.Client/_CP14/DemiplaneTraveling/CP14DemiplaneMapWindow.xaml
@@ -6,11 +6,10 @@
xmlns:nodeTree="clr-namespace:Content.Client._CP14.UserInterface.Systems.NodeTree"
xmlns:demiplaneTraveling="clr-namespace:Content.Client._CP14.DemiplaneTraveling"
Title="{Loc 'cp14-demiplane-map-title'}"
- MinSize="1200 850"
- SetSize="1200 850">
+ MinSize="1000 650"
+ SetSize="1800 950">
-
@@ -20,9 +19,10 @@
-
-
+
+
@@ -30,25 +30,30 @@
-
+
-
+
-
+
-
+
-
+
@@ -62,9 +67,16 @@
HorizontalExpand="True" HorizontalAlignment="Center" />
-
-
-
+
+
+
+
+
+
+
diff --git a/Content.Client/_CP14/DemiplaneTraveling/CP14DemiplaneMapWindow.xaml.cs b/Content.Client/_CP14/DemiplaneTraveling/CP14DemiplaneMapWindow.xaml.cs
index 68f191be4e..0fe1b8f87d 100644
--- a/Content.Client/_CP14/DemiplaneTraveling/CP14DemiplaneMapWindow.xaml.cs
+++ b/Content.Client/_CP14/DemiplaneTraveling/CP14DemiplaneMapWindow.xaml.cs
@@ -1,8 +1,11 @@
using System.Numerics;
using System.Text;
using Content.Client._CP14.UserInterface.Systems.NodeTree;
+using Content.Client.Administration.Managers;
using Content.Shared._CP14.DemiplaneTraveling;
+using Content.Shared.Administration;
using Robust.Client.AutoGenerated;
+using Robust.Client.Player;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
@@ -17,6 +20,8 @@ public sealed partial class CP14DemiplaneMapWindow : DefaultWindow
{
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly ILogManager _log = default!;
+ [Dependency] private readonly IPlayerManager _player = default!;
+ [Dependency] private readonly IClientAdminManager _admin = default!;
private CP14DemiplaneMapUiState? _cachedState;
private CP14DemiplaneMapNode? _selectedNode;
@@ -167,6 +172,9 @@ public sealed partial class CP14DemiplaneMapWindow : DefaultWindow
private void SelectNode(CP14DemiplaneMapNode? node)
{
_selectedNode = node;
+
+ var isAdmin = _admin.IsAdmin();
+
if (node == null)
{
DeselectNode();
@@ -233,6 +241,18 @@ public sealed partial class CP14DemiplaneMapWindow : DefaultWindow
EjectButton.Disabled = !node.InFrontierZone || node.InUsing;
RevokeButton.Disabled = !node.InUsing;
+
+ //Admin part
+ AdminPanel.Visible = isAdmin;
+
+ var adminSb = new StringBuilder();
+
+ adminSb.Append("Modifiers: \n");
+ foreach (var modifier in node.Modifiers)
+ {
+ adminSb.Append("- " + Loc.GetString(modifier.Id) + "\n");
+ }
+ AdminDescription.Text = adminSb.ToString();
}
private void DeselectNode()
diff --git a/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs b/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs
index 4506d26e8c..8df91fd489 100644
--- a/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs
+++ b/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs
@@ -2,6 +2,7 @@ using System.Linq;
using System.Numerics;
using Content.Server._CP14.Demiplane;
using Content.Server._CP14.Demiplane.Components;
+using Content.Server.Destructible;
using Content.Server.Station.Systems;
using Content.Shared._CP14.Demiplane.Components;
using Content.Shared._CP14.Demiplane.Prototypes;
@@ -27,6 +28,8 @@ public sealed partial class CP14StationDemiplaneMapSystem : CP14SharedStationDem
[Dependency] private readonly CP14DemiplaneSystem _demiplane = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
+ [Dependency] private readonly DestructibleSystem _destructible = default!;
+ [Dependency] private readonly DamageableSystem _damageable = default!;
public override void Initialize()
{
@@ -41,10 +44,10 @@ public sealed partial class CP14StationDemiplaneMapSystem : CP14SharedStationDem
SubscribeLocalEvent(OnNodeBlockerShutdown);
SubscribeLocalEvent(OnCoreInit);
- SubscribeLocalEvent(OnCoreDestroyed);
+ SubscribeLocalEvent(OnCoreShutdown);
}
- private void OnCoreDestroyed(Entity ent, ref DestructionEventArgs args)
+ private void OnCoreShutdown(Entity ent, ref DestructionEventArgs args)
{
if (TryComp(ent.Comp.Demiplane, out var demiplane))
{
@@ -151,7 +154,8 @@ public sealed partial class CP14StationDemiplaneMapSystem : CP14SharedStationDem
SpawnAttachedTo("CP14ImpactEffectMagicSplitting", Transform(uid).Coordinates);
_popup.PopupEntity(Loc.GetString("cp14-demiplane-revoke-item"), ent);
_popup.PopupEntity(Loc.GetString("cp14-demiplane-revoke-item"), uid);
- QueueDel(uid);
+ _damageable.TryChangeDamage(uid, ent.Comp.RevokeDamage, true);
+ _destructible.DestroyEntity(uid);
}
}
}
diff --git a/Content.Shared/_CP14/DemiplaneTraveling/CP14DemiplaneNavigationMapComponent.cs b/Content.Shared/_CP14/DemiplaneTraveling/CP14DemiplaneNavigationMapComponent.cs
index 13f9e3e1c8..efd9df0fb3 100644
--- a/Content.Shared/_CP14/DemiplaneTraveling/CP14DemiplaneNavigationMapComponent.cs
+++ b/Content.Shared/_CP14/DemiplaneTraveling/CP14DemiplaneNavigationMapComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Damage;
using Robust.Shared.Audio;
using Robust.Shared.Prototypes;
@@ -17,4 +18,13 @@ public sealed partial class CP14DemiplaneNavigationMapComponent : Component
[DataField]
public SoundSpecifier EjectSound = new SoundPathSpecifier("/Audio/Magic/ethereal_exit.ogg");
+
+ [DataField]
+ public DamageSpecifier RevokeDamage = new()
+ {
+ DamageDict = new()
+ {
+ { "Blunt", 100 },
+ },
+ };
}
diff --git a/Resources/Maps/_CP14/Dungeon/artifact_room.yml b/Resources/Maps/_CP14/Dungeon/artifact_room.yml
index 43a80a4cd3..91c45afebf 100644
--- a/Resources/Maps/_CP14/Dungeon/artifact_room.yml
+++ b/Resources/Maps/_CP14/Dungeon/artifact_room.yml
@@ -402,7 +402,7 @@ entities:
rot: -1.5707963267948966 rad
pos: 22.5,1.5
parent: 1
-- proto: CP14IronDoorGuardWeaponStorage
+- proto: CP14IronDoorRandomLocked
entities:
- uid: 62
components:
diff --git a/Resources/Prototypes/_CP14/Entities/Effects/sky_lightning.yml b/Resources/Prototypes/_CP14/Entities/Effects/sky_lightning.yml
index ed9eccdec9..52c04b5afc 100644
--- a/Resources/Prototypes/_CP14/Entities/Effects/sky_lightning.yml
+++ b/Resources/Prototypes/_CP14/Entities/Effects/sky_lightning.yml
@@ -70,6 +70,7 @@
- type: CP14AreaEntityEffect
range: 1
effects:
+ - !type:CP14SpellThrowFromUser
- !type:CP14SpellApplyEntityEffect
effects:
- !type:Electrocute
@@ -78,11 +79,6 @@
damage:
types:
Shock: 15
- - !type:FlammableReaction
- multiplier: 1.5
- - !type:AdjustTemperature
- amount: 15000
- - !type:Ignite
- type: CP14FarSound
closeSound:
path: /Audio/_CP14/Ambience/Lightning/lightning_close1.ogg
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml
index a6899ee95a..0be891af5d 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml
@@ -1,6 +1,6 @@
- type: entity
- id: CP14CrystalShardQuartz
parent: BaseItem
+ id: CP14CrystalShardQuartz
name: quartz shard
description: Natural quartz crystals that can absorb the magical energy of the world around them.
categories: [ ForkFiltered ]
@@ -26,4 +26,31 @@
juiceSolution:
reagents:
- ReagentId: CP14GroundQuartz
- Quantity: 7
\ No newline at end of file
+ Quantity: 7
+
+- type: entity
+ parent: BaseItem
+ id: CP14DimensitCrystal
+ name: dimensit shard
+ description: A fragment of the fabric of reality. An extremely valuable resource for those who know what they can do with it.
+ categories: [ ForkFiltered ]
+ components:
+ #- type: Tag
+ # tags:
+ # - CP14FitInMortar
+ - type: Item
+ size: Tiny
+ shape:
+ - 0,0,0,1
+ - type: Sprite
+ sprite: _CP14/Structures/Dungeon/demiplan_rift_core.rsi
+ layers:
+ - state: core1
+ map: ["random"]
+ - type: RandomSprite
+ available:
+ - random:
+ core1: ""
+ core2: ""
+ core3: ""
+ core4: ""
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml
index 275b43aca9..e5f414d482 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml
@@ -2,15 +2,17 @@
parent: BaseItem
id: CP14BaseDemiplaneKey
categories: [ ForkFiltered ]
- name: demiplane key
- description: The core that connects the real world to the demiplane. Use it to open a temporary passage to the other world.
+ name: demiplane coordinate key
+ description: A temporary blob of energy linking the real world and the demiplane. Use it before it dissipates.
components:
- type: Item
- size: Normal
+ size: Ginormous
- type: Sprite
- sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi
+ noRot: true
+ drawdepth: Effects
+ sprite: _CP14/Structures/Dungeon/demiplan_rift_core.rsi
layers:
- - state: core
+ - state: coord
- type: GuideHelp
guides:
- CP14_RU_Demiplanes
@@ -22,37 +24,30 @@
- Core
- EntryRoom
- Exit
-
-#- type: entity
-# id: CP14DemiplaneKeyT1
-# parent: CP14BaseDemiplaneKey
-# suffix: Level 3
-# components:
-# - type: CP14DemiplaneRandomGenerator
-# level: 3
-# limits:
-# Reward: 1
-# Danger: 1
-# GhostRoleDanger: 1
-# Fun: 1
-# Weather: 1
-# MapLight: 1
-#
-#- type: entity
-# id: CP14DemiplaneKeyT2
-# parent: CP14BaseDemiplaneKey
-# suffix: Level 6
-# components:
-# - type: Sprite
-# layers:
-# - state: core
-# color: red
-# - type: CP14DemiplaneRandomGenerator
-# level: 6
-# limits:
-# Reward: 1
-# Danger: 1.5
-# GhostRoleDanger: 1
-# Fun: 1
-# Weather: 1
-# MapLight: 1
\ No newline at end of file
+ - type: TimedDespawn
+ lifetime: 120
+ - type: CanMoveInAir
+ - type: RandomWalk
+ minSpeed: 0.25
+ maxSpeed: 0.75
+ - type: Physics
+ bodyType: Dynamic
+ bodyStatus: InAir
+ - type: Fixtures
+ fixtures:
+ fix1:
+ shape:
+ !type:PhysShapeAabb
+ bounds: "-0.25,-0.25,0.25,0.25"
+ density: 20
+ mask:
+ #- ItemMask # CP14 swap ItemMask to Impassable only
+ - Impassable
+ restitution: 0.3 # fite me
+ friction: 0.2
+ - type: PointLight
+ enabled: true
+ color: "#8f42ff"
+ energy: 1
+ radius: 2
+ netsync: false
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Demiplanes/round_end.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Demiplanes/round_end.yml
index 8295f9fe57..5610fa379a 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Demiplanes/round_end.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Demiplanes/round_end.yml
@@ -55,6 +55,7 @@
- type: ActivatableUI
key: enum.CP14DemiplaneMapUiKey.Key
requiresComplex: true
+ singleUser: true
- type: CP14DemiplaneNavigationMap
- type: UserInterface
interfaces:
@@ -168,12 +169,6 @@
collection: GlassSmash
- type: Destructible
thresholds:
- - trigger:
- !type:DamageTrigger
- damage: 350
- behaviors:
- - !type:DoActsBehavior
- acts: ["Destruction"]
- trigger:
!type:DamageTrigger
damage: 50
@@ -182,4 +177,14 @@
sound:
collection: GlassBreak
- !type:DoActsBehavior
- acts: ["Destruction"]
\ No newline at end of file
+ acts: ["Destruction"]
+ - !type:SpawnEntitiesBehavior
+ spawn:
+ CP14DimensitCrystal:
+ min: 4
+ max: 6
+ - !type:SpawnEntitiesBehavior
+ spawn:
+ CP14SkyLightningPurple:
+ min: 1
+ max: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml
index be845d5f01..f4360549eb 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml
@@ -298,9 +298,4 @@
sound:
collection: GlassBreak
- !type:DoActsBehavior
- acts: ["Destruction"]
- #- !type:SpawnEntitiesBehavior
- # spawn:
- # CP14StoneBlock1:
- # min: 5
- # max: 7
\ No newline at end of file
+ acts: ["Destruction"]
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_ice.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_ice.yml
index fad0a64fcc..054aa6e5e6 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_ice.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_ice.yml
@@ -1,7 +1,7 @@
- type: cp14DemiplaneLocation
id: T1IceCaves
levels:
- min: 4
+ min: 3
max: 7
icon:
sprite: _CP14/Interface/Misc/demiplane_locations.rsi
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/island_snow.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/island_snow.yml
index 7266b9ea72..d1b1ec45ca 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/island_snow.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/island_snow.yml
@@ -1,7 +1,7 @@
- type: cp14DemiplaneLocation
id: T1SnowIsland
levels:
- min: 3
+ min: 2
max: 5
icon:
sprite: _CP14/Interface/Misc/demiplane_locations.rsi
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/leaf_maze.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/leaf_maze.yml
index cf8a5dc61d..b8e81b530a 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/leaf_maze.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/leaf_maze.yml
@@ -2,7 +2,7 @@
id: T1LeafMaze
levels:
min: 3
- max: 5
+ max: 6
icon:
sprite: _CP14/Interface/Misc/demiplane_locations.rsi
state: leaf_maze
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/wastelands.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/wastelands.yml
index cc9e32f1ff..df6bbf3b97 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/wastelands.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/wastelands.yml
@@ -1,7 +1,7 @@
- type: cp14DemiplaneLocation
id: T1Wastelands
levels:
- min: 5
+ min: 3
max: 7
icon:
sprite: _CP14/Interface/Misc/demiplane_locations.rsi
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml
index adcf3bd031..cd4a73253b 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml
@@ -8,7 +8,7 @@
name: cp14-modifier-chasm
generationWeight: 0.6
categories:
- Danger: 0.33
+ Danger: 0.25
layers:
- !type:OreDunGen
entity: CP14Chasm
@@ -28,7 +28,7 @@
max: 10
generationWeight: 0.3
categories:
- Danger: 0.33
+ Danger: 0.25
blacklistTags:
- CP14DemiplaneCold
- CP14DemiplaneHerbals
@@ -66,7 +66,7 @@
max: 10
name: cp14-modifier-shadow-kudzu
categories:
- Danger: 0.3
+ Danger: 0.25
layers:
- !type:OreDunGen
entity: CP14AstralHaze
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
index 54256305e4..b92358c72e 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
@@ -8,7 +8,7 @@
name: cp14-modifier-zombie
generationWeight: 1.5
categories:
- Danger: 0.3
+ Danger: 0.25
blacklistTags:
- CP14DemiplaneHot
layers:
@@ -43,7 +43,7 @@
max: 5
name: cp14-modifier-dyno
categories:
- Danger: 0.2
+ Danger: 0.25
requiredTags:
- CP14DemiplaneHerbals
blacklistTags:
@@ -62,7 +62,7 @@
max: 5
name: cp14-modifier-dyno
categories:
- Danger: 0.3
+ Danger: 0.25
requiredTags:
- CP14DemiplaneHerbals
layers:
@@ -72,39 +72,6 @@
minGroupSize: 2
maxGroupSize: 3
-- type: cp14DemiplaneModifier
- id: EnemySkeletonT1
- levels:
- min: 3
- max: 5
- name: cp14-modifier-skeleton
- generationWeight: 1.5
- generationProb: 0.5
- categories:
- GhostRoleDanger: 1
- layers:
- - !type:OreDunGen
- entity: CP14SpawnPointGhostDemiplaneSkeletonT1
- count: 1
- minGroupSize: 1
- maxGroupSize: 3
-
-- type: cp14DemiplaneModifier
- id: EnemyLurker
- levels:
- min: 1
- max: 10
- generationWeight: 0.33
- generationProb: 0.25
- categories:
- GhostRoleDanger: 1
- layers:
- - !type:OreDunGen
- entity: SpawnPointGhostDemiplaneLurker
- count: 1
- minGroupSize: 1
- maxGroupSize: 1
-
# TIER 2
- type: cp14DemiplaneModifier
@@ -213,7 +180,7 @@
id: MobSlimeBase
levels:
min: 1
- max: 10
+ max: 5
categories:
Danger: 0.25
layers:
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml
new file mode 100644
index 0000000000..4302a7491e
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml
@@ -0,0 +1,32 @@
+- type: cp14DemiplaneModifier
+ id: EnemySkeletonT1
+ levels:
+ min: 3
+ max: 5
+ name: cp14-modifier-skeleton
+ generationWeight: 1.5
+ generationProb: 0.5
+ categories:
+ GhostRoleDanger: 1
+ layers:
+ - !type:OreDunGen
+ entity: CP14SpawnPointGhostDemiplaneSkeletonT1
+ count: 1
+ minGroupSize: 1
+ maxGroupSize: 3
+
+- type: cp14DemiplaneModifier
+ id: EnemyLurker
+ levels:
+ min: 1
+ max: 10
+ generationWeight: 0.33
+ generationProb: 0.25
+ categories:
+ GhostRoleDanger: 1
+ layers:
+ - !type:OreDunGen
+ entity: SpawnPointGhostDemiplaneLurker
+ count: 1
+ minGroupSize: 1
+ maxGroupSize: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml
index 4d5446b23f..6eb3282b08 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml
@@ -4,7 +4,7 @@
min: 1
max: 8
categories:
- Reward: 0.1
+ Reward: 0.15
layers:
- !type:OreDunGen
tileMask:
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml
index fe70d50885..0d98423bc4 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml
@@ -7,7 +7,7 @@
max: 10
name: cp14-modifier-dayflin
categories:
- Reward: 0.1
+ Reward: 0.15
requiredTags:
- CP14DemiplaneHerbals
- CP14DemiplaneOpenSky
@@ -29,7 +29,7 @@
max: 10
name: cp14-modifier-fly-agaric
categories:
- Reward: 0.1
+ Reward: 0.15
requiredTags:
- CP14DemiplaneHerbals
layers:
@@ -51,7 +51,7 @@
max: 10
name: cp14-modifier-blue-amanita
categories:
- Reward: 0.1
+ Reward: 0.15
requiredTags:
- CP14DemiplaneHerbals
layers:
@@ -72,7 +72,7 @@
max: 10
name: cp14-modifier-blood-flower
categories:
- Reward: 0.1
+ Reward: 0.15
requiredTags:
- CP14DemiplaneHerbals
layers:
@@ -93,7 +93,7 @@
max: 10
name: cp14-modifier-wild-sage
categories:
- Reward: 0.1
+ Reward: 0.15
requiredTags:
- CP14DemiplaneHerbals
- CP14DemiplaneOpenSky
@@ -115,7 +115,7 @@
max: 10
name: cp14-modifier-air-lily
categories:
- Reward: 0.1
+ Reward: 0.15
requiredTags:
- CP14DemiplaneHerbals
- CP14DemiplaneWater
@@ -138,7 +138,7 @@
max: 10
name: cp14-modifier-lumisroom
categories:
- Reward: 0.1
+ Reward: 0.15
requiredTags:
- CP14DemiplaneUnderground
layers:
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml
index 7ad0676747..93d254a823 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml
@@ -4,10 +4,10 @@
id: LootT1
levels:
min: 1
- max: 5
+ max: 3
generationWeight: 2
categories:
- Reward: 0.35
+ Reward: 0.15
layers:
- !type:OreDunGen
entity: CP14SpawnerDemiplaneLootT1
@@ -23,7 +23,7 @@
name: cp14-modifier-rabbits
generationWeight: 0.4
categories:
- Reward: 0.1
+ Reward: 0.15
requiredTags:
- CP14DemiplanePeacefulAnimals
layers:
@@ -58,7 +58,7 @@
max: 10
generationWeight: 0.4
categories:
- Reward: 0.05
+ Reward: 0.1
requiredTags:
- CP14DemiplaneAnimalsSwamp
layers:
@@ -80,7 +80,7 @@
name: cp14-modifier-sheeps
generationWeight: 0.4
categories:
- Reward: 0.2
+ Reward: 0.15
requiredTags:
- CP14DemiplanePeacefulAnimals
layers:
@@ -97,7 +97,7 @@
max: 10
name: cp14-modifier-ruins
categories:
- Reward: 0.15
+ Reward: 0.2
generationProb: 0.8
layers:
- !type:OreDunGen
@@ -115,7 +115,7 @@
max: 10
generationWeight: 2
categories:
- Reward: 0.35
+ Reward: 0.15
layers:
- !type:OreDunGen
entity: CP14SpawnerDemiplaneLootT2
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml
index 1808f29ff6..9b2e319da6 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml
@@ -8,7 +8,7 @@
name: cp14-modifier-iron-ore
unique: false
categories:
- Reward: 0.4
+ Reward: 0.25
requiredTags:
- CP14DemiplaneOres
- CP14DemiplaneOpenSky
@@ -17,7 +17,7 @@
entityMask:
- CP14WallStone
entity: CP14WallStoneIronOre
- count: 15
+ count: 20
minGroupSize: 2
maxGroupSize: 4
@@ -29,7 +29,7 @@
name: cp14-modifier-iron-ore
unique: false
categories:
- Reward: 0.4
+ Reward: 0.25
requiredTags:
- CP14DemiplaneOres
- CP14DemiplaneUnderground
@@ -38,7 +38,7 @@
entityMask:
- CP14WallStone
entity: CP14WallStoneIronOre
- count: 10
+ count: 15
minGroupSize: 4
maxGroupSize: 6
@@ -50,7 +50,7 @@
name: cp14-modifier-copper-ore
unique: false
categories:
- Reward: 0.3
+ Reward: 0.25
requiredTags:
- CP14DemiplaneOres
- CP14DemiplaneOpenSky
@@ -59,7 +59,7 @@
entityMask:
- CP14WallStone
entity: CP14WallStoneCopperOre
- count: 15
+ count: 20
minGroupSize: 2
maxGroupSize: 4
@@ -71,7 +71,7 @@
name: cp14-modifier-copper-ore
unique: false
categories:
- Reward: 0.3
+ Reward: 0.25
requiredTags:
- CP14DemiplaneOres
- CP14DemiplaneUnderground
@@ -80,7 +80,7 @@
entityMask:
- CP14WallStone
entity: CP14WallStoneCopperOre
- count: 10
+ count: 15
minGroupSize: 4
maxGroupSize: 6
@@ -94,7 +94,7 @@
name: cp14-modifier-gold-ore
unique: false
categories:
- Reward: 0.5
+ Reward: 0.25
requiredTags:
- CP14DemiplaneOres
- CP14DemiplaneOpenSky
@@ -115,7 +115,7 @@
name: cp14-modifier-gold-ore
unique: false
categories:
- Reward: 0.5
+ Reward: 0.25
requiredTags:
- CP14DemiplaneOres
- CP14DemiplaneUnderground
@@ -136,7 +136,7 @@
name: cp14-modifier-mithril-ore
unique: false
categories:
- Reward: 0.5
+ Reward: 0.25
requiredTags:
- CP14DemiplaneOres
- CP14DemiplaneOpenSky
@@ -157,7 +157,7 @@
name: cp14-modifier-mithril-ore
unique: false
categories:
- Reward: 0.5
+ Reward: 0.25
requiredTags:
- CP14DemiplaneOres
- CP14DemiplaneUnderground
diff --git a/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/coord.png b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/coord.png
new file mode 100644
index 0000000000..91e99aa623
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/coord.png differ
diff --git a/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core.png b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core.png
deleted file mode 100644
index f478826b2e..0000000000
Binary files a/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core1.png b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core1.png
new file mode 100644
index 0000000000..bfc63313c5
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core1.png differ
diff --git a/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core2.png b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core2.png
new file mode 100644
index 0000000000..585da487cb
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core2.png differ
diff --git a/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core3.png b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core3.png
new file mode 100644
index 0000000000..493be52a36
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core3.png differ
diff --git a/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core4.png b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core4.png
new file mode 100644
index 0000000000..84e8192b06
Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/core4.png differ
diff --git a/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/meta.json b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/meta.json
index d72cd21664..cae606cfd3 100644
--- a/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi/meta.json
@@ -1,14 +1,23 @@
{
"version": 1,
"license": "CC0-1.0",
- "copyright": "Core created by TheShuEd, connective created by omsoyk",
+ "copyright": "core1 core2 core3 core4 created by TheShuEd, connective created by omsoyk",
"size": {
"x": 32,
"y": 32
},
"states": [
{
- "name": "core"
+ "name": "core1"
+ },
+ {
+ "name": "core2"
+ },
+ {
+ "name": "core3"
+ },
+ {
+ "name": "core4"
},
{
"name": "connective",
@@ -26,6 +35,21 @@
0.15
]
]
+ },
+ {
+ "name": "coord",
+ "delays": [
+ [
+ 0.3,
+ 0.3,
+ 0.3,
+ 0.3,
+ 0.3,
+ 0.3,
+ 0.3,
+ 0.3
+ ]
+ ]
}
]
}