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

[Tweak] Better Lizards #164

Merged
merged 7 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
74 changes: 74 additions & 0 deletions Resources/Locale/en-US/_white/markings/reptilian.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# HEAD
marking-LizardHeadGuilmon= Lizard, guilmon
marking-LizardHeadGuilmon-guilmon = Main

marking-LizardShoutEasternDragon= Lizard, eastern dragon
marking-LizardShoutEasternDragon-eastern_dragon = Outer
marking-LizardShoutEasternDragon-eastern_dragon_overlay = Inner

marking-LizardShoutEasternDragonUsiki= Lizard, eastern dragon (Tentacle)
marking-LizardShoutEasternDragonUsiki-eastern_dragon = Outer
marking-LizardShoutEasternDragonUsiki-eastern_dragon_overlay = Inner
marking-LizardShoutEasternDragonUsiki-eastern_dragon_usiki = Tentacle

marking-LizardHeadCobraHood = Lizard, hood with ears (Cobra)
marking-LizardHeadCobraHood-cobra_hood_with_ears = Outer
marking-LizardHeadCobraHood-cobra_hood_with_ears_overlay = Inner

marking-LizardHornsCurled-horns_curled_l = Left horn
marking-LizardHornsCurled-horns_curled_r = Right horn

marking-LizardHornsRam-horns_ram_l = Left horn
marking-LizardHornsRam-horns_ram_r = Right horn

marking-LizardHornsShort-horns_short_l = Left horn
marking-LizardHornsShort-horns_short_r = The right horn

marking-LizardHornsSimple-horns_simple_l = Left horn
marking-LizardHornsSimple-horns_simple_r = Right horn

marking-LizardHornsDouble-horns_double_l = Left horns
marking-LizardHornsDouble-horns_double_r = Right horns

marking-LizardHornsArgali-horns_argali_l = Left horn
marking-LizardHornsArgali-horns_argali_r = Right horn

marking-LizardHornsAyrshire-horns_ayrshire_l = Left Horn
marking-LizardHornsAyrshire-horns_ayrshire_r = Right Horn

marking-LizardHornsMyrsore-horns_myrsore_l = Left horn
marking-LizardHornsMyrsore-horns_myrsore_r = Right horn

marking-LizardHornsBighorn-horns_bighorn_l = Left horn
marking-LizardHornsBighorn-horns_bighorn_r = Right horn

# TAILS
marking-SnakeLargeTail = Lizard, large snake tail
marking-SnakeLargeTail-tail_snakelarge = Inner
marking-SnakeLargeTail-tail_snakelarge_overlay = Outer

# SPINES
marking-LizardChestSpinesAquatic = Lizard, chest, spines (Aquatic)
marking-LizardChestSpinesAquatic-spines_aquatic = Spikes
marking-LizardChestSpinesAquaticWithoutTail = Lizard, chest, spines (Aquatic, without tail)
marking-LizardChestSpinesAquaticWithoutTail-spines_aquatic = Spikes

marking-LizardChestSpinesLong = Lizard, chest, spines (Long)
marking-LizardChestSpinesLong-spines_long = Spikes
marking-LizardChestSpinesLongWithoutTail = Lizard, chest, spines (Long, without tail)
marking-LizardChestSpinesLongWithoutTail-spines_long = Spikes

marking-LizardChestSpinesLongMembrane = Lizard, chest, spines (Long, Membrane)
marking-LizardChestSpinesLongMembrane-spines_longmembrane = spines
marking-LizardChestSpinesLongMembraneWithoutTail = Lizard, chest, spines (Long, Membrane, without tail)
marking-LizardChestSpinesLongMembraneWithoutTail-spines_longmembrane = spines

marking-LizardChestSpinesShort = Lizard, chest, spines (Short)
marking-LizardChestSpinesShort-spines_short = Spikes
marking-LizardChestSpinesShortWithoutTail = Lizard, chest, spines (Short, without tail)
marking-LizardChestSpinesShortWithoutTail-spines_short = Spikes

marking-LizardChestSpinesShortMembrane = Lizard, chest, spines (Short, Membrane)
marking-LizardChestSpinesShortMembrane-spines_short = Spikes
marking-LizardChestSpinesShortMembraneWithoutTail = Lizard, chest, spines (Short, Membrane, without tail)
marking-LizardChestSpinesShortMembraneWithoutTail-spines_short = Spikes
74 changes: 74 additions & 0 deletions Resources/Locale/ru-RU/_white/markings/reptilian.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# ГОЛОВА
marking-LizardHeadGuilmon= Ящер, гилмон
marking-LizardHeadGuilmon-guilmon = Основная часть

marking-LizardShoutEasternDragon= Ящер, восточный дракон
marking-LizardShoutEasternDragon-cobra_hood_with_ears = Внешняя часть
marking-LizardShoutEasternDragon-cobra_hood_with_ears_overlay = Внутреняя часть
PuroSlavKing marked this conversation as resolved.
Show resolved Hide resolved

marking-LizardShoutEasternDragonUsiki= Ящер, восточный дракон (Усики)
marking-LizardShoutEasternDragonUsiki-eastern_dragon = Внешняя часть
marking-LizardShoutEasternDragonUsiki-eastern_dragon_overlay = Внутреняя часть
marking-LizardShoutEasternDragonUsiki-eastern_dragon_usiki = Усики

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-LizardChestSpinesAquatic = Ящер, грудь, шипы на спине (Водный)
marking-LizardChestSpinesAquatic-spines_aquatic = Шипы
marking-LizardChestSpinesAquaticWithoutTail = Ящер, грудь, шипы на спине (Водный, без хвоста)
marking-LizardChestSpinesAquaticWithoutTail-spines_aquatic = Шипы

marking-LizardChestSpinesLong = Ящер, грудь, шипы на спине (Длинные)
marking-LizardChestSpinesLong-spines_long = Шипы
marking-LizardChestSpinesLongWithoutTail = Ящер, грудь, шипы на спине (Длинные, без хвоста)
marking-LizardChestSpinesLongWithoutTail-spines_long = Шипы

marking-LizardChestSpinesLongMembrane = Ящер, грудь, шипы на спине (Длинные, Мембрана)
marking-LizardChestSpinesLongMembrane-spines_longmembrane = Шипы
marking-LizardChestSpinesLongMembraneWithoutTail = Ящер, грудь, шипы на спине (Длинные, Мембрана, без хвоста)
marking-LizardChestSpinesLongMembraneWithoutTail-spines_longmembrane = Шипы

marking-LizardChestSpinesShort = Ящер, грудь, шипы на спине (Короткие)
marking-LizardChestSpinesShort-spines_short = Шипы
marking-LizardChestSpinesShortWithoutTail = Ящер, грудь, шипы на спине (Короткие, без хвоста)
marking-LizardChestSpinesShortWithoutTail-spines_short = Шипы

marking-LizardChestSpinesShortMembrane = Ящер, грудь, шипы на спине (Короткие, Мембрана)
marking-LizardChestSpinesShortMembrane-spines_short = Шипы
marking-LizardChestSpinesShortMembraneWithoutTail = Ящер, грудь, шипы на спине (Короткие, Мембрана, без хвоста)
marking-LizardChestSpinesShortMembraneWithoutTail-spines_short = Шипы
16 changes: 8 additions & 8 deletions Resources/Prototypes/Body/Organs/reptilian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
categories: [ HideSpawnMenu ]
components:
- type: Stomach
specialDigestible:
tags:
- Fruit
- ReptilianFood
- Meat
- Pill
- Crayon
- Paper
# specialDigestible: # WWDP-Remove
# tags:
# - Fruit
# - ReptilianFood
# - Meat
# - Pill
# - Crayon
# - Paper
- type: SolutionContainerManager
solutions:
stomach:
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@
shoes:
- state: equipped-FEET
offset: "0, -0.02"
- state: equipped-FEET-reptilian # WWDP
offset: "0, -0.02"
- type: Item
size: Small
sprite: Clothing/Shoes/Specific/large_clown.rsi
Expand All @@ -260,6 +262,8 @@
shoes:
- state: equipped-FEET
offset: "0, -0.04"
- state: equipped-FEET-reptilian # WWDP
offset: "0, -0.04"
- type: Item
sprite: Clothing/Shoes/Specific/skates.rsi
- type: ClothingSpeedModifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,44 +87,54 @@
markingCategory: HeadTop
speciesRestriction: [Reptilian, Human]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_curled
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_curled_l
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_curled_r

