Merge pull request #77 from SMTheGuild/durfless

Reworked new X-O-Meter model
SMTheGuild · Aug 30, 2023 · 355e2f7 · 355e2f7
2 parents 3701aec + cc85483
commit 355e2f7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/Objects/Mesh/MeshNew/obj_interactive_speedmeter.fbx b/Objects/Mesh/MeshNew/obj_interactive_speedmeter.fbx
diff --git a/Objects/Textures/TexturesNew/obj_interactive_speedmeter_asg.tga b/Objects/Textures/TexturesNew/obj_interactive_speedmeter_asg.tga
diff --git a/Objects/Textures/TexturesNew/obj_interactive_speedmeter_dif.tga b/Objects/Textures/TexturesNew/obj_interactive_speedmeter_dif.tga
diff --git a/Objects/Textures/TexturesNew/obj_interactive_speedmeter_nor.tga b/Objects/Textures/TexturesNew/obj_interactive_speedmeter_nor.tga
diff --git a/Scripts/interactable/Orientation/XOMeter.lua b/Scripts/interactable/Orientation/XOMeter.lua
@@ -400,22 +400,21 @@ function XOMeter.client_onFixedUpdate(self, dt)
 
 
 	elseif mode.savevalue == 7 then -- velocity
-	   	one = ((sInteractable.power / 4 + 152) / 310) % 1.0
+	   	one = ((sInteractable.power / 4 + 67) / 134) % 1.0
 	elseif mode.savevalue == 8 then --rpm
-		one = ((sInteractable.power + 152) / 310) % 1.0
+		one = ((sInteractable.power + 67) / 134) % 1.0
 	elseif mode.savevalue == 10 then --mass
-		one = ((sInteractable.power / 10 + 102) / 310) % 1.0
+		one = ((sInteractable.power / 10 + 7) / 134) % 1.0
 	elseif mode.savevalue == 11 then -- orient
+		local value = 0.5 - sInteractable.power / 360
 
-		local value = 0.5+sInteractable.power/360
-
 		if self.shape:getZAxis().z < 0 then
-			value = 0.5+sInteractable.power/360
+			value = 0.5 + sInteractable.power / 360
 		end
 
 		one = value % 1.0
 	else
-		one = ((sInteractable.power + 102) / 310) % 1.0 -- garbage
+		one = ((sInteractable.power + 17) / 134) % 1.0 -- garbage
 	end
 
 	self.interactable:setAnimProgress("arrow_anim", one)