Skip to content

шаурма#633

Open
benjii158 wants to merge 2 commits into
corvax-team:masterfrom
benjii158:shaurma
Open

шаурма#633
benjii158 wants to merge 2 commits into
corvax-team:masterfrom
benjii158:shaurma

Conversation

@benjii158

@benjii158 benjii158 commented May 30, 2026

Copy link
Copy Markdown
Contributor

я добавил шаурму. все.

Описание PR

шаурма добавлена, вот, вкусная

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

вкусная еда легендарной популярности. тут не должно появляться вопрос почему. ну а вообще почему бы и нет, если разрешили добавить

Технические детали

добавил рецепт, сам предмет, мету, спрайты инхенд лефт и райт, айкон, фтл все

Медиа

шавух

Требования

Согласие с условиями

  • Я согласен с условиями LICENSE и CLA.

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

Список изменений

🆑 benjamin

  • wl-add: Добавлена шауха

Summary by CodeRabbit

  • New Features
    • Introduced Shaurma, a new consumable food item available in-game
    • Shaurma can be crafted using a recipe that combines dough slice, meat cutlet, cabbage, potato, and tomato
    • Added complete flavor profile and visual assets for the new food item
    • Russian localization support now available

Review Change Stack

я добавил шаурму. все.
@github-actions

github-actions Bot commented May 30, 2026

Copy link
Copy Markdown
Contributor

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

Resources/Textures/_WL/Entities/Objects/Consumable/Food/shaurma.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after d37d9b1

@coderabbitai

coderabbitai Bot commented May 30, 2026

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

This PR introduces a new consumable food item called shaurma into the game. The addition includes a complete entity definition with visual assets, Russian localization, integration into the flavor system, and a cooking recipe that combines multiple ingredients to produce the finished item.

Changes

Shaurma Food Item

Layer / File(s) Summary
Food Entity Definition & Presentation
Resources/Prototypes/_WL/Entities/Objects/Consumable/Food/Sandwitch.yml, Resources/Locale/ru-RU/_WL/prototypes/entities/objects/consumable/food/sandwitch.ftl, Resources/Textures/_WL/Entities/Objects/Consumable/Food/shaurma.rsi/meta.json
The FoodShaurma entity inherits from FoodInjectableBase and defines item properties including flavor profile (shaurma), edible transfer amount (5), sprite reference, and nutrient/vitamin reagent composition. Russian localization provides the display name "шаурма" and description. RSI sprite metadata defines 32x32 icon and directional in-hand states.
Flavor Profile
Resources/Prototypes/_WL/Flavors/flavors.yml
A new base flavor entry with id shaurma and Russian description "сочно" is registered in the flavor system.
Cooking Recipe
Resources/Prototypes/_WL/Recipes/Cooking/meal_recipes.yml
A new RecipeShaurma microwave meal recipe defines the resulting food (FoodShaurma), cook time (15 seconds), savory group classification, and required solid ingredients (dough slice, meat cutlet, cabbage, potato, tomato).

🎯 1 (Trivial) | ⏱️ ~3 minutes

Suggested labels

Changes: Localization, S: Untriaged, S: Needs Review, size/M

Suggested reviewers

  • tau27

Poem

🐰 A shaurma wrapped with care,
In lavash, honest and fair,
With meat and greens so bright,
The recipe makes it right,
Russian flavors dancing there! 🌯

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Title check ❓ Inconclusive The PR title 'шаурма' is vague and generic; it only names the food item being added without conveying why this change matters or what the primary modification accomplishes. Consider a more descriptive title like 'Add shaurma food item with recipe and localization' to better summarize the changeset for teammates reviewing history.
✅ Passed checks (4 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@Resources/Prototypes/_WL/Entities/Objects/Consumable/Food/Sandwitch.yml`:
- Line 5: Update the fallback description string for the FoodShaurma prototype
by replacing the incorrect onion-rings text in the description field with a
shaurma-appropriate sentence (e.g., reference "shaurma", its ingredients or
delivery style) so the description aligns with the FoodShaurma identity and
recipe; modify the description value in the Consumable/Food Sandwitch.yml (the
description key) to a shaurma-specific phrase.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 59335315-a11c-455b-b819-a60d48b6ff80

📥 Commits

Reviewing files that changed from the base of the PR and between fc06a6f and f86f06c.

⛔ Files ignored due to path filters (4)
  • Resources/Textures/_WL/Entities/Objects/Consumable/Food/shaurma.rsi/icon.png is excluded by !**/*.png
  • Resources/Textures/_WL/Entities/Objects/Consumable/Food/shaurma.rsi/inhand-left.png is excluded by !**/*.png
  • Resources/Textures/_WL/Entities/Objects/Consumable/Food/shaurma.rsi/inhand-right.png is excluded by !**/*.png
  • Resources/Textures/_WL/Entities/Objects/Consumable/Food/shaurma.rsi/shaurma.png is excluded by !**/*.png
📒 Files selected for processing (5)
  • Resources/Locale/ru-RU/_WL/prototypes/entities/objects/consumable/food/sandwitch.ftl
  • Resources/Prototypes/_WL/Entities/Objects/Consumable/Food/Sandwitch.yml
  • Resources/Prototypes/_WL/Flavors/flavors.yml
  • Resources/Prototypes/_WL/Recipes/Cooking/meal_recipes.yml
  • Resources/Textures/_WL/Entities/Objects/Consumable/Food/shaurma.rsi/meta.json

parent: FoodInjectableBase
id: FoodShaurma
name: "shaurma"
description: "Fried onion rings with fragrant cheese in a convenient cone."

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Fix fallback description to match the shaurma item.

Line 5 currently describes onion rings with cheese, which conflicts with the new FoodShaurma identity and recipe. Please replace it with a shaurma-appropriate description to avoid inconsistent in-game text.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Resources/Prototypes/_WL/Entities/Objects/Consumable/Food/Sandwitch.yml` at
line 5, Update the fallback description string for the FoodShaurma prototype by
replacing the incorrect onion-rings text in the description field with a
shaurma-appropriate sentence (e.g., reference "shaurma", its ingredients or
delivery style) so the description aligns with the FoodShaurma identity and
recipe; modify the description value in the Consumable/Food Sandwitch.yml (the
description key) to a shaurma-specific phrase.

@oldschoolotaku oldschoolotaku left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

у тебя 4 картинки в RSI. почему в мете указано только 3?

@github-actions

Copy link
Copy Markdown
Contributor

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants