Implement the gameplay side of Rally Order (missing: the server side, and proper storage at the end of each race)

Author: Nomagno

src/karts/kart.cpp

@@ -245,6 +245,8 @@ Kart::Kart (const std::string& ident, unsigned int world_kart_id,
     m_controller           = NULL;
     m_tyres                = new Tyres(this);
     m_is_disqualified = false;
+    m_rally_start = false;
+    m_rally_wait_mode = false;
     m_is_under_tme_ruleset = true;
     m_initial_color        = 0.0f;
     m_saved_controller     = NULL;
@@ -3364,6 +3366,57 @@ void Kart::updatePhysics(int ticks)
     // Cap speed if necessary
     const Material *m = getMaterial();
 
+    bool wait_mode = false;
+
+    RaceManager::RallyOrder *rally_order = RaceManager::get()->getRallyOrder();
+    RaceManager::RallyPlayer *current_player = NULL;
+    LinearWorld* lw = dynamic_cast<LinearWorld*>(World::getWorld());
+    std::string name = StringUtils::wideToUtf8(getController()->getName());
+    if (lw && rally_order) {
+        for (RaceManager::RallyPlayer &p : rally_order->players) {
+            if (p.username == name) {
+                current_player = &p;
+                break;
+            }
+        }
+    }
+
+    if (!current_player) {
+        //TODO: Build a fake player as per the strategy variables - need a support procedure for this
+    }
+
+    float time = World::getWorld()->getTime();
+    if (current_player) {
+        if (current_player->gap_to_leader
+            <=
+            (float)rally_order->warmup_cutoff)
+        {
+            if (time < current_player->gap_to_leader) {
+                setSlowdown(MaxSpeed::MS_DECREASE_STOP, getKartProperties()->getTyresPitSpeedFraction(), stk_config->time2Ticks(0.1f), -1);
+                m_rally_start = true;
+            } else {
+                setSlowdown(MaxSpeed::MS_DECREASE_STOP, getKartProperties()->getTyresPitSpeedFraction(), stk_config->time2Ticks(0.1f), 0);
+                m_rally_start = false;
+            }
+        } else {
+            if (time < current_player->gap_to_leader) {
+                m_rally_wait_mode = true;
+                m_rally_start = true;
+            } else {
+                m_rally_wait_mode = false;
+                m_rally_start = false;
+            }
+        }
+    }
+
+    //TODO: ACTUALLY MAKE THE RALLYORDER BE FILLED UP PROPERLY
+    // SO THIS HACK OF A TEST FOR WARMUP MODE ISN'T NEEDED
+    //if (time < 40.0) {
+    //    m_rally_wait_mode = true;
+    //} else {
+    //    m_rally_wait_mode = false;
+    //}
+
 
     ItemPolicy *item_policy = RaceManager::get()->getItemPolicy();
     item_policy->enforceVirtualPaceCarRulesForKart(this);
@@ -3379,7 +3432,9 @@ void Kart::updatePhysics(int ticks)
 
 	uint32_t rules = item_policy->m_policy_sections[leader_sec].m_rules;
 
-	if (rules & ItemPolicyRules::IPT_GHOST_KARTS) {
+    if (m_rally_start) {
+		getBody()->setTag(GHOST_NO_COLLECTIBLE_KART_TAG);    
+	} else if (rules & ItemPolicyRules::IPT_GHOST_KARTS) {
 		getBody()->setTag(NO_COLLISION_KART_TAG);
 	} else {
 		getBody()->setTag(KART_TAG);

src/karts/kart.hpp

@@ -443,6 +443,8 @@ class Kart : public Moveable
     bool m_is_disqualified;
     float m_initial_color;
 
+    bool m_rally_start;
+    bool m_rally_wait_mode;
 
     const core::stringw& getName() const { return m_name; }
 

src/race/race_manager.cpp

@@ -157,6 +157,7 @@ RaceManager::RaceManager()
     setNumPlayers(0);
     setSpareTireKartNum(0);
 
+    m_rally_mode = false;
     m_tme_rules.fuel_mode = 0;
     m_tme_rules.do_item_preview = 0;
     m_tme_rules.wildcards = 0;

src/race/race_manager.hpp

@@ -355,6 +355,9 @@ class RaceManager
 
 private:
 
+    bool m_rally_mode;
+    RallyOrder m_rally_order;
+
     /** The kart status data for each kart. */
     std::vector<KartStatus>          m_kart_status;
 
@@ -492,6 +495,10 @@ class RaceManager
 
     void setTyreModRules(int fuel_mode, const std::vector<int> &tyre_alloc, int wildcards, bool item_preview);
 
+    void setRallyMode(bool a) { m_rally_mode = a; }
+    bool getRallyMode() const { return m_rally_mode; }
+    RallyOrder *getRallyOrder() { return getRallyMode() ? &m_rally_order : NULL; }
+
     TyreModRules *getTyreModRules(void);
 
 

src/tracks/check_structure.cpp

@@ -116,6 +116,11 @@ void CheckStructure::update(float dt)
     {
         const Vec3 &xyz = world->getKart(i)->getFrontXYZ();
         if(world->getKart(i)->getKartAnimation()) continue;
+
+        // In rally warmup mode, checklines aren't counted
+        if (world->getKart(i) && world->getKart(i)->m_rally_wait_mode)
+            continue;
+
         // Only check active checklines.
         if(m_is_active[i] && isTriggered(m_previous_position[i], xyz, i))
         {
@@ -222,6 +227,10 @@ void CheckStructure::trigger(unsigned int kart_index)
     switch(m_check_type)
     {
     case CT_NEW_LAP :
+        // Don't start new laps if rally warmup mode is active
+        if (World::getWorld()->getKart(kart_index)->m_rally_wait_mode)
+            break;
+
         World::getWorld()->newLap(kart_index);
         if(UserConfigParams::m_check_debug)
         {