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

Demon #126

Merged
merged 6 commits into from
Jul 13, 2024
Merged

Demon #126

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
22 changes: 22 additions & 0 deletions Resources/Locale/en-US/ADT/Body/Parts/demon.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ent-PartDemon = demon body part
.desc = { ent-BaseItem.desc }
ent-TorsoDemon = demon torso
.desc = { ent-PartDemon.desc }
ent-HeadDemon = demon head
.desc = { ent-PartDemon.desc }
ent-LeftArmDemon = left demon arm
.desc = { ent-PartDemon.desc }
ent-RightArmDemon = right demon arm
.desc = { ent-PartDemon.desc }
ent-LeftHandDemon = left demon hand
.desc = { ent-PartDemon.desc }
ent-RightHandDemon = right demon hand
.desc = { ent-PartDemon.desc }
ent-LeftLegDemon = left demon leg
.desc = { ent-PartDemon.desc }
ent-RightLegDemon = right demon leg
.desc = { ent-PartDemon.desc }
ent-LeftFootDemon = left demon foot
.desc = { ent-PartDemon.desc }
ent-RightFootDemon = right demon foot
.desc = { ent-PartDemon.desc }
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/ADT/Entities/Mobs/Species/demon.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-BaseMobDemon = Urisst' Mzhand Demon
.desc = { ent-BaseMobSpecies.desc }
ent-MobDemonDummy = Urist McHands
.desc = A dummy reptilian meant to be used in character setup.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/Body/Organs/demon.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-OrganDemonStomach = { ent-OrganAnimalStomach }
.desc = { ent-OrganAnimalStomach.desc }
10 changes: 10 additions & 0 deletions Resources/Locale/ru-RU/ADT/Body/Organs/drask.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ent-OrganDraskEyes = глаза
.desc = Я тебя вижу!
ent-OrganDraskLungs = лёгкие
.desc = Фильтрует кислород из атмосферы, который затем поступает в кровь для использования в качестве переносчика электронов.
ent-OrganDraskHeart = сердце
.desc = Мне жаль того бессердечного ублюдка, который его потерял.
ent-OrganDraskInnards = внутренности
.desc = Мерзость.
ent-OrganDraskKidneys = почки
.desc = Выводят токсины из кровеносной системы.
22 changes: 22 additions & 0 deletions Resources/Locale/ru-RU/ADT/Body/Parts/demon.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ent-PartDemon = часть тела арканы
.desc = { ent-BaseItem.desc }
ent-TorsoDemon = торс арканы
.desc = { ent-PartDemon.desc }
ent-HeadDemon = голова арканы
.desc = { ent-PartDemon.desc }
ent-LeftArmDemon = левая рука арканы
.desc = { ent-PartDemon.desc }
ent-RightArmDemon = правая рука арканы
.desc = { ent-PartDemon.desc }
ent-LeftHandDemon = левая кисть арканы
.desc = { ent-PartDemon.desc }
ent-RightHandDemon = правая кисть арканы
.desc = { ent-PartDemon.desc }
ent-LeftLegDemon = левая нога арканы
.desc = { ent-PartDemon.desc }
ent-RightLegDemon = правая нога арканы
.desc = { ent-PartDemon.desc }
ent-LeftFootDemon = левая стопа арканы
.desc = { ent-PartDemon.desc }
ent-RightFootDemon = правая стопа арканы
.desc = { ent-PartDemon.desc }
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/Body/Parts/drask.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
marking-DraskArmRight = правая рука
marking-DraskArmLeft = левая рука
8 changes: 8 additions & 0 deletions Resources/Locale/ru-RU/ADT/Chemistry/metabolizer-types.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,11 @@ metabolizer-type-dwarf = Дварф
metabolizer-type-moth = Ниан
metabolizer-type-arachnid = Арахнид
metabolizer-type-drask = Драск
metabolizer-type-demon = Аркана
metabolizer-type-novakid = Новакид
metabolizer-type-shark = Акула
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

По моему тут много лишнего

metabolizer-type-vulpkanin = Вульпканин
metabolizer-type-tajaran = Таяран
metabolizer-type-reptilian = Унатх
metabolizer-type-ursus = Урс
metabolizer-type-felinid = Фелинид
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/demon.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-MobDemon = { ent-BaseMobDemon }
.desc = { ent-BaseMobDemon.desc }
5 changes: 5 additions & 0 deletions Resources/Locale/ru-RU/ADT/Entities/Mobs/Species/demon.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ent-BaseMobDemon = Урист МакАркана
.desc = { ent-BaseMobSpeciesOrganic.desc }
.suffix = Аркана
ent-MobDemonDummy = { ent-BaseSpeciesDummy }
.desc = { ent-BaseSpeciesDummy.desc }
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/Species/demon.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
species-name-demon = Аркана
12 changes: 0 additions & 12 deletions Resources/Locale/ru-RU/ADT/Species/drask.ftl
Original file line number Diff line number Diff line change
@@ -1,13 +1 @@
species-name-drask = Драск
marking-DraskArmRight = правая рука
marking-DraskArmLeft = левая рука
ent-OrganDraskEyes = глаза
.desc = Я тебя вижу!
ent-OrganDraskLungs = лёгкие
.desc = Фильтрует кислород из атмосферы, который затем поступает в кровь для использования в качестве переносчика электронов.
ent-OrganDraskHeart = сердце
.desc = Мне жаль того бессердечного ублюдка, который его потерял.
ent-OrganDraskInnards = внутренности
.desc = Мерзость.
ent-OrganDraskKidneys = почки
.desc = Выводят токсины из кровеносной системы.
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/Species/kobolt.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
species-name-kobolt = Кобольд
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Мгм

