From: icekot8 <93311212+icekot8@users.noreply.github.com> Date: Mon, 1 Jan 2024 06:40:49 +0000 (+0300) Subject: artifact effect fauna and flora spawn (#23295) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=77c10185bb5311bb6aaa04dd8d126bb61af97a9f;p=space-station-14.git 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... --- 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 0000000000..41499b67b3 Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/meta.json b/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/meta.json index af84abf130..9242d06bd7 100644 --- a/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/meta.json +++ b/Resources/Textures/Objects/Decoration/Flora/flora_trees.rsi/meta.json @@ -7,6 +7,9 @@ "y": 96 }, "states": [ + { + "name": "icon" + }, { "name": "tree01" },