diff --git a/Dreadnought/Dreadnought.xml b/Dreadnought/Dreadnought.xml index 7f9dd98..c74efd1 100644 --- a/Dreadnought/Dreadnought.xml +++ b/Dreadnought/Dreadnought.xml @@ -31,15 +31,14 @@ #000000 #000000 - ^\[\d+\-hull, \d+\-power, \w+ damage, \d+\-will \*(\w+)\*\]$ + ^\[\d+\-hull, \d+\-power, \w+ damage, \d+\-will \*(\w+)?\*\]$ 1 Aetherbalance - + 0 0 0 @@ -59,7 +58,7 @@ raiseEvent("dreadnought.onAetherBalance") - Entering/Exiting + Locking/Unlocking 0 0 @@ -270,6 +269,160 @@ send("config aethermap off") + Activate/Deactivate calls + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + + + Turret On + + 0 + 99 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^\(Ship\): \w+ says, \"(\w+), please activate your turret\."$ + + + 1 + + + + Turret Off + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^\(Ship\): \w+ says, \"(\w+), please deactivate your turret\."$ + + + 1 + + + + Collector On Targetted + + 0 + 99 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^\(Ship\): (\w+) says, \"(\w+), siphon on.\"$ + + + 1 + + + + Collector Off Targetted + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^\(Ship\): (\w+) says, \"(\w+), siphon off.\"$ + + + 1 + + + + Collector On + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^\(Ship\): (\w+) says, \"Siphon on.\"$ + + + 1 + + + + Collector Off + + 0 + 39 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^\(Ship\): (\w+) says, \"Siphon off.\"$ + + + 1 + + + + Pilot 0 @@ -521,7 +674,7 @@ end - + Gunner 0 @@ -596,7 +749,7 @@ dreadnought.fireTurret() - + Callout Target 0 @@ -633,9 +786,10 @@ dreadnought.fireTurret() - + Turret Balance - + 0 39 0 @@ -653,6 +807,28 @@ dreadnought.fireTurret() 3 + + Target Acquired + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^You tune the weapon module to target a \w+ \w+\.$ + ^You tune the weapon module to target a six-headed \w+\.$ + + + 1 + 1 + + Vortex 1 + + Vortex Fired + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + You focus your turret on the fabric of aetherspace itself and fire, ripping open a gaping vortex. + + + 3 + + Shockwave 3 - - Target Acquired - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - You tune the weapon module to target - - - 2 - - - - Turret Balance - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - A battle turret whirrs quietly, ready to be used once again. - - - 3 - - Beast Dies - 0 0 @@ -808,7 +964,8 @@ dreadnought.fireTurret() No Target - + 0 0 0 @@ -848,7 +1005,7 @@ dreadnought.fireTurret() - + Empath 0 @@ -1330,7 +1487,7 @@ end - + Collector 0 @@ -1589,160 +1746,6 @@ disableTrigger("Siphoning - Callout") - - Activate/Deactivate calls - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - - - Turret On - - 0 - 99 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - ^\(Ship\): \w+ says, \"(\w+), please activate your turret\."$ - - - 1 - - - - Turret Off - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - ^\(Ship\): \w+ says, \"(\w+), please deactivate your turret\."$ - - - 1 - - - - Collector On Targetted - - 0 - 99 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - ^\(Ship\): (\w+) says, \"(\w+), siphon on.\"$ - - - 1 - - - - Collector Off Targetted - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - ^\(Ship\): (\w+) says, \"(\w+), siphon off.\"$ - - - 1 - - - - Collector On - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - ^\(Ship\): (\w+) says, \"Siphon on.\"$ - - - 1 - - - - Collector Off - - 0 - 39 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - ^\(Ship\): (\w+) says, \"Siphon off.\"$ - - - 1 - - - Gnome traders @@ -1801,146 +1804,6 @@ send("config shipsight 1") - - Lusternia_test - - - Lusternia_test - - - mudlet-mapper - - - mudlet-mapper - - - Mudlet Mapper - - - - - - Check for updates periodically - - - - - - - - - Lusternia_test - - - Lusternia_test - - - Dreadnought - - - - - - Shockwaves - - - - - - Shockwaves Expired - - shipt Attention! The shockwaves have expired! - - - - - Five Minute Announcement - - shipt Attention! The shockwaves will expire in five minutes! - - - - - Fifteen Minute Announcement - - shipt Attention! The shockwaves will expire in fifteen minutes! - - - - - - - Lusternia_test - - - Lusternia_test - - - mudlet-mapper - - - mudlet-mapper - - - Mudlet Mapper - - - - - - Check for updates periodically - - - - - - - - - Lusternia_test - - - Lusternia_test - - - Dreadnought - - - - - - Shockwaves - - - - - - Shockwaves Expired - - shipt Attention! The shockwaves have expired! - - - - - Five Minute Announcement - - shipt Attention! The shockwaves will expire in five minutes! - - - - - Fifteen Minute Announcement - - shipt Attention! The shockwaves will expire in fifteen minutes! - - - - - - - - - @@ -2018,7 +1881,7 @@ end - + Pilot @@ -2185,7 +2048,7 @@ end ^pce$ - + Gunner @@ -2195,10 +2058,10 @@ end Enable/Disable Turret @@ -2207,20 +2070,34 @@ end Target Gathering Mode ^gmode (call|auto)$ + + Targetting + + + + ^gtar (\w+)$ + - + Empath @@ -2264,7 +2141,7 @@ send("grid modules") ^gsliv$ - + Collector @@ -2489,18 +2366,20 @@ end local targets = dreadnought.gunning.targets local targetAcquired = dreadnought.gunning.targetAcquired - if shockwaveCalled then - send("turret shockwave") - elseif vortexCalled then - send("turret vortex") - dreadnought.gunning.vortexCalled = false - else - local currentTarget = targets[1] - if currentTarget ~= nil then - if targetAcquired then - send("turret fire") - else - send("turret target creature" .. currentTarget) + if dreadnought.balance then + if shockwaveCalled then + send("turret shockwave") + elseif vortexCalled then + send("turret vortex") + dreadnought.gunning.vortexCalled = false + else + local currentTarget = targets[1] + if currentTarget ~= nil then + if targetAcquired then + send("turret fire") + else + send("turret target creature " .. currentTarget) + end end end end