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

Project ReBELL. Act I. Wonder Delta + retexture + new shaders #1012

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

Conversation

trest100
Copy link
Contributor

@trest100 trest100 commented Jan 18, 2025

Описание PR

Первая часть из 3 обещанного проекта ReBELL.

  • ретекстур ВСЕХ тайлов
  • ретекстур стен
  • ретекстур ВСЕХ шлюзов
  • переработка шейдеров
  • новая карта: WonderDelta

Медиа

Тип PR

  • Feature
  • Fix
  • Tweak
  • Balance
  • Refactor
  • Port
  • Translate
  • Resprite

Изменения

🆑 trest100

Summary by CodeRabbit

  • Новые функции
    • Добавлены новые варианты напольных покрытий:
      • Темная брусчатка (горизонтальная и вертикальная)
      • Темный елочный узор
      • Стальная брусчатка (горизонтальная и вертикальная)
      • Стальной елочный узор
      • Белая брусчатка (горизонтальная и вертикальная)
      • Белый елочный узор

@trest100 trest100 requested review from Roudenn and Rxup as code owners January 18, 2025 23:41
Copy link
Contributor

coderabbitai bot commented Jan 18, 2025

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Обзор

Добавлены новые определения напольных плиток в файл floors.yml. Введены девять новых вариантов плиток с различными текстурами: темные, стальные и белые, включающие паркетные и мощеные варианты с горизонтальной и вертикальной ориентацией.

Изменения

Файл Описание изменений
Resources/Prototypes/_Backmen/Tiles/floors.yml Добавлены новые типы напольных покрытий:
- FloorDarkPavementAlt
- FloorDarkPavementVerticalAlt
- FloorDarkHerringboneAlt
- FloorSteelHerringboneAlt
- FloorSteelPavementAlt
- FloorSteelPavementVerticalAlt
- FloorWhiteHerringboneAlt
- FloorWhitePavementAlt
- FloorWhitePavementVerticalAlt

Стихотворение

🐰 Плиточный кролик танцует вприсядку,
Новые текстуры - просто загадка!
Темные, белые, стальные узоры,
Пол превращается в яркие споры.
Вертикаль, паркет - какая же прелесть! 🏠


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions github-actions bot added size/XL S: Untriaged Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. No C# Нету кода. and removed S: Untriaged labels Jan 18, 2025
@trest100 trest100 marked this pull request as draft January 18, 2025 23:41
Copy link
Contributor

github-actions bot commented Jan 18, 2025

RSI Diff Bot; head commit 89a8671 merging into 730265b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Structures/Walls/solid.rsi

State Old New Status
full Modified
reinf_construct-0 Modified
reinf_construct-1 Modified
reinf_construct-2 Modified
reinf_construct-3 Modified
reinf_construct-4 Modified
reinf_construct-5 Modified
reinf_over0 Modified
reinf_over1 Modified
reinf_over2 Modified
reinf_over3 Modified
reinf_over4 Modified
reinf_over5 Modified
reinf_over6 Modified
reinf_over7 Modified
solid0 Modified
solid1 Modified
solid2 Modified
solid3 Modified
solid4 Modified
solid5 Modified
solid6 Modified
solid7 Modified

Resources/Textures/Structures/Walls/solid_diagonal.rsi

State Old New Status
state0 Modified
state1 Modified

Resources/Textures/Structures/Walls/solid_rust.rsi

State Old New Status
full Modified
solid0 Modified
solid1 Modified
solid2 Modified
solid3 Modified
solid4 Modified
solid5 Modified
solid6 Modified
solid7 Modified

Edit: diff updated after 89a8671

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (2)
Resources/Prototypes/_Backmen/Tiles/floors.yml (2)

5-10: Рассмотрите возможность улучшения визуального разнообразия

Все плитки используют одинаковую вероятность размещения вариантов (1.0). Для улучшения визуального разнообразия рекомендуется использовать разные вероятности.

  placementVariants:
-   - 1.0
-   - 1.0
-   - 1.0
-   - 1.0
+   - 1.0
+   - 0.8
+   - 0.6
+   - 0.4

