From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sun, 25 Feb 2024 23:41:24 +0000 (+0300) Subject: Flora anomaly nerf (#25499) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=656679cb54317afb8408e0bed47e26da1773ddee;p=space-station-14.git Flora anomaly nerf (#25499) * Update kudzu.yml * Update living_light.yml * files * Update flora.yml * Update kudzu.yml * bul * Update kudzu.yml * Update living_light.yml * bullet immune --- diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml index cc75405e10..9b90d202f3 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml @@ -30,10 +30,6 @@ state: glow shader: unshaded - type: MobState - - type: MobThresholds - thresholds: - 0: Alive - 50: Dead - type: SlowOnDamage speedModifierThresholds: 20: 0.5 @@ -94,7 +90,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 50 + damage: 25 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -128,10 +124,6 @@ - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] state: glow shader: unshaded - - type: MobThresholds - thresholds: - 0: Alive - 50: Dead - type: DamageStateVisuals states: Alive: @@ -159,10 +151,6 @@ - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] state: glow shader: unshaded - - type: MobThresholds - thresholds: - 0: Alive - 40: Dead - type: DamageStateVisuals states: Alive: diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml index 791127170f..6a622d7bea 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml @@ -484,3 +484,87 @@ components: - type: Sprite state: tree06 + +- type: entity + parent: BaseTree + id: LightTree01 + name: glowing tree + description: a marvelous tree filled with strange energy. + components: + - type: PointLight + radius: 2.0 + energy: 4.5 + color: "#6270bb" + - type: Sprite + sprite: Objects/Decoration/Flora/flora_treeslight.rsi + state: tree01 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/tree_fell.ogg + params: + volume: 5 + variation: 0.05 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + Log: + min: 0 + max: 1 + - !type:SpawnEntitiesBehavior + spawn: + MobLuminousObject: + min: 0 + max: 1 + +- type: entity + parent: LightTree01 + id: LightTree02 + components: + - type: Sprite + sprite: Objects/Decoration/Flora/flora_treeslight.rsi + state: tree02 + +- type: entity + parent: LightTree01 + id: LightTree03 + components: + - type: Sprite + sprite: Objects/Decoration/Flora/flora_treeslight.rsi + state: tree03 + +- type: entity + parent: LightTree01 + id: LightTree04 + components: + - type: Sprite + sprite: Objects/Decoration/Flora/flora_treeslight.rsi + state: tree04 + +- type: entity + parent: LightTree01 + id: LightTree05 + components: + - type: Sprite + sprite: Objects/Decoration/Flora/flora_treeslight.rsi + state: tree05 + +- type: entity + parent: LightTree01 + id: LightTree06 + components: + - type: Sprite + sprite: Objects/Decoration/Flora/flora_treeslight.rsi + state: tree06 diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml index 6ebf095117..5de1f0b7f9 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml @@ -135,15 +135,12 @@ offset: 0.2 chance: 0.05 prototypes: - - FloraTree01 - - FloraTree02 - - FloraTree03 - - FloraTree04 - - FloraTree05 - - FloraTree06 - - FloraTreeLarge01 - - FloraTreeLarge02 - - FloraTreeLarge03 + - LightTree01 + - LightTree02 + - LightTree03 + - LightTree04 + - LightTree05 + - LightTree06 - CrystalCyan rarePrototypes: - AnomalyFloraBulb @@ -154,13 +151,15 @@ parent: KudzuFlowerFriendly components: - type: Kudzu - spreadChance: 0.4 + spreadChance: 0.2 - type: RandomSpawner - chance: 0.1 + chance: 0.05 rarePrototypes: - AnomalyFloraBulb + - AnomalyFloraBulb - MobLuminousEntity - MobLuminousObject + - MobLuminousPerson - type: entity id: FleshKudzu diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/meta.json b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/meta.json new file mode 100644 index 0000000000..4820db2c63 --- /dev/null +++ b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd for Space Station 14", + "size": { + "x": 96, + "y": 96 + }, + "states": [ + { + "name": "tree01" + }, + { + "name": "tree02" + }, + { + "name": "tree03" + }, + { + "name": "tree04" + }, + { + "name": "tree05" + }, + { + "name": "tree06" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree01.png b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree01.png new file mode 100644 index 0000000000..986b78b0cc Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree01.png differ diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree02.png b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree02.png new file mode 100644 index 0000000000..ffbf2c44ff Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree02.png differ diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree03.png b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree03.png new file mode 100644 index 0000000000..f37059eb97 Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree03.png differ diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree04.png b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree04.png new file mode 100644 index 0000000000..0461766bcd Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree04.png differ diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree05.png b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree05.png new file mode 100644 index 0000000000..26ac7f8b40 Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree05.png differ diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree06.png b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree06.png new file mode 100644 index 0000000000..01cda92099 Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree06.png differ