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

Перенос Таяров #114

Merged
merged 17 commits into from
Aug 2, 2024
Merged
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
24 changes: 24 additions & 0 deletions Resources/Audio/ADT/Felinid/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- files: ["cat_hiss1.ogg", "cat_hiss2.ogg"]
license: "CC-BY-4.0"
copyright: "Original sound by https://freesound.org/people/secondbody/ - cut out two clips of cat hissing, cleaned up, and converted to ogg."
source: "https://freesound.org/people/secondbody/sounds/50357/"

- files: ["cat_meow1.ogg", "cat_meow2.ogg", "cat_meow3.ogg"]
license: "CC-BY-3.0"
copyright: "Original sound by https://freesound.org/people/ignotus/ - cut out three clips of cat meowing, cleaned up, and converted to ogg."
source: "https://freesound.org/people/ignotus/sounds/26104/"

- files: ["cat_mew1.ogg", "cat_mew2.ogg"]
license: "CC0-1.0"
copyright: "Original sound by https://freesound.org/people/videog/ - cut out two clips of kittens mewing, cleaned up, and converted to ogg."
source: "https://freesound.org/people/videog/sounds/149191/"

- files: ["cat_purr1.ogg"]
license: "CC-BY-4.0"
copyright: "Original sound by https://freesound.org/people/klangstrand/ - cut out short clip, fade in and out, converted to ogg."
source: "https://freesound.org/people/klangstrand/sounds/213951/"

