|
@@ -44,14 +44,14 @@ discard block |
|
|
block discarded – undo |
|
44
|
44
|
} |
|
45
|
45
|
|
|
46
|
46
|
} else { |
|
47
|
|
- $pokemon_file = file_get_contents(SYS_PATH.'/core/json/locales/EN/pokes.json'); |
|
48
|
|
- $translation_file = file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.json'); |
|
|
47
|
+ $pokemon_file = file_get_contents(SYS_PATH.'/core/json/locales/EN/pokes.json'); |
|
|
48
|
+ $translation_file = file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.json'); |
|
49
|
49
|
$moves_file = json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/moves.json')); |
|
50
|
50
|
} |
|
51
|
51
|
} else { |
|
52
|
52
|
$pokemon_file = file_get_contents(SYS_PATH.'/core/json/locales/EN/pokes.json'); |
|
53
|
|
- $translation_file = file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.json'); |
|
54
|
|
- $moves_file = json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/moves.json')); |
|
|
53
|
+ $translation_file = file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.json'); |
|
|
54
|
+ $moves_file = json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/moves.json')); |
|
55
|
55
|
} |
|
56
|
56
|
|
|
57
|
57
|
|
|
@@ -61,23 +61,23 @@ discard block |
|
|
block discarded – undo |
|
61
|
61
|
// always overwrite english if available |
|
62
|
62
|
######################################## |
|
63
|
63
|
|
|
64
|
|
-$locales = (object) array_replace(json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.json'), true), json_decode($translation_file, true)); |
|
|
64
|
+$locales = (object) array_replace(json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/translations.json'), true), json_decode($translation_file, true)); |
|
65
|
65
|
|
|
66
|
66
|
// Recursive replace because of multi level array |
|
67
|
|
-$pokemon_trans_array = array_replace_recursive(json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/pokes.json'), true), json_decode($pokemon_file, true)); |
|
|
67
|
+$pokemon_trans_array = array_replace_recursive(json_decode(file_get_contents(SYS_PATH.'/core/json/locales/EN/pokes.json'), true), json_decode($pokemon_file, true)); |
|
68
|
68
|
|
|
69
|
69
|
// convert associative array back to object array (recursive) |
|
70
|
|
-$pokemon_trans = json_decode(json_encode($pokemon_trans_array), false); |
|
|
70
|
+$pokemon_trans = json_decode(json_encode($pokemon_trans_array), false); |
|
71
|
71
|
unset($pokemon_trans_array); |
|
72
|
72
|
|
|
73
|
73
|
|
|
74
|
74
|
// Merge the pokedex, pokemon translation and rarity file into a new array |
|
75
|
75
|
########################################################################## |
|
76
|
76
|
|
|
77
|
|
-$pokedex_file = file_get_contents(SYS_PATH.'/core/json/pokedex.json'); |
|
78
|
|
-$pokemons = json_decode($pokedex_file); |
|
|
77
|
+$pokedex_file = file_get_contents(SYS_PATH.'/core/json/pokedex.json'); |
|
|
78
|
+$pokemons = json_decode($pokedex_file); |
|
79
|
79
|
|
|
80
|
|
-$pokedex_rarity_file = SYS_PATH.'/core/json/pokedex.rarity.json'; |
|
|
80
|
+$pokedex_rarity_file = SYS_PATH.'/core/json/pokedex.rarity.json'; |
|
81
|
81
|
// initial create of pokedex.rarity.json if it doesn't exist |
|
82
|
82
|
if (!is_file($pokedex_rarity_file)) { |
|
83
|
83
|
include_once(SYS_PATH.'/core/cron/pokedex.rarity.php'); |
|
@@ -87,14 +87,14 @@ discard block |
|
|
block discarded – undo |
|
87
|
87
|
|
|
88
|
88
|
foreach ($pokemons->pokemon as $pokeid => $pokemon) { |
|
89
|
89
|
// Merge name and description from translation files |
|
90
|
|
- $pokemon->name = $pokemon_trans->pokemon->$pokeid->name; |
|
91
|
|
- $pokemon->description = $pokemon_trans->pokemon->$pokeid->description; |
|
|
90
|
+ $pokemon->name = $pokemon_trans->pokemon->$pokeid->name; |
|
|
91
|
+ $pokemon->description = $pokemon_trans->pokemon->$pokeid->description; |
|
92
|
92
|
|
|
93
|
93
|
// Replace quick and charge move with translation |
|
94
|
|
- $quick_move = $pokemon->quick_move; |
|
95
|
|
- $pokemon->quick_move = $pokemon_trans->quick_moves->$quick_move; |
|
96
|
|
- $charge_move = $pokemon->charge_move; |
|
97
|
|
- $pokemon->charge_move = $pokemon_trans->charge_moves->$charge_move; |
|
|
94
|
+ $quick_move = $pokemon->quick_move; |
|
|
95
|
+ $pokemon->quick_move = $pokemon_trans->quick_moves->$quick_move; |
|
|
96
|
+ $charge_move = $pokemon->charge_move; |
|
|
97
|
+ $pokemon->charge_move = $pokemon_trans->charge_moves->$charge_move; |
|
98
|
98
|
|
|
99
|
99
|
// Replace types with translation |
|
100
|
100
|
foreach ($pokemon->types as &$type) { |
|
@@ -104,8 +104,8 @@ discard block |
|
|
block discarded – undo |
|
104
|
104
|
|
|
105
|
105
|
// Resolve candy_id to candy_name |
|
106
|
106
|
if (isset($pokemon->candy_id)) { |
|
107
|
|
- $candy_id = $pokemon->candy_id; |
|
108
|
|
- $pokemon->candy_name = $pokemon_trans->pokemon->$candy_id->name; |
|
|
107
|
+ $candy_id = $pokemon->candy_id; |
|
|
108
|
+ $pokemon->candy_name = $pokemon_trans->pokemon->$candy_id->name; |
|
109
|
109
|
unset($pokemon->candy_id); |
|
110
|
110
|
} |
|
111
|
111
|
// Convert move numbers to names |
brusselopole /
Worldopole
