Scanner edits;

- Can now detect objects submerged in terrain

Author: fourZK

Data/Base.rte/Devices/Tools/Scanner/Scanner.ini

@@ -5,7 +5,7 @@
 AddDevice = HDFirearm
 	PresetName = Scanner
 	AddToGroup = Tools
-	Description = Handy pocket scanner for your exploration needs.  Use it to reveal unseen areas inside terrain.
+	Description = Handy pocket scanner for your exploration needs.  Use it to reveal unseen areas and objects inside terrain.
 	Mass = 4
 	HitsMOs = 0
 	GetsHitByMOs = 1
@@ -20,7 +20,7 @@ AddDevice = HDFirearm
 		CopyOf = Dent Metal Device
 	ExitWound = AEmitter
 		CopyOf = Dent Metal Device
-	GoldValue = 30
+	GoldValue = 20
 	AtomGroup = AtomGroup
 		AutoGenerate = 1
 		Material = Material
@@ -41,10 +41,10 @@ AddDevice = HDFirearm
 		Y = 4
 	DrawAfterParent = 0
 	StanceOffset = Vector
-		X = 8
-		Y = 4
+		X = 12
+		Y = 0
 	SharpStanceOffset = Vector
-		X = 11
+		X = 13
 		Y = -1
 	SupportOffset = Vector
 		X = 1

Data/Base.rte/Devices/Tools/Scanner/Scanner.lua

@@ -1,24 +1,44 @@
 function Create(self)
-	self.signalStrength = 1000;
-	self.maxScanRange = 400;
-	self.scanSpacing = 20;
-	self.dotCount = math.floor(self.maxScanRange/self.scanSpacing);
+	self.signalStrength = 10000;
+	self.signalDecrement = 10;
+	self.maxScanRange = 360;
 	self.scanSpreadAngle = math.rad(self.ParticleSpreadRange);
+	self.flashTimer = Timer();
+	self.activity = ActivityMan:GetActivity();
+end
+
+function Update(self)
+	local parent = self:GetRootParent();
+	if IsActor(parent) and ToActor(parent):IsPlayerControlled() then
+		if self.detectedItemPos then
+			local timerRatio = self.flashTimer.ElapsedSimTimeMS/self.flashDelay;
+			if timerRatio < 1 then
+				PrimitiveMan:DrawPrimitives(100 * timerRatio, {CirclePrimitive(self.activity:ScreenOfPlayer(ToActor(parent):GetController().Player), self.detectedItemPos, self.detectedItemRadius * timerRatio, 188)});
+			else
+				self.detectedItemPos = nil;
+			end
+		end
+	end
 end
 
 function OnFire(self)
 	local signalStrength = self.signalStrength;
 	local angleVariance = self.scanSpreadAngle * 0.5 - (math.random() * self.scanSpreadAngle);
-	for i = 1, self.dotCount do
-		local checkPos = self.MuzzlePos + Vector((self.scanSpacing * i) * self.FlipFactor, 0):RadRotate(self.RotAngle + angleVariance);
+	local unseenResolution = SceneMan:GetUnseenResolution(-1);
+	local scanSpacing = math.max(math.min(unseenResolution.X, unseenResolution.Y) * 0.5, 1);
+	local trace = Vector(self.FlipFactor, 0):RadRotate(self.RotAngle);
+	local checkPos = Vector(self.MuzzlePos.X, self.MuzzlePos.Y);
+	for i = 1, self.maxScanRange/scanSpacing do
+		trace = Vector(trace.X, trace.Y):SetMagnitude(i * scanSpacing);
+		checkPos = self.MuzzlePos + Vector(trace.X, trace.Y):RadRotate(angleVariance);
 		if SceneMan.SceneWrapsX then
 			if checkPos.X > SceneMan.SceneWidth then
 				checkPos = Vector(checkPos.X - SceneMan.SceneWidth, checkPos.Y);
 			elseif checkPos.X < 0 then
 				checkPos = Vector(checkPos.X + SceneMan.SceneWidth, checkPos.Y);
 			end
 		end
-		signalStrength = signalStrength - (40 + SceneMan:GetMaterialFromID(SceneMan:GetTerrMatter(checkPos.X, checkPos.Y)).StructuralIntegrity);
+		signalStrength = signalStrength - (self.signalDecrement + SceneMan:GetMaterialFromID(SceneMan:GetTerrMatter(checkPos.X, checkPos.Y)).StructuralIntegrity) * scanSpacing;
 		if signalStrength < 0 then
 			break;
 		end
@@ -27,4 +47,13 @@ function OnFire(self)
 			break;
 		end
 	end
+	if self.detectedItemPos == nil then
+		local mo = MovableMan:GetMOFromID(SceneMan:CastMORay(self.MuzzlePos, trace, self:GetRootParent().ID, Activity.NOTEAM, rte.airID, true, 1));
+		if mo and IsMOSRotating(mo) then
+			self.flashTimer:Reset();
+			self.detectedItemPos = mo:GetRootParent().Pos;
+			self.detectedItemRadius = 5 + mo:GetRootParent().Radius;
+			self.flashDelay = 100 + 100 * math.sqrt(self.detectedItemRadius);
+		end
+	end
 end