Перенос в новую ветку #169
Conversation
WalkthroughThis pull request makes extensive modifications across numerous YAML configuration files and one Python module. New entities, prototypes, and vessels have been added while outdated ones are removed or renamed. Updates include changes to UID values, transformation properties, tilemap entries, and method signatures, along with additions of metadata files for textures. Adjustments span maps, shipyards, catalogs, and device definitions, and include both gameplay entity restructuring and minor API changes in the Calculator class. Changes
Suggested labels
Poem
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. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
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)
Other keywords and placeholders
CodeRabbit Configuration File (
|
github-actions
bot
added
S: Untriaged
size/XL
No C#
YML
Map-POI
and removed
size/XL
labels
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hello @Autsaider-IM, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!
Summary of Changes
This pull request focuses on rebalancing and expanding the pirate gameplay within the Corvax Frontier setting. It includes changes to the pirate cove map, pirate ships, pirate uplink store, and various pirate-related items and mechanics. The goal is to improve the pirate experience by adding new content, fixing existing issues, and adjusting prices and stats for better balance. Additionally, the PR updates several existing systems and adds a new shuttle, 'Цинга' (Scurvy), a pirate apothecary ship.
Highlights
- Pirate Cove: The pirate cove has been updated with layout and item changes, including the removal of the pirate hoverbike, changes to food and medical supplies, and the addition of additional hook-guns.
- Pirate Uplink Rebalancing: The pirate uplink store has been rebalanced with adjusted prices for various items, the removal of some items, and the addition of new items such as a dry ration, laser pistol, stunning charge, .30 caliber rounds, tie set, and T2 capacitor kit.
- Pirate Shuttle Changes: Various pirate shuttles have been modified with changes to armor, firepower, maneuverability, and the addition of a dubloon selling console to the 'Полюс' (Pole) shuttle. A new shuttle, 'Цинга' (Scurvy), has been added as a pirate apothecary ship.
- General Changes: Several general changes have been implemented, including updating KZ and SRP links to the Corvax Frontier wiki, preventing the removal/disassembly of advanced mass scanners on DSBF shuttles, updating the Quasar shuttle, and removing the ability to obtain hoverbikes without using a cheat spawn.
- Technical Changes: The PR includes numerous changes to map YAML files, including entity positions, component adjustments, and the removal of deprecated entities. There are also changes to the gas mixtures and wall types in some maps.
Changelog
Click here to see the changelog
- Resources/Maps/Corvax/POI/cove.yml
- Removed pirate hoverbike and pirate chest crates.
- Added additional cannonballs and hook-guns.
- Added missing Anchorable components to computers.
- Replaced ready-made food with ingredients.
- Added a cooking crate.
- Replaced human meat with generic meat.
- Added a pirate pistol rack.
- Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml
- Removed various decals and unnecessary entities to clean up the map.
- Added a computer for selling contraband for dubloons.
- Replaced reinforced walls with plastitanium walls.
- Added a protolathe.
- Removed the AmmoTechFab.
- Replaced DefibrillatorCabinetFilled with DefibrillatorCabinetOpen.
- Added a pirate cannon.
- Resources/Maps/Corvax/Shuttles/BlackMarket/SalvationUnion.yml
- Replaced PlatingBurnt with PlatingDamaged.
- Removed gas mixtures from the environment.
- Replaced AirlockGlassShuttleNfsdLocked with AirlockGlassShuttleSyndicate.
- Added cannonballs to the ship.
- Added pirate crates to the ship.
- Fixed a number of structural errors.
- Resources/Maps/Corvax/Shuttles/BlackMarket/barnacle.yml
- Added an airlock hatch.
- Added caution buttons.
- Replaced a pistol rack.
- Added a computer frame.
- Replaced a defibrillator cabinet.
- Added a small gyroscope.
- Replaced wall wood with wall wood forced.
- Resources/Maps/Corvax/Shuttles/BlackMarket/bocakillo.yml
- Added a new floor type.
- Added airlock shuttle syndicate pirate locked.
- Added a cannonball.
- Added a protolathe.
- Added a rack.
- Replaced wall wood with wall wood forced.
- Resources/Maps/Corvax/Shuttles/BlackMarket/falcon.yml
- Added AtmosFixBlockerMarker.
- Added a number of entities.
- Replaced DefibrillatorCabinetFilled with DefibrillatorCabinetOpen.
- Resources/Maps/Corvax/Shuttles/BlackMarket/hog.yml
- Added a new floor type.
- Replaced AtmosDeviceFanTiny with AtmosDeviceFanDirectional.
- Added a number of entities.
- Replaced WallWood with WallWoodForced.
- Resources/Maps/Corvax/Shuttles/BlackMarket/menace.yml
- Added a new floor type.
- Added a computer frame.
- Replaced ComputerTabletopStationRecords with CurtainsBlackOpen.
- Added a small gyroscope.
- Replaced WallWood with WallWoodForced.
- Resources/Maps/Corvax/Shuttles/BlackMarket/schooner.yml
- Added a new floor type.
- Added a number of entities.
- Replaced ComputerTabletopStationRecords with CurtainsBlackOpen.
- Added a small gyroscope.
- Replaced WallWood with WallWoodForced.
- Resources/Prototypes/Corvax/Catalog/Fills/Boxes/pirate.yml
- Added new box fills for pirate content.
- Resources/Prototypes/Corvax/Misc/books/PirateCodex.yml
- Added a Pirate Codex book.
- Resources/Prototypes/Corvax/Shipyard/BlackMarket/scurvy.yml
- Added a new shuttle, scurvy.
- Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml
- Updated the KZ and SRP links to the Corvax Frontier wiki.
- Resources/Prototypes/_NF/Catalog/Bounties/pirate_bounties.yml
- Rebalanced pirate bounty rewards and contents.
- Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml
- Rebalanced pirate uplink store prices and contents.
Using Gemini Code Assist
The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.
Invoking Gemini
You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.
| Feature | Command | Description |
|---|---|---|
| Code Review | /gemini review |
Performs a code review for the current pull request in its current state. |
| Pull Request Summary | /gemini summary |
Provides a summary of the current pull request in its current state. |
| Comment | @gemini-code-assist | Responds in comments when explicitly tagged, both in issue comments and review comments. |
| Help | /gemini help |
Displays a list of available commands. |
Customization
To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.
Limitations & Feedback
Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.
You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.
A pirate's life, a coding spree,
Refactoring ships for all to see.
With dubloons to spend,
And features to blend,
A balanced game, for you and me!
Footnotes
-
Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩
|
Warning Gemini encountered an error creating the review. You can try again by commenting |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 7
🔭 Outside diff range comments (6)
Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml (1)
7504-7520:⚠️ Potential issueEnsure consistent component definitions for ShuttleGunPirateCannon entities.
The
ShuttleGunPirateCannonentities are missing theAnchorablecomponent. This should be addressed to ensure that these entities can be properly anchored in the game world.Resources/Maps/Corvax/Shuttles/BlackMarket/menace.yml (1)
251-270:⚠️ Potential issueResolve Merge Conflict in Prototype Definition
There are unresolved merge conflict markers surrounding the definitions forAirlockGlassShuttleSyndicateversusAirlockGlassShuttleSyndicatePirateLocked. This is a critical issue; please resolve the conflict and remove the conflict markers so that the YAML is valid.🧰 Tools
🪛 YAMLlint (1.35.1)
[error] 252-252: syntax error: could not find expected ':'
(syntax)
Resources/Maps/Corvax/Shuttles/BlackMarket/barnacle.yml (1)
290-305: 🛠️ Refactor suggestion
⚠️ Potential issueUnresolved Merge Conflict in the CannonBall Prototype
There is an unresolved merge conflict in the “CannonBall” entity around these lines. For example, you see markers such as<<<<<<< HEAD, the two alternative changes, and>>>>>>> master. This is not valid YAML and is likely the cause of the YAMLlint error (e.g. at line 525).Please resolve the merge conflict by choosing (or merging) the correct values for the transformation (position and rotation) and then remove the conflict markers. For example, if the intended change is to use the new position and no rotation, your diff might look like:
-<<<<<<< HEAD - pos: 1.2770476,-0.4926232 -======= - rot: 1.5707963267948966 rad - pos: 1.8835673,-2.403088 ->>>>>>> master + pos: 1.2770476,-0.4926232(Adjust as necessary based on the design requirements.)
Resources/Maps/Corvax/Shuttles/BlackMarket/SalvationUnion.yml (1)
1789-1799:⚠️ Potential issueUnresolved Merge Conflict in "ShuttleGunPirateCannonNoUse" Prototype
The section for "ShuttleGunPirateCannonNoUse" (lines 1789–1799) still contains conflict markers (e.g.,<<<<<<< HEAD,=======,>>>>>>> master). This causes a YAML syntax error (as noted by YAMLlint) and must be resolved immediately.
Please remove the conflict markers and merge the appropriate changes so that the YAML is valid.🧰 Tools
🪛 YAMLlint (1.35.1)
[error] 1790-1790: syntax error: could not find expected ':'
(syntax)
Resources/Maps/Corvax/Shuttles/BlackMarket/falcon.yml (1)
647-788:⚠️ Potential issueMerge Conflict Detected:
Unresolved merge conflict markers are present between lines 647 and 788. These conflict markers (e.g.<<<<<<< HEAD,=======, and>>>>>>> master) will result in YAML syntax errors and must be resolved before merging.🧰 Tools
🪛 YAMLlint (1.35.1)
[error] 647-647: syntax error: could not find expected ':'
(syntax)
Resources/Maps/Corvax/Shuttles/BlackMarket/schooner.yml (1)
603-611: 🛠️ Refactor suggestionVerify Removal of APCBasic Prototype
The “APCBasic” prototype has been removed from the entities list. Confirm that all parts of the codebase that previously referenced this prototype have been updated or replaced so as not to break any functionality.
🧹 Nitpick comments (51)
Resources/Prototypes/Corvax/Misc/books/PirateCodex.yml (1)
1-16: YAML entity for PirateCodex is defined correctly—but add a trailing newline.
The entity extends BaseHyperlinkBook and includes all required components (Sprite, HyperlinkBook, Tag) with the proper URL and tags. To comply with YAML best practices and avoid lint errors, please add a new line at the end of the file.🧰 Tools
🪛 YAMLlint (1.35.1)
[error] 16-16: no new line character at the end of file
(new-line-at-end-of-file)
Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml (1)
1317-1337: Confirm removal of the hoverbike listing is deliberate.
The block forUplinkSecurityHoverbikeNfsdFlatpackhas been commented out in this file—which aligns with the decision to remove hoverbike functionality from the game. If this removal is final, consider deleting the commented-out code entirely to keep the file clean.Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml (1)
1045-1050: Removal of the HoverbikeFlatpack from the spawn list is noted.
The commented out line (# - HoverbikeFlatpack # Corvax-Frontier) effectively removes this prototype from the RandomSpawner’s list. Please confirm that this change aligns with the overall removal of hoverbike spawning functionality. If the code is no longer needed for future reference, consider removing the comment to simplify maintenance.Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml (1)
178-186: Disable ContractorHoverbikeFlatpack LoadoutThe loadout block for
ContractorHoverbikeFlatpackhas been commented out as intended. This temporary deactivation aligns with the removal of the pirate hoverbike feature. If this removal is permanent, consider deleting the block to avoid clutter.Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml (1)
766-766: Commenting Out ContractorHoverbikeFlatpack in Loadout GroupWithin the
ContractorFunloadout group, the entry forContractorHoverbikeFlatpackis now commented out. This change is consistent with the related modifications in the jobs file. Ensure that any references or documentation mentioning this loadout are updated accordingly.Resources/Prototypes/Corvax/Shipyard/Expedition/dreadnought.yml (2)
13-24: New Vessel Definition for DreadnoughtA new vessel entry for the “dreadnought” is introduced with clear properties (ID, parent, name, description, price, category, group, shuttlePath, and class). Verify that the price and recommended crew size fit the intended game balance.
25-43: New GameMap Configuration for DreadnoughtThe game map corresponding to the “dreadnought” vessel is defined with its map name, path, minimum player count, and station setup. Review the station components (such as the name template and job availability) to ensure they align with gameplay requirements.
Resources/Prototypes/Corvax/Shipyard/BlackMarket/scurvy.yml (3)
13-22: New Vessel Entry: ScurvyThe new vessel for “scurvy” is added with appropriate attributes including its ID, parent, name, description, price, category, group, and shuttlePath. Confirm that the price and crew recommendations are balanced for a small pirate shuttle.
23-40: New GameMap Entry: ScurvyThe game map for the “scurvy” shuttle is defined properly with a map name, path, minimum players, and a station configuration featuring a name setup and job availability for the Pirate role. Ensure that the station prototype and the name generator settings work as expected within the game’s ecosystem.
9-9: Remove Trailing WhitespaceThere is trailing whitespace on line 9. Removing extra spaces will help keep the YAML files clean and avoid potential linting issues.
🧰 Tools
🪛 YAMLlint (1.35.1)
[error] 9-9: trailing spaces
(trailing-spaces)
Resources/Maps/Corvax/POI/cove.yml (14)
4001-4016: New Entities Added and Proto Removal for Weapon Configuration
The changes introduce two new entities with UIDs 2108 and 2131 (each with a Transform component) and remove the protoCannonBallEmp. Please verify that this removal and the addition of these new entries are intentional and that any downstream references toCannonBallEmphave been updated accordingly.
4989-4996: Addition of Missing Components & Removal of Outdated Prototype
Here, amissingComponentssection with theAnchorableentry is added, and the protoComputerPalletConsoleNFHighMarketis removed. Confirm that adding the constraint is required for the current design and ensure that no other configurations rely on the removed proto.
5016-5023: Enforcing Entity Constraints and Updating Prototype References
The addition of themissingComponentsfield containingAnchorablefor this entity is a good move for ensuring proper behavior. The removal of the protoComputerPowerMonitoringshould be double-checked to guarantee that any functionality previously provided by it has an appropriate replacement.
5045-5079: Multiple Prototype Removals with Consistent Constraint Application
This hunk removes several proto references—ComputerTabletopRadar,ComputerTabletopStationRecords,ComputerTabletopSurveillanceCameraMonitor, andComputerWallmountBlackMarketBankATM—while also appending amissingComponentssection referencingAnchorableto the affected entities. Please review these removals carefully to ensure that any dependent logic (or UI linking these components) is updated accordingly.
5113-5125: Crate Prototype Removals and Entity Reassignment
The removal ofproto: CrateFoodCookingandproto: CrateFreezerindicates a significant update to crate configurations. Verify that the entities now represented (with UIDs 2061 and 858) correctly capture the intended functionality and that any references to the removed prototypes are properly adjusted in the overall game logic.
5133-5140: Updated Chemical Properties – Verify Mole Values
Themolesarray now includes new numerical values. Please confirm that the updated values (e.g.1.8977377and7.139109) accurately reflect the desired chemical or environmental properties and that their order is correct in relation to the other parameters.
5151-5165: Removal of Crate Prototype for Party Configurations
This change removes theproto: CrateFunPartyfrom the configuration while the container setup (via aContainerSlotwith specific entity IDs) remains. Review this removal to ensure that it aligns with the new design requirements and that the remaining entity references (including UIDs 684 and 834) are still valid within the updated context.
5609-5619: Removal of DoubleEmergencyOxygenTankFilled Prototype
The protoDoubleEmergencyOxygenTankFilledhas been removed, which suggests this oxygen tank type is no longer available. Confirm that this removal is in line with the new gameplay features and that any dependencies on this proto have been addressed.
6123-6129: Removal of FloorDrain Prototype and Position Adjustment
With the removal of the protoFloorDrainand a slight positional adjustment for the entity with UID 756, please verify that this change does not adversely affect environmental or physics interactions in the game.
7018-7024: Removal of FoodMeat Prototype
The protoFoodMeatis removed in this hunk. Ensure that this is an intentional change in the food system and that any balancing or replacement items have been documented and implemented elsewhere.
7041-7060: Reconfiguration of Container Entities & Removal of FoodPlate Prototype
Entities with UIDs 684 and 834 now present updated components with a new parent (UID 858), and the protoFoodPlateis removed. Verify that this reconfiguration reflects the intended design for food-serving mechanics and that it integrates correctly with the rest of the system.
7987-8007: Addition of New Magazine-Related Entities and Removal of an Outdated Prototype
New entities (UIDs 2132, 2141, 2142) with Transform components have been added, while the protoMagazineNovaliteC1Emptyis removed. Confirm that these changes correctly implement the new magazine configuration intended for the updated gameplay mechanics.
8630-8640: New Entity Addition – Verify Entity UID Usage
A new entity with UID 1136 is added here with its Transform component. Please ensure that this addition is intentional and that it does not conflict with previous removals or reassignments of similar UIDs in related design documents.
9758-9770: Removal of Outdated Weapon Rack and Melee Weapon (Stunbaton) Prototypes
The prototypesStructurePistolRackPiratesFilledandStunbatonhave been removed. Verify that these removals fit within the updated design for pirate equipment and that any necessary replacements or adjustments have been provided to maintain game balance and functionality.Resources/Maps/_NF/POI/lpbravo.yml (1)
3238-3244: Removal of HoverbikeSyndicateFlatpack Prototype:
These lines now comment out the entire block for the “HoverbikeSyndicateFlatpack” prototype (including uid 515 and its Transform component). This change is in direct alignment with the PR objective to remove the pirate hoverbike. If the prototype is not intended for any future use, you might consider removing it completely to keep the configuration file as concise as possible.Resources/Prototypes/Corvax/Entities/Structures/Walls/walls.yml (1)
88-129: YAML Formatting: Indentation and Trailing Spaces in WallWoodForced Definition
The newWallWoodForcedentity definition introduces the reinforced wooden wall. However, static analysis flagged several YAML formatting issues:
- Indentation Issues:
• Line 94 (and similar nested lines such as 103, 107, and 116) have lower than expected indentation.- Trailing Spaces:
• Lines 126–129 contain trailing spaces (and the file does not end with a newline).Please adjust the YAML indents so that list items under
componentsare indented uniformly (e.g. using 4 spaces per nesting level) and remove any trailing spaces. For example:- components: - - type: Sprite - sprite: Structures/Walls/wood.rsi - - type: Icon - sprite: Structures/Walls/wood.rsi + components: + - type: Sprite + sprite: Structures/Walls/wood.rsi + - type: Icon + sprite: Structures/Walls/wood.rsiAnd for the trailing spaces in the final component block:
- - type: RCDDeconstructable - cost: 6 - delay: 8 - fx: EffectRCDDeconstruct8 + - type: RCDDeconstructable + cost: 6 + delay: 8 + fx: EffectRCDDeconstruct8Once these formatting issues are corrected, the file will be more compliant with YAML linting standards.
🧰 Tools
🪛 YAMLlint (1.35.1)
[warning] 94-94: wrong indentation: expected 4 but found 2
(indentation)
[warning] 103-103: wrong indentation: expected 6 but found 4
(indentation)
[warning] 107-107: wrong indentation: expected 8 but found 6
(indentation)
[warning] 116-116: wrong indentation: expected 8 but found 6
(indentation)
[error] 126-126: trailing spaces
(trailing-spaces)
[error] 127-127: trailing spaces
(trailing-spaces)
[error] 128-128: trailing spaces
(trailing-spaces)
[error] 129-129: no new line character at the end of file
(new-line-at-end-of-file)
[error] 129-129: trailing spaces
(trailing-spaces)
Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml (1)
8334-8351: Verify thruster additions are balanced.Several new thruster entities have been added. Ensure that this doesn't unbalance the shuttle's capabilities compared to other vessels in the game.
Consider if these additional thrusters align with the PR's objective of adjusting shuttle meta for balance. Adding too many thrusters could make this shuttle significantly more maneuverable than intended.
Resources/Maps/Corvax/Shuttles/BlackMarket/menace.yml (4)
6-7: Tilemap Update for Floor Types
The tilemap now specifies new flooring types—“FloorHullReinforced” for key 3 and “FloorMetalDiamond” for key 2. Please verify that these names match the new textures and conform to our design guidelines.
31-34: Tile Encoding for Chunk “-1,0”
The encoded tile data for chunk “-1,0” has been updated. Please check that these new values are consistent with overall map layout requirements for negative coordinates.
35-38: Tilemap Data Verification for Chunk “0,-1”
The long encoded string for chunk “0,-1” has been revised. Since these values are critical for the map’s visual integrity, it is advisable to validate the rendered result (e.g. via a tilemap preview tool).
282-307: AirlockHatch Transform Updates
TheAirlockHatchprototype now defines several transform components (including rotation set to 3.141592653589793 rad) with updated positions. Please ensure these numeric values match the intended design for shuttle access points and interact correctly with other systems.Resources/Maps/Corvax/Shuttles/Nfsd/Cvasar.yml (1)
10-11: Tilemap Modification for Plating
A new tile mapping entry (134: PlatingDamaged) has been added. This appears to replace an older variant (possibly “PlatingBurnt”). Verify that the new designation is supported by the textures and rendering rules across the game.Resources/Maps/Corvax/Shuttles/BlackMarket/barnacle.yml (1)
100-107: Atmospheric Tile Value Update in GridAtmosphere
At line 102–103 the tile value for the key “-1,0” is updated to “61091”. Please double–check that this new value is intentional and consistent with the desired atmospheric settings on this map.Resources/Maps/Corvax/Shuttles/BlackMarket/bocakillo.yml (1)
10-12: New Tile Type “FloorMetalDiamond” Introduced
A new tile type “FloorMetalDiamond” is added on line 11. This update seems to follow the PR objective enhancements. Please ensure that this tile is supported elsewhere in your map–logic and asset pipeline.Resources/Maps/Corvax/Shuttles/BlackMarket/SalvationUnion.yml (1)
1650-2318: Comprehensive Entity Prototype Restructuring
A large block of entity prototypes (from approximately line 1650 through 2318) has been updated, removed, or restructured. This includes prototypes such as:
- Rack & Railing: Updated transform parameters.
- Various decorative and functional entities: (e.g. RandomPosterContraband, ShuttleSMGRifle, CableHV/CableMV, CannonBallGrapeshot)
- Pirate-related and others: (e.g. PirateFlag, PortableGeneratorPacmanShuttle, Poweredlight variations, WallPlastitanium*, WallReinforced/Rust, etc.)
Given the scope of these changes, please verify:
• All uid updates are coherent and do not conflict with other game entities.
• Transform positions and rotations reflect the intended visual layout on the map.
• Any removed prototypes are not referenced from elsewhere in the codebase.This restructuring is significant and warrants thorough testing in the game environment.
🧰 Tools
🪛 YAMLlint (1.35.1)
[error] 1790-1790: syntax error: could not find expected ':'
(syntax)
Resources/Maps/Corvax/Shuttles/BlackMarket/hog.yml (3)
2655-2660: Cutlass Prototype – Parent Reference Update
For the Cutlass prototype, the entity with UID 626 now has an updated Transform that specifiesparent: 621(indicating a change in the hierarchical relationship). Verify that this new parent reference is correct and that it links appropriately with game inventory or mounting logic. If a typo occurred in specifying the parent, consider this diff:- parent: <previous_value> + parent: 621
4320-4377: ShuttleGunPirateCannon – Missing Components Specification
Within the ShuttleGunPirateCannon block, several entities (UIDs such as 120, 308, 351, 380, 381, 398, 399, and 400) now include a new fieldmissingComponents: - Anchorable. This change implies that these entities are expected to lack the Anchorable component. Confirm that this intentional omission is consistent with gameplay design (i.e. that these items should not be anchored) and that downstream processing correctly handles the absence of Anchorable.
4606-4634: StructureMeleeWeaponRack – Container Slot References for Weapons
The StructureMeleeWeaponRack prototype now sets container slot entries for weapons (weapon1, weapon2, weapon3, etc.). Note that UID references for weapon slots 1, 2, and 3 have been updated to 624, 626, and 627 respectively, while slots 4 and 5 remain set to null. Please verify that these references match the intended weapon assignments and that empty slots are handled correctly by the game logic. An example diff if a correction is needed:- ent: null + ent: <desired_uid_or leave null if intentional>Resources/Prototypes/_NF/Catalog/Bounties/pirate_bounties.yml (9)
2-9: Deprecation of Legacy Bounties:
The entry for “PirateBountyMail” is now entirely commented out. Please confirm that keeping legacy entries commented (instead of outright removal) is the intended strategy for deprecation and won’t lead to future confusion or maintenance issues.
38-47: Deprecation of PirateBountyGyro:
This entire block (lines 38–47) is commented out. Make sure that “PirateBountyGyro” is no longer required anywhere in the game and that removing it (or keeping it archived) is the intended approach for deprecation.
77-86: Deprecation of PirateBountyGravGen:
This block for “PirateBountyGravGen” is now commented out. Confirm that its deprecation has been communicated and that no downstream dependencies remain.
87-96: Deprecation of PirateBountyVendingMachine:
Likewise, the “PirateBountyVendingMachine” entry is commented out. Ensure that its removal is intentional and that there are no unintended references in the game code or configuration.
161-169: Deprecation of PirateBountyMK58:
This block remains commented out. If the decision is to deprecate this bounty, consider removing it entirely if legacy support is no longer necessary.
179-188: Deprecation of PirateBountyHotplate:
The “PirateBountyHotplate” entry is commented out. Please verify that its removal aligns with the updated in-game mechanics and that any related references have been updated.
199-208: Deprecated Bounty – PirateBountyKeyCommon:
A FIXME note suggests replacing this entry with an alternative. Consider resolving this by either providing the new definition or removing the deprecated code if it’s no longer needed.
209-217: Deprecation of PirateBountyMedicalFabBoard:
This bounty entry remains commented out. Verify that its exclusion is intentional and that removal will not cause inconsistencies in bounty referencing elsewhere.
285-294: Deprecation of PirateBountyHydroTray:
This entire section is commented out. Confirm that “PirateBountyHydroTray” is effectively deprecated in favor of other gameplay mechanics.Resources/Maps/Corvax/Shuttles/BlackMarket/falcon.yml (2)
351-351: Trailing Spaces Notice:
Trailing spaces have been detected at line 351. Please remove them to conform with YAML formatting standards.
359-359: Missing Newline at End of File:
The file does not end with a newline character. Adding a newline at the end will help avoid issues with tools that require a terminating newline.Resources/Maps/Corvax/Shuttles/BlackMarket/schooner.yml (2)
972-1021: Review BlastDoor Prototype Update
A new “BlastDoor” prototype configuration is added (lines 972–1021) with several transform changes (rotation and position updates). Please verify that these values are correct and consistent with the updated game design for ship door mechanics.
1047-1078: Review BlastDoorOpen Prototype Update
Similarly, the “BlastDoorOpen” prototype has been updated (lines 1047–1078). Check that the transform parameters (rotations and positions) here are consistent with other door prototypes and support the desired in-game behavior.
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
⛔ Files ignored due to path filters (5)
Resources/Textures/Corvax/Boxes/boxpirat.pngis excluded by!**/*.pngResources/Textures/Corvax/Boxes/capacitor.pngis excluded by!**/*.pngResources/Textures/Corvax/Boxes/shelllethal.pngis excluded by!**/*.pngResources/Textures/Corvax/Boxes/ziptie.pngis excluded by!**/*.pngResources/Textures/Corvax/Misc/books/PirateCodex.pngis excluded by!**/*.png
📒 Files selected for processing (26)
Resources/Maps/Corvax/POI/cove.yml(15 hunks)Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml(11 hunks)Resources/Maps/Corvax/Shuttles/BlackMarket/SalvationUnion.yml(14 hunks)Resources/Maps/Corvax/Shuttles/BlackMarket/barnacle.yml(18 hunks)Resources/Maps/Corvax/Shuttles/BlackMarket/bocakillo.yml(18 hunks)Resources/Maps/Corvax/Shuttles/BlackMarket/falcon.yml(4 hunks)Resources/Maps/Corvax/Shuttles/BlackMarket/hog.yml(10 hunks)Resources/Maps/Corvax/Shuttles/BlackMarket/menace.yml(15 hunks)Resources/Maps/Corvax/Shuttles/BlackMarket/schooner.yml(21 hunks)Resources/Maps/Corvax/Shuttles/Nfsd/Cvasar.yml(28 hunks)Resources/Maps/_NF/POI/lpbravo.yml(1 hunks)Resources/Prototypes/Corvax/Catalog/Fills/Boxes/pirate.yml(1 hunks)Resources/Prototypes/Corvax/Entities/Structures/Walls/walls.yml(1 hunks)Resources/Prototypes/Corvax/Misc/books/PirateCodex.yml(1 hunks)Resources/Prototypes/Corvax/Shipyard/BlackMarket/scurvy.yml(1 hunks)Resources/Prototypes/Corvax/Shipyard/Expedition/dreadnought.yml(1 hunks)Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml(2 hunks)Resources/Prototypes/_NF/Catalog/Bounties/pirate_bounties.yml(15 hunks)Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml(12 hunks)Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml(1 hunks)Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml(1 hunks)Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml(3 hunks)Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml(1 hunks)Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml(1 hunks)Resources/Textures/Corvax/Boxes/meta.json(1 hunks)Resources/Textures/Corvax/Misc/books/meta.json(1 hunks)
🧰 Additional context used
🪛 YAMLlint (1.35.1)
Resources/Prototypes/Corvax/Misc/books/PirateCodex.yml
[error] 16-16: no new line character at the end of file
(new-line-at-end-of-file)
Resources/Prototypes/Corvax/Shipyard/BlackMarket/scurvy.yml
[error] 9-9: trailing spaces
(trailing-spaces)
Resources/Prototypes/Corvax/Entities/Structures/Walls/walls.yml
[warning] 94-94: wrong indentation: expected 4 but found 2
(indentation)
[warning] 103-103: wrong indentation: expected 6 but found 4
(indentation)
[warning] 107-107: wrong indentation: expected 8 but found 6
(indentation)
[warning] 116-116: wrong indentation: expected 8 but found 6
(indentation)
[error] 126-126: trailing spaces
(trailing-spaces)
[error] 127-127: trailing spaces
(trailing-spaces)
[error] 128-128: trailing spaces
(trailing-spaces)
[error] 129-129: no new line character at the end of file
(new-line-at-end-of-file)
[error] 129-129: trailing spaces
(trailing-spaces)
Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml
[error] 7529-7529: syntax error: could not find expected ':'
(syntax)
Resources/Maps/Corvax/Shuttles/BlackMarket/SalvationUnion.yml
[error] 1790-1790: syntax error: could not find expected ':'
(syntax)
Resources/Maps/Corvax/Shuttles/BlackMarket/bocakillo.yml
[error] 256-256: syntax error: could not find expected ':'
(syntax)
Resources/Prototypes/_NF/Catalog/Bounties/pirate_bounties.yml
[error] 351-351: trailing spaces
(trailing-spaces)
[error] 359-359: no new line character at the end of file
(new-line-at-end-of-file)
Resources/Maps/Corvax/Shuttles/BlackMarket/falcon.yml
[error] 647-647: syntax error: could not find expected ':'
(syntax)
Resources/Maps/Corvax/Shuttles/BlackMarket/schooner.yml
[error] 542-542: syntax error: could not find expected ':'
(syntax)
Resources/Maps/Corvax/Shuttles/BlackMarket/menace.yml
[error] 252-252: syntax error: could not find expected ':'
(syntax)
Resources/Maps/Corvax/Shuttles/BlackMarket/barnacle.yml
[error] 525-525: syntax error: could not find expected ':'
(syntax)
⏰ Context from checks skipped due to timeout of 90000ms (1)
- GitHub Check: Test Packaging
🔇 Additional comments (81)
Resources/Textures/Corvax/Misc/books/meta.json (1)
1-14: New metadata file for PirateCodex is well-formed.
The JSON correctly specifies the version, license, copyright, size, and a single state “PirateCodex”.Resources/Textures/Corvax/Boxes/meta.json (1)
1-23: Box textures metadata file looks good.
This new JSON file correctly defines the version, license, copyright, size, and includes all four states.Resources/Maps/Corvax/POI/cove.yml (1)
13029-13052:❓ Verification inconclusive
Weapon Prototype Removals and Entity Replacements
Several weapon prototypes (WeaponGrapplingGun,WeaponLauncherPirateCannon, andWeaponRevolverArgentiNonlethal) are removed in this hunk. Concurrently, new entities with UIDs 23, 2063, and 2107 are added with detailed Transform settings. Please confirm that these changes align with the updated design of pirate weaponry and that all references to the old prototypes have been updated accordingly.
🏁 Script executed:
#!/bin/bash # Search for references to the removed weapon prototypes throughout the repository echo "Searching for WeaponGrapplingGun references..." rg "WeaponGrapplingGun" . echo "Searching for WeaponLauncherPirateCannon references..." rg "WeaponLauncherPirateCannon" . echo "Searching for WeaponRevolverArgentiNonlethal references..." rg "WeaponRevolverArgentiNonlethal" .Length of output: 7369
Weapon Prototype Update Verification
The changes inResources/Maps/Corvax/POI/cove.ymlnow replace the standard spawns of the weapon prototypes with new entity instances (UIDs 23, 2063, and 2107) and custom Transform settings. However, our repository-wide search still returns references toWeaponGrapplingGun,WeaponLauncherPirateCannon, andWeaponRevolverArgentiNonlethalin several other files (e.g. catalogs, recipes, locale files, and additional map definitions). Please confirm whether the removal and replacement in this file is part of a broader update—to deprecate the old prototypes across the entire codebase—or if these references in other locations should remain. Also, double-check that the new Transform settings meet the updated pirate weaponry design specifications.Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml (2)
26-26: Verify Correctness of Updated URL for HyperlinkBookSpaceLaw.
The URL has been updated to
https://station14.ru/wiki/%D0%9A%D0%97_(Frontier)
which appears to use percent encoding to represent Unicode characters. Please ensure that this URL is correctly encoded and that it directs to the intended resource.
43-43: Verify Correctness of Updated URL for HyperlinkBookNfsdSop.
The URL has been updated to
https://station14.ru/wiki/%D0%A1%D0%A0%D0%9F_%D0%94%D0%A1%D0%91%D0%A4_(Frontier)
which uses percent encoding for Unicode characters. Please confirm that the encoding is accurate and that the link points to the correct resource as intended by the change.Resources/Maps/_NF/POI/lpbravo.yml (1)
346-4531:❓ Verification inconclusive
Bulk Removal of Deprecated Prototypes:
A very large number of prototype definitions—ranging from various airlock configurations (e.g. "AirlockExternalShuttleSyndicateLocked", "AirlockHatchSyndicate", "AirlockSyndicateLocked") to entities such as "APCBasic", "AtmosDeviceFanDirectional", and many others—have been removed from this YAML file. These removals appear to be part of an overall update to the pirate-related configuration (in line with the PR objectives) by eliminating outdated or unneeded prototypes. Before finalizing, please verify that:
• All external references and dependencies (in other maps, prototypes, or code modules) have been updated accordingly to avoid dangling references.
• Any replacements or new configurations (for example, the newly added Pirate Code) are properly integrated elsewhere in the game’s configuration.
• There is adequate documentation or changelog commentary to track these removals for future maintenance.
Below are some shell scripts you can run to gather additional information for verifying this bulk removal:
#!/bin/bash # Verify external references to a few of the removed prototypes. prototypes=("AirlockExternalShuttleSyndicateLocked" "AirlockHatchSyndicate" "AirlockSyndicateLocked" "APCBasic" "AtmosDeviceFanDirectional") for proto in "${prototypes[@]}"; do echo "Searching for references to: $proto" rg "$proto" . done#!/bin/bash # Check if the changelog or documentation mentions the deprecation of these prototypes. echo "Searching for changelog or documentation references related to 'deprecated prototypes' or 'pirate'" rg -i "deprecated prototypes" . rg -i "Pirate Code" .Please run these scripts from the repository root to verify that no outdated prototypes are referenced externally and that all changes are accompanied by adequate documentation. Once you’ve confirmed that external dependencies have been updated and that the Pirate Code (or any new configuration) is integrated correctly, we can finalize the review comment.
Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml (3)
387-390: Add bookSlot and penSlot to PirateNFPDA
The new slots assign a starting book ofHyperlinkBookPirateCodeand a pen ofLuxuryPenfor the pirate handheld device. Please verify that these item definitions exist and are correctly referenced in the appropriate prototype files.
404-407: Update PirateCaptainNFPDA slots with new starting items
The pirate captain PDA now includes abookSlotand apenSlotwith the same item references (HyperlinkBookPirateCodeandLuxuryPen). Confirm that these changes align with the new design for pirate devices and that the referenced items are defined.
421-424: Enhance PirateFirstMateNFPDA with updated slots
The first mate PDA now provides abookSlotand apenSlotusingHyperlinkBookPirateCodeandLuxuryPen. Please double‐check that this update is consistent with the design intent and that the identifiers are correct.Resources/Prototypes/Corvax/Catalog/Fills/Boxes/pirate.yml (3)
1-24: New Entity: BoxT2SuperCapacitor
This entity adds a cardboard box containing modified capacitors. The inclusion of both aStorageFill(with 9 units ofAdvancedCapacitorStockPart) and aStoragecomponent defining grid layout and whitelist is clear and well structured.
• Please verify that the grid specification (0,0,2,3) is parsed correctly by the engine.
25-37: New Entity: BoxZiptiePirat
A new box for zip ties is introduced, employing the correct sprite (Corvax/Boxes/pirate.rsi) with layered states. Ensure that this prototype’s parent (BoxZiptie) and any associated logic fully support the new asset.
38-55: New Entity: BoxDeathRattleImplantsPirat
This “dissolution kit” prototype is defined with a unique description and sprite layers for both the box (usingbox_of_doom) and a syringe. The storage grid and fill component (with 5 units ofDeathAcidifierImplanter) are properly configured. Verify that the humorous description is intentional and that the asset resources are in place.Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml (10)
55-73: Removal of Obsolete Listing: UplinkPirateCaptainCrateFilled
This listing has been commented out, indicating its removal in favor of updated catalog entries. Confirm that the removal of this crate aligns with the new design (and that related items such as the pirate hoverbike have been removed elsewhere as described in the PR objectives).
74-89: Cost Update for UplinkPirateCrateFilled
The cost for the crate listing has been updated to 13 Doubloons (noted with#CorvaxFrontier). Please ensure this new price is balanced within the game’s economy.
196-197: Cost Adjustment for UplinkEnergyCutlass
TheEnergyCutlasslisting now costs 4 Doubloons as indicated by the inline comment. This change appears to be part of an overall pricing update—please confirm that the new cost suits the intended gameplay balance.
231-232: Cost Update for UplinkPirateRedGrenade
The red grenade’s cost has been updated to 2 Doubloons with the#CorvaxFrontiernote. Verify that this pricing is in line with the new economic design for pirate uplink items.
247-248: Cost Update for UplinkPirateGreenGrenade
The green grenade now carries a cost of 2 Doubloons. As with other price adjustments, please review this change to ensure consistency with the overall pricing strategy.
263-264: Cost Update for UplinkPirateGrayGrenade
The gray grenade’s cost is now set to 2 Doubloons (as tagged with#CorvaxFrontier). Confirm that this aligns with the intended balance for explosive items in the uplink catalog.
464-481: New Listing: UplinkPiratBoxT2SuperCapacitor
This new uplink listing introduces the engine modification kit. The listing details—including name, description, product entity, cost (4 Doubloons), categories, and conditions (including a BuyerJobCondition forPirateCaptain)—are clearly defined. Ensure that theBoxT2SuperCapacitorprototype is registered correctly in the game.
482-499: New Listing: UplinkPiratBoxZiptiePirat
The listing for a box of zip ties is added with a cost of 3 Doubloons and conditions that include both a whitelist and a BuyerJobCondition forPirateCaptain. The description and product reference match those defined in the fills/boxes file.
519-527: Update for UplinkRadioImplanterFreelance
There is a minor change (as indicated by the tilde markers) in the categories list. Make sure the adjusted category listing now solely includesUplinkPirateUtilityand that this change is consistent with other similar items in the catalog.
530-547: New Listing: UplinkPiratBoxDeathRattleImplantsPirat
A new uplink entry for the dissolution kit is introduced with a cost of 4 Doubloons. The conditions require a whitelist forPirateUplinkand a BuyerJobCondition forPirateCaptain, which mirrors the design in the fills/boxes file. Verify that both the product entity and the descriptive text are correct for the intended gameplay effect.Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml (7)
869-869: LGTM!This appears to be a valid tilemap configuration for position -2,2 with a value of 0: 61678.
4683-4684: Prototype renamed properly.The
DefibrillatorCabinetFilledprototype has been correctly renamed toDefibrillatorCabinetOpen, which aligns with the AI summary. This appears to be part of a broader cleanup or refactoring mentioned in the PR objectives.
4660-4660: Similar door timing issue.This door also has a large negative value for
secondsUntilStateChange(-10260.392). This appears to be a pattern with doors in this file and should be verified as intended behavior.
8627-8856:❓ Verification inconclusive
Ensure consistency in wall prototype changes.
The switch from
WallReinforcedtoWallPlastitaniumis substantial. Ensure that this change is consistent with the game's design and that all references to these wall types are updated throughout the codebase.
🏁 Script executed:
#!/bin/bash # Check for any remaining references to WallReinforced that might need updating echo "Checking for remaining references to WallReinforced..." grep -r "WallReinforced" --include="*.yml" .Length of output: 21364
Action Required: Verify Consistency of Wall Prototype Changes in BlackMarket Poli.yml
The updated Poli.yml file now uses both the new wall prototypes (
WallPlastitaniumandWallPlastitaniumShuttle) alongside an instance ofWallReinforced. A repository-wide search confirms that many other maps and prototypes still referenceWallReinforced(and its variants) throughout the codebase. Please verify that the mixed usage in Poli.yml is intentional per the game's design:
File Concern:
- Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml (lines 8627–8856): Confirm whether the final block using
proto: WallReinforcedshould remain as is or be updated to align with the new wall prototype standard.Next Steps:
- Double-check the design documentation to ensure that the coexistence of
WallPlastitaniumandWallReinforcedis by design.- If the intention is to replace all instances, update the remaining reference(s) in Poli.yml and, if needed, plan for a broader refactoring across other maps that still use
WallReinforced.
9522-9522:❓ Verification inconclusive
Verify the door timing change.
The
secondsUntilStateChangeproperty has been modified to a very large negative number (-12076.117). This likely means the door will change state immediately. Confirm that this is intentional behavior rather than an error in the configuration.
🏁 Script executed:
#!/bin/bash # Check for typical values of secondsUntilStateChange in other doors echo "Checking for typical door state change timing values..." grep -r "secondsUntilStateChange:" --include="*.yml" . | sort | head -n 10Length of output: 1121
Confirm Door Timing Configuration in Poli.yml
The configuration in Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml now sets
secondsUntilStateChange: -12076.117Our search across similar door configuration files shows that large negative values (e.g., -14183.977, -3065.4983, -184773.06, etc.) are used across the codebase. While this pattern suggests that a negative value likely triggers an immediate or otherwise special state change, please verify that this specific value is intentional for the Poli door and aligns with the game's door state logic.
8857-8944:❓ Verification inconclusive
Verify wall prototype refactoring is complete.
The move from
WallReinforcedto a split betweenWallPlastitaniumandWallPlastitaniumShuttleindicates a refactoring of wall types. Ensure that this is part of a broader architectural change and that all areas using these wall types are updated consistently.
🏁 Script executed:
#!/bin/bash # Check for any consistency issues with the new wall types echo "Checking how widespread the new wall types are..." grep -r "WallPlastitanium" --include="*.yml" . | wc -l grep -r "WallPlastitaniumShuttle" --include="*.yml" . | wc -lLength of output: 231
Ensure all wall prototype references are updated and no deprecated types remain.
- The search results show extensive usage of the new wall types (216 for
WallPlastitaniumand 8 forWallPlastitaniumShuttle), which confirms that the refactoring effort is well-propagated.- Please verify that any references to the old
WallReinforcedtype have been completely removed to ensure full consistency across the codebase.- Confirm that all affected modules and files reflect this architectural change uniformly.
4401-4412:❓ Verification inconclusive
New computer console looks good but is missing components.
The
ComputerContrabandPalletConsolePirateentity definition is correctly added, but note that it's missing theConstructionandAnchorablecomponents as indicated in themissingComponentsfield. These missing components may affect the behavior of this entity in the game.
🏁 Script executed:
#!/bin/bash # Check if the Construction and Anchorable components are defined for similar entities echo "Checking for similar entities with Construction and Anchorable components..." ast-grep --pattern $'- proto: Computer.*\n entities:\n.*\n.*\n.*components:\n.*\n.*\n.*\n.*type: Construction'Length of output: 445
Manual Verification Required: Missing Component Definitions
The new
ComputerContrabandPalletConsolePirateentity appears to be added correctly. However, as noted, it lacks theConstructionandAnchorablecomponents—listed undermissingComponents. The original AST-grep command failed due to formatting issues, so please run the above scripts to manually verify that similar entities in this YML file include these components. Confirm whether the omission is intentional or requires addressing.
🏁 Script executed:
#!/bin/bash echo "Checking the 'ComputerContrabandPalletConsolePirate' entity definition in the file..." rg -n "proto: ComputerContrabandPalletConsolePirate" Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml echo "Searching for the 'Construction' component in the file..." rg -n "type: Construction" Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml echo "Searching for the 'Anchorable' component in the file..." rg -n "type: Anchorable" Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.ymlLength of output: 885
Verification of Missing Components in New Computer Console Definition
The new computer console entity defined in
Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml(lines 4401-4412) is correctly added, but it still lacks theConstructionandAnchorablecomponents. Our manual inspection confirms that neither atype: Constructionnor atype: Anchorableentry was found in the file. Since these components may be crucial for the entity's expected behavior in the game, please verify if the absence of these components is intentional or if they need to be added.
- Location:
Resources/Maps/Corvax/Shuttles/BlackMarket/Poli.yml(lines 4401-4412)- Details:
- The entity
ComputerContrabandPalletConsolePiratehas amissingComponentsfield listingConstructionandAnchorable.- Searches for
type: Constructionandtype: Anchorablein the file returned no matches.Resources/Maps/Corvax/Shuttles/BlackMarket/menace.yml (1)
27-30: MapGrid Chunk “0,0” Tiles Encoding
The chunk for coordinate “0,0” now uses a new encoded string for its tiles. It is important to confirm that this encoding correctly represents the desired visual layout and that no data was corrupted during the update.Resources/Maps/Corvax/Shuttles/Nfsd/Cvasar.yml (1)
1-33: Overall Consistency and Integration Testing
The updates in this file affect both the tilemap (e.g. the new “PlatingDamaged” tile) and the extensive entity configurations (including new prototypes likeAirAlarm). It is recommended to perform thorough visual and integration tests in-game to ensure that the new settings align with gameplay mechanics and that no layout discrepancies occur.Resources/Maps/Corvax/Shuttles/BlackMarket/barnacle.yml (2)
200-208: Addition of the AirlockHatch Prototype
A new prototype “AirlockHatch” is introduced (lines 201–208). The Transform component (with position –2.5,1.5 and parent set to 201) appears to be correctly defined. Please ensure that any game–logic or references to this new prototype are updated elsewhere as needed.
350-370: New ButtonFrame Entities for Caution Displays
The addition of prototypes “ButtonFrameCaution” and “ButtonFrameCautionSecurity” (roughly around lines 355–370) that define their positions and rotation values looks appropriate. Verify that these new UI elements or physical objects integrate correctly into your game’s device–list logic.Resources/Maps/Corvax/Shuttles/BlackMarket/SalvationUnion.yml (9)
14-14: Rename Tile Label: "PlatingBurnt" → "PlatingDamaged"
This update in the tilemap (line 14) clarifies the damage state of the plating. Verify that this change is consistently reflected across related maps or documentation.
335-344: Removal of Prototype "AirCanister"
The removal of the AirCanister prototype (lines 335–344) appears intentional. Please confirm that no in-game systems rely on this entity or that appropriate replacements have been implemented.
345-357: Removal of Prototype "AirlockExternalGlass"
The prototype "AirlockExternalGlass" (lines 345–357) has been removed. Verify that any functionalities or references to external glass airlocks are updated or replaced accordingly in the game logic.
358-365: Addition/Update: "AirlockGlassShuttleSyndicate" Prototype
A new or modified prototype "AirlockGlassShuttleSyndicate" is defined (lines 358–365) with a transform specifying a 1.5708 rad rotation. Ensure that this change correctly reflects the intended syndicate affiliation and that downstream references use this updated entity.
366-373: Removal of Prototype "AirlockHatch"
The entire block for "AirlockHatch" (lines 366–373) has been removed. Confirm that the removal of airlock hatches is deliberate and that any adjacent systems (such as airlock controls) have been adjusted to the new configuration.
388-400: Removal of Prototype "APCBasic"
The "APCBasic" entity (lines 388–400) has been removed. Double-check that all gameplay or UI elements referencing this prototype are updated so that no orphaned references remain.
401-507: Bulk Removal of Multiple Entity Prototypes
Between lines 401 and 507, several prototypes are removed—including "AtmosDeviceFanDirectional", "Barricade", "BarricadeDirectional", "BlastDoor", "BlastDoorOpen", "BoxBodyBag", "ButtonFrameCaution", and "ButtonFrameCautionSecurity".
Please ensure these removals are intentional and that any external references (in scripts, maps, or UI elements) are updated to reflect these changes.
1049-1056: Rename: "CratePirateChest" → "CratePirateChestCaptain"
At lines 1049–1056 the prototype has been renamed and its uid changed (from 284 to 35). Verify that the new naming and identifier propagate correctly in all locations where this crate is used, especially in contexts related to pirate content.
269-297:❓ Verification inconclusive
Update to GridAtmosphere Tile Values
The numeric properties for the atmospheric tiles have been updated across several grid coordinates:
• (0,1): now{0: 48, 1: 3136}
• (0,2): now{1: 41883, 0: 32}
• (0,3): now{0: 16, 1: 10894}
• (1,1): added key{0: 3200}alongside{1: 832}
• (1,2): added key{0: 132}with existing value{1: 47675}
• (1,3): added key{0: 16928}to complement{1: 39743}
• (1,4): key{0: 18560}is now defined
• (2,1): key updated to{0: 16}and similar for subsequent entries.
Please verify that these new values correctly reflect the intended atmospheric simulation parameters and that they align with the new game design.
Review: Validate Updated Atmospheric Tile Grid Values
The YAML update introduces refined atmospheric simulation parameters in the grid. Note that the diff snippet shows the final state without explicitly highlighting removed or replaced code. Key updates are as follows:
- (0,1): now
{0: 48, 1: 3136}- (0,2): now
{1: 41883, 0: 32}- (0,3): now
{0: 16, 1: 10894}- (1,1): now includes
{0: 3200}alongside{1: 832}- (1,2): now includes
{0: 132}with the existing{1: 47675}- (1,3): now updated to include the added key
{0: 16928}to complement{1: 39743}- (1,4): the key
{0: 18560}is now defined alongside its paired value- (2,1): updated with
{0: 16}, with similar adjustments applied to subsequent entriesAction:
Please verify that these numeric adjustments accurately reflect the intended atmospheric simulation parameters and are in full alignment with the new game design. Additionally, double-check the coordinate alignment—especially for (1,3)—to ensure that the placement of the added key{0: 16928}is correct and any intended removals or refactors are properly handled.Resources/Maps/Corvax/Shuttles/BlackMarket/hog.yml (7)
381-393: Tilemap Data Update – GridAtmosphere Tiles
The tile values for several coordinates have been updated (e.g. coordinate (0,0) now uses 65423, (-1,0) is 65343, (0,1) is 65262, etc.) which appears to match the intended modifications described in the PR objectives. Please verify that these new numeric values correctly reflect the intended gameplay changes.
591-617: AirlockShuttleSyndicate Entity Transforms and UIDs
The UIDs and transformation parameters (rotation and position) for the entities under the AirlockShuttleSyndicate prototype have been updated (UIDs 125, 178, 243, and 295 with revised rotation/position values). Ensure that any hardcoded references in other configurations or game logic have been updated accordingly to reflect these changes.
759-821: AtmosDeviceFanDirectional – Transform Adjustments
Multiple entities under the AtmosDeviceFanDirectional prototype have been modified with new rotation and position values (notice the tildes on lines such as 776, 782, 788–795, 800–807, etc.). Please confirm that these new spatial configurations achieve the desired directional fan effect in-game.
845-897: AtmosFixBlockerMarker – New Entity Additions
New entities for the AtmosFixBlockerMarker prototype (UIDs 628, 635, 637, 638, 639, 667, 668, and an additional UID 759) have been added with defined Transform components. Verify that their positions correctly integrate with the surrounding map context and that the new prototype is consistently referenced elsewhere as intended.
2711-2717: EnergyCutlass Prototype – Parent Reference Update
Similar to the Cutlass, the EnergyCutlass now shows its Transform’s parent set to 621. Please double‑check that this aligns with the underlying entity hierarchy and that any consumers of these entities are aware of the new parent–child linkage.
2577-2594:❓ Verification inconclusive
CurtainsBlack – Door Timing Updates
The door components for the CurtainsBlack prototype now include modified values forsecondsUntilStateChange(e.g. ‑5165.067 and ‑3350.7908). These negative timing values are unusual; please double‑check that this behavior is intended (perhaps to trigger immediate or reversed state changes) and that it does not conflict with simulation timing elsewhere.
Action: Confirm Door Timing Behavior
The updated door components for the CurtainsBlack prototype now use negative values for
secondsUntilStateChange(‑5165.067 and ‑3350.7908) inResources/Maps/Corvax/Shuttles/BlackMarket/hog.yml(lines 2577‑2594). Since such negative timing is unusual—potentially intended for triggering immediate or reversed state changes—please verify that this behavior is deliberate and does not conflict with the simulation’s overall timing logic.
2619-2627:❓ Verification inconclusive
CurtainsBlackOpen – Door Timing Adjustment
Within the CurtainsBlackOpen prototype, a changed door property now specifiessecondsUntilStateChange: -3920.4885. As with CurtainsBlack, negative timing may be unconventional. Confirm that this configuration produces the expected door-closing behavior within the game logic.
#!/bin/bash echo "Searching for negative occurrences of 'secondsUntilStateChange' in YAML files..." rg "secondsUntilStateChange:\s*-\d+\.\d+" -n .Please run the above shell script to check for other instances using negative timing values in the repository. This will help verify whether -3920.4885 is part of a broader, intentional pattern in door configurations.
Critical Review – Verify Door Timing Behavior
In the BlackMarket map configuration for CurtainsBlackOpen (see Resources/Maps/Corvax/Shuttles/BlackMarket/hog.yml, Lines 2619–2627), the door’s property
secondsUntilStateChangeis set to -3920.4885. Since negative timing is unconventional, please confirm that this setting produces the intended door-closing behavior in the game logic. If this negative value is deliberate (for example, to trigger an immediate or offset state change), consider adding documentation or inline comments clarifying the rationale.
- File: Resources/Maps/Corvax/Shuttles/BlackMarket/hog.yml
- Snippet (Lines 2619–2627):
components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,1.5 parent: 1 - type: Door secondsUntilStateChange: -3920.4885 state: Closing - uid: 393Please verify this configuration’s impact on gameplay to ensure consistency with the game’s intended door behavior.
</details> <details> <summary>Resources/Prototypes/_NF/Catalog/Bounties/pirate_bounties.yml (29)</summary> `11-19`: **New Bounty Entry – PirateBountyPDA:** The new bounty entry for “PirateBountyPDA” is correctly added with a clear structure and expected fields. Ensure that any game logic referencing this bounty now uses the new identifier. --- `20-28`: **PirateBountyExtinguisher Update:** The entry for “PirateBountyExtinguisher” retains similar details with an annotation (“#CorvaxFrontier”). Please verify that the reward (amount of “3”) is consistent with the intended balance changes. --- `29-37`: **PirateBountyCaptainGloves Modification:** The id for “PirateBountyCaptainGloves” has been updated to “ClothingHandsMercenaryGlovesCombat”. Confirm that all related asset references and in‐game logic have been updated accordingly to accommodate this revised identifier. --- `48-55`: **PirateBountyDefib Entry Verification:** The “PirateBountyDefib” entry is defined without modifications and follows the standard format. No issues detected here. --- `57-66`: **PirateBountyAlcohol Entry:** The bounty “PirateBountyAlcohol” is correctly defined, including “spawnChest: false”. Ensure that this flag is consistent with overall game design for similar bounties. --- `67-76`: **PirateBountyThruster Entry:** The “PirateBountyThruster” bounty has clear entries and a reward of 4. Please verify that both the reward and the “spawnChest” flag (set to false) are aligned with recent gameplay balance updates. --- `97-105`: **Updated Reward for PirateBountyCappy:** The “PirateBountyCappy” entry now features an increased reward (15 instead of a lower previous value). Double-check that this modification fits within the intended game economy adjustments. --- `106-114`: **Updated Reward for PirateBountyCultistNecklace:** The reward value has been updated to 7. The structure is consistent; please confirm that this change is harmonized with the overall adjustment strategy for cultist-themed bounties. --- `115-123`: **PirateBountyNfsdCampaign Update:** The “PirateBountyNfsdCampaign” entry now has a reward of 6. Please verify that the campaign item’s availability and reward match the new balancing guidelines. --- `124-132`: **PirateBountyScafSuit Entry:** The “PirateBountyScafSuit” record is updated with a reward of 6 and a consistent entry format. No further issues found. --- `133-142`: **PirateBountyRTG Entry:** The “PirateBountyRTG” entry is defined with a reward of 6 and “spawnChest: false”. Please verify that these settings remain consistent with similar device reward configurations. --- `143-151`: **PirateBountyMercGas Entry:** The entry for “PirateBountyMercGas” looks standard with a reward of 3. Ensure that any balance changes are reflected across similar bounty types. --- `152-160`: **PirateBountyRDHardsuit Entry:** The “PirateBountyRDHardsuit” bounty remains defined with a reward of 3. No issues noted in the update. --- `170-178`: **New Entry – PirateBountyArtifactAnalyzer:** The new “PirateBountyArtifactAnalyzer” entry is added with a reward of 4. Confirm that artifact-related bounties are coherent with the new pirate gameplay updates. --- `189-198`: **PirateBountyDeepFryer Entry:** The bounty entry for “PirateBountyDeepFryer” is properly formatted with a reward of 5 and “spawnChest: false”. This entry appears correct. --- `218-226`: **PirateBountyHypo Entry:** The “PirateBountyHypo” entry shows a reward of 3, annotated with “#CorvaxFrontier”. Confirm that this adjustment is consistent with similar items throughout the bounty system. --- `227-235`: **PirateBountyOreBox Entry:** The definition of “PirateBountyOreBox” is clear, with a reward of 3 and “spawnChest: false”. No issues detected. --- `237-246`: **PirateBountyAutolathe Entry:** The “PirateBountyAutolathe” entry is defined with a reward of 5. Ensure that this new addition is integrated with the game’s existing systems for autolathe-related tasks. --- `247-255`: **PirateBountyDiamond Entry:** The reward for “PirateBountyDiamond” is set to 4 with an amount of 10 diamonds. Please verify that this scaling is intended given the economic context of the rewards. --- `256-264`: **PirateBountyGold Entry:** The entry for “PirateBountyGold” indicates a reward of 4 with 100 gold. Confirm that this high quantity is balanced with the rest of the bounty system and game economy. --- `265-274`: **PirateBountyPlasmaCanister Entry:** The entry is updated with a reward of 3 and “spawnChest: false,” along with a “#CorvaxFrontier” note. Ensure that similar annotations are documented in related configurations. --- `275-284`: **PirateBountyContraCrate Entry:** A reward of 8 is specified here, along with a bonus comment. Please verify that this boost in reward (and the bonus note) is consistent with overall balance decisions. --- `295-304`: **New Entry – PirateBountyEnforcer:** The “PirateBountyEnforcer” entry is clearly defined with a reward of 3 and “spawnChest: false.” This addition aligns well with the updated pirate systems. --- `305-314`: **New Entry – PirateBountyKitchenMicrowave:** This entry uses a localized name “Микроволновка” and is set with a reward of 5. Please double-check that localization (including encoding) and asset references are correct. --- `315-323`: **New Entry – PirateBountyDrinkSodaWaterCan:** The “PirateBountyDrinkSodaWaterCan” entry includes localized text (“Банка Содовой #Газированная вода”) and appears to be formatted consistently with a reward of 3. --- `324-333`: **New Entry – PirateBountySuitStorageBase:** The entry “PirateBountySuitStorageBase” is newly added with a reward of 5 and “spawnChest: false.” Verify that this entry meshes with new suit storage mechanics in the game. --- `334-342`: **New Entry – PirateBountyPlushieMoffRandom:** The new bounty entry for “PirateBountyPlushieMoffRandom” is added with a reward of 4. Ensure that the asset “Плюшевый Ниан” is properly linked in related systems. --- `343-351`: **New Entry – PirateBountyBedsheetSyndie:** The entry is defined with a reward of 3, and the localized name “Одеяло Синдиката” is used. Confirm that this localization is supported and that the new identifier is referenced across related assets. <details> <summary>🧰 Tools</summary> <details> <summary>🪛 YAMLlint (1.35.1)</summary> [error] 351-351: trailing spaces (trailing-spaces) </details> </details> --- `352-359`: **New Entry – PirateBountyGunSafe:** The “PirateBountyGunSafe” entry appears correctly defined with a reward of 4. Verify that the new identifier “GunSafe” corresponds to the correct asset and functionality in the game. <details> <summary>🧰 Tools</summary> <details> <summary>🪛 YAMLlint (1.35.1)</summary> [error] 359-359: no new line character at the end of file (new-line-at-end-of-file) </details> </details> </details> <details> <summary>Resources/Maps/Corvax/Shuttles/BlackMarket/schooner.yml (3)</summary> `428-431`: **Validate Updated Tile IDs** The tilemap entries for coordinates “0,0” and “-1,0” now have values 65358 and 61006, respectively. Please confirm that these new values meet the intended design specifications. --- `3010-3029`: **Confirm Canister Anchoring and Physics Settings** The “NitrogenCanister” and “OxygenCanister” prototypes now include an “anchored: True” attribute and a Physics component with a static body type. This should keep the canisters stationary. Verify that this update reflects the desired game behavior. --- `2309-2345`: **Verify Device Network Configuration for FirelockGlass** Within the section for “FirelockGlass” (lines 2309–2345), the DeviceNetwork component is set up with linked device lists. Please ensure that these networks are correctly configured and that the referenced device IDs are valid in the new branch. </details> </blockquote></details> </details> <!-- This is an auto-generated comment by CodeRabbit for review status -->
| missingComponents: | ||
| - Construction | ||
| - Anchorable |
There was a problem hiding this comment.
Similar issue with missing components in ComputerPirateBountyRedemption.
The ComputerPirateBountyRedemption entity is also missing the Construction and Anchorable components. This appears to be a pattern with computer entities in this file.
| parent: 1 | ||
| <<<<<<< HEAD | ||
| - proto: ShuttleGunPirateCannonNoUse | ||
| entities: | ||
| - uid: 1164 | ||
| components: | ||
| - type: Transform | ||
| rot: 1.5707963267948966 rad | ||
| pos: 8.5,7.5 | ||
| parent: 1 | ||
| ======= | ||
| missingComponents: | ||
| - Anchorable | ||
| >>>>>>> master |
There was a problem hiding this comment.
Fix unresolved merge conflict in the file.
There's an unresolved merge conflict in this section of the file. This needs to be resolved before the changes can be merged.
The conflict appears to be related to the ShuttleGunPirateCannonNoUse entity. You need to decide which version to keep:
- The HEAD version that adds this entity with a specific position
- The master version that continues with other component definitions
-<<<<<<< HEAD
-
-- proto: ShuttleGunPirateCannonNoUse
- entities:
- - uid: 1164
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 8.5,7.5
- parent: 1
-=======
+- proto: ShuttleGunPirateCannonNoUse
+ entities:
+ - uid: 1164
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 8.5,7.5
+ parent: 1
+
missingComponents:
- Anchorable
->>>>>>> master📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| parent: 1 | |
| <<<<<<< HEAD | |
| - proto: ShuttleGunPirateCannonNoUse | |
| entities: | |
| - uid: 1164 | |
| components: | |
| - type: Transform | |
| rot: 1.5707963267948966 rad | |
| pos: 8.5,7.5 | |
| parent: 1 | |
| ======= | |
| missingComponents: | |
| - Anchorable | |
| >>>>>>> master | |
| parent: 1 | |
| proto: ShuttleGunPirateCannonNoUse | |
| entities: | |
| - uid: 1164 | |
| components: | |
| - type: Transform | |
| rot: 1.5707963267948966 rad | |
| pos: 8.5,7.5 | |
| parent: 1 | |
| missingComponents: | |
| - Anchorable |
🧰 Tools
🪛 YAMLlint (1.35.1)
[error] 7529-7529: syntax error: could not find expected ':'
(syntax)
| - proto: AirAlarm | ||
| entities: | ||
| - uid: 298 | ||
| components: | ||
| - type: Transform | ||
| pos: 6.5,13.5 | ||
| parent: 2 | ||
| - type: DeviceList | ||
| devices: | ||
| - 44 | ||
| - 59 | ||
| - 299 | ||
| - 190 | ||
| - 191 | ||
| - 189 | ||
| - 63 |
There was a problem hiding this comment.
🛠️ Refactor suggestion
New Entity Prototype: AirAlarm
A new prototype named AirAlarm is introduced in this file. Please review the transform coordinates and the attached DeviceList (which includes device IDs such as 44, 59, 299, etc.) to ensure they correctly reference valid devices in the game.
| pos: 1.5,-0.5 | ||
| parent: 2 | ||
| <<<<<<< HEAD | ||
| - type: Door | ||
| secondsUntilStateChange: -708.32196 | ||
| state: Opening | ||
| - type: DeviceLinkSource | ||
| lastSignals: | ||
| DoorStatus: True | ||
| ======= | ||
| >>>>>>> master |
There was a problem hiding this comment.
🛠️ Refactor suggestion
Unresolved Merge Conflict in AirlockExternalGlassPirateLocked Section
Within the “AirlockExternalGlassPirateLocked” prototype there is an unresolved merge conflict block between lines roughly 255 and 263. For example, you have a conflict block that should include alternate definitions (e.g. for a Door component with a “secondsUntilStateChange” value and a “DeviceLinkSource” with “lastSignals”). This is causing a YAML syntax error (as indicated by YAMLlint at line 256).
Please resolve the merge conflict by selecting the intended changes and remove all conflict markers. A possible diff might be:
-<<<<<<< HEAD
- - type: Door
- secondsUntilStateChange: -708.32196
- state: Opening
- - type: DeviceLinkSource
- lastSignals:
- DoorStatus: True
-=======
->>>>>>> masterThen re–insert the correct and complete block.
Committable suggestion skipped: line range outside the PR's diff.
🧰 Tools
🪛 YAMLlint (1.35.1)
[error] 256-256: syntax error: could not find expected ':'
(syntax)
| - proto: AirlockHatch | ||
| entities: | ||
| - uid: 356 | ||
| components: | ||
| - type: Transform | ||
| pos: -1.5,1.5 | ||
| parent: 1 | ||
| - uid: 358 | ||
| components: | ||
| - type: Transform | ||
| pos: 2.5,-1.5 | ||
| parent: 1 | ||
| - uid: 401 | ||
| components: | ||
| - type: Transform | ||
| pos: -1.5,-1.5 | ||
| parent: 1 | ||
| - uid: 402 |
There was a problem hiding this comment.
🛠️ Refactor suggestion
Review Removal of AirlockHatch Prototype
The “AirlockHatch” prototype and its associated transform components have been removed. Please double-check that (a) no gameplay logic or dependencies rely on this prototype and (b) the removal was intentional given the changes to pirate vessel setups.
| - proto: WallWoodForced | ||
| entities: | ||
| - uid: 405 | ||
| components: | ||
| - type: Transform | ||
| pos: -3.5,9.5 | ||
| pos: -4.5,-1.5 | ||
| parent: 1 | ||
| - uid: 437 | ||
| - uid: 406 | ||
| components: | ||
| - type: Transform | ||
| pos: 0.5,-9.5 | ||
| pos: -4.5,-5.5 | ||
| parent: 1 | ||
| - uid: 438 | ||
| - uid: 407 | ||
| components: | ||
| - type: Transform | ||
| pos: -1.5,-9.5 | ||
| pos: -3.5,-5.5 | ||
| parent: 1 | ||
| - uid: 439 | ||
| - uid: 408 | ||
| components: | ||
| - type: Transform | ||
| pos: 2.5,-9.5 | ||
| pos: -3.5,-1.5 | ||
| parent: 1 | ||
| - uid: 440 | ||
| - uid: 409 | ||
| components: | ||
| - type: Transform | ||
| pos: -2.5,5.5 | ||
| pos: -4.5,1.5 | ||
| parent: 1 | ||
| - uid: 441 | ||
| - uid: 410 | ||
| components: | ||
| - type: Transform | ||
| pos: 3.5,5.5 | ||
| pos: -3.5,1.5 | ||
| parent: 1 | ||
| - uid: 442 | ||
| - uid: 411 | ||
| components: | ||
| - type: Transform | ||
| pos: 2.5,-5.5 | ||
| pos: -4.5,5.5 | ||
| parent: 1 | ||
| - uid: 443 | ||
| - uid: 412 | ||
| components: | ||
| - type: Transform | ||
| pos: 1.5,-5.5 | ||
| pos: -3.5,5.5 | ||
| parent: 1 | ||
| - uid: 444 | ||
| - uid: 413 | ||
| components: | ||
| - type: Transform | ||
| pos: 1.5,-4.5 | ||
| pos: 4.5,5.5 | ||
| parent: 1 | ||
| - uid: 445 | ||
| - uid: 414 | ||
| components: | ||
| - type: Transform | ||
| pos: -0.5,-4.5 | ||
| pos: 5.5,5.5 | ||
| parent: 1 | ||
| - uid: 446 | ||
| - uid: 415 | ||
| components: | ||
| - type: Transform | ||
| pos: -0.5,-5.5 | ||
| pos: 4.5,1.5 | ||
| parent: 1 | ||
| - uid: 447 | ||
| - uid: 416 | ||
| components: | ||
| - type: Transform | ||
| pos: -1.5,-5.5 | ||
| pos: 5.5,1.5 | ||
| parent: 1 | ||
| - uid: 448 | ||
| - uid: 417 | ||
| components: | ||
| - type: Transform | ||
| pos: 0.5,-1.5 | ||
| pos: 4.5,-1.5 | ||
| parent: 1 |
There was a problem hiding this comment.
🛠️ Refactor suggestion
Overall Review of Prototype Removals and Renames
There is an extensive removal of prototypes (for example, “ButtonFrameCautionSecurity”, “ClosetRadiationSuitFilled”, “NFSignDock”, “IngotGold1”, etc.) as well as some renaming/replacements. Ensure that all such removals have been coordinated with changes elsewhere in the codebase (scripts, UI, and gameplay logic) so that no dangling references remain. It would be useful to document these shifts in your changelog or migration notes.
| <<<<<<< HEAD | ||
| - proto: AirAlarm | ||
| ======= | ||
| - proto: AirlockGlassShuttleSyndicatePirateLocked | ||
| >>>>>>> master |
There was a problem hiding this comment.
💡 Verification agent
❓ Verification inconclusive
Resolve Unresolved Merge Conflict Markers
There are unresolved merge conflict markers in this region (lines 541–545). For example, the file shows a conflict between using “AirAlarm” versus “AirlockGlassShuttleSyndicatePirateLocked” as the prototype. Please resolve the conflict and remove the markers so that the YAML is syntactically valid.
Please resolve the merge conflict markers in the YAML file.
There are unresolved merge markers at lines 541–545 in Resources/Maps/Corvax/Shuttles/BlackMarket/schooner.yml. The snippet shows a conflict between using AirAlarm and AirlockGlassShuttleSyndicatePirateLocked as the prototype:
<<<<<<< HEAD
- proto: AirAlarm
=======
- proto: AirlockGlassShuttleSyndicatePirateLocked
>>>>>>> master
- Action Required:
- Remove the conflict markers (
<<<<<<< HEAD,=======,>>>>>>> master) to ensure the YAML remains syntactically valid. - Decide which prototype should be applied and adjust the file accordingly.
- Remove the conflict markers (
🧰 Tools
🪛 YAMLlint (1.35.1)
[error] 542-542: syntax error: could not find expected ':'
(syntax)
Общие изменения пиратов:
Изменения аплинка пиратов:
Изменения бухты:
Изменение меты шаттлов:
Сэндвич:
Моряк:
Месть Королевы Анны:
Полюс:
Предъява:
Союз Спасения:
Шхуна:
Боров:
Добавлены новые суда:
Цинга:
(автор: alexmactep)
Прочие изменения:
1.Книги КЗ и СРП теперь ведут на вики проекта Corvax Frontier.
2.Продвинутые Сканеры массы на шаттлах дсбф больше нельзя открутить или разобрать, с части шаттлов консоль вовсе удалена.
3.Обновлён шаттл Квазар. Последний получил лицензию и исправлен ряд конструкционных ошибок.
4.Удалена возможность получения любого ховербайка в игре не прибегая к щитспавну.
(за помощь в работе над ПРом спасибо многоуважаемому terrafrog)
Media
Summary by CodeRabbit
New Features
Content Updates