| author | ecalot
<ecalot> 2005-03-05 14:11:06 UTC |
| committer | ecalot
<ecalot> 2005-03-05 14:11:06 UTC |
| parent | 120a890b15de10dd5a6746baf6f71305d4c6bd43 |
| FP/src/conf/awk/room_conf.awk | +5 | -4 |
| FP/src/conf/room.conf | +92 | -89 |
diff --git a/FP/src/conf/awk/room_conf.awk b/FP/src/conf/awk/room_conf.awk index 89be669..9dabaf7 100644 --- a/FP/src/conf/awk/room_conf.awk +++ b/FP/src/conf/awk/room_conf.awk @@ -29,19 +29,20 @@ # -/[\t ]*XX .*/ { +/^[\t ]*XX .*/ { if (inIf) printf("}\n"); printf("\n#define draw%s(x,y,left,tile,right,dleft) \\\n",$2) inIf=0 } -/[\t ]*if / { +/^[\t ]*cond / { if (inIf) printf("}\\\n"); - printf("%s {\\\n",$0) + $1="" + printf("if (%s) {\\\n",$0) inIf=1 } -/[\t ]*draw/ { +/^[\t ]*draw/ { f=$1 x=$2 y=$3 diff --git a/FP/src/conf/room.conf b/FP/src/conf/room.conf index 1f01ffe..86dc6a9 100644 --- a/FP/src/conf/room.conf +++ b/FP/src/conf/room.conf @@ -1,234 +1,237 @@ + +# vim: set ts=10 + XX AllLeft # Gate/left - if (isIn(left,TILES_DOOR)) + cond isIn(left,TILES_DOOR) drawAll 0 2 15 drawGate 0 -TILE_H+3 gateGetFrame(left) - + # normal/left - if (isIn(left,TILES_FLOOR)) + cond isIn(left,TILES_FLOOR) drawAll 0 2 10 # loose moving/left - if (isIn(left,TILES_LOOSEMOVING)) + cond isIn(left,TILES_LOOSEMOVING) drawLoose 0 2 looseGetFrame(left),layTritop # exit_left/left - if (isIn(left,TILE_EXIT_RIGHT)) + cond isIn(left,TILE_EXIT_RIGHT) drawAll 0 2 7 # pillar/left - if (isIn(left,TILES_PILLAR)) + cond isIn(left,TILES_PILLAR) drawAll 0 2 44 # pillar_big_up/left - if (isIn(left,TILE_BP_BOTTOM)) + cond isIn(left,TILE_BP_BOTTOM) drawAll 0 2 83 - if (isIn(left,TILE_BP_TOP)) + cond isIn(left,TILE_BP_TOP) drawAll 0 3 85 # pressable/left - if (isIn(left,TILES_RAISE_PRESSED)) + cond isIn(left,TILES_RAISE_PRESSED) drawAll 0 2 10 - if (isIn(left,TILES_RAISE_UNPRESSED)) + cond isIn(left,TILES_RAISE_UNPRESSED) drawAll 0 1 10 - if (isIn(left,TILES_DROP_PRESSED)) + cond isIn(left,TILES_DROP_PRESSED) drawAll 0 3 10 - if (isIn(left,TILES_DROP_UNPRESSED)) + cond isIn(left,TILES_DROP_UNPRESSED) drawAll 0 2 10 # debris/left - if (isIn(left,TILES_BROKENTILE)) + cond isIn(left,TILES_BROKENTILE) drawAll 0 2 49 # spikes/left - if (isIn(left,TILES_SPIKES)) + cond isIn(left,TILES_SPIKES) drawAll 0 2 107 drawSpike -TILE_W 0 spikeGetFrame(left),layRight - + # skeleton/left - if (isIn(left,TILES_SKELETON)) + cond isIn(left,TILES_SKELETON) drawAll 0 2 81 # sword/left - if (isIn(left,TILES_SWORD)) - drawSword -15 -4 + cond isIn(left,TILES_SWORD) + drawSword -15 -4 # potion base/left - if (isIn(left,TILES_SMALLPOTION)) - drawPotionSmallBase 15 -4 - if ((isIn(left,TILES_BIGPOTION))) - drawPotionBigBase 15 -4 + cond isIn(left,TILES_SMALLPOTION) + drawPotionSmallBase -15 -4 + cond (isIn(left,TILES_BIGPOTION)) + drawPotionBigBase -15 -4 # potion animation/left - if (isIn(left,TILES_REDPOTION)) + cond isIn(left,TILES_REDPOTION) drawPotionRedBubbles 3-15 -15 isIn(left,TILES_BIGPOTION) - if (isIn(left,TILES_GREENPOTION)) + cond isIn(left,TILES_GREENPOTION) drawPotionGreenBubbles 3-15 -15 isIn(left,TILES_BIGPOTION) - if (isIn(left,TILES_BLUEPOTION)) + cond isIn(left,TILES_BLUEPOTION) drawPotionBlueBubbles 3-15 -15 isIn(left,TILES_BIGPOTION) XX AllTile # Wall/left - if ((!isIn(tile,TILES_WALL))&&(isIn(left,TILES_WALL))) + cond (!isIn(tile,TILES_WALL))&&(isIn(left,TILES_WALL)) drawAll 0 2 63 # torch/this - if (isIn(tile,TILES_TORCH)) - # animation + cond isIn(tile,TILES_TORCH) + # animation drawTorchFire 11+TILE_W -39 # base drawAll 3+TILE_W -24 56 - + # chopper/this - if (isIn(tile,TILE_CHOPPER)) + cond isIn(tile,TILE_CHOPPER) drawChopper 0 0 chopperGetFrame(tile),layCBack # empty_bricks/this - if (isIn(tile,TILES_BRICKE1)) + cond isIn(tile,TILES_BRICKE1) drawAll TILE_W+0 -18 52 - if (isIn(tile,TILES_BRICKE2)) + cond isIn(tile,TILES_BRICKE2) drawAll TILE_W+0 -18 53 - if (isIn(tile,TILES_WINDOW)) + cond isIn(tile,TILES_WINDOW) drawAll TILE_W+0 -18 54 # floor_bricks/this - if (isIn(tile,TILES_BRICKF1)) + cond isIn(tile,TILES_BRICKF1) drawAll TILE_W+0 -18 12 - if (isIn(tile,TILES_BRICKF2)) + cond isIn(tile,TILES_BRICKF2) drawAll TILE_W+0 -18 13 # gate/this - if (isIn(tile,TILES_DOOR)) + cond isIn(tile,TILES_DOOR) drawAll 0 0 14 # gate_frame/this - if (isIn(tile,TILES_GATEFRAME)) + cond isIn(tile,TILES_GATEFRAME) drawAll 24 0 17 # normal/this - if (isIn(tile,TILES_FLOOR)) + cond isIn(tile,TILES_FLOOR) drawAll 0 0 9 # loose moving/this - if (isIn(tile,TILES_LOOSEMOVING)) + cond isIn(tile,TILES_LOOSEMOVING) drawLoose 0 0 looseGetFrame(tile),layTribot # exit_left/this - if (isIn(tile,TILE_EXIT_RIGHT)) + cond isIn(tile,TILE_EXIT_RIGHT) drawAll 0 0 5 - if (isIn(tile,TILE_EXIT_LEFT)) + cond isIn(tile,TILE_EXIT_LEFT) drawAll 0 0 9 drawExit TILE_W+8 -TILE_H-1 gateGetFrame(tile) - + # pillar/this - if (isIn(tile,TILES_PILLAR)) + cond isIn(tile,TILES_PILLAR) drawAll 0 0 43 # big_pillar/this - if (isIn(tile,TILE_BP_BOTTOM)) + cond isIn(tile,TILE_BP_BOTTOM) drawAll 0 0 82 - if (isIn(tile,TILE_BP_TOP)) + cond isIn(tile,TILE_BP_TOP) drawAll 8 3 87 # pressable/this # TODO: use boolean algebra to simplify this - if (isIn(tile,TILES_RAISE_UNPRESSED)&&isIn(left,TILES_WALKABLE)&&(!isIn(left,TILES_RAISE))) + cond isIn(tile,TILES_RAISE_UNPRESSED)&&isIn(left,TILES_WALKABLE)&&(!isIn(left,TILES_RAISE)) drawAll 0 0 57 - if ((isIn(tile,TILES_RAISE)&&((!isIn(tile,TILES_UNPRESSED))||(!isIn(left,TILES_WALKABLE))||isIn(left,TILES_RAISE)))&&(isIn(tile,TILES_UNPRESSED))) + cond (isIn(tile,TILES_RAISE)&&((!isIn(tile,TILES_UNPRESSED))||(!isIn(left,TILES_WALKABLE))||isIn(left,TILES_RAISE)))&&(isIn(tile,TILES_UNPRESSED)) drawAll 0 0 58 - if (((isIn(tile,TILES_RAISE)&&((!isIn(tile,TILES_UNPRESSED))||(!isIn(left,TILES_WALKABLE))||isIn(left,TILES_RAISE)))&&(!isIn(tile,TILES_UNPRESSED)))||isIn(tile,TILES_DROP_UNPRESSED)) + cond ((isIn(tile,TILES_RAISE)&&((!isIn(tile,TILES_UNPRESSED))||(!isIn(left,TILES_WALKABLE))||isIn(left,TILES_RAISE)))&&(!isIn(tile,TILES_UNPRESSED)))||isIn(tile,TILES_DROP_UNPRESSED) drawAll 0 1 58 - if (isIn(tile,TILES_DROP_PRESSED)) + cond isIn(tile,TILES_DROP_PRESSED) drawAll 0 2 58 # debris/this - if (isIn(tile,TILES_BROKENTILE)) + cond isIn(tile,TILES_BROKENTILE) drawAll 0 0 48 # spikes/this - if (isIn(tile,TILES_SPIKES)) + cond isIn(tile,TILES_SPIKES) drawAll 0 0 101 drawSpike 0 0 spikeGetFrame(tile),layBack - + # skeleton/this - if (isIn(tile,TILES_SKELETON)) + cond isIn(tile,TILES_SKELETON) drawAll 0 0 80 XX AllBack # loose moving - if (isIn(tile,TILES_LOOSEMOVING)) + cond isIn(tile,TILES_LOOSEMOVING) drawLoose 0 3 looseGetFrame(tile),layBase # normal - if (isIn(tile,TILES_UNPRESSED)) + cond isIn(tile,TILES_UNPRESSED) # TODO: drop has resource 59 for unpressed/raise 47? checkgame drawAll 0 3 59 - if (isIn(tile,TILES_PRESSED)) + cond isIn(tile,TILES_PRESSED) drawAll 0 4 59 - if (isIn(tile,TILES_WALKABLE)&&(!isIn(tile,TILES_LOOSEMOVING))&&(!isIn(tile,TILES_PRESSABLE))) + cond isIn(tile,TILES_WALKABLE)&&(!isIn(tile,TILES_LOOSEMOVING))&&(!isIn(tile,TILES_PRESSABLE)) drawAll 0 3 11 # wall # there are 4 cases - if (wallCase(WALL_LOC_WWW)) + cond wallCase(WALL_LOC_WWW) drawAll 0 3 65 - if (wallCase(WALL_LOC_SWW)) + cond wallCase(WALL_LOC_SWW) drawAll 0 3 71 - if (wallCase(WALL_LOC_WWS)) + cond wallCase(WALL_LOC_WWS) drawAll 0 3 67 - if (wallCase(WALL_LOC_SWS)) + cond wallCase(WALL_LOC_SWS) drawAll 0 3 69 # empty/gate_frame/this - if (isIn(tile,TILES_SPACE)&&isIn(tile,TILES_GATEFRAME)) + cond isIn(tile,TILES_SPACE)&&isIn(tile,TILES_GATEFRAME) drawAll 0 3 42 # empty/gate/left - if (isIn(tile,TILES_SPACE)&&isIn(dleft,TILES_DOOR)) + cond isIn(tile,TILES_SPACE)&&isIn(dleft,TILES_DOOR) drawAll 0 3 16 # empty/big_pillar/left - if (isIn(tile,TILES_SPACE)&&isIn(dleft,TILE_BP_TOP)) + cond isIn(tile,TILES_SPACE)&&isIn(dleft,TILE_BP_TOP) drawAll 0 3 86 # empty/pillar/left - if (isIn(tile,TILES_SPACE)&&isIn(dleft,TILES_PILLAR)) + cond isIn(tile,TILES_SPACE)&&isIn(dleft,TILES_PILLAR) drawAll 0 3 45 # empty/wall/left - if (isIn(tile,TILES_SPACE)&&isIn(dleft,TILES_WALL)) + cond isIn(tile,TILES_SPACE)&&isIn(dleft,TILES_WALL) drawAll 0 3 64 # upper objects - if (isIn(tile,TILE_EXIT_LEFT)) + cond isIn(tile,TILE_EXIT_LEFT) drawAll 0+TILE_W -TILE_H+3 6 - if (isIn(tile,TILE_EXIT_RIGHT)) + cond isIn(tile,TILE_EXIT_RIGHT) drawAll 0+TILE_W -TILE_H+3 8 XX AllFore # pillar - if (isIn(tile,TILES_PILLAR)) + cond isIn(tile,TILES_PILLAR) drawAll 8 0 46 # big pillar - if (isIn(tile,TILE_BP_BOTTOM)) + cond isIn(tile,TILE_BP_BOTTOM) drawAll 8 0 84 # wall # there are 4 cases - if (wallCase(WALL_LOC_WWW)) + cond wallCase(WALL_LOC_WWW) drawAll 0 0 66 - if (wallCase(WALL_LOC_SWW)) + cond wallCase(WALL_LOC_SWW) drawAll 0 0 72 - if (wallCase(WALL_LOC_WWS)) + cond wallCase(WALL_LOC_WWS) drawAll 0 0 68 - if (wallCase(WALL_LOC_SWS)) + cond wallCase(WALL_LOC_SWS) drawAll 0 0 70 - + # the seed generation algorithm # Upper row - if (wallGetInfo(WALL_TABLE_LINE1_DARKER)) + cond wallGetInfo(WALL_TABLE_LINE1_DARKER) drawAll 0 -39 75 - if (wallGetInfo(WALL_TABLE_LINE1_LEFT_DOWN)) + cond wallGetInfo(WALL_TABLE_LINE1_LEFT_DOWN) drawAll 0 -39 77 - if (wallGetInfo(WALL_TABLE_LINE1_RIGHT_DOWN)) + cond wallGetInfo(WALL_TABLE_LINE1_RIGHT_DOWN) drawAll 24 -39 79 - if (wallGetInfo(WALL_TABLE_LINE1_RIGHT_UP)) + cond wallGetInfo(WALL_TABLE_LINE1_RIGHT_UP) drawAll 24 -49 78 - if (wallGetInfo(WALL_TABLE_LINE1_LEFT_UP)) + cond wallGetInfo(WALL_TABLE_LINE1_LEFT_UP) drawAll 0 -54 76 # Second row - if (isIn(tile,TILES_WALL)) + cond isIn(tile,TILES_WALL) drawAll 7+wallGetInfo(WALL_TABLE_LINE2_OFFSET) -18 74-wallGetInfo(WALL_TABLE_LINE2_SEP) - if (wallGetInfo(WALL_TABLE_LINE2_LEFT_DOWN)) + cond wallGetInfo(WALL_TABLE_LINE2_LEFT_DOWN) drawAll 7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)+5 -39+21 77 - if (wallGetInfo(WALL_TABLE_LINE2_RIGHT_DOWN)) + cond wallGetInfo(WALL_TABLE_LINE2_RIGHT_DOWN) drawAll 24+7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)-32+5 -39+21 79 - if (wallGetInfo(WALL_TABLE_LINE2_RIGHT_UP)) + cond wallGetInfo(WALL_TABLE_LINE2_RIGHT_UP) drawAll 24+7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)-32+5 -49+21 78 - if (wallGetInfo(WALL_TABLE_LINE2_LEFT_UP)) + cond wallGetInfo(WALL_TABLE_LINE2_LEFT_UP) drawAll 7+wallGetInfo(WALL_TABLE_LINE2_OFFSET)+5 -54+21 76 # Third row TODO: send to BottomTile - if (isIn(tile,TILES_WALL)) + cond isIn(tile,TILES_WALL) drawAll 3+wallGetInfo(WALL_TABLE_LINE3_OFFSET) 3 74-wallGetInfo(WALL_TABLE_LINE3_SEP) - if (wallGetInfo(WALL_TABLE_LINE3_LEFT_UP)) + cond wallGetInfo(WALL_TABLE_LINE3_LEFT_UP) drawAll 5+wallGetInfo(WALL_TABLE_LINE3_OFFSET)+5 -55+21*2 76 # debris/this foreground layer - if (isIn(tile,TILES_BROKENTILE)) + cond isIn(tile,TILES_BROKENTILE) drawAll 0 0 51 # spikes/this foreground layer - if (isIn(tile,TILES_SPIKES)) + cond isIn(tile,TILES_SPIKES) drawSpike 0 0 spikeGetFrame(tile),layFore