From 0300ff5b4fb1d36b130daf44bef635f5697bca94 Mon Sep 17 00:00:00 2001 From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com> Date: Wed, 22 Jun 2022 12:55:32 +0100 Subject: somewhat better marvins on wargames and deck (#323) --- .../mod/scripts/vscripts/mp/levels/mp_lf_deck.nut | 10 +++++----- .../mod/scripts/vscripts/mp/levels/mp_wargames.nut | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'Northstar.CustomServers/mod/scripts') 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 5af01346..341493ba 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut @@ -83,10 +83,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 ) } } -- cgit v1.2.3