diff --git a/src/decmove.cpp b/src/decmove.cpp index e67bc59..2f96293 100644 --- a/src/decmove.cpp +++ b/src/decmove.cpp @@ -8,15 +8,42 @@ static Sint16 table_move1[] = { 9 * 4, // nb - 0, 0, 0, 0, 0, 0, 0, 0, - -2, 0, +2, 0, -1, 0, +1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - -2, 0, +2, 0, -1, 0, +1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - -2, 0, +2, 0, -1, 0, +1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - -2, 0, +2, 0, -1, 0, +1, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + -2, 0, + +2, 0, + -1, 0, + +1, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + -2, 0, + +2, 0, + -1, 0, + +1, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + -2, 0, + +2, 0, + -1, 0, + +1, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + -2, 0, + +2, 0, + -1, 0, + +1, 0, }; // Mouvement pour faire sauter un objet (est) sur blupi @@ -24,15 +51,22 @@ static Sint16 table_move1[] = static Sint16 table_move2[] = { 9 + 19, // nb - 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -10, - 0, -20, - 0, -30, - 0, -40, - -1, -50, - -3, -60, - -7, -70, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, -10, + 0, -20, + 0, -30, + 0, -40, + -1, -50, + -3, -60, + -7, -70, -15, -80, -22, -70, -30, -56, @@ -52,15 +86,22 @@ static Sint16 table_move2[] = static Sint16 table_move3[] = { 9 + 19, // nb - 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -10, - 0, -20, - 0, -30, - 0, -40, - 1, -50, - 3, -60, - 7, -70, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, -10, + 0, -20, + 0, -30, + 0, -40, + 1, -50, + 3, -60, + 7, -70, 15, -80, 22, -70, 30, -56, @@ -83,13 +124,13 @@ static Sint16 table_move4[] = -30, -60, -22, -70, -15, -80, - -7, -70, - -3, -60, - -1, -50, - 0, -40, - 0, -30, - 0, -20, - 0, -10, + -7, -70, + -3, -60, + -1, -50, + 0, -40, + 0, -30, + 0, -20, + 0, -10, }; // Mouvement pour déposer un objet (sud) sur blupi @@ -100,28 +141,28 @@ static Sint16 table_move5[] = 30, -60, 22, -70, 15, -80, - 7, -70, - 3, -60, - 1, -50, - 0, -40, - 0, -30, - 0, -20, - 0, -10, + 7, -70, + 3, -60, + 1, -50, + 0, -40, + 0, -30, + 0, -20, + 0, -10, }; // Mouvement pour pousser un pont vers l'est. static Sint16 table_move6[] = { 40, // nb - +2, +1, - +4, +2, - +6, +3, - +8, +4, - +10, +5, - +12, +6, - +14, +7, - +16, +8, - +18, +9, + +2, +1, + +4, +2, + +6, +3, + +8, +4, + +10, +5, + +12, +6, + +14, +7, + +16, +8, + +18, +9, +20, +10, +22, +11, +24, +12, @@ -159,15 +200,15 @@ static Sint16 table_move6[] = static Sint16 table_move7[] = { 40, // nb - -2, -1, - -4, -2, - -6, -3, - -8, -4, - -10, -5, - -12, -6, - -14, -7, - -16, -8, - -18, -9, + -2, -1, + -4, -2, + -6, -3, + -8, -4, + -10, -5, + -12, -6, + -14, -7, + -16, -8, + -18, -9, -20, -10, -22, -11, -24, -12, @@ -205,15 +246,15 @@ static Sint16 table_move7[] = static Sint16 table_move8[] = { 40, // nb - -2, +1, - -4, +2, - -6, +3, - -8, +4, - -10, +5, - -12, +6, - -14, +7, - -16, +8, - -18, +9, + -2, +1, + -4, +2, + -6, +3, + -8, +4, + -10, +5, + -12, +6, + -14, +7, + -16, +8, + -18, +9, -20, +10, -22, +11, -24, +12, @@ -251,15 +292,15 @@ static Sint16 table_move8[] = static Sint16 table_move9[] = { 40, // nb - +2, -1, - +4, -2, - +6, -3, - +8, -4, - +10, -5, - +12, -6, - +14, -7, - +16, -8, - +18, -9, + +2, -1, + +4, -2, + +6, -3, + +8, -4, + +10, -5, + +12, -6, + +14, -7, + +16, -8, + +18, -9, +20, -10, +22, -11, +24, -12, @@ -297,74 +338,242 @@ static Sint16 table_move9[] = static Sint16 table_move10[] = { 16 * 4, // nb - -2, 0, +2, 0, -2, 0, +2, 0, - -2, 0, +2, 0, -2, 0, +2, 0, - -2, 0, +2, 0, -2, 0, +2, 0, - -2, 0, +2, 0, -2, 0, +2, 0, - -1, 0, +1, 0, -1, 0, +1, 0, - -1, 0, +1, 0, -1, 0, +1, 0, - -1, 0, +1, 0, -1, 0, +1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - -2, 0, +2, 0, -2, 0, +2, 0, - -2, 0, +2, 0, -2, 0, +2, 0, - -2, 0, +2, 0, -2, 0, +2, 0, - -2, 0, +2, 0, -2, 0, +2, 0, - -1, 0, +1, 0, -1, 0, +1, 0, - -1, 0, +1, 0, -1, 0, +1, 0, - -1, 0, +1, 0, -1, 0, +1, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -2, 0, + +2, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, }; // Mouvement pour secouer la mine. static Sint16 table_move11[] = { 20 * 4, // nb - 0, -1, 0, +1, 0, -1, 0, +1, - 0, -1, 0, +1, 0, -1, 0, +1, - 0, -1, 0, +1, 0, -1, 0, +1, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, -1, 0, +1, 0, -1, 0, +1, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, -1, 0, +1, 0, -1, 0, +1, - 0, -1, 0, +1, 0, -1, 0, +1, - 0, -1, 0, +1, 0, -1, 0, +1, - 0, -1, 0, +1, 0, -1, 0, +1, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, -1, 0, +1, 0, -1, 0, +1, - 0, -1, 0, +1, 0, -1, 0, +1, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, -1, 0, +1, 0, -1, 0, +1, - 0, -1, 0, +1, 0, -1, 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + 0, -1, + 0, +1, }; // Mouvement pour secouer l'usine. static Sint16 table_move12[] = { 20 * 4, // nb - -1, 0, +1, 0, -1, 0, +1, 0, - 0, -1, 0, +1, 0, -1, 0, +1, - -1, 0, +1, 0, -1, 0, +1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - -2, 0, +2, 0, 0, +1, 0, +1, - -2, 0, +2, 0, 0, +1, 0, +1, - -1, 0, +1, 0, -1, 0, +1, 0, - -2, 0, +2, 0, 0, +1, 0, +1, - 0, 0, 0, 0, 0, 0, 0, 0, - -1, 0, +1, 0, -1, 0, +1, 0, - -1, 0, +1, 0, -1, 0, +1, 0, - 0, -1, 0, +1, 0, -2, 0, +2, - -1, 0, +1, 0, -1, 0, +1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - -1, 0, +1, 0, -1, 0, +1, 0, - -2, 0, +2, 0, 0, +1, 0, +1, - -2, 0, +2, 0, 0, +1, 0, +1, - 0, 0, 0, 0, 0, 0, 0, 0, - -2, 0, +2, 0, 0, +1, 0, +1, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + 0, -1, + 0, +1, + 0, -1, + 0, +1, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + -2, 0, + +2, 0, + 0, +1, + 0, +1, + -2, 0, + +2, 0, + 0, +1, + 0, +1, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + -2, 0, + +2, 0, + 0, +1, + 0, +1, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + 0, -1, + 0, +1, + 0, -2, + 0, +2, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + -1, 0, + +1, 0, + -1, 0, + +1, 0, + -2, 0, + +2, 0, + 0, +1, + 0, +1, + -2, 0, + +2, 0, + 0, +1, + 0, +1, + 0, 0, + 0, 0, + 0, 0, + 0, 0, + -2, 0, + +2, 0, + 0, +1, + 0, +1, }; Sint16 *GetListMoves (Sint32 rank)