Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это
комментарии - они не будут видны в PR. -->


**Проверки**
<!-- Выполнение всех следующих действий, если это приемлемо для вида
изменений сильно ускорит разбор вашего PR -->
- [x] PR полностью завершён и мне не нужна помощь чтобы его закончить.
- [x] Я внимательно просмотрел все свои изменения и багов в них не
нашёл.
- [x] Я запускал локальный сервер со своими изменениями и всё
протестировал.
- [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR
этого не требует.

**Изменения**

Перенос урсов, правил также отсортировал некоторые файлы

no cl

---------

Co-authored-by: Xelasto <[email protected]>
  • Loading branch information
Schrodinger71 and Xelasto authored Aug 7, 2024
1 parent 365c78d commit 4301274
Show file tree
Hide file tree
Showing 212 changed files with 2,421 additions and 357 deletions.
4 changes: 4 additions & 0 deletions Resources/Audio/ADT/Ursus/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["cry1, cry2, laugh1, laugh2, scream1, scream2, scream3"]
license: "CC-BY-SA-3.0"
copyright: "https://zvukogram.com/category/zvuki-izdavaemyie-medvedyami/"
source: "https://zvukogram.com/category/zvuki-izdavaemyie-medvedyami/"
Binary file added Resources/Audio/ADT/Ursus/cry1.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Ursus/cry2.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Ursus/laugh1.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Ursus/laugh2.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Ursus/scream1.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Ursus/scream2.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Ursus/scream3.ogg
Binary file not shown.
Binary file added Resources/Audio/ADT/Ursus/scream4.ogg
Binary file not shown.
8 changes: 0 additions & 8 deletions Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTClothingOuterCoatUrs = костюм Урса
.desc = Очень тёплый пуховик, сделанный точно не из Урса..
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
ent-ADTClothingUniformsJumpsuitWhiteDiplomatSuitL = Белый костюм дипломата
.desc = Специально сделанный белый костюм дипломата NanoTrasen.
ent-ADTClothingUniformPathologistSuit = костюм патологоанатома
.desc = Лёгкий комбинезон для работника морга.
ent-ADTClothingUniformPathologistSkirt = юбка-костюм патологоанатома
.desc = Лёгкая юбка-комбинезон для работницы морга.
ent-ADTClothingUniformPathologistSuitAlt = чёрный костюм патологоанатома
.desc = Лёгкий комбинезон для работника морга. Более угрюмая версия.
ent-ADTClothingUniformPathologistSkirtAlt = чёрная юбка-костюм патологоанатома
.desc = Лёгкая юбка-комбинезон для работницы морга. Более угрюмая версия.
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
marking-ADTUrsusNeat = Аккуратная
marking-ADTUrsusWarrior = Воин
marking-ADTUrsusWarrior2 = Воин 2
marking-ADTUrsusSurfaceRiver = Гладь реки
marking-ADTUrsusGorgon = Горгона
marking-ADTUrsusBreadwinner = Добытчик
marking-ADTUrsusWhip = Кнут
marking-ADTUrsusWhip2 = Кнут 2
marking-ADTUrsusShorthedgehog = Короткий ежик
marking-ADTUrsusShorthedgehog2 = Короткий ежик 2
marking-ADTUrsusValkyriesscythe = Коса валькирии
marking-ADTUrsusValkyriesscythe2 = Коса валькирии 2
marking-ADTUrsusWarriorsscythe = Коса воина
marking-ADTUrsusBraidsontheside = Косы на бок
marking-ADTUrsusBraidsontheside2 = Косы на бок 2
marking-ADTUrsusForeststyle = Лесной стиль
marking-ADTUrsusForeststyle2 = Лесной стиль 2
marking-ADTUrsusSoftwaves = Мягкие волны
marking-ADTUrsusSoftwaves2 = Мягкие волны 2
marking-ADTUrsusBraidedcone = Плетёная шишка
marking-ADTUrsusBraidedside = Плетёный бок
marking-ADTUrsusBraidedside2 = Плетёный бок 2
marking-ADTUrsusCollector = Собиратель
marking-ADTUrsusFallencone = Упавшая шишка
marking-ADTUrsusTailbigdipper = Хвост большой медведицы
marking-ADTUrsusCone = Шишка
marking-ADTUrsusYoungboy = Юный молодец
marking-ADTUrsusfluffiness = Покров 1
marking-ADTUrsusfluffiness2 = Покров 2
marking-ADTUrsusfluffiness3 = Покров 3
marking-ADTUrsuspanda = Панда
marking-ADTUrsusspace_bear = Космический медведь
marking-ADTUrsustattoo_leader = Лидер
marking-ADTUrsusbig_heart = Большое сердце
marking-ADTUrsussoft_belly = Мягкое пузико 1
marking-ADTUrsussoft_belly2 = Мягкое пузико 2
marking-ADTUrsusgrizzly_necklace = Ожерелье гризли 1
marking-ADTUrsusgrizzly_necklace2 = Ожерелье гризли 2
marking-ADTUrsusgrizzly_necklace3 = Ожерелье гризли 3
marking-ADTUrsusMuzzle = Морда 1
marking-ADTUrsusMuzzle2 = Морда 2
marking-ADTUrsusnose = Нос
marking-ADTUrsusears = Уши 1
marking-ADTUrsusears2 = Уши 2
marking-ADTUrsusthird_eye = Третий глаз
marking-ADTUrsusarrow = Стрела
marking-ADTUrsusembarrassment = Стестняшки
marking-ADTUrsusspots = Пятна
marking-ADTUrsusspots_left = Пятно слева
marking-ADTUrsusspots_right = Пятно справа
marking-ADTUrsusrigth_eye = Правый глаз
marking-ADTUrsusleft_eye = Левый глаз
marking-ADTUrsusstar = Звезда
marking-ADTUrsuskiss = Кисс
marking-ADTUrsuseyeliner = Подводка
marking-ADTUrsushand_left = Левая рука
marking-ADTUrsusgradienthand_left = Левая рука градиент 1
marking-ADTUrsusgradienthand_left2 = Левая рука градиент 2
marking-ADTUrsushand_right = Правая рука
marking-ADTUrsusgradienthand_right = Правая рука градиент 1
marking-ADTUrsusgradienthand_right2 = Правая рука градиент 2
marking-ADTUrsusfoot_left = Левая ступня
marking-ADTUrsusgradientfoot_left = Левая ступня градиент 1
marking-ADTUrsusgradientfoot_left2 = Левая ступня градиент 2
marking-ADTUrsusfoot_right = Правая ступня
marking-ADTUrsusgradientfoot_right = Правая ступня градиент 1
marking-ADTUrsusgradientfoot_right2 = Правая ступня градиент 2
marking-ADTUrsuscardigan = Кардиган1(Спина)
marking-ADTUrsuscardigan2 = Кардиган2(Спина)
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ marking-ADTVulpkaninfoxbelly = Лисий живот
marking-ADTVulpkaninfullbelly = Окрас живота
marking-ADTVulpkaninpointsfade = Окрас лап
marking-ADTVulpkaninpointsfadebelly = Пятнистый окрас лап, груди и живота
marking-ADTVulpkaninsharppoints = Резкие пятна
marking-ADTVulpkaninsharppoints = Резкие пятна
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTPlushieUrs = плюшевый Урс
.desc = Милая плюшевая игрушка Урса.
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/Species/Ursus.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
species-name-Ursus = Урс
190 changes: 190 additions & 0 deletions Resources/Prototypes/ADT/Body/Parts/Ursus.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
# TODO: Add descriptions (many)
# TODO BODY: Part damage
- type: entity
id: PartUrsus
parent: BaseItem
name: "Урс части тела"
abstract: true
components:
- type: Damageable
damageContainer: Biological
- type: BodyPart
- type: ContainerContainer
containers:
bodypart: !type:Container
ents: []

- type: entity
id: TorsoUrsus
name: "тело урса"
parent: PartUrsus
components:
- type: Sprite
netsync: false
sprite: ADT/Mobs/Species/Ursus/parts.rsi
state: "torso_m"
- type: Icon
sprite: ADT/Mobs/Species/Ursus/parts.rsi
state: "torso_m"
- type: BodyPart
partType: Torso

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

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

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

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

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

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

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

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

0 comments on commit 4301274

Please sign in to comment.