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
  • 32-improve-app-metadata
  • 49-upgrade-framework-and-dependencies
  • 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.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.2_2
  • 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_27
  • Release_0.1.1_28
  • Release_0.1.2_29
  • Release_0.2.0_30
  • Release_0.2.1_31
  • Release_0.3.0_32
  • Release_0.3.1_33
  • Release_0.4.0_34
  • Release_0.4.1_35
  • Release_0.4.2_36
  • Release_0.5.0_37
  • Release_0.6.0_38
  • Release_0.7.0_39
  • Release_0.8.0_40
  • Release_0.8.1_41
  • Release_0.8.2_42
  • Release_0.9.0_43
45 results

Target

Select target project
  • android/org.benoitharrault.sortgame
1 result
Select Git revision
  • 32-improve-app-metadata
  • 49-upgrade-framework-and-dependencies
  • 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.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.2_2
  • 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_27
  • Release_0.1.1_28
  • Release_0.1.2_29
  • Release_0.2.0_30
  • Release_0.2.1_31
  • Release_0.3.0_32
  • Release_0.3.1_33
  • Release_0.4.0_34
  • Release_0.4.1_35
  • Release_0.4.2_36
  • Release_0.5.0_37
  • Release_0.6.0_38
  • Release_0.7.0_39
  • Release_0.8.0_40
  • Release_0.8.1_41
  • Release_0.8.2_42
  • Release_0.9.0_43
45 results
Show changes

Commits on Source 4

