git » fp-git.git » commit 73a64dc

blocking improved

author rata
2004-10-31 19:15:53 UTC
committer rata
2004-10-31 19:15:53 UTC
parent c620e3ac5f699d35da39c1bf33e8584abbc7c304

blocking improved

FP/src/conf/states/main.conf +56 -3

diff --git a/FP/src/conf/states/main.conf b/FP/src/conf/states/main.conf
index fa3bfc1..3be4cdb 100644
--- a/FP/src/conf/states/main.conf
+++ b/FP/src/conf/states/main.conf
@@ -23,12 +23,27 @@
 #  Created: 15 Oct 2004
 #
 #  Author: Enrique Calot <ecalot.cod@princed.com.ar>
+#	   Rodrigo Campos Catelin <rodrigocc@gmail.com>
 #
 # Note:
 #  DO NOT remove this copyright notice
 #
 
 normal:
+	action            Jump and crash
+		conditions
+			KeyUp                  pressed
+			KeyForward             pressed
+			MapForward		block
+		next
+			normal
+		animation
+			16-27 
+			28 ps
+			29-33 p
+		steps
+			relative 0
+	
 	action            Jump
 		conditions
 			KeyUp                  pressed
@@ -41,6 +56,8 @@ normal:
 			29-33 p
 		steps
 			relative 20
+
+
 	action            Pass level
 		conditions
 			KeyUp                  pressed
@@ -64,10 +81,11 @@ normal:
 			99 u
 		steps
 			relative 5 #use absolute forward
-	action            Jump up with free space up
+	action            Jump up with free space up and a block in front
 		conditions
 			KeyUp                  pressed
 			MapUp                  space
+			MapForward		block
 		next
 			normal
 		animation
@@ -75,6 +93,19 @@ normal:
 			96-99
 		steps
 			relative 0
+
+	action            Jump up with free space up
+		conditions
+			KeyUp                  pressed
+			MapUp                  space
+		next
+			normal
+		animation
+			81-93 
+			96-99
+		steps
+			relative 2
+
 	action            Jump up with cieling
 		conditions
 			KeyUp                  pressed
@@ -180,10 +211,21 @@ running:
 		next
 			crouched
 		steps
-			relative 10
+			relative 2
 		animation
 			118-120 p
-	
+	action            Jump and crash
+		conditions
+			KeyUp                  pressed
+			KeyForward             pressed
+			MapForward		block
+		next
+			normal
+		steps
+			relative 0
+		animation
+			34-44 p
+
 	action            Jump
 		conditions
 			KeyUp                  pressed
@@ -194,6 +236,7 @@ running:
 			relative 20
 		animation
 			34-44 p
+
 	
 	action            Keep running and crash
 		conditions
@@ -246,6 +289,16 @@ crouched:
 		animation
 			120 p
 
+	action   Get up but with a block in front
+		conditions
+			MapForward		block
+		next
+			normal
+		steps
+			relative 0
+		animation
+			121-129 p
+
 	action		 Get up
 		conditions
 			none