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.

Sign up for GitHub

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

Jump to bottom

Big Fucking Universe Update #741

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Big Fucking Universe Update #741

wants to merge 8 commits into from

Conversation

Hyrmik
Copy link
Contributor

@Hyrmik Hyrmik commented Nov 5, 2024 •
edited by Unlumy
Loading

Описание PR

image

Пока что это неприоритетное масштабное обновление для "Времени Приключений".
В обновлении запланировано:

  • Добавление новых ресурсов и соответствующие изменения в крафте.
  • Улучшение геймплея утилизаторов благодаря введению 5 новых планет, данжей и новых враждебных мобов.
  • Введение новой расы - Резоми.

Коммиты для расы Резоми взяты отсюда:

Почему / Баланс

Ссылка на публикацию в Discord

Техническая информация

Медиа

Требования

  • Я прочитал(а) и следую Руководство по созданию пулл реквестов. Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера.
  • Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, или этот пулл реквест не требует демонстрации в игре

Критические изменения

Цели обновления

  • Создание планет
    • Ледяная планета
    • Океаническая планета
    • Песчаная планета
    • Зловещая (мясная) планета
    • Планета оазиса
  • Новые данжи для планет
  • Кристализатор
  • Новые ресурсы (Медь, цинк)
  • Полная перепись крафтов под новые ресурсы
  • Перестройка карт под новые крафты
  • Добавление новой расы Резоми

Чейнджлог

@Hyrmik Hyrmik added this to the Расы milestone Nov 5, 2024
@github-actions github-actions bot added Changes: UI Изменение интерфейса Changes: Sprites Изменение спрайтов Changes: Localization Изменение локализации labels Nov 5, 2024
@Hyrmik Hyrmik added Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ and removed Changes: UI Изменение интерфейса Changes: Sprites Изменение спрайтов Changes: Localization Изменение локализации labels Nov 5, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 5, 2024 •
edited
Loading

RSI Diff Bot; head commit 58de594 merging into 60adeb6
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Effects/brute_damage.rsi

State Old New Status
Chest_Brute_10 Added
Chest_Brute_100 Added
Chest_Brute_20 Added
Chest_Brute_30 Added
Chest_Brute_50 Added
Chest_Brute_70 Added
Head_Brute_10 Added
Head_Brute_100 Added
Head_Brute_20 Added
Head_Brute_30 Added
Head_Brute_50 Added
Head_Brute_70 Added
LArm_Brute_10 Added
LArm_Brute_100 Added
LArm_Brute_20 Added
LArm_Brute_30 Added
LArm_Brute_50 Added
LArm_Brute_70 Added
LLeg_Brute_10 Added
LLeg_Brute_100 Added
LLeg_Brute_20 Added
LLeg_Brute_30 Added
LLeg_Brute_50 Added
LLeg_Brute_70 Added
RArm_Brute_10 Added
RArm_Brute_100 Added
RArm_Brute_20 Added
RArm_Brute_30 Added
RArm_Brute_50 Added
RArm_Brute_70 Added
RLeg_Brute_10 Added
RLeg_Brute_100 Added
RLeg_Brute_20 Added
RLeg_Brute_30 Added
RLeg_Brute_50 Added
RLeg_Brute_70 Added

Resources/Textures/ADT/Effects/burn_damage.rsi

State Old New Status
Chest_Burn_10 Added
Chest_Burn_100 Added
Chest_Burn_20 Added
Chest_Burn_30 Added
Chest_Burn_50 Added
Chest_Burn_70 Added
Head_Burn_10 Added
Head_Burn_100 Added
Head_Burn_20 Added
Head_Burn_30 Added
Head_Burn_50 Added
Head_Burn_70 Added
LArm_Burn_10 Added
LArm_Burn_100 Added
LArm_Burn_20 Added
LArm_Burn_30 Added
LArm_Burn_50 Added
LArm_Burn_70 Added
LLeg_Burn_10 Added
LLeg_Burn_100 Added
LLeg_Burn_20 Added
LLeg_Burn_30 Added
LLeg_Burn_50 Added
LLeg_Burn_70 Added
RArm_Burn_10 Added
RArm_Burn_100 Added
RArm_Burn_20 Added
RArm_Burn_30 Added
RArm_Burn_50 Added
RArm_Burn_70 Added
RLeg_Burn_10 Added
RLeg_Burn_100 Added
RLeg_Burn_20 Added
RLeg_Burn_30 Added
RLeg_Burn_50 Added
RLeg_Burn_70 Added

Resources/Textures/ADT/Effects/onfire.rsi

State Old New Status
Generic_mob_burning Added
Monkey_burning Added
Mouse_burning Added
Standing Added

Resources/Textures/ADT/Mobs/Customization/Resomi/eyes.rsi

State Old New Status
resomi Added

Resources/Textures/ADT/Mobs/Customization/Resomi/resomi_hair.rsi

