From e82c2058b0b0e0ed51e41c306da5a086420bf048 Mon Sep 17 00:00:00 2001 From: Zach Dziura Date: Tue, 1 Mar 2016 23:38:00 -0500 Subject: [PATCH] v2.0 Lots and lots of changes in this release! The Combateer subsystem has been totally fixed, with the proper parameters actually being passed to the fireTurret() function. Various bug fixes all around as well, especially pertaining to gathering Aethercraft skills and the like. The big breaking change is the removal of the GM alias from the Empathing subsystem. Empaths now should use GR, for "Grid Repair". GR will, by default, only repair modules that are occupied. GR ALL to repair all modules on the ship. --- Dreadnought.xml | 1280 ++++++++++++++++++++++++--------------------- README.md | 4 +- docs/Combateer.md | 2 + docs/Empath.md | 10 +- 4 files changed, 699 insertions(+), 597 deletions(-) diff --git a/Dreadnought.xml b/Dreadnought.xml index d78b561..ac3bcff 100644 --- a/Dreadnought.xml +++ b/Dreadnought.xml @@ -17,6 +17,193 @@ #000000 + + Module Lock + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^You step up to (?:a|an|the) (\w+\s?)+ + + + 1 + + + + Module Unlock + + 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|an|the) (\w+\s?)+\.$ + + + 1 + + + + Shockwave Timer + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + A nearby turret blankets aetherspace with bolts of crackling energy, which ripple around this space in waves of coruscating power. + You blanket the aetherspace around you with bolts of crackling energy, which ripple around this space in waves of coruscating power. + + + 3 + 3 + + + + Ship Implodes + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + implodes and your body is instantly torn apart by the unstable reality of the Aetherways. + + + 0 + + Prompt @@ -57,238 +244,7 @@ - - Locking/Unlocking - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - - - Chair Locked - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - You step up to the command chair, 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 - - - - Chair Unlocked - - 0 - 39 - 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 the command chair. - - - 3 - - - - Grid Locked - - 0 - 99 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - You step up to the empathic grid, 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 - - - - Grid Unlocked - - 0 - 39 - 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 the empathic grid. - - - 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 - - 0 - 39 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - You step up to an energy collector, 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 - - - - Collector 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 an energy collector. - - - 3 - - - - + Pilot 0 @@ -303,7 +259,7 @@ send("config aethermap off") #000000 - + Autopilot 0 @@ -318,7 +274,7 @@ send("config aethermap off") #000000 - + Siphon Callout 0 0 @@ -562,15 +518,14 @@ end Autopilot Movement Failsafe - +end) 0 0 0 @@ -584,10 +539,12 @@ end ^You steer(?:\s\w+(?:\'\w+)?)+ to the \w+\.$ ^With a ripple,(?:\s\w+(?:\'\w+)?)+ frees itself from its shockwave\.$ + The command chair whirrs quietly, ready to be used once again. 1 1 + 3 @@ -614,7 +571,6 @@ end Shockwave Timer #000000 - + Grid Setup #000000 #000000 - concussive shock rips through the hull.$ - swiftly shears through her hull.$ - rips apart her hull.$ - shreds deep rends through her hull.$ + concussive shock rips through the hull\.$ + swiftly shears through her hull\.$ + rips apart her hull\.$ + shreds deep rends through her hull\.$ ^Violet sparks fly through the air and - ^\(Ship\): \w+ says, \"Repair.\"$ - cries out as bolts of jagged energy strike out from the ruptured fabric of aetherspace here.$ + cries out as bolts of jagged energy strike out from the ruptured fabric of aetherspace here\.$ 1 @@ -819,7 +774,6 @@ dreadnought.repairShip(dreadnought.balance, dreadnought.empath.commands)1 1 1 - 1 @@ -861,7 +815,70 @@ end - Damaged + Damaged - Occupied + + 0 + 0 + 1 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^"(\D+)(\d+)"\s+(?:\w+\s){3}\s+\d+\%\ \/\ (\w+) damage \[\w+\] + + + 1 + + + End Damaged + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + return isPrompt() + + + 4 + + + + + Damaged - Unoccupied End Damaged - 0 0 @@ -946,6 +965,27 @@ end + + Rapair Callout + + 0 + 0 + 0 + + + #ff0000 + #ffff00 + + #000000 + #000000 + + ^\(Ship\): \w+ says, \"Repair.\"$ + + + 1 + + Already Repaired Aetherbeast Dead - @@ -1261,12 +1301,12 @@ dreadnought.repairShip(dreadnought.balance, dreadnought.empath.commands)#000000 - + Turret Setup - + 0 0 - 13 + 0 #ff0000 @@ -1275,10 +1315,10 @@ dreadnought.repairShip(dreadnought.balance, dreadnought.empath.commands)#000000 #000000 - The battle turret is a spherical object + The battle turret is a spherical object, half of which is below the floor and the other half above. Made of a gleaming black metal, an opening on top of the turret leads to a cushioned interior. Handholds and other devices are attached within to operate the aetheric battle mechanisms. The entire interior is a sphere within a sphere that can rotate in all directions. An ominous hum vibrates up from deep within the turret itself. - 2 + 3 Can Vortex @@ -1343,7 +1383,7 @@ disableTrigger("Turret Setup") Aetherbeast Summoned +dreadnought.fireTurret(dreadnought.combateer.targets, dreadnought.combateer.flags) 0 99 0 @@ -1366,7 +1406,7 @@ dreadnought.fireTurret(dreadnought.combateer.targets, dreadnought.combateer.flag Karibidean Summoned +dreadnought.fireTurret(dreadnought.combateer.targets, dreadnought.combateer.flags) 0 0 0 @@ -1403,7 +1443,7 @@ dreadnought.fireTurret(dreadnought.combateer.targets, dreadnought.combateer.flag Targeting +dreadnought.fireTurret(dreadnought.combateer.targets, dreadnought.combateer.flags) 0 99 0 @@ -1427,7 +1467,7 @@ dreadnought.fireTurret(dreadnought.combateer.targets, dreadnought.combateer.flag Turret Balance +dreadnought.fireTurret(dreadnought.combateer.targets, dreadnought.combateer.flags) 0 39 0 @@ -1459,19 +1499,21 @@ dreadnought.fireTurret(dreadnought.combateer.targets, dreadnought.combateer.flag #000000 #000000 - ^You tune the weapon module to target a \w+ \w+\.$ + ^You tune the weapon module to target (?:a|an) \w+ \w+\.$ ^You tune the weapon module to target a six-headed \w+\.$ + ^You tune the weapon module to target a scorpion-like \w+\.$ 1 1 + 1 Vortex 0 0 @@ -1501,7 +1543,7 @@ end #000000 You focus your turret on the fabric of aetherspace itself and fire, ripping open a gaping vortex. + A focused blast rips through the fabric of aetherspace, ripping open a gaping vortex. 3 + 3 Shockwave +dreadnought.fireTurret(dreadnought.combateer.targets, dreadnought.combateer.flags) 0 99 0 @@ -1568,7 +1612,7 @@ dreadnought.fireTurret() Targetted Shockwave 0 0 @@ -1615,7 +1659,7 @@ end Beast Dies +dreadnought.fireTurret(dreadnought.combateer.targets, dreadnought.combateer.flags) 0 0 0 @@ -1659,7 +1703,7 @@ table.remove(dreadnought.combateer.targets, 1) Turret Exhaustion +dreadnought.fireTurret(dreadnought.combateer.targets, dreadnought.combateer.flags) 0 99 0 @@ -1678,7 +1722,7 @@ dreadnought.fireTurret() - + Collector 0 @@ -1988,6 +2032,7 @@ end Collector On Targetted 0 @@ -2073,26 +2118,6 @@ tempTimer(0.1, [[send("shipt Aye aye, Captain! Deactivating my collector&qu - - Ship Implodes - - 0 - 0 - 0 - - - #ff0000 - #ffff00 - - #000000 - #000000 - - implodes and your body is instantly torn apart by the unstable reality of the Aetherways. - - - 0 - - @@ -2139,7 +2164,7 @@ tempTimer(0.1, [[send("shipt Aye aye, Captain! Deactivating my collector&qu - + Pilot @@ -2431,25 +2456,24 @@ end - - Grid Modules - - grid modules - - ^gm$ - Grid Repair - ^gr(?: (reset))?$ + ^gr(?: (all|reset))?$ Slivven Check @@ -2525,14 +2549,21 @@ elseif matches[2] == "list" then else table.insert(dreadnought.combateer.targets, matches[2]) dmsg("Adding to the list of targets: " .. matches[2]) - dreadnought.fireTurret() + dreadnought.fireTurret(dreadnought.combateer.targets, dreadnought.combateer.flags) end ^ttar (\w+)$ + + + + + + + - + Collector @@ -2686,294 +2717,6 @@ dmsg("All Dreadnought reflexes have been disabled.") - - Dreadnought - - - - - Pilot - - - - - - - - - - - - - - - - - - Empath - - - - - - - - - Combateer - - - - - - - - - Collector - - - - - - - - - - - - - - - - - Data Structures @@ -3101,6 +2844,357 @@ end }) return action +end + + + + + Dreadnought + + + + + Pilot + + + + + + + + + + + + + + + + + + + + + Empath + + + + + + + + + Combateer + + + + + + + + + Collector + + + + + + + + + + + + + + + + + diff --git a/README.md b/README.md index 729d05f..304302a 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,15 @@ Installation 3. Open Mudlet. On the Menu Bar, click on `Package Manager`. 4. Click on `Install`, navigate to the folder where you extracted the zip file, and select the `Dreadnought.xml` file. 5. Click `OK` to close the Package Manager window. +6. Restart Mudlet to make sure all variables are instantiated properly. Updating -------- 1. Open up Mudlet's Package Manager. 2. Select the `Dreadnought` package and click `Uninstall`. -3. See the above Installation instructions. +3. Restart Mudlet to clear out all existing variables. +4. See the above Installation instructions. Documentation ------------- diff --git a/docs/Combateer.md b/docs/Combateer.md index ed350ca..bb60007 100644 --- a/docs/Combateer.md +++ b/docs/Combateer.md @@ -3,6 +3,8 @@ Combateer The combateer has two different modes: callout and auto, with the difference being how the system acquires targets. In callout mode, the Captain will automatically call out the target and the system will pick it up. Auto mode, on the other hand, will automatically acquire and fire upon targets. +Once you lock into the turret, the turretting mode is automatically set to `call`ing mode. See below for the exact commands to switch turretting modes. + It's important to note that the combateer system will automatically target karibideans when they arrive. Commands diff --git a/docs/Empath.md b/docs/Empath.md index cc38844..1251545 100644 --- a/docs/Empath.md +++ b/docs/Empath.md @@ -6,7 +6,11 @@ Much of the magic behind the empathing system takes place automatically, without Commands -------- - - `gm` - Sends the `grid modules` command, which is set up to automatically assess the current damage done to each module. - - `gr [reset]` - If for whatever reason the repairing process stops, this will restart it. Also, should you give the optional `reset` option, the repairing queue will be cleared. + - `gr [all|reset]` - By default, will check and repair any damaged modules as long as they're occupied by someone. Passing in the `all` parameter will repair all modules on the ship, regardless if they're occupied. - `gsliv` - Will check for any slivven infecting the ship and announce their presence upon the ship's aether. - - `gc` - Will clarity the command chair at the next available opportunity. \ No newline at end of file + - `gc` - Will clarity the command chair at the next available opportunity. + + Crew Commands + ------------- + + If you're a crew-member, you can trigger the Empath to repair the entire ship by calling out `Repair` on the Ship Aether. \ No newline at end of file