diff --git a/config.tin b/config.tin index 60ba651..ca611d5 100644 --- a/config.tin +++ b/config.tin @@ -1,7 +1,7 @@ #VARIABLE {chat_file} {logs/chat.log} #CONFIG {SPEEDWALK} {OFF}; -#CONFIG {PACKET PATCH} {5}; +#CONFIG {PACKET PATCH} {0.75}; #nop not perfect, yet to find a value that stops all broken lines; #CONFIG {COLOR PATCH} {ON}; #CONFIG {MCCP} {ON}; #CONFIG {MOUSE} {ON}; @@ -24,11 +24,10 @@ #READ {src/quota.tin}; #READ {src/combat.tin}; -#READ {src/deadletter.tin}; #READ {src/db.tin}; #READ {src/magic.tin}; -#READ {src/missions.tin}; +#READ {src/missions.tin}; #nop this file loads all the individual mission files (sailing, sausage, werks); #READ {src/group.tin}; #READ {src/personal.tin}; diff --git a/src/actions.tin b/src/actions.tin index 7019e2c..d2163f3 100644 --- a/src/actions.tin +++ b/src/actions.tin @@ -108,6 +108,15 @@ #NOP ==[Horses]== #HIGHLIGHT {brindle horse} orange; +#NOP ==[Magic Items]==; +#SUB {^You feel you have regained enough strength to invoke a flame weapon again.$} {You feel you have regained enough strength to invoke<900> a flame<900> weapon again.}; +#ACTION {^You feel you have regained enough strength to invoke a flame weapon again.$} { #showme {\a}; }; +#SUB {^You zap your balsa wand at %1.$} {You zap<900> your balsa wand<900> at %1<900>.}; +#SUB {^A pulse of light leaves the balsa wand and envelops %1.$} {A pulse of light<900> leaves the balsa wand<900> and envelops %1<900>.}; +#SUB {^A pulse of pure night leaves the balsa wand and envelops you.$} {A pulse<900> of pure night<900> leaves the balsa wand<900> and envelops you<900>.}; +#SUB {^A pulse of pure night leaves the balsa wand and envelops you, while %1 fizzles slightly and dims.$} {A pulse<900> of pure night<900> leaves the balsa wand<900> and envelops you<900>, while the black diamond nostril stud<900> fizzles slightly and dims<900>.}; +#HIGHLIGHT {^You feel your skin start to ripple uncomfortably...$} {}; + #NOP ==[Tab Completions]== #ACTION {^[%1 has gained the %2 achievement %3]$} { #tab {%1}; diff --git a/src/gmcp.tin b/src/gmcp.tin index 01c870b..d5fc8e1 100644 --- a/src/gmcp.tin +++ b/src/gmcp.tin @@ -78,7 +78,8 @@ #nop reset prompt details; #var {tpa_status} {0}; #var {tpa_color} {0}; - #var {tpa_start} {0}; + #nop #var {tpa_start} {0}; + #unvar {tpa_start}; #unvar {quota}; #nop re-split the screen to wipe out the prompt from last character; diff --git a/src/group.tin b/src/group.tin index 7ae310c..634c9cc 100644 --- a/src/group.tin +++ b/src/group.tin @@ -33,13 +33,13 @@ } #nop CCC -#ACTION {^ * {Her|His|Its} skin has been {hardened|covered} {with|to}{a?} %4, although {the \w+|it} seems {weaker|not to be}} { +#ACTION {^ * {Her|His|Its} skin {is|has been} {hardened|covered} {with|to}{a?} %4, although {the \w+|it} seems {weaker|not to be}} { #if {"$group_shields_current" != ""} { #variable {group_shields[$group_shields_current][ccc]} {1}; /softwritegroupshieldstofile; }; } -#ACTION {^ * Your skin has been {hardened|covered} {with|to}{a?} %4, although {the \w+|it} seems {weaker|not to be}} { +#ACTION {^ * Your skin {is|has been} {hardened|covered} {with|to}{a?} %4, although {the \w+|it} seems {weaker|not to be}} { #variable {group_shields[$GMCP[charinfo][capname]][ccc]} {1}; /softwritegroupshieldstofile; }; @@ -57,9 +57,13 @@ /softwritegroupshieldstofile; }; } +#ACTION {^ * You are {(really )?}protected by the power of {Pishe|Gufnork|Gapp|Sandelfon|Fish|Hat|Sek|Aegadon|Cubal|Reebox}} { + #variable {group_shields[$GMCP[charinfo][capname]][ms]} {1}; + /softwritegroupshieldstofile; +} #nop KII -#ACTION {^ * {You|She|He|It} are surrounded by a {handful|cloud|small swarm|large swarm|vast sawrm|plague} of} { +#ACTION {^ * {You|She|He|It} {is|are} surrounded by a {handful|cloud|small swarm|large swarm|vast sawrm|plague} of} { #if {"%1" == "You"} { #variable {group_shields[$GMCP[charinfo][capname]][kii]} {1}; }; @@ -256,7 +260,7 @@ }; -#nop KII +#nop KII; #ACTION {^The last of the injured {lacewings|stick insects|mayflies|praying mantids|butterflies|ladybirds|dragonflies|damselflies|moths|grasshoppers|winged termites|sandflies|mosquitoes|gnats|crickets|flying ants|locusts|horseflies|cicadas|bees|wasps|hornets|elephant beetles|assassin bugs} surrounding {(\w+\b\W*?){1,8}} crash to the ground.$} { #variable {gs_dropname} {%1}; #replace {gs_dropname} { } {;}; @@ -288,6 +292,16 @@ }; }; +#nop MS; +#ACTION {^You are protected by the power of {Pishe|Gufnork|Gapp|Sandelfon|Fish|Hat|Sek|Aegadon|Cubal|Reebox}.$} { + #variable {group_shields[$GMCP[charinfo][capname]][ms]} {1}; + /writegroupshieldstofile; +}; +#ACTION {^Your divine protection expires.$} { + #variable {group_shields[$GMCP[charinfo][capname]][ms]} {0}; + /writegroupshieldstofile; +}; + #nop ======================================; @@ -367,11 +381,11 @@ #format {gs_displayline} {%.6s: } {$name}; #format {gs_displayline} {%-8s} {$gs_displayline}; - #foreach {tpa;ccc;eff;kii} {shield} { + #foreach {tpa;ccc;eff;kii;ms} {shield} { #if {&group_shields[$name][$shield] && "$group_shields[$name][$shield]" == "1"} { - #format {gs_displayline} {%s %u<099>} {$gs_displayline} {$shield}; + #format {gs_displayline} {%s %u<099>} {$gs_displayline} {$shield}; } { - #format {gs_displayline} {%s %u<099>} {$gs_displayline} {$shield}; + #format {gs_displayline} {%s %u<099>} {$gs_displayline} {$shield}; }; }; #line {log} {$groupshield_file} {$gs_displayline}; diff --git a/src/spottimers.tin b/src/spottimers.tin index 8b7c093..4f646f8 100644 --- a/src/spottimers.tin +++ b/src/spottimers.tin @@ -353,7 +353,7 @@ #nop The smuggler captain dies. #ACTION {^%1 dies.$} { #foreach {*killtimers[]} {spot} { - #nop Force case insensitivity on the match due to "The" "A" being capitalized + #nop Force case insensitivity on the match due to "The" "A" being capitalized; #regex {%1} {%i$spot} { #format {killtimers[$spot][time]} {%T}; };