WIP

Author: GoogleFrog

LuaRules/Configs/RogueK/reward_defs.lua

@@ -93,7 +93,6 @@ local categories = {
 	light_turret = {
 		humanName = "Turret",
 		options = ProcessUnitList({
-			"turretlaser",
 			"turretmissile",
 			"turretimpulse",
 			"turretgauss",
@@ -108,6 +107,8 @@ local categories = {
 			"staticmex",
 			"energywind",
 			"energysolar",
+			"turretlaser",
+			"staticrearm",
 			"staticradar",
 		}),
 	},

LuaRules/Utilities/unitDefReplacements.lua

@@ -9,6 +9,7 @@ local planetwarsStructure = {}
 local buildPlate = {}
 local buildPowerCache = {}
 local rangeCache = {}
+local baseDefCache = {}
 local dynComm = {}
 local variableCostUnit = {
 	[UnitDefNames["terraunit"].id] = true
@@ -130,6 +131,19 @@ function Spring.Utilities.GetUnitRange(unitID, unitDefID)
 	return Spring.GetUnitRulesParam(unitID, "comm_max_range") or GetCachedBaseRange(unitDefID), Spring.GetUnitRulesParam(unitID, "primary_weapon_range")
 end
 
+function Spring.Utilities.GetBaseDefID(unitDefID)
+	if not unitDefID then
+		return unitDefID
+	end
+	if baseDefCache then
+		return baseDefCache[unitDefID]
+	end
+	local ud = UnitDefs[unitDefID]
+	local bud = ud.customParams.baseDef and UnitDefNames[ud.customParams.baseDef]
+	baseDefCache[unitDefID] = bud and bud.id or unitDefID
+	return baseDefCache[unitDefID]
+end
+
 -------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------
 

LuaUI/Widgets/chili/Skins/Evolved/skin.lua

@@ -659,30 +659,7 @@ skin.main_window_tall = {
 }
 
 skin.main_window = {
-	TileImage = ":c:tech_mainwindow_opaque.png",
-	tiles = {176, 64, 176, 64}, --// tile widths: left, top, right, bottom
-	padding = {10, 6, 10, 6},
-	hitpadding = {4, 4, 4, 4},
-
-	captionColor = {1, 1, 1, 0.45},
-	backgroundColor = {0.1, 0.1, 0.1, 0.7},
-
-	boxes = {
-		resize = {-23, -19, -12, -8},
-		drag = {0, 0, "100%", 10},
-	},
-
-	NCHitTest = NCHitTestWithPadding,
-	NCMouseDown = WindowNCMouseDown,
-	NCMouseDownPostChildren = WindowNCMouseDownPostChildren,
-
-	DrawControl = DrawWindow,
-	DrawDragGrip = function() end,
-	DrawResizeGrip = DrawResizeGrip,
-}
-
-skin.main_window_opaque = {
-	TileImage = ":c:tech_mainwindow_opaque.png",
+	TileImage = ":c:tech_mainwindow.png",
 	tiles = {176, 64, 176, 64}, --// tile widths: left, top, right, bottom
 	padding = {10, 6, 10, 6},
 	hitpadding = {4, 4, 4, 4},

LuaUI/Widgets/chili_old/Skins/Evolved/skin.lua

@@ -681,29 +681,6 @@ skin.main_window = {
   DrawResizeGrip = DrawResizeGrip,
 }
 
-skin.main_window_opaque = {
-  TileImage = ":c:tech_mainwindow_opaque.png",
-  tiles = {176, 64, 176, 64}, --// tile widths: left, top, right, bottom
-  padding = {10, 6, 10, 6},
-  hitpadding = {4, 4, 4, 4},
-
-  captionColor = {1, 1, 1, 0.45},
-  backgroundColor = {0.1, 0.1, 0.1, 0.7},
-  
-  boxes = {
-    resize = {-23, -19, -12, -8},
-    drag = {0, 0, "100%", 10},
-  },
-
-  NCHitTest = NCHitTestWithPadding,
-  NCMouseDown = WindowNCMouseDown,
-  NCMouseDownPostChildren = WindowNCMouseDownPostChildren,
-
-  DrawControl = DrawWindow,
-  DrawDragGrip = function() end,
-  DrawResizeGrip = DrawResizeGrip,
-}
-
 skin.window_black = {
   TileImage = ":c:tech_black.png",
   tiles = {0, 0, 0, 0}, --// tile widths: left,top,right,bottom

LuaUI/Widgets/gui_chili_rogue_rewards.lua

@@ -49,6 +49,8 @@ local screen0
 local rewardButtons = {}
 local currentLoadout = {}
 
+local planetButtons = {}
+
 local blackBackground
 local loadoutDisplay 
 
@@ -93,6 +95,11 @@ end
 --------------------------------------------------------------------------------
 -- Utils
 
+local function ClickPlanet(planetID)
+	for i = 1, #planetButtons do
+		planetButtons[i].SetSelection(planetID == i)
+	end
+end
 
 local function ClickRewardCategoryButton(buttonID)
 	for i = 1, #rewardButtons do
@@ -127,16 +134,103 @@ end
 --------------------------------------------------------------------------------
 -- Galaxy Map
 
-local function SetupGalaxyMap(parent)
+local function StartBattle()
+	
+end
+
+local function GetPlanet(parent, planetID, planetDef)
+	local isSelected = false
+	local isDisabled = false
+	local oldFont = WG.GetSpecialFont(14, "internal_white", {outlineColor = {0, 0, 0, 1}, color = {1, 1, 1, 1}})
+	
+	local button = Chili.Button:New{
+		parent = parent,
+		caption = planetDef.humanName,
+		OnClick = {function () ClickPlanet(planetID) end},
+		x = 200 + planetDef.pos[1] * 100,
+		y = planetDef.pos[2] * 100,
+		width = 70,
+		height = 70,
+	}
 
 	local externalFuncs = {}
-	function externalFuncs.Show()
+	function externalFuncs.SetDisabled(newDisabled)
+		if newDisabled == isDisabled then
+			return
+		end
+		isDisabled = newDisabled
+		if isDisabled then
+			button.backgroundColor = BUTTON_DISABLE_COLOR
+			button.focusColor = BUTTON_DISABLE_FOCUS_COLOR
+			button.borderColor = BUTTON_DISABLE_FOCUS_COLOR
+			function button:HitTest(x,y) return false end
+			button.font = WG.GetSpecialFont(14, "integral_grey", {outlineColor = {0, 0, 0, 1}, color = {0.6, 0.6, 0.6, 1}})
+		else
+			button.backgroundColor = BUTTON_COLOR
+			button.focusColor = BUTTON_FOCUS_COLOR
+			button.borderColor = BUTTON_BORDER_COLOR
+			button.font = oldFont
+			function button:HitTest(x,y) return self end
+		end
+		button:Invalidate()
+	end
 
+	function externalFuncs.SetSelection(newIsSelected)
+		if isSelected == newIsSelected then
+			return
+		end
+		isSelected = newIsSelected
+		if isSelected then
+			button.backgroundColor = SELECT_BUTTON_COLOR
+			button.focusColor = SELECT_BUTTON_FOCUS_COLOR
+		else
+			button.backgroundColor = BUTTON_COLOR
+			button.focusColor = BUTTON_FOCUS_COLOR
+		end
+		button:Invalidate()
 	end
-	function externalFuncs.Hide()
 
+	return externalFuncs
+end
+
+local function SetupGalaxyMap(parent)
+	local galaxy = CustomKeyToUsefulTable(modOptions.rk_galaxy)
+	
+	local holder = Chili.Control:New{
+		parent = parent,
+		x = 0,
+		y = 0,
+		right = 0,
+		bottom = 0,
+		padding = {10, 10, 10, 10},
+	}
+	
+	local startButton = Chili.Button:New{
+		parent = holder,
+		caption = "Start Battle",
+		OnClick = {function () StartBattle() end},
+		x = 20,
+		y = 20,
+		width = 140,
+		height = 70,
+	}
+	
+	for i = 1, #galaxy.planets do
+		local planetDef = galaxy.planets[i]
+		planetButtons[i] = GetPlanet(holder, i, planetDef)
+		if planetDef.state then
+			planetButtons[i].SetDisabled(true)
+		end
 	end
 
+	local externalFuncs = {}
+	function externalFuncs.Show()
+		holder:SetVisibility(true)
+	end
+	function externalFuncs.Hide()
+		holder:SetVisibility(false)
+	end
+	externalFuncs.Hide()
 	return externalFuncs
 end
 
@@ -426,7 +520,6 @@ local function MakeRewardList(holder, name, leftBound, rightBound, itemList)
 	return externalFunctions
 end
 
-
 local function SetupLoadoutPanel(bottomPanel)
 	local teamID = Spring.GetMyTeamID()
 	if not currentLoadout then

ModOptions.lua

@@ -554,6 +554,14 @@ local options = {
     type    = "string",
     def     = "",
   },
+  {
+    key     = "extraunits",
+    name    = "Extra Units",
+    desc    = "A base64 encoded definition of extra units. Use customparams.base_def to use an existing unit as a base.",
+    section = 'experimental',
+    type    = "string",
+    def     = "",
+  },
   {
     key     = "option_notes",
     name    = "Notes",

gamedata/unitdefs_post.lua

@@ -112,6 +112,30 @@ do
 	end
 end
 
+-- New units
+
+
+do
+	local append = false
+	local modoptName = "extraunits"
+	while modOptions[modoptName] and modOptions[modoptName] ~= "" do
+		local units = Spring.Utilities.CustomKeyToUsefulTable(modOptions[modoptName])
+		if type(tweaks) == "table" then
+			Spring.Echo("Loading extraunits modoption", append or 0)
+			for name, ud in pairs(units) do
+				Spring.Echo("Loading extraunit " .. name)
+				local ud = lowerkeys(ud)
+				if ud.customparams.base_def then
+					Spring.Utilities.OverwriteTableInplace(ud, lowerkeys(UnitDefs[ud.customparams.base_def]), true)
+				end
+				UnitDefs[name] = ud
+			end
+		end
+		append = (append or 0) + 1
+		modoptName = "extraunits" .. append
+	end
+end
+
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
 --