From 25c2a5b094ccdc34ae3b0052a8d6d1889c44429a Mon Sep 17 00:00:00 2001 From: Brandon Cornejo Date: Sat, 1 Aug 2015 11:42:03 -0500 Subject: [PATCH] Add sorted campaign mob tracker --- README.md | 1 + aardwolf-session | 17 ----------------- aliases.tin | 31 +++++++++++++++++++++++++++++++ bin/aardwolf-session | 7 +++++++ bin/release | 14 ++++++++++++++ config.tin | 2 +- src/gmcp.tin | 2 -- src/init.tin | 3 ++- src/minimap.tin | 4 ++-- 9 files changed, 58 insertions(+), 23 deletions(-) delete mode 100755 aardwolf-session create mode 100755 bin/aardwolf-session create mode 100755 bin/release diff --git a/README.md b/README.md index 75b9ff2..2c32199 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ * repopwatch on|off - toggles announcing of repops in $repchan * .note *message here* - adds *message* to notes.log (bottom right window) * .newpage - clears the note screen, providing a fresh page +* cpcheck - print list of campaign targets to note window, sorted by area The actions.tin and aliases.tin files are a place for your personal triggers and aliases. diff --git a/aardwolf-session b/aardwolf-session deleted file mode 100755 index 696db49..0000000 --- a/aardwolf-session +++ /dev/null @@ -1,17 +0,0 @@ -#tmux kill-session -t aardwolf -#tmux new-session -d -s aardwolf -x 189 -y 47 -#tmux splitw -v -l 20 'tail -fs .1 /home/br4n/documents/MUD/AardWolf/aardwolf/aardwolf/quest' -#tmux selectp -t 0 -#tmux splitw -v -l 22 'tail -fs .1 /home/br4n/documents/MUD/AardWolf/aardwolf/aardwolf/affects' -#tmux selectp -t 2 -#tmux attach-session -t aardwolf -#tmux splitw -h -l 140 'tail -fs .1 /home/br4n/documents/MUD/AardWolf/aardwolf/aardwolf/channel.log' -#tmux splitw -v -l 37 'tt++ -G /home/br4n/documents/MUD/AardWolf/aardwolf/aardwolf/setup.tin' -#tmux send-keys -t 0 'exit' Enter - -tmux split-window -v -p 80 'tail -fs .1 /home/br4n/documents/MUD/AardWolf/aardwolf-tintin/logs/channel.log' -tmux swap-pane -Dd -tmux split-window -h -p 20 'tail -fs .1 /home/br4n/documents/MUD/AardWolf/aardwolf-tintin/logs/minimap.log' -tmux split-window -v -p 50 'tail -fs .1 /home/br4n/documents/MUD/AardWolf/aardwolf-tintin/logs/notes.log' -tmux select-pane -L -tmux send-keys 'tt++ -G /home/br4n/documents/MUD/AardWolf/aardwolf-tintin/config.tin' Enter diff --git a/aliases.tin b/aliases.tin index 08a05a4..7a149c1 100644 --- a/aliases.tin +++ b/aliases.tin @@ -25,3 +25,34 @@ #showme {<0&09>\<0&09\><099> <1&09>\<1&09\><099>}; }; }; + +#ALIAS {cpcheck} +{ + .newpage; + #var {cplog} {1}; + #line {log} {$dir/logs/notes.log} {<199>-==[<169>Campaign Targets<199>]==-<099>\n}; + campaign check; +}; + +#ACTION {^You still have to kill %. %* (%*)$} +{ + #if {$cplog} + { + #list {cpareas} {find} {%3} {exists}; + #if {$exists == 0} { #list {cpareas} {sort} {%3}; }; + #list {%3} {sort} {%2}; + }; +}; + +#ACTION {left to finish this campaign.$} +{ + #var {cplog} {0}; + #foreach {$cpareas[%*]} {name} + { + #line {log} {$dir/logs/notes.log} {<199>$name:<099>}; + #foreach {${$name}[%*]} {target} + { + #line {log} {$dir/logs/notes.log} { * <029>$target<099>}; + } + } +}; diff --git a/bin/aardwolf-session b/bin/aardwolf-session new file mode 100755 index 0000000..ffaf58d --- /dev/null +++ b/bin/aardwolf-session @@ -0,0 +1,7 @@ +#!/bin/bash +tmux split-window -h -p 22 'tail -fs .1 /home/br4n/documents/MUD/AardWolf/aardwolf-tintin/logs/minimap.log' +tmux split-window -v -p 58 'tail -fs .1 /home/br4n/documents/MUD/AardWolf/aardwolf-tintin/logs/notes.log' +tmux select-pane -L +tmux split-window -v -p 80 'tail -fs .1 /home/br4n/documents/MUD/AardWolf/aardwolf-tintin/logs/channel.log' +tmux swap-pane -Ud +tmux send-keys 'tt++ -G /home/br4n/documents/MUD/AardWolf/aardwolf-tintin/config.tin' Enter diff --git a/bin/release b/bin/release new file mode 100755 index 0000000..9870384 --- /dev/null +++ b/bin/release @@ -0,0 +1,14 @@ +#!/bin/bash + +# Clear Username and Password +sed -i '1,2s/{\(.*\)} {\(.*\)}\;$/{\1} {}\;/' config.tin +echo "Clearing credentials..." + +# Empty logs and history +for f in logs/*.log +do + rm $f + touch $f + echo "Clearing $f..." +done +echo "Done - ready to commit." diff --git a/config.tin b/config.tin index 99d06ec..a88139a 100644 --- a/config.tin +++ b/config.tin @@ -18,7 +18,7 @@ #READ {$dir/aliases.tin}; #READ {$dir/actions.tin}; -#ACTION {{^\{chan ch={answer|question|wangrp|gossip|barter|auction|nobletalk|sports|gclan|newbie|curse|market}\}%2$}} {#line gag}; +#ACTION {{^\{chan ch={answer|question|wangrp|tech|gossip|barter|auction|nobletalk|sports|gclan|newbie|curse|market}\}%2$}} {#line gag}; #ACTION {{\{stats\}}} {#line gag}; #SESSION {aard} {aardmud.org} {4000}; diff --git a/src/gmcp.tin b/src/gmcp.tin index faad781..651403b 100644 --- a/src/gmcp.tin +++ b/src/gmcp.tin @@ -75,8 +75,6 @@ #event {SESSION DISCONNECTED} { #history write {$dir/logs/history.log}; - #line log {$dir/logs/minimap.log} {\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n}; - #line log {$dir/logs/mobs.log} {\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n}; } #event {SESSION CONNECTED} diff --git a/src/init.tin b/src/init.tin index 68ea6df..1dd6392 100644 --- a/src/init.tin +++ b/src/init.tin @@ -3,9 +3,10 @@ #ALIAS {do_on_connect} { - protocol gmcp sendchar; map; + protocol gmcp sendchar; quest time; + look; }; #ACTION {^############# Reconnecting to Game #############$} {do_on_connect} diff --git a/src/minimap.tin b/src/minimap.tin index 5faaa4e..b963fe1 100644 --- a/src/minimap.tin +++ b/src/minimap.tin @@ -26,14 +26,14 @@ #ACTION {^$} { - #line log {$dir/logs/minimap.log} {\n\r\n\r}; + #line log {$dir/logs/minimap.log} {\n\n\n\n\n\n}; get_minimap; #line gag; } {1} #ACTION {{^\{roomchars\}}} { - #line log {$dir/logs/mobs.log} {\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n}; + #line log {$dir/logs/mobs.log} {\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n}; get_chars; #line gag; }