diff options
| author | RoyalBlue1 <malte.hoermeyer@web.de> | 2022-07-15 00:41:36 +0200 |
|---|---|---|
| committer | RoyalBlue1 <malte.hoermeyer@web.de> | 2022-07-15 00:41:36 +0200 |
| commit | 1d9b24faf5280db4b57eea42904f24ff4fdd16ba (patch) | |
| tree | 558c8c8aa6b3d044f5fd9e17284177f96ba354f3 /Northstar.CustomServers/mod/scripts/vscripts/mp/levels | |
| parent | 88d765b41f4ff94c59fa535d53e708274fa22d26 (diff) | |
| parent | 85eb27362bd295a9e1560982a3369a688e13ded0 (diff) | |
| download | NorthstarMods-1d9b24faf5280db4b57eea42904f24ff4fdd16ba.tar.gz NorthstarMods-1d9b24faf5280db4b57eea42904f24ff4fdd16ba.zip | |
Merge remote-tracking branch 'upsteam/main' into gamemode_fd
Diffstat (limited to 'Northstar.CustomServers/mod/scripts/vscripts/mp/levels')
3 files changed, 14 insertions, 7 deletions
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_colony02.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_colony02.nut index 83338c8e..02b11010 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_colony02.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_colony02.nut @@ -2,6 +2,11 @@ global function CodeCallback_MapInit void function CodeCallback_MapInit() { + AddCallback_EntitiesDidLoad( CreateEvacNodes ) +} + +void function CreateEvacNodes() +{ AddEvacNode( CreateScriptRef( < -475.129913, 1480.167847, 527.363953 >, < 8.841560, 219.338501, 0 > ) ) AddEvacNode( CreateScriptRef( < 1009.315186, 3999.888916, 589.914917 >, < 23.945116, -146.680725, 0 > ) ) AddEvacNode( CreateScriptRef( < 2282.868896, -1363.706543, 846.188660 >, < 23.945116, -146.680725, 0 > ) ) diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_lf_deck.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_lf_deck.nut index 592422ee..d5162f0b 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_lf_deck.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_lf_deck.nut @@ -14,9 +14,11 @@ void function CodeCallback_MapInit() void function DeckSpawnWorkerDrone( entity spawnpoint ) { - - entity drone = CreateWorkerDrone( TEAM_UNASSIGNED, spawnpoint.GetOrigin(), spawnpoint.GetAngles() ) + entity drone = CreateWorkerDrone( TEAM_UNASSIGNED, spawnpoint.GetOrigin() - < 0, 0, 150 >, spawnpoint.GetAngles() ) DispatchSpawn( drone ) + + // this seems weird for drones + thread AssaultMoveTarget( drone, spawnpoint ) } void function DeckSpawnMarvinForIdleNode( entity node ) @@ -24,7 +26,5 @@ void function DeckSpawnMarvinForIdleNode( entity node ) entity marvin = CreateMarvin( TEAM_UNASSIGNED, node.GetOrigin(), node.GetAngles() ) DispatchSpawn( marvin ) - // doing this because no ai rn - if ( GetAINScriptVersion() == -1 ) - thread PlayAnim( marvin, node.kv.leveled_animation ) + thread AssaultMoveTarget( marvin, node ) }
\ No newline at end of file diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut index c1290bb0..4a53c4fe 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut @@ -88,10 +88,12 @@ void function SpawnMarvinsForRound() entity marvin = CreateMarvin( TEAM_UNASSIGNED, spawner.GetOrigin(), spawner.GetAngles() ) marvin.kv.health = 1 marvin.kv.max_health = 1 - marvin.kv.spawnflags = 516 - marvin.kv.contents = (int(marvin.kv.contents) | CONTENTS_NOGRAPPLE) + //marvin.kv.spawnflags = 516 + marvin.kv.contents = ( int( marvin.kv.contents ) | CONTENTS_NOGRAPPLE ) DispatchSpawn( marvin ) HideName( marvin ) + + thread MarvinJobThink( marvin ) } } |