Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 28-add-high-scores
  • 29-use-real-board-painter-to-draw-parameters-items
  • 32-add-block-size-limit-parameter
  • 39-improve-app-metadata
  • master
  • Release_0.0.10_10
  • Release_0.0.11_11
  • Release_0.0.12_12
  • Release_0.0.13_13
  • Release_0.0.14_14
  • Release_0.0.15_15
  • Release_0.0.16_16
  • Release_0.0.17_17
  • Release_0.0.18_18
  • Release_0.0.19_19
  • Release_0.0.1_1
  • Release_0.0.20_20
  • Release_0.0.21_21
  • Release_0.0.22_22
  • Release_0.0.23_23
  • Release_0.0.24_24
  • Release_0.0.25_25
  • Release_0.0.26_26
  • Release_0.0.27_27
  • Release_0.0.28_28
  • Release_0.0.29_29
  • Release_0.0.2_2
  • Release_0.0.30_30
  • Release_0.0.31_31
  • Release_0.0.3_3
  • Release_0.0.4_4
  • Release_0.0.5_5
  • Release_0.0.6_6
  • Release_0.0.7_7
  • Release_0.0.8_8
  • Release_0.0.9_9
  • Release_0.1.0_32
  • Release_0.1.1_33
  • Release_0.2.0_34
  • Release_0.2.1_35
  • Release_0.3.0_36
  • Release_0.3.1_37
  • Release_0.4.0_38
  • Release_0.4.1_39
  • Release_0.4.2_40
  • Release_0.5.0_41
  • Release_0.6.0_42
  • Release_0.7.0_43
  • Release_0.8.0_44
  • Release_0.8.1_45
  • Release_0.8.2_46
  • Release_0.9.0_47
  • Release_0.9.1_48
53 results

Target

Select target project
  • android/org.benoitharrault.jeweled
1 result
Select Git revision
  • 28-add-high-scores
  • 29-use-real-board-painter-to-draw-parameters-items
  • 32-add-block-size-limit-parameter
  • 39-improve-app-metadata
  • master
  • Release_0.0.10_10
  • Release_0.0.11_11
  • Release_0.0.12_12
  • Release_0.0.13_13
  • Release_0.0.14_14
  • Release_0.0.15_15
  • Release_0.0.16_16
  • Release_0.0.17_17
  • Release_0.0.18_18
  • Release_0.0.19_19
  • Release_0.0.1_1
  • Release_0.0.20_20
  • Release_0.0.21_21
  • Release_0.0.22_22
  • Release_0.0.23_23
  • Release_0.0.24_24
  • Release_0.0.25_25
  • Release_0.0.26_26
  • Release_0.0.27_27
  • Release_0.0.28_28
  • Release_0.0.29_29
  • Release_0.0.2_2
  • Release_0.0.30_30
  • Release_0.0.31_31
  • Release_0.0.3_3
  • Release_0.0.4_4
  • Release_0.0.5_5
  • Release_0.0.6_6
  • Release_0.0.7_7
  • Release_0.0.8_8
  • Release_0.0.9_9
  • Release_0.1.0_32
  • Release_0.1.1_33
  • Release_0.2.0_34
  • Release_0.2.1_35
  • Release_0.3.0_36
  • Release_0.3.1_37
  • Release_0.4.0_38
  • Release_0.4.1_39
  • Release_0.4.2_40
  • Release_0.5.0_41
  • Release_0.6.0_42
  • Release_0.7.0_43
  • Release_0.8.0_44
  • Release_0.8.1_45
  • Release_0.8.2_46
  • Release_0.9.0_47
  • Release_0.9.1_48
53 results
Show changes

Commits on Source 4

org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=0.0.10 app.versionName=0.0.12
app.versionCode=10 app.versionCode=12
Improve pick new color.
Fix compute score board on new game.
Amélioration de la sélection de couleur.
Correction du calcul du bandeau de score au démarrage d'une partie.
...@@ -122,6 +122,7 @@ class GameCubit extends HydratedCubit<GameState> { ...@@ -122,6 +122,7 @@ class GameCubit extends HydratedCubit<GameState> {
void postAnimate() { void postAnimate() {
this.moveCellsDown(); this.moveCellsDown();
this.updateAvailableBlocksCount(); this.updateAvailableBlocksCount();
refresh();
if (!this.state.currentGame.hasAtLeastOneAvailableBlock()) { if (!this.state.currentGame.hasAtLeastOneAvailableBlock()) {
print('no more block found. finish game.'); print('no more block found. finish game.');
...@@ -137,6 +138,7 @@ class GameCubit extends HydratedCubit<GameState> { ...@@ -137,6 +138,7 @@ class GameCubit extends HydratedCubit<GameState> {
newGame.dump(); newGame.dump();
updateState(newGame); updateState(newGame);
this.postAnimate();
} }
@override @override
......
...@@ -184,23 +184,25 @@ class Game { ...@@ -184,23 +184,25 @@ class Game {
// build a list of values to pick one // build a list of values to pick one
final List<int> values = []; final List<int> values = [];
// All eligible values // All eligible values (twice)
final int maxValue = this.settings.colorsCount; final int maxValue = this.settings.colorsCount;
for (int i = 1; i <= maxValue; i++) { for (int i = 1; i <= maxValue; i++) {
values.add(i); values.add(i);
values.add(i);
} }
// Add values of current col // Add values of current col (twice)
for (int r = 0; r <= this.settings.boardSize; r++) { for (int r = 0; r <= this.settings.boardSize; r++) {
if (this.isInBoard(CellLocation.go(r, col))) { if (this.isInBoard(CellLocation.go(r, col))) {
final int? value = this.getCellValue(CellLocation.go(r, col)); final int? value = this.getCellValue(CellLocation.go(r, col));
if (value != null) { if (value != null) {
values.add(value); values.add(value);
values.add(value);
} }
} }
} }
// Add values of sibling cols // Add values of sibling cols (twice for top rows)
for (int deltaCol = -1; deltaCol <= 1; deltaCol++) { for (int deltaCol = -1; deltaCol <= 1; deltaCol++) {
final int c = col + deltaCol; final int c = col + deltaCol;
for (int r = 0; r < this.settings.boardSize; r++) { for (int r = 0; r < this.settings.boardSize; r++) {
...@@ -208,6 +210,9 @@ class Game { ...@@ -208,6 +210,9 @@ class Game {
final int? value = this.getCellValue(CellLocation.go(r, c)); final int? value = this.getCellValue(CellLocation.go(r, c));
if (value != null) { if (value != null) {
values.add(value); values.add(value);
if (row < this.settings.boardSize / 3) {
values.add(value);
}
} }
} }
} }
......
...@@ -3,7 +3,7 @@ description: Jeweled Game ...@@ -3,7 +3,7 @@ description: Jeweled Game
publish_to: 'none' publish_to: 'none'
version: 0.0.10+10 version: 0.0.12+12
environment: environment:
sdk: '^3.0.0' sdk: '^3.0.0'
......