Skip to content

Commit

Permalink
[Tweak] Better Lizards (#749)
Browse files Browse the repository at this point in the history
  • Loading branch information
PuroSlavKing authored Sep 16, 2024
1 parent 2969282 commit 7620fa0
Show file tree
Hide file tree
Showing 48 changed files with 368 additions and 40 deletions.
43 changes: 43 additions & 0 deletions Resources/Locale/ru-RU/_ataraxia/markings/reptilian.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# ГОЛОВА
marking-LizardHeadCobraHood = Ящер, воротник с ушами (Кобра)
marking-LizardHeadCobraHood-cobra_hood_with_ears = Внешняя часть
marking-LizardHeadCobraHood-cobra_hood_with_ears_overlay = Внутреняя часть
marking-LizardHornsCurled-horns_curled_l = Левый рог
marking-LizardHornsCurled-horns_curled_r = Правый рог
marking-LizardHornsRam-horns_ram_l = Левый рог
marking-LizardHornsRam-horns_ram_r = Правый рог
marking-LizardHornsShort-horns_short_l = Левый рог
marking-LizardHornsShort-horns_short_r = Правый рог
marking-LizardHornsSimple-horns_simple_l = Левый рог
marking-LizardHornsSimple-horns_simple_r = Правый рог
marking-LizardHornsDouble-horns_double_l = Левые рога
marking-LizardHornsDouble-horns_double_r = Правые рога
marking-LizardHornsArgali-horns_argali_l = Левый рог
marking-LizardHornsArgali-horns_argali_r = Правый рог
marking-LizardHornsAyrshire-horns_ayrshire_l = Левый рог
marking-LizardHornsAyrshire-horns_ayrshire_r = Правый рог
marking-LizardHornsMyrsore-horns_myrsore_l = Левый рог
marking-LizardHornsMyrsore-horns_myrsore_r = Правый рог
marking-LizardHornsBighorn-horns_bighorn_l = Левый рог
marking-LizardHornsBighorn-horns_bighorn_r = Правый рог
# ХВОСТЫ
marking-SnakeLargeTail = Ящер, большой змеиный хвост
marking-SnakeLargeTail-tail_snakelarge = Верняя часть
marking-SnakeLargeTail-tail_snakelarge_overlay = Нижняя часть
marking-WesternDragonTail = Ящер, хвост западного дракона
marking-WesternDragonTail-tail_westerndragon = Верняя часть
marking-WesternDragonTail-tail_westerndragon_overlay = Нижняя часть
marking-KangarooTail = Ящер, хвост кенгуру
marking-KangarooTail-tail_kangaroo = Верняя часть
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ent-OrganAnthroAnimalStomach = { ent-OrganHumanStomach }
.desc = { ent-OrganHumanStomach.desc }
ent-OrganAnthroAnimalLiver = { ent-OrganHumanLiver }
.desc = { ent-OrganHumanLiver.desc }
ent-OrganAnthroAnimalHeart = { ent-OrganHumanHeart }
.desc = { ent-OrganHumanHeart.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-OrganReptilianTongue = язык ящера
.desc = Мясистая мышца, используемая в основном для шипения.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
metabolizer-type-anthropomorph-animal = Гуманоидное животное
18 changes: 9 additions & 9 deletions Resources/Prototypes/Body/Organs/reptilian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
parent: OrganAnimalStomach
categories: [ HideSpawnMenu ]
components:
- type: Stomach
specialDigestible:
tags:
- Fruit
- ReptilianFood
- Meat
- Pill
- Crayon
- Paper
- type: Stomach # Ataraxia-REMOVE
# specialDigestible:
# tags:
# - Fruit
# - ReptilianFood
# - Meat
# - Pill
# - Crayon
# - Paper
- type: SolutionContainerManager
solutions:
stomach:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Body/Prototypes/reptilian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
torso:
part: TorsoReptilian
organs:
heart: OrganAnimalHeart
heart: OrganAnthroAnimalHeart # Ataraxia
lungs: OrganHumanLungs
stomach: OrganReptilianStomach
liver: OrganAnimalLiver
liver: OrganAnthroAnimalLiver # Ataraxia
kidneys: OrganHumanKidneys
connections:
- right arm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,44 +87,54 @@
markingCategory: HeadTop
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_curled
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_curled_l
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_curled_r

- type: marking
id: LizardHornsRam
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_ram
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_ram_l
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_ram_r

- type: marking
id: LizardHornsShort
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_short
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_short_l
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_short_r

- type: marking
id: LizardHornsSimple
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_simple
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_simple_l
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_simple_r

- type: marking
id: LizardHornsDouble
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_double
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_double_l
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_double_r

- type: marking
id: LizardTailSmooth
Expand Down Expand Up @@ -208,11 +218,7 @@
id: LizardChestTiger
bodyPart: Chest
markingCategory: Chest
speciesRestriction:
[
Reptilian,
Shadowkin,
]
speciesRestriction: [Reptilian, Shadowkin] # Ataraxia
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: body_tiger
Expand Down Expand Up @@ -268,35 +274,43 @@
markingCategory: HeadTop
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_argali
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_argali_l
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_argali_r

- type: marking
id: LizardHornsAyrshire
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_ayrshire
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_ayrshire_l
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_ayrshire_r

- type: marking
id: LizardHornsMyrsore
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_myrsore
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_myrsore_l
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_myrsore_r

- type: marking
id: LizardHornsBighorn
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_bighorn
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_bighorn_l
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi # Ataraxia
state: horns_bighorn_r

- type: marking
id: LizardHornsDemonic
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Reagents/gases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
conditions:
- !type:OrganType
type: Animal
- !type:Oxygenate # Ataraxia
conditions:
- !type:OrganType
type: AnthroAnimal
- !type:Oxygenate
conditions:
- !type:OrganType
Expand Down
23 changes: 21 additions & 2 deletions Resources/Prototypes/Reagents/toxins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,8 @@
min: 1
- !type:OrganType
type: Animal # Applying damage to the mobs with lower metabolism capabilities
- !type:OrganType # Ataraxia
type: AnthroAnimal
damage:
types:
Poison: 0.4
Expand All @@ -468,6 +470,8 @@
min: 3
- !type:OrganType
type: Animal
- !type:OrganType # Ataraxia
type: AnthroAnimal

- type: reagent
id: Amatoxin
Expand Down Expand Up @@ -534,6 +538,9 @@
- !type:OrganType
type: Animal
shouldHave: false
- !type:OrganType # Ataraxia
type: AnthroAnimal
shouldHave: false
type: Local
visualType: MediumCaution
messages: [ "generic-reagent-effect-sick" ]
Expand All @@ -549,14 +556,22 @@
- !type:OrganType
type: Animal
shouldHave: false
damage:
- !type:OrganType # Ataraxia
type: AnthroAnimal
shouldHave: true
damage: # Ataraxia-EDIT
types:
Poison: 1
Blunt: -0.5
Piercing: -0.5
Heat: -0.2
- !type:AdjustReagent
conditions:
- !type:OrganType
type: Animal
shouldHave: true
- !type:OrganType # Ataraxia
type: AnthroAnimal
shouldHave: false
reagent: Protein
amount: 0.5

Expand All @@ -578,6 +593,8 @@
min: 1
- !type:OrganType
type: Animal
- !type:OrganType # Ataraxia
type: AnthroAnimal
damage:
types:
Poison: 0.06
Expand Down Expand Up @@ -621,6 +638,8 @@
min: 1
- !type:OrganType
type: Animal
- !type:OrganType # Ataraxia
type: AnthroAnimal
damage:
types:
Poison: 0.06
Expand Down
23 changes: 23 additions & 0 deletions Resources/Prototypes/_Ataraxia/Body/Organs/anthro_animal.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: entity
parent: OrganHumanStomach
id: OrganAnthroAnimalStomach
noSpawn: true
components:
- type: Metabolizer
metabolizerTypes: [ AnthroAnimal ]

- type: entity
parent: OrganHumanLiver
id: OrganAnthroAnimalLiver
noSpawn: true
components:
- type: Metabolizer
metabolizerTypes: [ AnthroAnimal ]

- type: entity
parent: OrganHumanHeart
id: OrganAnthroAnimalHeart
noSpawn: true
components:
- type: Metabolizer
metabolizerTypes: [ AnthroAnimal ]
9 changes: 9 additions & 0 deletions Resources/Prototypes/_Ataraxia/Body/Organs/reptilian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: entity
parent: BaseHumanOrgan
id: OrganReptilianTongue
name: reptilian tongue
description: Fleshy muscle used mainly for hissing.
components:
- type: Sprite
sprite: _Ataraxia/Items/Misc/lizardtongue.rsi
state: tonguelizard
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- type: metabolizerType
id: AnthroAnimal
name: metabolizer-type-anthropomorph-animal
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
- type: marking
id: LizardHeadCobraHood
bodyPart: HeadSide
markingCategory: HeadSide
speciesRestriction: [Reptilian]
sprites:
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi
state: cobra_hood_with_ears
- sprite: _Ataraxia/Mobs/Customization/reptilian_parts.rsi
state: cobra_hood_with_ears_overlay

- type: marking
id: SnakeLargeTail
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Reptilian]
sprites:
- sprite: _Ataraxia/Mobs/Customization/reptilian_64x32.rsi
state: tail_snakelarge
- sprite: _Ataraxia/Mobs/Customization/reptilian_64x32.rsi
state: tail_snakelarge_overlay

- type: marking
id: WesternDragonTail
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Reptilian]
sprites:
- sprite: _Ataraxia/Mobs/Customization/reptilian_64x32.rsi
state: tail_westerndragon
- sprite: _Ataraxia/Mobs/Customization/reptilian_64x32.rsi
state: tail_westerndragon_overlay

- type: marking
id: KangarooTail
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Reptilian]
sprites:
- sprite: _Ataraxia/Mobs/Customization/reptilian_64x32.rsi
state: tail_kangaroo
Loading

0 comments on commit 7620fa0

Please sign in to comment.