Future/iw4_bot_warfare
1
0
Fork 0
mirror of https://github.com/ineedbots/iw4_bot_warfare.git synced 2025-04-21 21:45:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

grenade cook

Browse Source
This commit is contained in:
Your Name 2020-09-17 10:49:12 -06:00
parent c137750225
commit f95391b906
4 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
userraw/maps/mp/bots/_bot_internal.gsc
View File

@ -140,6 +140,7 @@ resetBotVars()
self.bot.isfragging = false; self.bot.isfragging = false;
self.bot.isfraggingafter = false; self.bot.isfraggingafter = false;
self.bot.tryingtofrag = false; self.bot.tryingtofrag = false;
self.bot.tryingtofragpullback = false;
self.bot.semi_time = false; self.bot.semi_time = false;
self.bot.greedy_path = false; self.bot.greedy_path = false;
@ -895,7 +896,12 @@ fireHack()
shouldFire = false; shouldFire = false;
if (self.bot.tryingtofrag) if (self.bot.tryingtofrag)
shouldFire = true; {
if (self.bot.tryingtofragpullback)
shouldFire = true;
else
shouldFire = false;
}
if (level.gameEnded || !gameFlag( "prematch_done" )) if (level.gameEnded || !gameFlag( "prematch_done" ))
shouldFire = false; shouldFire = false;
@ -1805,7 +1811,10 @@ aim()
nade = self getValidGrenade(); nade = self getValidGrenade();
if(isDefined(nade) && rand <= self.pers["bots"]["behavior"]["nade"] && bulletTracePassed(myEye, myEye + (0, 0, 75), false, self) && bulletTracePassed(last_pos, last_pos + (0, 0, 100), false, target) && dist > level.bots_minGrenadeDistance && dist < level.bots_maxGrenadeDistance) if(isDefined(nade) && rand <= self.pers["bots"]["behavior"]["nade"] && bulletTracePassed(myEye, myEye + (0, 0, 75), false, self) && bulletTracePassed(last_pos, last_pos + (0, 0, 100), false, target) && dist > level.bots_minGrenadeDistance && dist < level.bots_maxGrenadeDistance)
{ {
self thread botThrowGrenade(nade); time = 0.5;
if (nade == "frag_grenade_mp")
time = 2;
self thread botThrowGrenade(nade, time);
self notify("kill_goal"); self notify("kill_goal");
} }
} }
@ -2346,9 +2355,12 @@ knife(ent, knifeDist)
self.bot.knifing = true; self.bot.knifing = true;
self.bot.knifingafter = true; self.bot.knifingafter = true;
isplay = isPlayer(ent); isplay = (isDefined(ent) && isPlayer(ent));
usedRiot = self.hasRiotShieldEquipped; usedRiot = self.hasRiotShieldEquipped;
distsq = DistanceSquared(self.origin, ent.origin); org = (0, 0, 99999999);
if (isDefined(ent))
org = ent.origin;
distsq = DistanceSquared(self.origin, org);
inLastStand = self inLastStand(); inLastStand = self inLastStand();
stance = self getStance(); stance = self getStance();
damage = 135; damage = 135;
@ -2498,7 +2510,7 @@ reload()
// the script should reload for us. // the script should reload for us.
} }
botThrowGrenade(grenName) botThrowGrenade(grenName, grenTime)
{ {
self endon("death"); self endon("death");
self endon("disconnect"); self endon("disconnect");
@ -2529,15 +2541,24 @@ botThrowGrenade(grenName)
self setSpawnWeapon(grenName); self setSpawnWeapon(grenName);
self.bot.tryingtofrag = true; self.bot.tryingtofrag = true;
self.bot.tryingtofragpullback = true;
ret = self waittill_any_timeout( 5, "grenade_pullback", "grenade_fire" ); ret = self waittill_any_timeout( 5, "grenade_pullback", "grenade_fire" );
if (ret == "grenade_pullback") if (ret == "grenade_pullback")
{ {
if (isDefined(grenTime))
{
self.bot.tryingtofragpullback = false;
wait grenTime;
self.bot.tryingtofragpullback = true;
}
ret = self waittill_any_timeout( 5, "grenade_fire", "weapon_change", "offhand_end" ); ret = self waittill_any_timeout( 5, "grenade_fire", "weapon_change", "offhand_end" );
} }
self.bot.tryingtofrag = false; self.bot.tryingtofrag = false;
self.bot.tryingtofragpullback = false;
self setSpawnWeapon(curWeap); self setSpawnWeapon(curWeap);
@ -2601,7 +2622,7 @@ jump()
if (self inLastStand() || self getStance() != "stand" || if (self inLastStand() || self getStance() != "stand" ||
level.gameEnded || !gameFlag( "prematch_done" ) || self IsUsingRemote() || level.gameEnded || !gameFlag( "prematch_done" ) || self IsUsingRemote() ||
self.bot.isfrozen || self.bot.climbing || self.bot.jumpingafter) self.bot.isfrozen || self.bot.stop_move || self.bot.climbing || self.bot.jumpingafter)
return; return;
self.bot.jumping = true; self.bot.jumping = true;

5
userraw/maps/mp/bots/_bot_script.gsc
View File

@ -1818,7 +1818,10 @@ bot_use_grenade_think()
self BotStopMoving(true); self BotStopMoving(true);
wait 1; wait 1;
self throwBotGrenade(nade); time = 0.5;
if (nade == "frag_grenade_mp")
time = 2;
self throwBotGrenade(nade, time);
self ClearScriptAimPos(); self ClearScriptAimPos();
self BotStopMoving(false); self BotStopMoving(false);

4
userraw/maps/mp/bots/_bot_utility.gsc
View File

@ -117,9 +117,9 @@ getValidGrenade()
return random(possibles); return random(possibles);
} }
throwBotGrenade(gname) throwBotGrenade(gname, gtime)
{ {
return self maps\mp\bots\_bot_internal::botThrowGrenade(gname); return self maps\mp\bots\_bot_internal::botThrowGrenade(gname, gtime);
} }
botIsClimbing() botIsClimbing()

3
userraw/todo.txt
View File

@ -3,9 +3,6 @@ bomb gamemodes,
unreleased gamemodes unreleased gamemodes
switch weapon with disable weapon switch weapon with disable weapon
_internal:
grenade cook time
_other: _other:
dvars, loadout, behaviour, menu dvars, loadout, behaviour, menu
code comments code comments