git » fp-git.git » commit 6bf60db

added fallings 2 and 3. Bugfixed segmentation fault.

author ecalot
2005-02-19 09:37:50 UTC
committer ecalot
2005-02-19 09:37:50 UTC
parent 2d9110b23614c120f7cb8298861cd2dbb2672206

added fallings 2 and 3. Bugfixed segmentation fault.

FP/src/conf/states/main.conf +76 -8

diff --git a/FP/src/conf/states/main.conf b/FP/src/conf/states/main.conf
index b1ebea5..65f33ab 100644
--- a/FP/src/conf/states/main.conf
+++ b/FP/src/conf/states/main.conf
@@ -410,36 +410,104 @@ falling1:
 	action		falling to a walkable place
 	
 		conditions
-			MapNotOn	walkable
 			MapDown		walkable
 		next
 			crouched
 		animation
-			15 f $2
-		steps
-			relative 0
+			113 f $2 @50
+			114 @40
+			115 @18
+			116 @5
+			117
 	
 	action		falling to spikes
 		
 		conditions
-			MapNotOn	walkable
 			MapDown		spikes
 		next
 			exit spiked
 		animation
+			15 f @50
 			212-216
+	
+	action		Continue falling
+		condition
+			MapNotOn	walkable
+		next
+			falling2
 		steps
 			relative 0
-	action
+		animation
+			113 f $2 @50
+			114 @40
+			115 @18
+			116 @5
+			117
+
+falling2:
+	action		falling to a walkable place
+		conditions
+			MapDown		walkable
+		next
+			crouched
+		animation
+			117 f @50
+			117 @30
+			117 @15
+			219 h
+	
+	action		falling to spikes
+		
+		conditions
+			MapDown		spikes
+		next
+			exit spiked
+		animation
+			15 f @50
+			212-216
 	
 	action		Continue falling
 		
 		condition
 			MapNotOn	walkable
 		next
-			Falling2
+			falling3
 		steps
 			relative 0
 		animation
-			15		
+			117 f @50
+			117 @30
+			117 @15
+			117
 
+falling3:
+	action		falling to a walkable place
+		conditions
+			MapDown		walkable
+		next
+			exit splash
+		animation
+			117 f @45
+			117 @20
+			117
+	
+	action		falling to spikes
+		
+		conditions
+			MapDown		spikes
+		next
+			exit spiked
+		animation
+			15 f @45
+			212-216
+	
+	action		Continue falling
+		
+		condition
+			MapNotOn	walkable
+		next
+			falling3
+		animation
+			117 f @45
+			117 @20
+			117