-
Notifications
You must be signed in to change notification settings - Fork 334
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
target prioritization proof of concept #4088
Draft
SethDGamre
wants to merge
2
commits into
beyond-all-reason:master
Choose a base branch
from
SethDGamre:target-prioritization-start
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
function gadget:GetInfo() | ||
return { | ||
name = "Target Prioritization", | ||
desc = "target prioritization", | ||
author = "SethDGamre", | ||
date = "2024.12.28", | ||
license = "GNU GPL, v2 or later", | ||
layer = 0, | ||
enabled = true | ||
} | ||
end | ||
|
||
if not gadgetHandler:IsSyncedCode() then | ||
return false -- no unsynced code | ||
end | ||
|
||
----Localize Functions---- | ||
local spGetUnitDefID = Spring.GetUnitDefID | ||
|
||
local function findMatch(string, pattern) | ||
if string.match(string,"%f[%a]"..pattern.."%f[%A]") then --ripped this off the internet somewhere. Checks whole string patterns parsed by spaces not part of greater whole. | ||
return true | ||
else | ||
return false | ||
end | ||
end | ||
|
||
----Unit Type Categorization Functions---- | ||
local function unitIsSpam(uDef) | ||
if (uDef.customParams.purpose and findMatch(uDef.customParams.purpose, "SPAM")) | ||
or (uDef.health < 400 | ||
and uDef.weapons and next(uDef.weapons) | ||
and uDef.metalcost < 55) | ||
then | ||
return true | ||
else | ||
return false | ||
end | ||
end | ||
|
||
|
||
----Weapon Type Categorization Functions---- | ||
local function weaponIsAlphastrike(wDef) | ||
if wDef.customParams.purpose and wDef.customParams.purpose == "ALPHASTRIKE" | ||
or wDef.reloadTime and wDef.reloadTime < 3 | ||
then | ||
return true | ||
else | ||
return false | ||
end | ||
end | ||
|
||
local function weaponIsAntispam(wDef) | ||
if wDef.customParams.purpose and wDef.customParams.purpose == "ALPHASTRIKE" | ||
then | ||
return true | ||
else | ||
return false | ||
end | ||
end | ||
|
||
----Constants---- | ||
local WEAPONTYPES = { | ||
HIGHALPHA = 1, | ||
ANTISPAM = 2, | ||
} | ||
local UNITTYPES = { | ||
SPAM = 1, | ||
FAST = 2, | ||
} | ||
|
||
|
||
----Weight Table Entries---- | ||
local weaponWeights = { | ||
[WEAPONTYPES.ANTISPAM] = { | ||
[UNITTYPES.FAST] = 1.1, | ||
[UNITTYPES.SPAM] = 1.5, | ||
}, | ||
|
||
[WEAPONTYPES.HIGHALPHA] = { | ||
[UNITTYPES.FAST] = 0.2, | ||
[UNITTYPES.SPAM] = 0.5, | ||
} | ||
} | ||
|
||
----Other Tables---- | ||
local unitDefTypes = {} | ||
local weaponDefTypes = {} | ||
|
||
|
||
----Populate def tables---- | ||
for uDefID, uDef in ipairs(UnitDefs) do | ||
if unitIsSpam(uDef) then | ||
unitDefTypes[uDefID] = UNITTYPES.SPAM | ||
end | ||
end | ||
|
||
for wDefID, wDef in ipairs(WeaponDefs) do | ||
local typeWeights = {} | ||
if weaponIsAlphastrike(wDef) then | ||
typeWeights = weaponWeights[WEAPONTYPES.HIGHALPHA] | ||
elseif weaponIsAntispam(wDef) then | ||
typeWeights = weaponWeights[WEAPONTYPES.ANTISPAM] | ||
end | ||
weaponDefTypes[wDefID] = typeWeights | ||
end | ||
|
||
function gadget:AllowWeaponTarget(unitID, targetID, attackerWeaponNum, attackerWeaponDefID, defPriority) | ||
if not targetID then return true, defPriority end | ||
|
||
local weaponTypeWeights = weaponDefTypes[attackerWeaponDefID] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. after this line you can check |
||
local targetDefID = spGetUnitDefID(targetID) | ||
local targetType = unitDefTypes[targetDefID] | ||
if targetType then | ||
local newDefPriority = weaponTypeWeights[targetType] or defPriority | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. missing tab here before |
||
return true, newDefPriority | ||
end | ||
|
||
return true, defPriority | ||
end | ||
|
||
--Sprung's return code: antispam[attackerWeaponDefID] and Spring.Utilities.GetUnitPower(targetID) or defPriority |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can assign directly to weaponDefTypes[wDefID] inside the if/elseif clauses so you won't have an empty table for unused wDefIDs.
that way also you can return early below when you see weaponDefTypes[attackerWeaponDefID] is nil.