- type: marking
id: LizardHornsRam
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian, Human]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_ram
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_ram_l
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_ram_r

- type: marking
id: LizardHornsShort
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian, Human]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_short
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_short_l
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_short_r

- type: marking
id: LizardHornsSimple
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian, Human]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_simple
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_simple_l
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_simple_r

- type: marking
id: LizardHornsDouble
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian, Human]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_double
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_double_l
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_double_r

- type: marking
id: LizardTailSmooth
Expand Down Expand Up @@ -264,35 +274,43 @@
markingCategory: HeadTop
speciesRestriction: [Reptilian, Human]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_argali
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_argali_l
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_argali_r

- type: marking
id: LizardHornsAyrshire
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian, Human]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_ayrshire
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_ayrshire_l
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_ayrshire_r

- type: marking
id: LizardHornsMyrsore
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian, Human]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_myrsore
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_myrsore_l
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_myrsore_r

- type: marking
id: LizardHornsBighorn
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian, Human]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_bighorn
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_bighorn_l
- sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
state: horns_bighorn_r

- type: marking
id: LizardHornsKoboldEars
Expand Down
50 changes: 50 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,30 @@
amount: 5
- type: Inventory
speciesId: reptilian
# WWDP-Edit-Start
femaleDisplacements:
jumpsuit:
sizeMaps:
32:
sprite: _White/Mobs/Species/displacement.rsi
state: jumpsuit-female
shoes:
sizeMaps:
32:
sprite: _White/Mobs/Species/displacement.rsi
state: shoes
displacements:
jumpsuit:
sizeMaps:
32:
sprite: _White/Mobs/Species/displacement.rsi
state: jumpsuit
shoes:
sizeMaps:
32:
sprite: _White/Mobs/Species/displacement.rsi
state: shoes
# WWDP-Edit-End
PuroSlavKing marked this conversation as resolved.
Show resolved Hide resolved
- type: LizardAccent
- type: Speech
speechSounds: Lizard
Expand Down Expand Up @@ -78,5 +102,31 @@
components:
- type: HumanoidAppearance
species: Reptilian
# WWDP-Edit-Start
- type: Inventory
speciesId: reptilian
femaleDisplacements:
jumpsuit:
sizeMaps:
32:
sprite: _White/Mobs/Species/displacement.rsi
state: jumpsuit-female
shoes:
sizeMaps:
32:
sprite: _White/Mobs/Species/displacement.rsi
state: shoes
displacements:
jumpsuit:
sizeMaps:
32:
sprite: _White/Mobs/Species/displacement.rsi
state: jumpsuit
shoes:
sizeMaps:
32:
sprite: _White/Mobs/Species/displacement.rsi
state: shoes
# WWDP-Edit-End

#Weh
10 changes: 5 additions & 5 deletions Resources/Prototypes/Species/reptilian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
RArm: MobReptilianRArm
LHand: MobReptilianLHand
RHand: MobReptilianRHand
LLeg: MobReptilianLLeg
RLeg: MobReptilianRLeg
LFoot: MobReptilianLFoot
RFoot: MobReptilianRFoot
LLeg: MobReptilianLLegDigi # WWDP-Edit
RLeg: MobReptilianRLegDigi # WWDP-Edit
LFoot: MobReptilianLFootDigi # WWDP-Edit
RFoot: MobReptilianRFootDigi # WWDP-Edit

- type: markingPoints
id: MobReptilianMarkingLimits
Expand All @@ -62,7 +62,7 @@
points: 2
required: false
Chest:
points: 1
points: 3 # WWDP-Edit
required: false
RightLeg:
points: 2
Expand Down
Loading
Loading