Skip to content

Commit

Permalink
Плюшки (#568)
Browse files Browse the repository at this point in the history 
* plushie lu + no PAPICH

* agata

* плюшевый милос-танка

Signed-off-by: pacable <[email protected]>

* locale

---------

Signed-off-by: pacable <[email protected]>
Co-authored-by: pacable <[email protected]>
  • Loading branch information
@Rinary1 @pxc1984
Rinary1 and pxc1984 authored Oct 30, 2024
1 parent c89653c commit a65c014
Show file tree
Hide file tree
Showing 9 changed files with 108 additions and 43 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/validate-locale.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches: [ staging, trying ]
pull_request:
types: [opened, synchronize, reopened]
paths:
- '**.yml'
- '**.ftl'
Expand All @@ -12,6 +13,7 @@ jobs:
validate_ymls:
name: Validate Locales
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false
steps:
- uses: actions/[email protected]
- name: Set up Python
Expand Down
16 changes: 16 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/toys.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,19 @@ ent-PlushieNara = На-Ра
.desc = Из дормиториев только что вышел нуарный унатх.
ent-PlushiePeacemaker = Миротворец
.desc = Там где он, там мир, но там где война, там он несëт смерть.
ent-PlushieEblan = Плюшевый Милос-Танака
.desc = Защитник станции, всегда готовый к неожиданным приключениям!
ent-PlushieKlim = Плюшевый Клим Кузьмин
.desc = Вульпа атмос, от него пахнет плазмой. Заделает любую дыру, даже в вашем сердце.
ent-PlushieMelania = Плюшевая Мелания Киселёва
.desc = Величайшая желешка во вселенной, любящая своих сестер. Хлюп!
ent-PlushieOkobius = Плюшевый Окобиус Акватика
.desc = Один из худших бригмедиков, что когда либо существовали.
ent-PlushieVyacheslav = Плюшевый Вячеслав Некрасов
.desc = Популярная в соответствующих кругах личность.
ent-PlushieLu = Плюшевый Лу'Сайм
.desc = Вы думаете, это вульпа-химик - женщина? Думайте так дальше... Иногда фыркает
ent-PlushieAgata = Плюшеывый агент Агата Кацухиро
.desc = Эта плюшка была сделана на планетарной тюрьме, осуждёнными агентами Синдиката. Носи её с гордостью, корпорат
ent-PlushieMilosTanka = Плюшевый Милос-Танака
.desc = Унати в форме Центрального Командования, что он может в себе скрывать кроме двух ножей и револьвера?
61 changes: 43 additions & 18 deletions Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,14 +678,6 @@
- type: Sprite
state: plushie-nara
sprite: _Sunrise/Objects/Fun/toys.rsi
- type: EmitSoundOnUse
sound:
path: /Audio/_Sunrise/papich_naaa.ogg
- type: EmitSoundOnTrigger
sound:
path: /Audio/_Sunrise/papich_naaa.ogg
- type: UseDelay
delay: 20.0

- type: entity
parent: BasePlushie
Expand All @@ -708,8 +700,8 @@
- type: entity
parent: BasePlushie
id: PlushieEblan
name: Плюшевый Милос-Танака
description: Защитник станции, всегда готовый к неожиданным приключениям!
name: Plush Milos-Tanaka
description: Protector of the station, always ready for unexpected adventures!
components:
- type: Sprite
state: plushie-eblan
Expand All @@ -718,8 +710,8 @@
- type: entity
parent: BasePlushie
id: PlushieKlim
name: Плюшевый Клим Кузьмин
description: Вульпа атмос, от него пахнет плазмой. Заделает любую дыру, даже в вашем сердце.
name: Plush Klim Kuzmin
description: Vulpa atm, he smells like plasma. It'll fix any hole, even in your heart.
components:
- type: Sprite
state: plushie-klim
Expand All @@ -728,8 +720,8 @@
- type: entity
parent: BasePlushie
id: PlushieMelania
name: Плюшевая Мелания Киселёва
description: Величайшая желешка во вселенной, любящая своих сестер. Хлюп!
name: Plush Melania Kiseleva
description: The greatest jellybean in the universe, loving her sisters. Squish!
components:
- type: Sprite
state: plushie-melania
Expand All @@ -738,8 +730,8 @@
- type: entity
parent: BasePlushie
id: PlushieOkobius
name: Плюшевый Окобиус Акватика
description: Один из худших бригмедиков, что когда либо существовали.
name: Plush Ocobius Aquatica
description: One of the worst brig medics that ever existed.
components:
- type: Sprite
state: plushie-okobius
Expand All @@ -748,9 +740,42 @@
- type: entity
parent: BasePlushie
id: PlushieVyacheslav
name: Плюшевый Вячеслав Некрасов
description: Популярная в соответствующих кругах личность.
name: Plushy Vyacheslav Nekrasov
description: A popular personality in relevant circles.
components:
- type: Sprite
state: plushie-vyacheslav
sprite: _Sunrise/Objects/Fun/toys.rsi

- type: entity
parent: [ EmitVulpGrowl, BasePlushie ]
id: PlushieLu
name: Plush Lou'Slime
description: You think this vulpa chemist is a woman? Keep thinking that... Sometimes she snorts
components:
- type: Sprite
state: plushie-lu
sprite: _Sunrise/Objects/Fun/toys.rsi

- type: entity
parent: BasePlushie
id: PlushieAgata
name: Plush Agent Agata Katsuhiro
description: This plushie was made on a planetary prison by convicted Syndicate agents. Wear it proudly, corporate
components:
- type: Sprite
state: plushie-agata
sprite: _Sunrise/Objects/Fun/toys.rsi

- type: entity
parent: BasePlushie
id: PlushieMilosTanka
name: Plush Milos-Tanaka
description: Unathi in a Central Command uniform, what could he possibly be hiding in him besides two knives and a revolver?
components:
- type: Sprite
sprite: _Sunrise/Objects/Fun/toys.rsi
layers:
- state: plushie-milos-tan
- state: syndie-visor
shader: unshaded
22 changes: 22 additions & 0 deletions Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/meta.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,28 @@
},
{
"name": "plushie-vyacheslav"
},
{
"name": "plushie-lu"
},
{
"name": "plushie-agata"
},
{
"name": "plushie-milos-tan"
},
{
"name": "syndie-visor",
"delays": [
[
0.3,
0.3,
0.3,
0.3,
0.3,
0.3
]
]
}
]
}
Binary file added Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-agata.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-lu.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/plushie-milos-tan.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_Sunrise/Objects/Fun/toys.rsi/syndie-visor.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 25 additions & 25 deletions Tools/_sunrise/Schemas/validate_yml.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,31 +66,31 @@ def check_translations(root_dir, ignore_list, ignore_files):
elif is_english(value):
add_error(rel_path, line_num, f'Не переведённая строка "{key}": {line.strip()}')