Also applies to: 23-28, 42-47, 60-65, 78-83, 96-101, 114-119, 132-137, 150-155


36-36: Исправьте форматирование файла

Обнаружены следующие проблемы форматирования:

  • Лишние пробелы в строках 36 и 55
  • Отсутствует перевод строки в конце файла
  heatCapacity: 10000

- type: tile  
+ type: tile

  heatCapacity: 10000
+

Also applies to: 55-55, 162-162

🧰 Tools
🪛 yamllint (1.35.1)

[error] 36-36: trailing spaces

(trailing-spaces)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 53ef47e and 99250db.

⛔ Files ignored due to path filters (66)
  • Resources/Textures/Backmen/Tiles/dark_herringbone.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Tiles/dark_pavement.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Tiles/dark_pavement_vertical.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Tiles/steel_herringbone.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Tiles/steel_pavement.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Tiles/steel_pavement_vertical.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Tiles/white_herringbone.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Tiles/white_pavement.png is excluded by !**/*.png
  • Resources/Textures/Backmen/Tiles/white_pavement_vertical.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/full.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/solid0.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/solid1.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/solid2.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/solid3.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/solid4.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/solid5.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/solid6.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid.rsi/solid7.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid_rust.rsi/full.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png is excluded by !**/*.png
  • Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png is excluded by !**/*.png
  • Resources/Textures/Tiles/dark_mono.png is excluded by !**/*.png
  • Resources/Textures/Tiles/dark_pavement_vertical.png is excluded by !**/*.png
  • Resources/Textures/Tiles/elevator_shaft.png is excluded by !**/*.png
  • Resources/Textures/Tiles/lino.png is excluded by !**/*.png
  • Resources/Textures/Tiles/metaldiamond.png is excluded by !**/*.png
  • Resources/Textures/Tiles/mining_floor.png is excluded by !**/*.png
  • Resources/Textures/Tiles/mining_floor_dark.png is excluded by !**/*.png
  • Resources/Textures/Tiles/mining_floor_light.png is excluded by !**/*.png
  • Resources/Textures/Tiles/reinforced.png is excluded by !**/*.png
  • Resources/Textures/Tiles/silver.png is excluded by !**/*.png
  • Resources/Textures/Tiles/steel.png is excluded by !**/*.png
  • Resources/Textures/Tiles/steel_diagonal.png is excluded by !**/*.png
  • Resources/Textures/Tiles/steel_diagonal_mini.png is excluded by !**/*.png
  • Resources/Textures/Tiles/steel_herringbone.png is excluded by !**/*.png
  • Resources/Textures/Tiles/steel_mono.png is excluded by !**/*.png
  • Resources/Textures/Tiles/steel_pavement_vertical.png is excluded by !**/*.png
  • Resources/Textures/Tiles/super_reinforced.png is excluded by !**/*.png
  • Resources/Textures/Tiles/white_mono.png is excluded by !**/*.png
  • Resources/Textures/Tiles/white_pavement_vertical.png is excluded by !**/*.png
  • Resources/Textures/Tiles/wood.png is excluded by !**/*.png
  • Resources/Textures/Tiles/wood_broken.png is excluded by !**/*.png
  • Resources/Textures/Tiles/wood_large.png is excluded by !**/*.png
  • Resources/Textures/Tiles/wood_tile.png is excluded by !**/*.png
📒 Files selected for processing (1)
  • Resources/Prototypes/_Backmen/Tiles/floors.yml (1 hunks)
🧰 Additional context used
🪛 yamllint (1.35.1)
Resources/Prototypes/_Backmen/Tiles/floors.yml

[error] 36-36: trailing spaces

(trailing-spaces)


[error] 55-55: trailing spaces

(trailing-spaces)


[error] 162-162: no new line character at the end of file

(new-line-at-end-of-file)

⏰ Context from checks skipped due to timeout of 300000ms (3)
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: Test Packaging
🔇 Additional comments (3)
Resources/Prototypes/_Backmen/Tiles/floors.yml (3)

