diff --git a/scripts/actions.tin b/scripts/actions.tin index 9d9ac02..292ffe8 100644 --- a/scripts/actions.tin +++ b/scripts/actions.tin @@ -72,7 +72,7 @@ #action {%* damaged beyond repair.} {?charlieware? {play -r gs Starship/Computer/Warning}} #action {There is inadequate amount of ammunition left in the starship for a reload.} {?charlieware? {play -r gs Starship/Computer/Warning}} #nop WARN simplified — original has conditions, check Prometheus.xml -#action {%* the starship's salvage scanners, which begin scanning the area for debris.} {#line gag} +#action {%* the starship's salvage scanners, which begin scanning the area for debris.} {#if {%1} =~ {You} {?charlieware? {play -r gs Starship/Computer/Keyboard}};#else {#line gag}} #nop complex trigger (auto-translated conditionals) #action {The computer reports that %*} {#line gag;#if {%1} =~ {completed repair of} {?charlieware? {play -r gs Starship/Computer/RepairComplete}};#elseif {%1} =~ {there is no debris} {?charlieware? {play -r gs Starship/Computer/NoDebris}};#elseif {%1} =~ {hacked into} {?charlieware? {play -r gs Starship/Derelicts/Hacked}};#elseif {%1} =~ {Attempting to retreat} {?charlieware? {play -r gs Starship/Derelicts/DestructionTriggered}};#elseif {%1} =~ {discovered an artifact} {?charlieware? {play -r gs Starship/Computer/Artifact}};#elseif {%1} =~ {returned to the ship} {?charlieware? {play -r gs Starship/Derelicts/ProbeReturn}};#elseif {%1} =~ {is 1 unit away} {?charlieware? {play -r gs Starship/Computer/OneUnitAway}};#elseif {%1} =~ {no space for the debris} {?charlieware? {play -r gs Starship/Misc/StorageFull}};#elseif {%1} =~ {Easter egg} {?charlieware? {play -r gs General/Misc/EggItem}}} #action {The computer emits a piercing tone, alerting you that a starship has been detected in the sector's boundries.} {?charlieware? {play -r gs Starship/Computer/PiercingTone}} @@ -217,7 +217,7 @@ #nop complex trigger (auto-translated conditionals) #action {%* press%*a few keys on a console, %* the %* alert.} {#if {%3} =~ {enabling} {?charlieware? {play -r gs General/Devices/Activate}};#elseif {%3} =~ {disabling} {?charlieware? {play -r gs General/Devices/Deactivate}}} #nop WARN simplified — original has conditions, check Prometheus.xml -#action {%* furiously input%*into a weapon locking console.} {#line gag} +#action {%* furiously input%*into a weapon locking console.} {?charlieware? {play -r gs Starship/Computer/Keyboard}} #action {You feel a thrumming pulse through the deck beneath you as the shields activate.} {#line gag} #action {You feel a slight vibration from the ship as it strengthens the shields around the ship.} {#line gag} #action {The ship lurches abruptly as super-heated shrapnel penetrates the hull.} {#line gag} @@ -362,13 +362,13 @@ #action {The clicks coming from below abruptly stop.} {#line gag;?charlieware? {play -r gs Starship/Misc/TransferEnd}} #action {You hear a series of clicks from below as the refinery is emptied into a starship.} {#line gag} #nop WARN simplified — original has conditions, check Prometheus.xml -#action {%* has fired at %*.} {#line gag} +#action {%* has fired at %*.} {?charlieware? {play -r cs Space/OtherFired}} #action {There are no %* to fire.} {?charlieware? {play -r gs Starship/Computer/Warning}} #action {Either the launchers do not need reloading, or the ship lacks the required ammunition.} {?charlieware? {play -r gs General/Misc/Cancel}} #nop complex trigger (auto-translated conditionals) #action {The vehicle shudders as %*} {#line gag;#if {%1} =~ {cannons are fired} {?charlieware? {play -r gs Starship/Misc/SalvageLaunch}};#elseif {%1} =~ {a grenade is launched toward a target} {?charlieware? {play -r cs Ground/GrenadeFire}};#elseif {%1} =~ {a grenade comes in contact with its armor and explodes} {?charlieware? {play -r cs Ground/GrenadeExplode}}} #nop complex trigger (auto-translated conditionals) -#action {%* has fired %* at %*} {#line gag;#if {%2} =~ {minicannons} {?charlieware? {play -r gs Starship/Misc/SalvageLaunch}};#elseif {%2} =~ {a greenade} {?charlieware? {play -r cs Ground/GrenadeFire}}} +#action {%* has fired %* at %*} {#line gag;#if {%2} =~ {minicannons} {?charlieware? {play -r gs Starship/Misc/SalvageLaunch}};#elseif {%2} =~ {a grenade} {?charlieware? {play -r cs Ground/GrenadeFire}};#elseif {%2} =~ {a massive energy beam} {?charlieware? {play -r cs Space/OtherFired}}} #action {%* has a lock on this starship.} {?charlieware? {play -r cs Space/LockedOnYou}} #action {Self-destruct sequence initiated! Destruction in sixty seconds.} {?charlieware? {play -r gs Starship/Misc/SelfDestructStart}} #action {The relic... EXPLODES!} {?charlieware? {play -r gs Starship/Misc/RelicExplosion}} @@ -462,7 +462,7 @@ #action {You hear distant weapon fire!} {#line gag} #action {The beam hits %*!} {#line gag;?charlieware? {play -r cs Ground/Lasers/LaserHits}} #nop complex trigger (auto-translated conditionals) -#action {%* falls to %* with a sickening thud!} {#else {?charlieware? {play -r cs Ground/Dead}}} +#action {%* falls to %* with a sickening thud!} {#if {%1} =~ {X-Loritan} {?charlieware? {play -r cs Ground/LoreDeath}};#elseif {%1} =~ {alien creature} {?charlieware? {play -r cs Ground/LoreDeath}};#else {?charlieware? {play -r cs Ground/Dead}}} #action {The laser beam flies around, hitting everyone in its path!} {#line gag} #action {The beam flies %*!} {#line gag} #action {You insert a laser energy pack into a laser supplier, pressing a button.} {?charlieware? {play -r cs Ground/PowerSupplierButton}} @@ -521,7 +521,7 @@ #action {%*put%*into%*oceanography container.} {?charlieware? {play -r gs General/PearlDiving/OceanographyContainer}} #action {The scanner indicates that the current coordinates are empty of valuable items.} {#line gag;?charlieware? {play -r gs General/PearlDiving/NothingHere}} #nop WARN simplified — original has conditions, check Prometheus.xml -#action {%* begin%*moving %* underwater shovel through the water and deep into the ground.} {#line gag} +#action {%* begin%*moving %* underwater shovel through the water and deep into the ground.} {?charlieware? {play -r gs General/Archaeology/Shovel}} #nop WARN simplified — original has conditions, check Prometheus.xml #action {%* stop%*digging, nothing as a result.} {#line gag;?charlieware? {play -r gs General/PearlDiving/Cease}} #action {Valuable material found! Depth %*.} {?charlieware? {play -r gs General/PearlDiving/PearlLocated}} @@ -552,7 +552,7 @@ #action {You receive %* points!} {?charlieware? {play -r gs General/Misc/Points}} #action {You press a button.} {?charlieware? {play -r gs General/Devices/ButtonPush}} #nop WARN simplified — original has conditions, check Prometheus.xml -#action {The planetary damage of this planet is %* units out of 100.0 units.} {#line gag;?charlieware? {play -r gs Starship/Computer/Display}} +#action {The planetary damage of this planet is %* units out of 100.0 units.} {?charlieware? {play -r gs Starship/Computer/Display}} #action {You hear a soft knocking from the starship's hull.} {?charlieware? {play -r gs Starship/Misc/HullKnocking}} #action {You calmly knock on the hull of %*} {?charlieware? {play -r gs Starship/Misc/HullKnocking}} #nop complex trigger (auto-translated conditionals) @@ -645,7 +645,7 @@ #action {%* tap%*a button, %*.} {#if {%3} =~ {bringing up the mined mineral status} {?charlieware? {play -r gs General/Devices/ButtonPush}};#elseif {%3} =~ {viewscreen} {?charlieware? {play -r gs General/Devices/Activate}};#elseif {%3} =~ {disabling} {?charlieware? {play -r gs General/Devices/Deactivate}}} #action {No mined minerals could be found.} {?charlieware? {play -r gs Starship/Computer/Display}} #action {A light next to the PA blinks off.} {?charlieware? {play -r gs General/Devices/Deactivate}} -#action {A light blinks on next to the PA.} {?charlieware? {play -r gs General/Devices/Aactivate}} +#action {A light blinks on next to the PA.} {?charlieware? {play -r gs General/Devices/Activate}} #action {Only %* until Christmas!} {?charlieware? {play -r gs General/Hosts/Christmas}} #action {The ship accelerates into hyperspace.} {#line gag;?charlieware? {play -r gs Starship/Move/Accelerate}} #action {The ship decelerates into real space.} {#line gag;?charlieware? {play -r gs Starship/Move/Decelerate}} @@ -675,7 +675,7 @@ #action {You unclip a%*and remove it from around your waist.} {?charlieware? {play -r gs General/Misc/ItemWearBelt};?charlieware? {play -r gs General/Misc/ItemUnwear}} #action {~^(.*?) (don|dons|strap|straps|wear|wears) (.*?)\.$} {?charlieware? {play -r gs General/Misc/ItemWear}} #nop complex trigger (auto-translated conditionals) -#action {~^(.*) (remove|removes|unstrap|unstraps) (.*?)\.$} {#else {?charlieware? {play -r gs General/Misc/ItemUnwear}}} +#action {~^(.*) (remove|removes|unstrap|unstraps) (.*?)\.$} {#if {%3} =~ {before} {?charlieware? {play -r gs General/Misc/Cancel}};#elseif {%3} =~ {your electronic gadgets first} {?charlieware? {play -r gs General/Misc/Cancel}};#elseif {%3} =~ {from} {#line gag};#else {?charlieware? {play -r gs General/Misc/ItemUnwear}}} #action {The ship shakes slightly when something impacts the hull.} {#line gag} #action {You feel a jolt as the ship crashes into a small, previously unseen asteroid.} {#line gag} #action {The engines roar for a short moment, something blocking the ship's movement.} {#line gag} diff --git a/scripts/dev.tin b/scripts/dev.tin index 135aa7a..facbd5e 100644 --- a/scripts/dev.tin +++ b/scripts/dev.tin @@ -1,3 +1,3 @@ #run {engine} {./engine/bin/linux/charlie_engine assets} -#alias {?charlieware?} {#system{./engine/bin/linux/charlie_cli %1&> &}} +#alias {?charlieware?} {#system{./engine/bin/linux/charlie_cli "%1" &>/dev/null &}} #sess prometheus prometheus-enterprises.com 2223