for dirpath, _, filenames in os.walk(en_locale_dir):
for filename in filenames:
if filename.endswith('.ftl'):
file_path = os.path.join(dirpath, filename)
rel_path = os.path.relpath(file_path, root_dir_abs)

if filename in ignore_files:
#print(f'Игнорирование файла: {filename}') Не нужно, если много файлов игнорирует
continue

with open(file_path, 'r', encoding='utf-8') as ftl_file:
lines = ftl_file.readlines()
for line_num, line in enumerate(lines, start=1):
if '=' in line and not line.strip().startswith('#'):
key, value = line.split('=', 1)
key = key.strip()
value = value.strip()
value = remove_braces_content(value)

if not is_english(value) and not contains_ignored_word(value, ignore_list):
if key.endswith('.desc') or key.endswith('.suffix'):
if has_russian(value):
add_error(rel_path, line_num, f'Русская строка "{key}": {line.strip()}')
elif has_russian(value):
add_error(rel_path, line_num, f'Русская строка "{key}": {line.strip()}')
#for dirpath, _, filenames in os.walk(en_locale_dir):
# for filename in filenames:
# if filename.endswith('.ftl'):
# file_path = os.path.join(dirpath, filename)
# rel_path = os.path.relpath(file_path, root_dir_abs)

# if filename in ignore_files:
# #print(f'Игнорирование файла: {filename}') Не нужно, если много файлов игнорирует
# continue

# with open(file_path, 'r', encoding='utf-8') as ftl_file:
# lines = ftl_file.readlines()
# for line_num, line in enumerate(lines, start=1):
# if '=' in line and not line.strip().startswith('#'):
# key, value = line.split('=', 1)
# key = key.strip()
# value = value.strip()
# value = remove_braces_content(value)

# if not is_english(value) and not contains_ignored_word(value, ignore_list):
# if key.endswith('.desc') or key.endswith('.suffix'):
# if has_russian(value):
# add_error(rel_path, line_num, f'Русская строка "{key}": {line.strip()}')
# elif has_russian(value):
# add_error(rel_path, line_num, f'Русская строка "{key}": {line.strip()}')

def check_yml_files(dir: str, ignore_list: List[str]):
key_pattern = re.compile(r'^(name|description|suffix|rules|desc):\s*(.+)')
Expand Down

0 comments on commit a65c014

Please sign in to comment.