Skip to content

Commit

Permalink
Dungeon enemies rebalance: Aberrant Flesh (new-frontiers-14#1985)
Browse files Browse the repository at this point in the history
* update

* tweaked newborns

* fix

* nefr maw again

* da boss

* Update Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/aberrant_flesh.xml

Co-authored-by: Whatstone <[email protected]>

* Minor flesh abomination grammar pass

* NF prefix for "SalvageMobRestrictions"

* Flesh Horror game rule rewrite

* Cut down on monster description lengths

* wet fx

* horror nerf

* Update ghost-role-component.ftl

* Update mob_hostile_expeditions_aberrant_flesh.yml

* BibleComponentComponent->BibleComponent

* Frontier changelog: fix food recipe guidebook CL

* icon for bone spike

* validate-rsis: try using python 3.10

---------

Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Whatstone <[email protected]>
  • Loading branch information
3 people authored Oct 6, 2024
1 parent ba7e7f1 commit cc071da
Show file tree
Hide file tree
Showing 18 changed files with 510 additions and 73 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/validate-rsis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ jobs:
run: git submodule update --init
- name: Pull engine updates
uses: space-wizards/[email protected]
- name: Set up Python 3.10 # Frontier
uses: actions/setup-python@v3 # Frontier
with: # Frontier
python-version: "3.10" # Frontier
- name: Install Python dependencies
run: |
pip3 install --ignore-installed --user pillow jsonschema
Expand Down
4 changes: 3 additions & 1 deletion Resources/Changelog/Frontier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4254,7 +4254,9 @@ Entries:
id: 5359
time: '2024-10-03T19:53:08.0000000+00:00'
- author: Mnemotechnician
changes: []
changes:
- type: Add
message: The Food Recipes page in the guidebook now shows all available recipes.
id: 5360
time: '2024-10-04T17:59:04.0000000+00:00'
- author: dvir001
Expand Down
12 changes: 12 additions & 0 deletions Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,15 @@ ghost-role-information-hovertaxibot-description = Fly passengers to where they n
# Adopted from space-wizards #26265 (Thank you, PolterTzi)
ghost-role-information-yipyip-name = Yip Yip
ghost-role-information-yipyip-description = Notorious lounge lizard and bartender at Bahama Mama's. This drink-slinging kobold lives to serve his patrons.
ghost-role-information-aberrant-flesh-horror-dungeon-name = Aberrant flesh horror
ghost-role-information-aberrant-flesh-horror-dungeon-description = Defend the expedition dungeon with other flesh monstrosities!
ghost-role-information-dungeon-boss-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all dungeon mobs.
Fight players within the dungeon, defend your dungeon.
Please note that [color=yellow]all server rules still apply.[/color] Additionally:
- [color=red]DO NOT[/color] damage player shuttles or their contents.
- [color=red]DO NOT[/color] hide from players to run down the expedition timer.
- [color=red]DO NOT[/color] gib players. Once they're dead, leave them be.
- [color=red]DO NOT[/color] destroy or hide valuable loot in the dungeon.
- [color=red]DO NOT[/color] leave the planet.
8 changes: 8 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
- type: entity
parent: BaseMobFlesh
id: MobFleshJared
categories: [ HideSpawnMenu ] # Frontier
components:
- type: Sprite
layers:
Expand All @@ -88,6 +89,7 @@
- type: entity
parent: BaseMobFlesh
id: MobFleshGolem
categories: [ HideSpawnMenu ] # Frontier
components:
- type: Sprite
layers:
Expand Down Expand Up @@ -117,6 +119,7 @@
- type: entity
parent: BaseMobFlesh
id: MobFleshClamp
categories: [ HideSpawnMenu ] # Frontier
components:
- type: Sprite
layers:
Expand All @@ -141,6 +144,7 @@
- type: entity
parent: BaseMobFlesh
id: MobFleshLover
categories: [ HideSpawnMenu ] # Frontier
components:
- type: Sprite
layers:
Expand Down Expand Up @@ -262,6 +266,7 @@
- type: entity
parent: BaseMobFleshSalvage
id: MobFleshJaredSalvage
categories: [ HideSpawnMenu ] # Frontier
components:
- type: Sprite
layers:
Expand All @@ -287,6 +292,7 @@
- type: entity
parent: BaseMobFleshSalvage
id: MobFleshGolemSalvage
categories: [ HideSpawnMenu ] # Frontier
components:
- type: Sprite
layers:
Expand Down Expand Up @@ -316,6 +322,7 @@
- type: entity
parent: BaseMobFleshSalvage
id: MobFleshClampSalvage
categories: [ HideSpawnMenu ] # Frontier
components:
- type: Sprite
layers:
Expand All @@ -340,6 +347,7 @@
- type: entity
parent: BaseMobFleshSalvage
id: MobFleshLoverSalvage
categories: [ HideSpawnMenu ] # Frontier
components:
- type: Sprite
layers:
Expand Down
20 changes: 10 additions & 10 deletions Resources/Prototypes/Procedural/salvage_factions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,34 +176,34 @@
- entries:
- id: SpawnMobAberrantFleshExpeditions
amount: 1
maxAmount: 3
maxAmount: 2
- id: SpawnMobAberrantFleshExpeditions
amount: 1
maxAmount: 3
maxAmount: 2
prob: 0.5
- entries:
- id: SpawnMobAberrantFleshExpeditions
amount: 1
maxAmount: 3
maxAmount: 2
- id: SpawnMobAberrantFleshExpeditions
amount: 1
maxAmount: 3
maxAmount: 2
prob: 0.25
- entries:
- id: SpawnMobAberrantFleshExpeditions
amount: 1
maxAmount: 3
maxAmount: 2
- id: SpawnMobAberrantFleshExpeditions
amount: 1
maxAmount: 3
maxAmount: 2
prob: 0.25
- entries:
- id: SpawnMobAberrantFleshExpeditions
amount: 2
maxAmount: 4
amount: 1
maxAmount: 2
- id: SpawnMobAberrantFleshExpeditions
amount: 2
maxAmount: 4
amount: 1
maxAmount: 2
prob: 0.1
configs:
DefenseStructure: AberrantFleshDigestiveSack
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
tags:
- Book
components:
- BibleComponent
- Bible
- Paper
bottle:
whitelist:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
- type: entity
id: SpawnMobFleshJaredExpeditions
name: aberrant flesh jared spawner
parent: MarkerBasePlaceFree
suffix: AI, Hostile
components:
- type: Sprite
layers:
- state: red
- state: ai
- sprite: _NF/Mobs/Aliens/flesh.rsi
state: jared
- type: ConditionalSpawner
prototypes:
- MobFleshJaredExpeditions
- MobFleshJaredOldExpeditions

- type: entity
id: SpawnMobFleshGolemExpeditions
name: aberrant flesh golem spawner
parent: MarkerBasePlaceFree
suffix: AI, Hostile
components:
- type: Sprite
layers:
- state: red
- state: ai
- sprite: _NF/Mobs/Aliens/flesh.rsi
state: golem
- type: ConditionalSpawner
prototypes:
- MobFleshGolemExpeditions
- MobFleshGolemAltExpeditions
- MobFleshGolemOldExpeditions

- type: entity
id: SpawnMobFleshAssimilatedMiner
name: aberrant flesh miner spawner
parent: MarkerBasePlaceFree
suffix: AI, Hostile
components:
- type: Sprite
layers:
- state: red
- state: ai
- sprite: _NF/Mobs/Aliens/flesh_assimilated_miner.rsi
state: base
- type: ConditionalSpawner
prototypes:
- MobFleshAssimilatedMiner

- type: entity
id: SpawnMobFleshClampExpeditions
name: aberrant flesh clamp spawner
parent: MarkerBasePlaceFree
suffix: AI, Hostile
components:
- type: Sprite
layers:
- state: red
- state: ai
- sprite: _NF/Mobs/Aliens/flesh.rsi
state: clamp
- type: ConditionalSpawner
prototypes:
- MobFleshClampExpeditions
- MobFleshClampOldExpeditions

- type: entity
id: SpawnMobFleshLoverExpeditions
name: aberrant flesh lover spawner
parent: MarkerBasePlaceFree
suffix: AI, Hostile
components:
- type: Sprite
layers:
- state: red
- state: ai
- sprite: _NF/Mobs/Aliens/flesh.rsi
state: lover
- type: ConditionalSpawner
prototypes:
- MobFleshLoverExpeditions

- type: entity
id: SpawnMobHorrorExpeditions
name: aberrant flesh horror spawner
parent: MarkerBasePlaceFree
suffix: AI, Hostile
components:
- type: Sprite
layers:
- state: red
- state: ai
- sprite: _NF/Mobs/Aliens/flesh.rsi
state: horror
- type: ConditionalSpawner
prototypes:
- MobHorrorExpeditions
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,31 @@
rarePrototypes:
- MobFleshAssimilatedMiner
rareChance: 0.05

- type: entity
name: newborn aberrant flesh spawner
id: SpawnMobAberrantFleshNewbornExpeditions
parent: MarkerBase
suffix: AI, Hostile, RND
components:
- type: Sprite
layers:
- state: red
- sprite: _NF/Mobs/Aliens/flesh.rsi
state: lover
- state: ai
- type: RandomSpawner
prototypes:
- MobFleshJaredExpeditionsNewborn
- MobFleshJaredOldExpeditionsNewborn
- MobFleshGolemExpeditionsNewborn
- MobFleshGolemAltExpeditionsNewborn
- MobFleshGolemOldExpeditionsNewborn
- MobFleshClampExpeditionsNewborn
- MobFleshClampOldExpeditionsNewborn
- MobFleshLoverExpeditionsNewborn
chance: 1
offset: 0.0
rarePrototypes:
- MobFleshAssimilatedMiner
rareChance: 0.05
57 changes: 49 additions & 8 deletions Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,21 @@
- type: MovedByPressure
- type: Insulated

- type: entity
save: false
id: MobPassiveRegenWeak
abstract: true
components:
- type: PassiveDamage
allowedStates:
- Alive
damageCap: 500
damage:
groups:
Brute: -0.5
Burn: -0.5
Airloss: -1

- type: entity
save: false
id: MobPassiveRegen
Expand All @@ -34,14 +49,12 @@
allowedStates:
- Alive
- Critical
damageCap: 400
damageCap: 500
damage:
groups:
Brute: -1
Burn: -10
Brute: -0.5
Burn: -0.5
Airloss: -1
Toxin: -7
Genetic: -7

- type: entity
save: false
Expand Down Expand Up @@ -96,6 +109,30 @@
#groups:
#- AllAccess

# Dungeon boss
- type: entity
id: MobHostileBossBase
abstract: true
parent:
- MobEnhancedMovement
- MobPassiveRegenWeak
components:
- type: Hands
- type: Puller
- type: Stamina
critThreshold: 999
- type: MobPrice
price: 4000
deathPenalty: 0.5
- type: Tag
tags:
- CanPilot
- FootstepSound
- DoorBumpOpener
- CannotSuicide
- type: NFSalvageMobRestrictions
- type: FTLKnockdownImmune

# Inventories
- type: entity
save: false
Expand Down Expand Up @@ -192,6 +229,9 @@
- BaseC3MobHuman
id: MobHumanoidHostileBase
components:
- type: MovementSpeedModifier
baseWalkSpeed : 3.5
baseSprintSpeed : 4.5
- type: NPCRetaliation
attackMemoryLength: 10
- type: MobMover
Expand Down Expand Up @@ -254,16 +294,16 @@
- BaseC3MobCreature
id: MobNonHumanHostileBase
components:
- type: MovementSpeedModifier
baseWalkSpeed : 3.5
baseSprintSpeed : 4.5
- type: NPCRetaliation
attackMemoryLength: 10
- type: Reactive
groups:
Flammable: [Touch]
Extinguish: [Touch]
Acidic: [Touch, Ingestion]
- type: MovementSpeedModifier
baseWalkSpeed : 4
baseSprintSpeed : 4
- type: StatusEffects
allowed:
- SlowedDown
Expand Down Expand Up @@ -312,4 +352,5 @@
- CanPilot
- FootstepSound
- DoorBumpOpener
- CannotSuicide
- type: FTLKnockdownImmune
Loading

0 comments on commit cc071da

Please sign in to comment.