Skip to content

Fix "proper" expressions not being parsed in default target priorities #7138

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.

Sign up for GitHub

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

Open
lL1l1 wants to merge 7 commits into
base: develop
Choose a base branch
from
+28 −27
Open

Fix "proper" expressions not being parsed in default target priorities #7138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4cbc4b8
Debug logging of Mercy's prio
lL1l1 Jun 12, 2026
56a1611
Fix "proper" expressions not being parsed in default prios
lL1l1 Jun 12, 2026
3be6f70
Revert debug logging
lL1l1 Jun 12, 2026
8816c27
Clean up overdefined torp bomber priorities
lL1l1 Jun 12, 2026
0dc3e47
Log all proper prios and their weapons
lL1l1 Jun 12, 2026
4f43313
Revert "Log all proper prios and their weapons"
lL1l1 Jun 12, 2026
e9f217a
Create fix.7138.md
lL1l1 Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/snippets/fix.7138.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- (#7138) Fix default target priorities that use parentheses to enable richer category parsing using normal category parsing instead.
2 changes: 1 addition & 1 deletion lua/sim/weapon.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions units/UAA0204/UAA0204_unit.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions units/UEA0204/UEA0204_unit.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions units/URA0204/URA0204_unit.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions units/XAA0306/XAA0306_unit.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
Expand Down
10 changes: 5 additions & 5 deletions units/XSA0204/XSA0204_unit.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading