Mercurial > hg > batmud > ggrtf

changeset 1366:82d30c2f10d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Further fixes in handling of certain herbs in potion mixing macro etc.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 21 Mar 2011 17:05:52 +0200
parents 0cd6a973e6ab
children 79fc9fd2626a
files gm-alchemist.tf
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gm-alchemist.tf	Mon Mar 21 03:38:36 2011 +0200
+++ b/gm-alchemist.tf	Mon Mar 21 17:05:52 2011 +0200
@@ -128,11 +128,11 @@
 	/endif%;\
 	/if (_error) /break%;/endif%;\
 	/set alch_st=1%;\
-	/set alch_herb=$[replace("_"," ",alch_herb)]%;\
-	@@get %{alch_herb} from %{alch_jar}%;\
+	/let _herb=$[replace("_"," ", alch_herb)]%;\
+	@@get %{_herb} from %{alch_jar}%;\
 	/set alch_process=$(/grepeat -14 1 /galch_get_organ)%;\
-	/msq @{BCwhite}Mixing potion from@{n} '@{BCyellow}%{alch_mineral}@{n}', '@{BCcyan}%{alch_organ}@{n}' and '@{BCgreen}%{alch_herb}@{n}'...%;\
-	@@use mix potion at prepared flask use %{alch_mineral} %{alch_organ} %{alch_herb}
+	/msq @{BCwhite}Mixing potion from@{n} '@{BCyellow}%{alch_mineral}@{n}', '@{BCcyan}%{alch_organ}@{n}' and '@{BCgreen}%{_herb}@{n}'...%;\
+	@@use mix potion at prepared flask use %{alch_mineral} %{alch_organ} %{_herb}
 
 
 /def -i tmix =\
@@ -155,8 +155,9 @@
 		@@put %{alch_organ} in %{alch_can}%;\
 	/endif%;\
 	/if (alch_jar!~"" & alch_herb!~"")\
-		/msq Returning '%{alch_herb}' in can '%{alch_jar}'%;\
-		@@put %{alch_herb} in %{alch_jar}%;\
+		/let _herb=$[replace("_"," ", alch_herb)]%;\
+		/msq Returning '%{_herb}' in can '%{alch_jar}'%;\
+		@@put %{_herb} in %{alch_jar}%;\
 	/endif