View difference between Paste ID: NRXZCGDQ and NiECPZQP

-function fn_returnBestInfantryUnit( i_city )
+--[[-----------------------------------------
 Name:		 GetCivSpecificUnit
-	local i_plyID		= i_city:GetOwner()
+Purpose: 	 Get the UnitType for a specific
-	local i_gdr		= GameInfo.Units.UNIT_MECH.ID
+civ from a UnitClassType.
-	local i_inf_mechanized	= GameInfo.Units.UNIT_MECHANIZED_INFANTRY.ID
+-------------------------------------------]]
-	local i_inf		= GameInfo.Units.UNIT_INFANTRY.ID
+function fnGetCivSpecificUnit(pPly, sUnitClass) -- Thanks whoward69
-	local i_inf_gw		= GameInfo.Units.UNIT_GREAT_WAR_INFANTRY.ID
+
-	local i_rifleman	= GameInfo.Units.UNIT_RIFLEMAN.ID
+	-- BEGIN DEFINES
-	local i_musketman	= GameInfo.Units.UNIT_MUSKETMAN.ID
+	local sUnitType = nil
-	local i_longswordsman	= GameInfo.Units.UNIT_LONGSWORDSMAN.ID
+	local sCivType = GameInfo.Civilizations[pPly:GetCivilizationType()].Type
-	local i_pikeman		= GameInfo.Units.UNIT_PIKEMAN.ID
+	-- END DEFINES
-	local i_swordsman	= GameInfo.Units.UNIT_SWORDSMAN.ID
+
-	local i_phalanx		= GameInfo.Units.UNIT_SPARTAN_PHALANX.ID  -- Can I get modded units like this?
+	-- Loop through civilization-specific UnitClass overrides, id est their unique units, and yield to be returned the proper UnitType.
-	local i_warrior		= GameInfo.Units.UNIT_WARRIOR.ID
+	for pOverride in GameInfo.Civilization_UnitClassOverrides{CivilizationType = sCivType, UnitClassType = sUnitClass} do
 		sUnitType = pOverride.UnitType