21 changes: 21 additions & 0 deletions Resources/Prototypes/ADT/Body/Organs/demon.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
- type: entity
id: OrganDemonStomach
parent: OrganAnimalStomach
noSpawn: true
components:
- type: SolutionContainerManager
solutions:
stomach:
maxVol: 50

- type: entity
id: OrganDemonHeart
parent: OrganAnimalHeart
components:
- type: Metabolizer
maxReagents: 2
metabolizerTypes: [ Demon ]
groups:
- id: Medicine
- id: Poison
- id: Narcotic
1 change: 0 additions & 1 deletion Resources/Prototypes/ADT/Body/Organs/fill.txt

This file was deleted.

193 changes: 193 additions & 0 deletions Resources/Prototypes/ADT/Body/Parts/demon.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
# TODO: Add descriptions (many)
# TODO BODY: Part damage
- type: entity
id: PartDemon
parent: BaseItem
name: "demon body part"
abstract: true
components:
- type: Damageable
damageContainer: Biological
- type: BodyPart
- type: ContainerContainer
containers:
bodypart: !type:Container
ents: []
- type: Tag
tags:
- Trash

- type: entity
id: TorsoDemon
name: "demon torso"
parent: PartDemon
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Demon/parts.rsi
state: "torso_m"
- type: Icon
sprite: ADT/Mobs/Demon/parts.rsi
state: "torso_m"
- type: BodyPart
partType: Torso

- type: entity
id: HeadDemon
name: "demon head"
parent: PartDemon
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Demon/parts.rsi
state: "head_m"
- type: Icon
sprite: ADT/Mobs/Demon/parts.rsi
state: "head_m"
- type: BodyPart
partType: Head
vital: true
- type: Input
context: "ghost"
- type: MovementSpeedModifier
baseWalkSpeed: 0
baseSprintSpeed: 0
- type: InputMover
- type: GhostOnMove
- type: Tag
tags:
- Head

- type: entity
id: LeftArmDemon
name: "left demon arm"
parent: PartDemon
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Demon/parts.rsi
state: "l_arm"
- type: Icon
sprite: ADT/Mobs/Demon/parts.rsi
state: "l_arm"
- type: BodyPart
partType: Arm
symmetry: Left

- type: entity
id: RightArmDemon
name: "right demon arm"
parent: PartDemon
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Demon/parts.rsi
state: "r_arm"
- type: Icon
sprite: ADT/Mobs/Demon/parts.rsi
state: "r_arm"
- type: BodyPart
partType: Arm
symmetry: Right

- type: entity
id: LeftHandDemon
name: "left demon hand"
parent: PartDemon
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Demon/parts.rsi
state: "l_hand"
- type: Icon
sprite: ADT/Mobs/Demon/parts.rsi
state: "l_hand"
- type: BodyPart
partType: Hand
symmetry: Left

- type: entity
id: RightHandDemon
name: "right demon hand"
parent: PartDemon
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Demon/parts.rsi
state: "r_hand"
- type: Icon
sprite: ADT/Mobs/Demon/parts.rsi
state: "r_hand"
- type: BodyPart
partType: Hand
symmetry: Right

- type: entity
id: LeftLegDemon
name: "left demon leg"
parent: PartDemon
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Demon/parts.rsi
state: "l_leg"
- type: Icon
sprite: ADT/Mobs/Demon/parts.rsi
state: "l_leg"
- type: BodyPart
partType: Leg
symmetry: Left
- type: MovementBodyPart
walkSpeed : 2.5
sprintSpeed : 4.5

- type: entity
id: RightLegDemon
name: "right demon leg"
parent: PartDemon
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Demon/parts.rsi
state: "r_leg"
- type: Icon
sprite: ADT/Mobs/Demon/parts.rsi
state: "r_leg"
- type: BodyPart
partType: Leg
symmetry: Right
- type: MovementBodyPart
walkSpeed : 2.5
sprintSpeed : 4.5

- type: entity
id: LeftFootDemon
name: "left demon foot"
parent: PartDemon
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Demon/parts.rsi
state: "l_foot"
- type: Icon
sprite: ADT/Mobs/Demon/parts.rsi
state: "l_foot"
- type: BodyPart
partType: Foot
symmetry: Left

- type: entity
id: RightFootDemon
name: "right demon foot"
parent: PartDemon
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Demon/parts.rsi
state: "r_foot"
- type: Icon
sprite: ADT/Mobs/Demon/parts.rsi
state: "r_foot"
- type: BodyPart
partType: Foot
symmetry: Right
1 change: 0 additions & 1 deletion Resources/Prototypes/ADT/Body/Parts/fill.txt

This file was deleted.

49 changes: 49 additions & 0 deletions Resources/Prototypes/ADT/Body/Prototypes/demon.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
- type: body
name: "demon"
id: Demon
root: torso
slots:
head:
part: HeadDemon
connections:
- torso
organs:
brain: OrganHumanBrain
eyes: OrganHumanEyes
torso:
part: TorsoDemon
organs:
heart: OrganDemonHeart
lungs: OrganHumanLungs
stomach: OrganDemonStomach
liver: OrganAnimalLiver
kidneys: OrganHumanKidneys
connections:
- left arm
- right arm
- left leg
- right leg
right arm:
part: RightArmDemon
connections:
- right hand
left arm:
part: LeftArmDemon
connections:
- left hand
right hand:
part: RightHandDemon
left hand:
part: LeftHandDemon
right leg:
part: RightLegDemon
connections:
- right foot
left leg:
part: LeftLegDemon
connections:
- left foot
right foot:
part: RightFootDemon
left foot:
part: LeftFootDemon
Loading
Loading