Moved the mining truck to be specific to the mine map

PythonAPI/examples/manual_control_with_traffic.py

@@ -599,8 +599,7 @@ class KeyboardControl(object):
                 else: # Remove the Reverse flag
                     current_lights &= ~carla.VehicleLightState.Reverse
                 if current_lights != self._lights: # Change the light state only if necessary
-                    self._lights = current_lights
-                    world.player.set_light_state(carla.VehicleLightState(self._lights))
+                    world.player.set_light_state(carla.VehicleLightState(current_lights))
                 # Apply control
                 if not self._ackermann_enabled:
                     world.player.apply_control(self._control)
@@ -615,6 +614,8 @@ class KeyboardControl(object):
                 self._parse_walker_keys(pygame.key.get_pressed(), clock.get_time(), world)
                 world.player.apply_control(self._control)
 
+        self._lights = current_lights
+
     def _parse_vehicle_keys(self, keys, milliseconds):
         if keys[K_UP] or keys[K_w]:
             if not self._ackermann_enabled:

Unreal/CarlaUnreal/Config/DefaultGame.ini

@@ -58,5 +58,6 @@ bSkipEditorContent=False
 +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Maps/Nav")
 +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Maps/TM")
 +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Config")
++DirectoriesToAlwaysStageAsUFS=(Path="Carla/Config/Mine_01")
 bNativizeBlueprintAssets=False
 bNativizeOnlySelectedBlueprints=False

Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/Factory/VehicleActorFactory.cpp

@@ -19,6 +19,12 @@
 TArray<FActorDefinition> AVehicleActorFactory::GetDefinitions()
 {
   LoadVehicleParametersArrayFromFile("VehicleParameters.json", VehiclesParams);
+  FString UniqueVehicleParameters = GetWorld()->GetMapName().Mid(GetWorld()->StreamingLevelsPrefix.Len()) + "/Vehicles.json";
+  LoadVehicleParametersArrayFromFile(UniqueVehicleParameters, MineVehiclesParams);
+  for (const FVehicleParameters& VehicleParams : MineVehiclesParams)
+  {
+    VehiclesParams.Add(VehicleParams);
+  }
   UActorBlueprintFunctionLibrary::MakeVehicleDefinitions(VehiclesParams, Definitions);
   return Definitions;
 }

Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Actor/Factory/VehicleActorFactory.h

@@ -52,4 +52,6 @@ protected:
   TArray<FActorDefinition> Definitions;
   UPROPERTY(EditAnywhere)
   TArray<FVehicleParameters> VehiclesParams;
+  UPROPERTY(EditAnywhere)
+  TArray<FVehicleParameters> MineVehiclesParams;
 };