Added a cursor for SetTarget.

ZeroK-RTS · Nov 20, 2017 · 6947a99 · 6947a99
1 parent d09a4cd
commit 6947a99
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 9 deletions.
diff --git a/Anims/cursortarget.txt b/Anims/cursortarget.txt
@@ -0,0 +1,9 @@
+hotspot center
+frame  anims/cursortarget_0.png  0.3
+frame  anims/cursortarget_1.png  0.13
+frame  anims/cursortarget_2.png  0.10
+frame  anims/cursortarget_3.png  0.07
+frame  anims/cursortarget_4.png  0.04
+frame  anims/cursortarget_3.png  0.07
+frame  anims/cursortarget_2.png  0.10
+frame  anims/cursortarget_1.png  0.13
diff --git a/Anims/cursortarget_0.png b/Anims/cursortarget_0.png
diff --git a/Anims/cursortarget_1.png b/Anims/cursortarget_1.png
diff --git a/Anims/cursortarget_2.png b/Anims/cursortarget_2.png
diff --git a/Anims/cursortarget_3.png b/Anims/cursortarget_3.png
diff --git a/Anims/cursortarget_4.png b/Anims/cursortarget_4.png
diff --git a/Anims/zk_static/cursortarget_0.png b/Anims/zk_static/cursortarget_0.png
diff --git a/LuaRules/Gadgets/unit_target_on_the_move.lua b/LuaRules/Gadgets/unit_target_on_the_move.lua
@@ -1,10 +1,5 @@
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
-if not gadgetHandler:IsSyncedCode() then
-	return
-end
---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
 
 function gadget:GetInfo()
   return {
@@ -17,7 +12,19 @@ function gadget:GetInfo()
 	enabled = true,
   }
 end
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+include("LuaRules/Configs/customcmds.h.lua")
 
+if not gadgetHandler:IsSyncedCode() then
+	function gadget:Initialize()
+		Spring.SetCustomCommandDrawData(CMD_UNIT_SET_TARGET, "SetTarget", {1.0, 0.75, 0.0, 0.7}, true)
+		Spring.SetCustomCommandDrawData(CMD_UNIT_SET_TARGET_CIRCLE, "SetTarget", {1.0, 0.75, 0.0, 0.7}, true)
+		Spring.AssignMouseCursor("SetTarget", "cursortarget", true, false)
+	end
+
+	return
+end
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
 local spInsertUnitCmdDesc   = Spring.InsertUnitCmdDesc
@@ -79,14 +86,12 @@ local allyTargetUnits = {
 	[UnitDefNames["jumpsumo"].id] = true,
 }
 
-include("LuaRules/Configs/customcmds.h.lua")
-
 local unitSetTargetCmdDesc = {
 	id      = CMD_UNIT_SET_TARGET,
 	type    = CMDTYPE.ICON_UNIT_OR_RECTANGLE,
 	name    = 'Set Target',
 	action  = 'settarget',
-	cursor  = 'Attack',
+	cursor  = 'SetTarget',
 	tooltip = 'Sets target for unit, not removed by move commands',
 	hidden = true,
 }
@@ -96,7 +101,7 @@ local unitSetTargetCircleCmdDesc = {
 	type    = CMDTYPE.ICON_UNIT_OR_AREA,
 	name    = 'Set Target Circle',
 	action  = 'settargetcircle',
-	cursor  = 'Attack',
+	cursor  = 'SetTarget',
 	tooltip = 'Sets target for unit, not removed by move commands, circle version',
 	hidden = false,
 }