From edc8e0b51d3c752e9b323fdde0194e716aae40e8 Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Sun, 22 Sep 2024 22:08:19 +0200
Subject: [PATCH] =?UTF-8?q?-=20[FIX]=20No=20es=20podia=20colocar=20actors?=
 =?UTF-8?q?=20en=20l'ultima=20fila=20o=20columna=20en=20floating=20mode=20?=
 =?UTF-8?q?-=20M=C3=A9s=20habitacions,=20actors=20i=20gr=C3=A0fics?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/altres.gif    | Bin 4033 -> 4150 bytes
 data/rooms/09.txt  | 175 ++++++++++++++++++-
 data/rooms/14.txt  | 427 ++++++++++++++++++++++++++++++++++++++++++++-
 data/templates.txt |  54 +++++-
 source/m_game.cpp  |   5 +-
 5 files changed, 647 insertions(+), 14 deletions(-)

diff --git a/data/altres.gif b/data/altres.gif
index 40f18d4113df4cab05874b415a6f93f847240d41..b4ca5083d490c250e20ba11b96c508bc2659620d 100644
GIT binary patch
delta 1149
zcmV-@1cLj)AGRQ{$qRqN_*;?~fIhK}uf<fd_l*JfLa!K&+9fUMcss0CirUDG3S(RE
zI9pE`fH6jQ*R_ZXc#m*1h{IT77^oujXkGuOM*P@}xFnE)XpLk=kS_*SoN<u%*l01h
zREKks99dh;mx&$Ok>;3d*kzF+sXw6QcHVH3K?srjfQ1w(bu52bknNXq!{=2rRfFgV
zOn4Y|i$N%ZR!e&%krDWUAX1ZqqbwYRSRAJq|7McI<&Eo@d2L~b*!Wfd$y7|n29-QP
zl_zC)(ibmRDU_*~dU;cjVEIqc0)E2dYR-65ccT$~mu(ZtgqY|dE*VJvXEaVYSv;tc
z4%ufo5g{)aHbj4E345u5eCcu(8ITXwK8AQv5}AynsF!57mb>zNIHi%~cwItSNniO#
zx7e0uWrdWmax}A<a$;qdH;beRjhHr?c37H!Vn&t~M@7e#qWDCyNr)Sj36oipmsLwV
zCY9IMn&<SJ9;r%FL1~AXko2RKw!)gRMM*=nk9Wg~mDzu85SN#>>1F50ASZA=TCzIh
z7$OB?B>$0)ovBy#5}ph~DhZ)?!je!oMVpejFrT5D^$2aOkZWfdYyUyhc5k$4lxPs2
zql8|WJAhL(xhI_V_Lh1yR#WJmpd)#^LosiuPw9!AzBQAE<4YOJmn;*MJu*oY3Zf!X
zE)E)pa5sNOhB$U;Vt)Q;J8)Dy0@_A1*n3V?ow;$G@Cky2IHJD6CF;>5o|9dHBSBMG
zRFp-ceS{{88B<u&ImD<&HF`X0_ljQlDr!-Y!L^0q!!p~ML4g^cESI4T5mW_}Qv)Mg
z_(-Nfx>)qbphK~m>BENw^Hvn1F>xxVzvz)}sgHk#6EOYNNi&*(r{^wA1E>&GT7300
zIEacx$Bjc-LJn40!qsnMS#5OMF`8w7lsaIRny3o4sF)gYXb4gNID~&4B#&T082Zqi
z>;-&%Wr5zqgb)>T%4lJPx-27ECYqR+(FZqwItYjdMex+C!>N<N$|_C-Up{$17TRCh
zvMPU0SV^wBK{rGzeu<1r3P4s07wZOwl<97KhMshFm?hAscQUSzI;M-6i2b)jk;Qv8
zq&DpOI^2dcCV7>(ij(Icp(QGoi)4TMIs&Z`mpFQia*AF>2n__Qg2&>R(ASyyB4yX3
ziH<s_X6mBlx-JFle+Qec7%P_=8<raii{XC&OL;M|;TTY!1t5o&u=s+qDp4}w=c4cg
zRT4_CY4bsFHe!(KYTnvV3fHh<N21X}j=|~`Ks$~0s(**qt+R|HpU^51nb5RMn}@Qx
zAyJzXtoo$NcwkqXAKJ-`*vhod%B4UPwqJ{vgIHp)+BYThYIqt8c-e=nG>ZfzgA#Sx
zstQ!KXG%7j1r&{ngz-8-aT};Uq#6zss()3qox`7x8??q*cdIgtV(W_a*k<=yre-*f
zp1ZU|_F7V#xrj8h*BC3AdnmODj$cYd^HI257@4BGU#1a)NV%Jq+dYvculDF%zX~>4
PI=aVOt(RCcApih7w}Bqp

delta 1031
zcmV+i1o->5Ai*E7$qRo$XpO%mi2>*n+xS{cC3{ntdD@mkk4BEnm_E{CiCm&zj3sNj
zNOyswTa3s-k5y#VsC0O^hzmGF&WMiYD1Wbok5p(7?>LMsgI@oqMhY2&FlCV7#WD_b
z8y1KbFvuBRHHzzqk<a*I0?80dbvQhMhECX!!kAjjmx<D+fx>@OjxBk2DUoQK5t9>W
zG$dG)kONP9=M9<Qgd50`WeAS^fQ4WsC$ZomP-B!zsE*Cxa!<%!Qm0q{NC-jK*M6!K
zb&EkLgH}s>RAQo-HoquxO(~T{q%8c%bKQ1PCO2EE;f+27k~OE60e5%>$$OwTGRDS|
zEJc?VW0CiWm$!fBe|y=4b+(urF<g+vI!h^FL<xSv<7$anb<E~x9!Zl5=3AG;hyMhZ
zl*v4&crJy+Hj`(UpP@deV4Cz1He@+Lq`8w(;&L7dH*^G*7fBfX_nIGci<Jq9QWBPT
zb2yNsn^<XunC6?5$eA5;EE9t@Nogf;QCU~nXAG$l$8>*E0|lIRXjZ<#LKLG-h(wrz
zcwVd0hEMsOf;L}<IEV*gg?@>gojFD4v{4F^7GTt2m6@L)d7B4f8vj-{NkUagF-9|-
zsG492aY&g#&qsB-xjWaRC9C6(O7?z6B^7z;oSLW)=4m)&kq~+(ED3c};K_OH#i1|g
znA%yAC6Iq>c~dk&({^vPX_T0qw$+S+$sm9uqqO&!_EwO3G*;=jqGSMbUl)gP$4FCB
zQZDL~HsescQ<~yvQ$0eUWC*3r)1$Grf-7ZDhB$U;Vt!9bI&f4xUD`%7*n3VCTRU}K
zJ8E5pIHkPFYN^sAo|9eq2tYzuRFuV&K!Q(z8dHB*(mBKkgUX4fU5ck{0+hkEh2evd
zWxAy-H>C{`R0We$10!2<DUySTJ&}kMpT&m-^Hvn1F`eqEacZXj&e&g_G^QDNdhWtB
zs+y6YdX7cMjbm9t4pv#h)o<9iQrv@zdzX-S1({8gGC!%3P{g6%bB-P=U{=XoeYKJ2
z!GwPhRfE9Ojb);V4cc1PiUx?+tS&J<gj6j=^sVE=j6<4;XoyDJ^PqR7tw;Hh>js8>
zc&h*!CahS5ad(BzNS};@Ys)CG04S6Hnw63muWn}~*CT}fdJaPRkPM5Oc5#Oh3k?$s
zG!?5g7wd*r`e7Tpu=*MnDp4|A2(269u4aF^vL#ES#G|O+Sf^gWveTG~=2{}+CJ`V@
zvvUYE6sxcKk)Q@ET|S!^Ba5>+n>eq=lqq|(t099zTC}X8Sw27!h$`!fY1Oh?Ylf4$
zf3x_hXrz@|+J!#*k6f#uWjj48YfW!-mTPOa=oErn8MhRvk8Am<c1w{ZsjeXa06QrF
B;HCfo

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::getTMax().x && y<room::getTMax().y)
+                if (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))