From 77c10185bb5311bb6aaa04dd8d126bb61af97a9f Mon Sep 17 00:00:00 2001 From: icekot8 <93311212+icekot8@users.noreply.github.com> Date: Mon, 1 Jan 2024 09:40:49 +0300 Subject: [PATCH] artifact effect fauna and flora spawn (#23295) * adding EffectFaunaSpawn * add spawn flora effect, blood trigger * fix removed the bloody trigger * fix oh, I hope this solves the problem. * I added an icon sprite.. * fix I'm stupid.. * final touch... --- .../Markers/Spawners/Random/flora.yml | 42 ++++++++++ .../XenoArch/Effects/normal_effects.yml | 76 +++++++++++++++++- .../Decoration/Flora/flora_trees.rsi/icon.png | Bin 0 -> 4850 bytes .../Flora/flora_trees.rsi/meta.json | 3 + 4 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml create mode 100644 Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/icon.png diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml new file mode 100644 index 0000000000..9abd35a920 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml @@ -0,0 +1,42 @@ +- type: entity + id: RandomFloraTree + name: random tree spawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Objects/Decoration/Flora/flora_trees.rsi + state: icon + - type: RandomSpawner + prototypes: + - FloraTreeLarge01 + - FloraTreeLarge02 + - FloraTreeLarge03 + - FloraTreeLarge04 + - FloraTreeLarge05 + - FloraTreeLarge06 + - FloraTreeConifer01 + - FloraTreeConifer02 + - FloraTreeConifer03 + - FloraTreeSnow01 + - FloraTreeSnow02 + - FloraTreeSnow03 + - FloraTreeSnow04 + - FloraTreeSnow05 + - FloraTreeSnow06 + - FloraTree01 + - FloraTree02 + - FloraTree03 + - FloraTree04 + - FloraTree05 + - FloraTree06 + chance: 0.95 + rarePrototypes: + - ShadowTree01 + - ShadowTree02 + - ShadowTree03 + - ShadowTree04 + - ShadowTree05 + - ShadowTree06 + rareChance: 0.05 diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index cf6bdd4fc5..5fe619bd4f 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -133,6 +133,16 @@ possibleChemicals: - Potassium +- type: artifactEffect + id: EffectFloraSpawn + targetDepth: 1 + effectHint: artifact-effect-hint-creation + components: + - type: SpawnArtifact + maxSpawns: 3 + spawns: + - id: RandomFloraTree + - type: artifactEffect id: EffectThrow targetDepth: 0 @@ -334,6 +344,70 @@ - id: MobCarpMagic orGroup: carp +- type: artifactEffect + id: EffectFaunaSpawn + targetDepth: 2 + effectHint: artifact-effect-hint-creation + components: + - type: SpawnArtifact + maxSpawns: 5 + spawns: + - id: MobAdultSlimesYellowAngry + orGroup: fauna + - id: MobAngryBee + orGroup: fauna + - id: MobBearSpace + orGroup: fauna + - id: MobBee + orGroup: fauna + maxAmount: 5 + - id: MobCat + orGroup: fauna + maxAmount: 2 + - id: MobCatKitten + orGroup: fauna + maxAmount: 2 + - id: MobCorgiPuppy + orGroup: fauna + maxAmount: 2 + - id: MobFox + orGroup: fauna + maxAmount: 1 + - id: MobGoat + orGroup: fauna + maxAmount: 3 + - id: MobKangaroo + orGroup: fauna + maxAmount: 1 + - id: MobKangarooSpace + orGroup: fauna + - id: MobMothroach + orGroup: fauna + maxAmount: 2 + - id: MobMonkeySyndicateAgent #so lucky + orGroup: fauna + maxAmount: 1 + prob: 0.03 + - id: MobMouse + orGroup: fauna + - id: MobParrot + orGroup: fauna + maxAmount: 1 + - id: MobPenguin + orGroup: fauna + maxAmount: 2 + - id: MobPig + orGroup: fauna + maxAmount: 1 + - id: MobPurpleSnake + orGroup: fauna + - id: MobSpiderSpace + orGroup: fauna + - id: MobTick + orGroup: fauna + - id: MobXenoRavager + orGroup: fauna + - type: artifactEffect id: EffectCashSpawn targetDepth: 2 @@ -607,4 +681,4 @@ - type: SpawnArtifact maxSpawns: 1 spawns: - - id: Singularity + - id: Singularity \ No newline at end of file diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/icon.png b/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..41499b67b3d75dc598afc0e8dda7d55b7ddfca9d GIT binary patch literal 4850 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