git » fp-git.git » commit 17d36d7

diff --git a/FP/src/conf/awk/states_conf_static.awk b/FP/src/conf/awk/states_conf_static.awk
index 8821dca..4f9ce69 100644
--- a/FP/src/conf/awk/states_conf_static.awk
+++ b/FP/src/conf/awk/states_conf_static.awk
@@ -260,12 +260,12 @@ END {
 	for (i=0;i<currentAnimation;i++) {
 		flags=arrayAnimation[i,"flags"]
 		
-		b=match(flags,/[+][ ]*([0-9]+)/)
-		steps=substr(flags,b,RLENGTH)/1
-		c=match(flags,/[-][ ]*([0-9]+)/)
-		offxs=substr(flags,c,RLENGTH)/1
+		b=match(flags,/\$[ ]*([+-]?[0-9]+)/)
+		steps=substr(flags,b+1,RLENGTH)
+		c=match(flags,/\@[ ]*([+-]?[0-9]+)/)
+		offxs=substr(flags,c+1,RLENGTH)/1
 		
-		s=match(flags,/([^0-9 +-])/)
+		s=match(flags,/([^0-9 +@\$-])/)
 		if (s) d=substr(flags,s,1)
 		if (s&&(d!="#")) {
 			coma2=""
@@ -273,7 +273,7 @@ END {
 			while (s) {
 				flagmask=sprintf("%s%sSTATES_FLAG_%s",flagmask,coma2,toupper(d))
 				flags=substr(flags,s+1,length(flags)-s)
-				s=match(flags,/([^0-9 +-])/)
+				s=match(flags,/([^0-9 +@\$-])/)
 				if (s) d=substr(flags,s,1)
 				if (d=="#") s=0
 				coma2="|"
diff --git a/FP/src/conf/states/main.conf b/FP/src/conf/states/main.conf
index 3081e98..6195980 100644
--- a/FP/src/conf/states/main.conf
+++ b/FP/src/conf/states/main.conf
@@ -38,7 +38,7 @@ normal:
 		next
 			normal
 		animation
-			16-22 +2
+			16-22 $2
 		steps
 			absoluteOnStop  8
 	
@@ -49,9 +49,9 @@ normal:
 		next
 			normal
 		animation
-			16-27 +4
+			16-27 $4
 			28 ps
-			29-33 p +2
+			29-33 p $2
 		steps
 			relative  0
 
@@ -136,11 +136,11 @@ normal:
 		steps
 			relative  0
 		animation
-			134-135 p +1
-			136 +5
-			137-139 +6
-			140 +5
-			141-145	p +1 #total: 32
+			134-135 p $1
+			136 $5
+			137-139 $6
+			140 $5
+			141-145	p $1 #total: 32
 	action            Start running and crashing
 		conditions
 			KeyForward             pressed
@@ -159,7 +159,7 @@ normal:
 		steps
 			relative  0
 		animation
-			1-4 p +3
+			1-4 p $3
 	action            Turn
 		conditions
 			KeyBack                pressed
@@ -187,7 +187,7 @@ normal:
 		steps
 			relative  0
 		animation
-			15 f +2
+			15 f $2
 
 	action            If there aren't more actions then the normal state is kept
 		conditions
@@ -237,7 +237,7 @@ running:
 		steps
 			relative  0
 		animation
-			34-44 p +7
+			34-44 p $7
 
 	
 	action            Keep running and crash
@@ -258,7 +258,7 @@ running:
 		steps
 			relative  0
 		animation
-			5-14 p +5
+			5-14 p $5
 	action            Turn
 		conditions
 			KeyBack                pressed