diff --git a/data/altres.gif b/data/altres.gif index 40f18d4..b4ca508 100644 Binary files a/data/altres.gif and b/data/altres.gif differ diff --git a/data/rooms/09.txt b/data/rooms/09.txt index bb199c6..b783c5d 100644 --- a/data/rooms/09.txt +++ b/data/rooms/09.txt @@ -5,11 +5,178 @@ door-height-xn: 0 door-height-yp: 0 door-height-yn: 0 color: PURPLE -floor-texture: 4 -wall-texture: 7 -door-texture: 5 -under-door-texture: 7 +floor-texture: 3 +wall-texture: 9 +door-texture: 3 +under-door-texture: 9 exit-xp: 12 exit-xn: 10 exit-yp: 17 exit-yn: 8 + +actor{ + name: BUBBLE-00 + bmp: altres.gif + bmp-rect: 20 75 28 26 + bmp-offset: -2 28 + pos: 32 24 7 + size: 8 8 8 + orient: ZP + flags: PUSHABLE MOVING DEADLY INERTIA + movement: Z +} + +actor{ + name: BUBBLE-01 + bmp: altres.gif + bmp-rect: 20 75 28 26 + bmp-offset: -2 28 + pos: 24 32 32 + size: 8 8 8 + orient: ZN + flags: PUSHABLE MOVING DEADLY INERTIA + movement: Z +} + +actor{ + name: BUBBLE-02 + bmp: altres.gif + bmp-rect: 20 75 28 26 + bmp-offset: -2 28 + pos: 32 32 20 + size: 8 8 8 + orient: ZN + flags: PUSHABLE MOVING DEADLY INERTIA + movement: Z +} + +actor{ + name: BUBBLE-03 + bmp: altres.gif + bmp-rect: 20 75 28 26 + bmp-offset: -2 28 + pos: 24 24 20 + size: 8 8 8 + orient: ZP + flags: PUSHABLE MOVING DEADLY INERTIA + movement: Z +} + +actor{ + name: CADIRA-00 + bmp: caixes.gif + bmp-rect: 64 96 20 32 + bmp-offset: -7 38 + pos: 18 8 0 + size: 6 5 8 + orient: YP + flags: ORIENTABLE + movement: CW +} + +actor{ + name: CADIRA-01 + bmp: caixes.gif + bmp-rect: 64 96 20 32 + bmp-offset: -7 38 + pos: 8 19 0 + size: 6 5 8 + orient: YP + movement: CW +} + +actor{ + name: CADIRA-02 + bmp: caixes.gif + bmp-rect: 64 96 20 32 + bmp-offset: -7 38 + pos: 8 41 0 + size: 6 5 8 + orient: YP + movement: CW +} + +actor{ + name: CADIRA-03 + bmp: caixes.gif + bmp-rect: 64 96 20 32 + bmp-offset: -7 38 + pos: 8 49 0 + size: 6 5 8 + orient: YP + movement: CW +} + +actor{ + name: CADIRA-04 + bmp: caixes.gif + bmp-rect: 64 96 20 32 + bmp-offset: -7 38 + pos: 49 8 0 + size: 6 5 8 + orient: YP + flags: ORIENTABLE + movement: CW +} + +actor{ + name: CADIRA-05 + bmp: caixes.gif + bmp-rect: 64 96 20 32 + bmp-offset: -7 38 + pos: 41 8 0 + size: 6 5 8 + orient: YP + flags: ORIENTABLE + movement: CW +} + +actor{ + name: MESITA + bmp: caixes.gif + bmp-rect: 0 64 32 32 + bmp-offset: 0 32 + pos: 8 8 0 + size: 8 8 4 + movement: CW +} + +actor{ + name: TRANSPA-00 + bmp: altres.gif + bmp-rect: 0 160 32 32 + bmp-offset: 0 32 + pos: 24 24 0 + size: 8 8 6 + movement: CW +} + +actor{ + name: TRANSPA-01 + bmp: altres.gif + bmp-rect: 0 160 32 32 + bmp-offset: 0 32 + pos: 32 24 0 + size: 8 8 6 + movement: CW +} + +actor{ + name: TRANSPA-02 + bmp: altres.gif + bmp-rect: 0 160 32 32 + bmp-offset: 0 32 + pos: 32 32 0 + size: 8 8 6 + movement: CW +} + +actor{ + name: TRANSPA-03 + bmp: altres.gif + bmp-rect: 0 160 32 32 + bmp-offset: 0 32 + pos: 24 32 0 + size: 8 8 6 + movement: CW +} diff --git a/data/rooms/14.txt b/data/rooms/14.txt index 58ae2d4..b5b220e 100644 --- a/data/rooms/14.txt +++ b/data/rooms/14.txt @@ -1,11 +1,428 @@ width: 2 -height: 2 -door-height-xn: 0 -door-height-yp: 0 +height: 3 +door-height-xn: 3 +door-height-yp: 2 color: WHITE -floor-texture: 0 -wall-texture: 0 +floor-texture: 11 +wall-texture: 2 door-texture: 0 under-door-texture: 0 exit-xn: 15 exit-yp: 13 + +actor{ + name: BLOCK-00 + bmp: caixes.gif + bmp-rect: 0 40 32 24 + bmp-offset: 0 24 + pos: 8 0 0 + size: 8 8 4 + orient: ZP + flags: MOVING + movement: Z +} + +actor{ + name: BLOCK-01 + bmp: caixes.gif + bmp-rect: 0 40 32 24 + bmp-offset: 0 24 + pos: 8 56 0 + size: 8 8 4 + orient: ZP + flags: MOVING + movement: Z +} + +actor{ + name: BLOCK-02 + bmp: caixes.gif + bmp-rect: 0 40 32 24 + bmp-offset: 0 24 + pos: 40 56 0 + size: 8 8 4 + orient: ZP + flags: MOVING + movement: Z +} + +actor{ + name: BLOCK-03 + bmp: caixes.gif + bmp-rect: 0 40 32 24 + bmp-offset: 0 24 + pos: 24 0 0 + size: 8 8 4 + orient: ZP + flags: MOVING + movement: Z +} + +actor{ + name: CADIRA + bmp: caixes.gif + bmp-rect: 64 96 20 32 + bmp-offset: -8 40 + pos: 40 16 0 + size: 5 4 8 + orient: YP + movement: CW +} + +actor{ + name: CONV-XP-00 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 8 56 4 + size: 8 8 4 + orient: XP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: XP +} + +actor{ + name: CONV-XP-01 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 16 56 4 + size: 8 8 4 + orient: XP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: XP +} + +actor{ + name: CONV-XP-02 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 24 56 4 + size: 8 8 4 + orient: XP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: XP +} + +actor{ + name: CONV-XP-03 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 32 56 4 + size: 8 8 4 + orient: XP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: XP +} + +actor{ + name: CONV-XP-04 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 40 56 4 + size: 8 8 4 + orient: XP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: XP +} + +actor{ + name: CONV-XP-05 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 16 0 4 + size: 8 8 4 + orient: XP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: XP +} + +actor{ + name: CONV-XP-06 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 24 0 4 + size: 8 8 4 + orient: XP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: XP +} + +actor{ + name: CONV-YP-00 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 8 0 4 + size: 8 8 4 + orient: YP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: YP +} + +actor{ + name: CONV-YP-01 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 8 8 4 + size: 8 8 4 + orient: YP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: YP +} + +actor{ + name: CONV-YP-02 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 8 16 4 + size: 8 8 4 + orient: YP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: YP +} + +actor{ + name: CONV-YP-03 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 8 24 4 + size: 8 8 4 + orient: YP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: YP +} + +actor{ + name: CONV-YP-04 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 8 32 4 + size: 8 8 4 + orient: YP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: YP +} + +actor{ + name: CONV-YP-05 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 8 40 4 + size: 8 8 4 + orient: YP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: YP +} + +actor{ + name: CONV-YP-06 + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 8 48 4 + size: 8 8 4 + orient: YP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: YP +} + +actor{ + name: OBRER + bmp: obrer.gif + bmp-rect: 0 0 24 32 + bmp-offset: -4 37 + pos: 48 0 4 + size: 8 8 8 + orient: YP + anim-wait: 1 + flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: Y +} + +actor{ + name: PLAT-00 + bmp: caixes.gif + bmp-rect: 160 136 32 24 + bmp-offset: 0 24 + pos: 48 56 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLAT-01 + bmp: caixes.gif + bmp-rect: 160 136 32 24 + bmp-offset: 0 24 + pos: 48 48 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLAT-02 + bmp: caixes.gif + bmp-rect: 160 136 32 24 + bmp-offset: 0 24 + pos: 40 48 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLAT-03 + bmp: caixes.gif + bmp-rect: 160 136 32 24 + bmp-offset: 0 24 + pos: 48 40 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLAT-04 + bmp: caixes.gif + bmp-rect: 160 136 32 24 + bmp-offset: 0 24 + pos: 48 32 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLAT-05 + bmp: caixes.gif + bmp-rect: 160 136 32 24 + bmp-offset: 0 24 + pos: 40 32 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLAT-06 + bmp: caixes.gif + bmp-rect: 160 136 32 24 + bmp-offset: 0 24 + pos: 48 24 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLAT-07 + bmp: caixes.gif + bmp-rect: 160 136 32 24 + bmp-offset: 0 24 + pos: 48 16 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLAT-08 + bmp: caixes.gif + bmp-rect: 160 136 32 24 + bmp-offset: 0 24 + pos: 40 16 0 + size: 8 8 4 + orient: ZP + flags: REACTIVE + react-mask: ZN + react-push: XP + movement: Z +} + +actor{ + name: PLAT-09 + bmp: caixes.gif + bmp-rect: 160 136 32 24 + bmp-offset: 0 24 + pos: 48 8 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLAT-10 + bmp: caixes.gif + bmp-rect: 160 136 32 24 + bmp-offset: 0 24 + pos: 48 0 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLAT-11 + bmp: caixes.gif + bmp-rect: 160 136 32 24 + bmp-offset: 0 24 + pos: 40 0 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: S-SHOES + bmp: objectes.gif + bmp-rect: 162 0 28 22 + bmp-offset: -3 24 + pos: 40 0 4 + size: 4 4 4 + anim-cycle: SEQ + anim-wait: 2 + flags: SPECIAL + movement: CW +} diff --git a/data/templates.txt b/data/templates.txt index 0e3e19f..e96be8b 100644 --- a/data/templates.txt +++ b/data/templates.txt @@ -128,6 +128,30 @@ category{ react-push: XP } + actor{ + name: CONV-YP + bmp: caixes.gif + bmp-rect: 0 128 32 32 + bmp-offset: 0 32 + pos: 8 0 0 + size: 8 8 4 + orient: YP + anim-cycle: MIN + flags: REACTIVE ANIMATED ORIENTABLE + react-mask: ZN + react-push: YP + } + + actor{ + name: TRANSPA + bmp: altres.gif + bmp-rect: 0 160 32 32 + bmp-offset: 0 32 + pos: 24 24 0 + size: 8 8 6 + movement: CW + } + } category{ @@ -187,9 +211,9 @@ category{ name: CADIRA bmp: caixes.gif bmp-rect: 64 96 20 32 - bmp-offset: -8 40 - pos: 8 51 0 - size: 5 4 8 + bmp-offset: -7 38 + pos: 24 40 0 + size: 6 5 8 orient: YP movement: CW } @@ -395,6 +419,20 @@ category{ movement: CCW } + actor{ + name: OBRER + bmp: obrer.gif + bmp-rect: 0 0 24 32 + bmp-offset: -4 37 + pos: 48 0 4 + size: 8 8 8 + orient: YP + anim-wait: 1 + flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: Y + } + } category{ @@ -495,4 +533,14 @@ category{ movement: CW } + actor{ + name: TRANSPA + bmp: altres.gif + bmp-rect: 0 160 32 32 + bmp-offset: 0 32 + pos: 24 24 0 + size: 8 8 8 + movement: CW + } + } diff --git a/source/m_game.cpp b/source/m_game.cpp index 1bc7e11..fb994ed 100644 --- a/source/m_game.cpp +++ b/source/m_game.cpp @@ -312,7 +312,7 @@ namespace modules //draw::print2(x, -3, 1, 6, PURPLE, FONT_ZOOM_NONE); //draw::print2(y, -3, 1, 7, PURPLE, FONT_ZOOM_NONE); - if (x>=room::getTMin().x && y>=room::getTMin().y && x=room::getTMin().x && y>=room::getTMin().y && x<=room::getTMax().x && y<=room::getTMax().y) { floating_position = {x, y}; selected->pos.x = floating_position.x*8; @@ -838,13 +838,14 @@ namespace modules draw::color(PAPER); draw::rect(2, 0, 96, 204); - if (ui::button("DUPLICATE", 2, line, 48, 11) || (input::keyDown(SDL_SCANCODE_LCTRL) && input::keyPressed(SDL_SCANCODE_D))) + if (ui::button("DUPLICATE", 2, line, 48, 11) || input::keyPressed(SDL_SCANCODE_D)) { actor::actor_t *new_act = actor::duplicate(act); actor::setUniqueName(new_act); //new_act->pos.x++; new_act->pos.y++; actor::setDirty(new_act, true); actor::select(new_act); + actor::setFloatingEditing(true); changed = true; } if (ui::button("DELETE", 48, line, 48, 11) || input::keyPressed(SDL_SCANCODE_DELETE))