From 093cd5916bdafbf5e87a8cc242920ef235200330 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Mon, 30 Sep 2024 13:45:01 +0200 Subject: [PATCH] =?UTF-8?q?-=20[FIX]=20Al=20tornar=20del=20minimapa=20sens?= =?UTF-8?q?e=20seleccionar=20una=20habitaci=C3=B3,=20ha=20de=20deixar-te?= =?UTF-8?q?=20en=20la=20que=20estaves.=20-=20Canviat=20un=20poc=20el=20cap?= =?UTF-8?q?=20de=20l'heroi=20-=20Completant=20habitacions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/rooms/43.txt | 22 ++++ data/rooms/47.txt | 12 ++ data/rooms/51.txt | 10 +- data/rooms/59.txt | 272 +++++++++++++++++++++++++++++++++++++++- data/test.gif | Bin 3931 -> 3951 bytes source/m_editor_map.cpp | 8 +- 6 files changed, 314 insertions(+), 10 deletions(-) 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 f968fbe81da8d628abe7d5b1accb3f2f2a03b6ee..db861fc990744edfded8f8542bc5c060ef1e033e 100644 GIT binary patch delta 3220 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 delta 3199 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 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);