diff --git a/data/rooms/43.txt b/data/rooms/43.txt index 882ad6c..0bbb08c 100644 --- a/data/rooms/43.txt +++ b/data/rooms/43.txt @@ -67,3 +67,25 @@ actor{ orient: ZP movement: Z } + +actor{ + name: PLATH-02 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 32 8 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-03 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 24 8 0 + size: 8 8 4 + orient: ZP + movement: Z +} diff --git a/data/rooms/47.txt b/data/rooms/47.txt index 9199575..3c16544 100644 --- a/data/rooms/47.txt +++ b/data/rooms/47.txt @@ -314,6 +314,18 @@ actor{ movement: Z } +actor{ + name: PLATH-25 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 32 8 0 + size: 8 8 4 + orient: ZP + flags: MOVING + movement: Z +} + actor{ name: PLATH-26 bmp: caixes.gif diff --git a/data/rooms/51.txt b/data/rooms/51.txt index a371a04..8c75522 100644 --- a/data/rooms/51.txt +++ b/data/rooms/51.txt @@ -1,10 +1,10 @@ -width: 3 -height: 3 +width: 2 +height: 2 door-height-yp: 0 color: CYAN -floor-texture: 0 -wall-texture: 0 -door-texture: 0 +floor-texture: 1 +wall-texture: 8 +door-texture: 5 under-door-texture: 0 exit-yp: 52 exit-zp: 47 diff --git a/data/rooms/59.txt b/data/rooms/59.txt index f5db7b9..8f07101 100644 --- a/data/rooms/59.txt +++ b/data/rooms/59.txt @@ -4,12 +4,276 @@ door-height-xp: 0 door-height-xn: 0 door-height-yp: 0 door-height-yn: 0 -color: CYAN -floor-texture: 0 -wall-texture: 0 -door-texture: 0 +color: GREEN +floor-texture: 1 +wall-texture: 13 +door-texture: 5 under-door-texture: 0 exit-xp: 58 exit-xn: 61 exit-yp: 60 exit-yn: 62 + +actor{ + name: BLOCMATA-00 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 8 8 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-01 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 16 8 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-02 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 8 16 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-03 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 40 8 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-04 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 48 8 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-05 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 48 16 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-06 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 48 40 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-07 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 48 48 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-08 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 40 48 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-09 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 16 48 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-10 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 8 48 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-11 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 8 40 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-12 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 24 24 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-13 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 32 24 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-14 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 32 32 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BLOCMATA-15 + bmp: altres.gif + bmp-rect: 0 133 32 27 + bmp-offset: 0 27 + pos: 24 32 0 + size: 8 8 6 + flags: REACTIVE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CW +} + +actor{ + name: BUBBLE-00 + bmp: altres.gif + bmp-rect: 20 75 28 26 + bmp-offset: -2 28 + pos: 8 8 6 + size: 8 8 8 + flags: PUSHABLE INERTIA + movement: CW +} + +actor{ + name: BUBBLE-01 + bmp: altres.gif + bmp-rect: 20 75 28 26 + bmp-offset: -2 28 + pos: 48 8 6 + size: 8 8 8 + flags: PUSHABLE INERTIA + movement: CW +} + +actor{ + name: BUBBLE-02 + bmp: altres.gif + bmp-rect: 20 75 28 26 + bmp-offset: -2 28 + pos: 48 48 6 + size: 8 8 8 + flags: PUSHABLE INERTIA + movement: CW +} + +actor{ + name: BUBBLE-03 + bmp: altres.gif + bmp-rect: 20 75 28 26 + bmp-offset: -2 28 + pos: 8 48 6 + size: 8 8 8 + flags: PUSHABLE INERTIA + movement: CW +} + +actor{ + name: GAT-BATMAN + bmp: gat.gif + bmp-rect: 0 0 24 28 + bmp-offset: -4 32 + pos: 16 16 0 + size: 8 8 8 + orient: XP + anim-wait: 1 + flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CCW +} + +actor{ + name: GAT-ROBIN + bmp: gat2.gif + bmp-rect: 0 0 24 28 + bmp-offset: -4 32 + pos: 40 40 0 + size: 8 8 8 + orient: XN + anim-wait: 1 + flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CCW +} diff --git a/data/test.gif b/data/test.gif index f968fbe..db861fc 100644 Binary files a/data/test.gif and b/data/test.gif differ diff --git a/source/m_editor_map.cpp b/source/m_editor_map.cpp index 9ffb15c..f4ae4a9 100644 --- a/source/m_editor_map.cpp +++ b/source/m_editor_map.cpp @@ -14,6 +14,7 @@ namespace modules vec2_t scroll {0,0}; int drawn[64]; int current_room; + int previous_room; struct miniroom_t { @@ -124,6 +125,7 @@ namespace modules for (int i=0;i<64;++i) drawn[i]=false; current_room = room::getCurrent(); + previous_room = current_room; loadMiniRoom(); room::load(42); @@ -152,7 +154,11 @@ namespace modules bool loop() { - if (input::keyPressed(SDL_SCANCODE_ESCAPE) || input::keyPressed(SDL_SCANCODE_TAB)) return false; + if (input::keyPressed(SDL_SCANCODE_ESCAPE) || input::keyPressed(SDL_SCANCODE_TAB)) + { + room::load(previous_room); + return false; + } //draw::stencil::enable(); //draw::stencil::clear(255);