Changeset 352Tweet

Timestamp:

Feb 4, 2011, 1:20:53 AM (12 years ago)

Author:

sam

Message:

Merge the Fusion class back into Board.

Location:

trunk

Files:

• monsterz/Makefile.am (modified) (1 diff)
• monsterz/board.cpp (modified) (14 diffs)
• monsterz/board.h (modified) (2 diffs)
• monsterz/fusion.cpp (deleted)
• monsterz/fusion.h (deleted)
• monsterz/interface.cpp (modified) (5 diffs)
• win32/monsterz.vcxproj (modified) (2 diffs)
• win32/monsterz.vcxproj.filters (modified) (2 diffs)

trunk/monsterz/Makefile.am

@@ -4 +4 @@
 monsterz_SOURCES = \
     monsterz.cpp monsterz.h title.cpp title.h interface.cpp interface.h \
-    fusion.cpp fusion.h board.cpp board.h piece.cpp piece.h mash.cpp mash.h \
-    thumbs.cpp thumbs.h
+    board.cpp board.h piece.cpp piece.h mash.cpp mash.h thumbs.cpp thumbs.h
 monsterz_CXXFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
 monsterz_LDADD = $(top_builddir)/src/liblol.a

trunk/monsterz/board.cpp

@@ -17 +17 @@
 #include <cstdlib>
 #include <ctime>
+#include <cstring>
 
 #include "core.h"
@@ -34 +35 @@
 
 private:
+    Board::game_t game;
+
     int2 dim;
-    int npieces;
-    int board, tiles;
+    int minnpieces, npieces, maxnpieces;
+
+    int board, tiles, icons;
     int click, whip;
 
@@ -44 +48 @@
         Piece *piece;
     }
-    pairs[MAX_WIDTH][MAX_HEIGHT], grabbed;
+    pairs[MAX_WIDTH][MAX_HEIGHT];
+
+    /* Hunt */
+    struct Pair grabbed;
     int nmoves;
+    int2 src_cell, dst_cell;
+
+    /* Fusion */
+    struct Pair current[2];
+    int next[2], rotation;
 
     Text *scoretext;
@@ -53 +65 @@
     Emitter *emitter;
     Thumbs *thumbs;
-    int2 src_cell, dst_cell;
 
     int2 oldmouse;
@@ -61 +72 @@
     enum
     {
-        IDLE,
-        BADCLICK,
-        GRAB,
+        HUNT_IDLE,
+        HUNT_BADCLICK,
+        HUNT_GRAB,
+        FUSION_IDLE,
     }
     state;
@@ -72 +84 @@
  */
 
