diff --git a/data/rooms/02.txt b/data/rooms/02.txt index e8b22c7..0f84874 100644 --- a/data/rooms/02.txt +++ b/data/rooms/02.txt @@ -52,7 +52,7 @@ actor{ } actor{ - name: B-00-LIVE + name: B-00-JUMP bmp: objectes.gif bmp-rect: 114 78 15 18 bmp-offset: -8 22 diff --git a/data/rooms/16.txt b/data/rooms/16.txt index 10bf520..44f902f 100644 --- a/data/rooms/16.txt +++ b/data/rooms/16.txt @@ -9,6 +9,19 @@ under-door-texture: 0 exit-yp: 15 editor-done: 1 +actor{ + name: B-05-GOD + bmp: objectes.gif + bmp-rect: 114 78 15 18 + bmp-offset: -8 22 + pos: 40 40 0 + size: 4 4 4 + anim-cycle: SEQ + anim-wait: 2 + flags: ANIMATED SPECIAL + movement: CW +} + actor{ name: BOX-A-01 bmp: caixes.gif diff --git a/data/rooms/23.txt b/data/rooms/23.txt index be5a16d..8546624 100644 --- a/data/rooms/23.txt +++ b/data/rooms/23.txt @@ -24,7 +24,7 @@ actor{ } actor{ - name: B-01-JUMP + name: B-01-RUN bmp: objectes.gif bmp-rect: 114 78 15 18 bmp-offset: -8 22 diff --git a/data/rooms/27.txt b/data/rooms/27.txt index 6c54f37..0acfb39 100644 --- a/data/rooms/27.txt +++ b/data/rooms/27.txt @@ -12,11 +12,11 @@ exit-xn: 28 editor-done: 1 actor{ - name: B-03-GOD + name: B-03-LIVE bmp: objectes.gif bmp-rect: 114 78 15 18 - bmp-offset: -8 22 - pos: 48 -3 16 + bmp-offset: -8 24 + pos: 48 56 16 size: 4 4 4 anim-cycle: SEQ anim-wait: 2 @@ -25,18 +25,7 @@ actor{ } actor{ - name: BOX-B - bmp: caixes.gif - bmp-rect: 32 0 32 32 - bmp-offset: 0 32 - pos: 48 8 0 - size: 8 8 8 - flags: PUSHABLE - movement: CW -} - -actor{ - name: CADIRA + name: CADIRA-00 bmp: caixes.gif bmp-rect: 64 96 20 32 bmp-offset: -7 38 @@ -47,12 +36,24 @@ actor{ movement: CW } +actor{ + name: CADIRA-01 + bmp: caixes.gif + bmp-rect: 64 96 20 32 + bmp-offset: -7 38 + pos: 8 7 0 + size: 6 5 8 + orient: YP + flags: PUSHABLE + movement: CW +} + actor{ name: CUADRO-00 bmp: altres.gif bmp-rect: 66 75 18 32 bmp-offset: 0 39 - pos: 7 8 6 + pos: 7 13 6 size: 1 1 9 orient: YP movement: CW @@ -63,7 +64,7 @@ actor{ bmp: altres.gif bmp-rect: 102 75 18 32 bmp-offset: 0 39 - pos: 7 48 6 + pos: 7 43 6 size: 1 1 9 orient: YP movement: CW @@ -165,6 +166,26 @@ actor{ movement: CW } +actor{ + name: LAMPARA-00 + bmp: altres.gif + bmp-rect: 128 0 20 41 + bmp-offset: -6 45 + pos: 48 56 0 + size: 6 6 16 + movement: CW +} + +actor{ + name: LAMPARA-01 + bmp: altres.gif + bmp-rect: 128 0 20 41 + bmp-offset: -6 45 + pos: 8 56 0 + size: 6 6 16 + movement: CW +} + actor{ name: MESITA bmp: caixes.gif @@ -182,7 +203,7 @@ actor{ bmp-offset: -2 33 pos: 32 0 0 size: 8 7 6 - flags: PUSHABLE + flags: PICKABLE PUSHABLE GRAVITY movement: CW } @@ -191,7 +212,7 @@ actor{ bmp: caixes.gif bmp-rect: 160 0 32 32 bmp-offset: 0 34 - pos: 8 56 0 + pos: 16 56 0 size: 8 8 2 orient: XN flags: REACTIVE MOVING DEADLY @@ -230,6 +251,6 @@ actor{ bmp-offset: -4 34 pos: 24 0 4 size: 8 6 8 - flags: PUSHABLE + flags: PUSHABLE GRAVITY movement: CW } diff --git a/data/rooms/35.txt b/data/rooms/35.txt index 2efcb6f..f51ea58 100644 --- a/data/rooms/35.txt +++ b/data/rooms/35.txt @@ -11,6 +11,19 @@ exit-xn: 33 exit-yn: 28 editor-done: 1 +actor{ + name: B-06-LIVE + bmp: objectes.gif + bmp-rect: 114 78 15 18 + bmp-offset: -8 22 + pos: 24 32 12 + size: 4 4 4 + anim-cycle: SEQ + anim-wait: 2 + flags: ANIMATED SPECIAL + movement: CW +} + actor{ name: PLATH-00 bmp: caixes.gif @@ -227,3 +240,15 @@ actor{ orient: ZP movement: Z } + +actor{ + name: PLATH-18 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 24 32 8 + size: 8 8 4 + orient: ZP + flags: DISAPPEAR + movement: Z +} diff --git a/data/rooms/56.txt b/data/rooms/56.txt index 57f0cb1..d5abbe3 100644 --- a/data/rooms/56.txt +++ b/data/rooms/56.txt @@ -27,19 +27,6 @@ actor{ movement: CW } -actor{ - name: B-02-RUN - bmp: objectes.gif - bmp-rect: 114 78 15 18 - bmp-offset: -8 22 - pos: 8 8 0 - size: 4 4 4 - anim-cycle: SEQ - anim-wait: 2 - flags: ANIMATED SPECIAL - movement: CW -} - actor{ name: BATMAN bmp: batman.gif diff --git a/data/rooms/59.txt b/data/rooms/59.txt index 360f4b3..5ea1526 100644 --- a/data/rooms/59.txt +++ b/data/rooms/59.txt @@ -256,9 +256,9 @@ actor{ bmp: gat.gif bmp-rect: 0 0 24 28 bmp-offset: -4 32 - pos: 16 16 0 + pos: 16 24 0 size: 8 8 8 - orient: XP + orient: YN anim-wait: 1 flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY react-mask: XP XN YP YN ZP ZN @@ -270,9 +270,9 @@ actor{ bmp: gat2.gif bmp-rect: 0 0 24 28 bmp-offset: -4 32 - pos: 40 40 0 + pos: 40 32 0 size: 8 8 8 - orient: XN + orient: YP anim-wait: 1 flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY react-mask: XP XN YP YN ZP ZN diff --git a/data/rooms/60.txt b/data/rooms/60.txt index 583ca47..a066146 100644 --- a/data/rooms/60.txt +++ b/data/rooms/60.txt @@ -183,9 +183,9 @@ actor{ bmp: obrer.gif bmp-rect: 0 0 24 32 bmp-offset: -4 37 - pos: 8 24 0 + pos: 24 24 0 size: 8 8 8 - orient: XN + orient: XP anim-wait: 1 flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY react-mask: XP XN YP YN ZP ZN @@ -197,9 +197,9 @@ actor{ bmp: obrer.gif bmp-rect: 0 0 24 32 bmp-offset: -4 37 - pos: 48 48 0 + pos: 40 48 0 size: 8 8 8 - orient: XN + orient: XP anim-wait: 1 flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY react-mask: XP XN YP YN ZP ZN diff --git a/data/rooms/61.txt b/data/rooms/61.txt index e19cd41..51b56ef 100644 --- a/data/rooms/61.txt +++ b/data/rooms/61.txt @@ -20,6 +20,19 @@ actor{ movement: CW } +actor{ + name: B-04-LIVE + bmp: objectes.gif + bmp-rect: 114 78 15 18 + bmp-offset: -8 22 + pos: 48 0 0 + size: 4 4 4 + anim-cycle: SEQ + anim-wait: 2 + flags: ANIMATED SPECIAL + movement: CW +} + actor{ name: BLOCMATA-00 bmp: altres.gif @@ -61,6 +74,7 @@ actor{ bmp-offset: 0 32 pos: 0 49 6 size: 8 8 8 + flags: PUSHABLE GRAVITY movement: CW } @@ -72,7 +86,7 @@ actor{ pos: 8 40 0 size: 8 8 8 orient: YP - flags: ORIENTABLE + flags: PUSHABLE ORIENTABLE GRAVITY movement: CW } @@ -83,6 +97,7 @@ actor{ bmp-offset: 0 32 pos: 8 32 8 size: 8 8 8 + flags: PUSHABLE GRAVITY movement: CW } @@ -117,6 +132,7 @@ actor{ bmp-offset: 0 32 pos: 31 2 0 size: 8 8 8 + flags: PUSHABLE GRAVITY movement: CW } @@ -128,7 +144,7 @@ actor{ pos: 54 0 8 size: 8 8 8 orient: YP - flags: ORIENTABLE + flags: PUSHABLE ORIENTABLE GRAVITY movement: CW } @@ -149,6 +165,7 @@ actor{ bmp-offset: 0 32 pos: 10 32 0 size: 8 8 8 + flags: PUSHABLE GRAVITY movement: CW } @@ -167,8 +184,9 @@ actor{ bmp: caixes.gif bmp-rect: 32 0 32 32 bmp-offset: 0 32 - pos: 40 0 0 + pos: 40 1 0 size: 8 8 8 + flags: PUSHABLE GRAVITY movement: CW } @@ -180,7 +198,7 @@ actor{ pos: 46 3 10 size: 8 8 8 orient: YP - flags: ORIENTABLE + flags: PUSHABLE ORIENTABLE GRAVITY movement: CW } @@ -256,3 +274,42 @@ actor{ flags: MOVING ANIMATED movement: RANDV } + +actor{ + name: EXPLOSION-03 + bmp: caixes.gif + bmp-rect: 0 160 18 22 + bmp-offset: -7 24 + pos: 48 48 0 + size: 8 8 4 + orient: YN + anim-cycle: SEQ + flags: MOVING ANIMATED + movement: RANDV +} + +actor{ + name: EXPLOSION-04 + bmp: caixes.gif + bmp-rect: 0 160 18 22 + bmp-offset: -7 24 + pos: 0 0 0 + size: 8 8 4 + orient: XP + anim-cycle: SEQ + flags: MOVING ANIMATED + movement: RANDV +} + +actor{ + name: EXPLOSION-05 + bmp: caixes.gif + bmp-rect: 0 160 18 22 + bmp-offset: -7 24 + pos: 16 24 0 + size: 8 8 4 + orient: XN + anim-cycle: SEQ + flags: MOVING ANIMATED + movement: RANDV +} diff --git a/data/rooms/63.txt b/data/rooms/63.txt index 40569c1..0535105 100644 --- a/data/rooms/63.txt +++ b/data/rooms/63.txt @@ -9,6 +9,19 @@ under-door-texture: 2 exit-xp: 62 editor-done: 1 +actor{ + name: B-02-GOD + bmp: objectes.gif + bmp-rect: 114 78 15 18 + bmp-offset: -8 22 + pos: 56 16 20 + size: 4 4 4 + anim-cycle: SEQ + anim-wait: 2 + flags: ANIMATED SPECIAL + movement: CW +} + actor{ name: P-ELBOW bmp: objectes.gif @@ -45,6 +58,29 @@ actor{ movement: Y } +actor{ + name: PLATH-02 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 56 16 16 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-04 + bmp: altres.gif + bmp-rect: 160 48 32 32 + bmp-offset: 0 32 + pos: 32 8 16 + size: 8 8 4 + orient: XN + flags: MOVING + movement: X +} + actor{ name: TRANSPA-00 bmp: altres.gif diff --git a/source/actor.cpp b/source/actor.cpp index 3a363de..b6b981e 100644 --- a/source/actor.cpp +++ b/source/actor.cpp @@ -2164,7 +2164,7 @@ namespace actor switch (getBoosterFromString(booster)) { case BOOST_GOD: - boost_god = 99 * 2; + boost_god = 99 * 4; break; case BOOST_RUN: boost_steps = 99 * 2; diff --git a/source/m_game.cpp b/source/m_game.cpp index 8914c2b..8dec743 100644 --- a/source/m_game.cpp +++ b/source/m_game.cpp @@ -437,7 +437,7 @@ namespace modules draw::print2("c", 15, 26, col3, FONT_ZOOM_NONE); draw::print2(actor::hero::getBoostJump(), 2, 8, 27, col3, FONT_ZOOM_NONE); - draw::print2(actor::hero::getBoostGod()/2, 2, 11, 27, col1, FONT_ZOOM_NONE); + draw::print2(actor::hero::getBoostGod()/4, 2, 11, 27, col1, FONT_ZOOM_NONE); draw::print2(actor::hero::getBoostRun()/2, 2, 14, 27, col2, FONT_ZOOM_NONE); draw::stencil::enable();