Skip to content

Commit

Permalink
Port mothroachs from Nyano (#294)
Browse files Browse the repository at this point in the history
* Mothroaches (#1521)

* Mothroach init

* Removes the petting conflict

Conflicts with the picking up and it's just annoying honestly.

* Specific sound for it

* Fix incorrect .rsi

* Mothroach accent

* Refix the incorrect .rsi

Big brain moment

* Lowers density of the little bugger

* baseWalkSpeed, nyano tags.yml

* Mothroach 3kg

* Mothroach takes 3x more space as mouse

Just to match the 3x heavier than mouse

* Grindable, SmallMob, Moth damage modifier

Make the bugger grindable into blood and nutriment
Use the normal Moth damage modifier set, meaning they will have the same weakness/resistance
Lowers the asphyxiation rate to match mouse better

* Delete VentCritters.cs

* Update mothroachs to latest changes

* Mothroach are no longer bloodbags (#1704)

* fix yml error

* mothroach fixes

* fix combat yml error

---------

Co-authored-by: Fluffiest Floofers <[email protected]>
Co-authored-by: Checkraze <[email protected]>
  • Loading branch information
3 people committed Sep 19, 2023
1 parent a0c5c76 commit 44a15f8
Show file tree
Hide file tree
Showing 24 changed files with 242 additions and 2 deletions.
Binary file not shown.
8 changes: 8 additions & 0 deletions Resources/Locale/en-US/accent/accents.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,11 @@ accent-words-slimes-2 = Blimpuf?
accent-words-slimes-3 = Blump!
accent-words-slimes-4 = Bluuump...
accent-words-slimes-5 = Blabl blump!
# Nyanotrasen Mothroach
accent-words-mothroach-1 = Squeak!
accent-words-mothroach-2 = Chirp!
accent-words-mothroach-3 = Peep!
accent-words-mothroach-4 = Eeee!
accent-words-mothroach-5 = Eep!
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,6 @@ ghost-role-information-loneop-rules = You are a syndicate operative tasked with
ghost-role-information-behonker-name = Behonker
ghost-role-information-behonker-description = You are an antagonist, bring death and honks to those who do not follow the honkmother.
ghost-role-information-mothroach-name = Mothroach
ghost-role-information-mothroach-description = A cute but mischievous mothroach.
2 changes: 2 additions & 0 deletions Resources/Prototypes/GameRules/events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@
prob: 0.015
- id: MobMouse2
prob: 0.015
- id: MobMothroach
prob: 0.015
- id: MobRatServant
prob: 0.015
specialEntries:
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/_Nyano/Accents/full_replacements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: accent
id: mothroach
fullReplacements:
- accent-words-mothroach-1
- accent-words-mothroach-2
- accent-words-mothroach-3
- accent-words-mothroach-4
- accent-words-mothroach-5
12 changes: 12 additions & 0 deletions Resources/Prototypes/_Nyano/Entities/Materials/materials.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: entity
parent: BaseItem
id: HideMothroach
name: mothroach hide
description: A thin layer of mothroach hide.
components:
- type: Sprite
sprite: Nyanotrasen/Objects/Materials/mothroach.rsi
state: mothroachhide
- type: Tag
tags:
- MothroachHide
111 changes: 111 additions & 0 deletions Resources/Prototypes/_Nyano/Entities/Mobs/NPCs/mothroach.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
- type: entity
name: mothroach
parent: SimpleMobBase
id: MobMothroach
description: This is the adorable by-product of multiple attempts at genetically mixing mothpeople with cockroaches.
components:
- type: GhostRole
makeSentient: true
allowSpeech: true
allowMovement: true
whitelistRequired: false
name: ghost-role-information-mothroach-name
description: ghost-role-information-mothroach-description
- type: GhostTakeoverAvailable
- type: Speech
speechSounds: Chitter
- type: Sprite
drawdepth: SmallMobs
sprite: Nyanotrasen/Mobs/Animals/mothroach.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: mothroach
- type: Item
size: 15
- type: Clothing
quickEquip: false
sprite: Nyanotrasen/Mobs/Animals/mothroach.rsi
equippedPrefix: 0
slots:
- HEAD
- type: Appearance
- type: DamageStateVisuals
states:
Alive:
Base: mothroach
Critical:
Base: mothroach_dead
Dead:
Base: mothroach_dead
- type: Physics
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.3
density: 10
mask:
- SmallMobMask
layer:
- SmallMobLayer
- type: MobState
- type: MobThresholds
thresholds:
0: Alive
25: Critical
50: Dead
- type: MovementSpeedModifier
baseWalkSpeed : 3.5
baseSprintSpeed : 5
- type: Damageable
damageContainer: Biological
damageModifierSet: Moff # moff
- type: Respirator
damage:
types:
Asphyxiation: 0.5
damageRecovery:
types:
Asphyxiation: -0.5
# TODO: Remove CombatMode when Prototype Composition is added
- type: CombatMode
combatToggleAction: ActionCombatModeToggleOff
- type: Butcherable
spawned:
- id: FoodMeatRat
amount: 2
- id: HideMothroach # Gotta make the plushies
amount: 1
prob: 0.5
- type: Extractable
grindableSolutionName: food
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
- type: Bloodstream
bloodMaxVolume: 70
- type: ReplacementAccent
accent: mothroach
- type: Vocal
sounds:
Male: Mothroach
Female: Mothroach
Unsexed: Mothroach
wilhelmProbability: 0.001
- type: MobPrice
price: 60
- type: Tag
tags:
- Trash
- CannotSuicide
- type: CanEscapeInventory
- type: NpcFactionMember
factions:
- Passive
- type: HTN
rootTask:
task: MouseCompound
7 changes: 5 additions & 2 deletions Resources/Prototypes/_Nyano/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,16 @@
components:
- type: Sprite
state: moff
- type: Construction
graph: MoffPlushie
node: plush

- type: entity
parent: BasePlushieMoff
id: PlushieMoffRandom
name: moth plushie
suffix: Random
description: A cute little mothperson that you can hold in the palm of your hand. This brand comes in many flavors!
description: A cute little mothperson that you can hold in the palm of your hand.
components:
- type: Sprite
sprite: Nyanotrasen/Objects/Fun/Toys/moff.rsi
Expand Down Expand Up @@ -93,4 +96,4 @@
state: moffbar
- type: EmitSoundOnLand
sound:
path: /Audio/Voice/Moth/laugh_moth.ogg
path: /Audio/Voice/Moth/laugh_moth.ogg
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@
- MobLizard
- MobSlug
- MobFrog
- MobMothroach
rareChance: 0.15
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
- type: constructionGraph
id: MoffPlushie
start: start
graph:
- node: start
edges:
- to: plush
steps:
- tag: MothroachHide
icon:
sprite: Nyanotrasen/Objects/Materials/mothroach.rsi
state: mothroachhide
name: mothroach hide
- material: Cloth
amount: 3
doAfter: 5
- node: plush
entity: PlushieMoff
6 changes: 6 additions & 0 deletions Resources/Prototypes/_Nyano/Voice/speech_emote_sounds.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- type: emoteSounds
id: Mothroach
sound:
path: /Audio/Voice/Moth/squeak_moth.ogg
params:
variation: 0.125
8 changes: 8 additions & 0 deletions Resources/Prototypes/_Nyano/Voice/speech_sounds.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: speechSounds
id: Chitter
saySound:
path: /Audio/Nyanotrasen/Animals/moth_chitter.ogg
askSound:
path: /Audio/Nyanotrasen/Animals/moth_chitter.ogg
exclaimSound:
path: /Audio/Nyanotrasen/Animals/moth_chitter.ogg
4 changes: 4 additions & 0 deletions Resources/Prototypes/_Nyano/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@

- type: Tag
id: RuinedShop

- type: Tag
id: MothroachHide

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from fulpstation at https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "mothroach",
"directions": 4
},
{
"name": "mothroach_lazy",
"directions": 4
},
{
"name": "mothroach_sleep",
"directions": 4
},
{
"name": "mothroach_dead",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "0-equipped-HELMET",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "mothroachhide"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 44a15f8

Please sign in to comment.