State Old New Status
ResomiBackstrafe Added
ResomiBurstShort Added
ResomiDefault Added
ResomiDroopy Added
ResomiEars Added
ResomiFluffymohawk Added
ResomiHedge Added
ResomiLong Added
ResomiLongway Added
ResomiMane Added
ResomiManeBeardless Added
ResomiMohawk Added
ResomiMushroom Added
ResomiNotree Added
ResomiPointy Added
ResomiSpiky Added
ResomiTwies Added
ResomiUpright Added

Resources/Textures/ADT/Mobs/Customization/Resomi/resomi_parts.rsi

State Old New Status
fluff Added
fluff_head Added
fluff_head_up Added
l_foot_feathers Added
l_hand_feathers Added
r_foot_feathers Added
r_hand_feathers Added
tail Added
tail_feathers Added

Resources/Textures/ADT/Mobs/Effects/Resomi/brute_damage.rsi

State Old New Status
Chest_Brute_10 Added
Chest_Brute_30 Added
Chest_Brute_50 Added
Chest_Brute_70 Added
Head_Brute_10 Added
Head_Brute_30 Added
Head_Brute_50 Added
Head_Brute_70 Added
LArm_Brute_10 Added
LArm_Brute_30 Added
LArm_Brute_50 Added
LArm_Brute_70 Added
LFoot_Brute_10 Added
LFoot_Brute_30 Added
LFoot_Brute_50 Added
LFoot_Brute_70 Added
LHand_Brute_10 Added
LHand_Brute_30 Added
LHand_Brute_50 Added
LHand_Brute_70 Added
LLeg_Brute_10 Added
LLeg_Brute_30 Added
LLeg_Brute_50 Added
LLeg_Brute_70 Added
RArm_Brute_10 Added
RArm_Brute_30 Added
RArm_Brute_50 Added
RArm_Brute_70 Added
RFoot_Brute_10 Added
RFoot_Brute_30 Added
RFoot_Brute_50 Added
RFoot_Brute_70 Added
RHand_Brute_10 Added
RHand_Brute_30 Added
RHand_Brute_50 Added
RHand_Brute_70 Added
RLeg_Brute_10 Added
RLeg_Brute_30 Added
RLeg_Brute_50 Added
RLeg_Brute_70 Added
Tail_Brute_10 Added
Tail_Brute_30 Added
Tail_Brute_50 Added
Tail_Brute_70 Added

Resources/Textures/ADT/Mobs/Effects/Resomi/burn_damage.rsi

State Old New Status
Chest_Burn_10 Added
Chest_Burn_30 Added
Chest_Burn_50 Added
Chest_Burn_70 Added
Head_Burn_10 Added
Head_Burn_30 Added
Head_Burn_50 Added
Head_Burn_70 Added
LArm_Burn_10 Added
LArm_Burn_30 Added
LArm_Burn_50 Added
LArm_Burn_70 Added
LFoot_Burn_10 Added
LFoot_Burn_30 Added
LFoot_Burn_50 Added
LFoot_Burn_70 Added
LHand_Burn_10 Added
LHand_Burn_30 Added
LHand_Burn_50 Added
LHand_Burn_70 Added
LLeg_Burn_10 Added
LLeg_Burn_30 Added
LLeg_Burn_50 Added
LLeg_Burn_70 Added
RArm_Burn_10 Added
RArm_Burn_30 Added
RArm_Burn_50 Added
RArm_Burn_70 Added
RFoot_Burn_10 Added
RFoot_Burn_30 Added
RFoot_Burn_50 Added
RFoot_Burn_70 Added
RHand_Burn_10 Added
RHand_Burn_30 Added
RHand_Burn_50 Added
RHand_Burn_70 Added
RLeg_Burn_10 Added
RLeg_Burn_30 Added
RLeg_Burn_50 Added
RLeg_Burn_70 Added

Resources/Textures/ADT/Mobs/Effects/onfire.rsi

State Old New Status
Generic_mob_burning Added
Monkey_burning Added
Mouse_burning Added
Resomi_burning Added
Resomi_minor_burning Added
Standing Added

Resources/Textures/ADT/Mobs/Species/Resomi/displacement.rsi

State Old New Status
back Added
belt Added
ears Added
eyes Added
feet Added
hands Added
head Added
inHand Added
jumpsuit Added
mask Added
neck Added
suitStorage Added

Resources/Textures/ADT/Mobs/Species/Resomi/organs.rsi

State Old New Status
lung-l Added
lung-r Added

Resources/Textures/ADT/Mobs/Species/Resomi/parts.rsi

State Old New Status
full Added
groin Added
head_f Added
head_m Added
l_arm Added

Edit: diff updated after 58de594

@Hyrmik Hyrmik removed this from the Расы milestone Nov 5, 2024
@Hyrmik Hyrmik marked this pull request as draft November 5, 2024 09:34
@github-actions github-actions bot added Changes: UI Изменение интерфейса Changes: Sprites Изменение спрайтов Changes: Localization Изменение локализации labels Nov 10, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 2, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Unlumy Unlumy added the Issue: help wanted Необходима помощь label Dec 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов Changes: UI Изменение интерфейса Issue: help wanted Необходима помощь Merge Conflict S: Merge Conflict size/L Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Hyrmik @Unlumy