aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobTheBob <32057864+BobTheBob9@users.noreply.github.com>2022-06-22 12:55:32 +0100
committerGitHub <noreply@github.com>2022-06-22 12:55:32 +0100
commit0300ff5b4fb1d36b130daf44bef635f5697bca94 (patch)
treebfa77b3bc4b07d26d014c76fcf1480e4250534cd
parentffdc9584be155f5aca5952524ceb6f5cc7d30c93 (diff)
downloadNorthstarMods-0300ff5b4fb1d36b130daf44bef635f5697bca94.tar.gz
NorthstarMods-0300ff5b4fb1d36b130daf44bef635f5697bca94.zip
somewhat better marvins on wargames and deck (#323)
-rw-r--r--Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_lf_deck.nut10
-rw-r--r--Northstar.CustomServers/mod/scripts/vscripts/mp/levels/mp_wargames.nut6
2 files changed, 9 insertions, 7 deletions
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 )
}
}