Skip to content
Snippets Groups Projects
Commit 4f252f37 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '21-enlarge-dataset' into 'master'

Resolve "Enlarge dataset"

Closes #21

See merge request !21
parents d88d0fa7 fef556e4
No related branches found
No related tags found
1 merge request!21Resolve "Enlarge dataset"
Pipeline #5572 passed
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
app.versionName=0.0.20
app.versionCode=20
app.versionName=0.0.21
app.versionCode=21
Enlarge / improve database.
Compléments et améliorations sur la base de données.
This diff is collapsed.
......@@ -3,7 +3,7 @@ description: A sorting game application.
publish_to: 'none'
version: 0.0.20+20
version: 0.0.21+21
environment:
sdk: '^3.0.0'
......
This diff is collapsed.
......@@ -34,7 +34,7 @@ function find_missing_associations(array $mappingItems, array $categories, array
$mappingItems[$item]['na'],
);
foreach ($categories as $category) {
if (!\in_array($category, $set)) {
if ($category === 'inerte' && !\in_array($category, $set)) {
$missing[] = [
'item' => $item,
'category' => $category,
......@@ -310,9 +310,9 @@ function editMappings($mappingItems, $categories, $items, $exclusions)
case '3':
dump(' -> "' . $item . '" does not apply as "is or is not" "' . $category . '"');
$mappingItems[$item]['na'][] = $category;
foreach ($ex as $exclusion) {
dump(' -> "' . $item . '" does not apply as "is or is not" "' . $category . '"');
$mappingItems[$item]['na'][] = $category;
foreach ($ex as $excludedCategory) {
dump(' -> "' . $item . '" does not apply as "is or is not" "' . $excludedCategory . '"');
$mappingItems[$item]['na'][] = $excludedCategory;
}
break;
......
......@@ -25,4 +25,6 @@ echo "class GameData {" >"${GAME_DATA_DART_FILE}"
echo " static const Map<String, dynamic> data = $(cat "${DATA_FILE}");" >>"${GAME_DATA_DART_FILE}"
echo "}" >>"${GAME_DATA_DART_FILE}"
dart format "${GAME_DATA_DART_FILE}"
# cat "${DATA_FILE}"
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment