diff --git a/changelog/snippets/fix.7138.md b/changelog/snippets/fix.7138.md new file mode 100644 index 00000000000..2bcef635343 --- /dev/null +++ b/changelog/snippets/fix.7138.md @@ -0,0 +1 @@ +- (#7138) Fix default target priorities that use parentheses to enable richer category parsing using normal category parsing instead. diff --git a/lua/sim/weapon.lua b/lua/sim/weapon.lua index 8f584618a07..13408dc9632 100644 --- a/lua/sim/weapon.lua +++ b/lua/sim/weapon.lua @@ -55,7 +55,7 @@ local function ParsePriorities() end for _, priority in priorities do if not finalPriorities[priority] then - if StringFind(priority, '%(', 1, true) then + if StringFind(priority, '(', 1, true) then finalPriorities[priority] = ParseEntityCategoryProperly(priority) else finalPriorities[priority] = ParseEntityCategory(priority) diff --git a/units/UAA0204/UAA0204_unit.bp b/units/UAA0204/UAA0204_unit.bp index a28f0cb8351..1f533f1593c 100644 --- a/units/UAA0204/UAA0204_unit.bp +++ b/units/UAA0204/UAA0204_unit.bp @@ -235,12 +235,12 @@ UnitBlueprint{ RateOfFire = 10/100, --10/integer interval in ticks TargetPriorities = { "CRUISER", - "(NAVAL * TECH2 * SHIELD)", - "(STRUCTURE * DEFENSE * ANTIAIR)", - "(TECH3 * NAVAL * CARRIER)", + "NAVAL TECH2 SHIELD", + "STRUCTURE DEFENSE ANTIAIR", + "TECH3 NAVAL CARRIER", "SUBMERSIBLE", - "NAVAL * TECH2", - "NAVAL * TECH3", + "NAVAL TECH2", + "NAVAL TECH3", "MOBILE", "(STRUCTURE * DEFENSE - ANTIMISSILE)", "ALLUNITS", diff --git a/units/UEA0204/UEA0204_unit.bp b/units/UEA0204/UEA0204_unit.bp index 702122dd086..b18280284dd 100644 --- a/units/UEA0204/UEA0204_unit.bp +++ b/units/UEA0204/UEA0204_unit.bp @@ -243,12 +243,12 @@ UnitBlueprint{ RateOfFire = 10/100, --10/integer interval in ticks TargetPriorities = { "CRUISER", - "(NAVAL * TECH2 * SHIELD)", - "(STRUCTURE * DEFENSE * ANTIAIR)", - "(TECH3 * NAVAL * CARRIER)", + "NAVAL TECH2 SHIELD", + "STRUCTURE DEFENSE ANTIAIR", + "TECH3 NAVAL CARRIER", "SUBMERSIBLE", - "NAVAL * TECH2", - "NAVAL * TECH3", + "NAVAL TECH2", + "NAVAL TECH3", "MOBILE", "(STRUCTURE * DEFENSE - ANTIMISSILE)", "ALLUNITS", diff --git a/units/URA0204/URA0204_unit.bp b/units/URA0204/URA0204_unit.bp index 9fda9ee3be5..8834d318e0b 100644 --- a/units/URA0204/URA0204_unit.bp +++ b/units/URA0204/URA0204_unit.bp @@ -242,12 +242,12 @@ UnitBlueprint{ RateOfFire = 10/100, --10/integer interval in ticks TargetPriorities = { "CRUISER", - "(NAVAL * TECH2 * SHIELD)", - "(STRUCTURE * DEFENSE * ANTIAIR)", - "(TECH3 * NAVAL * CARRIER)", + "NAVAL TECH2 SHIELD", + "STRUCTURE DEFENSE ANTIAIR", + "TECH3 NAVAL CARRIER", "SUBMERSIBLE", - "NAVAL * TECH2", - "NAVAL * TECH3", + "NAVAL TECH2", + "NAVAL TECH3", "MOBILE", "(STRUCTURE * DEFENSE - ANTIMISSILE)", "ALLUNITS", diff --git a/units/XAA0306/XAA0306_unit.bp b/units/XAA0306/XAA0306_unit.bp index f57cbf067fd..e8471e540c2 100644 --- a/units/XAA0306/XAA0306_unit.bp +++ b/units/XAA0306/XAA0306_unit.bp @@ -235,15 +235,15 @@ UnitBlueprint{ RateOfFire = 10/100, --10/integer interval in ticks TargetPriorities = { "CRUISER", - "(NAVAL * TECH2 * SHIELD)", - "(TECH3 * STRUCTURE * DEFENSE * ANTIAIR)", - "(TECH3 * NAVAL * CARRIER)", + "NAVAL TECH2 SHIELD", + "TECH3 STRUCTURE DEFENSE ANTIAIR", + "TECH3 NAVAL CARRIER", "(SUBMERSIBLE - TECH1)", - "(NAVAL * TECH2)", - "(NAVAL * TECH3)", + "NAVAL TECH2", + "NAVAL TECH3", "SUBMERSIBLE", "MOBILE", - "(STRUCTURE * DEFENSE * ANTIAIR)", + "STRUCTURE DEFENSE ANTIAIR", "(STRUCTURE * DEFENSE - ANTIMISSILE)", "ALLUNITS", }, diff --git a/units/XSA0204/XSA0204_unit.bp b/units/XSA0204/XSA0204_unit.bp index 754442a5860..a0dccf07474 100644 --- a/units/XSA0204/XSA0204_unit.bp +++ b/units/XSA0204/XSA0204_unit.bp @@ -234,12 +234,12 @@ UnitBlueprint{ RateOfFire = 10/100, --10/integer interval in ticks TargetPriorities = { "CRUISER", - "(NAVAL * TECH2 * SHIELD)", - "(STRUCTURE * DEFENSE * ANTIAIR)", - "(TECH3 * NAVAL * CARRIER)", + "NAVAL TECH2 SHIELD", + "STRUCTURE DEFENSE ANTIAIR", + "TECH3 NAVAL CARRIER", "SUBMERSIBLE", - "NAVAL * TECH2", - "NAVAL * TECH3", + "NAVAL TECH2", + "NAVAL TECH3", "MOBILE", "(STRUCTURE * DEFENSE - ANTIMISSILE)", "ALLUNITS",