From 8248fcb07e7972d832138aee6a9893b525d26351 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Wed, 8 Jan 2025 14:16:38 +0300 Subject: [PATCH] Events tweaks (#707) * mosquito + outbreak markers * Update comoss.yml * Update monster.yml --- Resources/Maps/_CP14/comoss.yml | 170 ++++++++++++++++-- .../Markers/Spawners/demiplane_rifts.yml | 29 +++ .../_CP14/Entities/Mobs/NPC/monster.yml | 2 +- .../Structures/Furniture/lamppost.yml | 1 - .../Prototypes/_CP14/GameRules/events.yml | 19 ++ 5 files changed, 206 insertions(+), 15 deletions(-) diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml index c02ae3f5b5..ba9f14d165 100644 --- a/Resources/Maps/_CP14/comoss.yml +++ b/Resources/Maps/_CP14/comoss.yml @@ -2943,13 +2943,6 @@ entities: - type: ItemPlacer placedEntities: - 15363 -- proto: CP14AuraNodeBase - entities: - - uid: 17838 - components: - - type: Transform - pos: -25.5,-69.5 - parent: 2 - proto: CP14BankStorageMarker entities: - uid: 1269 @@ -43335,8 +43328,6 @@ entities: - type: Transform pos: -3.5,-11.5 parent: 2 - - type: Physics - bodyType: Static - proto: CP14CraneBarrelSmallBeerBlowLaw entities: - uid: 2029 @@ -43344,8 +43335,6 @@ entities: - type: Transform pos: -5.5,-11.5 parent: 2 - - type: Physics - bodyType: Static - proto: CP14CraneBarrelSmallBeerBreeze entities: - uid: 2057 @@ -43353,8 +43342,6 @@ entities: - type: Transform pos: -4.5,-11.5 parent: 2 - - type: Physics - bodyType: Static - proto: CP14CrateCoffin entities: - uid: 1349 @@ -87392,6 +87379,163 @@ entities: rot: 1.5707963267948966 rad pos: 12.50742,-56.913044 parent: 2 +- proto: CP14VentCritterMarker + entities: + - uid: 5510 + components: + - type: Transform + pos: 21.5,9.5 + parent: 2 + - uid: 7805 + components: + - type: Transform + pos: -3.5,0.5 + parent: 2 + - uid: 12906 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 2 + - uid: 12907 + components: + - type: Transform + pos: 0.5,9.5 + parent: 2 + - uid: 12922 + components: + - type: Transform + pos: -10.5,8.5 + parent: 2 + - uid: 17838 + components: + - type: Transform + pos: -21.5,9.5 + parent: 2 + - uid: 17888 + components: + - type: Transform + pos: -22.5,-21.5 + parent: 2 + - uid: 17889 + components: + - type: Transform + pos: 17.5,19.5 + parent: 2 + - uid: 17890 + components: + - type: Transform + pos: 10.5,8.5 + parent: 2 + - uid: 17891 + components: + - type: Transform + pos: 31.5,8.5 + parent: 2 + - uid: 17892 + components: + - type: Transform + pos: 20.5,-0.5 + parent: 2 + - uid: 17893 + components: + - type: Transform + pos: 22.5,-9.5 + parent: 2 + - uid: 17894 + components: + - type: Transform + pos: 13.5,-11.5 + parent: 2 + - uid: 17895 + components: + - type: Transform + pos: 5.5,-10.5 + parent: 2 + - uid: 17896 + components: + - type: Transform + pos: -0.5,-11.5 + parent: 2 + - uid: 17897 + components: + - type: Transform + pos: -0.5,-21.5 + parent: 2 + - uid: 17898 + components: + - type: Transform + pos: 0.5,-28.5 + parent: 2 + - uid: 17899 + components: + - type: Transform + pos: -0.5,-36.5 + parent: 2 + - uid: 17900 + components: + - type: Transform + pos: 0.5,-43.5 + parent: 2 + - uid: 17901 + components: + - type: Transform + pos: -12.5,-37.5 + parent: 2 + - uid: 17902 + components: + - type: Transform + pos: -8.5,-26.5 + parent: 2 + - uid: 17903 + components: + - type: Transform + pos: -10.5,-1.5 + parent: 2 + - uid: 17904 + components: + - type: Transform + pos: -24.5,-15.5 + parent: 2 + - uid: 17905 + components: + - type: Transform + pos: -20.5,-28.5 + parent: 2 + - uid: 17906 + components: + - type: Transform + pos: -1.5,-66.5 + parent: 2 + - uid: 17907 + components: + - type: Transform + pos: 1.5,22.5 + parent: 2 + - uid: 17908 + components: + - type: Transform + pos: 26.5,-14.5 + parent: 2 + - uid: 17909 + components: + - type: Transform + pos: 25.5,-38.5 + parent: 2 + - uid: 17910 + components: + - type: Transform + pos: 15.5,-48.5 + parent: 2 + - uid: 17911 + components: + - type: Transform + pos: -17.5,-68.5 + parent: 2 + - uid: 17912 + components: + - type: Transform + pos: 4.5,-15.5 + parent: 2 - proto: CP14VialSmall entities: - uid: 2158 diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml index 90e390214b..59895419cc 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml @@ -1,3 +1,17 @@ +- type: entity + id: CP14VentCritterMarker + parent: MarkerBase + categories: [ ForkFiltered ] + name: Mob spawners marker + description: random creatures breaking out of the demiplanes will spawn at this location + components: + - type: VentCritterSpawnLocation + - type: Sprite + layers: + - state: pink + - sprite: /Textures/_CP14/Mobs/Monster/mole.rsi + state: live + - type: entity id: CP14BaseMobGroupSpawner abstract: true @@ -72,3 +86,18 @@ range: 1, 3 children: - id: CP14MobDinoSmallHydra + + +- type: entity + parent: CP14BaseMobGroupSpawner + id: CP14MobGroupSpawnerMosquito + suffix: 2-3 Mosquito + components: + - type: EntityTableSpawner + deleteSpawnerAfterSpawn: false + offset: 1 + table: !type:GroupSelector + rolls: !type:RangeNumberSelector + range: 2, 3 + children: + - id: CP14MobMonsterMosquito diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/monster.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/monster.yml index 8956801da3..64c9798dcd 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/monster.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/monster.yml @@ -214,7 +214,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 50 + damage: 20 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml index ae3e20024f..1238bb25ec 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml @@ -71,7 +71,6 @@ - type: PointLight energy: 5 radius: 8 - - type: VentCritterSpawnLocation # Uggh, need something better - type: entity parent: CP14BaseLamppost diff --git a/Resources/Prototypes/_CP14/GameRules/events.yml b/Resources/Prototypes/_CP14/GameRules/events.yml index cbe1bef6ec..beea77677c 100644 --- a/Resources/Prototypes/_CP14/GameRules/events.yml +++ b/Resources/Prototypes/_CP14/GameRules/events.yml @@ -15,6 +15,7 @@ - id: CP14ClosetSkeleton - id: CP14ZombiesSpawn - id: CP14HydrasSpawn + - id: CP14MosquitoSpawn - type: entity parent: CP14BaseGameRule @@ -60,3 +61,21 @@ entries: - id: CP14MobGroupSpawnerHydras prob: 0.05 + + +- type: entity + parent: CP14BaseStationEventShortDelay + id: CP14MosquitoSpawn + components: + - type: StationEvent + startAnnouncement: cp14-event-announcement-demiplane-outbreak + startAudio: + path: /Audio/_CP14/Ambience/event_boom.ogg + earliestStart: 20 + minimumPlayers: 15 + weight: 5 + duration: 60 + - type: VentCrittersRule + entries: + - id: CP14MobGroupSpawnerMosquito + prob: 0.05