An Oversight in the new Spanish Tree

[DukofDeth]

I was looking at the new Spanish tree, and noticed this...

focus = {
id = SPA_retake_gibraltar
available = {
NOT = {
is_in_faction_with = ENG
has_war_with = ENG
controls_state = 118
}
}
bypass = {
}
prerequisite = { focus = SPA_demand_french_north_africa }
prerequisite = { focus = SPA_defenses_against_invasion }

icon = GFX_focus_attack_britain
x = 1
y = 1
relative_position_id = SPA_demand_french_north_africa
cost = 10

available_if_capitulated = yes

completion_reward = {
create_wargoal = {
type = take_state_focus
target = ENG
generator = { 118 }
expire = 0
}
}
}

There's nothing in it to redirect should someone else own/control Gibraltar. What if England had been defeated, and no longer owned that rock? I did so in a recent game, and was sitting there, wondering if I would get attacked by Spain as it went through its tree, only to peek at the code and realize that Spain was coded to direct itself at Britain and Britain only. The "Unite Iberia" focus at least does have such a restriction, even though there's nothing to state so in the tool-tip [I had to peek at the code].

Is there a way to get the AI to generate a wargoal vs. anyone who occupies an AI's core or claim? I seem to recall Germany getting a wargoal vs. anyone who controlled the Sudentland, once it had made a claim to it.

There is also no line granting a waring. "will_lead_to_war_with = (x)" is the bit of code that lets a player - or the AI - know that someone is generating a wargoal by way of focus. The lack of a warning can lead to a player getting blind-sided just because they haven't gotten around to playing as Spain, so aren't familiar with the changes. This one is missing from a few wargoal-generating focuses.