From 6aa30f91e6ff5b7b8f29471c23bbfdadd1b01931 Mon Sep 17 00:00:00 2001 From: funkyfranky <> Date: Wed, 18 Jul 2018 17:41:21 +0200 Subject: [PATCH] Debug output --- Moose Development/Moose/Cargo/CargoGroup.lua | 3 --- .../Moose/Wrapper/Controllable.lua | 18 +++++++++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Moose Development/Moose/Cargo/CargoGroup.lua b/Moose Development/Moose/Cargo/CargoGroup.lua index 69787e721..3fa26e9ab 100644 --- a/Moose Development/Moose/Cargo/CargoGroup.lua +++ b/Moose Development/Moose/Cargo/CargoGroup.lua @@ -367,8 +367,6 @@ do -- CARGO_GROUP self:F( {From, Event, To, ToPointVec2, NearRadius } ) NearRadius = NearRadius or 25 - - env.info("FF onenterunboarding") local Timer = 1 @@ -383,7 +381,6 @@ do -- CARGO_GROUP --- @param Cargo.Cargo#CARGO Cargo function( Cargo, NearRadius ) if not Cargo:IsDestroyed() then - env.info("FF blubblub") local ToVec=nil if ToPointVec2==nil then ToVec=self.CargoCarrier:GetPointVec2():GetRandomPointVec2InRadius(2*NearRadius, NearRadius) diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index 8db384482..df8767019 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -2014,12 +2014,13 @@ do -- Route methods -- Calculate the direct distance between the initial and final points. local LengthDirect=FromCoordinate:Get2DDistance(ToCoordinate) - env.info(string.format("FF length on road = %.1f km", LengthOnRoad/1000)) - env.info(string.format("FF length directly = %.1f km", LengthDirect/1000)) - env.info(string.format("FF length fraction = %.1f km", LengthOnRoad/LengthDirect)) - env.info(string.format("FF length only road = %.1f km", LengthRoad/1000)) - env.info(string.format("FF length off road = %.1f km", LengthOffRoad/1000)) - env.info(string.format("FF percent on road = %.1f", LengthRoad/LengthOnRoad*100)) + -- Debug info. + self:T(string.format("Length on road = %.3f km", LengthOnRoad/1000)) + self:T(string.format("Length directly = %.3f km", LengthDirect/1000)) + self:T(string.format("Length fraction = %.3f km", LengthOnRoad/LengthDirect)) + self:T(string.format("Length only road = %.3f km", LengthRoad/1000)) + self:T(string.format("Length off road = %.3f km", LengthOffRoad/1000)) + self:T(string.format("Percent on road = %.1f", LengthRoad/LengthOnRoad*100)) -- Route, ground waypoints along road. local route={} @@ -2032,13 +2033,13 @@ do -- Route methods -- Check whether the road is very long compared to direct path. if LongRoad and Shortcut then - env.info(string.format("FF longroad and shortcut")) + -- Road is long ==> we take the short cut. table.insert(route, FromCoordinate:WaypointGround(Speed, OffRoadFormation)) table.insert(route, ToCoordinate:WaypointGround(Speed, OffRoadFormation)) else - env.info(string.format("FF longroad and shortcut else")) + -- Create waypoints. table.insert(route, FromCoordinate:WaypointGround(Speed, OffRoadFormation)) table.insert(route, PathOnRoad[2]:WaypointGround(Speed, "On Road")) @@ -2047,7 +2048,6 @@ do -- Route methods -- Add the final coordinate because the final might not be on the road. local dist=ToCoordinate:Get2DDistance(PathOnRoad[#PathOnRoad-1]) if dist>10 then - env.info(string.format("FF longroad and shortcut else dist>10")) table.insert(route, ToCoordinate:WaypointGround(Speed, OffRoadFormation)) end