Line 390: |
Line 390: |
| else | | else |
| return false | | return false |
| + | end |
| + | end |
| + | |
| + | local implicitTrigger = true |
| + | |
| + | local function trigger(implicit) |
| + | implicitTrigger = implicit |
| + | local ship_key = sequence[sequence_position] |
| + | ship_key = tonumber(ship_key) or ship_key |
| + | sequence_position = sequence_position + 1 |
| + | ship = Ship(ship_key) |
| + | if ship:id() then |
| + | shipCapabilities = ShipCapabilities{ ship = ship } |
| + | equipment = false |
| + | else |
| + | ship = Equipment(ship_key) |
| + | equipment = true |
| end | | end |
| end | | end |
Line 420: |
Line 437: |
| end | | end |
| elseif arg == "!@" then | | elseif arg == "!@" then |
− | local ship_key = sequence[sequence_position]
| + | trigger(false) |
− | ship_key = tonumber(ship_key) or ship_key
| |
− | sequence_position = sequence_position + 1
| |
− | ship = Ship(ship_key)
| |
− | if ship:id() then
| |
− | shipCapabilities = ShipCapabilities{ ship = ship }
| |
− | equipment = false
| |
− | else
| |
− | ship = Equipment(ship_key)
| |
− | equipment = true
| |
− | end
| |
| elseif prefix2 == "!!" then | | elseif prefix2 == "!!" then |
| local key = string.sub(arg, 3) | | local key = string.sub(arg, 3) |
Line 459: |
Line 466: |
| return "|-\n" | | return "|-\n" |
| elseif prefix == "?" then | | elseif prefix == "?" then |
| + | if implicitTrigger and sequence then |
| + | trigger(true) |
| + | end |
| local prefix2 = string.sub(arg, 1, 2) | | local prefix2 = string.sub(arg, 1, 2) |
| if prefix2 == "??" then | | if prefix2 == "??" then |
Line 574: |
Line 584: |
| "@all_names", | | "@all_names", |
| "~hp_mod_married ~ 1", | | "~hp_mod_married ~ 1", |
− | "!@", | + | -- "!@", |
| "?link", | | "?link", |
| }) | | }) |