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

DryDock update #68

Merged
merged 7 commits into from
Sep 29, 2024
Merged

Conversation

PointPNG
Copy link
Contributor

@PointPNG PointPNG commented Sep 24, 2024

Описание PR

Чек-лист:

  • Rechecked all my code

typo:

  • Feature

Изменения

🆑 PointPNG

  • add: ДрайДок добавлен в билд.
  • add: ДрайДок добавлен в ротацию карт.

Copy link
Contributor

coderabbitai bot commented Sep 24, 2024

Walkthrough

The pull request introduces a new game map named "DryDock" by adding an entry to the existing list of map locations and creating a new configuration file for "DryDock Station." The default.yml file is updated to include "DryDock," while the drydock.yml file defines the map's metadata, player capacity, and various station components, including roles and job allocations. Additionally, the PostMapInitTest class is updated to include "DryDock" in its array of identifiers.

Changes

Files Change Summary
Resources/Prototypes/Maps/Pools/default.yml Added new entry "DryDock" to the list of map locations.
Resources/Prototypes/Maps/drydock.yml Introduced configuration for "DryDock Station," including metadata, player capacity, and station components (StationNameSetup, StationEmergencyShuttle, StationJobs).
Content.IntegrationTests/Tests/PostMapInitTest.cs Added new entry "DryDock" to the array of identifiers and updated the last entry to include a trailing comma.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 60bd987 and 684a78f.

📒 Files selected for processing (1)
  • Resources/Prototypes/Maps/drydock.yml (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • Resources/Prototypes/Maps/drydock.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.

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: 1

Outside diff range and nitpick comments (1)
Resources/Prototypes/Maps/drydock.yml (1)

18-71: LGTM! Consider clarifying disabled roles.

The job distribution looks well-balanced across different departments. The use of ranges for some roles provides flexibility in player assignments.

Consider adding a comment to explain the purpose of roles with [0, 0] quantities (Psychologist, Boxer). Are these intentionally disabled for this map, or is there another reason for their inclusion?

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 55c0d4b and a7a7595.

Files selected for processing (2)
  • Resources/Prototypes/Maps/Pools/default.yml (1 hunks)
  • Resources/Prototypes/Maps/drydock.yml (1 hunks)
Additional comments not posted (2)
Resources/Prototypes/Maps/Pools/default.yml (1)

17-17: LGTM! The "DryDock" map has been successfully added to the default map pool.

The addition of "DryDock" to the DefaultMapPool is consistent with the PR objectives and correctly implemented. This change will make the new map available in the game's map rotation.

To ensure the "DryDock" map is properly implemented, let's verify its configuration:

Resources/Prototypes/Maps/drydock.yml (1)

7-17: LGTM! Verify emergency shuttle file.

The station configuration looks good. The use of StandardNanotrasenStation prototype and custom name generator with 'WWDP' prefix seems appropriate.

Please run the following script to verify the existence of the emergency shuttle file:

Verification successful

Please run the following script to locate the emergency shuttle file across the repository:


LGTM! Emergency shuttle file verified.

The emergency shuttle file NTES_Delta.yml exists at Resources/Maps/Shuttles/DeltaV/NTES_Delta.yml, which correctly matches the path specified in the configuration.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the existence of the emergency shuttle file.

# Test: Check if the emergency shuttle file exists
fd -t f "NTES_Delta.yml" Maps/Shuttles/DeltaV

Length of output: 153


Script:

#!/bin/bash
# Description: Search for the emergency shuttle file in the repository.

fd -t f "NTES_Delta.yml"

Length of output: 70

Resources/Prototypes/Maps/drydock.yml Show resolved Hide resolved
@Remuchi
Copy link
Collaborator

Remuchi commented Sep 25, 2024

@PointPNG проваленный линтер актуальный

Resources/Prototypes/Maps/drydock.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Maps/drydock.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Maps/drydock.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Maps/drydock.yml Outdated Show resolved Hide resolved
@Evgencheg
Copy link
Contributor

в Content.IntegrationTests/Tests/PostMapInitTest.cs
нужно добавить DryDock после любой карты

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

🧹 Outside diff range and nitpick comments (1)
Content.IntegrationTests/Tests/PostMapInitTest.cs (1)

64-65: LGTM! Consider standardizing comments for consistency.

The addition of "DryDock" to the GameMaps array is correct and aligns with the PR objectives. This change ensures that the new map will be included in the GameMapsLoadableTest.

For consistency, consider using the same comment style as the other entries. If "WWDP" represents a different project or category, it might be worth adding a brief explanation in a code comment above the array.

-            "Submarine", //DeltaV
-            "DryDock" //WWDP
+            "Submarine", // DeltaV
+            "DryDock" // WWDP (World Wide Dream Project)
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between a7a7595 and 60bd987.

📒 Files selected for processing (1)
  • Content.IntegrationTests/Tests/PostMapInitTest.cs (1 hunks)
🔇 Additional comments not posted (2)
Content.IntegrationTests/Tests/PostMapInitTest.cs (2)

64-65: Address linter failures before merging

Remuchi mentioned that the linter has failed for this PR. While the changes in this file look good, please ensure that all linter issues are resolved before merging.

Run the project's linter on the entire codebase and fix any reported issues. If you need assistance with specific linter errors, please let me know, and I'll be happy to help.


64-65: Verify complete integration of "DryDock" into map rotation

While adding "DryDock" to the GameMaps array ensures it will be tested for loading, we should verify that all necessary steps have been taken to fully integrate it into the map rotation.

Please run the following script to check for any other files that might need updating to include "DryDock" in the map rotation:

This script will help identify any additional files that might need to be updated to fully integrate "DryDock" into the map rotation.

@Evgencheg
Copy link
Contributor

@PointPNG не забудь закоментить senior джобки

DVOniksWyvern and others added 5 commits September 29, 2024 14:57
Co-authored-by: Remuchi <72476615+Remuchi@users.noreply.github.com>
Co-authored-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com>
Co-authored-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com>
Co-authored-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com>
Co-authored-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com>
Copy link
Collaborator

@DVOniksWyvern DVOniksWyvern left a comment

Choose a reason for hiding this comment

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

Принял все исправления, тесты успешны, пляшем.

@DVOniksWyvern DVOniksWyvern merged commit 757e286 into WWhiteDreamProject:master Sep 29, 2024
10 checks passed
riddleridou added a commit that referenced this pull request Sep 29, 2024
@Evgencheg
Copy link
Contributor

Принял все исправления, тесты успешны, пляшем.

я бы ещё советовал проверить карту в игре, побегать посмотреть. Вдруг 🤷

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.

4 participants