Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Space Koi #32378

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,3 +227,13 @@
cost: 5000
category: cargoproduct-category-name-livestock
group: market

- type: cargoProduct
id: LivestockSpaceKoi
icon:
sprite: Mobs/Aliens/Kois/red_black.rsi
state: livestock_icon
product: CrateNPCSpaceKoi
cost: 5000
category: cargoproduct-category-name-livestock
group: market
18 changes: 18 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/npc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -264,3 +264,21 @@
contents:
- id: MobMothroach
amount: 4
- type: entity
id: CrateNPCSpaceKoi
parent: CrateLivestock
name: space koi crate
description: A crate containing five space kois.
components:
- type: StorageFill
contents:
- id: MobRedBlackKoi
amount: 1
- id: MobGoldBlackKoi
amount: 1
- id: MobRedCircleKoi
amount: 1
- id: MobBloodSkeletonKoi
amount: 1
- id: MobSpaceGlowKoi
amount: 1
20 changes: 20 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -880,3 +880,23 @@
- type: ConditionalSpawner
prototypes:
- MobHonkBot

- type: entity
name: space koi spawner
id: SpawnSpaceKoi
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- sprite: Mobs/Aliens/Kois/red_black.rsi
state: livestock_icon
- state: ai
- type: ConditionalSpawner
prototypes:
- MobSpaceGlowKoi
- MobRedBlackKoi
- MobGoldBlackKoi
- MobRedCircleKoi
- MobBloodSkeletonKoi

131 changes: 131 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3459,3 +3459,134 @@
components:
- type: ReplacementAccent
accent: nymph
- type: entity
name: space koi
id: BaseMobKoi
parent: [ SimpleSpaceMobBase, FlyingMobBase ]
description: Colorful space carp parody, looks friendly.
abstract: true
components:
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/Kois/gold_black.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
- type: Physics
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.40
density: 80
mask:
- FlyingMobMask
layer:
- FlyingMobLayer
- type: MobState
- type: MobThresholds
thresholds:
0: Alive
40: Dead
- type: MovementSpeedModifier
baseWalkSpeed: 2.5
baseSprintSpeed: 3.5
- type: Stamina
critThreshold: 100
- type: DamageStateVisuals
states:
Alive:
Base: alive
Dead:
Base: dead
- type: Butcherable
spawned:
- id: FoodMeat
amount: 1
- type: MeleeWeapon
altDisarm: false
angle: 0
animation: WeaponArcBite
soundHit:
path: /Audio/Effects/bite.ogg
damage:
types:
Blunt: 1
Slash: 7
- type: TypingIndicator
proto: alien
- type: ReplacementAccent
accent: genericAggressive
- type: Speech
speechVerb: LargeMob
- type: InteractionPopup
interactSuccessString: petting-success-carp
interactFailureString: petting-failure-carp
interactFailureSound:
path: /Audio/Effects/bite.ogg
- type: StaticPrice
price: -800


- type: entity
parent: BaseMobKoi
id: MobRedBlackKoi
suffix: "Red Black"
components:
- type: Sprite
sprite: Mobs/Aliens/Kois/red_black.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
- type: entity
parent: BaseMobKoi
id: MobGoldBlackKoi
suffix: "Gold Black"
components:
- type: Sprite
sprite: Mobs/Aliens/Kois/gold_black.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive

- type: entity
parent: BaseMobKoi
id: MobRedCircleKoi
suffix: "Red Circle"
components:
- type: Sprite
sprite: Mobs/Aliens/Kois/red_circle.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive

- type: entity
parent: BaseMobKoi
id: MobBloodSkeletonKoi
suffix: "Blood Skeleton"
components:
- type: Sprite
sprite: Mobs/Aliens/Kois/blood_skeleton.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
- type: entity
parent: BaseMobKoi
id: MobSpaceGlowKoi
suffix: "Space Glow"
components:
- type: Sprite
sprite: Mobs/Aliens/Kois/space_glow.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
- map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
state: unshaded
shader: unshaded
- type: PointLight
radius: 1.2
energy: 2
color: "#4faffb"


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.
43 changes: 43 additions & 0 deletions Resources/Textures/Mobs/Aliens/Kois/blood_skeleton.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"version": 2,
"license": "CC-BY-SA-3.0",
"copyright": "Made by XcenLegend for Space Station 14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "dead"
},
{
"name": "alive",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
]
]
}
]
}
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.
43 changes: 43 additions & 0 deletions Resources/Textures/Mobs/Aliens/Kois/gold_black.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"version": 2,
"license": "CC-BY-SA-3.0",
"copyright": "Made by XcenLegend for Space Station 14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "dead"
},
{
"name": "alive",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
]
]
}
]
}
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.
46 changes: 46 additions & 0 deletions Resources/Textures/Mobs/Aliens/Kois/red_black.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by XcenLegend for Space Station 14",
"states": [
{
"name": "icon"
},
{
"name": "livestock_icon"
},
{
"name": "dead"
},
{
"name": "alive",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
]
]
}
]
}
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.
43 changes: 43 additions & 0 deletions Resources/Textures/Mobs/Aliens/Kois/red_circle.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"version": 2,
"license": "CC-BY-SA-3.0",
"copyright": "Made by XcenLegend for Space Station 14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "dead"
},
{
"name": "alive",
"directions": 4,
"delays": [
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2
]
]
}
]
}
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
Loading