-Board::Board(int2 dim, int npieces)
+Board::Board(game_t game, int2 dim, int minnpieces, int maxnpieces)
   : data(new BoardData())
 {
+    data->game = game;
+
     data->dim = dim;
-    data->npieces = npieces;
+    data->minnpieces = minnpieces;
+    data->npieces = minnpieces;
+    data->maxnpieces = maxnpieces;
     data->board = Tiler::Register(PNG_BOARD, 384, 384, 1.0f);
     data->tiles = Tiler::Register(PNG_TILES, 48, 48, 1.0f);
+    data->icons = Tiler::Register(PNG_ICONS, 24, 24, 1.0f);
     data->click = Sampler::Register(WAV_CLICK);
     data->whip = Sampler::Register(WAV_WHIP);
@@ -85 +102 @@
     Ticker::Ref(data->emitter);
 
-    Fill();
+    data->thumbs = new Thumbs(0);
+    Ticker::Ref(data->thumbs);
+
+    switch (data->game)
+    {
+    case GAME_HUNT:
+        Fill();
+        data->thumbs->SetMax(data->npieces);
+        data->state = BoardData::HUNT_IDLE;
+        break;
+
+    case GAME_FUSION:
+        for (int j = 0; j < data->dim.j; j++)
+            for (int i = 0; i < data->dim.i; i++)
+                data->pairs[i][j].id = 0;
+
+        data->current[0].id = GetRandomId();
+        data->current[1].id = GetRandomId();
+        data->current[0].piece = new Piece(data->emitter, int2(3, 8),
+                                           80 + 20 * data->current[0].id);
+        data->current[1].piece = new Piece(data->emitter, int2(4, 8),
+                                           80 + 20 * data->current[1].id);
+        Ticker::Ref(data->current[0].piece);
+        Ticker::Ref(data->current[1].piece);
+        data->current[0].piece->SetPos(int2(3, 7) * 48);
+        data->current[1].piece->SetPos(int2(4, 7) * 48);
+
+        data->next[0] = GetRandomId();
+        data->next[1] = GetRandomId();
+        data->rotation = 0;
+
+        data->thumbs->SetMax(data->npieces + 1);
+        data->state = BoardData::FUSION_IDLE;
+        break;
+    }
 
     data->mashes = NULL;
     data->nextblink = 0.0f;
     data->whipdelay = 0.0f;
-    data->state = BoardData::IDLE;
-
-    data->thumbs = new Thumbs(MAX_PIECES);
-    Ticker::Ref(data->thumbs);
 
     data->scoretext = new Text(NULL, "monsterz/gfx/font2.png");
@@ -115 +162 @@
 
     /* If possible, make a random monster blink */
-    if ((data->nextblink -= deltams) < 0.0f)
+    if (data->game == Board::GAME_HUNT && (data->nextblink -= deltams) < 0.0f)
     {
         data->pairs[rand() % data->dim.i]
@@ -142 +189 @@
     switch (data->state)
     {
-    case BoardData::IDLE:
+    case BoardData::HUNT_IDLE:
         /* Should we start dragging something? */
         if (buttons[0] && !data->oldbuttons[0] && mousepos.x != -1)
@@ -153 +200 @@
                 data->src_cell = mousepos / 48;
                 data->dst_cell = int2(-1);
-                data->state = BoardData::GRAB;
+                data->state = BoardData::HUNT_GRAB;
             }
             else
-                data->state = BoardData::BADCLICK;
-        }
-        break;
-    case BoardData::GRAB:
+                data->state = BoardData::HUNT_BADCLICK;
+        }
+        break;
+
+    case BoardData::HUNT_GRAB:
         if (mousepos.x != -1)
         {
@@ -196 +244 @@
             if (data->dst_cell != int2(-1))
                 Switch(data->src_cell, data->dst_cell);
-            data->state = BoardData::IDLE;
-        }
-        break;
-    case BoardData::BADCLICK:
+            data->state = BoardData::HUNT_IDLE;
+        }
+        break;
+
+    case BoardData::HUNT_BADCLICK:
         if (!buttons[0])
