git » fp-git.git » commit c620e3a

Added blocking

author ecalot
2004-10-30 02:23:59 UTC
committer ecalot
2004-10-30 02:23:59 UTC
parent 1d7550f93a29f7118a9b1b908541d9f0947bcf6d

Added blocking

FP/src/conf/resources.conf +1 -1
FP/src/conf/states/main.conf +33 -0
FP/src/conf/tiles.conf +2 -1

diff --git a/FP/src/conf/resources.conf b/FP/src/conf/resources.conf
index 15d274a..076e1e5 100644
--- a/FP/src/conf/resources.conf
+++ b/FP/src/conf/resources.conf
@@ -65,7 +65,7 @@ IMGS_POTION_BASE     IMG PRINCE  150 162 163
 
 IMG_ENV_DUNGEON      IMG DUNGEON 200 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 269 270 271 272 273 274 285 292 293 294 295 296 297 298 299 300 324 325 326 344 346 347 348 349 350 351 351 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 1230 1231 1286 1287 1288 1289 1290 1291 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343
 
-#dungeon environment
+#palace environment
 
 IMG_ENV_PALACE      IMG PALACE 200 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 269 270 271 272 273 274 285 292 293 294 295 296 297 298 299 300 324 325 326 344 346 347 348 349 350 351 351 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 1230 1231 1286 1287 1288 1289 1290 1291 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343
 
diff --git a/FP/src/conf/states/main.conf b/FP/src/conf/states/main.conf
index 4a4e0eb..fa3bfc1 100644
--- a/FP/src/conf/states/main.conf
+++ b/FP/src/conf/states/main.conf
@@ -85,6 +85,18 @@ normal:
 			97-99
 		steps
 			relative 0
+	action            Start walking but he will crach into the wall
+		conditions
+			KeyShift               pressed
+			KeyForward             pressed
+			MapForward             block
+		next
+			normal
+		steps
+			relative 0
+		animation
+			134-135 p
+			143-145	p
 	action            Start walking
 		conditions
 			KeyShift               pressed
@@ -97,6 +109,16 @@ normal:
 			134-135 p
 			136-142
 			143-145	p
+	action            Start running and crashing
+		conditions
+			KeyForward             pressed
+			MapForward             block
+		next
+			normal
+		steps
+			relative 0
+		animation
+			1 p
 	action            Start running
 		conditions
 			KeyForward             pressed
@@ -173,6 +195,17 @@ running:
 		animation
 			34-44 p
 	
+	action            Keep running and crash
+		conditions
+			KeyForward             pressed
+			MapForward             block
+		next
+			normal
+		steps
+			relative 0
+		animation
+			5-7 p
+			13-14 p
 	action            Keep running
 		conditions
 			KeyForward             pressed
diff --git a/FP/src/conf/tiles.conf b/FP/src/conf/tiles.conf
index d7d8583..e8fc2da 100644
--- a/FP/src/conf/tiles.conf
+++ b/FP/src/conf/tiles.conf
@@ -37,7 +37,7 @@ walkable dangerous
 tile PILLAR 3 none
 
 tile GATE 4 gate
-gates
+gates block@1
 
 tile BTN_STUCK 5 none
 tile BTN_DROP 6 event
@@ -59,6 +59,7 @@ exitdoor
 tile CHOPPER 18 chomp
 tile TORCH 19 none
 tile WALL 20 wall
+block
 tile SKELETON 21 none
 tile SWORD 22 none
 tile BALCONY_LEFT 23 none