From: Stephen Groundwater Date: Sun, 16 Oct 2005 14:50:49 +0000 (+0000) Subject: added missing icewood tiles X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=cce29fe2e92bdaaadb826c0b366b2eb5d55a6fcf;p=supertux.git added missing icewood tiles SVN-Revision: 2847 --- diff --git a/data/images/sprites.strf b/data/images/sprites.strf index 689abcf98..f216d43a4 100644 --- a/data/images/sprites.strf +++ b/data/images/sprites.strf @@ -1099,7 +1099,9 @@ (x-offset 4) (y-offset 3) (images "creatures/spidermite/spidermite.png" - "creatures/spidermite/spidermite.png")) +"creatures/spidermite/spidermite0.png" + "creatures/spidermite/spidermite1.png" +"creatures/spidermite/spidermite0.png")) (action (name "right") (x-offset 4) @@ -1268,7 +1270,45 @@ (mirror-action "squished-left") ) ) - +; Totem + (sprite (name "totem") + (action + (y-offset -3) + (fps 5) + (name "left") + (images "creatures/totem/walk-left-0.png" + "creatures/totem/walk-left-0.png" + "creatures/totem/walk-left-0.png") + ) + (action + (y-offset -3) + (fps 5) + (name "right") + (mirror-action "left") + ) + (action + (y-offset -3) + (name "small-left") + (images "creatures/totem/small-left-0.png" + "creatures/totem/walk-left-0.png" + "creatures/totem/walk-left-0.png") + ) + (action + (y-offset -3) + (name "small-right") + (mirror-action "small-left") + ) + (action + (y-offset -6) + (name "squished-left") + (images "creatures/totem/walk-left-0.png") + ) + (action + (y-offset -6) + (name "squished-right") + (mirror-action "squished-left") + ) + ) ; PoisonIvy (sprite (name "poisonivy") (action diff --git a/data/images/tiles.strf b/data/images/tiles.strf index 8474dc80c..68c974a32 100644 --- a/data/images/tiles.strf +++ b/data/images/tiles.strf @@ -59,7 +59,7 @@ ) (tilegroup (name "Stone Brick Walls") - (tiles 64 65 66 67 68 69 0 0 0 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 0 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 0 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 0 0 0 0 1355 0 0 0 1356 0 0 0 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1467 1468 1469 1470 1471 1472 1473 1474) + (tiles 64 65 66 67 68 69 0 0 0 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 0 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 0 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 0 0 0 0 1355 0 0 0 1356 0 0 0 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1467 1468 1469 1470 1471 1472 1473 1474 1475) ) (tilegroup (name "Signs") @@ -5762,6 +5762,12 @@ ) (solid #f) ) - + (tile + (id 1475) + (images + (region "tiles/castle/web.png" 32 64 32 32) + ) + (solid #f) +) ) ) diff --git a/data/images/tiles/castle/web.png b/data/images/tiles/castle/web.png index d5c87ffeb..9593027a5 100644 Binary files a/data/images/tiles/castle/web.png and b/data/images/tiles/castle/web.png differ diff --git a/data/images/tiles/icewood/foresttiles-4.png b/data/images/tiles/icewood/foresttiles-4.png new file mode 100755 index 000000000..b2af5f90e Binary files /dev/null and b/data/images/tiles/icewood/foresttiles-4.png differ diff --git a/data/images/tiles/icewood/icewood-1.png b/data/images/tiles/icewood/icewood-1.png new file mode 100644 index 000000000..86f50d768 Binary files /dev/null and b/data/images/tiles/icewood/icewood-1.png differ diff --git a/data/images/tiles/icewood/icewood-5.png b/data/images/tiles/icewood/icewood-5.png new file mode 100644 index 000000000..cdf50151a Binary files /dev/null and b/data/images/tiles/icewood/icewood-5.png differ diff --git a/data/images/tiles/icewood/icewood-6.png b/data/images/tiles/icewood/icewood-6.png new file mode 100644 index 000000000..992adbac9 Binary files /dev/null and b/data/images/tiles/icewood/icewood-6.png differ diff --git a/data/images/tiles/icewood/icewood-7.png b/data/images/tiles/icewood/icewood-7.png new file mode 100755 index 000000000..2e4d8e394 Binary files /dev/null and b/data/images/tiles/icewood/icewood-7.png differ diff --git a/data/levels/world2/icewood.stl b/data/levels/world2/icewood.stl index 6f5d734a8..32e3a0404 100644 --- a/data/levels/world2/icewood.stl +++ b/data/levels/world2/icewood.stl @@ -16,14 +16,14 @@ (tiles 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1467 1468 1469 1470 1467 1468 1469 1470 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1471 1472 1473 1395 1395 1472 1473 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1382 1395 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1475 1395 1395 1395 1475 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1475 1395 1395 1395 1475 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1475 1395 1395 1395 1475 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1475 1395 1395 1382 1475 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1475 1395 1395 1395 1475 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1475 1395 1395 1395 1475 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1475 1395 1395 1395 1475 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1475 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1395 1395 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1442 1442 1423 1423 1423 1423 1423 1423 1423 1423 1423 1423 1423 1423 1423 1423 1423 1423 1423 1423 1423 1425 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 64 64 64 64 64 64 64 0 0 0 0 0 0 0 0 0 0 0 0 0 1429 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1435 1435 1441 0 0 0 1450 1450 1450 1450 1450 1450 1450 1450 1450 1450 1450 1450 1450 1450 1450 1450 1450 1450 1450 1450 1433 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -45,10 +45,10 @@ 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1372 1372 1372 1372 1372 1395 1372 1372 1467 1468 1469 1470 1467 1468 1469 1470 1467 1468 1469 1470 1372 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1395 1467 1468 1469 1470 1395 1372 1372 1471 1472 1473 1474 1471 1472 1473 1474 1471 1472 1473 1474 1372 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 1372 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 1382 1382 1382 1382 1382 1382 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1395 1395 1395 1395 1372 1372 1372 1475 1372 1372 1372 1475 1372 1372 1372 1372 1372 1372 1372 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1475 1395 1395 1395 1372 1372 1372 1475 1372 1372 1372 1475 1372 1372 1372 1372 1372 1372 1372 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 1395 1395 1475 1395 1395 1395 1372 1372 1372 1475 1372 1372 1372 1475 1372 1372 1372 1372 1372 1372 1372 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 1382 1382 1475 1382 1382 1382 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/src/badguy/mrtree.hpp b/src/badguy/mrtree.hpp index 058e26141..8858d4ea0 100644 --- a/src/badguy/mrtree.hpp +++ b/src/badguy/mrtree.hpp @@ -18,15 +18,15 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. -#ifndef __MRTREE_H__ -#define __MRTREE_H__ +#ifndef __TOTEM_H__ +#define __TOTEM_H__ #include "badguy.hpp" -class MrTree : public BadGuy +class Totem : public BadGuy { public: - MrTree(const lisp::Lisp& reader); + Totem(const lisp::Lisp& reader); void activate(); void write(lisp::Writer& writer);