- [FIX] Les plantilles d'actor no se podien actualitzar

data/rooms/02.txt

@@ -12,9 +12,9 @@ exit-yp: 4
 exit-zp: 0
 
 actor{
-    name: BOX
+    name: BARREL
     bmp: caixes.gif
-    bmp-rect: 32 0 32 32
+    bmp-rect: 96 64 32 32
     bmp-offset: 0 32
     pos: 32 32 0
     size: 8 8 8

data/rooms/04.txt

@@ -19,26 +19,6 @@ actor{
     movement: CW
 }
 
-actor{
-    name: BOX02
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 16 0 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX03
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 24 0 0
-    size: 8 8 8
-    movement: CW
-}
-
 actor{
     name: BOX20
     bmp: caixes.gif
@@ -109,6 +89,16 @@ actor{
     movement: CW
 }
 
+actor{
+    name: BOX02
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 16 0 0
+    size: 8 8 8
+    movement: CW
+}
+
 actor{
     name: BOX15
     bmp: caixes.gif
@@ -119,6 +109,16 @@ actor{
     movement: CW
 }
 
+actor{
+    name: BOX03
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 24 0 0
+    size: 8 8 8
+    movement: CW
+}
+
 actor{
     name: BOX16
     bmp: caixes.gif
@@ -189,6 +189,16 @@ actor{
     movement: CW
 }
 
+actor{
+    name: BOX18
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 40 56 0
+    size: 8 8 8
+    movement: CW
+}
+
 actor{
     name: BOX08
     bmp: caixes.gif
@@ -229,16 +239,6 @@ actor{
     movement: CW
 }
 
-actor{
-    name: BOX18
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 40 56 0
-    size: 8 8 8
-    movement: CW
-}
-
 actor{
     name: BOX23
     bmp: caixes.gif

data/rooms/05.txt

@@ -1,9 +1,11 @@
 width: 2
 height: 2
+door-height-xp: 0
 door-height-xn: 0
 color: YELLOW
 floor-texture: 8
 wall-texture: 8
 door-texture: 5
 under-door-texture: 0
+exit-xp: 6
 exit-xn: 0

data/rooms/06.txt

@@ -0,0 +1,35 @@
+width: 3
+height: 3
+door-height-xn: 0
+color: CYAN
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-xn: 5
+
+actor{
+    name: YONKI
+    bmp: caixes.gif
+    bmp-rect: 168 64 19 32
+    bmp-offset: -7 37
+    pos: 18 9 0
+    size: 6 6 12
+    anim-cycle: SEQ
+    anim-wait: 1
+    flags: PUSHABLE GRAVITY 
+    movement: CW
+}
+
+actor{
+    name: BARREL
+    bmp: caixes.gif
+    bmp-rect: 96 64 18 32
+    bmp-offset: -7 37
+    pos: 25 9 0
+    size: 6 6 12
+    anim-cycle: SEQ
+    anim-wait: 1
+    flags: PUSHABLE ANIMATED GRAVITY 
+    movement: CW
+}

data/templates.txt

@@ -1,3 +1,4 @@
+
 actor{
     name: BOX
     bmp: test.gif
@@ -5,11 +6,18 @@ actor{
     bmp-offset: 0 32
     pos: 32 32 8
     size: 8 8 8
-    orient: NONE
     movement: CW
-    anim-cycle: WALK
+}
-    anim-wait: 0
+
-    flags: PUSH GRAV
+actor{
-    react-mask: NONE
+    name: BARREL
-    react-push: NONE
+    bmp: caixes.gif
+    bmp-rect: 96 64 18 32
+    bmp-offset: -7 37
+    pos: 25 9 0
+    size: 6 6 12
+    anim-cycle: SEQ
+    anim-wait: 1
+    flags: PUSHABLE ANIMATED GRAVITY 
+    movement: CW
 }

source/main.cpp

@@ -477,8 +477,7 @@ bool game::loop()
                     {
                         act = actor::getFirst();
                         while (act) {
-                            // [WORKING HERE]
+                            if ((act->flags&FLAG_NOEDITOR)!=FLAG_NOEDITOR && (act->flags&FLAG_HERO)!=FLAG_HERO) {
-                            //if ((act->flags&FLAG_NOEDITOR)!=FLAG_NOEDITOR && (act->flags&FLAG_HERO)!=FLAG_HERO) {
                                 if (section==SECTION_ACTOR && act==actor::getSelected()) {
                                     draw::color(LIGHT+BLUE);
                                     draw::fillrect(4, 2+line*9, 92, 9);
@@ -489,7 +488,7 @@ bool game::loop()
                                 }
                                 draw::print(act->name, 14, 4+line*9, LIGHT+WHITE, BLACK);
                                 line++;
-                            //}
+                            }
                             act = act->next;
                         }
 
@@ -745,7 +744,7 @@ switch (section)
 
             if (ui::button("ADD TO TEMPLATES", 2, line, 96, 11))
             {
-                if (act && !actor::templates::getByName(act->name)) actor::templates::add(act);
+                if (act) actor::templates::add(act);
             }
             //changed |= btn_opt("ANIMCYC", 2, 106, act->anim_cycle, {0, 1}, {"0 1 0 2", "0 1 2 3"});
 

todo.txt

@@ -1,9 +1,9 @@
 x Gràfics per a la roomba
-- Fer la roomba mes xicoteta
+x Fer la roomba mes xicoteta
 x Més gràfics de caixes
 x Gràfics de piso, per a quan no hi ha piso
-- Gràfics de barril, en foc
+x Gràfics de barril, en foc
-- Gràfics de yonki
+x Gràfics de yonki
 x Gràfics de tele
 x Gràfics de armari
 x Gràfics de taula