1-162: Добавьте скриншоты изменений

Поскольку PR включает визуальные изменения текстур, было бы полезно добавить скриншоты:

  • До и после изменений
  • Примеры использования новых текстур в игре
🧰 Tools
🪛 yamllint (1.35.1)

[error] 36-36: trailing spaces

(trailing-spaces)


[error] 55-55: trailing spaces

(trailing-spaces)


[error] 162-162: no new line character at the end of file

(new-line-at-end-of-file)


4-4: Проверьте наличие текстур

Необходимо убедиться, что все указанные текстуры присутствуют в репозитории.

Also applies to: 22-22, 41-41, 59-59, 77-77, 95-95, 113-113, 131-131, 149-149

✅ Verification successful

Текстуры проверены - всё в порядке

Все необходимые текстуры присутствуют в директории Resources/Textures/Backmen/Tiles/.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check if all referenced texture files exist
for texture in dark_pavement.png dark_pavement_vertical.png dark_herringbone.png steel_herringbone.png steel_pavement.png steel_pavement_vertical.png white_herringbone.png white_pavement.png white_pavement_vertical.png; do
    if [ ! -f "Resources/Textures/Backmen/Tiles/$texture" ]; then
        echo "Missing texture: $texture"
    fi
done

Length of output: 2642


Script:

#!/bin/bash
# List all PNG files in the Backmen/Tiles directory
fd -e png . Resources/Textures/Backmen/Tiles/

Length of output: 597


87-89: Проверьте несоответствие в звуках шагов

Плитка FloorSteelPavementAlt использует FootstepFloor, в то время как все остальные плитки используют FootstepTile. Это может быть ошибкой.

✅ Verification successful

Подтверждено несоответствие в звуках шагов

Проверка показала, что все остальные напольные покрытия, включая варианты стальных покрытий, используют звуковую коллекцию FootstepTile. Использование FootstepFloor для FloorSteelPavementAlt действительно является несоответствием, которое следует исправить для сохранения консистентности звуков в игре.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for other steel pavement tiles to verify correct footstep sound
rg "FloorSteelPavement[^A]" -A 10

Length of output: 18407


Script:

#!/bin/bash
# Search for footstep configurations in steel pavement tiles
rg "FloorSteelPavement.*\n.*footstep" -A 3

Length of output: 236


Script:

#!/bin/bash
# Search for footstep configurations in steel pavement tiles
rg -U "id: FloorSteelPavement.*?\n.*?footstep" -A 3

Length of output: 53


Script:

#!/bin/bash
# Examine the floor tile definitions in relevant files
cat Resources/Prototypes/_Backmen/Tiles/floors.yml Resources/Prototypes/Tiles/floors.yml | rg -A 10 -B 2 "id: FloorSteelPavement"

Length of output: 1142


Script:

#!/bin/bash
# Search for default tile configurations and footstep sounds
rg -U "parent.*tile.*\n.*footstep" Resources/Prototypes/

Length of output: 58


Script:

#!/bin/bash
# Search for FootstepTile usage in tile configurations
rg "FootstepTile" Resources/Prototypes/

Length of output: 4100

@lzk228
Copy link
Contributor

lzk228 commented Jan 19, 2025

чтооооо очередные форк респрайты которые никто не будет поддерживать? круто блин🥞😎💪

@Roudenn
Copy link
Collaborator

Roudenn commented Jan 19, 2025

А спрайты покажиш? Или это сюрпрайз

Copy link
Collaborator

@Roudenn Roudenn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

В этих местах я сомневаюсь, остальное впорядке

Copy link
Collaborator

@Roudenn Roudenn Jan 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Спрайты стен слишком темные и непривычные, игроки взбунтуются когда их увидят из-за привыкания к старым (гипотеза и субъективное мнение, я бы у игроков опрос сделал)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Спрайт тайла как бы странно это не звучало можно перепутать со стеной, лучше оставить как есть

Copy link
Contributor

github-actions bot commented Feb 6, 2025

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# Нету кода. size/XL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants