Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #72 from Corvax-Frontier/Change
Browse files Browse the repository at this point in the history
Всяческие изменения, мелкие респрайты, добавление и тд.
  • Loading branch information
Zekins3366 authored Apr 25, 2024
2 parents bd40d5c + c56b90d commit 5917e7c
Show file tree
Hide file tree
Showing 72 changed files with 920 additions and 58 deletions.
5 changes: 5 additions & 0 deletions Resources/Audio/Ambience/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,8 @@
license: "CC0-1.0"
copyright: "Created by dimbark1, edited and converted to mono by TheShuEd"
source: "https://freesound.org/people/dimbark1/sounds/316797/"

- files: ["frontier.ogg"]
license: "CC0-1.0"
copyright: "Created by bishkek_pro_master"
source: "https://band.link/juBQi"
Binary file added Resources/Audio/Ambience/frontier.ogg
Binary file not shown.
14 changes: 14 additions & 0 deletions Resources/Locale/ru-RU/corvax/markings/xenoslime.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
marking-SlimePawSocks-pawsocks = Носки на лапах из слизи
marking-SlimePawSocks = Носки на лапах из слизи
marking-FoxSlimeTail-vulp_tail = Лисий хвост из слизи
marking-FoxSlimeTail = Лисий хвост из слизи
marking-FoxSlimeEar-vulp_ear = Лисье ухо из слизи (внешнее)
marking-FoxSlimeEar-vulp_ear_inner = Лисье ухо из слизи (внутреннее)
marking-FoxSlimeEar = Лисье ухо из слизи
marking-WolfSlimeTail-wolf_tail = Волчий хвост из слизи (основа)
marking-WolfSlimeTail-wolf_tail_inner = Волчий хвост из слизи (конец)
marking-WolfSlimeTail = Волчий хвост из слизи
marking-FoxSlimeBelly-vulp_belly-torso = Лисье брюхо из слизи
marking-FoxSlimeBelly = Лисье брюхо из слизи
marking-FoxSlimeSnout-vulp_face = Лисья морда из слизи
marking-FoxSlimeSnout = Лисья морда из слизи
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/corvax/species/species.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
species-name-xenoslime = Ксенослайм
119 changes: 119 additions & 0 deletions Resources/Prototypes/Corvax/Body/Parts/xenoslime.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
# TODO: Add descriptions (many)
# TODO BODY: Part damage
- type: entity
id: PartXenoslime
parent: [BaseItem, BasePart]
name: "xenoslime body part"
abstract: true
components:
- type: Extractable
juiceSolution:
reagents:
- ReagentId: Slime
Quantity: 10

- type: entity
id: TorsoXenoslime
name: "xenoslime torso"
parent: [PartXenoslime, BaseTorso]
components:
- type: Sprite
sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi
state: "torso_m"
- type: Extractable
juiceSolution:
reagents:
- ReagentId: Slime
Quantity: 20

- type: entity
id: HeadXenoslime
name: "xenoslime head"
parent: [PartXenoslime, BaseHead]
components:
- type: Sprite
sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi
state: "head_m"
- type: Extractable
juiceSolution:
reagents:
- ReagentId: Slime
Quantity: 10

- type: entity
id: LeftArmXenoslime
name: "left xenoslime arm"
parent: [PartXenoslime, BaseLeftArm]
components:
- type: Sprite
sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi
state: "l_arm"

- type: entity
id: RightArmXenoslime
name: "right xenoslime arm"
parent: [PartXenoslime, BaseRightArm]
components:
- type: Sprite
sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi
state: "r_arm"

- type: entity
id: LeftHandXenoslime
name: "left xenoslime hand"
parent: [PartXenoslime, BaseLeftHand]
components:
- type: Sprite
sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi
state: "l_hand"

- type: entity
id: RightHandXenoslime
name: "right xenoslime hand"
parent: [PartXenoslime, BaseRightHand]
components:
- type: Sprite
sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi
state: "r_hand"

- type: entity
id: LeftLegXenoslime
name: "left xenoslime leg"
parent: [PartXenoslime, BaseLeftLeg]
components:
- type: Sprite
sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi
state: "l_leg"
- type: MovementBodyPart
walkSpeed : 2.7
sprintSpeed : 4.5

- type: entity
id: RightLegXenoslime
name: "right xenoslime leg"
parent: [PartXenoslime, BaseRightLeg]
components:
- type: Sprite
sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi
state: "r_leg"
- type: MovementBodyPart
walkSpeed : 2.7
sprintSpeed : 4.5

- type: entity
id: LeftFootXenoslime
name: "left xenoslime foot"
parent: [PartXenoslime, BaseLeftFoot]
components:
- type: Sprite
sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi
state: "l_foot"

- type: entity
id: RightFootXenoslime
name: "right xenoslime foot"
parent: [PartXenoslime, BaseRightFoot]
components:
- type: Sprite
sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi
state: "r_foot"
46 changes: 46 additions & 0 deletions Resources/Prototypes/Corvax/Body/Prototypes/xenoslime.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
- type: body
name: "xenoslime"
id: Xenoslime
root: torso
slots:
head:
part: HeadXenoslime
connections:
- torso
organs:
brain: OrganHumanBrain
eyes: OrganHumanEyes
torso:
part: TorsoXenoslime
organs:
core: SentientSlimeCore
lungs: OrganSlimeLungs
connections:
- left arm
- right arm
- left leg
- right leg
right arm:
part: RightArmXenoslime
connections:
- right hand
left arm:
part: LeftArmXenoslime
connections:
- left hand
right hand:
part: RightHandXenoslime
left hand:
part: LeftHandXenoslime
right leg:
part: RightLegXenoslime
connections:
- right foot
left leg:
part: LeftLegXenoslime
connections:
- left foot
right foot:
part: RightFootXenoslime
left foot:
part: LeftFootXenoslime
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
- type: marking
id: SlimePawSocks
markingCategory: Overlay
bodyPart: RFoot #highest possible layer
speciesRestriction: [Xenoslime]
sprites:
- sprite: Corvax/Mobs/Customization/xenoslime.rsi
state: pawsocks

- type: marking
id: FoxSlimeTail
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Xenoslime]
sprites:
- sprite: Corvax/Mobs/Customization/xenoslime.rsi
state: vulp_tail

- type: marking
id: FoxSlimeEar
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Xenoslime]
sprites:
- sprite: Corvax/Mobs/Customization/xenoslime.rsi
state: vulp_ear
- sprite: Corvax/Mobs/Customization/xenoslime.rsi
state: vulp_ear_inner

- type: marking
id: WolfSlimeTail
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Xenoslime]
sprites:
- sprite: Corvax/Mobs/Customization/xenoslime.rsi
state: wolf_tail
- sprite: Corvax/Mobs/Customization/xenoslime.rsi
state: wolf_tail_inner

- type: marking
id: FoxSlimeBelly
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Xenoslime]
sprites:
- sprite: Corvax/Mobs/Customization/xenoslime.rsi
state: vulp_belly-torso

- type: marking
id: FoxSlimeSnout
bodyPart: Snout
markingCategory: Snout
speciesRestriction: [Xenoslime]
sprites:
- sprite: Corvax/Mobs/Customization/xenoslime.rsi
state: vulp_face
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- type: entity
save: false
name: Urist McXenoslime
parent: [BaseMobXenoslime, BaseMob]
id: MobXenoslime
96 changes: 96 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Mobs/Species/xenoslime.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
- type: entity
save: false
name: Urist McXenoclime
parent: BaseMobSpeciesOrganic
id: BaseMobXenoslime
abstract: true
components:
- type: Hunger # Corvax-Frontier
starvationDamage:
types:
Cold: 0.5
Bloodloss: 0.5
- type: Thirst
- type: Carriable # Carrying system from nyanotrasen.
- type: Icon
sprite: Corvax/Mobs/Species/Xenoslime/parts.rsi
state: full
- type: Body
prototype: Xenoslime
requiredLegs: 2
- type: HumanoidAppearance
species: Xenoslime
- type: Speech
speechVerb: Xenoslime
speechSounds: Xenoslime
- type: TypingIndicator
proto: Xenoslime
- type: Vocal
sounds:
Male: MaleXenoslime
Female: FemaleXenoslime
Unsexed: MaleXenoslime
- type: Damageable
damageContainer: Biological
damageModifierSet: Xenoslime
- type: Bloodstream
bloodReagent: Xenoslime # TODO Color Xenoslime blood based on their Xenoslime color or smth
- type: Barotrauma
damage:
types:
Blunt: 0.50 #per second, scales with pressure and other constants.
Heat: 0.2 # 0.1 more than humans, i feel like low pressure would make Xenoslime boil more than blunt stretch them so i decided on this instead.
- type: Inventory
speciesId: reptilian
- type: Reactive
groups:
Flammable: [ Touch ]
Extinguish: [ Touch ]
reactions:
- reagents: [ Water, SpaceCleaner ]
methods: [ Touch ]
effects:
- !type:WashCreamPieReaction
- reagents: [ Water ]
methods: [ Touch ]
effects:
- !type:HealthChange
scaleByQuantity: true
damage:
types:
Heat: 2
- !type:PopupMessage
type: Local
visualType: Large
messages: [ "slime-hurt-by-water-popup" ]
probability: 0.25
- type: Butcherable
butcheringType: Spike
spawned:
- id: FoodMeatSlime
amount: 5
- type: Respirator
damage:
types:
Asphyxiation: 0.2
damageRecovery:
types:
Asphyxiation: -1.0
maxSaturation: 15
- type: SizeAttributeWhitelist # Frontier
short: true
shortscale: 0.8
shortDensity: 140
shortPseudoItem: true
shortCosmeticOnly: false

- type: entity
save: false
name: Urist McHands
parent: MobHumanDummy
id: MobXenoslimeDummy
noSpawn: true
description: A dummy Xenoslime meant to be used in character setup.
components:
- type: HumanoidAppearance
species: Xenoslime
Loading

0 comments on commit 5917e7c

Please sign in to comment.