diff --git a/src/drivers/simplix/simplix_trb1/trb1-boxer-trbrs/karwada.xml b/src/drivers/simplix/simplix_trb1/trb1-boxer-trbrs/karwada.xml index 5d45d03b..204e5ddf 100644 --- a/src/drivers/simplix/simplix_trb1/trb1-boxer-trbrs/karwada.xml +++ b/src/drivers/simplix/simplix_trb1/trb1-boxer-trbrs/karwada.xml @@ -126,7 +126,7 @@
- + @@ -137,7 +137,7 @@
- + diff --git a/src/drivers/simplix/simplix_trb1/trb1-sector-rb1/karwada.xml b/src/drivers/simplix/simplix_trb1/trb1-sector-rb1/karwada.xml index b969449e..e3f19b15 100644 --- a/src/drivers/simplix/simplix_trb1/trb1-sector-rb1/karwada.xml +++ b/src/drivers/simplix/simplix_trb1/trb1-sector-rb1/karwada.xml @@ -126,7 +126,7 @@
- + @@ -137,7 +137,7 @@
- + @@ -166,8 +166,8 @@ - - + +
diff --git a/src/drivers/simplix/simplix_trb1/trb1-zaxxon-rb/karwada.xml b/src/drivers/simplix/simplix_trb1/trb1-zaxxon-rb/karwada.xml index c9101f76..bf13fd66 100644 --- a/src/drivers/simplix/simplix_trb1/trb1-zaxxon-rb/karwada.xml +++ b/src/drivers/simplix/simplix_trb1/trb1-zaxxon-rb/karwada.xml @@ -63,7 +63,7 @@
- +
@@ -104,7 +104,7 @@
- + @@ -115,7 +115,7 @@
- + @@ -126,7 +126,7 @@
- + @@ -137,7 +137,7 @@
- + @@ -166,7 +166,7 @@ - + diff --git a/src/drivers/simplix/src/unitdriver.cpp b/src/drivers/simplix/src/unitdriver.cpp index 329ad05a..dea695da 100644 --- a/src/drivers/simplix/src/unitdriver.cpp +++ b/src/drivers/simplix/src/unitdriver.cpp @@ -2902,9 +2902,9 @@ void TDriver::EvaluateCollisionFlags( { oTreatTeamMateAsLapper = OppInfo.GotFlags(F_TEAMMATE | F_REAR) - && OppInfo.State.RelPos > -25 - && CarLaps == OppCar->_laps - && CarDamage > OppInfo.TeamMateDamage + 1000; + && OppInfo.State.RelPos > -50 + && ((CarLaps <= OppCar->_laps) + || (CarDamage > OppInfo.TeamMateDamage + 1000)); } else { @@ -2915,10 +2915,10 @@ void TDriver::EvaluateCollisionFlags( { if (oStayTogether > 50 && OppInfo.GotFlags(F_TEAMMATE | F_REAR) - && OppInfo.State.RelPos < -35 && OppInfo.State.RelPos > -oStayTogether && CarDamage + 1000 > OppInfo.TeamMateDamage) { + Coll.LappersBehind |= OppInfo.State.CarDistLat < 0 ? F_LEFT : F_RIGHT; IsLapper = true; } @@ -3407,7 +3407,7 @@ double TDriver::FilterLetPass(double Accel) if (oLetPass) { if (oTreatTeamMateAsLapper) - Accel = MIN(Accel, 0.7); + Accel = MIN(Accel, 0.3); else Accel = MIN(Accel, 0.5); }