From aefad2565ff9932fec6032c0baad38ab445d837d Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Thu, 22 Aug 2024 10:52:27 +1000 Subject: [PATCH 01/12] Added Resurrection trigger and more effects --- .../ArtifactResurrectionTriggerComponent.cs | 14 ++ .../ArtifactResurrectionTriggerSystem.cs | 41 ++++ .../en-US/xenoarchaeology/artifact-hints.ftl | 1 + Resources/Prototypes/Polymorphs/polymorph.yml | 36 ++++ .../XenoArch/Effects/normal_effects.yml | 192 +++++++++++++++++- .../Prototypes/XenoArch/artifact_triggers.yml | 7 + 6 files changed, 286 insertions(+), 5 deletions(-) create mode 100644 Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactResurrectionTriggerComponent.cs create mode 100644 Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactResurrectionTriggerSystem.cs diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactResurrectionTriggerComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactResurrectionTriggerComponent.cs new file mode 100644 index 00000000000000..5bcaecfd8d852a --- /dev/null +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactResurrectionTriggerComponent.cs @@ -0,0 +1,14 @@ +namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components; + +/// +/// Triggers when a nearby entity is resurrected +/// +[RegisterComponent] +public sealed partial class ArtifactResurrectionTriggerComponent : Component +{ + /// + /// How close to the resurrection the artifact has to be for it to trigger. + /// + [DataField("range")] + public float Range = 15f; +} diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactResurrectionTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactResurrectionTriggerSystem.cs new file mode 100644 index 00000000000000..7d2a9667a5a8ff --- /dev/null +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactResurrectionTriggerSystem.cs @@ -0,0 +1,41 @@ +using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components; +using Content.Shared.Mobs; + +namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems; + +public sealed class ArtifactResurrectionTriggerSystem : EntitySystem +{ + [Dependency] private readonly ArtifactSystem _artifact = default!; + + /// + public override void Initialize() + { + SubscribeLocalEvent(OnMobStateChanged); + } + + private void OnMobStateChanged(MobStateChangedEvent ev) + { + if (ev.OldMobState != MobState.Dead || ev.NewMobState == MobState.Dead) + return; + + var resurrectionXform = Transform(ev.Target); + + var toActivate = new List>(); + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var trigger, out var xform)) + { + if (!resurrectionXform.Coordinates.TryDistance(EntityManager, xform.Coordinates, out var distance)) + continue; + + if (distance > trigger.Range) + continue; + + toActivate.Add((uid, trigger)); + } + + foreach (var a in toActivate) + { + _artifact.TryActivateArtifact(a); + } + } +} diff --git a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl index 98dfa89fa9fc8e..1b59d90c64965f 100644 --- a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl +++ b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl @@ -40,3 +40,4 @@ artifact-trigger-hint-regular-gases = Standard atmospheric gases artifact-trigger-hint-plasma = Gaseous plasma artifact-trigger-hint-land = Active deceleration artifact-trigger-hint-examine = Examination +artifact-trigger-hint-resurrection = Resurrection diff --git a/Resources/Prototypes/Polymorphs/polymorph.yml b/Resources/Prototypes/Polymorphs/polymorph.yml index 96739a50d3caff..7def7e696528fe 100644 --- a/Resources/Prototypes/Polymorphs/polymorph.yml +++ b/Resources/Prototypes/Polymorphs/polymorph.yml @@ -165,6 +165,42 @@ revertOnCrit: true duration: 20 +- type: polymorph + id: ArtifactBee + configuration: + entity: MobBee + forced: true + transferName: true + transferHumanoidAppearance: true + inventory: None + revertOnDeath: true + revertOnCrit: true + duration: 25 + +- type: polymorph + id: ArtifactClownSpider + configuration: + entity: MobClownSpider + forced: true + transferName: true + transferHumanoidAppearance: true + inventory: None + revertOnDeath: true + revertOnCrit: true + duration: 25 + +- type: polymorph + id: ArtifactFinfin + configuration: + entity: MobFinfin + forced: true + transferName: true + transferHumanoidAppearance: true + inventory: None + revertOnDeath: true + revertOnCrit: true + duration: 25 + # Polymorphs for Wizards polymorph self spell - type: polymorph id: WizardSpider diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index f2723e5369e475..588dd731a358cf 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -638,8 +638,30 @@ - id: RandomAnomalySpawner - type: artifactEffect - id: EffectBoom + id: EffectPortal + targetDepth: 3 + effectHint: artifact-effect-hint-displacement + components: + - type: PortalArtifact + +- type: artifactEffect + id: EffectLesserPresentSpawn targetDepth: 3 + effectHint: artifact-effect-hint-creation + components: + - type: SpawnArtifact + maxSpawns: 5 + spawns: + - id: PresentRandom + prob: 0.95 + - id: PresentRandomUnsafe + prob: 0.03 + - id: PresentRandomInsane + prob: 0.02 + + - type: artifactEffect + id: EffectBoom + targetDepth: 4 effectHint: artifact-effect-hint-environment components: - type: TriggerArtifact @@ -652,11 +674,171 @@ maxIntensity: 50 - type: artifactEffect - id: EffectPortal - targetDepth: 3 - effectHint: artifact-effect-hint-displacement + id: EffectMajorCashSpawn + targetDepth: 4 + effectHint: artifact-effect-hint-creation components: - - type: PortalArtifact + - type: SpawnArtifact + maxSpawns: 10 + spawns: + - id: SpaceCash100 + maxAmount: 5 + prob: 0.75 + - id: SpaceCash1000 + maxAmount: 2 + prob: 0.5 + - id: SpaceCash5000 + prob: 0.25 + - id: SpaceCash10000 + prob: 0.1 + - id: SpaceCash50000 + prob: 0.01 + +- type: artifactEffect + id: EffectFaunaSpawnDangerous + targetDepth: 4 + effectHint: artifact-effect-hint-creation + components: + - type: SpawnArtifact + maxSpawns: 10 + spawns: + - id: MobAdultSlimesYellowAngry + orGroup: fauna + - id: MobAngryBee + orGroup: fauna + - id: MobBearSpace + orGroup: fauna + - id: MobBee + orGroup: fauna + maxAmount: 10 + - id: MobKangarooSpace + orGroup: fauna + - id: MobMonkeySyndicateAgent #so lucky + orGroup: fauna + maxAmount: 1 + prob: 0.03 + maxAmount: 1 + - id: MobGrenadePenguin + orGroup: fauna + maxAmount: 2 + - id: MobPurpleSnake + orGroup: fauna + - id: MobSpiderSpace + orGroup: fauna + - id: MobTick + orGroup: fauna + - id: MobXenoRavager + orGroup: fauna + +- type: artifactEffect + id: EffectFoamVeryDangerous + targetDepth: 4 + effectHint: artifact-effect-hint-biochemical + components: + - type: FoamArtifact + minFoamAmount: 30 + maxFoamAmount: 40 + reagents: + - SpaceDrugs + - Nocturine + - MuteToxin + - Phlogiston + - CarpoToxin + - Uranium + - BuzzochloricBees + - JuiceThatMakesYouWeh + - Lead + - ForeverWeed + - Romerol + prob: 0.1 + +- type: artifactEffect + id: EffectClownSpider + targetDepth: 4 + effectHint: artifact-effect-hint-polymorph + components: + - type: PolyOthersArtifact + polymorphPrototypeName: ArtifactClownSpider + +- type: artifactEffect + id: EffectFinfin + targetDepth: 4 + effectHint: artifact-effect-hint-polymorph + components: + - type: PolyOthersArtifact + polymorphPrototypeName: ArtifactFinfin + +- type: artifactEffect + id: EffectPolymorphBee + targetDepth: 4 + effectHint: artifact-effect-hint-polymorph + components: + - type: PolyOthersArtifact + polymorphPrototypeName: ArtifactBee + +- type: artifactEffect + id: EffectHealAllPowerful + targetDepth: 4 + effectHint: artifact-effect-hint-environment + components: + - type: DamageNearbyArtifact + damageChance: 1 + radius: 30 + whitelist: + components: + - MobState + damage: + groups: + Brute: -900 + Burn: -900 + Airloss: -600 + Toxin: -600 + + - type: artifactEffect + id: EffectSuperHeat + targetDepth: 4 + effectHint: artifact-effect-hint-release + components: + - type: TemperatureArtifact + targetTemp: 5000 + +- type: artifactEffect + id: EffectSuperCold + targetDepth: 4 + effectHint: artifact-effect-hint-consumption + components: + - type: TemperatureArtifact + targetTemp: 2 + +- type: artifactEffect + id: EffectShatterStructure + targetDepth: 4 + effectHint: artifact-effect-hint-environment + components: + - type: DamageNearbyArtifact + damageChance: 0.85 + whitelist: + tags: + - Window + - Wall + damage: + types: + Structural: 300 + +- type: artifactEffect + id: EffectPresentSpawn + targetDepth: 4 + effectHint: artifact-effect-hint-creation + components: + - type: SpawnArtifact + maxSpawns: 7 + spawns: + - id: PresentRandom + prob: 0.8 + - id: PresentRandomUnsafe + prob: 0.13 + - id: PresentRandomInsane + prob: 0.7 - type: artifactEffect id: EffectSingulo diff --git a/Resources/Prototypes/XenoArch/artifact_triggers.yml b/Resources/Prototypes/XenoArch/artifact_triggers.yml index b16a9de8dea7e0..7024e555de1e31 100644 --- a/Resources/Prototypes/XenoArch/artifact_triggers.yml +++ b/Resources/Prototypes/XenoArch/artifact_triggers.yml @@ -187,5 +187,12 @@ possibleGas: - Plasma +- type: artifactTrigger + id: TriggerResurrection + targetDepth: 4 + triggerHint: artifact-trigger-hint-resurrection + components: + - type: ArtifactResurrectionTrigger + #don't add in new targetdepth values until you have a few #or else it will skew heavily towards a few options. From 2cbf0f4f135e577a691579015ed4d7b2d62bbcf4 Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Thu, 22 Aug 2024 12:25:39 +1000 Subject: [PATCH 02/12] fix errors --- .../XenoArch/Effects/normal_effects.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index 588dd731a358cf..31063c4134f5ab 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -659,7 +659,7 @@ - id: PresentRandomInsane prob: 0.02 - - type: artifactEffect +- type: artifactEffect id: EffectBoom targetDepth: 4 effectHint: artifact-effect-hint-environment @@ -717,7 +717,6 @@ orGroup: fauna maxAmount: 1 prob: 0.03 - maxAmount: 1 - id: MobGrenadePenguin orGroup: fauna maxAmount: 2 @@ -750,31 +749,33 @@ - Lead - ForeverWeed - Romerol - prob: 0.1 - type: artifactEffect - id: EffectClownSpider + id: EffectPolyClownSpider targetDepth: 4 effectHint: artifact-effect-hint-polymorph components: - type: PolyOthersArtifact polymorphPrototypeName: ArtifactClownSpider + range: 5 - type: artifactEffect - id: EffectFinfin + id: EffectPolyFinfin targetDepth: 4 effectHint: artifact-effect-hint-polymorph components: - type: PolyOthersArtifact polymorphPrototypeName: ArtifactFinfin + range: 5 - type: artifactEffect - id: EffectPolymorphBee + id: EffectPolyBee targetDepth: 4 effectHint: artifact-effect-hint-polymorph components: - type: PolyOthersArtifact polymorphPrototypeName: ArtifactBee + range: 5 - type: artifactEffect id: EffectHealAllPowerful @@ -794,7 +795,7 @@ Airloss: -600 Toxin: -600 - - type: artifactEffect +- type: artifactEffect id: EffectSuperHeat targetDepth: 4 effectHint: artifact-effect-hint-release From 34edba8ae7bba4dc030ce842c0b645c475bf71b0 Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Fri, 6 Sep 2024 09:06:00 +1000 Subject: [PATCH 03/12] nerfed dangerous present spawn rate --- Resources/Prototypes/XenoArch/Effects/normal_effects.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index 31063c4134f5ab..d91e8d54000c13 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -835,11 +835,11 @@ maxSpawns: 7 spawns: - id: PresentRandom - prob: 0.8 + prob: 0.95 - id: PresentRandomUnsafe - prob: 0.13 + prob: 0.3 - id: PresentRandomInsane - prob: 0.7 + prob: 0.2 - type: artifactEffect id: EffectSingulo From 905c85a7bf06e273ff0b271145dadc42067d3051 Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Fri, 6 Sep 2024 09:16:38 +1000 Subject: [PATCH 04/12] books and wizard books artifact loot rarely wizard books spawn from artifact --- .../XenoArch/Effects/normal_effects.yml | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index d91e8d54000c13..e493a06563e6e7 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -729,6 +729,16 @@ - id: MobXenoRavager orGroup: fauna +- type: artifactEffect + id: EffectBigIgnite + targetDepth: 34 + effectHint: artifact-effect-hint-release + components: + - type: IgniteArtifact + range: 8 + minFireStack: 4 + maxFireStack: 7 + - type: artifactEffect id: EffectFoamVeryDangerous targetDepth: 4 @@ -841,6 +851,35 @@ - id: PresentRandomInsane prob: 0.2 +- type: artifactEffect + id: EffectBookSpawn + targetDepth: 4 + artifact-effect-hint-creation + components: + - type: SpawnArtifact + maxSpawns: 1 + spawns: + - id: BookRandom + prob: 0.95 + - id: WizardsGrimoire + prob: 0.001 + - id: SpawnSpellbook + prob: 0.01 + - id: ForceWallSpellbook + prob: 0.01 + - id: BlinkBook + prob: 0.01 + - id: SmiteBook + prob: 0.003 + - id: KnockSpellbook + prob: 0.01 + - id: FireballSpellbook + prob: 0.01 + - id: SpawnSpaceGreaseSpellbook + prob: 0.01 + - id: ScrollRunes + prob: 0.01 + - type: artifactEffect id: EffectSingulo targetDepth: 10 From 614f479a2c916242a690e811b9ee04551a24bef0 Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Fri, 6 Sep 2024 09:47:55 +1000 Subject: [PATCH 05/12] Added Duck Duck Goose to artifact spawns --- .../Entities/Markers/Spawners/mobs.yml | 17 ++++++++- .../XenoArch/Effects/normal_effects.yml | 37 ++++++++++++------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index c4bb90ed47e3a2..d2e440374e6c5d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -978,4 +978,19 @@ sprite: Mobs/Aliens/laser-less_laser_raptor.rsi - type: ConditionalSpawner prototypes: - - MobRaptor \ No newline at end of file + - MobRaptor + +- type: entityTable + id: SpawnMobDuckDuckGoose + table: !type:GroupSelector + children: + # Common Group + - !type:GroupSelector + weight: 75 + children: + # Smoker's specialty + - !type:AllSelector + children: + - id: MobDuckMallard + - id: MobDuckBrown + - id: MobGoose diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index e493a06563e6e7..71403d46069c59 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -627,16 +627,6 @@ spawns: - id: RandomArtifactSpawner -- type: artifactEffect - id: EffectAnomaly - targetDepth: 3 - effectHint: artifact-effect-hint-creation - components: - - type: SpawnArtifact - maxSpawns: 1 - spawns: - - id: RandomAnomalySpawner - - type: artifactEffect id: EffectPortal targetDepth: 3 @@ -659,6 +649,27 @@ - id: PresentRandomInsane prob: 0.02 +- type: artifactEffect + id: EffectDuckDuckGooseSpawn + targetDepth: 3 + effectHint: artifact-effect-hint-creation + components: + - type: SpawnArtifact + maxSpawns: 2 + spawns: + - id: SpawnMobDuckDuckGoose + orGroup: fauna + +- type: artifactEffect + id: EffectAnomaly + targetDepth: 4 + effectHint: artifact-effect-hint-creation + components: + - type: SpawnArtifact + maxSpawns: 1 + spawns: + - id: RandomAnomalySpawner + - type: artifactEffect id: EffectBoom targetDepth: 4 @@ -845,11 +856,11 @@ maxSpawns: 7 spawns: - id: PresentRandom - prob: 0.95 + prob: 0.9 - id: PresentRandomUnsafe - prob: 0.3 + prob: 0.06 - id: PresentRandomInsane - prob: 0.2 + prob: 0.03 - type: artifactEffect id: EffectBookSpawn From b04a304f587afbd5f5ec649ca9c2e02de1407d06 Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Sat, 7 Sep 2024 12:24:42 +1000 Subject: [PATCH 06/12] fixed issues and removed broken goose spawn --- .../XenoArch/Effects/normal_effects.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index 71403d46069c59..1e710af92a7e2b 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -649,17 +649,6 @@ - id: PresentRandomInsane prob: 0.02 -- type: artifactEffect - id: EffectDuckDuckGooseSpawn - targetDepth: 3 - effectHint: artifact-effect-hint-creation - components: - - type: SpawnArtifact - maxSpawns: 2 - spawns: - - id: SpawnMobDuckDuckGoose - orGroup: fauna - - type: artifactEffect id: EffectAnomaly targetDepth: 4 @@ -742,7 +731,7 @@ - type: artifactEffect id: EffectBigIgnite - targetDepth: 34 + targetDepth: 4 effectHint: artifact-effect-hint-release components: - type: IgniteArtifact @@ -865,7 +854,7 @@ - type: artifactEffect id: EffectBookSpawn targetDepth: 4 - artifact-effect-hint-creation + effectHint: artifact-effect-hint-creation components: - type: SpawnArtifact maxSpawns: 1 From 4dba25dcc5d15db1fe7c3f8bd228ff4428840bd5 Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Sat, 7 Sep 2024 12:44:14 +1000 Subject: [PATCH 07/12] Padded out depth 4 triggers --- .../en-US/xenoarchaeology/artifact-hints.ftl | 1 + .../XenoArch/Effects/normal_effects.yml | 3 ++ .../Prototypes/XenoArch/artifact_triggers.yml | 41 +++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl index 1b59d90c64965f..f715909d2934f6 100644 --- a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl +++ b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl @@ -37,6 +37,7 @@ artifact-trigger-hint-death = Life essence artifact-trigger-hint-radiation = Radiation artifact-trigger-hint-pressure = Extreme pressure artifact-trigger-hint-regular-gases = Standard atmospheric gases +artifact-trigger-hint-vape = Gaseous water artifact-trigger-hint-plasma = Gaseous plasma artifact-trigger-hint-land = Active deceleration artifact-trigger-hint-examine = Examination diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index 1e710af92a7e2b..dac682aa282dd7 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -728,6 +728,9 @@ orGroup: fauna - id: MobXenoRavager orGroup: fauna + - id: MobDragonDungeon + orGroup: fauna + prob: 0.05 - type: artifactEffect id: EffectBigIgnite diff --git a/Resources/Prototypes/XenoArch/artifact_triggers.yml b/Resources/Prototypes/XenoArch/artifact_triggers.yml index 7024e555de1e31..b95e0728626928 100644 --- a/Resources/Prototypes/XenoArch/artifact_triggers.yml +++ b/Resources/Prototypes/XenoArch/artifact_triggers.yml @@ -194,5 +194,46 @@ components: - type: ArtifactResurrectionTrigger +- type: artifactTrigger + id: TriggerVape + targetDepth: 4 + triggerHint: artifact-trigger-hint-vape + components: + - type: ArtifactGasTrigger + possibleGas: + - WaterVapor + +# Below exist to pad out the depth 4 triggers. Can remove some of those when we get more triggers implemented +- type: artifactTrigger + id: TriggerMusicDeep + targetDepth: 4 + triggerHint: artifact-trigger-hint-music + components: + - type: ArtifactMusicTrigger + +- type: artifactTrigger + id: TriggerExamineDeep + targetDepth: 4 + triggerHint: artifact-trigger-hint-examine + components: + - type: ArtifactExamineTrigger + +- type: artifactTrigger + id: TriggerAnchorDeep + targetDepth: 4 + triggerHint: artifact-trigger-hint-tool + blacklist: + components: + - Item + components: + - type: ArtifactAnchorTrigger + +- type: artifactTrigger + id: TriggerMagnetDeep + targetDepth: 4 + triggerHint: artifact-trigger-hint-magnet + components: + - type: ArtifactMagnetTrigger + #don't add in new targetdepth values until you have a few #or else it will skew heavily towards a few options. From b4704594a4c47ccac6f987cf91840072aeb31a03 Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Sat, 7 Sep 2024 12:52:44 +1000 Subject: [PATCH 08/12] Borg Artifact module now has dropper and beaker for interacting --- .../Entities/Objects/Specific/Robotics/borg_modules.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index a49f08e28f1198..2c07213862bfca 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -397,6 +397,8 @@ - type: ItemBorgModule items: - NodeScanner + - BorgDropper + - Beaker - type: entity id: BorgModuleAnomaly From db7577ba54511ccfa3ee13622b440de14704947d Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Sat, 7 Sep 2024 12:56:48 +1000 Subject: [PATCH 09/12] Update RobustToolbox --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index da56851846d3fb..49c831b48d1449 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit da56851846d3fb33f7a77233fc3d505affd81ac1 +Subproject commit 49c831b48d1449e90a65acdb0c276d2deea4ce2c From 2ba11e43779d619455f2b94ad30874364cb343f4 Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Sat, 7 Sep 2024 12:57:33 +1000 Subject: [PATCH 10/12] Revert "Update RobustToolbox" This reverts commit db7577ba54511ccfa3ee13622b440de14704947d. --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 49c831b48d1449..da56851846d3fb 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 49c831b48d1449e90a65acdb0c276d2deea4ce2c +Subproject commit da56851846d3fb33f7a77233fc3d505affd81ac1 From 33a1dd4dade7578f22f6f5f6722316f1b265fe22 Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Sat, 7 Sep 2024 13:07:35 +1000 Subject: [PATCH 11/12] artifact spawned book no longer empty --- Resources/Prototypes/XenoArch/Effects/normal_effects.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index dac682aa282dd7..454e38b95136a9 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -862,7 +862,7 @@ - type: SpawnArtifact maxSpawns: 1 spawns: - - id: BookRandom + - id: BookRandomStory prob: 0.95 - id: WizardsGrimoire prob: 0.001 From 535a68824e848359447644a1bcd850b091f6f571 Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Sat, 7 Sep 2024 14:20:21 +1000 Subject: [PATCH 12/12] Added SpaceCash50000 prototype --- .../Prototypes/Entities/Objects/Misc/space_cash.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml index 57dfb400984fc6..d174e438513270 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml @@ -158,6 +158,17 @@ - type: Stack count: 30000 +- type: entity + parent: SpaceCash + id: SpaceCash50000 + suffix: 50000 + components: + - type: Icon + sprite: Objects/Economy/cash.rsi + state: cash_1000 + - type: Stack + count: 50000 + - type: entity parent: SpaceCash id: SpaceCash1000000