Make item avoidance points account better for the new 2.0 item collisions

Author: Nomagno

src/items/item.cpp

@@ -468,9 +468,12 @@ void Item::initItem(ItemType type, const Vec3 &xyz, const Vec3&normal,
         m_distance_from_center = distances.getX();
         const DriveNode* dn = DriveGraph::get()->getNode(m_graph_node);
         const Vec3& right = dn->getRightUnitVector();
-        // Give it 10% more space, since the kart will not always come
-        // parallel to the drive line.
-        Vec3 delta = right * sqrt(m_distance_2) * 1.3f;
+        // Give it 120% more space, because
+        // this piece of code was written back when
+        // the kart hitbox wasn't used in collision
+        // calculations.
+        // For almost all karts, 120% is a good enough value.
+        Vec3 delta = right * sqrt(m_distance_2) * 2.2f;
         m_avoidance_points[0] = new Vec3(getXYZ() + delta);
         m_avoidance_points[1] = new Vec3(getXYZ() - delta);
     }

src/karts/controller/skidding_ai.cpp

@@ -964,13 +964,16 @@ bool SkiddingAI::steerToAvoid(const std::vector<const ItemState *> &items_to_avo
     if( !hit_left && !hit_right)
         return false;
 
-    // If we hit the left item, aim at the right avoidance point
-    // of the left item. We might still hit the right item ... this might
-    // still be better than going too far off track
+    // TME EDIT: SOMEONE WROTE
+                    // If we hit the left item, aim at the right avoidance point
+                    // of the left item. We might still hit the right item ... this might
+                    // still be better than going too far off track
+    // THIS IS NONSENSE.
+    // WE ARE PICKING THE LEFT OF THE LEFTMOST, EVIDENTLY.
     if(hit_left)
     {
         *aim_point =
-            *(items_to_avoid[index[0]]->getAvoidancePoint(/*left*/false));
+            *(items_to_avoid[index[0]]->getAvoidancePoint(/*left*/true));
         return true;
     }