Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #304 from mersen-tyn/maps_mersen
Browse files Browse the repository at this point in the history 
add shuttles, epsilon and minor fixes
  • Loading branch information
@Vonsant
Vonsant authored Jun 15, 2024
2 parents 7c31f66 + 7517407 commit d557283
Show file tree
Hide file tree
Showing 12 changed files with 16,936 additions and 161 deletions.
40 changes: 37 additions & 3 deletions Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ private void OnPlayerSpawningEvent(PlayerSpawnCompleteEvent ev)

private void OnStartup(RoundStartingEvent ev)
{
var Charlie = "/Maps/CorvaxFrontier/POI/charlie.yml";//Corvax-Frontier
var repeaterEpsilon = "/Maps/CorvaxFrontier/POI/epsilon.yml";//Corvax-Frontier
var charlie = "/Maps/CorvaxFrontier/POI/charlie.yml";//Corvax-Frontier
var depotMap = "/Maps/_NF/POI/cargodepot.yml";
var tinnia = "/Maps/_NF/POI/tinnia.yml";
var caseys = "/Maps/_NF/POI/caseyscasino.yml";
Expand All @@ -145,6 +146,7 @@ private void OnStartup(RoundStartingEvent ev)
var tinniaOffset = _random.NextVector2(1100f, 2800f);
var caseysOffset = _random.NextVector2(2250f, 4600f);
var tradeOffset = _random.NextVector2(1500f, 2500f);
var repeaterOffset = _random.NextVector2(2150f, 4850f);

if (_map.TryLoad(mapId, depotMap, out var depotUids, new MapLoadOptions
{
Expand Down Expand Up @@ -219,9 +221,9 @@ private void OnStartup(RoundStartingEvent ev)
_shuttle.AddIFFFlag(lpbravoUids[0], IFFFlags.HideLabel);
}
// Corvax-Frontier spawns sindipost Charlie
if (_map.TryLoad(mapId, Charlie, out var lpcharlieUids, new MapLoadOptions
if (_map.TryLoad(mapId, charlie, out var lpcharlieUids, new MapLoadOptions
{
Offset = _random.NextVector2(6150f, 10650f)
Offset = _random.NextVector2(8150f, 12650f)
}))
{
if (_prototypeManager.TryIndex<GameMapPrototype>("charlie", out var stationProto))
Expand All @@ -234,6 +236,38 @@ private void OnStartup(RoundStartingEvent ev)
_shuttle.SetIFFColor(lpcharlieUids[0], lpbravoColor);
_shuttle.AddIFFFlag(lpcharlieUids[0], IFFFlags.HideLabel);
}
// Corvax-Frontier spawns repeater Epsilon and Ipsilon (syndicate)
if (_map.TryLoad(mapId, repeaterEpsilon, out var rEpslieUids, new MapLoadOptions
{
Offset = repeaterOffset
}))
{
if (_prototypeManager.TryIndex<GameMapPrototype>("epsilon", out var stationProto))
{
_station.InitializeNewStation(stationProto.Stations["epsilon"], rEpslieUids);
}

var meta = EnsureComp<MetaDataComponent>(rEpslieUids[0]);
_meta.SetEntityName(rEpslieUids[0], "Ретранслятор Эпсилон", meta);
_shuttle.SetIFFColor(rEpslieUids[0], lpbravoColor);
_shuttle.AddIFFFlag(rEpslieUids[0], IFFFlags.HideLabel);
}
if (_map.TryLoad(mapId, repeaterEpsilon, out var rEpslieUids2, new MapLoadOptions
{
Offset = -repeaterOffset
}))
{
if (_prototypeManager.TryIndex<GameMapPrototype>("epsilon", out var stationProto))
{
_station.InitializeNewStation(stationProto.Stations["epsilon"], rEpslieUids2);
}

var meta = EnsureComp<MetaDataComponent>(rEpslieUids2[0]);
_meta.SetEntityName(rEpslieUids2[0], "Ретранслятор Ипсилон", meta);
_shuttle.SetIFFColor(rEpslieUids2[0], lpbravoColor);
_shuttle.AddIFFFlag(rEpslieUids2[0], IFFFlags.HideLabel);
}

// if (_map.TryLoad(mapId, northpole, out var northpoleUids, new MapLoadOptions
// {
// Offset = _random.NextVector2(2150f, 3900f)
Expand Down
137 changes: 98 additions & 39 deletions Resources/Maps/CorvaxFrontier/POI/charlie.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: InAir
bodyStatus: OnGround
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down Expand Up @@ -2102,7 +2102,7 @@ entities:
lastSignals:
DoorStatus: True
- type: Door
secondsUntilStateChange: -4298.4263
secondsUntilStateChange: -5007.457
state: Opening
- uid: 386
components:
Expand Down Expand Up @@ -3511,6 +3511,16 @@ entities:
- DoorStatus: Open
2676:
- DoorStatus: Open
- uid: 311
components:
- type: Transform
pos: 3.5,1.5
parent: 2
- uid: 312
components:
- type: Transform
pos: 2.5,1.5
parent: 2
- uid: 318
components:
- type: Transform
Expand Down Expand Up @@ -3538,15 +3548,12 @@ entities:
links:
- 2671
- 301
- 1417
- type: DeviceLinkSource
linkedPorts:
2671:
- DoorStatus: Open
2666:
- DoorStatus: Open
1417:
- DoorStatus: Open
301:
- DoorStatus: Open
- uid: 401
Expand Down Expand Up @@ -3629,6 +3636,11 @@ entities:
- type: DeviceLinkSink
links:
- 896
- uid: 442
components:
- type: Transform
pos: -0.5,-2.5
parent: 2
- uid: 633
components:
- type: Transform
Expand Down Expand Up @@ -3705,6 +3717,16 @@ entities:
linkedPorts:
2672:
- DoorStatus: Open
- uid: 859
components:
- type: Transform
pos: -0.5,-1.5
parent: 2
- uid: 860
components:
- type: Transform
pos: 6.5,-1.5
parent: 2
- uid: 1417
components:
- type: Transform
Expand All @@ -3713,33 +3735,43 @@ entities:
- type: DeviceLinkSink
invokeCounter: 3
links:
- 2666
- 381
- 301
- type: DeviceLinkSource
linkedPorts:
381:
- DoorStatus: Open
- uid: 2661
components:
- type: Transform
pos: 4.5,-14.5
parent: 2
- type: DeviceLinkSink
invokeCounter: 2
invokeCounter: 4
links:
- 401
- 318
- 2684
- 2685
- type: DeviceLinkSource
linkedPorts:
2684:
- DoorStatus: Open
2685:
- DoorStatus: Open
- uid: 2662
components:
- type: Transform
pos: 1.5,-14.5
parent: 2
- type: DeviceLinkSink
invokeCounter: 2
invokeCounter: 4
links:
- 401
- 318
- 2684
- 2685
- type: DeviceLinkSource
linkedPorts:
2684:
- DoorStatus: Open
2685:
- DoorStatus: Open
- uid: 2666
components:
- type: Transform
Expand All @@ -3752,8 +3784,6 @@ entities:
- 301
- type: DeviceLinkSource
linkedPorts:
1417:
- DoorStatus: Open
301:
- DoorStatus: Open
- uid: 2667
Expand Down Expand Up @@ -3917,11 +3947,38 @@ entities:
- type: Transform
pos: 2.5,-5.5
parent: 2
- type: DeviceLinkSink
invokeCounter: 2
links:
- 2662
- 2661
- type: DeviceLinkSource
linkedPorts:
2662:
- DoorStatus: Open
2661:
- DoorStatus: Open
- uid: 2685
components:
- type: Transform
pos: 3.5,-5.5
parent: 2
- type: DeviceLinkSink
invokeCounter: 2
links:
- 2662
- 2661
- type: DeviceLinkSource
linkedPorts:
2661:
- DoorStatus: Open
2662:
- DoorStatus: Open
- uid: 3126
components:
- type: Transform
pos: 6.5,-2.5
parent: 2
- proto: BlastDoorOpen
entities:
- uid: 2851
Expand Down Expand Up @@ -7631,6 +7688,11 @@ entities:
rot: 1.5707963267948966 rad
pos: -4.5,-26.5
parent: 2
- type: Godmode
oldDamage: {}
missingComponents:
- Construction
- Anchorable
- proto: ComputerMassMedia
entities:
- uid: 892
Expand Down Expand Up @@ -7701,6 +7763,11 @@ entities:
rot: 1.5707963267948966 rad
pos: 1.5,-26.5
parent: 2
- type: Godmode
oldDamage: {}
missingComponents:
- Anchorable
- Construction
- proto: ComputerTabletopCrewMonitoring
entities:
- uid: 758
Expand All @@ -7717,6 +7784,11 @@ entities:
rot: 3.141592653589793 rad
pos: 2.5,-27.5
parent: 2
- type: Godmode
oldDamage: {}
missingComponents:
- Anchorable
- Construction
- proto: ComputerWallmountBlackMarketBankATM
entities:
- uid: 2641
Expand Down Expand Up @@ -12742,16 +12814,6 @@ entities:
parent: 2
- proto: HighSecDoor
entities:
- uid: 311
components:
- type: Transform
pos: 2.5,-8.5
parent: 2
- uid: 312
components:
- type: Transform
pos: 3.5,-8.5
parent: 2
- uid: 316
components:
- type: Transform
Expand Down Expand Up @@ -12792,16 +12854,6 @@ entities:
- type: Transform
pos: 6.5,-2.5
parent: 2
- uid: 859
components:
- type: Transform
pos: 2.5,-5.5
parent: 2
- uid: 860
components:
- type: Transform
pos: 3.5,-5.5
parent: 2
- proto: KitchenMicrowave
entities:
- uid: 950
Expand Down Expand Up @@ -13848,7 +13900,7 @@ entities:
pos: 5.5,7.5
parent: 2
- type: DeadDrop
nextDrop: 2483.0462384
nextDrop: 3646.8826195
- proto: PosterContrabandEnlistGorlexDD
entities:
- uid: 2395
Expand All @@ -13858,7 +13910,7 @@ entities:
pos: -11.5,-13.5
parent: 2
- type: DeadDrop
nextDrop: 3810.0462384
nextDrop: 3646.8826195
- proto: PosterContrabandKosmicheskayaStantsiyaDD
entities:
- uid: 2316
Expand All @@ -13868,7 +13920,7 @@ entities:
pos: -16.5,5.5
parent: 2
- type: DeadDrop
nextDrop: 5699.0462384
nextDrop: 2942.8826195
- proto: PosterContrabandMoth
entities:
- uid: 2995
Expand Down Expand Up @@ -13898,7 +13950,7 @@ entities:
pos: -11.5,16.5
parent: 2
- type: DeadDrop
nextDrop: 5441.0462384
nextDrop: 2604.8826195
- proto: PoweredlightBlue
entities:
- uid: 1424
Expand Down Expand Up @@ -15360,6 +15412,12 @@ entities:
rot: 3.141592653589793 rad
pos: 3.5,-27.5
parent: 2
- type: Godmode
oldDamage: {}
missingComponents:
- Anchorable
- Construction
- CommunicationsConsole
- proto: SyndieFlag
entities:
- uid: 1223
Expand Down Expand Up @@ -20263,6 +20321,7 @@ entities:
- type: Transform
pos: 2.5,10.5
parent: 2
- type: NukeDisk
- uid: 2434
components:
- type: Transform
Expand Down
Loading

0 comments on commit d557283

Please sign in to comment.