-
Notifications
You must be signed in to change notification settings - Fork 95
Ремап Ориона #506
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ressuw
wants to merge
8
commits into
Lua-Frontier:master
Choose a base branch
from
ressuw:orion-remap
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Ремап Ориона #506
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
ceeba43
Ремап Ориона
ressuw 9e3aec2
правка
ressuw 339c71a
Руководство для Ориона
ressuw b6aa61c
правка
ressuw eb94332
попытка
ressuw 3d2adf8
Create orionp.png
ressuw 1cd336a
Merge branch 'master' into pr/506
HacksLua 297f2cd
самая последняя версия и некие фиксы
ressuw File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
11,187 changes: 5,472 additions & 5,715 deletions
11,187
Resources/Maps/_Lua/Shuttles/Expedition/orion-p.yml
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,39 @@ | ||
| # LuaWorld - This file is licensed under AGPLv3 | ||
| # Copyright (c) 2025 LuaWorld Contributors | ||
| # See AGPLv3.txt for details. | ||
| # Remap me pls | ||
| # - type: vessel | ||
| # parent: BaseVessel | ||
| # id: Orion-P | ||
| # name: MT Orion-P | ||
| # description: Научный шаттл с нестандартной компоновкой из малой серии шаттлов не горнодобывающей отрасли, характерной его компании. Наделен возможностью летать на экспедиции. Сделан под заказ. | ||
| # limit: 3 | ||
| # price: 237790 | ||
| # category: Large | ||
| # group: Expedition | ||
| # shuttlePath: /Maps/_Lua/Shuttles/Expedition/orion-p.yml | ||
| # whitelist: | ||
| # - Luna | ||
| # - Frontier | ||
| # class: | ||
| # - Expedition | ||
| # - Civilian | ||
| # engine: | ||
| # - Singularity | ||
| # addComponents: | ||
| # - type: IFF | ||
| # color: "#ffffff" | ||
| # - type: NanotrasenFtl | ||
| # Remap by you_my_kill (discord) | ||
|
|
||
| # - type: gameMap | ||
| # id: Orion-P | ||
| # mapName: 'MT Orion-P' | ||
| # mapPath: /Maps/_Lua/Shuttles/Expedition/orion-p.yml | ||
| # minPlayers: 0 | ||
| # stations: | ||
| # Orion-P: | ||
| # stationProto: StandardFrontierExpeditionVessel | ||
| # components: | ||
| # - type: StationNameSetup | ||
| # mapNameTemplate: 'MT Orion-P {1}' | ||
| # nameGenerator: | ||
| # !type:NanotrasenNameGenerator | ||
| # prefixCreator: '14' | ||
| - type: vessel | ||
| parent: BaseVessel | ||
| id: Orion-P | ||
| name: MT Orion-P | ||
| description: Научный шаттл с нестандартной компоновкой из малой серии шаттлов не горнодобывающей отрасли, характерной его компании. Наделен возможностью летать на экспедиции. Сделан под заказ. | ||
| limit: 3 | ||
| price: 145000 | ||
| category: Large | ||
| group: Expedition | ||
| whitelist: | ||
| - Luna | ||
| - Frontier | ||
| class: | ||
| - Expedition | ||
| - Civilian | ||
| engine: | ||
| - Singularity | ||
| shuttlePath: /Maps/_Lua/Shuttles/Expedition/orion-p.yml | ||
| guidebookPage: ShipyardOrionP | ||
|
|
||
| - type: gameMap | ||
| id: Orion-P | ||
| mapName: 'MT Orion-P' | ||
| mapPath: /Maps/_Lua/Shuttles/Expedition/orion-p.yml | ||
| minPlayers: 0 | ||
| stations: | ||
| Orion-P: | ||
| stationProto: StandardFrontierExpeditionVessel | ||
| components: | ||
| - type: StationNameSetup | ||
| mapNameTemplate: 'MT Orion-P {1}' | ||
| nameGenerator: | ||
| !type:NanotrasenNameGenerator | ||
| prefixCreator: '14' | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ressuw у тебя генератор сингулрность?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ДАМ- обозначается как сингулярность, разве нет?
Я переписывал прототип с саурона, у него написано сингулярность, ну и я решил так же оставить