Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

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

Добавление карт Корвакса #62

Merged
merged 32 commits into from
Aug 29, 2024
Merged

Добавление карт Корвакса #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9bba568
Закидываю карты просто корваксовские, без изменений.
aristophanivan Aug 23, 2024
60b4c5c
Merge branch 'Space-Stories:master' into CorvaxMapsAdding
aristophanivan Aug 25, 2024
42a4a93
Подгружаем...
aristophanivan Aug 25, 2024
158b382
Еще подгрузка.
aristophanivan Aug 25, 2024
1fdcc7f
Merge branch 'CorvaxMapsAdding' of https://github.com/aristophanivan/…
aristophanivan Aug 25, 2024
04afeaa
Еще добавляем
aristophanivan Aug 25, 2024
a45e868
добавляем еще
aristophanivan Aug 25, 2024
8adb30b
Merge branch 'Space-Stories:master' into CorvaxMapsAdding
aristophanivan Aug 26, 2024
9b05f82
Еще фикс
aristophanivan Aug 26, 2024
ab66be0
Merge branch 'CorvaxMapsAdding' of https://github.com/aristophanivan/…
aristophanivan Aug 26, 2024
b88eb0b
Добавление тайлов с корвакса
aristophanivan Aug 26, 2024
15c2937
Астра теперь грузится через loadmap.
aristophanivan Aug 26, 2024
da07bf7
Теперь аврит доступен в setmap
aristophanivan Aug 26, 2024
5e361d8
Теперь дельта работает в loadmap
aristophanivan Aug 26, 2024
ff83634
Фрейм теперь доступен в loadmap.
aristophanivan Aug 26, 2024
a7943df
Теперь Гельта доступна в loadmap(го выживач + гельта + цель на шаттл …
aristophanivan Aug 26, 2024
752c157
Ишимура теперь доступна в loadmap
aristophanivan Aug 26, 2024
1a7d42e
Маус теперь доступен для загрузки loadmap
aristophanivan Aug 26, 2024
c11ff28
Карта Outpost теперь доступна для выбора в loadmap
aristophanivan Aug 26, 2024
5cd836e
Paper теперь доступен в loadmap.
aristophanivan Aug 26, 2024
666a8e1
Карта Pearl теперь доступна в loadmap.
aristophanivan Aug 26, 2024
f2eeb13
Добавление корваксовской воды + возвращение ее на маус + карта Pilgri…
aristophanivan Aug 26, 2024
c6549aa
Добавление Silly в loadmap.
aristophanivan Aug 26, 2024
545dc20
СПЛИТ!
aristophanivan Aug 26, 2024
ec77769
Добавление terra в loadmap
aristophanivan Aug 26, 2024
ac81ea6
Перенос всех карт в папку Resources/Maps/Stories/ и теперь кст ЦентКо…
aristophanivan Aug 27, 2024
fef3057
Merge branch 'Space-Stories:master' into CorvaxMapsAdding
aristophanivan Aug 29, 2024
9a8dab0
ЦентКомм корвакса удалён.
aristophanivan Aug 29, 2024
7ab6b0f
Merge branch 'CorvaxMapsAdding' of https://github.com/aristophanivan/…
aristophanivan Aug 29, 2024
5367056
Merge branch 'Space-Stories:master' into CorvaxMapsAdding
aristophanivan Aug 29, 2024
a37be70
Вроде как... всё? Ну короче, осталось пофиксить то, что не пишется [K…
aristophanivan Aug 29, 2024
cddc5f7
Перенос шаттлов в папки сториса)
aristophanivan Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,936 changes: 0 additions & 3,936 deletions Resources/Maps/Shuttles/corvax_emergency.yml
View file
Open in desktop

This file was deleted.

2,681 changes: 2,681 additions & 0 deletions Resources/Maps/Stories/Shuttles/arrivals_corvaxsilly.yml
View file
Open in desktop

Large diffs are not rendered by default.

1,098 changes: 1,098 additions & 0 deletions Resources/Maps/Stories/Shuttles/cargo_corvaxsilly.yml
View file
Open in desktop

Large diffs are not rendered by default.

1,433 changes: 1,433 additions & 0 deletions Resources/Maps/Stories/Shuttles/cargo_gelta.yml
View file
Open in desktop

Large diffs are not rendered by default.

1,384 changes: 1,384 additions & 0 deletions Resources/Maps/Stories/Shuttles/cargo_maus.yml
View file
Open in desktop

Large diffs are not rendered by default.

802 changes: 802 additions & 0 deletions Resources/Maps/Stories/Shuttles/cargo_mayhen.yml
View file
Open in desktop

Large diffs are not rendered by default.

886 changes: 886 additions & 0 deletions Resources/Maps/Stories/Shuttles/cargo_payback.yml
View file
Open in desktop

Large diffs are not rendered by default.

4,118 changes: 4,118 additions & 0 deletions Resources/Maps/Stories/Shuttles/corvax_emergency.yml
View file
Open in desktop

Large diffs are not rendered by default.

2,673 changes: 2,673 additions & 0 deletions Resources/Maps/Stories/Shuttles/corvax_mining.yml
View file
Open in desktop

Large diffs are not rendered by default.

9,717 changes: 9,717 additions & 0 deletions Resources/Maps/Stories/Shuttles/emergency_corvaxavrit.yml
View file
Open in desktop

Large diffs are not rendered by default.

0 ...s/Maps/Shuttles/emergency_corvaxdelta.yml → ...tories/Shuttles/emergency_corvaxdelta.yml
View file
Open in desktop
File renamed without changes.
1,880 changes: 1,880 additions & 0 deletions Resources/Maps/Stories/Shuttles/emergency_corvaxpaper.yml
View file
Open in desktop

Large diffs are not rendered by default.

1,826 changes: 1,826 additions & 0 deletions Resources/Maps/Stories/Shuttles/emergency_corvaxsilly.yml
View file
Open in desktop

Large diffs are not rendered by default.

0 ...urces/Maps/Shuttles/emergency_courser.yml → ...ps/Stories/Shuttles/emergency_courser.yml
View file
Open in desktop
File renamed without changes.
48 changes: 29 additions & 19 deletions Resources/Maps/Shuttles/emergency_delta.yml → ...Maps/Stories/Shuttles/emergency_delta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ entities:
name: NT Evac Delta
- type: Transform
pos: -0.5625,0.671875
parent: invalid
parent: 761
- type: MapGrid
chunks:
0,0:
Expand Down Expand Up @@ -395,6 +395,18 @@ entities:
chunkSize: 4
- type: GasTileOverlay
- type: RadiationGridResistance
- uid: 761
components:
- type: MetaData
name: Map Entity
- type: Transform
- type: Map
mapPaused: True
- type: PhysicsMap
- type: GridTree
- type: MovedGrids
- type: Broadphase
- type: OccluderTree
- proto: AirCanister
entities:
- uid: 326
Expand Down Expand Up @@ -598,45 +610,43 @@ entities:
- type: Transform
pos: -4.5,-17.5
parent: 1
- proto: AtmosDeviceFanDirectional
- proto: AtmosDeviceFanTiny
entities:
- uid: 583
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 2.5,-8.5
rot: -1.5707963267948966 rad
pos: 2.5,-0.5
parent: 1
- uid: 696
- uid: 658
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 2.5,-10.5
rot: -1.5707963267948966 rad
pos: -5.5,-19.5
parent: 1
- uid: 761
- uid: 659
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 2.5,-2.5
rot: -1.5707963267948966 rad
pos: -5.5,-20.5
parent: 1
- uid: 763
- uid: 696
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 2.5,-0.5
rot: -1.5707963267948966 rad
pos: 2.5,-2.5
parent: 1
- proto: AtmosDeviceFanTiny
entities:
- uid: 658
- uid: 763
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -5.5,-19.5
pos: 2.5,-8.5
parent: 1
- uid: 659
- uid: 764
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -5.5,-20.5
pos: 2.5,-10.5
parent: 1
- proto: BorgCharger
entities:
Expand Down
5,284 changes: 5,284 additions & 0 deletions Resources/Maps/Stories/Shuttles/emergency_gelta.yml
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading