Skip to content

NAP Ship Fixes and Updates#69

Open
EmreD1242 wants to merge 4 commits intoss14-art:masterfrom
EmreD1242:NAP-UPDATE
Open

NAP Ship Fixes and Updates#69
EmreD1242 wants to merge 4 commits intoss14-art:masterfrom
EmreD1242:NAP-UPDATE

Conversation

@EmreD1242
Copy link
Contributor

@EmreD1242 EmreD1242 commented Mar 15, 2026

Mojave Mothership Updates

  • Updated all guns.
  • Updated equipment.
  • Modified inner parts.
  • Added a communication key for Americans.
  • Added a shipyard.
  • Added new docks for ULS.

20260315160340_1
20260315160334_1

New Ultra-Light Ships:

Phantom

20260315160557_1

Falcon

20260315162648_1

Summary by CodeRabbit

Новые возможности

  • Добавлены три новых типа кораблей: Mojave (медицинский челнок), Phantom и Falcon (лёгкие штурмовые челноки)
  • Доступны новые ваучеры для приобретения и активации добавленных кораблей на верфях
  • Обновлён список доступных судов в системе заказов материнского корабля

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Mar 15, 2026

📝 Walkthrough

Walkthrough

Добавлены три новых корабля-шаттла (Falcon, Phantom, Mojave) с полными конфигурационными файлами карт, сущностями ваучеров и интеграцией в систему верфи. Все изменения — это определение данных без изменения логики кода.

Changes

Cohort / File(s) Summary
Новые карты шаттлов NAP
Resources/Maps/_Crescent/Shuttles/NAP/falcon.yml, Resources/Maps/_Crescent/Shuttles/NAP/phantom.yml
Добавлены полные YAML-определения двух новых карт шаттлов с сетками, атмосферой, компонентами, реквизитом, системами движения и конфигурациями.
Ваучеры кораблей
Resources/Prototypes/_Crescent/Entities/Objects/Misc/shiplpcs.yml
Добавлены три новых прототипа ShipVoucher (Mojave, Phantom, Falcon) для получения кораблей через консоль верфи.
Конфигурация верфи и корабельные данные
Resources/Prototypes/_Crescent/Entities/Structures/mothership_consoles.yml, Resources/Prototypes/_Crescent/Maps/Ships/NAP/falcon.yml, Resources/Prototypes/_Crescent/Maps/Ships/NAP/phantom.yml
Обновлена консоль верфи (замена Mojave на Phantom и Falcon) и добавлены файлы конфигурации карт с метаданными, иконками, генератором имён и описаниями.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Possibly related PRs

Suggested labels

Changes: YML, Changes: Map

Poem

