.float status_teamhealing; // 0 = can't team heal, 1 = can team heal, 2 = team healing right now
-.float hold_BUTTON_ATCK2; // marks the bot holding the fire button after having decided on his prey
+.float hold_BUTTON_ATCK; // marks the bot holding the fire button after having decided on his prey
float Swallow_condition_check_bot(entity prey)
{
{
// base the decision around HOW damaged the team mate is, centered around 100 health
if(skill * (100 / prey.health) >= random() * 10) // there are 10 bot skill steps
- self.hold_BUTTON_ATCK2 = TRUE; // swallow the team mate
+ self.hold_BUTTON_ATCK = TRUE; // swallow the team mate
self.decide_swallow = time + cvar("bot_ai_vore_decide_swallow") / self.bot_vorethinkpred; // this is needed to take a proper decision, otherwise the code would execute each frame and return TRUE quickly
}
}
else
- self.hold_BUTTON_ATCK2 = FALSE;
+ self.hold_BUTTON_ATCK = FALSE;
}
void Vore_AI()
if(skill / fear >= randomtry)
if not(teams_matter && prey.team == self.team)
{
- self.hold_BUTTON_ATCK2 = TRUE; // swallow
+ self.hold_BUTTON_ATCK = TRUE; // swallow
self.decide_pred = time + decide_pred_time; // time before the bot decides what to do with his prey
}
self.decide_swallow = time + cvar("bot_ai_vore_decide_swallow") / self.bot_vorethinkpred; // this is needed to take a proper decision, otherwise the code would execute each frame and return TRUE quickly
}
}
else
- self.hold_BUTTON_ATCK2 = FALSE;
+ self.hold_BUTTON_ATCK = FALSE;
// if the bot is holding the firing button, apply that to the actual fire key
- if(self.hold_BUTTON_ATCK2)
- self.BUTTON_ATCK2 = TRUE;
+ if(self.hold_BUTTON_ATCK)
+ self.BUTTON_ATCK = TRUE;
// deciding what to do with a victim:
\r
if(swallow_complain != "")\r
{\r
- if(time > self.complain_vore && self.BUTTON_ATCK2)\r
+ if(time > self.complain_vore && self.BUTTON_ATCK)\r
{\r
play2(self, "misc/forbidden.wav");\r
sprint(self, swallow_complain);\r
else\r
self.stat_canswallow = 1;\r
\r
- if(self.BUTTON_ATCK2)\r
+ if(self.BUTTON_ATCK)\r
Vore_SwallowStep(prey);\r
}\r
else if(prey != world)\r
grabbered_fuel = cvar("g_balance_grabber_primary_grabbered_fuel");\r
// forced reload\r
if(cvar("g_balance_grabber_reload_ammo") && self.clip_load < min(cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_secondary_ammo"))\r
- && self.clip_load >= 0 && !(self.clip_load >= (time - self.grabber_time_fueldecrease) * grabbered_fuel && self.BUTTON_ATCK)) // not while hooked and still have ammo to stay hooked\r
+ && self.clip_load >= 0 && !(self.clip_load >= (time - self.grabber_time_fueldecrease) * grabbered_fuel && self.BUTTON_ATCK2)) // not while hooked and still have ammo to stay hooked\r
{\r
if(self.ammo_fuel >= 1) // we only have one weapon in VT, so nothing else to switch to if we're out of ammo\r
weapon_action(self.weapon, WR_RELOAD);\r
}\r
else if(self.clip_load >= 0 && !self.stat_eaten) // we're not currently reloading or eaten\r
{\r
- if(!self.stat_crosshair_style && self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO1)) // primary attack\r
+ if(!self.stat_crosshair_style && self.BUTTON_ATCK2 && weapon_action(self.weapon, WR_CHECKAMMO1)) // primary attack\r
{\r
if(time < self.weapon_delay)\r
return FALSE;\r
weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready); \r
}\r
}\r
- else if (self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO2)) // secondary attack\r
+ else if (self.BUTTON_ATCK2 && weapon_action(self.weapon, WR_CHECKAMMO2)) // secondary attack\r
{\r
if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire")))\r
{\r
self.grabber_state |= GRABBER_PULLING;\r
self.grabber_state &~= GRABBER_RELEASING;\r
\r
- if (self.BUTTON_ATCK)\r
+ if (self.BUTTON_ATCK2)\r
{\r
// already fired\r
if(self.grabber)\r
\r
- There is no longer a player swallow limit. Players now have a stomach capacity (for predators) and a mass (for prey), both based on player scale. As long as your mass is not exceeded, you can keep swallowing players. This affects your weight and overall player capacity based on player size as well. eg: You might be able to eat only one large player, while you could eat three tiny players or two normal sized players. Stomach size will also reflect your capacity, not the player count, being bigger or smaller based on the prey inside and their sizes compared to yours. By default, a macro player can swallow up to 15 mircos, and a micro up to 1 macro.\r
\r
-- Firing button functionality has been reworked. Both grabber primary and alternate modes are now on the attack1 button, the bolt attack automatically replacing the hook if looking at a surface in its range (crosshair changes to indicate that). The secondary fire button is used to swallow prey instead. This will take some getting used to, but I find it better to keep the swallowing on its own button from grabber fire. You can still hook to a player while swallowing them like before, by holding both firing buttons down. Stomach kicking stays on the same button.\r
+- Firing button functionality has been reworked. Both grabber primary and alternate modes are now on the attack2 button, the bolt attack automatically replacing the hook if looking at a surface in its range (crosshair changes to indicate that). The primary fire button is used to swallow prey only, and to stomach kick. This will take some getting used to, but I find it better to keep the swallowing on its own button from grabber fire. You can still hook to a player while swallowing them like before, by holding both firing buttons down.\r
projects / voretournament / voretournament.git / commitdiff