-            data->state = BoardData::IDLE;
-        break;
+            data->state = BoardData::HUNT_IDLE;
+        break;
+
+    case BoardData::FUSION_IDLE:
+    {
+        int column = -1;
+
+        if (clicked[2])
+        {
+            column = data->current[0].piece->GetCell().x;
+            data->rotation = (data->rotation + 1) % 2;
+            if (column - data->rotation > data->dim.i - 1)
+                column = data->dim.i - 1 - data->rotation;
+            if (!data->rotation)
+            {
+                BoardData::Pair tmp = data->current[0];
+                data->current[0] = data->current[1];
+                data->current[1] = tmp;
+                if (column == data->dim.i - 1)
+                    column = 6;
+            }
+        }
+
+        if (mousepos.x != -1
+            && mousepos.x / 48 != data->current[0].piece->GetCell().x)
+        {
+            column = mousepos.x / 48;
+            column = column < 0 ? 0 : column > data->dim.i - 2 + data->rotation ? data->dim.i - 2 + data->rotation : column;
+        }
+
+        if (column != -1)
+        {
+            if (data->rotation)
+            {
+                data->current[0].piece->SetCell(int2(column, 6));
+                data->current[1].piece->SetCell(int2(column, 7));
+            }
+            else
+            {
+                data->current[0].piece->SetCell(int2(column, 7));
+                data->current[1].piece->SetCell(int2(column + 1, 7));
+            }
+
+            data->current[0].piece->Move(data->current[0].piece->GetCell() * 48);
+            data->current[1].piece->Move(data->current[1].piece->GetCell() * 48);
+        }
+
+        if (clicked[0])
+        {
+            for (int t = 0; t < 2; t++)
+            {
+                int i = data->current[t].piece->GetCell().i;
+                for (int j = 0; j < 7; j++)
+                    if (data->pairs[i][j].id == 0)
+                    {
+                        data->current[t].piece->SetCell(int2(i, j));
+                        data->current[t].piece->Move(int2(i, j) * 48);
+                        data->pairs[i][j] = data->current[t];
+                        data->thumbs->AddCount(data->current[t].id, 1);
+                        break;
+                    }
+            }
+
+            data->current[0].id = data->next[0];
+            data->current[1].id = data->next[1];
+            data->current[0].piece = new Piece(data->emitter, int2(3, 7),
+                                               80 + 20 * data->current[0].id);
+            data->current[1].piece = new Piece(data->emitter, int2(4, 7),
+                                               80 + 20 * data->current[1].id);
+            Ticker::Ref(data->current[0].piece);
+            Ticker::Ref(data->current[1].piece);
+            data->current[0].piece->SetPos(int2(3, 8) * 48);
+            data->current[1].piece->SetPos(int2(4, 8) * 48);
+            data->current[0].piece->Move(data->current[0].piece->GetCell() * 48);
+            data->current[1].piece->Move(data->current[1].piece->GetCell() * 48);
+            data->next[0] = GetRandomId();
+            data->next[1] = GetRandomId();
+            data->rotation = 0;
+
+            Resolve();
+        }
+        break;
+    }
     }
 
@@ -215 +345 @@
     Scene::GetDefault()->AddTile((data->board << 16) | 0,
                                  position.x, position.y, 1, 0);
+
+    switch (data->game)
+    {
+    case GAME_HUNT:
+        break;
+    case GAME_FUSION:
+        Scene::GetDefault()->AddTile((data->icons << 16) | (data->next[0] - 1),
+                                     350, 400, 11, 0);
+        Scene::GetDefault()->AddTile((data->icons << 16) | (data->next[1] - 1),
+                                     380, 400, 11, 0);
+        break;
+    }
 }
 
@@ -502 +644 @@
 }
 