🐰 Три новых корабля летят сквозь звёзды,
Phantom быстрый, Falcon боевой,
Mojave медик несёт помощь грозной—
Верфь готова встретить их волной!
Ваучеры светят, карты живут,
Шаттлы в строй встают! 🚀

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Title check ❓ Inconclusive The title 'NAP Ship Fixes and Updates' is vague and generic, using non-descriptive terms that don't convey specific information about the changeset's main focus. Consider a more specific title that highlights the primary change, such as 'Add NAP Phantom and Falcon shuttles with Mojave updates' or 'Introduce new ultra-light shuttles and update mothership configuration'.
✅ Passed checks (2 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

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

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
📝 Coding Plan
  • Generate coding plan for human review comments

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

❤️ Share

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

Tip

CodeRabbit can generate a title for your PR based on the changes.

Add @coderabbitai placeholder anywhere in the title of your PR and CodeRabbit will replace it with a title based on the changes in the PR. You can change the placeholder by changing the reviews.auto_title_placeholder setting.

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

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@Resources/Maps/_Crescent/Shuttles/NAP/falcon.yml`:
- Around line 398-403: The Falcon map entry still contains copy-paste values
from Sabre; update the VesselIcon/iffIcon state from "fighter" to "ultralight"
to match the Falcon prototype and change the BecomesStation id from "Sabre" to
"Falcon" (or remove the BecomesStation block if Falcons should not become a
station) so it references the correct station/config for the Falcon instead of
pulling Sabre assets.

In `@Resources/Maps/_Crescent/Shuttles/NAP/phantom.yml`:
- Around line 266-267: В блоке с типом BecomesStation (в файле phantom.yml)
указан id: Nova, из‑за чего карта мапится на конфиг Nova; замените id: Nova на
id: Phantom, чтобы использовался правильный прототип Phantom (т.е. поменять
строку "id: Nova" на "id: Phantom" в той же секции BecomesStation).

In `@Resources/Prototypes/_Crescent/Entities/Objects/Misc/shiplpcs.yml`:
- Around line 2187-2200: Описание ресурса ShipVoucherMojave содержит
неправильный текст про "Imperial Xenovalk-class medical shuttle" — замените
строку description в записи ShipVoucherMojave так, чтобы она корректно описывала
ваучер для ship: Mojave (например: "An LPC fabprint disk loaded with a Mojave.
Has to be redeemed at a shipyard console."). Обновите только поле description в
сущности ShipVoucherMojave, оставив остальную структуру (components, sprite,
price, ship: Mojave) без изменений.

In `@Resources/Prototypes/_Crescent/Maps/Ships/NAP/falcon.yml`:
- Around line 4-7: В описании Falcon удалите тестовую фразу "Are you even
reading this man?" и исправьте строку LOADOUT в
Resources/Prototypes/_Crescent/Maps/Ships/NAP/falcon.yml: замените "LOADOUT: 1x
48mm missile" на корректное обозначение модуля, согласующееся с модулем Arbalest
— например "LOADOUT: 1x Arbalest 95mm missile" (обновите поле description в
файле Falcon чтобы текст был информативным и соответствовал модулю Arbalest).

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: d73acd36-32fa-47ad-9750-cd76d7470d5d

📥 Commits

Reviewing files that changed from the base of the PR and between 7037ae6 and 30742d4.

📒 Files selected for processing (7)
  • Resources/Maps/_Crescent/Shuttles/NAP/falcon.yml
  • Resources/Maps/_Crescent/Shuttles/NAP/mojave.yml
  • Resources/Maps/_Crescent/Shuttles/NAP/phantom.yml
  • Resources/Prototypes/_Crescent/Entities/Objects/Misc/shiplpcs.yml
  • Resources/Prototypes/_Crescent/Entities/Structures/mothership_consoles.yml
  • Resources/Prototypes/_Crescent/Maps/Ships/NAP/falcon.yml
  • Resources/Prototypes/_Crescent/Maps/Ships/NAP/phantom.yml

Comment on lines +398 to +403
- type: VesselIcon
iffIcon:
sprite: _Crescent/ShipIcons/ifficons.rsi
state: fighter
- type: BecomesStation
id: Sabre
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Falcon всё ещё ссылается на шаблон Sabre.

На этих строках остались копипаст-значения от другого корабля: state: fighter расходится с ultralight в Resources/Prototypes/_Crescent/Maps/Ships/NAP/falcon.yml (Lines 22-25), а BecomesStation id: Sabre подтянет станционный конфиг из Resources/Prototypes/_Crescent/Maps/Ships/NCWL/sabre.yml вместо Falcon.

🔧 Предлагаемая правка
-    - type: VesselIcon
-      iffIcon:
-        sprite: _Crescent/ShipIcons/ifficons.rsi
-        state: fighter
-    - type: BecomesStation
-      id: Sabre
+    - type: VesselIcon
+      iffIcon:
+        sprite: _Crescent/ShipIcons/ifficons.rsi
+        state: ultralight
+    - type: BecomesStation
+      id: Falcon
📝 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.

Suggested change
- type: VesselIcon
iffIcon:
sprite: _Crescent/ShipIcons/ifficons.rsi
state: fighter
- type: BecomesStation
id: Sabre
- type: VesselIcon
iffIcon:
sprite: _Crescent/ShipIcons/ifficons.rsi
state: ultralight
- type: BecomesStation
id: Falcon
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@Resources/Maps/_Crescent/Shuttles/NAP/falcon.yml` around lines 398 - 403, The
Falcon map entry still contains copy-paste values from Sabre; update the
VesselIcon/iffIcon state from "fighter" to "ultralight" to match the Falcon
prototype and change the BecomesStation id from "Sabre" to "Falcon" (or remove
the BecomesStation block if Falcons should not become a station) so it
references the correct station/config for the Falcon instead of pulling Sabre
assets.

Comment on lines +266 to +267
- type: BecomesStation
id: Nova
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Здесь должен быть Phantom, а не Nova.

Сейчас при BecomesStation карта превращается в станцию Nova, поэтому к NAP Phantom применится конфиг из Resources/Prototypes/_Crescent/Maps/Ships/NCWL/nova.yml, а его собственный Resources/Prototypes/_Crescent/Maps/Ships/NAP/phantom.yml останется неиспользованным.

🔧 Предлагаемая правка
-    - type: BecomesStation
-      id: Nova
+    - type: BecomesStation
+      id: Phantom
📝 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.

Suggested change
- type: BecomesStation
id: Nova
- type: BecomesStation
id: Phantom
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@Resources/Maps/_Crescent/Shuttles/NAP/phantom.yml` around lines 266 - 267, В
блоке с типом BecomesStation (в файле phantom.yml) указан id: Nova, из‑за чего
карта мапится на конфиг Nova; замените id: Nova на id: Phantom, чтобы
использовался правильный прототип Phantom (т.е. поменять строку "id: Nova" на
"id: Phantom" в той же секции BecomesStation).

Comment on lines +2187 to +2200
id: ShipVoucherMojave
name: Nap 'Mojave' pattern LPC fabprint disk
description: An LPC fabprint disk loaded with an Imperial Xenovalk-class medical shuttle. Has to be redeemed at a shipyard console.
components:
- type: Item
size: Small
- type: Sprite
sprite: _Crescent/Objects/Misc/lpcchip.rsi
layers:
- state: icon
- type: StaticPrice
price: 200000
- type: ShipVoucher
ship: Mojave
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor

Исправьте описание ShipVoucherMojave.

Сейчас ваучер для Mojave всё ещё описан как Imperial Xenovalk-class medical shuttle, хотя на Line 2200 он выдаёт ship: Mojave. Это явный копипаст и будет путать игроков в интерфейсе.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@Resources/Prototypes/_Crescent/Entities/Objects/Misc/shiplpcs.yml` around
lines 2187 - 2200, Описание ресурса ShipVoucherMojave содержит неправильный
текст про "Imperial Xenovalk-class medical shuttle" — замените строку
description в записи ShipVoucherMojave так, чтобы она корректно описывала ваучер
для ship: Mojave (например: "An LPC fabprint disk loaded with a Mojave. Has to
be redeemed at a shipyard console."). Обновите только поле description в
сущности ShipVoucherMojave, оставив остальную структуру (components, sprite,
price, ship: Mojave) без изменений.

Comment on lines +4 to +7
description: |
A sleek American ultra-light strike shuttle, built for fast hit-and-run operations. The Falcon is perfect for flanking attacks. Are you even reading this man?
LOADOUT: 1x 48mm missile
MINIMUM CREW: 1x Pilot
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor

Исправьте текст описания Falcon.

Фраза Are you even reading this man? выглядит как забытый тестовый текст. Плюс LOADOUT: 1x 48mm missile расходится с картой Resources/Maps/_Crescent/Shuttles/NAP/falcon.yml, где на Line 644 модуль подписан как Arbalest 95mm missile, так что описание сейчас вводит игрока в заблуждение.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@Resources/Prototypes/_Crescent/Maps/Ships/NAP/falcon.yml` around lines 4 - 7,
В описании Falcon удалите тестовую фразу "Are you even reading this man?" и
исправьте строку LOADOUT в
Resources/Prototypes/_Crescent/Maps/Ships/NAP/falcon.yml: замените "LOADOUT: 1x
48mm missile" на корректное обозначение модуля, согласующееся с модулем Arbalest
— например "LOADOUT: 1x Arbalest 95mm missile" (обновите поле description в
файле Falcon чтобы текст был информативным и соответствовал модулю Arbalest).

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.

1 participant