Fix #43

Author: Nomagno

src/karts/kart.cpp

@@ -481,13 +481,13 @@ void Kart::reset()
 
         // Item Policy No Collision Karts karts are different because they have bodies but can't collide with projectiles or with other karts
         ItemPolicy *item_policy = RaceManager::get()->getItemPolicy();
-    	uint32_t rules = item_policy->m_policy_sections[0].m_rules;
+        uint32_t rules = item_policy->m_policy_sections[0].m_rules;
 
-    	if (rules & ItemPolicyRules::IPT_GHOST_KARTS) {
+        if (rules & ItemPolicyRules::IPT_GHOST_KARTS) {
             Physics::get()->addKart(this, true /*ghost*/);
-    	} else {
+        } else {
             Physics::get()->addKart(this, false /*ghost*/);
-    	}
+        }
     }
 
     m_min_nitro_ticks = 0;
@@ -1340,6 +1340,9 @@ void Kart::collectedItem(ItemState *item_state)
     const Item::ItemType type = item_state->getType();
     bool is_mini;
     auto& stk_config = STKConfig::get();
+    uint32_t rules;
+    int sec;
+    ItemPolicy *item_policy = NULL;
 
     switch (type)
     {
@@ -1361,7 +1364,18 @@ void Kart::collectedItem(ItemState *item_state)
             break;
         }
 
-        m_tyres->commandChange(item_state->m_compound, item_state->m_stop_time);
+        item_policy = RaceManager::get()->getItemPolicy();
+        sec = item_policy->getSectionForKart(this);
+        if (sec == -1)
+            sec = 0;
+
+        rules = item_policy->m_policy_sections[sec].m_rules;
+
+        if (rules & ItemPolicyRules::IPT_TYRE_CHANGE_TIME_OVERRIDE) {
+            m_tyres->commandChange(item_state->m_compound, item_policy->m_policy_sections[sec].m_tyre_change_time);
+        } else {
+            m_tyres->commandChange(item_state->m_compound, item_state->m_stop_time);
+        }
 
         break;
     case Item::ITEM_BUBBLEGUM:

src/race/item_policy.cpp

@@ -25,6 +25,7 @@
 #include "utils/string_utils.hpp"
 #include "race/item_policy.hpp"
 #include "modes/world.hpp"
+#include "modes/linear_world.hpp"
 #include "items/item.hpp"
 #include "items/powerup.hpp"
 #include "items/powerup_manager.hpp"
@@ -159,6 +160,7 @@ void ItemPolicy::applySectionRules(ItemPolicySection &section, Kart *kart, int n
 // Returns the section that was applied. Returns -1 if it tried to appply an unsupported section or if there are no sections
 int ItemPolicy::applyRules(Kart *kart, int current_lap, int current_time, int total_laps_of_race) {
     if (m_policy_sections.size() == 0) return -1;
+
     for (unsigned i = 0; i < m_policy_sections.size(); i++) {
         int next_section_start_laps = total_laps_of_race;
         int prev_lap_item_amount = kart->m_item_amount_last_lap;
@@ -192,6 +194,44 @@ int ItemPolicy::applyRules(Kart *kart, int current_lap, int current_time, int to
     }
     return -1;
 }
+
+int ItemPolicy::getSectionForKart(Kart *kart) {
+    if (!World::getWorld()->raceHasLaps())
+        return -1;
+
+    LinearWorld *lin_world = dynamic_cast<LinearWorld*>(World::getWorld());
+    int current_lap = lin_world->getFinishedLapsOfKart(kart->getWorldKartId());
+    int current_time = World::getWorld()->getTime();
+
+    if (m_policy_sections.size() == 0) return -1;
+    for (unsigned i = 0; i < m_policy_sections.size(); i++) {
+        if (i+1 == m_policy_sections.size()) {
+            return i;
+            break;
+        } else if (m_policy_sections[i].m_section_type == IP_TIME_BASED) {
+            Log::error("ItemPolicy", "Time-implemented item policy sections are not implemented yet");
+            return i;
+            break;
+        } else if (m_policy_sections[i].m_section_type == IP_LAPS_BASED) {
+            if (m_policy_sections[i+1].m_section_type == IP_TIME_BASED) {
+                Log::error("ItemPolicy", "Time-implemented item policy sections are not implemented yet");
+                return i;
+                break;
+            } else if (m_policy_sections[i+1].m_section_type == IP_LAPS_BASED) {
+                if (current_lap >= m_policy_sections[i].m_section_start &&
+                    current_lap < m_policy_sections[i+1].m_section_start)
+                {
+                    return i;
+                    break;
+                } else {
+                    continue;
+                }
+            }
+        }
+    }
+    return -1;
+
+}
 //--------------------------------------------------
 static std::string fetch(std::vector<std::string>& strings, unsigned idx) {
     if (idx >= strings.size())

src/race/item_policy.hpp

@@ -154,6 +154,7 @@ struct ItemPolicy {
                             int current_time, int prev_lap_item_amount);
 
     int applyRules(Kart *kart, int current_lap, int current_time, int total_laps_of_race);
+    int getSectionForKart(Kart *kart);
 
     bool isHitValid(float sender_distance, float sender_lap, int sender_position, float recv_distance, int recv_position, float recv_lap, float track_length);