-	if i_city:CanTrain( i_gdr ) then  -- Is there a better way than this giant if, then, elseif, else statement?
+		break
-		return i_gdr
+
-	elseif i_city:CanTrain( i_inf_mechanized ) then
+
-		return i_inf_mechanized
+	-- If we didn't get anything, yield to be returned the default UnitType for the UnitClass.
-	elseif i_city:CanTrain( i_inf ) then
+	if (sUnitType == nil) then
-		return i_inf
+		sUnitType = GameInfo.UnitClasses[sUnitClass].DefaultUnit
-	elseif i_city:CanTrain( i_inf_gw ) then
+
-		return i_inf_gw
+
-	elseif i_city:CanTrain( i_rifleman ) then
+	-- Give whatever function called this the UnitType we yielded.
-		return i_rifleman
+	return sUnitType
-	elseif i_city:CanTrain( i_musketman ) then
+
-		return i_musketman
+
-	elseif i_city:CanTrain( i_longswordsman ) then
+--[[-----------------------------------------
-		return i_longswordsman
+Name:  		ReturnBestInfantryUnit
-	elseif i_city:CanTrain( i_pikeman ) then
+Purpose:	Return the best land melee unit
-		return i_pikeman
+that a city can build.
-	elseif i_city:CanTrain( i_swordsman ) then
+-------------------------------------------]]
-		return i_swordsman
+function fnReturnBestInfantryUnit( pCity )
-	elseif i_city:CanTrain( i_phalanx ) then
+
-		return i_phalanx
+	--BEGIN DEFINES
-	else
+	local pPly = pCity:GetOwner()
-		return i_warrior
+
 	local possibleUnitClasses = {
 	GameInfoTypes.UNITCLASS_MECH,
 	GameInfoTypes.UNITCLASS_MECHANIZED_INFANTRY,
-GameEvents.SetPopulation.Add( function( x_offset, y_offset, f_oldPop, f_newPop )
+	GameInfoTypes.UNITCLASS_INFANTRY,
 	GameInfotypes.UNITCLASS_GREAT_WAR_INFANTRY,
-	local i_plot			= Map.GetPlot( x_offset, y_offset )
+	GameInfoTypes.UNITCLASS_RIFLEMAN,
-	local i_city  			= i_plot:GetPlotCity()
+	GameInfoTypes.UNITCLASS_MUSKETMAN,
-	local i_plyID 			= i_city:GetOwner()
+	GameInfoTypes.UNITCLASS_LONGSWORDSMAN,
-	local i_unit_mostCurrent	= nil
+	GameInfoTypes.UNITCLASS_PIKEMAN,
-	local n_trait			= GameInfo.Traits[i_plyID].UnitPerCapitalGrowths
+	GameInfoTypes.UNITCLASS_SWORDSMAN,
-	local i_unitAIType		= GameInfo.UnitAITypes.UNITAI_DEFENSE.ID
+	GameInfoTypes.UNITCLASS_SPEARMAN,
-	local n_zenith			= math.floor( i_city:GetHighestPopulation() )
+	GameInfoTypes.UNITCLASS_WARRIOR
 	} -- Thanks whoward69
-	if ( n_trait > 0 &&  -- Gotta be a better way then this if/then bollocks
+	--END DEFINES
-	( math.floor( f_newPop ) % n_trait ) == 0 ) && then
+
-		if i_city:IsCapital() then
+	-- Loop through each UnitClassType in the above defined table, see if the city can
-			if ( f_newPop > f_oldPop ) &&
+	-- train it's owner's specific UnitType.  Yield to be returned the best land melee
-			iNewPop >= n_zenith then
+	-- UnitType the city can build.
-				i_freeUnit = fn_returnBestInfantryUnit( i_city )
+	for _, iUnitClass in ipairs(possibleUnitClasses) do -- Thanks whoward69
 		if pCity:CanTrain( fn_GetCivSpecificUnit( pPly, iUnitClass ) ) then
-				i_plyID:AddFreeUnit( i_freeUnit, i_unitAIType ) -- What are the implications of this line?
+			return fn_GetCivSpecificUnit( pPly, iUnitClass )
 		end
 	end
 
 	-- Uh-oh!
 	return -1
 end
 
 GameEvents.SetPopulation.Add( function( xOffset, yOffset, fOldPop, fNewPop )
 
 	-- BEGIN DEFINES
 	local pPlot				= Map.GetPlot( xOffset, yOffset )
 	local pCity  			= pPlot:GetPlotCity()
 	local pPly 				= pCity:GetOwner()
 	local iUnitMostCurrent	= nil
 	local nTrait			= GameInfo.Traits[pPly].UnitPerCapitalGrowths
 	local sUnitAIType		= GameInfo.UnitAITypes.UNITAI_DEFENSE.ID
 	local nZenith			= math.floor( pCity:GetHighestPopulation() )
 	-- END DEFINES
 
 	-- On every growth of every city, run through the following list of conditions:
 	-- 1:  Does the city's owner have the trait, and is its population evenly divisible by the trait?
 	-- 2:  Is the city a capital?
 	-- 3:  Has the city grown instead of shrinking, and is this the city's highest population?
 	-- If all of the above are true, get the best land infantry unit we can, and spawn it at the city.
 	if ( nTrait > 0 &&
 	( math.floor( fNewPop ) % nTrait ) == 0 ) && then
 		if pCity:IsCapital() then
 			if ( fNewPop > fOldPop ) &&
 			fNewPop >= nZenith then
 				iFreeUnit = fnReturnBestInfantryUnit( pCity )
 
 				pPly:AddFreeUnit( iFreeUnit, iUnitAIType ) -- What are the implications of this line?
 			end
 		end
 	end
 end )