- files: ["cat_growl1.ogg"]
license: "CC0-1.0"
copyright: "Original sound by https://freesound.org/people/Zabuhailo/ - fade in and out, converted to ogg."
source: "https://freesound.org/people/Zabuhailo/sounds/146968/"
Binary file added Resources/Audio/ADT/Felinid/cat_growl1.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/cat_hiss1.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/cat_hiss2.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/cat_meow1.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/cat_meow2.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/cat_meow3.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/cat_mew1.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/cat_mew2.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/cat_purr1.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/cat_scream1.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/cat_scream2.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/cat_scream3.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/cat_wilhelm.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Felinid/hairball.ogg
Binary file not shown.
1 change: 1 addition & 0 deletions Resources/Audio/ADT/Felinid/license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hairball.ogg taken from https://en.wikipedia.org/wiki/File:Common_house_cat_coughing_hairball.ogv CC-BY-SA-3.0
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/Body/Organs/Tajaran.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-OrganTajaranStomach = { ent-OrganAnimalStomach }
.desc = { ent-OrganAnimalStomach.desc }
24 changes: 24 additions & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/Body/Parts/Tajaran.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
ent-PartTajaran = часть тела таяра
.desc = { ent-BaseItem.desc }
ent-TorsoTajaran = тело таяра
.desc = { ent-PartTajaran.desc }
ent-HeadTajaran = голова таяра
.desc = { ent-PartTajaran.desc }
ent-LeftArmTajaran = левая рука таяра
.desc = { ent-PartTajaran.desc }
ent-RightArmTajaran = правая рука таяра
.desc = { ent-PartTajaran.desc }
ent-LeftHandTajaran = левая кисть таяра
.desc = { ent-PartTajaran.desc }
ent-RightHandTajaran = правая кисть таяра
.desc = { ent-PartTajaran.desc }
ent-TailTajaran = хвост таяра
.desc = { ent-PartTajaran.desc }
ent-LeftLegTajaran = левая нога таяра
.desc = { ent-PartTajaran.desc }
ent-RightLegTajaran = правая нога таяра
.desc = { ent-PartTajaran.desc }
ent-LeftFootTajaran = левая ступня таяра
.desc = { ent-PartTajaran.desc }
ent-RightFootTajaran = правая ступня таяра
.desc = { ent-PartTajaran.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
marking-Belly1 = Живот
marking-Belly1-belly1 = Живот
marking-Belly2 = Живот 2
marking-Belly2-belly2 = Живот
marking-Belly3 = Живот 3
marking-Belly3-belly3 = Живот
marking-Belly4 = Грудь
marking-Belly4-chest = Грудь

marking-BodyStripes = Окрас табби
marking-BodyStripes-stripes_body = Табби
marking-BodyBlots = Окрас черепахи
marking-BodyBlots-blots_body = Черепаха
marking-patch2 = Окрас пятен
marking-patch2-patch = Пятна
marking-BodySkeleton = Рисунок скелета
marking-BodySkeleton-skeleton_body = Скелет
marking-arm1 = Окрас рук и ног (градиент)
marking-arm1-points = Градиент

marking-LHandGradient = Окрас левой кисти (градиент)
marking-LHandGradient-gradient_LHand = Градиент
marking-RHandGradient = Окрас правой кисти (градиент)
marking-RHandGradient-gradient_RHand = Градиент
marking-LArmGradient = Окрас левой руки (градиент)
marking-LArmGradient-gradient_LArm = Градиент
marking-RArmGradient = Окрас правой руки (градиент)
marking-RArmGradient-gradient_RArm = Градиент
marking-LLegGradient = Окрас левой ноги (градиент)
marking-LLegGradient-gradient_LLeg = Градиент
marking-RLegGradient = Окрас правой ноги (градиент)
marking-RLegGradient-gradient_RLeg = Градиент

marking-TailWingler1 = Полосы (хвост)
marking-TailWingler1-wingler_1 = Полосы
marking-TailWingler2 = Полосы 2 (хвост)
marking-TailWingler2-wingler_2 = Полосы
marking-TailWingler3 = Полосы 3 (хвост)
marking-TailWingler3-wingler_3 = Полосы
marking-TailTip = Кончик (хвост)
marking-TailTip-tail_tip = Кончик
marking-TailRing = Круг (хвост)
marking-TailRing-tail_ring = Круг
marking-TailSkeleton = Рисунок скелета (хвост)
marking-TailSkeleton-tail_skeleton = Скелет
marking-TailFluffy = Пушистый (хвост)
marking-TailFluffy-tail_fluffy = Хвост
marking-TailColor = Хвост (цвет)
marking-Tail-tail_m = Хвост

marking-Head1 = Ушки
marking-Head1-outears = Наружное ухо
marking-Head1-inears = Внутреннее ухо
marking-Head5 = Нос
marking-Head5-nose = Нос
marking-Head7 = Окрас пятна
marking-Head7-patch_SPONSOR_ONLY = Пятно
marking-Head8 = Окрас тигра
marking-Head8-tiger_face = Окрас
marking-Head9 = Окрас тигра 2
marking-Head9-tiger_head = Окрас
marking-HeadEyesStripes = Полосы (под глазами)
marking-HeadEyesStripes-eye_stripes_head = Полосы
marking-HeadStar = Окрас звезды
marking-HeadStar-star_head = Окрас
marking-HeadRacoon = Окрас енота
marking-HeadRacoon-raccoon-head = Окрас
marking-HeadMane = Грива
marking-HeadMane-mane_head = Грива

marking-Head4 = Морда (ушки)
marking-Head4-muzzleinears = Морда и ушки
marking-Head2 = Морда
marking-Head2-muzzle = Морда

marking-Hair1 = Чёлка
marking-Hair2 = Небрежная
marking-Hair3 = Боб
marking-Hair4 = Плетение
marking-Hair5 = Аккуратная
marking-Hair6 = Кудрявая
marking-Hair7 = Завитки
marking-Hair8 = Девичья (ретро)
marking-Hair9 = Длинная
marking-Hair10 = Растрёпанная
marking-Hair11 = Могавк
marking-Hair12 = Косы
marking-Hair13 = Крысиный хвост
marking-Hair14 = Лохматаяы
marking-Hair15 = Колючая
marking-Hair16 = Прямая
marking-Hair17 = Виктория
marking-HairEyebrows = Брови
marking-HairPigtail = Хвостик
marking-HairPonytail = Конский хвост

marking-FacialHairBeard = Борода
marking-FacialHairCheeks = Бакенбарды
marking-FacialHairMustache = Усы
marking-FacialHairMustache2 = Усы 2
marking-FacialHairMustache3 = Усы 3
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-MobTajaran = Урист МакТаяр
.desc = { ent-BaseMobTajaran.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-BaseMobTajaran = Таяр McHands
.desc = { ent-BaseMobSpecies.desc }
ent-MobTajaranDummy = Tajaran McHands
.desc = Манекен-таяран, предназначенный для использования при настройке персонажа.
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/Species/Tarajan.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
species-name-tajaran = Таяр
species-tajaran-body-parts = "Таяран части тела"
species-tajaran-torso = "Таяран тело"
21 changes: 21 additions & 0 deletions Resources/Prototypes/ADT/Body/Organs/Tajaran.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
- type: entity
id: OrganTajaranStomach
parent: OrganAnimalStomach
noSpawn: true
components:
- type: SolutionContainerManager
solutions:
stomach:
maxVol: 50

- type: entity
id: OrganTajaranHeart
parent: OrganAnimalHeart
components:
- type: Metabolizer
maxReagents: 2
metabolizerTypes: [ Tajaran, Animal ]
groups:
- id: Medicine
- id: Poison
- id: Narcotic
205 changes: 205 additions & 0 deletions Resources/Prototypes/ADT/Body/Parts/Tajaran.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
# TODO: Add descriptions (many)
# TODO BODY: Part damage
- type: entity
id: PartTajaran
parent: BaseItem
name: "Таяр части тела"
abstract: true
components:
- type: Damageable
damageContainer: Biological
- type: BodyPart
- type: ContainerContainer
containers:
bodypart: !type:Container
ents: []

- type: entity
id: TorsoTajaran
name: "тело таяра"
parent: PartTajaran
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "torso_m"
- type: Icon
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "torso_m"
- type: BodyPart
partType: Torso

- type: entity
id: HeadTajaran
name: "голова таяра"
parent: PartTajaran
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "head_m"
- type: Icon
sprite: ADT/Mobs/Species/Tajaran/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: LeftArmTajaran
name: "левая рука таяра"
parent: PartTajaran
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "l_arm"
- type: Icon
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "l_arm"
- type: BodyPart
partType: Arm
symmetry: Left

- type: entity
id: RightArmTajaran
name: "правая рука таяра"
parent: PartTajaran
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "r_arm"
- type: Icon
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "r_arm"
- type: BodyPart
partType: Arm
symmetry: Right

- type: entity
id: LeftHandTajaran
name: "левая кисть таяра"
parent: PartTajaran
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "l_hand"
- type: Icon
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "l_hand"
- type: BodyPart
partType: Hand
symmetry: Left

- type: entity
id: RightHandTajaran
name: "правая кисть таяра"
parent: PartTajaran
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "r_hand"
- type: Icon
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "r_hand"
- type: BodyPart
partType: Hand
symmetry: Right

- type: entity
id: TailTajaran
name: "хвост таяра"
parent: PartTajaran
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "tail_m"
- type: Icon
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "tail_m"
- type: BodyPart
partType: Tail

- type: entity
id: LeftLegTajaran
name: "левая нога таяра"
parent: PartTajaran
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "l_leg"
- type: Icon
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "l_leg"
- type: BodyPart
partType: Leg
symmetry: Left
- type: MovementBodyPart
walkSpeed: 2.7
sprintSpeed: 4.6

- type: entity
id: RightLegTajaran
name: "правая нога таяра"
parent: PartTajaran
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "r_leg"
- type: Icon
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "r_leg"
- type: BodyPart
partType: Leg
symmetry: Right
- type: MovementBodyPart
walkSpeed: 2.7
sprintSpeed: 4.6

- type: entity
id: LeftFootTajaran
name: "левая ступня таяра"
parent: PartTajaran
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "l_foot"
- type: Icon
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "l_foot"
- type: BodyPart
partType: Foot
symmetry: Left

- type: entity
id: RightFootTajaran
name: "правая ступня таяра"
parent: PartTajaran
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "r_foot"
- type: Icon
sprite: ADT/Mobs/Species/Tajaran/parts.rsi
state: "r_foot"
- type: BodyPart
partType: Foot
symmetry: Right
Loading
Loading