-Board::~Board()
-{
-    Input::UntrackMouse(this);
+int Board::GetRandomId() const
+{
+    int max = data->npieces;
+
+    if (max > data->minnpieces)
+        max--;
+
+    return 1 + rand() % max;
+}
+
+void Board::Resolve()
+{
+    int list[MAX_PIECES][MAX_PIECES];
+    int count[MAX_PIECES * MAX_PIECES];
 
     for (int j = 0; j < data->dim.j; j++)
         for (int i = 0; i < data->dim.i; i++)
-        {
-            data->pairs[i][j].piece->SetBelow(NULL);
-            Ticker::Unref(data->pairs[i][j].piece);
-        }
+            list[i][j] = -1;
+    memset(count, 0, sizeof(count));
+
+    int seq = 0, effect = 0;
+
+    /* Count connected tiles */
+    for (int j = 0; j < data->dim.j; j++) for (int i = 0; i < data->dim.i; i++)
+    {
+        if (!data->pairs[i][j].id)
+            continue;
+
+        if (data->pairs[i][j].id >= data->maxnpieces)
+            continue;
+
+        if (list[i][j] != -1)
+            continue;
+
+        list[i][j] = seq;
+        count[seq] = TagNeighbours(list, i, j);
+        if (count[seq] >= 3)
+            effect = 1;
+        seq++;
+    }
+
+    /* Only continue if there is an effect */
+    if (!effect)
+        return;
+
+    /* Add tiles to a mash; add mash to our list */
+    Mash *mash = new Mash(data->emitter);
+    Ticker::Ref(mash);
+
+    for (int j = 0; j < data->dim.j; j++) for (int i = 0; i < data->dim.i; i++)
+    {
+        if (list[i][j] == -1)
+            continue;
+        if (count[list[i][j]] < 3)
+            continue;
+
+        mash->AddPiece(data->pairs[i][j].piece);
+        data->pairs[i][j].piece = NULL;
+    }
+
+    mash->nextmash = data->mashes;
+    data->mashes = mash;
+
+    /* Create new pieces where necessary */
+    for (int j = 0; j < data->dim.j; j++) for (int i = 0; i < data->dim.i; i++)
+    {
+        if (list[i][j] == -1)
+            continue;
+        if (count[list[i][j]] < 3)
+        {
+            if (!data->pairs[i][j].piece)
+                data->pairs[i][j].id = 0;
+            continue;
+        }
+
+        data->pairs[i][j].id++;
+        if (data->pairs[i][j].id > data->npieces
+                && data->pairs[i][j].id <= data->maxnpieces)
+        {
+            data->npieces++;
+            data->thumbs->SetMax(data->npieces);
+        }
+        data->pairs[i][j].piece = new Piece(data->emitter, int2(i, j), 80 + 20 * data->pairs[i][j].id);
+        Ticker::Ref(data->pairs[i][j].piece);
+        data->pairs[i][j].piece->SetPos(int2(i, j) * 48);
+        data->thumbs->AddCount(data->pairs[i][j].id, 1);
+        count[list[i][j]] = 0;
+        list[i][j] = -1;
+    }
+
+    /* Move everything down */
+    for (int j = data->dim.j; j--;) for (int i = 0; i < data->dim.i; i++)
+    {
+        if (list[i][j] == -1 || data->pairs[i][j].piece)
+            continue;
+
+        for (int j2 = j + 1; j2 < data->dim.j; j2++)
+        {
+            data->pairs[i][j2 - 1] = data->pairs[i][j2];
+            if (data->pairs[i][j2 - 1].id)
+            {
+                data->pairs[i][j2 - 1].piece->SetCell(int2(i, j2 - 1));
+                data->pairs[i][j2 - 1].piece->Move(int2(i, j2 - 1) * 48);
+            }
+            list[i][j2 - 1] = list[i][j2];
+        }
+
+        data->pairs[i][data->dim.j - 1].id = 0;
+        list[i][data->dim.j - 1] = -1;
+    }
+
+    /* Start again (FIXME: make this a while() loop) */
+    Resolve();
+}
+
+int Board::TagNeighbours(int list[MAX_PIECES][MAX_PIECES], int i, int j)
+{
+    int2 const off[] = { int2(-1, 0), int2(1, 0), int2(0, -1), int2(0, 1) };
+
+    int count = 1;
+
+    for (int n = 0; n < 4; n++)
+    {
+        int i2 = i + off[n].i;
+        int j2 = j + off[n].j;
+
+        if (i2 >= 0 && i2 < data->dim.i && j2 >= 0 && j2 < data->dim.j
+             && data->pairs[i2][j2].id == data->pairs[i][j].id
+             && list[i2][j2] == -1)
+        {
+            list[i2][j2] = list[i][j];
+            count += TagNeighbours(list, i2, j2);
+        }
+    }
+    return count;
+}
+
+Board::~Board()
+{
+    Input::UntrackMouse(this);
+
+    switch (data->game)
+    {
+    case GAME_HUNT:
+        for (int j = 0; j < data->dim.j; j++)
+            for (int i = 0; i < data->dim.i; i++)
+            {
+                data->pairs[i][j].piece->SetBelow(NULL);
+                Ticker::Unref(data->pairs[i][j].piece);
+            }
+        break;
+    case GAME_FUSION:
+        for (int j = 0; j < data->dim.j; j++)
+            for (int i = 0; i < data->dim.i; i++)
+                if (data->pairs[i][j].id)
+                    Ticker::Unref(data->pairs[i][j].piece);
+        Ticker::Unref(data->current[0].piece);
+        Ticker::Unref(data->current[1].piece);
+        break;
+    }
     Ticker::Unref(data->thumbs);
     Ticker::Unref(data->scoretext);
@@ -525 +817 @@
     Tiler::Deregister(data->board);
     Tiler::Deregister(data->tiles);
+    Tiler::Deregister(data->icons);
     Sampler::Deregister(data->click);
     Sampler::Deregister(data->whip);

trunk/monsterz/board.h

@@ -24 +24 @@
 {
 public:
-    Board(int2 dim, int npieces);
+    typedef enum
+    {
+        GAME_HUNT,
+        GAME_FUSION,
+    }
+    game_t;
+
+    Board(game_t, int2 dim, int minnpieces, int maxnpieces);
     virtual ~Board();
 
@@ -31 +38 @@
     virtual void TickDraw(float deltams);
 
+    /* Hunt mode */
     void Fill();
     void Switch(int2 cell_a, int2 cell_b);
     int ListMashes(int list[MAX_WIDTH][MAX_HEIGHT]);
     int ListMoves(int list[MAX_WIDTH][MAX_HEIGHT]);
+
+    /* Fusion mode */
+    int GetRandomId() const;
+    void Resolve();
+    int TagNeighbours(int list[MAX_PIECES][MAX_PIECES], int i, int j);
 
 private:

trunk/monsterz/interface.cpp

@@ -22 +22 @@
 #include "title.h"
 #include "board.h"
-#include "fusion.h"
 #include "monsterz.h"
 
@@ -36 +35 @@
     Title *title;
     Board *board;
-    Fusion *fusion;
     int screen, tiles;
 
@@ -57 +55 @@
     data->title = NULL;
     data->board = NULL;
-    data->fusion = NULL;
     data->screen = Tiler::Register(PNG_BACKGROUND, 640, 480, 1.0f);
     data->tiles = Tiler::Register(PNG_TILES, 48, 48, 1.0f);
@@ -83 +80 @@
             Ticker::Unref(data->title);
             data->title = NULL;
-            data->fusion = new Fusion(int2(6, 8), 3, 12);
-            Ticker::Ref(data->fusion);
-#if 0
-            data->board = new Board(int2(8, 8), 8);
+            data->board = new Board(Board::GAME_FUSION, int2(6, 8), 3, 12);
+            //data->board = new Board(Board::GAME_HUNT, int2(8, 8), 8, 8);
             Ticker::Ref(data->board);
-#endif
             data->state = InterfaceData::GAME;
         }
@@ -118 +112 @@
     if (data->board)
         Ticker::Unref(data->board);
-    if (data->fusion)
-        Ticker::Unref(data->fusion);
     Tiler::Deregister(data->tiles);
     Tiler::Deregister(data->screen);

trunk/win32/monsterz.vcxproj

@@ -13 +13 @@
   <ItemGroup>
     <ClInclude Include="..\monsterz\board.h" />
-    <ClInclude Include="..\monsterz\fusion.h" />
     <ClInclude Include="..\monsterz\interface.h" />
     <ClInclude Include="..\monsterz\mash.h" />
@@ -53 +52 @@
   <ItemGroup>
     <ClCompile Include="..\monsterz\board.cpp" />
-    <ClCompile Include="..\monsterz\fusion.cpp" />
     <ClCompile Include="..\monsterz\interface.cpp" />
     <ClCompile Include="..\monsterz\mash.cpp" />

trunk/win32/monsterz.vcxproj.filters

@@ -89 +89 @@
     </ClInclude>
     <ClInclude Include="..\monsterz\board.h" />
-    <ClInclude Include="..\monsterz\fusion.h" />
     <ClInclude Include="..\monsterz\interface.h" />
     <ClInclude Include="..\monsterz\piece.h" />
@@ -177 +176 @@
     </ClCompile>
     <ClCompile Include="..\monsterz\board.cpp" />
-    <ClCompile Include="..\monsterz\fusion.cpp" />
     <ClCompile Include="..\monsterz\interface.cpp" />
     <ClCompile Include="..\monsterz\monsterz.cpp" />