From b840359aceb22d6ba13a9e6aecd0b5e23d47818d Mon Sep 17 00:00:00 2001 From: Zach Dziura Date: Thu, 21 Jan 2016 14:38:22 -0500 Subject: [PATCH] Finished testing the rest of the modules Now to write documentation. Ahoy! --- Dreadnought/Dreadnought.xml | 2010 ++++++++++++++++----------- docs/{Empathing.md => Collector.md} | 0 docs/{Gunning.md => Combateer.md} | 0 docs/{Piloting.md => Empath.md} | 0 docs/{Siphoning.md => Pilot.md} | 0 5 files changed, 1176 insertions(+), 834 deletions(-) rename docs/{Empathing.md => Collector.md} (100%) rename docs/{Gunning.md => Combateer.md} (100%) rename docs/{Piloting.md => Empath.md} (100%) rename docs/{Siphoning.md => Pilot.md} (100%) diff --git a/Dreadnought/Dreadnought.xml b/Dreadnought/Dreadnought.xml index c74efd1..e024a38 100644 --- a/Dreadnought/Dreadnought.xml +++ b/Dreadnought/Dreadnought.xml @@ -79,6 +79,7 @@ enableTrigger("Pilot") disableTrigger("Autopilot") send("config shipsight 1") send("config aethermap on") +dreadnought.pilot.reset() sendGMCP([[Char.Skills.Get {"group":"aethercraft"}]]) send("\n") @@ -105,7 +106,8 @@ send("\n") disableTrigger("Pilot") disableTrigger("Autopilot") send("config shipsight 0") -send("config aethermap off") +send("config aethermap off") +dreadnought.pilot.reset() 0 39 0 @@ -123,61 +125,15 @@ send("config aethermap off") 3 - - Turret Locked - - 0 - 39 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - You step up to a battle turret, locking yourself into the module and linking your mind to the controls of the ship. After a moment, you begin to sense your command of the module in your own brain. - - - 3 - - - - Turret Unlocked - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - With a long, slow blink, you allow your mind to drift free from the ship, and release your lock on the command of a battle turret. - - - 3 - - Grid Locked @@ -203,7 +159,8 @@ send("\n") +send("config aethermap off") +dreadnought.empath.reset() 0 39 0 @@ -221,6 +178,58 @@ send("config aethermap off") 3 + + Turret Locked + + 0 + 39 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + You step up to a battle turret, locking yourself into the module and linking your mind to the controls of the ship. After a moment, you begin to sense your command of the module in your own brain. + + + 3 + + + + Turret Unlocked + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + With a long, slow blink, you allow your mind to drift free from the ship, and release your lock on the command of a battle turret. + + + 3 + + Collector Locked - - 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 @@ -454,14 +309,15 @@ send("config shipsight 1") Aetherbeast Summoned - 0 0 @@ -484,12 +340,16 @@ end Karibidean Summoned - 0 0 @@ -509,9 +369,29 @@ explandAlias("ungagall") - Entering Shockwave - + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + enters from the \w+ on the aetherways\.$ + + + 1 + + + + Entering Shockwave + 0 39 0 @@ -523,36 +403,17 @@ dreadnought.autopilot() #000000 #000000 - ^You are thrust forward as .* shudders violently and comes to a complete stop\.$ - - - 1 - - - - Aetherbeast Enters - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - enters from the (\w+) on the aetherways\.$ + ^You are thrust forward as(?:\s\w+(?:\'\w+)?)+ shudders violently and comes to a complete stop\.$ + The command chair is unresponsive to your requests. 1 + 3 Freed From Shockwave - 0 0 @@ -566,7 +427,7 @@ dreadnought.autopilot() #000000 I am clearing the command chair of all impairments\."$ - ^With a ripple, .* frees itself from its shockwave\.$ + ^With a ripple,(?:\s\w+(?:\'\w+)?)+ frees itself from its shockwave\.$ 1 @@ -577,7 +438,13 @@ dreadnought.autopilot() Aetherbeast Dies +end + +if dreadnought.aetherbeastCount == 0 then + dreadnought.pilot.siphonCallout = true +end + +dreadnought.autopilot() 0 0 0 @@ -589,39 +456,39 @@ end #000000 #000000 - suddenly explodes\!$ - - - 1 - - - - Pilot Balance - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - I am clearing the command chair of all impairments\."$ - The command chair whirrs quietly, ready to be used once again. + ^(?:\w+\s){3}suddenly explodes\!$ + A six-headed scyllus suddenly explodes! 1 3 + + Pilot Balance + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + The command chair whirrs quietly, ready to be used once again. + + + 3 + + Ship Move - + 0 0 0 @@ -633,7 +500,7 @@ dreadnought.piloting.lastMove = matches[2] #000000 #000000 - ^You steer .* to the (\w+)\.$ + ^You steer(?:\s\w+(?:\'\w+)?)+ to the \w+\.$ 1 @@ -641,20 +508,20 @@ dreadnought.piloting.lastMove = matches[2] Siphon Callout - 0 99 @@ -667,149 +534,19 @@ end #000000 #000000 - ^An energy vortex pulsates brightly.$ - - - 1 - - - - - Gunner - - 0 - 99 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - - - Auto Target - - 0 - 99 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - - - Aetherbeast Summoned - - 0 - 99 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - ^Drawn by the flux of energy, a \w+ (\w+) suddenly wanders into the nearby area\.$ - ^Drawn by the flux of energy, a six-headed (\w+) suddenly wanders into the nearby area\.$ - - - 1 - 1 - - - - Karibidean Summoned - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - The energy vortex flashes and a vortex karibidean flies out of it. - - - 3 - - - - - Callout Target - - 0 - 99 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - - - Targeting - - 0 - 99 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - ^\(Ship\): \w+ says, "Target (\w+)\."$ - - - 1 - - - - - Turret Balance - - 0 - 39 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - A battle turret whirrs quietly, ready to be used once again. + An energy vortex pulsates brightly. 3 - Target Acquired - + Shockwave Timer + 0 0 0 @@ -821,130 +558,16 @@ dreadnought.fireTurret() #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 - - 0 - 99 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - ^\(Ship\): \w+ says, \"(\w+), 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 - - 0 - 99 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - ^\(Ship\): (\w+) says, \"Shockwave.\"$ - - - 1 - - - - Targetted Shockwave - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - ^\(Ship\): \w+ says, \"(\w+), shockwave.\"$ - - - 1 - - - - Shockwave Fired - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - This area is too full of energy for you to create a shockwave. - You blanket the aetherspace around you with bolts of crackling energy, which ripple around this space in waves of coruscating power. A nearby turret blankets aetherspace with bolts of crackling energy, which ripple around this space in waves of coruscating power. 3 - 3 - 3 - Beast Dies - + Highlights + 0 0 0 @@ -956,51 +579,15 @@ dreadnought.fireTurret() #000000 #000000 - suddenly explodes\!$ + ^With a ripple,(?:\s\w+(?:\'\w+)?)+ frees itself from its shockwave\.$ + The command chair whirrs quietly, ready to be used once again. + ^(?:\w+\s){3}suddenly explodes\!$ + A six-headed scyllus suddenly explodes! 1 - - - - No Target - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - A battle turret is not targeting anything. - - 3 - - - - Turret Exhaustion - - 0 - 99 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - Exhaustion clouds your mind and you fail to properly link to a battle turret. - - + 1 3 @@ -1020,20 +607,20 @@ dreadnought.fireTurret() #000000 - + Grid Setup 0 0 @@ -1046,7 +633,7 @@ end #000000 #000000 - ^"(\D+)\d+"\s+(?:\w+\s){3}\s+(\d+)\%\s\/\s(\w+) + ^"(\D+)(\d+)"\s+(?:\w+\s){3}\s+\d+\%\ \/\ \w+ damage 1 @@ -1054,7 +641,8 @@ end Finish Setup +disableTrigger("Grid Setup") +dmsg("The empathic grid is set up and ready for your control.") 0 39 0 @@ -1105,7 +693,8 @@ disableTrigger("Grid Setup") Damaged - + 0 0 0 @@ -1137,8 +726,8 @@ disableTrigger("Grid Setup") Repaired - 0 0 @@ -1175,7 +764,7 @@ end Damaged - end - heap.insert(dreadnought.empathing.commands, action(module, priority, "grid repair module " .. matches[3])) + heap.insert(dreadnought.empath.commands, action(module, priority, "grid repair module " .. matches[3])) end 0 0 @@ -1209,7 +798,7 @@ end #000000 #000000 - ^"(\D+)(\d+)"\s+(?:\w+\s){3}\s+\d+% \/ (\w+) + ^"(\D+)(\d+)"\s+(?:\w+\s){3}\s+\d+\%\ \/\ (\w+) damage 1 @@ -1238,8 +827,8 @@ dreadnought.repairShip() Repaired - 0 0 @@ -1252,16 +841,18 @@ end #000000 #000000 - ^Crackling energy surges to \w+\s(\w+)\s\w+, fully healing it\.$ + ^Crackling energy surges to \w+ \w+ (\w+), fully healing it\.$ 1 - + Already Repaired - + 0 0 0 @@ -1278,7 +869,7 @@ end 3 - 0 + 3 @@ -1297,9 +888,10 @@ end #000000 - + Infected - 0 39 @@ -1322,16 +914,10 @@ send("grid modules") Slivven Check - + 0 0 - 1 + 100 #ff0000 @@ -1340,21 +926,51 @@ end #000000 #000000 - ^"(\D+)\d+"\s+(?:\w+\s){3}\s+\d+% \/ \w+ damage\s?(?:\[(\w+)\])?\sPARASITE\!$ + "chair - 1 + 2 - Finish Slivven Check - + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^"(\D+)\d+"\s+(?:\w+\s){3}\s+\d+% \/ \w+ damage\s?(?:\[(\w+)\])?\sPARASITE\!$ + + + 1 + + + + Finish Slivven Check + +setTriggerStayOpen("Slivven Check", 0) +disableTrigger("Slivven Check") 0 99 0 @@ -1391,8 +1007,8 @@ setTriggerStayOpen("Slivven Check", 0) Call - @@ -1415,8 +1031,8 @@ end Emergency - @@ -1439,10 +1055,10 @@ end Finish - 0 0 @@ -1463,11 +1079,275 @@ end 3 + + Aetherbeast Dead + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + suddenly explodes!$ + + + 1 + + - Aetherbeast Dead - + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + The empathic grid whirrs quietly, ready to be used once again. + + + 3 + + + + + Combateer + + 0 + 99 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + + + Turret Setup + + 0 + 0 + 13 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + The battle turret is a spherical object + + + 2 + + + Can Vortex + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + It has a spherical diamonut covered with surgically sharp blades installed. + + + 3 + + + + Finish Setup + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + return isPrompt() + + + 4 + + + + + Auto Target + + 0 + 99 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + + + Aetherbeast Summoned + + 0 + 99 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^Drawn by the flux of energy, a \w+ (\w+) suddenly wanders into the nearby area\.$ + ^Drawn by the flux of energy, a six-headed (\w+) suddenly wanders into the nearby area\.$ + + + 1 + 1 + + + + Karibidean Summoned + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + The energy vortex flashes and a vortex karibidean flies out of it. + + + 3 + + + + + Callout Target + + 0 + 99 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + + + Targeting + + 0 + 99 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^\(Ship\): \w+ says, "Target (\w+)\."$ + ^\(Ship\): \w+ says, "Gunners, train your sights upon the (\w+)\."$ + + + 1 + 1 + + + + + Turret Balance + + 0 + 39 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + A battle turret whirrs quietly, ready to be used once again. + + + 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 + 0 0 @@ -1480,10 +1360,197 @@ end #000000 #000000 - suddenly explodes!$ + ^\(Ship\): \w+ says, "Vortex\."$ + ^\(Ship\): \w+ says, "Turret vortex.\"$ + ^\(Ship\): \w+ says, "TURRET VORTEX.\"$ + ^\(Ship\): \w+ says, "Turret Vortex\."$ 1 + 1 + 1 + 1 + + + + Targetted Vortex + + 0 + 99 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^\(Ship\): \w+ says, \"(\w+), 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 + + 0 + 99 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^\(Ship\): (\w+) says, \"Shockwave.\"$ + + + 1 + + + + Targetted Shockwave + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^\(Ship\): \w+ says, \"(\w+), shockwave.\"$ + + + 1 + + + + Shockwave Fired + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + This area is too full of energy for you to create a shockwave. + You blanket the aetherspace around you with bolts of crackling energy, which ripple around this space in waves of coruscating power. + A nearby turret blankets aetherspace with bolts of crackling energy, which ripple around this space in waves of coruscating power. + + + 3 + 3 + 3 + + + + Beast Dies + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + suddenly explodes\!$ + + + 1 + + + + No Target + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + A battle turret is not targeting anything. + No such creature is close enough for a battle turret to get a targeting lock. + + + 3 + 3 + + + + Turret Exhaustion + + 0 + 99 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + Exhaustion clouds your mind and you fail to properly link to a battle turret. + + + 3 @@ -1610,7 +1677,7 @@ end - + Siphoning - Callout 0 @@ -1746,6 +1813,180 @@ 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+), turret on\."$ + + + 1 + + + + Turret Off + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^\(Ship\): \w+ says, \"(\w+), turret off\."$ + + + 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 + + + + + Ship Implodes + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + implodes and your body is instantly torn apart by the unstable reality of theAetherways\.$ + + + 1 + + Gnome traders @@ -1812,75 +2053,6 @@ disableTrigger("Siphoning - Callout") - - Setup - - - - - - Toggle Hunting Mode - - - - ^dread hunt (on|off)$ - - - Command Module - - - - - - Toggle Autopilot - - - - ^pauto (on|off)$ - - - Toggle Siphon Callout - - - - ^psiphon (on|off)$ - - - Pilot @@ -1896,31 +2068,78 @@ end Steer +disableTrigger("Autopilot") +disableTrigger("Siphon Callout") ^(n|ne|e|se|s|sw|w|nw)$ Glide - + ^(nn|nene|ee|sese|ss|swsw|ww|nwnw)$ + + Toggle Autopilot + + + + ^pauto (on|off)$ + + + Toggle Siphon Callout + + + + ^pcall (on|off)$ + Pathing +} + +dmsg("Autopilot path set up.") - ^ppath (n|ne|e|se|s|sw|w|nw) (n|ne|e|se|s|sw|w|nw)$ + ^ppath (n|ne|e|se|s|sw|w|nw) (n|ne|e|se|s|sw|w|nw) (n|ne|e|se|s|sw|w|nw)$ + + + Reset + + + + ^preset(?: (confirm))?$ + + + Launch + + pilot launch + + ^pl$ + + + Dock + + pilot dock + + ^pd$ + + + Shockwave + + shipt Shockwave + + ^pshock$ + + + Vortex + + shipt Vortex + + ^pvort$ Scoop pilot scoop - ^pscoop$ + ^ps$ Transverse @@ -1983,20 +2232,6 @@ dreadnought.piloting.paths = { ^panch$ - - Launch - - pilot launch - - ^plaunch$ - - - Dock - - pilot dock - - ^pdock$ - Forcefield @@ -2038,7 +2273,7 @@ end shipt clarity - ^pclarity$ + ^pc$ Emergency Clarity @@ -2049,7 +2284,67 @@ end - Gunner + Empath + + + + + + Grid Setup + + + + ^gsetup$ + + + Grid Modules + + grid modules + + ^gm$ + + + Grid Repair + + + + ^gr(?:\s?(\w+))?$ + + + Slivven Check + + + + ^gsliv$ + + + Clarity + + + + ^gc$ + + + + Combateer @@ -2065,7 +2360,7 @@ else end - ^gturret (on|off)$ + ^t(on|off)$ Target Gathering Mode @@ -2080,65 +2375,28 @@ else end - ^gmode (call|auto)$ + ^tmode (call|auto)$ Targetting - ^gtar (\w+)$ - - - - Empath - - - - - - Grid Setup - - - - ^gsetup$ - - - Grid Modules - - grid modules - - ^gm$ - - - Clarity - - - - ^gc$ - - - Slivven Check - - - - ^gsliv$ + ^ttar (\w+)$ @@ -2273,6 +2531,26 @@ cecho("\n <green> You are now ungagging <red> Move<green> ^ungagmove$ + + Finish Hunting + + + + ^hunt off$ + @@ -2283,21 +2561,43 @@ cecho("\n <green> You are now ungagging <red> Move<green> Pilot - @@ -2320,14 +2622,15 @@ end Next Position @@ -2336,61 +2639,47 @@ end Steer Home - - Gunner - - - - - - - Empath - haveClarity = false }, - slivvensFound = 0 + slivvensFound = 0, + + reset = function () + dreadnought.empath = reset() + dreadnought.empath.reset = reset + end } + + + + + Combateer + + + + + if dreadnought.balance then + if shockwaveCalled then + send("turret shockwave") + elseif vortexCalled then + send("turret vortex") + 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 +end @@ -2560,6 +2896,12 @@ end + + +