[Remove] No Pride O Mat / Прайдомат был удален #84

Spatison · 2024-10-10T21:38:25Z

Описание PR

Откат коммита с добавлением прайдомата и замена всех прайдоматов на картах

Изменения

🆑 Spatison

remove: Delete Prido-O-Mat / Удален прайдомат

This reverts commit 0c2f8a4

coderabbitai · 2024-10-10T21:38:32Z

Walkthrough

This pull request involves the deletion of multiple files related to vending machines, specifically those associated with Pride-themed products. The changes include the removal of localization entries, entity definitions, and metadata files that pertain to various vending machine functionalities and configurations. Additionally, new mappings have been added to the migration files to establish relationships between VendingMachinePride and other entities.

Changes

File Path	Change Summary
Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl	Removed localization entry for "Crate Vending Machine Restock Pride."
Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl	Removed localization strings for "Pride-O-Mat restock crate."
Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml	Removed cargo product definition for `CrateVendingMachineRestockPride`.
Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml	Removed entity definition for `CrateVendingMachineRestockPrideFilled` and added property `noSpawn: true`.
Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml	Removed advertisement message packs related to the vending machine.
Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml	Removed inventory configuration for `PrideDrobeInventory`.
Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml	Removed definitions for restocking entities, including `BaseVendingMachineRestockDeltaV` and `VendingMachineRestockPride`.
Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml	Removed definitions for vending machines `VendingMachinePride` and `VendingMachineCourierDrobe`.
Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json	Removed metadata for the vending machine restock object.
Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json	Removed metadata for the Pride vending machine asset.
Resources/Migrations/whiteMigration.yml	Added mapping from `VendingMachinePride` to `VendingMachineCola`.
Resources/Migrations/migration.yml	Introduced new mappings including `VendingMachinePride` to `RandomVending` and various entities to `null`.

Suggested labels

Changes: C#

Suggested reviewers

Remuchi

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between e639e0e and 05c101a.

📒 Files selected for processing (1)

Resources/Migrations/migration.yml (1 hunks)

🚧 Files skipped from review as they are similar to previous changes (1)

Resources/Migrations/migration.yml

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 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 · 2024-10-10T21:39:05Z

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

Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi

State	Old	New	Status
base			Removed
green_bit			Removed
inhand-left			Removed
inhand-right			Removed
refill_pride			Removed

Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi

State	Old	New	Status
broken			Removed
normal-unshaded			Removed
off			Removed
panel			Removed

Remuchi · 2024-10-11T04:05:43Z

Не удаляй его из билда. Вместо этого используй migrations.yml

This reverts commit 6f19f6f.

This reverts commit baff326.

coderabbitai

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 6f19f6f and 3eb3413.

📒 Files selected for processing (1)

Resources/Migrations/whiteMigration.yml (1 hunks)

🧰 Additional context used

🪛 yamllint

Resources/Migrations/whiteMigration.yml

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

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

Resources/Migrations/whiteMigration.yml

Remuchi · 2024-10-11T05:05:13Z

не надо по это делать отдельный файл WhiteMigrations. AFAIK миграции работают только из основного файла migrations.yml. Туда и дописывай.

PuroSlavKing · 2024-10-11T22:43:39Z

Пусть он лучше заменяется на случайный спавнер вендинговых автоматов, кола заебала
Нужен NoSpawn в прототипе, что-бы даже не думали ставить это на картах

…t/wwdpublic into no-pride-o-mat

coderabbitai

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)

Resources/Migrations/migration.yml (1)

258-260: LGTM. Consider community feedback for future improvements.

The changes align with the PR objectives by removing the Pride-themed vending machines:

VendingMachinePride is replaced with RandomVending, maintaining gameplay elements while removing the specific theme.

VendingMachineRestockPride is removed entirely.

These modifications effectively implement the requested changes using the migrations.yml file, as suggested in the PR comments.

For future consideration:

Evaluate the suggestion from PuroSlavKing about implementing a "NoSpawn" feature for more granular control over vending machine placement.

Consider developing a more flexible system for themed vending machines that can be easily toggled or randomized based on server preferences.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 3eb3413 and d558708.

📒 Files selected for processing (4)

Resources/Migrations/migration.yml (1 hunks)
Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml (0 hunks)
Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml (1 hunks)
Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml (1 hunks)

💤 Files with no reviewable changes (1)

Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml

🚧 Files skipped from review as they are similar to previous changes (2)

Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml

🧰 Additional context used

github-actions · 2024-10-21T16:56:55Z

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

Remuchi · 2024-10-22T16:37:40Z

@Spatison build fail legit.
После фикса можно мержить

…t/wwdpublic into no-pride-o-mat

This reverts commit 1f56327.

Spatison added 2 commits October 11, 2024 00:30

Revert "Pride-o-mat and refill for it (#22)"

baff326

This reverts commit 0c2f8a4

delete: Pride-O-Mat

6f19f6f

github-actions bot added Changes: Localization Changes: Map Changes: Sprite labels Oct 10, 2024

Spatison changed the title ~~[Remove] No Pride O Mat~~ [Remove] No Pride O Mat / Прайдомат был удален Oct 10, 2024

Spatison self-assigned this Oct 10, 2024

Spatison requested a review from Remuchi October 10, 2024 21:41

github-actions bot added the Status: Needs Review label Oct 10, 2024

Spatison added 3 commits October 11, 2024 07:37

Revert "delete: Pride-O-Mat"

74cbc04

This reverts commit 6f19f6f.

Revert "Revert "Pride-o-mat and refill for it (#22)""

f59e00a

This reverts commit baff326.

migration.yml

3eb3413

github-actions bot added Changes: YML and removed Changes: Sprite Changes: Map Changes: Localization labels Oct 11, 2024

coderabbitai bot reviewed Oct 11, 2024

View reviewed changes

Resources/Migrations/whiteMigration.yml Outdated Show resolved Hide resolved

Spatison added 8 commits October 16, 2024 07:53

tweak

2328622

Update vending_machine_restock.yml

e720940

fix

1f56327

Merge branch 'no-pride-o-mat' of https://github.com/WWhiteDreamProjec…

250f7be

…t/wwdpublic into no-pride-o-mat

fix

f145eb8

Update vending.yml

5179efb

fix

2c3b639

Update vending_machine_restock.yml

d558708

coderabbitai bot reviewed Oct 16, 2024

View reviewed changes

Spatison added 3 commits October 17, 2024 04:01

Update vending.yml

e639e0e

Update vending_machines.yml

c7fd1d7

Update migration.yml

05c101a

github-actions bot added the Status: Merge Conflict label Oct 21, 2024

Merge branch 'master' into no-pride-o-mat

3917dc5

github-actions bot removed the Status: Merge Conflict label Oct 22, 2024

Remuchi approved these changes Oct 22, 2024

View reviewed changes

Spatison added 2 commits October 22, 2024 20:26

Merge branch 'no-pride-o-mat' of https://github.com/WWhiteDreamProjec…

673e38c

…t/wwdpublic into no-pride-o-mat

Revert "fix"

503c244

This reverts commit 1f56327.

Remuchi merged commit ccc5666 into master Oct 23, 2024
10 checks passed

Remuchi deleted the no-pride-o-mat branch October 23, 2024 03:35

Spatison pushed a commit that referenced this pull request Oct 23, 2024

Automatic Changelog Update (#84)

f10a878

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Remove] No Pride O Mat / Прайдомат был удален #84

[Remove] No Pride O Mat / Прайдомат был удален #84

Spatison commented Oct 10, 2024 •

edited

Loading

coderabbitai bot commented Oct 10, 2024 •

edited

Loading

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

github-actions bot commented Oct 10, 2024

Remuchi commented Oct 11, 2024

coderabbitai bot left a comment

Remuchi commented Oct 11, 2024

PuroSlavKing commented Oct 11, 2024

coderabbitai bot left a comment

github-actions bot commented Oct 21, 2024

Remuchi commented Oct 22, 2024

[Remove] No Pride O Mat / Прайдомат был удален #84

[Remove] No Pride O Mat / Прайдомат был удален #84

Conversation

Spatison commented Oct 10, 2024 • edited Loading

Описание PR

Изменения

coderabbitai bot commented Oct 10, 2024 • edited Loading

Walkthrough

Changes

Suggested labels

Suggested reviewers

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

github-actions bot commented Oct 10, 2024

Remuchi commented Oct 11, 2024

coderabbitai bot left a comment

Choose a reason for hiding this comment

Remuchi commented Oct 11, 2024

PuroSlavKing commented Oct 11, 2024

coderabbitai bot left a comment

Choose a reason for hiding this comment

github-actions bot commented Oct 21, 2024

Remuchi commented Oct 22, 2024

Spatison commented Oct 10, 2024 •

edited

Loading

coderabbitai bot commented Oct 10, 2024 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)