Show whitespace changes
Inline Side-by-side
Showing
with 1226 additions and 1037 deletions
android/gradle.properties
View file @ 761d41a6
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
app.versionName=0.0.22
app.versionCode=22
app.versionName=0.0.24
app.versionCode=24
fastlane/metadata/android/en-US/changelogs/23.txt 0 → 100644
View file @ 761d41a6
Add choose categories theme.
fastlane/metadata/android/en-US/changelogs/24.txt 0 → 100644
View file @ 761d41a6
Lowercase all items.
fastlane/metadata/android/fr-FR/changelogs/23.txt 0 → 100644
View file @ 761d41a6
Ajout du choix du thème des catégories.
fastlane/metadata/android/fr-FR/changelogs/24.txt 0 → 100644
View file @ 761d41a6
Mise en minuscules de tous les items.
lib/config/default_game_settings.dart
View file @ 761d41a6
import 'package:sortgame/data/fetch_data_helper.dart';
import 'package:sortgame/utils/tools.dart';
class DefaultGameSettings {
static const List<String> availableParameters = [
'itemsCount',
'theme',
];
static const int itemsCountValueLow = 5;
......@@ -18,12 +20,20 @@ class DefaultGameSettings {
itemsCountValueVeryHigh,
];
static const int defaultThemeValue = 0;
static List<int> getAvailableValues(String parameterCode) {
switch (parameterCode) {
case 'itemsCount':
return DefaultGameSettings.allowedItemsCountValues;
}
switch (parameterCode) {
case 'theme':
final int count = FetchDataHelper().getThemes().length;
return List<int>.generate(count, (i) => i);
}
printlog('Did not find any available value for game parameter "$parameterCode".');
return [];
}
......
lib/cubit/settings_game_cubit.dart
View file @ 761d41a6
......@@ -12,11 +12,13 @@ class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
void setValues({
int? itemsCount,
int? theme,
}) {
emit(
GameSettingsState(
settings: GameSettings(
itemsCount: itemsCount ?? state.settings.itemsCount,
theme: theme ?? state.settings.theme,
),
),
);
......@@ -26,6 +28,8 @@ class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
switch (code) {
case 'itemsCount':
return GameSettings.getItemsCountValueFromUnsafe(state.settings.itemsCount);
case 'theme':
return GameSettings.getThemeValueFromUnsafe(state.settings.theme);
}
return 0;
}
......@@ -35,19 +39,23 @@ class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
printlog('code: $code / value: $value');
int itemsCount = code == 'itemsCount' ? value : getParameterValue('itemsCount');
int theme = code == 'theme' ? value : getParameterValue('theme');
setValues(
itemsCount: itemsCount,
theme: theme,
);
}
@override
GameSettingsState? fromJson(Map<String, dynamic> json) {
int itemsCount = json['itemsCount'] as int;
int theme = json['theme'] as int;
return GameSettingsState(
settings: GameSettings(
itemsCount: itemsCount,
theme: theme,
),
);
}
......@@ -56,6 +64,7 @@ class GameSettingsCubit extends HydratedCubit<GameSettingsState> {
Map<String, dynamic>? toJson(GameSettingsState state) {
return <String, dynamic>{
'itemsCount': state.settings.itemsCount,
'theme': state.settings.theme,
};
}
}
lib/data/fetch_data_helper.dart
View file @ 761d41a6
import 'package:sortgame/data/game_data.dart';
import 'package:sortgame/models/data/category.dart';
import 'package:sortgame/models/data/game_item.dart';
import 'package:sortgame/models/data/game_theme.dart';
import 'package:sortgame/models/data/item.dart';
import 'package:sortgame/models/settings_game.dart';
import 'package:sortgame/utils/tools.dart';
class FetchDataHelper {
......@@ -13,6 +15,9 @@ class FetchDataHelper {
final List<Item> _items = [];
List<Item> get items => _items;
final List<GameTheme> _themes = [];
List<GameTheme> get themes => _themes;
final List<GameItem> _mapping = [];
void init() {
......@@ -25,6 +30,16 @@ class FetchDataHelper {
_categories.add(Category(key: element, text: element));
}
final Map<String, dynamic> rawThemes = gameData['themes'] as Map<String, dynamic>;
rawThemes.forEach((code, rawCategories) {
final List<Category> categories = [];
for (var rawElement in rawCategories) {
final element = rawElement.toString();
categories.add(Category(key: element, text: element));
}
_themes.add(GameTheme(code: code, categories: categories));
});
final List<dynamic> rawItems = gameData['items'] as List<dynamic>;
for (var rawElement in rawItems) {
final element = rawElement.toString();
......@@ -64,13 +79,27 @@ class FetchDataHelper {
}
}
List<GameItem> getItems(int count) {
List<GameItem> getItems(GameSettings gameSettings) {
if (_mapping.isEmpty) {
init();
}
final int count = gameSettings.itemsCount;
final int theme = gameSettings.theme;
List<GameItem> items = _mapping;
// Remove unwanted categories if theme is selected
if (theme != 0) {
final GameTheme gameTheme = _themes[theme];
for (GameItem item in items) {
item.isCategory.removeWhere((Category category) =>
(!gameTheme.categories.map((c) => c.key).contains(category.key)));
item.isNotCategory.removeWhere((Category category) =>
(!gameTheme.categories.map((c) => c.key).contains(category.key)));
}
}
// Remove items without enough data
items.removeWhere((GameItem gameItem) =>
(gameItem.isCategory.isEmpty || gameItem.isNotCategory.isEmpty));
......@@ -79,4 +108,20 @@ class FetchDataHelper {
return items.take(count).toList();
}
List<GameTheme> getThemes() {
if (_themes.isEmpty) {
init();
}
return _themes.toList();
}
GameTheme getTheme(int themeIndex) {
if (_themes.isEmpty) {
init();
}
return _themes[themeIndex];
}
}
lib/data/game_data.dart
View file @ 761d41a6
......@@ -15,1458 +15,1464 @@ class GameData {
["inerte", "animal", "végétal"],
["naturel", "artificiel"]
],
"themes": {
"tout": [],
"état": ["liquide", "solide", "gazeux"],
"genre": ["inerte", "animal", "végétal"],
"vivant": ["animal", "végétal"]
},
"items": [
"ABEILLE",
"AIGUILLE",
"ALLUMETTE",
"AMBULANCE",
"AMPOULE",
"ANANAS",
"AQUARIUM",
"ARAIGNÉE",
"ARBRE",
"ARMOIRE",
"ARROSOIR",
"ASPERGE",
"ASPIRATEUR",
"AUBERGINE",
"AUTRUCHE",
"AVION",
"BALAI",
"BALANÇOIRE",
"BALEINE",
"BALLON",
"BANANE",
"BASSINE",
"BATEAU",
"BAVOIR",
"BERCEAU",
"BEURRE",
"BIBERON",
"BISCUIT",
"BONBON",
"BONNET",
"BOTTE",
"BOUCHON",
"BOUGIE",
"BOUQUET",
"BOUTEILLE",
"BROSSE",
"BROUETTE",
"BÉBÉ",
"BÛCHE",
"CACTUS",
"CAFETIÈRE",
"CAFÉ",
"CAHIER",
"CAMION",
"CANARD",
"CAROTTE",
"CARTABLE",
"CASQUE",
"CASQUETTE",
"CASSEROLE",
"CASTOR",
"CERF-VOLANT",
"CHAISE",
"CHAMPIGNON",
"CHATEAU",
"CHAUSSETTE",
"CHAUSSURE",
"CHEMINÉE",
"CHEMISE",
"CHEVAL",
"CINTRE",
"CISEAUX",
"CITRON",
"CITROUILLE",
"COCCINELLE",
"COCOTTE-MINUTE",
"COLLIER",
"CONCOMBRE",
"CONFITURE",
"COQ",
"COQUELICOT",
"CORBEAU",
"CORDE",
"CORNICHON",
"CRABE",
"CRAYON",
"CROCODILE",
"CULOTTE",
"DAUPHIN",
"DINOSAURE",
"DROMADAIRE",
"ESCALIER",
"ESCARGOT",
"FANTÔME",
"FENÊTRE",
"FLEUR",
"FLÛTE",
"FOURCHETTE",
"FOURMI",
"FRAISE",
"FRAMBOISE",
"FROMAGE",
"FUSÉE",
"GANT",
"GILET",
"GOMME",
"GOURDE",
"GRENOUILLE",
"GRILLE-PAIN",
"GUITARE",
"GUÊPE",
"HARMONICA",
"HIPPOCAMPE",
"HIPPOPOTAME",
"HÉLICOPTÈRE",
"JAMBON",
"JOURNAL",
"JUPE",
"KANGOUROU",
"KAYAK",
"KIWI",
"LAIT",
"LAMPE",
"LAPIN",
"LAVE-LINGE",
"LIBELLULE",
"LICORNE",
"LION",
"LIT",
"LITIÈRE",
"LIVRE",
"LOUP",
"LUNE",
"LUNETTES",
"MAISON",
"MARTEAU",
"MICRO",
"MOTO",
"MOUCHE",
"MOUTON",
"MÉSANGE",
"MÉTRO",
"NOEUD",
"NOISETTE",
"OEUF",
"OIE",
"ORAGE",
"ORCHESTRE",
"ORDINATEUR",
"OREILLER",
"OURS",
"PAIN",
"PANDA",
"PANTALON",
"PAPILLON",
"PAQUEBOT",
"PARAPLUIE",
"PASSOIRE",
"PEIGNE",
"PELLE",
"PELOTE",
"PELUCHE",
"PENDULE",
"PERCEUSE",
"PERLE",
"PERROQUET",
"PIANO",
"PIGEON",
"PISCINE",
"PIVERT",
"PIZZA",
"PLAGE",
"POIRE",
"POISSON",
"POMME",
"POMME-DE-TERRE",
"POMPIER",
"POUBELLE",
"POULET",
"POUPÉE",
"POUSSETTE",
"POUSSIN",
"PUZZLE",
"PYJAMA",
"PÂTES",
"PÉNICHE",
"PÊCHE",
"RADIS",
"RAQUETTE",
"RENARD",
"REQUIN",
"RHINOCÉROS",
"RIVIÈRE",
"ROBINET",
"ROSE",
"RÂTEAU",
"RÉVEIL",
"SAC",
"SAC À DOS",
"SALADE",
"SANDALE",
"SANDWICH",
"SANGLIER",
"SAUCISSE",
"SAUCISSON",
"SAUTERELLE",
"SAVON",
"SCIE",
"SEAU",
"SERPENT",
"SINGE",
"SOLEIL",
"SOUPE",
"SOUS-MARIN",
"STADE",
"STATUE",
"STYLO",
"SUCRE",
"TABOURET",
"TACHE",
"TAILLE-CRAYON",
"TAPIS",
"TARTINE",
"TASSE",
"THERMOMÈTRE",
"TIRE-BOUCHON",
"TIROIR",
"TOBOGGAN",
"TONDEUSE",
"TORCHON",
"TORTUE",
"TOURNEVIS",
"TRACTEUR",
"TRAIN",
"TROMPETTE",
"TULIPE",
"TÉLÉPHONE",
"TÉLÉVISION",
"VACHE",
"VALISE",
"VASE",
"VIOLON",
"VOILIER",
"VOITURE",
"VÉLO",
"YAOURT",
"ZÈBRE",
"ÉCHELLE",
"ÉCUREUIL",
"ÉLÉPHANT",
"ÉTOILE",
"ÉVIER"
"abeille",
"aiguille",
"allumette",
"ambulance",
"ampoule",
"ananas",
"aquarium",
"araignée",
"arbre",
"armoire",
"arrosoir",
"asperge",
"aspirateur",
"aubergine",
"autruche",
"avion",
"balai",
"balançoire",
"baleine",
"ballon",
"banane",
"bassine",
"bateau",
"bavoir",
"berceau",
"beurre",
"biberon",
"biscuit",
"bonbon",
"bonnet",
"botte",
"bouchon",
"bougie",
"bouquet",
"bouteille",
"brosse",
"brouette",
"bébé",
"bûche",
"cactus",
"cafetière",
"café",
"cahier",
"camion",
"canard",
"carotte",
"cartable",
"casque",
"casquette",
"casserole",
"castor",
"cerf-volant",
"chaise",
"champignon",
"chateau",
"chaussette",
"chaussure",
"cheminée",
"chemise",
"cheval",
"cintre",
"ciseaux",
"citron",
"citrouille",
"coccinelle",
"cocotte-minute",
"collier",
"concombre",
"confiture",
"coq",
"coquelicot",
"corbeau",
"corde",
"cornichon",
"crabe",
"crayon",
"crocodile",
"culotte",
"dauphin",
"dinosaure",
"dromadaire",
"escalier",
"escargot",
"fantôme",
"fenêtre",
"fleur",
"flûte",
"fourchette",
"fourmi",
"fraise",
"framboise",
"fromage",
"fusée",
"gant",
"gilet",
"gomme",
"gourde",
"grenouille",
"grille-pain",
"guitare",
"guêpe",
"harmonica",
"hippocampe",
"hippopotame",
"hélicoptère",
"jambon",
"journal",
"jupe",
"kangourou",
"kayak",
"kiwi",
"lait",
"lampe",
"lapin",
"lave-linge",
"libellule",
"licorne",
"lion",
"lit",
"litière",
"livre",
"loup",
"lune",
"lunettes",
"maison",
"marteau",
"micro",
"moto",
"mouche",
"mouton",
"mésange",
"métro",
"noeud",
"noisette",
"oeuf",
"oie",
"orage",
"orchestre",
"ordinateur",
"oreiller",
"ours",
"pain",
"panda",
"pantalon",
"papillon",
"paquebot",
"parapluie",
"passoire",
"peigne",
"pelle",
"pelote",
"peluche",
"pendule",
"perceuse",
"perle",
"perroquet",
"piano",
"pigeon",
"piscine",
"pivert",
"pizza",
"plage",
"poire",
"poisson",
"pomme",
"pomme-de-terre",
"pompier",
"poubelle",
"poulet",
"poupée",
"poussette",
"poussin",
"puzzle",
"pyjama",
"pâtes",
"péniche",
"pêche",
"radis",
"raquette",
"renard",
"requin",
"rhinocéros",
"rivière",
"robinet",
"rose",
"râteau",
"réveil",
"sac",
"sac à dos",
"salade",
"sandale",
"sandwich",
"sanglier",
"saucisse",
"saucisson",
"sauterelle",
"savon",
"scie",
"seau",
"serpent",
"singe",
"soleil",
"soupe",
"sous-marin",
"stade",
"statue",
"stylo",
"sucre",
"tabouret",
"tache",
"taille-crayon",
"tapis",
"tartine",
"tasse",
"thermomètre",
"tire-bouchon",
"tiroir",
"toboggan",
"tondeuse",
"torchon",
"tortue",
"tournevis",
"tracteur",
"train",
"trompette",
"tulipe",
"téléphone",
"télévision",
"vache",
"valise",
"vase",
"violon",
"voilier",
"voiture",
"vélo",
"yaourt",
"zèbre",
"échelle",
"écureuil",
"éléphant",
"étoile",
"évier"
],
"mapping": {
"items": {
"ABEILLE": {
"abeille": {
"is": ["animal", "naturel", "solide"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"AIGUILLE": {
"aiguille": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"ALLUMETTE": {
"allumette": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"AMBULANCE": {
"ambulance": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "végétal"],
"na": []
},
"AMPOULE": {
"ampoule": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"ANANAS": {
"ananas": {
"is": ["végétal"],
"isnot": ["animal", "inerte", "liquide"],
"na": []
},
"AQUARIUM": {
"aquarium": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"ARAIGNÉE": {
"araignée": {
"is": ["animal"],
"isnot": ["inerte", "liquide", "végétal"],
"na": []
},
"ARBRE": {
"arbre": {
"is": ["naturel", "solide", "végétal"],
"isnot": ["animal", "artificiel", "gazeux", "inerte", "liquide"],
"na": []
},
"ARMOIRE": {
"armoire": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"ARROSOIR": {
"arrosoir": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"ASPERGE": {
"asperge": {
"is": ["végétal"],
"isnot": ["animal", "inerte", "solide"],
"na": []
},
"ASPIRATEUR": {
"aspirateur": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"AUBERGINE": {
"aubergine": {
"is": ["végétal"],
"isnot": ["animal", "inerte"],
"na": []
},
"AUTRUCHE": {
"autruche": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "gazeux", "inerte", "végétal"],
"na": []
},
"AVION": {
"avion": {
"is": ["inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"BALAI": {
"balai": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"BALANÇOIRE": {
"balançoire": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"BALEINE": {
"baleine": {
"is": ["animal", "naturel", "solide"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"BALLON": {
"ballon": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"BANANE": {
"banane": {
"is": ["naturel", "solide", "végétal"],
"isnot": ["animal", "artificiel", "gazeux", "inerte", "liquide"],
"na": []
},
"BASSINE": {
"bassine": {
"is": ["inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"BATEAU": {
"is": ["animal", "inerte"],
"isnot": ["végétal"],
"bateau": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"BAVOIR": {
"bavoir": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"BERCEAU": {
"berceau": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"BEURRE": {
"beurre": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"BIBERON": {
"biberon": {
"is": ["inerte"],
"isnot": ["animal", "liquide", "végétal"],
"na": []
},
"BISCUIT": {
"biscuit": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"BONBON": {
"bonbon": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"BONNET": {
"bonnet": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"BOTTE": {
"botte": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "végétal"],
"na": []
},
"BOUCHON": {
"bouchon": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"BOUGIE": {
"bougie": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"BOUQUET": {
"bouquet": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"BOUTEILLE": {
"bouteille": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"BROSSE": {
"brosse": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"BROUETTE": {
"brouette": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"BÉBÉ": {
"bébé": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"BÛCHE": {
"bûche": {
"is": ["végétal"],
"isnot": ["animal", "inerte"],
"na": []
},
"CACTUS": {
"cactus": {
"is": ["solide", "végétal"],
"isnot": ["animal", "gazeux", "inerte", "liquide"],
"na": []
},
"CAFETIÈRE": {
"cafetière": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"CAFÉ": {
"café": {
"is": ["liquide", "végétal"],
"isnot": ["animal", "gazeux", "inerte", "solide"],
"na": []
},
"CAHIER": {
"cahier": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"CAMION": {
"is": ["inerte", "végétal"],
"isnot": ["animal"],
"camion": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"CANARD": {
"canard": {
"is": ["animal", "naturel", "solide"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"CAROTTE": {
"carotte": {
"is": ["végétal"],
"isnot": ["animal", "inerte", "liquide"],
"na": []
},
"CARTABLE": {
"cartable": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"CASQUE": {
"casque": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"CASQUETTE": {
"casquette": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"CASSEROLE": {
"casserole": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"CASTOR": {
"castor": {
"is": ["animal", "naturel"],
"isnot": ["inerte", "végétal"],
"na": []
},
"CERF-VOLANT": {
"cerf-volant": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "végétal"],
"na": []
},
"CHAISE": {
"is": ["animal", "artificiel", "inerte", "solide"],
"isnot": ["gazeux", "liquide", "naturel", "végétal"],
"chaise": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"CHAMPIGNON": {
"champignon": {
"is": ["végétal"],
"isnot": ["animal", "inerte"],
"na": []
},
"CHATEAU": {
"chateau": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "végétal"],
"na": []
},
"CHAUSSETTE": {
"is": ["inerte", "végétal"],
"isnot": ["animal"],
"chaussette": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"CHAUSSURE": {
"chaussure": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"CHEMINÉE": {
"cheminée": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "gazeux", "naturel", "végétal"],
"na": []
},
"CHEMISE": {
"chemise": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"CHEVAL": {
"cheval": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"CINTRE": {
"cintre": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"CISEAUX": {
"ciseaux": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"CITRON": {
"citron": {
"is": ["végétal"],
"isnot": ["animal", "inerte"],
"na": []
},
"CITROUILLE": {
"citrouille": {
"is": ["naturel", "végétal"],
"isnot": ["animal", "artificiel", "gazeux", "inerte"],
"na": []
},
"COCCINELLE": {
"coccinelle": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "gazeux", "inerte", "végétal"],
"na": ["liquide", "solide"]
},
"COCOTTE-MINUTE": {
"cocotte-minute": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"COLLIER": {
"collier": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "végétal"],
"na": []
},
"CONCOMBRE": {
"concombre": {
"is": ["végétal"],
"isnot": ["animal", "inerte"],
"na": []
},
"CONFITURE": {
"confiture": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"COQ": {
"coq": {
"is": ["animal", "naturel", "solide"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"COQUELICOT": {
"coquelicot": {
"is": ["solide", "végétal"],
"isnot": ["animal", "gazeux", "inerte", "liquide"],
"na": []
},
"CORBEAU": {
"corbeau": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"CORDE": {
"corde": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"CORNICHON": {
"cornichon": {
"is": ["naturel", "végétal"],
"isnot": ["animal", "artificiel", "gazeux", "inerte"],
"na": []
},
"CRABE": {
"crabe": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "inerte", "végétal"],
"na": []
},
"CRAYON": {
"crayon": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"CROCODILE": {
"crocodile": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "gazeux", "inerte", "végétal"],
"na": ["liquide", "solide"]
},
"CULOTTE": {
"culotte": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"DAUPHIN": {
"dauphin": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"DINOSAURE": {
"dinosaure": {
"is": ["animal"],
"isnot": ["gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"DROMADAIRE": {
"dromadaire": {
"is": ["animal", "naturel", "solide"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"ESCALIER": {
"escalier": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "végétal"],
"na": []
},
"ESCARGOT": {
"escargot": {
"is": ["animal"],
"isnot": ["inerte", "liquide", "végétal"],
"na": []
},
"FANTÔME": {
"fantôme": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": ["naturel"]
},
"FENÊTRE": {
"fenêtre": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"FLEUR": {
"fleur": {
"is": ["naturel", "végétal"],
"isnot": ["animal", "artificiel", "inerte"],
"na": []
},
"FLÛTE": {
"flûte": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"FOURCHETTE": {
"fourchette": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"FOURMI": {
"fourmi": {
"is": ["animal", "naturel", "solide"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"FRAISE": {
"fraise": {
"is": ["végétal"],
"isnot": ["animal", "inerte"],
"na": []
},
"FRAMBOISE": {
"framboise": {
"is": ["naturel", "végétal"],
"isnot": ["animal", "artificiel", "inerte"],
"na": []
},
"FROMAGE": {
"is": ["animal", "artificiel", "inerte"],
"isnot": ["liquide", "naturel", "végétal"],
"fromage": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "liquide", "naturel", "végétal"],
"na": []
},
"FUSÉE": {
"fusée": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"GANT": {
"gant": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"GILET": {
"gilet": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"GOMME": {
"gomme": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"GOURDE": {
"gourde": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"GRENOUILLE": {
"grenouille": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"GRILLE-PAIN": {
"grille-pain": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"GUITARE": {
"guitare": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"GUÊPE": {
"guêpe": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "inerte", "végétal"],
"na": ["gazeux", "liquide", "solide"]
},
"HARMONICA": {
"harmonica": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"HIPPOCAMPE": {
"hippocampe": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "inerte", "végétal"],
"na": []
},
"HIPPOPOTAME": {
"hippopotame": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"HÉLICOPTÈRE": {
"hélicoptère": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"JAMBON": {
"jambon": {
"is": ["inerte"],
"isnot": ["animal", "liquide", "végétal"],
"na": []
},
"JOURNAL": {
"journal": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"JUPE": {
"jupe": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"KANGOUROU": {
"kangourou": {
"is": ["animal", "naturel", "solide"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"KAYAK": {
"kayak": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"KIWI": {
"kiwi": {
"is": ["végétal"],
"isnot": ["animal", "inerte"],
"na": []
},
"LAIT": {
"lait": {
"is": ["inerte"],
"isnot": ["animal", "solide", "végétal"],
"na": []
},
"LAMPE": {
"lampe": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"LAPIN": {
"lapin": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "inerte", "végétal"],
"na": []
},
"LAVE-LINGE": {
"lave-linge": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"LIBELLULE": {
"libellule": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "inerte", "végétal"],
"na": []
},
"LICORNE": {
"licorne": {
"is": ["animal", "naturel", "solide"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"LION": {
"lion": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "inerte", "végétal"],
"na": []
},
"LIT": {
"lit": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"LITIÈRE": {
"litière": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "végétal"],
"na": []
},
"LIVRE": {
"livre": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"LOUP": {
"loup": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"LUNE": {
"lune": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"LUNETTES": {
"is": ["animal", "inerte"],
"isnot": ["végétal"],
"lunettes": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"MAISON": {
"maison": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"MARTEAU": {
"marteau": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"MICRO": {
"micro": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"MOTO": {
"moto": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"MOUCHE": {
"mouche": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "gazeux", "inerte", "végétal"],
"na": ["liquide", "solide"]
},
"MOUTON": {
"mouton": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"MÉSANGE": {
"mésange": {
"is": ["animal"],
"isnot": ["gazeux", "inerte", "végétal"],
"na": []
},
"MÉTRO": {
"métro": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"NOEUD": {
"noeud": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": ["solide"]
},
"NOISETTE": {
"noisette": {
"is": ["naturel", "végétal"],
"isnot": ["animal", "artificiel", "gazeux", "inerte"],
"na": []
},
"OEUF": {
"oeuf": {
"is": ["animal"],
"isnot": ["gazeux", "inerte", "végétal"],
"na": []
},
"OIE": {
"oie": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"ORAGE": {
"orage": {
"is": ["inerte", "naturel"],
"isnot": ["animal", "artificiel", "gazeux", "liquide", "végétal"],
"na": ["solide"]
},
"ORCHESTRE": {
"orchestre": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"ORDINATEUR": {
"ordinateur": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"OREILLER": {
"is": ["animal", "inerte"],
"isnot": ["végétal"],
"oreiller": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"OURS": {
"ours": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "gazeux", "inerte", "végétal"],
"na": ["liquide", "solide"]
},
"PAIN": {
"is": ["inerte", "végétal"],
"isnot": ["animal"],
"pain": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"PANDA": {
"panda": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "inerte", "végétal"],
"na": []
},
"PANTALON": {
"pantalon": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"PAPILLON": {
"papillon": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": ["solide"]
},
"PAQUEBOT": {
"paquebot": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"PARAPLUIE": {
"parapluie": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "liquide", "naturel", "végétal"],
"na": []
},
"PASSOIRE": {
"passoire": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"PEIGNE": {
"peigne": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"PELLE": {
"pelle": {
"is": ["inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"PELOTE": {
"pelote": {
"is": ["inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"PELUCHE": {
"peluche": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"PENDULE": {
"pendule": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"PERCEUSE": {
"perceuse": {
"is": ["inerte"],
"isnot": ["animal", "liquide", "végétal"],
"na": []
},
"PERLE": {
"perle": {
"is": ["inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"PERROQUET": {
"perroquet": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "inerte", "végétal"],
"na": []
},
"PIANO": {
"piano": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"PIGEON": {
"pigeon": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"PISCINE": {
"is": ["inerte", "végétal"],
"isnot": ["animal", "gazeux"],
"piscine": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "végétal"],
"na": []
},
"PIVERT": {
"pivert": {
"is": ["animal", "solide"],
"isnot": ["gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"PIZZA": {
"pizza": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"PLAGE": {
"is": ["inerte", "naturel", "végétal"],
"isnot": ["animal", "artificiel"],
"plage": {
"is": ["inerte", "naturel"],
"isnot": ["animal", "artificiel", "végétal"],
"na": []
},
"POIRE": {
"poire": {
"is": ["végétal"],
"isnot": ["animal", "inerte"],
"na": []
},
"POISSON": {
"poisson": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"POMME": {
"pomme": {
"is": ["naturel", "solide", "végétal"],
"isnot": ["animal", "artificiel", "gazeux", "inerte", "liquide"],
"na": []
},
"POMME-DE-TERRE": {
"pomme-de-terre": {
"is": ["végétal"],
"isnot": ["animal", "inerte"],
"na": []
},
"POMPIER": {
"pompier": {
"is": [],
"isnot": ["animal", "gazeux", "liquide"],
"na": ["inerte", "végétal"]
},
"POUBELLE": {
"poubelle": {
"is": ["inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"POULET": {
"poulet": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "gazeux", "inerte", "végétal"],
"na": ["liquide", "solide"]
},
"POUPÉE": {
"poupée": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"POUSSETTE": {
"poussette": {
"is": ["inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"POUSSIN": {
"poussin": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"PUZZLE": {
"puzzle": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"PYJAMA": {
"pyjama": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"PÂTES": {
"pâtes": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"PÉNICHE": {
"péniche": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"PÊCHE": {
"pêche": {
"is": ["naturel", "solide", "végétal"],
"isnot": ["animal", "artificiel", "gazeux", "inerte", "liquide"],
"na": []
},
"RADIS": {
"radis": {
"is": ["végétal"],
"isnot": ["animal", "inerte", "liquide"],
"na": []
},
"RAQUETTE": {
"raquette": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "gazeux", "naturel", "végétal"],
"na": []
},
"RENARD": {
"renard": {
"is": ["animal"],
"isnot": ["gazeux", "inerte", "végétal"],
"na": []
},
"REQUIN": {
"requin": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": ["solide"]
},
"RHINOCÉROS": {
"rhinocéros": {
"is": ["animal", "solide"],
"isnot": ["gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"RIVIÈRE": {
"rivière": {
"is": ["naturel"],
"isnot": ["animal", "artificiel"],
"na": ["inerte", "végétal"]
},
"ROBINET": {
"is": ["animal", "inerte"],
"isnot": ["végétal"],
"robinet": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"ROSE": {
"rose": {
"is": ["naturel", "solide", "végétal"],
"isnot": ["animal", "artificiel", "gazeux", "inerte", "liquide"],
"na": []
},
"RÂTEAU": {
"râteau": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"RÉVEIL": {
"réveil": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"SAC": {
"sac": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"SAC À DOS": {
"sac à dos": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"SALADE": {
"salade": {
"is": ["naturel", "végétal"],
"isnot": ["animal", "artificiel", "inerte"],
"na": []
},
"SANDALE": {
"sandale": {
"is": ["inerte"],
"isnot": ["animal", "liquide", "végétal"],
"na": []
},
"SANDWICH": {
"sandwich": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"SANGLIER": {
"sanglier": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": ["solide"]
},
"SAUCISSE": {
"saucisse": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"SAUCISSON": {
"saucisson": {
"is": ["inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"SAUTERELLE": {
"sauterelle": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"SAVON": {
"savon": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "gazeux", "naturel", "végétal"],
"na": ["liquide", "solide"]
},
"SCIE": {
"scie": {
"is": ["inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"SEAU": {
"seau": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"SERPENT": {
"serpent": {
"is": ["animal"],
"isnot": ["inerte", "liquide", "végétal"],
"na": []
},
"SINGE": {
"singe": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": ["solide"]
},
"SOLEIL": {
"soleil": {
"is": ["inerte", "naturel"],
"isnot": ["animal", "artificiel", "liquide", "végétal"],
"na": []
},
"SOUPE": {
"soupe": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"SOUS-MARIN": {
"is": ["artificiel", "inerte", "végétal"],
"isnot": ["animal", "naturel"],
"sous-marin": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"STADE": {
"stade": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"STATUE": {
"statue": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"STYLO": {
"stylo": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"SUCRE": {
"sucre": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"TABOURET": {
"is": ["animal", "artificiel", "inerte", "solide"],
"isnot": ["gazeux", "liquide", "naturel", "végétal"],
"tabouret": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"TACHE": {
"tache": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "végétal"],
"na": ["artificiel", "liquide", "solide"]
},
"TAILLE-CRAYON": {
"taille-crayon": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"TAPIS": {
"tapis": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"TARTINE": {
"tartine": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"TASSE": {
"tasse": {
"is": ["inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"THERMOMÈTRE": {
"thermomètre": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"TIRE-BOUCHON": {
"tire-bouchon": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"TIROIR": {
"tiroir": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"TOBOGGAN": {
"toboggan": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"TONDEUSE": {
"tondeuse": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"TORCHON": {
"torchon": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "végétal"],
"na": []
},
"TORTUE": {
"tortue": {
"is": ["animal", "naturel", "solide"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"TOURNEVIS": {
"is": ["animal", "inerte"],
"isnot": ["gazeux", "végétal"],
"tournevis": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "végétal"],
"na": []
},
"TRACTEUR": {
"tracteur": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"TRAIN": {
"train": {
"is": ["inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "végétal"],
"na": []
},
"TROMPETTE": {
"trompette": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"TULIPE": {
"tulipe": {
"is": ["solide", "végétal"],
"isnot": ["animal", "gazeux", "inerte", "liquide"],
"na": []
},
"TÉLÉPHONE": {
"téléphone": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"TÉLÉVISION": {
"télévision": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"VACHE": {
"vache": {
"is": ["animal", "naturel", "solide"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": []
},
"VALISE": {
"valise": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"VASE": {
"vase": {
"is": ["inerte"],
"isnot": ["animal", "gazeux", "végétal"],
"na": []
},
"VIOLON": {
"violon": {
"is": ["inerte"],
"isnot": ["animal", "liquide", "végétal"],
"na": []
},
"VOILIER": {
"is": ["animal", "artificiel", "inerte", "solide"],
"isnot": ["gazeux", "liquide", "naturel", "végétal"],
"voilier": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"VOITURE": {
"voiture": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
},
"VÉLO": {
"vélo": {
"is": ["artificiel", "inerte", "solide"],
"isnot": ["animal", "gazeux", "liquide", "naturel", "végétal"],
"na": []
},
"YAOURT": {
"yaourt": {
"is": ["artificiel"],
"isnot": ["animal", "gazeux", "naturel", "végétal"],
"na": ["inerte"]
},
"ZÈBRE": {
"zèbre": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "gazeux", "inerte", "liquide", "végétal"],
"na": ["solide"]
},
"ÉCHELLE": {
"échelle": {
"is": ["artificiel", "inerte"],
"isnot": ["animal", "naturel", "végétal"],
"na": []
},
"ÉCUREUIL": {
"écureuil": {
"is": ["animal"],
"isnot": ["inerte", "végétal"],
"na": []
},
"ÉLÉPHANT": {
"éléphant": {
"is": ["animal", "naturel"],
"isnot": ["artificiel", "inerte", "végétal"],
"na": []
},
"ÉTOILE": {
"étoile": {
"is": ["inerte", "naturel", "solide"],
"isnot": ["animal", "artificiel", "gazeux", "liquide", "végétal"],
"na": []
},
"ÉVIER": {
"évier": {
"is": ["inerte"],
"isnot": ["animal", "végétal"],
"na": []
......
lib/models/data/game_theme.dart 0 → 100644
View file @ 761d41a6
import 'package:sortgame/models/data/category.dart';
class GameTheme {
final String code;
final List<Category> categories;
GameTheme({
required this.code,
required this.categories,
});
@override
String toString() {
return '$GameTheme(${toJson()})';
}
Map<String, dynamic>? toJson() {
return <String, dynamic>{
'code': code,
'categories': categories.toString(),
};
}
}
lib/models/game.dart
View file @ 761d41a6
......@@ -38,7 +38,7 @@ class Game {
GameSettings newGameSettings = gameSettings ?? GameSettings.createDefault();
GlobalSettings newGlobalSettings = globalSettings ?? GlobalSettings.createDefault();
List<GameItem> items = FetchDataHelper().getItems(newGameSettings.itemsCount);
List<GameItem> items = FetchDataHelper().getItems(newGameSettings);
return Game(
items: items,
......
lib/models/settings_game.dart
View file @ 761d41a6
......@@ -3,9 +3,11 @@ import 'package:sortgame/utils/tools.dart';
class GameSettings {
final int itemsCount;
final int theme;
GameSettings({
required this.itemsCount,
required this.theme,
});
static int getItemsCountValueFromUnsafe(int itemsCount) {
......@@ -16,15 +18,25 @@ class GameSettings {
return DefaultGameSettings.defaultItemsCountValue;
}
static int getThemeValueFromUnsafe(int theme) {
if (DefaultGameSettings.getAvailableValues('theme').contains(theme)) {
return theme;
}
return DefaultGameSettings.defaultThemeValue;
}
factory GameSettings.createDefault() {
return GameSettings(
itemsCount: DefaultGameSettings.defaultItemsCountValue,
theme: DefaultGameSettings.defaultThemeValue,
);
}
void dump() {
printlog('Settings: ');
printlog(' itemsCount: $itemsCount');
printlog(' theme: $theme');
}
@override
......@@ -35,6 +47,7 @@ class GameSettings {
Map<String, dynamic>? toJson() {
return <String, dynamic>{
'itemsCount': itemsCount,
'theme': theme,
};
}
}
lib/ui/painters/parameter_painter.dart
View file @ 761d41a6
......@@ -3,6 +3,8 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:sortgame/config/default_game_settings.dart';
import 'package:sortgame/data/fetch_data_helper.dart';
import 'package:sortgame/models/data/game_theme.dart';
import 'package:sortgame/models/settings_game.dart';
import 'package:sortgame/models/settings_global.dart';
import 'package:sortgame/utils/tools.dart';
......@@ -44,6 +46,9 @@ class ParameterPainter extends CustomPainter {
case 'itemsCount':
paintItemsCountParameterItem(value, canvas, canvasSize);
break;
case 'theme':
paintThemeParameterItem(value, canvas, canvasSize);
break;
default:
printlog('Unknown parameter: $code/$value');
paintUnknownParameterItem(value, canvas, canvasSize);
......@@ -146,4 +151,46 @@ class ParameterPainter extends CustomPainter {
),
);
}
void paintThemeParameterItem(
final int value,
final Canvas canvas,
final double size,
) {
final GameTheme theme = FetchDataHelper().getTheme(value);
final Color backgroundColor =
Color((theme.code.hashCode * 0xFFFFFF).toInt()).withOpacity(1.0);
final paint = Paint();
paint.strokeJoin = StrokeJoin.round;
paint.strokeWidth = 3 / 100 * size;
// Colored background
paint.color = backgroundColor;
paint.style = PaintingStyle.fill;
canvas.drawRect(Rect.fromPoints(const Offset(0, 0), Offset(size, size)), paint);
// centered text value
final textSpan = TextSpan(
text: theme.code,
style: TextStyle(
color: Colors.black,
fontSize: size / 4,
fontWeight: FontWeight.bold,
),
);
final textPainter = TextPainter(
text: textSpan,
textDirection: TextDirection.ltr,
);
textPainter.layout();
textPainter.paint(
canvas,
Offset(
(size - textPainter.width) * 0.5,
(size - textPainter.height) * 0.5,
),
);
}
}
pubspec.yaml
View file @ 761d41a6
......@@ -3,7 +3,7 @@ description: A sorting game application.
publish_to: 'none'
version: 0.0.22+22
version: 0.0.24+24
environment:
sdk: '^3.0.0'
......
scripts/data.json
View file @ 761d41a6
......@@ -25,253 +25,270 @@
"artificiel"
]
],
"themes": {
"tout": [],
"état": [
"liquide",
"solide",
"gazeux"
],
"genre": [
"inerte",
"animal",
"végétal"
],
"vivant": [
"animal",
"végétal"
]
},
"items": [
"ABEILLE",
"AIGUILLE",
"ALLUMETTE",
"AMBULANCE",
"AMPOULE",
"ANANAS",
"AQUARIUM",
"ARAIGNÉE",
"ARBRE",
"ARMOIRE",
"ARROSOIR",
"ASPERGE",
"ASPIRATEUR",
"AUBERGINE",
"AUTRUCHE",
"AVION",
"BALAI",
"BALANÇOIRE",
"BALEINE",
"BALLON",
"BANANE",
"BASSINE",
"BATEAU",
"BAVOIR",
"BERCEAU",
"BEURRE",
"BIBERON",
"BISCUIT",
"BONBON",
"BONNET",
"BOTTE",
"BOUCHON",
"BOUGIE",
"BOUQUET",
"BOUTEILLE",
"BROSSE",
"BROUETTE",
"BÉBÉ",
"BÛCHE",
"CACTUS",
"CAFETIÈRE",
"CAFÉ",
"CAHIER",
"CAMION",
"CANARD",
"CAROTTE",
"CARTABLE",
"CASQUE",
"CASQUETTE",
"CASSEROLE",
"CASTOR",
"CERF-VOLANT",
"CHAISE",
"CHAMPIGNON",
"CHATEAU",
"CHAUSSETTE",
"CHAUSSURE",
"CHEMINÉE",
"CHEMISE",
"CHEVAL",
"CINTRE",
"CISEAUX",
"CITRON",
"CITROUILLE",
"COCCINELLE",
"COCOTTE-MINUTE",
"COLLIER",
"CONCOMBRE",
"CONFITURE",
"COQ",
"COQUELICOT",
"CORBEAU",
"CORDE",
"CORNICHON",
"CRABE",
"CRAYON",
"CROCODILE",
"CULOTTE",
"DAUPHIN",
"DINOSAURE",
"DROMADAIRE",
"ESCALIER",
"ESCARGOT",
"FANTÔME",
"FENÊTRE",
"FLEUR",
"FLÛTE",
"FOURCHETTE",
"FOURMI",
"FRAISE",
"FRAMBOISE",
"FROMAGE",
"FUSÉE",
"GANT",
"GILET",
"GOMME",
"GOURDE",
"GRENOUILLE",
"GRILLE-PAIN",
"GUITARE",
"GUÊPE",
"HARMONICA",
"HIPPOCAMPE",
"HIPPOPOTAME",
"HÉLICOPTÈRE",
"JAMBON",
"JOURNAL",
"JUPE",
"KANGOUROU",
"KAYAK",
"KIWI",
"LAIT",
"LAMPE",
"LAPIN",
"LAVE-LINGE",
"LIBELLULE",
"LICORNE",
"LION",
"LIT",
"LITIÈRE",
"LIVRE",
"LOUP",
"LUNE",
"LUNETTES",
"MAISON",
"MARTEAU",
"MICRO",
"MOTO",
"MOUCHE",
"MOUTON",
"MÉSANGE",
"MÉTRO",
"NOEUD",
"NOISETTE",
"OEUF",
"OIE",
"ORAGE",
"ORCHESTRE",
"ORDINATEUR",
"OREILLER",
"OURS",
"PAIN",
"PANDA",
"PANTALON",
"PAPILLON",
"PAQUEBOT",
"PARAPLUIE",
"PASSOIRE",
"PEIGNE",
"PELLE",
"PELOTE",
"PELUCHE",
"PENDULE",
"PERCEUSE",
"PERLE",
"PERROQUET",
"PIANO",
"PIGEON",
"PISCINE",
"PIVERT",
"PIZZA",
"PLAGE",
"POIRE",
"POISSON",
"POMME",
"POMME-DE-TERRE",
"POMPIER",
"POUBELLE",
"POULET",
"POUPÉE",
"POUSSETTE",
"POUSSIN",
"PUZZLE",
"PYJAMA",
"PÂTES",
"PÉNICHE",
"PÊCHE",
"RADIS",
"RAQUETTE",
"RENARD",
"REQUIN",
"RHINOCÉROS",
"RIVIÈRE",
"ROBINET",
"ROSE",
"RÂTEAU",
"RÉVEIL",
"SAC",
"SAC À DOS",
"SALADE",
"SANDALE",
"SANDWICH",
"SANGLIER",
"SAUCISSE",
"SAUCISSON",
"SAUTERELLE",
"SAVON",
"SCIE",
"SEAU",
"SERPENT",
"SINGE",
"SOLEIL",
"SOUPE",
"SOUS-MARIN",
"STADE",
"STATUE",
"STYLO",
"SUCRE",
"TABOURET",
"TACHE",
"TAILLE-CRAYON",
"TAPIS",
"TARTINE",
"TASSE",
"THERMOMÈTRE",
"TIRE-BOUCHON",
"TIROIR",
"TOBOGGAN",
"TONDEUSE",
"TORCHON",
"TORTUE",
"TOURNEVIS",
"TRACTEUR",
"TRAIN",
"TROMPETTE",
"TULIPE",
"TÉLÉPHONE",
"TÉLÉVISION",
"VACHE",
"VALISE",
"VASE",
"VIOLON",
"VOILIER",
"VOITURE",
"VÉLO",
"YAOURT",
"ZÈBRE",
"ÉCHELLE",
"ÉCUREUIL",
"ÉLÉPHANT",
"ÉTOILE",
"ÉVIER"
"abeille",
"aiguille",
"allumette",
"ambulance",
"ampoule",
"ananas",
"aquarium",
"araignée",
"arbre",
"armoire",
"arrosoir",
"asperge",
"aspirateur",
"aubergine",
"autruche",
"avion",
"balai",
"balançoire",
"baleine",
"ballon",
"banane",
"bassine",
"bateau",
"bavoir",
"berceau",
"beurre",
"biberon",
"biscuit",
"bonbon",
"bonnet",
"botte",
"bouchon",
"bougie",
"bouquet",
"bouteille",
"brosse",
"brouette",
"bébé",
"bûche",
"cactus",
"cafetière",
"café",
"cahier",
"camion",
"canard",
"carotte",
"cartable",
"casque",
"casquette",
"casserole",
"castor",
"cerf-volant",
"chaise",
"champignon",
"chateau",
"chaussette",
"chaussure",
"cheminée",
"chemise",
"cheval",
"cintre",
"ciseaux",
"citron",
"citrouille",
"coccinelle",
"cocotte-minute",
"collier",
"concombre",
"confiture",
"coq",
"coquelicot",
"corbeau",
"corde",
"cornichon",
"crabe",
"crayon",
"crocodile",
"culotte",
"dauphin",
"dinosaure",
"dromadaire",
"escalier",
"escargot",
"fantôme",
"fenêtre",
"fleur",
"flûte",
"fourchette",
"fourmi",
"fraise",
"framboise",
"fromage",
"fusée",
"gant",
"gilet",
"gomme",
"gourde",
"grenouille",
"grille-pain",
"guitare",
"guêpe",
"harmonica",
"hippocampe",
"hippopotame",
"hélicoptère",
"jambon",
"journal",
"jupe",
"kangourou",
"kayak",
"kiwi",
"lait",
"lampe",
"lapin",
"lave-linge",
"libellule",
"licorne",
"lion",
"lit",
"litière",
"livre",
"loup",
"lune",
"lunettes",
"maison",
"marteau",
"micro",
"moto",
"mouche",
"mouton",
"mésange",
"métro",
"noeud",
"noisette",
"oeuf",
"oie",
"orage",
"orchestre",
"ordinateur",
"oreiller",
"ours",
"pain",
"panda",
"pantalon",
"papillon",
"paquebot",
"parapluie",
"passoire",
"peigne",
"pelle",
"pelote",
"peluche",
"pendule",
"perceuse",
"perle",
"perroquet",
"piano",
"pigeon",
"piscine",
"pivert",
"pizza",
"plage",
"poire",
"poisson",
"pomme",
"pomme-de-terre",
"pompier",
"poubelle",
"poulet",
"poupée",
"poussette",
"poussin",
"puzzle",
"pyjama",
"pâtes",
"péniche",
"pêche",
"radis",
"raquette",
"renard",
"requin",
"rhinocéros",
"rivière",
"robinet",
"rose",
"râteau",
"réveil",
"sac",
"sac à dos",
"salade",
"sandale",
"sandwich",
"sanglier",
"saucisse",
"saucisson",
"sauterelle",
"savon",
"scie",
"seau",
"serpent",
"singe",
"soleil",
"soupe",
"sous-marin",
"stade",
"statue",
"stylo",
"sucre",
"tabouret",
"tache",
"taille-crayon",
"tapis",
"tartine",
"tasse",
"thermomètre",
"tire-bouchon",
"tiroir",
"toboggan",
"tondeuse",
"torchon",
"tortue",
"tournevis",
"tracteur",
"train",
"trompette",
"tulipe",
"téléphone",
"télévision",
"vache",
"valise",
"vase",
"violon",
"voilier",
"voiture",
"vélo",
"yaourt",
"zèbre",
"échelle",
"écureuil",
"éléphant",
"étoile",
"évier"
],
"mapping": {
"items": {
"ABEILLE": {
"abeille": {
"is": [
"animal",
"naturel",
......@@ -286,7 +303,7 @@
],
"na": []
},
"AIGUILLE": {
"aiguille": {
"is": [
"inerte"
],
......@@ -296,7 +313,7 @@
],
"na": []
},
"ALLUMETTE": {
"allumette": {
"is": [
"inerte"
],
......@@ -306,7 +323,7 @@
],
"na": []
},
"AMBULANCE": {
"ambulance": {
"is": [
"inerte"
],
......@@ -317,7 +334,7 @@
],
"na": []
},
"AMPOULE": {
"ampoule": {
"is": [
"artificiel",
"inerte",
......@@ -332,7 +349,7 @@
],
"na": []
},
"ANANAS": {
"ananas": {
"is": [
"végétal"
],
......@@ -343,7 +360,7 @@
],
"na": []
},
"AQUARIUM": {
"aquarium": {
"is": [
"inerte"
],
......@@ -353,7 +370,7 @@
],
"na": []
},
"ARAIGNÉE": {
"araignée": {
"is": [
"animal"
],
......@@ -364,7 +381,7 @@
],
"na": []
},
"ARBRE": {
"arbre": {
"is": [
"naturel",
"solide",
......@@ -379,7 +396,7 @@
],
"na": []
},
"ARMOIRE": {
"armoire": {
"is": [
"artificiel",
"inerte"
......@@ -391,7 +408,7 @@
],
"na": []
},
"ARROSOIR": {
"arrosoir": {
"is": [
"inerte"
],
......@@ -401,7 +418,7 @@
],
"na": []
},
"ASPERGE": {
"asperge": {
"is": [
"végétal"
],
......@@ -412,7 +429,7 @@
],
"na": []
},
"ASPIRATEUR": {
"aspirateur": {
"is": [
"artificiel",
"inerte",
......@@ -427,7 +444,7 @@
],
"na": []
},
"AUBERGINE": {
"aubergine": {
"is": [
"végétal"
],
......@@ -437,7 +454,7 @@
],
"na": []
},
"AUTRUCHE": {
"autruche": {
"is": [
"animal",
"naturel"
......@@ -450,7 +467,7 @@
],
"na": []
},
"AVION": {
"avion": {
"is": [
"inerte",
"solide"
......@@ -463,7 +480,7 @@
],
"na": []
},
"BALAI": {
"balai": {
"is": [
"artificiel",
"inerte",
......@@ -478,7 +495,7 @@
],
"na": []
},
"BALANÇOIRE": {
"balançoire": {
"is": [
"artificiel",
"inerte"
......@@ -492,7 +509,7 @@
],
"na": []
},
"BALEINE": {
"baleine": {
"is": [
"animal",
"naturel",
......@@ -507,7 +524,7 @@
],
"na": []
},
"BALLON": {
"ballon": {
"is": [
"inerte"
],
......@@ -517,7 +534,7 @@
],
"na": []
},
"BANANE": {
"banane": {
"is": [
"naturel",
"solide",
......@@ -532,7 +549,7 @@
],
"na": []
},
"BASSINE": {
"bassine": {
"is": [
"inerte",
"solide"
......@@ -545,17 +562,17 @@
],
"na": []
},
"BATEAU": {
"bateau": {
"is": [
"animal",
"inerte"
],
"isnot": [
"animal",
"végétal"
],
"na": []
},
"BAVOIR": {
"bavoir": {
"is": [
"artificiel",
"inerte"
......@@ -567,7 +584,7 @@
],
"na": []
},
"BERCEAU": {
"berceau": {
"is": [
"artificiel",
"inerte",
......@@ -582,7 +599,7 @@
],
"na": []
},
"BEURRE": {
"beurre": {
"is": [
"inerte"
],
......@@ -592,7 +609,7 @@
],
"na": []
},
"BIBERON": {
"biberon": {
"is": [
"inerte"
],
......@@ -603,7 +620,7 @@
],
"na": []
},
"BISCUIT": {
"biscuit": {
"is": [
"artificiel",
"inerte"
......@@ -615,7 +632,7 @@
],
"na": []
},
"BONBON": {
"bonbon": {
"is": [
"artificiel",
"inerte",
......@@ -630,7 +647,7 @@
],
"na": []
},
"BONNET": {
"bonnet": {
"is": [
"artificiel",
"inerte"
......@@ -642,7 +659,7 @@
],
"na": []
},
"BOTTE": {
"botte": {
"is": [
"inerte"
],
......@@ -653,7 +670,7 @@
],
"na": []
},
"BOUCHON": {
"bouchon": {
"is": [
"inerte"
],
......@@ -663,7 +680,7 @@
],
"na": []
},
"BOUGIE": {
"bougie": {
"is": [
"artificiel",
"inerte",
......@@ -678,7 +695,7 @@
],
"na": []
},
"BOUQUET": {
"bouquet": {
"is": [
"inerte"
],
......@@ -688,7 +705,7 @@
],
"na": []
},
"BOUTEILLE": {
"bouteille": {
"is": [
"artificiel",
"inerte"
......@@ -700,7 +717,7 @@
],
"na": []
},
"BROSSE": {
"brosse": {
"is": [
"inerte"
],
......@@ -710,7 +727,7 @@
],
"na": []
},
"BROUETTE": {
"brouette": {
"is": [
"artificiel",
"inerte",
......@@ -725,7 +742,7 @@
],
"na": []
},
"BÉBÉ": {
"bébé": {
"is": [
"animal"
],
......@@ -735,7 +752,7 @@
],
"na": []
},
"BÛCHE": {
"bûche": {
"is": [
"végétal"
],
......@@ -745,7 +762,7 @@
],
"na": []
},
"CACTUS": {
"cactus": {
"is": [
"solide",
"végétal"
......@@ -758,7 +775,7 @@
],
"na": []
},
"CAFETIÈRE": {
"cafetière": {
"is": [
"artificiel",
"inerte",
......@@ -773,7 +790,7 @@
],
"na": []
},
"CAFÉ": {
"café": {
"is": [
"liquide",
"végétal"
......@@ -786,7 +803,7 @@
],
"na": []
},
"CAHIER": {
"cahier": {
"is": [
"inerte"
],
......@@ -796,17 +813,17 @@
],
"na": []
},
"CAMION": {
"camion": {
"is": [
"inerte",
"végétal"
"inerte"
],
"isnot": [
"animal"
"animal",
"végétal"
],
"na": []
},
"CANARD": {
"canard": {
"is": [
"animal",
"naturel",
......@@ -821,7 +838,7 @@
],
"na": []
},
"CAROTTE": {
"carotte": {
"is": [
"végétal"
],
......@@ -832,7 +849,7 @@
],
"na": []
},
"CARTABLE": {
"cartable": {
"is": [
"artificiel",
"inerte"
......@@ -844,7 +861,7 @@
],
"na": []
},
"CASQUE": {
"casque": {
"is": [
"inerte"
],
......@@ -854,7 +871,7 @@
],
"na": []
},
"CASQUETTE": {
"casquette": {
"is": [
"artificiel",
"inerte",
......@@ -869,7 +886,7 @@
],
"na": []
},
"CASSEROLE": {
"casserole": {
"is": [
"artificiel",
"inerte"
......@@ -881,7 +898,7 @@
],
"na": []
},
"CASTOR": {
"castor": {
"is": [
"animal",
"naturel"
......@@ -892,7 +909,7 @@
],
"na": []
},
"CERF-VOLANT": {
"cerf-volant": {
"is": [
"inerte"
],
......@@ -903,14 +920,14 @@
],
"na": []
},
"CHAISE": {
"chaise": {
"is": [
"animal",
"artificiel",
"inerte",
"solide"
],
"isnot": [
"animal",
"gazeux",
"liquide",
"naturel",
......@@ -918,7 +935,7 @@
],
"na": []
},
"CHAMPIGNON": {
"champignon": {
"is": [
"végétal"
],
......@@ -928,7 +945,7 @@
],
"na": []
},
"CHATEAU": {
"chateau": {
"is": [
"inerte"
],
......@@ -939,17 +956,17 @@
],
"na": []
},
"CHAUSSETTE": {
"chaussette": {
"is": [
"inerte",
"végétal"
"inerte"
],
"isnot": [
"animal"
"animal",
"végétal"
],
"na": []
},
"CHAUSSURE": {
"chaussure": {
"is": [
"artificiel",
"inerte",
......@@ -964,7 +981,7 @@
],
"na": []
},
"CHEMINÉE": {
"cheminée": {
"is": [
"artificiel",
"inerte"
......@@ -977,7 +994,7 @@
],
"na": []
},
"CHEMISE": {
"chemise": {
"is": [
"inerte"
],
......@@ -987,7 +1004,7 @@
],
"na": []
},
"CHEVAL": {
"cheval": {
"is": [
"animal"
],
......@@ -997,7 +1014,7 @@
],
"na": []
},
"CINTRE": {
"cintre": {
"is": [
"artificiel",
"inerte",
......@@ -1012,7 +1029,7 @@
],
"na": []
},
"CISEAUX": {
"ciseaux": {
"is": [
"inerte"
],
......@@ -1022,7 +1039,7 @@
],
"na": []
},
"CITRON": {
"citron": {
"is": [
"végétal"
],
......@@ -1032,7 +1049,7 @@
],
"na": []
},
"CITROUILLE": {
"citrouille": {
"is": [
"naturel",
"végétal"
......@@ -1045,7 +1062,7 @@
],
"na": []
},
"COCCINELLE": {
"coccinelle": {
"is": [
"animal",
"naturel"
......@@ -1061,7 +1078,7 @@
"solide"
]
},
"COCOTTE-MINUTE": {
"cocotte-minute": {
"is": [
"inerte"
],
......@@ -1071,7 +1088,7 @@
],
"na": []
},
"COLLIER": {
"collier": {
"is": [
"inerte"
],
......@@ -1082,7 +1099,7 @@
],
"na": []
},
"CONCOMBRE": {
"concombre": {
"is": [
"végétal"
],
......@@ -1092,7 +1109,7 @@
],
"na": []
},
"CONFITURE": {
"confiture": {
"is": [
"artificiel",
"inerte",
......@@ -1107,7 +1124,7 @@
],
"na": []
},
"COQ": {
"coq": {
"is": [
"animal",
"naturel",
......@@ -1122,7 +1139,7 @@
],
"na": []
},
"COQUELICOT": {
"coquelicot": {
"is": [
"solide",
"végétal"
......@@ -1135,7 +1152,7 @@
],
"na": []
},
"CORBEAU": {
"corbeau": {
"is": [
"animal"
],
......@@ -1145,7 +1162,7 @@
],
"na": []
},
"CORDE": {
"corde": {
"is": [
"artificiel",
"inerte",
......@@ -1160,7 +1177,7 @@
],
"na": []
},
"CORNICHON": {
"cornichon": {
"is": [
"naturel",
"végétal"
......@@ -1173,7 +1190,7 @@
],
"na": []
},
"CRABE": {
"crabe": {
"is": [
"animal",
"naturel"
......@@ -1185,7 +1202,7 @@
],
"na": []
},
"CRAYON": {
"crayon": {
"is": [
"inerte"
],
......@@ -1195,7 +1212,7 @@
],
"na": []
},
"CROCODILE": {
"crocodile": {
"is": [
"animal",
"naturel"
......@@ -1211,7 +1228,7 @@
"solide"
]
},
"CULOTTE": {
"culotte": {
"is": [
"inerte"
],
......@@ -1221,7 +1238,7 @@
],
"na": []
},
"DAUPHIN": {
"dauphin": {
"is": [
"animal"
],
......@@ -1231,7 +1248,7 @@
],
"na": []
},
"DINOSAURE": {
"dinosaure": {
"is": [
"animal"
],
......@@ -1243,7 +1260,7 @@
],
"na": []
},
"DROMADAIRE": {
"dromadaire": {
"is": [
"animal",
"naturel",
......@@ -1258,7 +1275,7 @@
],
"na": []
},
"ESCALIER": {
"escalier": {
"is": [
"inerte"
],
......@@ -1269,7 +1286,7 @@
],
"na": []
},
"ESCARGOT": {
"escargot": {
"is": [
"animal"
],
......@@ -1280,7 +1297,7 @@
],
"na": []
},
"FANTÔME": {
"fantôme": {
"is": [
"inerte"
],
......@@ -1292,7 +1309,7 @@
"naturel"
]
},
"FENÊTRE": {
"fenêtre": {
"is": [
"artificiel",
"inerte",
......@@ -1307,7 +1324,7 @@
],
"na": []
},
"FLEUR": {
"fleur": {
"is": [
"naturel",
"végétal"
......@@ -1319,7 +1336,7 @@
],
"na": []
},
"FLÛTE": {
"flûte": {
"is": [
"inerte"
],
......@@ -1329,7 +1346,7 @@
],
"na": []
},
"FOURCHETTE": {
"fourchette": {
"is": [
"inerte"
],
......@@ -1339,7 +1356,7 @@
],
"na": []
},
"FOURMI": {
"fourmi": {
"is": [
"animal",
"naturel",
......@@ -1354,7 +1371,7 @@
],
"na": []
},
"FRAISE": {
"fraise": {
"is": [
"végétal"
],
......@@ -1364,7 +1381,7 @@
],
"na": []
},
"FRAMBOISE": {
"framboise": {
"is": [
"naturel",
"végétal"
......@@ -1376,20 +1393,20 @@
],
"na": []
},
"FROMAGE": {
"fromage": {
"is": [
"animal",
"artificiel",
"inerte"
],
"isnot": [
"animal",
"liquide",
"naturel",
"végétal"
],
"na": []
},
"FUSÉE": {
"fusée": {
"is": [
"artificiel",
"inerte",
......@@ -1404,7 +1421,7 @@
],
"na": []
},
"GANT": {
"gant": {
"is": [
"inerte"
],
......@@ -1414,7 +1431,7 @@
],
"na": []
},
"GILET": {
"gilet": {
"is": [
"inerte"
],
......@@ -1424,7 +1441,7 @@
],
"na": []
},
"GOMME": {
"gomme": {
"is": [
"artificiel",
"inerte"
......@@ -1436,7 +1453,7 @@
],
"na": []
},
"GOURDE": {
"gourde": {
"is": [
"artificiel",
"inerte",
......@@ -1451,7 +1468,7 @@
],
"na": []
},
"GRENOUILLE": {
"grenouille": {
"is": [
"animal"
],
......@@ -1461,7 +1478,7 @@
],
"na": []
},
"GRILLE-PAIN": {
"grille-pain": {
"is": [
"inerte"
],
......@@ -1471,7 +1488,7 @@
],
"na": []
},
"GUITARE": {
"guitare": {
"is": [
"inerte"
],
......@@ -1481,7 +1498,7 @@
],
"na": []
},
"GUÊPE": {
"guêpe": {
"is": [
"animal",
"naturel"
......@@ -1497,7 +1514,7 @@
"solide"
]
},
"HARMONICA": {
"harmonica": {
"is": [
"inerte"
],
......@@ -1507,7 +1524,7 @@
],
"na": []
},
"HIPPOCAMPE": {
"hippocampe": {
"is": [
"animal",
"naturel"
......@@ -1519,7 +1536,7 @@
],
"na": []
},
"HIPPOPOTAME": {
"hippopotame": {
"is": [
"animal"
],
......@@ -1529,7 +1546,7 @@
],
"na": []
},
"HÉLICOPTÈRE": {
"hélicoptère": {
"is": [
"artificiel",
"inerte",
......@@ -1544,7 +1561,7 @@
],
"na": []
},
"JAMBON": {
"jambon": {
"is": [
"inerte"
],
......@@ -1555,7 +1572,7 @@
],
"na": []
},
"JOURNAL": {
"journal": {
"is": [
"artificiel",
"inerte",
......@@ -1570,7 +1587,7 @@
],
"na": []
},
"JUPE": {
"jupe": {
"is": [
"inerte"
],
......@@ -1580,7 +1597,7 @@
],
"na": []
},
"KANGOUROU": {
"kangourou": {
"is": [
"animal",
"naturel",
......@@ -1595,7 +1612,7 @@
],
"na": []
},
"KAYAK": {
"kayak": {
"is": [
"artificiel",
"inerte"
......@@ -1607,7 +1624,7 @@
],
"na": []
},
"KIWI": {
"kiwi": {
"is": [
"végétal"
],
......@@ -1617,7 +1634,7 @@
],
"na": []
},
"LAIT": {
"lait": {
"is": [
"inerte"
],
......@@ -1628,7 +1645,7 @@
],
"na": []
},
"LAMPE": {
"lampe": {
"is": [
"artificiel",
"inerte",
......@@ -1643,7 +1660,7 @@
],
"na": []
},
"LAPIN": {
"lapin": {
"is": [
"animal",
"naturel"
......@@ -1655,7 +1672,7 @@
],
"na": []
},
"LAVE-LINGE": {
"lave-linge": {
"is": [
"artificiel",
"inerte",
......@@ -1670,7 +1687,7 @@
],
"na": []
},
"LIBELLULE": {
"libellule": {
"is": [
"animal",
"naturel"
......@@ -1682,7 +1699,7 @@
],
"na": []
},
"LICORNE": {
"licorne": {
"is": [
"animal",
"naturel",
......@@ -1697,7 +1714,7 @@
],
"na": []
},
"LION": {
"lion": {
"is": [
"animal",
"naturel"
......@@ -1709,7 +1726,7 @@
],
"na": []
},
"LIT": {
"lit": {
"is": [
"inerte"
],
......@@ -1719,7 +1736,7 @@
],
"na": []
},
"LITIÈRE": {
"litière": {
"is": [
"inerte"
],
......@@ -1730,7 +1747,7 @@
],
"na": []
},
"LIVRE": {
"livre": {
"is": [
"artificiel",
"inerte",
......@@ -1745,7 +1762,7 @@
],
"na": []
},
"LOUP": {
"loup": {
"is": [
"animal"
],
......@@ -1755,7 +1772,7 @@
],
"na": []
},
"LUNE": {
"lune": {
"is": [
"inerte"
],
......@@ -1765,17 +1782,17 @@
],
"na": []
},
"LUNETTES": {
"lunettes": {
"is": [
"animal",
"inerte"
],
"isnot": [
"animal",
"végétal"
],
"na": []
},
"MAISON": {
"maison": {
"is": [
"artificiel",
"inerte",
......@@ -1790,7 +1807,7 @@
],
"na": []
},
"MARTEAU": {
"marteau": {
"is": [
"artificiel",
"inerte"
......@@ -1802,7 +1819,7 @@
],
"na": []
},
"MICRO": {
"micro": {
"is": [
"inerte"
],
......@@ -1814,7 +1831,7 @@
],
"na": []
},
"MOTO": {
"moto": {
"is": [
"inerte"
],
......@@ -1824,7 +1841,7 @@
],
"na": []
},
"MOUCHE": {
"mouche": {
"is": [
"animal",
"naturel"
......@@ -1840,7 +1857,7 @@
"solide"
]
},
"MOUTON": {
"mouton": {
"is": [
"animal"
],
......@@ -1850,7 +1867,7 @@
],
"na": []
},
"MÉSANGE": {
"mésange": {
"is": [
"animal"
],
......@@ -1861,7 +1878,7 @@
],
"na": []
},
"MÉTRO": {
"métro": {
"is": [
"inerte"
],
......@@ -1871,7 +1888,7 @@
],
"na": []
},
"NOEUD": {
"noeud": {
"is": [
"artificiel",
"inerte"
......@@ -1887,7 +1904,7 @@
"solide"
]
},
"NOISETTE": {
"noisette": {
"is": [
"naturel",
"végétal"
......@@ -1900,7 +1917,7 @@
],
"na": []
},
"OEUF": {
"oeuf": {
"is": [
"animal"
],
......@@ -1911,7 +1928,7 @@
],
"na": []
},
"OIE": {
"oie": {
"is": [
"animal"
],
......@@ -1921,7 +1938,7 @@
],
"na": []
},
"ORAGE": {
"orage": {
"is": [
"inerte",
"naturel"
......@@ -1937,7 +1954,7 @@
"solide"
]
},
"ORCHESTRE": {
"orchestre": {
"is": [
"artificiel",
"inerte"
......@@ -1949,7 +1966,7 @@
],
"na": []
},
"ORDINATEUR": {
"ordinateur": {
"is": [
"inerte"
],
......@@ -1959,17 +1976,17 @@
],
"na": []
},
"OREILLER": {
"oreiller": {
"is": [
"animal",
"inerte"
],
"isnot": [
"animal",
"végétal"
],
"na": []
},
"OURS": {
"ours": {
"is": [
"animal",
"naturel"
......@@ -1985,17 +2002,17 @@
"solide"
]
},
"PAIN": {
"pain": {
"is": [
"inerte",
"végétal"
"inerte"
],
"isnot": [
"animal"
"animal",
"végétal"
],
"na": []
},
"PANDA": {
"panda": {
"is": [
"animal",
"naturel"
......@@ -2007,7 +2024,7 @@
],
"na": []
},
"PANTALON": {
"pantalon": {
"is": [
"inerte"
],
......@@ -2017,7 +2034,7 @@
],
"na": []
},
"PAPILLON": {
"papillon": {
"is": [
"animal",
"naturel"
......@@ -2033,7 +2050,7 @@
"solide"
]
},
"PAQUEBOT": {
"paquebot": {
"is": [
"inerte"
],
......@@ -2043,7 +2060,7 @@
],
"na": []
},
"PARAPLUIE": {
"parapluie": {
"is": [
"artificiel",
"inerte"
......@@ -2056,7 +2073,7 @@
],
"na": []
},
"PASSOIRE": {
"passoire": {
"is": [
"artificiel",
"inerte",
......@@ -2071,7 +2088,7 @@
],
"na": []
},
"PEIGNE": {
"peigne": {
"is": [
"artificiel",
"inerte",
......@@ -2086,7 +2103,7 @@
],
"na": []
},
"PELLE": {
"pelle": {
"is": [
"inerte",
"solide"
......@@ -2099,7 +2116,7 @@
],
"na": []
},
"PELOTE": {
"pelote": {
"is": [
"inerte",
"solide"
......@@ -2112,7 +2129,7 @@
],
"na": []
},
"PELUCHE": {
"peluche": {
"is": [
"artificiel",
"inerte"
......@@ -2124,7 +2141,7 @@
],
"na": []
},
"PENDULE": {
"pendule": {
"is": [
"artificiel",
"inerte",
......@@ -2139,7 +2156,7 @@
],
"na": []
},
"PERCEUSE": {
"perceuse": {
"is": [
"inerte"
],
......@@ -2150,7 +2167,7 @@
],
"na": []
},
"PERLE": {
"perle": {
"is": [
"inerte",
"solide"
......@@ -2163,7 +2180,7 @@
],
"na": []
},
"PERROQUET": {
"perroquet": {
"is": [
"animal",
"naturel"
......@@ -2175,7 +2192,7 @@
],
"na": []
},
"PIANO": {
"piano": {
"is": [
"artificiel",
"inerte",
......@@ -2190,7 +2207,7 @@
],
"na": []
},
"PIGEON": {
"pigeon": {
"is": [
"animal"
],
......@@ -2200,18 +2217,18 @@
],
"na": []
},
"PISCINE": {
"piscine": {
"is": [
"inerte",
"végétal"
"inerte"
],
"isnot": [
"animal",
"gazeux"
"gazeux",
"végétal"
],
"na": []
},
"PIVERT": {
"pivert": {
"is": [
"animal",
"solide"
......@@ -2224,7 +2241,7 @@
],
"na": []
},
"PIZZA": {
"pizza": {
"is": [
"artificiel",
"inerte",
......@@ -2239,19 +2256,19 @@
],
"na": []
},
"PLAGE": {
"plage": {
"is": [
"inerte",
"naturel",
"végétal"
"naturel"
],
"isnot": [
"animal",
"artificiel"
"artificiel",
"végétal"
],
"na": []
},
"POIRE": {
"poire": {
"is": [
"végétal"
],
......@@ -2261,7 +2278,7 @@
],
"na": []
},
"POISSON": {
"poisson": {
"is": [
"animal"
],
......@@ -2271,7 +2288,7 @@
],
"na": []
},
"POMME": {
"pomme": {
"is": [
"naturel",
"solide",
......@@ -2286,7 +2303,7 @@
],
"na": []
},
"POMME-DE-TERRE": {
"pomme-de-terre": {
"is": [
"végétal"
],
......@@ -2296,7 +2313,7 @@
],
"na": []
},
"POMPIER": {
"pompier": {
"is": [],
"isnot": [
"animal",
......@@ -2308,7 +2325,7 @@
"végétal"
]
},
"POUBELLE": {
"poubelle": {
"is": [
"inerte",
"solide"
......@@ -2321,7 +2338,7 @@
],
"na": []
},
"POULET": {
"poulet": {
"is": [
"animal",
"naturel"
......@@ -2337,7 +2354,7 @@
"solide"
]
},
"POUPÉE": {
"poupée": {
"is": [
"artificiel",
"inerte"
......@@ -2349,7 +2366,7 @@
],
"na": []
},
"POUSSETTE": {
"poussette": {
"is": [
"inerte",
"solide"
......@@ -2362,7 +2379,7 @@
],
"na": []
},
"POUSSIN": {
"poussin": {
"is": [
"animal"
],
......@@ -2372,7 +2389,7 @@
],
"na": []
},
"PUZZLE": {
"puzzle": {
"is": [
"artificiel",
"inerte",
......@@ -2387,7 +2404,7 @@
],
"na": []
},
"PYJAMA": {
"pyjama": {
"is": [
"inerte"
],
......@@ -2397,7 +2414,7 @@
],
"na": []
},
"PÂTES": {
"pâtes": {
"is": [
"inerte"
],
......@@ -2407,7 +2424,7 @@
],
"na": []
},
"PÉNICHE": {
"péniche": {
"is": [
"artificiel",
"inerte"
......@@ -2419,7 +2436,7 @@
],
"na": []
},
"PÊCHE": {
"pêche": {
"is": [
"naturel",
"solide",
......@@ -2434,7 +2451,7 @@
],
"na": []
},
"RADIS": {
"radis": {
"is": [
"végétal"
],
......@@ -2445,7 +2462,7 @@
],
"na": []
},
"RAQUETTE": {
"raquette": {
"is": [
"artificiel",
"inerte"
......@@ -2458,7 +2475,7 @@
],
"na": []
},
"RENARD": {
"renard": {
"is": [
"animal"
],
......@@ -2469,7 +2486,7 @@
],
"na": []
},
"REQUIN": {
"requin": {
"is": [
"animal",
"naturel"
......@@ -2485,7 +2502,7 @@
"solide"
]
},
"RHINOCÉROS": {
"rhinocéros": {
"is": [
"animal",
"solide"
......@@ -2498,7 +2515,7 @@
],
"na": []
},
"RIVIÈRE": {
"rivière": {
"is": [
"naturel"
],
......@@ -2511,17 +2528,17 @@
"végétal"
]
},
"ROBINET": {
"robinet": {
"is": [
"animal",
"inerte"
],
"isnot": [
"animal",
"végétal"
],
"na": []
},
"ROSE": {
"rose": {
"is": [
"naturel",
"solide",
......@@ -2536,7 +2553,7 @@
],
"na": []
},
"RÂTEAU": {
"râteau": {
"is": [
"inerte"
],
......@@ -2546,7 +2563,7 @@
],
"na": []
},
"RÉVEIL": {
"réveil": {
"is": [
"artificiel",
"inerte"
......@@ -2558,7 +2575,7 @@
],
"na": []
},
"SAC": {
"sac": {
"is": [
"inerte"
],
......@@ -2568,7 +2585,7 @@
],
"na": []
},
"SAC À DOS": {
"sac à dos": {
"is": [
"artificiel",
"inerte",
......@@ -2583,7 +2600,7 @@
],
"na": []
},
"SALADE": {
"salade": {
"is": [
"naturel",
"végétal"
......@@ -2595,7 +2612,7 @@
],
"na": []
},
"SANDALE": {
"sandale": {
"is": [
"inerte"
],
......@@ -2606,7 +2623,7 @@
],
"na": []
},
"SANDWICH": {
"sandwich": {
"is": [
"artificiel",
"inerte"
......@@ -2618,7 +2635,7 @@
],
"na": []
},
"SANGLIER": {
"sanglier": {
"is": [
"animal",
"naturel"
......@@ -2634,7 +2651,7 @@
"solide"
]
},
"SAUCISSE": {
"saucisse": {
"is": [
"artificiel",
"inerte"
......@@ -2646,7 +2663,7 @@
],
"na": []
},
"SAUCISSON": {
"saucisson": {
"is": [
"inerte",
"solide"
......@@ -2659,7 +2676,7 @@
],
"na": []
},
"SAUTERELLE": {
"sauterelle": {
"is": [
"animal"
],
......@@ -2669,7 +2686,7 @@
],
"na": []
},
"SAVON": {
"savon": {
"is": [
"artificiel",
"inerte"
......@@ -2685,7 +2702,7 @@
"solide"
]
},
"SCIE": {
"scie": {
"is": [
"inerte",
"solide"
......@@ -2698,7 +2715,7 @@
],
"na": []
},
"SEAU": {
"seau": {
"is": [
"inerte"
],
......@@ -2708,7 +2725,7 @@
],
"na": []
},
"SERPENT": {
"serpent": {
"is": [
"animal"
],
......@@ -2719,7 +2736,7 @@
],
"na": []
},
"SINGE": {
"singe": {
"is": [
"animal",
"naturel"
......@@ -2735,7 +2752,7 @@
"solide"
]
},
"SOLEIL": {
"soleil": {
"is": [
"inerte",
"naturel"
......@@ -2748,7 +2765,7 @@
],
"na": []
},
"SOUPE": {
"soupe": {
"is": [
"inerte"
],
......@@ -2758,19 +2775,19 @@
],
"na": []
},
"SOUS-MARIN": {
"sous-marin": {
"is": [
"artificiel",
"inerte",
"végétal"
"inerte"
],
"isnot": [
"animal",
"naturel"
"naturel",
"végétal"
],
"na": []
},
"STADE": {
"stade": {
"is": [
"artificiel",
"inerte",
......@@ -2785,7 +2802,7 @@
],
"na": []
},
"STATUE": {
"statue": {
"is": [
"inerte"
],
......@@ -2795,7 +2812,7 @@
],
"na": []
},
"STYLO": {
"stylo": {
"is": [
"inerte"
],
......@@ -2805,7 +2822,7 @@
],
"na": []
},
"SUCRE": {
"sucre": {
"is": [
"inerte"
],
......@@ -2815,14 +2832,14 @@
],
"na": []
},
"TABOURET": {
"tabouret": {
"is": [
"animal",
"artificiel",
"inerte",
"solide"
],
"isnot": [
"animal",
"gazeux",
"liquide",
"naturel",
......@@ -2830,7 +2847,7 @@
],
"na": []
},
"TACHE": {
"tache": {
"is": [
"inerte"
],
......@@ -2845,7 +2862,7 @@
"solide"
]
},
"TAILLE-CRAYON": {
"taille-crayon": {
"is": [
"inerte"
],
......@@ -2855,7 +2872,7 @@
],
"na": []
},
"TAPIS": {
"tapis": {
"is": [
"inerte"
],
......@@ -2865,7 +2882,7 @@
],
"na": []
},
"TARTINE": {
"tartine": {
"is": [
"artificiel",
"inerte",
......@@ -2880,7 +2897,7 @@
],
"na": []
},
"TASSE": {
"tasse": {
"is": [
"inerte",
"solide"
......@@ -2893,7 +2910,7 @@
],
"na": []
},
"THERMOMÈTRE": {
"thermomètre": {
"is": [
"inerte"
],
......@@ -2905,7 +2922,7 @@
],
"na": []
},
"TIRE-BOUCHON": {
"tire-bouchon": {
"is": [
"inerte"
],
......@@ -2915,7 +2932,7 @@
],
"na": []
},
"TIROIR": {
"tiroir": {
"is": [
"artificiel",
"inerte",
......@@ -2930,7 +2947,7 @@
],
"na": []
},
"TOBOGGAN": {
"toboggan": {
"is": [
"inerte"
],
......@@ -2940,7 +2957,7 @@
],
"na": []
},
"TONDEUSE": {
"tondeuse": {
"is": [
"inerte"
],
......@@ -2950,7 +2967,7 @@
],
"na": []
},
"TORCHON": {
"torchon": {
"is": [
"inerte"
],
......@@ -2961,7 +2978,7 @@
],
"na": []
},
"TORTUE": {
"tortue": {
"is": [
"animal",
"naturel",
......@@ -2976,18 +2993,18 @@
],
"na": []
},
"TOURNEVIS": {
"tournevis": {
"is": [
"animal",
"inerte"
],
"isnot": [
"animal",
"gazeux",
"végétal"
],
"na": []
},
"TRACTEUR": {
"tracteur": {
"is": [
"inerte"
],
......@@ -2997,7 +3014,7 @@
],
"na": []
},
"TRAIN": {
"train": {
"is": [
"inerte",
"solide"
......@@ -3010,7 +3027,7 @@
],
"na": []
},
"TROMPETTE": {
"trompette": {
"is": [
"artificiel",
"inerte",
......@@ -3025,7 +3042,7 @@
],
"na": []
},
"TULIPE": {
"tulipe": {
"is": [
"solide",
"végétal"
......@@ -3038,7 +3055,7 @@
],
"na": []
},
"TÉLÉPHONE": {
"téléphone": {
"is": [
"inerte"
],
......@@ -3048,7 +3065,7 @@
],
"na": []
},
"TÉLÉVISION": {
"télévision": {
"is": [
"inerte"
],
......@@ -3058,7 +3075,7 @@
],
"na": []
},
"VACHE": {
"vache": {
"is": [
"animal",
"naturel",
......@@ -3073,7 +3090,7 @@
],
"na": []
},
"VALISE": {
"valise": {
"is": [
"inerte"
],
......@@ -3083,7 +3100,7 @@
],
"na": []
},
"VASE": {
"vase": {
"is": [
"inerte"
],
......@@ -3094,7 +3111,7 @@
],
"na": []
},
"VIOLON": {
"violon": {
"is": [
"inerte"
],
......@@ -3105,14 +3122,14 @@
],
"na": []
},
"VOILIER": {
"voilier": {
"is": [
"animal",
"artificiel",
"inerte",
"solide"
],
"isnot": [
"animal",
"gazeux",
"liquide",
"naturel",
......@@ -3120,7 +3137,7 @@
],
"na": []
},
"VOITURE": {
"voiture": {
"is": [
"inerte"
],
......@@ -3130,7 +3147,7 @@
],
"na": []
},
"VÉLO": {
"vélo": {
"is": [
"artificiel",
"inerte",
......@@ -3145,7 +3162,7 @@
],
"na": []
},
"YAOURT": {
"yaourt": {
"is": [
"artificiel"
],
......@@ -3159,7 +3176,7 @@
"inerte"
]
},
"ZÈBRE": {
"zèbre": {
"is": [
"animal",
"naturel"
......@@ -3175,7 +3192,7 @@
"solide"
]
},
"ÉCHELLE": {
"échelle": {
"is": [
"artificiel",
"inerte"
......@@ -3187,7 +3204,7 @@
],
"na": []
},
"ÉCUREUIL": {
"écureuil": {
"is": [
"animal"
],
......@@ -3197,7 +3214,7 @@
],
"na": []
},
"ÉLÉPHANT": {
"éléphant": {
"is": [
"animal",
"naturel"
......@@ -3209,7 +3226,7 @@
],
"na": []
},
"ÉTOILE": {
"étoile": {
"is": [
"inerte",
"naturel",
......@@ -3224,7 +3241,7 @@
],
"na": []
},
"ÉVIER": {
"évier": {
"is": [
"inerte"
],
......
scripts/manage_data.php
View file @ 761d41a6
......@@ -34,7 +34,7 @@ function find_missing_associations(array $mappingItems, array $categories, array
$mappingItems[$item]['na'],
);
foreach ($categories as $category) {
if ($category === 'inerte' && !\in_array($category, $set)) {
if (!\in_array($category, $set)) {
$missing[] = [
'item' => $item,
'category' => $category,
......@@ -106,8 +106,8 @@ if (!is_writable($jsonDataFile)) {
die;
}
$categories = (\array_key_exists('categories', $data) && \is_array($data['categories'])) ? $data['categories'] : [];;
$items = (\array_key_exists('items', $data) && \is_array($data['items'])) ? $data['items'] : [];;
$categories = (\array_key_exists('categories', $data) && \is_array($data['categories'])) ? $data['categories'] : [];
$items = (\array_key_exists('items', $data) && \is_array($data['items'])) ? $data['items'] : [];
// Manage categories exclusions
$exclusions = (\array_key_exists('exclusions', $data) && \is_array($data['exclusions'])) ? $data['exclusions'] : [];
......@@ -121,14 +121,18 @@ foreach ($exclusions as $exclusionSet) {
$categories = array_clean($categories);
$items = array_clean($items);
$themes = (\array_key_exists('themes', $data) && \is_array($data['themes'])) ? $data['themes'] : [];
$data['categories'] = $categories;
$data['items'] = $items;
$data['exclusions'] = $exclusions;
$data['themes'] = $themes;
dump('');
dump('Found ' . \count($categories) . ' unique categories.');
dump('Found ' . \count($items) . ' unique items.');
dump('Found ' . \count($exclusions) . ' exclusions sets.');
dump('Found ' . \count($themes) . ' themes.');
// Get/init mapping data
$mapping = (\array_key_exists('mapping', $data) && \is_array($data['mapping'])) ? $data['mapping'] : [];
......@@ -174,6 +178,13 @@ function showExclusions($exclusions)
}
}
function showThemes($theme)
{
foreach ($theme as $name => $categories) {
dump($name . ': ' . \join(', ', $categories));
}
}
function showMappings($mappingItems)
{
$columnsWidths = [
......@@ -337,14 +348,15 @@ while ($exitMainLoop === false) {
$missing = find_missing_associations($mappingItems, $categories, $items);
$menu = [
'0: exit',
'0: save and exit',
'',
'1: show categories (' . \count($categories) . ' found)',
'2: show items (' . \count($items) . ' found)',
'3: show exclusions (' . \count($exclusions) . ' found)',
'4: show mappings (' . \count($mappingItems) . ' found)',
'4: show themes (' . \count($themes) . ' found)',
'5: show mappings (' . \count($mappingItems) . ' found)',
'',
'5: complete mappings (' . \count($missing) . ' missing)',
'6: complete mappings (' . \count($missing) . ' missing)',
];
$answer = ask(\join("\n", $menu));
......@@ -362,9 +374,12 @@ while ($exitMainLoop === false) {
showExclusions($exclusions);
break;
case '4':
showMappings($mappingItems);
showThemes($themes);
break;
case '5':
showMappings($mappingItems);
break;
case '6':
$data['mapping']['items'] = editMappings($mappingItems, $categories, $items, $exclusions);
break;
default:
......