diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd3c852..5985889 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# Version 3.3.0 (20.08.2018)
+
+## Features
+
+- **Update(GAME_MASTER)**: v1535950353222
+- **Update(Assets)**: Git commit e917a7b178dfc80d7c38af9421d3810ccef082df
+
+## Contributors
+
+- [BrunnerLivio](https://github.com/BrunnerLivio/)
+
 # Version 3.2.3 (20.08.2018)
 
 ## Features
diff --git a/output/avatar-customization.json b/output/avatar-customization.json
index 262608a..1677b33 100644
--- a/output/avatar-customization.json
+++ b/output/avatar-customization.json
@@ -363,6 +363,17 @@
         ],
         "category": "Glasses"
     },
+    {
+        "name": "Glasses Teardrop 0",
+        "gender": "Female",
+        "enabled": true,
+        "id": "f_glasses_teardrop_0",
+        "iconName": "f_glasses_teardrop_bundle_icon",
+        "slot": [
+            "Glasses"
+        ],
+        "category": "Glasses"
+    },
     {
         "name": "Glasses Thick 0",
         "gender": "Female",
@@ -785,6 +796,18 @@
         ],
         "category": "Hat"
     },
+    {
+        "name": "Hat Pikachufan 0",
+        "gender": "Female",
+        "enabled": true,
+        "id": "f_hat_pikachufan_0",
+        "unlockBadgeLevel": 3,
+        "iconName": "f_hat_pikachufan_bundle_icon",
+        "slot": [
+            "Hat"
+        ],
+        "category": "Hat"
+    },
     {
         "name": "Hat Teamrocket 0",
         "gender": "Female",
@@ -1131,6 +1154,18 @@
         ],
         "category": "Pants"
     },
+    {
+        "name": "Pants Pikachufan 0",
+        "gender": "Female",
+        "enabled": true,
+        "id": "f_pants_pikachufan_0",
+        "unlockBadgeLevel": 50,
+        "iconName": "f_pants_pikachufan_bundle_icon",
+        "slot": [
+            "Pants"
+        ],
+        "category": "Pants"
+    },
     {
         "name": "Pants Shorts 0",
         "gender": "Female",
@@ -1443,6 +1478,18 @@
         ],
         "category": "Shirt"
     },
+    {
+        "name": "Shirt Pikachufan 0",
+        "gender": "Female",
+        "enabled": true,
+        "id": "f_shirt_pikachufan_0",
+        "unlockBadgeLevel": 300,
+        "iconName": "f_shirt_pikachufan_bundle_icon",
+        "slot": [
+            "Shirt"
+        ],
+        "category": "Shirt"
+    },
     {
         "name": "Shirt Sweater 30 0",
         "gender": "Female",
@@ -1688,6 +1735,17 @@
         ],
         "category": "Shirt"
     },
+    {
+        "name": "Shirt Tshirt Fest Chicago 2018",
+        "gender": "Female",
+        "enabled": true,
+        "id": "f_shirt_tshirt_fest_chicago_2018",
+        "iconName": "f_shirt_tshirt_fest_chicago_2018_bundle_icon",
+        "slot": [
+            "Shirt"
+        ],
+        "category": "Shirt"
+    },
     {
         "name": "Shirt Tshirt Global Goals 2017",
         "gender": "Female",
@@ -1935,6 +1993,18 @@
         ],
         "category": "Shoes"
     },
+    {
+        "name": "Shoes Pikachufan 0",
+        "gender": "Female",
+        "enabled": true,
+        "id": "f_shoes_pikachufan_0",
+        "unlockBadgeLevel": 50,
+        "iconName": "f_shoes_pikachufan_bundle_icon",
+        "slot": [
+            "Shoes"
+        ],
+        "category": "Shoes"
+    },
     {
         "name": "Shoes Teamrocket 0",
         "gender": "Female",
@@ -2234,6 +2304,17 @@
         ],
         "category": "Glasses"
     },
+    {
+        "name": "Glasses Teardrop 0",
+        "gender": "Male",
+        "enabled": true,
+        "id": "m_glasses_teardrop_0",
+        "iconName": "m_glasses_teardrop_bundle_icon",
+        "slot": [
+            "Glasses"
+        ],
+        "category": "Glasses"
+    },
     {
         "name": "Glasses Thick 0",
         "gender": "Male",
@@ -2636,6 +2717,18 @@
         ],
         "category": "Hat"
     },
+    {
+        "name": "Hat Pikachufan 0",
+        "gender": "Male",
+        "enabled": true,
+        "id": "m_hat_pikachufan_0",
+        "unlockBadgeLevel": 3,
+        "iconName": "m_hat_pikachufan_bundle_icon",
+        "slot": [
+            "Hat"
+        ],
+        "category": "Hat"
+    },
     {
         "name": "Hat Teamrocket 0",
         "gender": "Male",
@@ -2752,6 +2845,18 @@
         ],
         "category": "Pants"
     },
+    {
+        "name": "Pants Pikachufan 0",
+        "gender": "Male",
+        "enabled": true,
+        "id": "m_pants_pikachufan_0",
+        "unlockBadgeLevel": 50,
+        "iconName": "m_pants_pikachufan_bundle_icon",
+        "slot": [
+            "Pants"
+        ],
+        "category": "Pants"
+    },
     {
         "name": "Pants Skinnyjeans 0",
         "gender": "Male",
@@ -3143,6 +3248,18 @@
         ],
         "category": "Shirt"
     },
+    {
+        "name": "Shirt Pikachufan 0",
+        "gender": "Male",
+        "enabled": true,
+        "id": "m_shirt_pikachufan_0",
+        "unlockBadgeLevel": 300,
+        "iconName": "m_shirt_pikachufan_bundle_icon",
+        "slot": [
+            "Shirt"
+        ],
+        "category": "Shirt"
+    },
     {
         "name": "Shirt Sweatshirt Sporty 0",
         "gender": "Male",
@@ -3275,6 +3392,17 @@
         ],
         "category": "Shirt"
     },
+    {
+        "name": "Shirt Tshirt Fest Chicago 2018",
+        "gender": "Male",
+        "enabled": true,
+        "id": "m_shirt_tshirt_fest_chicago_2018",
+        "iconName": "m_shirt_tshirt_fest_chicago_2018_bundle_icon",
+        "slot": [
+            "Shirt"
+        ],
+        "category": "Shirt"
+    },
     {
         "name": "Shirt Tshirt Geometric 0",
         "gender": "Male",
@@ -3571,6 +3699,18 @@
         ],
         "category": "Shoes"
     },
+    {
+        "name": "Shoes Pikachufan 0",
+        "gender": "Male",
+        "enabled": true,
+        "id": "m_shoes_pikachufan_0",
+        "unlockBadgeLevel": 50,
+        "iconName": "m_shoes_pikachufan_bundle_icon",
+        "slot": [
+            "Shoes"
+        ],
+        "category": "Shoes"
+    },
     {
         "name": "Shoes Teamrocket 0",
         "gender": "Male",
diff --git a/output/locales/de-DE/avatar-customization.json b/output/locales/de-DE/avatar-customization.json
index 251045e..b651beb 100644
--- a/output/locales/de-DE/avatar-customization.json
+++ b/output/locales/de-DE/avatar-customization.json
@@ -86,6 +86,9 @@
     "f_glasses_mask_1": {
         "name": "Maske"
     },
+    "f_glasses_teardrop_0": {
+        "name": "Flieger-\\nSonnenbrille"
+    },
     "f_glasses_thick_0": {
         "name": "Fokus-Brille"
     },
@@ -170,6 +173,9 @@
         "name": "Karpador- Mütze"
     },
     "f_hat_mimikyu_0": {},
+    "f_hat_pikachufan_0": {
+        "name": "Pikachu-Fan-Kopfschmuck"
+    },
     "f_hat_teamrocket_0": {
         "name": "Team Rocket-Mütze"
     },
@@ -261,6 +267,9 @@
     "f_pants_neon_stripes_1": {
         "name": "Neon-Leggings"
     },
+    "f_pants_pikachufan_0": {
+        "name": "Pikachu-Fan-Shorts"
+    },
     "f_pants_shorts_0": {
         "name": "Sprinter- Shorts"
     },
@@ -343,6 +352,9 @@
     "f_shirt_mew_0": {
         "name": "Mew-T-Shirt"
     },
+    "f_shirt_pikachufan_0": {
+        "name": "Pikachu-Fan-Shirt"
+    },
     "f_shirt_sweater_30_0": {
         "name": "The Thirty"
     },
@@ -407,6 +419,7 @@
         "name": "Aktiv-Top"
     },
     "f_shirt_tshirt_fest_chicago_2017": {},
+    "f_shirt_tshirt_fest_chicago_2018": {},
     "f_shirt_tshirt_global_goals_2017": {},
     "f_shirt_tshirt_pikachu_0": {
         "name": "Pikachu-Shirt"
@@ -469,6 +482,9 @@
     "f_shoes_gymleader_2": {
         "name": "Arenaleiter-\\nSchuhe"
     },
+    "f_shoes_pikachufan_0": {
+        "name": "Pikachu-Fan-Schuhe"
+    },
     "f_shoes_teamrocket_0": {
         "name": "Team Rocket-Stiefel"
     },
@@ -536,6 +552,7 @@
     "m_glasses_mask_1": {
         "name": "Maske"
     },
+    "m_glasses_teardrop_0": {},
     "m_glasses_thick_0": {
         "name": "Fokus-Brille"
     },
@@ -630,6 +647,9 @@
         "name": "Karpador- Mütze"
     },
     "m_hat_mimikyu_0": {},
+    "m_hat_pikachufan_0": {
+        "name": "Pikachu-Fan-Kopfschmuck"
+    },
     "m_hat_teamrocket_0": {
         "name": "Team Rocket-Mütze"
     },
@@ -658,6 +678,9 @@
     "m_pants_jogger_0": {
         "name": "Jogger-Shorts"
     },
+    "m_pants_pikachufan_0": {
+        "name": "Pikachu-Fan-Shorts"
+    },
     "m_pants_skinnyjeans_0": {
         "name": "Skinny Jeans"
     },
@@ -761,6 +784,9 @@
     "m_shirt_mew_0": {
         "name": "Mew-T-Shirt"
     },
+    "m_shirt_pikachufan_0": {
+        "name": "Pikachu-Fan-Shirt"
+    },
     "m_shirt_sweatshirt_sporty_0": {
         "name": "Sport-Hoodie"
     },
@@ -795,6 +821,7 @@
         "name": "Team Rainbow Rocket-Shirt"
     },
     "m_shirt_tshirt_fest_chicago_2017": {},
+    "m_shirt_tshirt_fest_chicago_2018": {},
     "m_shirt_tshirt_geometric_0": {
         "name": "Schräg-Shirt"
     },
@@ -869,6 +896,9 @@
     "m_shoes_jogger_0": {
         "name": "Jogger-Schuhe"
     },
+    "m_shoes_pikachufan_0": {
+        "name": "Pikachu-Fan-Schuhe"
+    },
     "m_shoes_teamrocket_0": {
         "name": "Team Rocket-Stiefel"
     },
diff --git a/output/locales/de-DE/move.json b/output/locales/de-DE/move.json
index 4ecd44e..8821cce 100644
--- a/output/locales/de-DE/move.json
+++ b/output/locales/de-DE/move.json
@@ -583,5 +583,8 @@
     },
     "HYDRO_CANNON": {
         "name": "Aquahaubitze"
+    },
+    "LAST_RESORT": {
+        "name": "Zuflucht"
     }
 }
\ No newline at end of file
diff --git a/output/locales/en-US/avatar-customization.json b/output/locales/en-US/avatar-customization.json
index 4a43ad7..75dc56a 100644
--- a/output/locales/en-US/avatar-customization.json
+++ b/output/locales/en-US/avatar-customization.json
@@ -86,6 +86,9 @@
     "f_glasses_mask_1": {
         "name": "Mystery Mask"
     },
+    "f_glasses_teardrop_0": {
+        "name": "Aviator Sunglasses"
+    },
     "f_glasses_thick_0": {
         "name": "Focus Frames"
     },
@@ -170,6 +173,9 @@
         "name": "Magikarp Hat"
     },
     "f_hat_mimikyu_0": {},
+    "f_hat_pikachufan_0": {
+        "name": "Pikachu Fan Headband"
+    },
     "f_hat_teamrocket_0": {
         "name": "Team Rocket Hat"
     },
@@ -261,6 +267,9 @@
     "f_pants_neon_stripes_1": {
         "name": "Liquid Leggings"
     },
+    "f_pants_pikachufan_0": {
+        "name": "Pikachu Fan Shorts"
+    },
     "f_pants_shorts_0": {
         "name": "Track Shorts"
     },
@@ -343,6 +352,9 @@
     "f_shirt_mew_0": {
         "name": "Mew Shirt"
     },
+    "f_shirt_pikachufan_0": {
+        "name": "Pikachu Fan Shirt"
+    },
     "f_shirt_sweater_30_0": {
         "name": "The Thirty"
     },
@@ -407,6 +419,7 @@
         "name": "Active Tee"
     },
     "f_shirt_tshirt_fest_chicago_2017": {},
+    "f_shirt_tshirt_fest_chicago_2018": {},
     "f_shirt_tshirt_global_goals_2017": {},
     "f_shirt_tshirt_pikachu_0": {
         "name": "Pikachu Tee"
@@ -469,6 +482,9 @@
     "f_shoes_gymleader_2": {
         "name": "Gym Leader Shoes"
     },
+    "f_shoes_pikachufan_0": {
+        "name": "Pikachu Fan Shoes"
+    },
     "f_shoes_teamrocket_0": {
         "name": "Team Rocket Boots"
     },
@@ -536,6 +552,7 @@
     "m_glasses_mask_1": {
         "name": "Mystery Mask"
     },
+    "m_glasses_teardrop_0": {},
     "m_glasses_thick_0": {
         "name": "Focus Frames"
     },
@@ -630,6 +647,9 @@
         "name": "Magikarp Hat"
     },
     "m_hat_mimikyu_0": {},
+    "m_hat_pikachufan_0": {
+        "name": "Pikachu Fan Headband"
+    },
     "m_hat_teamrocket_0": {
         "name": "Team Rocket Hat"
     },
@@ -658,6 +678,9 @@
     "m_pants_jogger_0": {
         "name": "Jogger Shorts"
     },
+    "m_pants_pikachufan_0": {
+        "name": "Pikachu Fan Shorts"
+    },
     "m_pants_skinnyjeans_0": {
         "name": "Skinny Jeans"
     },
@@ -761,6 +784,9 @@
     "m_shirt_mew_0": {
         "name": "Mew Shirt"
     },
+    "m_shirt_pikachufan_0": {
+        "name": "Pikachu Fan Shirt"
+    },
     "m_shirt_sweatshirt_sporty_0": {
         "name": "Sports Hoodie"
     },
@@ -795,6 +821,7 @@
         "name": "Team Rainbow Rocket Top"
     },
     "m_shirt_tshirt_fest_chicago_2017": {},
+    "m_shirt_tshirt_fest_chicago_2018": {},
     "m_shirt_tshirt_geometric_0": {
         "name": "Diagonal Tee"
     },
@@ -869,6 +896,9 @@
     "m_shoes_jogger_0": {
         "name": "Jogger Shoes"
     },
+    "m_shoes_pikachufan_0": {
+        "name": "Pikachu Fan Shoes"
+    },
     "m_shoes_teamrocket_0": {
         "name": "Team Rocket Boots"
     },
diff --git a/output/locales/en-US/move.json b/output/locales/en-US/move.json
index cb0eab2..2ea2617 100644
--- a/output/locales/en-US/move.json
+++ b/output/locales/en-US/move.json
@@ -583,5 +583,8 @@
     },
     "HYDRO_CANNON": {
         "name": "Hydro Cannon"
+    },
+    "LAST_RESORT": {
+        "name": "Last Resort"
     }
 }
\ No newline at end of file
diff --git a/output/locales/es-ES/avatar-customization.json b/output/locales/es-ES/avatar-customization.json
index 7d18bba..ad22b43 100644
--- a/output/locales/es-ES/avatar-customization.json
+++ b/output/locales/es-ES/avatar-customization.json
@@ -86,6 +86,9 @@
     "f_glasses_mask_1": {
         "name": "Antifaz misterioso"
     },
+    "f_glasses_teardrop_0": {
+        "name": "Gafas de sol\\nde Aviador"
+    },
     "f_glasses_thick_0": {
         "name": "Gafas de leer"
     },
@@ -170,6 +173,9 @@
         "name": "Gorro Magikarp"
     },
     "f_hat_mimikyu_0": {},
+    "f_hat_pikachufan_0": {
+        "name": "Orejas Fan de Pikachu"
+    },
     "f_hat_teamrocket_0": {
         "name": "Gorra\\nTeam Rocket"
     },
@@ -261,6 +267,9 @@
     "f_pants_neon_stripes_1": {
         "name": "Mallas ajustadas"
     },
+    "f_pants_pikachufan_0": {
+        "name": "Pantalones Fan de Pikachu"
+    },
     "f_pants_shorts_0": {
         "name": "Pantalones cortos"
     },
@@ -343,6 +352,9 @@
     "f_shirt_mew_0": {
         "name": "Camiseta\\nde Mew"
     },
+    "f_shirt_pikachufan_0": {
+        "name": "Camiseta Fan de Pikachu"
+    },
     "f_shirt_sweater_30_0": {
         "name": "Cuello vuelto 30"
     },
@@ -407,6 +419,7 @@
         "name": "Camiseta Ball"
     },
     "f_shirt_tshirt_fest_chicago_2017": {},
+    "f_shirt_tshirt_fest_chicago_2018": {},
     "f_shirt_tshirt_global_goals_2017": {},
     "f_shirt_tshirt_pikachu_0": {
         "name": "Camiseta Pikachu"
@@ -469,6 +482,9 @@
     "f_shoes_gymleader_2": {
         "name": "Zapatos\\nde Líder de Gimnasio"
     },
+    "f_shoes_pikachufan_0": {
+        "name": "Zapatillas Fan de Pikachu"
+    },
     "f_shoes_teamrocket_0": {
         "name": "Botas\\nTeam Rocket"
     },
@@ -536,6 +552,7 @@
     "m_glasses_mask_1": {
         "name": "Antifaz misterioso"
     },
+    "m_glasses_teardrop_0": {},
     "m_glasses_thick_0": {
         "name": "Gafas de leer"
     },
@@ -630,6 +647,9 @@
         "name": "Gorro Magikarp"
     },
     "m_hat_mimikyu_0": {},
+    "m_hat_pikachufan_0": {
+        "name": "Orejas Fan de Pikachu"
+    },
     "m_hat_teamrocket_0": {
         "name": "Gorra\\nTeam Rocket"
     },
@@ -658,6 +678,9 @@
     "m_pants_jogger_0": {
         "name": "Pantalón corto de corredor"
     },
+    "m_pants_pikachufan_0": {
+        "name": "Pantalones Fan de Pikachu"
+    },
     "m_pants_skinnyjeans_0": {
         "name": "Vaqueros ajustados"
     },
@@ -761,6 +784,9 @@
     "m_shirt_mew_0": {
         "name": "Camiseta\\nde Mew"
     },
+    "m_shirt_pikachufan_0": {
+        "name": "Camiseta Fan de Pikachu"
+    },
     "m_shirt_sweatshirt_sporty_0": {
         "name": "Sudadera deportiva"
     },
@@ -795,6 +821,7 @@
         "name": "Camiseta\\nTeam Rainbow Rocket"
     },
     "m_shirt_tshirt_fest_chicago_2017": {},
+    "m_shirt_tshirt_fest_chicago_2018": {},
     "m_shirt_tshirt_geometric_0": {
         "name": "Camiseta diagonal"
     },
@@ -869,6 +896,9 @@
     "m_shoes_jogger_0": {
         "name": "Zapatos de corredor"
     },
+    "m_shoes_pikachufan_0": {
+        "name": "Zapatillas Fan de Pikachu"
+    },
     "m_shoes_teamrocket_0": {
         "name": "Botas\\nTeam Rocket"
     },
diff --git a/output/locales/es-ES/move.json b/output/locales/es-ES/move.json
index e58cd1d..3d312c8 100644
--- a/output/locales/es-ES/move.json
+++ b/output/locales/es-ES/move.json
@@ -583,5 +583,8 @@
     },
     "HYDRO_CANNON": {
         "name": "Hidrocañón"
+    },
+    "LAST_RESORT": {
+        "name": "Última Baza"
     }
 }
\ No newline at end of file
diff --git a/output/locales/fr-FR/avatar-customization.json b/output/locales/fr-FR/avatar-customization.json
index 6a64f88..742f7d0 100644
--- a/output/locales/fr-FR/avatar-customization.json
+++ b/output/locales/fr-FR/avatar-customization.json
@@ -86,6 +86,9 @@
     "f_glasses_mask_1": {
         "name": "Masque mystère"
     },
+    "f_glasses_teardrop_0": {
+        "name": "Lunettes de soleil aviateur"
+    },
     "f_glasses_thick_0": {
         "name": "Lunettes de lecture"
     },
@@ -170,6 +173,9 @@
         "name": "Bonnet Magicarpe"
     },
     "f_hat_mimikyu_0": {},
+    "f_hat_pikachufan_0": {
+        "name": "Serre-tête Fan de Pikachu"
+    },
     "f_hat_teamrocket_0": {
         "name": "Chapeau Team Rocket"
     },
@@ -261,6 +267,9 @@
     "f_pants_neon_stripes_1": {
         "name": "Leggings fluos"
     },
+    "f_pants_pikachufan_0": {
+        "name": "Short Fan de Pikachu"
+    },
     "f_pants_shorts_0": {
         "name": "Short de course"
     },
@@ -343,6 +352,9 @@
     "f_shirt_mew_0": {
         "name": "T-shirt Mew"
     },
+    "f_shirt_pikachufan_0": {
+        "name": "T-shirt Fan de Pikachu"
+    },
     "f_shirt_sweater_30_0": {
         "name": "Col roulé 30"
     },
@@ -407,6 +419,7 @@
         "name": "T-shirt sportif"
     },
     "f_shirt_tshirt_fest_chicago_2017": {},
+    "f_shirt_tshirt_fest_chicago_2018": {},
     "f_shirt_tshirt_global_goals_2017": {},
     "f_shirt_tshirt_pikachu_0": {
         "name": "T-shirt Pikachu"
@@ -469,6 +482,9 @@
     "f_shoes_gymleader_2": {
         "name": "Chaussures de Championne d’Arène"
     },
+    "f_shoes_pikachufan_0": {
+        "name": "Chaussures Fan de Pikachu"
+    },
     "f_shoes_teamrocket_0": {
         "name": "Bottes Team Rocket"
     },
@@ -536,6 +552,7 @@
     "m_glasses_mask_1": {
         "name": "Masque mystère"
     },
+    "m_glasses_teardrop_0": {},
     "m_glasses_thick_0": {
         "name": "Lunettes de lecture"
     },
@@ -630,6 +647,9 @@
         "name": "Bonnet Magicarpe"
     },
     "m_hat_mimikyu_0": {},
+    "m_hat_pikachufan_0": {
+        "name": "Serre-tête Fan de Pikachu"
+    },
     "m_hat_teamrocket_0": {
         "name": "Chapeau Team Rocket"
     },
@@ -658,6 +678,9 @@
     "m_pants_jogger_0": {
         "name": "Short de joggeur"
     },
+    "m_pants_pikachufan_0": {
+        "name": "Short Fan de Pikachu"
+    },
     "m_pants_skinnyjeans_0": {
         "name": "Jean stretch"
     },
@@ -761,6 +784,9 @@
     "m_shirt_mew_0": {
         "name": "T-shirt Mew"
     },
+    "m_shirt_pikachufan_0": {
+        "name": "T-shirt Fan de Pikachu"
+    },
     "m_shirt_sweatshirt_sporty_0": {
         "name": "Sweat de sport"
     },
@@ -795,6 +821,7 @@
         "name": "Haut Team Rainbow Rocket"
     },
     "m_shirt_tshirt_fest_chicago_2017": {},
+    "m_shirt_tshirt_fest_chicago_2018": {},
     "m_shirt_tshirt_geometric_0": {
         "name": "T-shirt diagonal"
     },
@@ -869,6 +896,9 @@
     "m_shoes_jogger_0": {
         "name": "Chaussures de joggeur"
     },
+    "m_shoes_pikachufan_0": {
+        "name": "Chaussures Fan de Pikachu"
+    },
     "m_shoes_teamrocket_0": {
         "name": "Bottes Team Rocket"
     },
diff --git a/output/locales/fr-FR/move.json b/output/locales/fr-FR/move.json
index 8692003..1e830a5 100644
--- a/output/locales/fr-FR/move.json
+++ b/output/locales/fr-FR/move.json
@@ -583,5 +583,8 @@
     },
     "HYDRO_CANNON": {
         "name": "Hydroblast"
+    },
+    "LAST_RESORT": {
+        "name": "Dernier Recours"
     }
 }
\ No newline at end of file
diff --git a/output/locales/it-IT/avatar-customization.json b/output/locales/it-IT/avatar-customization.json
index 082ad80..174be44 100644
--- a/output/locales/it-IT/avatar-customization.json
+++ b/output/locales/it-IT/avatar-customization.json
@@ -86,6 +86,9 @@
     "f_glasses_mask_1": {
         "name": "Maschera misteriosa"
     },
+    "f_glasses_teardrop_0": {
+        "name": "Occhiali da sole a goccia"
+    },
     "f_glasses_thick_0": {
         "name": "Occhiali da lettura"
     },
@@ -170,6 +173,9 @@
         "name": "Cappello Magikarp"
     },
     "f_hat_mimikyu_0": {},
+    "f_hat_pikachufan_0": {
+        "name": "Fascia fan di Pikachu"
+    },
     "f_hat_teamrocket_0": {
         "name": "Berretto Team Rocket"
     },
@@ -261,6 +267,9 @@
     "f_pants_neon_stripes_1": {
         "name": "Pantacollant vivaci"
     },
+    "f_pants_pikachufan_0": {
+        "name": "Pantaloncini fan di Pikachu"
+    },
     "f_pants_shorts_0": {
         "name": "Pantaloncini sportivi"
     },
@@ -343,6 +352,9 @@
     "f_shirt_mew_0": {
         "name": "T-shirt Mew"
     },
+    "f_shirt_pikachufan_0": {
+        "name": "Maglia fan di Pikachu"
+    },
     "f_shirt_sweater_30_0": {
         "name": "Maglia 30"
     },
@@ -407,6 +419,7 @@
         "name": "T-shirt sportiva"
     },
     "f_shirt_tshirt_fest_chicago_2017": {},
+    "f_shirt_tshirt_fest_chicago_2018": {},
     "f_shirt_tshirt_global_goals_2017": {},
     "f_shirt_tshirt_pikachu_0": {
         "name": "T-shirt Pikachu"
@@ -469,6 +482,9 @@
     "f_shoes_gymleader_2": {
         "name": "Scarpe Capopalestra"
     },
+    "f_shoes_pikachufan_0": {
+        "name": "Scarpe fan di Pikachu"
+    },
     "f_shoes_teamrocket_0": {
         "name": "Stivali Team Rocket"
     },
@@ -536,6 +552,7 @@
     "m_glasses_mask_1": {
         "name": "Maschera misteriosa"
     },
+    "m_glasses_teardrop_0": {},
     "m_glasses_thick_0": {
         "name": "Occhiali da lettura"
     },
@@ -630,6 +647,9 @@
         "name": "Cappello Magikarp"
     },
     "m_hat_mimikyu_0": {},
+    "m_hat_pikachufan_0": {
+        "name": "Fascia fan di Pikachu"
+    },
     "m_hat_teamrocket_0": {
         "name": "Berretto Team Rocket"
     },
@@ -658,6 +678,9 @@
     "m_pants_jogger_0": {
         "name": "Pantaloncini Podista"
     },
+    "m_pants_pikachufan_0": {
+        "name": "Pantaloncini fan di Pikachu"
+    },
     "m_pants_skinnyjeans_0": {
         "name": "Jeans aderenti"
     },
@@ -761,6 +784,9 @@
     "m_shirt_mew_0": {
         "name": "T-shirt Mew"
     },
+    "m_shirt_pikachufan_0": {
+        "name": "Maglia fan di Pikachu"
+    },
     "m_shirt_sweatshirt_sporty_0": {
         "name": "Felpa sportiva"
     },
@@ -795,6 +821,7 @@
         "name": "Maglia Team Rainbow Rocket"
     },
     "m_shirt_tshirt_fest_chicago_2017": {},
+    "m_shirt_tshirt_fest_chicago_2018": {},
     "m_shirt_tshirt_geometric_0": {
         "name": "T-shirt diagonale"
     },
@@ -869,6 +896,9 @@
     "m_shoes_jogger_0": {
         "name": "Scarpe Podista"
     },
+    "m_shoes_pikachufan_0": {
+        "name": "Scarpe fan di Pikachu"
+    },
     "m_shoes_teamrocket_0": {
         "name": "Stivali Team Rocket"
     },
diff --git a/output/locales/it-IT/move.json b/output/locales/it-IT/move.json
index 8a24f94..c910132 100644
--- a/output/locales/it-IT/move.json
+++ b/output/locales/it-IT/move.json
@@ -583,5 +583,8 @@
     },
     "HYDRO_CANNON": {
         "name": "Idrocannone"
+    },
+    "LAST_RESORT": {
+        "name": "Ultimascelta"
     }
 }
\ No newline at end of file
diff --git a/output/locales/ja-JP/avatar-customization.json b/output/locales/ja-JP/avatar-customization.json
index 4671926..52e60bb 100644
--- a/output/locales/ja-JP/avatar-customization.json
+++ b/output/locales/ja-JP/avatar-customization.json
@@ -86,6 +86,9 @@
     "f_glasses_mask_1": {
         "name": "なぞのマスク"
     },
+    "f_glasses_teardrop_0": {
+        "name": "ティアドロップ"
+    },
     "f_glasses_thick_0": {
         "name": "太ふちメガネ"
     },
@@ -170,6 +173,9 @@
         "name": "コイキング帽子"
     },
     "f_hat_mimikyu_0": {},
+    "f_hat_pikachufan_0": {
+        "name": "ピカチュウカチューシャ"
+    },
     "f_hat_teamrocket_0": {
         "name": "ロケット団帽子"
     },
@@ -261,6 +267,9 @@
     "f_pants_neon_stripes_1": {
         "name": "リキッドレギンス"
     },
+    "f_pants_pikachufan_0": {
+        "name": "ピカチュウだいすきパンツ"
+    },
     "f_pants_shorts_0": {
         "name": "短パン"
     },
@@ -343,6 +352,9 @@
     "f_shirt_mew_0": {
         "name": "ミュウTシャツ"
     },
+    "f_shirt_pikachufan_0": {
+        "name": "ピカチュウだいすきTシャツ"
+    },
     "f_shirt_sweater_30_0": {
         "name": "ザ・サーティ"
     },
@@ -407,6 +419,7 @@
         "name": "アクティブTシャツ"
     },
     "f_shirt_tshirt_fest_chicago_2017": {},
+    "f_shirt_tshirt_fest_chicago_2018": {},
     "f_shirt_tshirt_global_goals_2017": {},
     "f_shirt_tshirt_pikachu_0": {
         "name": "ピカチュウTシャツ"
@@ -469,6 +482,9 @@
     "f_shoes_gymleader_2": {
         "name": "ジムリーダーシューズ"
     },
+    "f_shoes_pikachufan_0": {
+        "name": "ピカチュウだいすきシューズ"
+    },
     "f_shoes_teamrocket_0": {
         "name": "ロケット団ブーツ"
     },
@@ -536,6 +552,7 @@
     "m_glasses_mask_1": {
         "name": "なぞのマスク"
     },
+    "m_glasses_teardrop_0": {},
     "m_glasses_thick_0": {
         "name": "太ふちメガネ"
     },
@@ -630,6 +647,9 @@
         "name": "コイキング帽子"
     },
     "m_hat_mimikyu_0": {},
+    "m_hat_pikachufan_0": {
+        "name": "ピカチュウカチューシャ"
+    },
     "m_hat_teamrocket_0": {
         "name": "ロケット団帽子"
     },
@@ -658,6 +678,9 @@
     "m_pants_jogger_0": {
         "name": "ジョギングパンツ"
     },
+    "m_pants_pikachufan_0": {
+        "name": "ピカチュウだいすきパンツ"
+    },
     "m_pants_skinnyjeans_0": {
         "name": "スキニーデニム"
     },
@@ -761,6 +784,9 @@
     "m_shirt_mew_0": {
         "name": "ミュウTシャツ"
     },
+    "m_shirt_pikachufan_0": {
+        "name": "ピカチュウだいすきTシャツ"
+    },
     "m_shirt_sweatshirt_sporty_0": {
         "name": "スポーツパーカー"
     },
@@ -795,6 +821,7 @@
         "name": "Rロケット団トップス"
     },
     "m_shirt_tshirt_fest_chicago_2017": {},
+    "m_shirt_tshirt_fest_chicago_2018": {},
     "m_shirt_tshirt_geometric_0": {
         "name": "パターンTシャツ"
     },
@@ -869,6 +896,9 @@
     "m_shoes_jogger_0": {
         "name": "ジョギングシューズ"
     },
+    "m_shoes_pikachufan_0": {
+        "name": "ピカチュウだいすきシューズ"
+    },
     "m_shoes_teamrocket_0": {
         "name": "ロケット団ブーツ"
     },
diff --git a/output/locales/ja-JP/move.json b/output/locales/ja-JP/move.json
index 7ea73d6..88a9d39 100644
--- a/output/locales/ja-JP/move.json
+++ b/output/locales/ja-JP/move.json
@@ -583,5 +583,8 @@
     },
     "HYDRO_CANNON": {
         "name": "ハイドロカノン"
+    },
+    "LAST_RESORT": {
+        "name": "とっておき"
     }
 }
\ No newline at end of file
diff --git a/output/locales/ko-KR/avatar-customization.json b/output/locales/ko-KR/avatar-customization.json
index 5d36edc..0068b52 100644
--- a/output/locales/ko-KR/avatar-customization.json
+++ b/output/locales/ko-KR/avatar-customization.json
@@ -86,6 +86,9 @@
     "f_glasses_mask_1": {
         "name": "미스터리 마스크"
     },
+    "f_glasses_teardrop_0": {
+        "name": "티어드롭형 선글라스"
+    },
     "f_glasses_thick_0": {
         "name": "둥근테안경"
     },
@@ -170,6 +173,9 @@
         "name": "잉어킹모자"
     },
     "f_hat_mimikyu_0": {},
+    "f_hat_pikachufan_0": {
+        "name": "피카츄 머리띠"
+    },
     "f_hat_teamrocket_0": {
         "name": "로켓단모자"
     },
@@ -261,6 +267,9 @@
     "f_pants_neon_stripes_1": {
         "name": "리퀴드 레깅스"
     },
+    "f_pants_pikachufan_0": {
+        "name": "피카츄 애호가팬츠"
+    },
     "f_pants_shorts_0": {
         "name": "트랙 쇼츠"
     },
@@ -343,6 +352,9 @@
     "f_shirt_mew_0": {
         "name": "뮤티셔츠"
     },
+    "f_shirt_pikachufan_0": {
+        "name": "피카츄 애호가티셔츠"
+    },
     "f_shirt_sweater_30_0": {
         "name": "The Thirty"
     },
@@ -407,6 +419,7 @@
         "name": "액티브티"
     },
     "f_shirt_tshirt_fest_chicago_2017": {},
+    "f_shirt_tshirt_fest_chicago_2018": {},
     "f_shirt_tshirt_global_goals_2017": {},
     "f_shirt_tshirt_pikachu_0": {
         "name": "피카츄티"
@@ -469,6 +482,9 @@
     "f_shoes_gymleader_2": {
         "name": "체육관 리더 슈즈"
     },
+    "f_shoes_pikachufan_0": {
+        "name": "피카츄 애호가슈즈"
+    },
     "f_shoes_teamrocket_0": {
         "name": "로켓단부츠"
     },
@@ -536,6 +552,7 @@
     "m_glasses_mask_1": {
         "name": "미스테리 마스크"
     },
+    "m_glasses_teardrop_0": {},
     "m_glasses_thick_0": {
         "name": "둥근테안경"
     },
@@ -630,6 +647,9 @@
         "name": "잉어킹모자"
     },
     "m_hat_mimikyu_0": {},
+    "m_hat_pikachufan_0": {
+        "name": "피카츄 머리띠"
+    },
     "m_hat_teamrocket_0": {
         "name": "로켓단모자"
     },
@@ -658,6 +678,9 @@
     "m_pants_jogger_0": {
         "name": "조깅팬츠"
     },
+    "m_pants_pikachufan_0": {
+        "name": "피카츄 애호가팬츠"
+    },
     "m_pants_skinnyjeans_0": {
         "name": "스키니진"
     },
@@ -761,6 +784,9 @@
     "m_shirt_mew_0": {
         "name": "뮤티셔츠"
     },
+    "m_shirt_pikachufan_0": {
+        "name": "피카츄 애호가티셔츠"
+    },
     "m_shirt_sweatshirt_sporty_0": {
         "name": "스포츠 후드티"
     },
@@ -795,6 +821,7 @@
         "name": "R로켓단상의"
     },
     "m_shirt_tshirt_fest_chicago_2017": {},
+    "m_shirt_tshirt_fest_chicago_2018": {},
     "m_shirt_tshirt_geometric_0": {
         "name": "패턴티셔츠"
     },
@@ -815,16 +842,16 @@
         "name": "팀 발로 티"
     },
     "m_shirt_turtleneck_30_0": {
-        "name": "The Thirty"
+        "name": "더 30"
     },
     "m_shirt_turtleneck_30_1": {
-        "name": "The Thirty"
+        "name": "더 30"
     },
     "m_shirt_turtleneck_30_2": {
-        "name": "The Thirty"
+        "name": "더 30"
     },
     "m_shirt_turtleneck_30_3": {
-        "name": "The Thirty"
+        "name": "더 30"
     },
     "m_shirt_ultra_0": {},
     "m_shoes_default_0": {
@@ -869,6 +896,9 @@
     "m_shoes_jogger_0": {
         "name": "조깅슈즈"
     },
+    "m_shoes_pikachufan_0": {
+        "name": "피카츄 애호가슈즈"
+    },
     "m_shoes_teamrocket_0": {
         "name": "로켓단부츠"
     },
diff --git a/output/locales/ko-KR/move.json b/output/locales/ko-KR/move.json
index ffe828f..d075e03 100644
--- a/output/locales/ko-KR/move.json
+++ b/output/locales/ko-KR/move.json
@@ -583,5 +583,8 @@
     },
     "HYDRO_CANNON": {
         "name": "하이드로캐논"
+    },
+    "LAST_RESORT": {
+        "name": "뒀다쓰기"
     }
 }
\ No newline at end of file
diff --git a/output/locales/pt-BR/avatar-customization.json b/output/locales/pt-BR/avatar-customization.json
index bb437aa..b88c7c8 100644
--- a/output/locales/pt-BR/avatar-customization.json
+++ b/output/locales/pt-BR/avatar-customization.json
@@ -86,6 +86,9 @@
     "f_glasses_mask_1": {
         "name": "Máscara misteriosa"
     },
+    "f_glasses_teardrop_0": {
+        "name": "Óculos escuros aviador"
+    },
     "f_glasses_thick_0": {
         "name": "Óculos para ler"
     },
@@ -170,6 +173,9 @@
         "name": "Chapéu de Magikarp"
     },
     "f_hat_mimikyu_0": {},
+    "f_hat_pikachufan_0": {
+        "name": "Gigolete Fã de Pikachu"
+    },
     "f_hat_teamrocket_0": {
         "name": "Chapéu da Equipe Rocket"
     },
@@ -261,6 +267,9 @@
     "f_pants_neon_stripes_1": {
         "name": "Calça legging"
     },
+    "f_pants_pikachufan_0": {
+        "name": "Short Fã de Pikachu"
+    },
     "f_pants_shorts_0": {
         "name": "Short curto"
     },
@@ -343,6 +352,9 @@
     "f_shirt_mew_0": {
         "name": "Camiseta de Mew"
     },
+    "f_shirt_pikachufan_0": {
+        "name": "Blusa Fã de Pikachu"
+    },
     "f_shirt_sweater_30_0": {
         "name": "Gola alta trinta"
     },
@@ -407,6 +419,7 @@
         "name": "Blusa esportiva"
     },
     "f_shirt_tshirt_fest_chicago_2017": {},
+    "f_shirt_tshirt_fest_chicago_2018": {},
     "f_shirt_tshirt_global_goals_2017": {},
     "f_shirt_tshirt_pikachu_0": {
         "name": "Blusa de Pikachu"
@@ -469,6 +482,9 @@
     "f_shoes_gymleader_2": {
         "name": "Tênis de Líder de Ginásio"
     },
+    "f_shoes_pikachufan_0": {
+        "name": "Tênis Fã de Pikachu"
+    },
     "f_shoes_teamrocket_0": {
         "name": "Botas da Equipe Rocket"
     },
@@ -536,6 +552,7 @@
     "m_glasses_mask_1": {
         "name": "Máscara misteriosa"
     },
+    "m_glasses_teardrop_0": {},
     "m_glasses_thick_0": {
         "name": "Óculos para ler"
     },
@@ -630,6 +647,9 @@
         "name": "Chapéu de Magikarp"
     },
     "m_hat_mimikyu_0": {},
+    "m_hat_pikachufan_0": {
+        "name": "Gigolete Fã de Pikachu"
+    },
     "m_hat_teamrocket_0": {
         "name": "Chapéu da Equipe Rocket"
     },
@@ -658,6 +678,9 @@
     "m_pants_jogger_0": {
         "name": "Bermuda de corredor"
     },
+    "m_pants_pikachufan_0": {
+        "name": "Bermuda Fã de Pikachu"
+    },
     "m_pants_skinnyjeans_0": {
         "name": "Calça justa"
     },
@@ -761,6 +784,9 @@
     "m_shirt_mew_0": {
         "name": "Camiseta de Mew"
     },
+    "m_shirt_pikachufan_0": {
+        "name": "Blusa Fã de Pikachu"
+    },
     "m_shirt_sweatshirt_sporty_0": {
         "name": "Moletom esportivo"
     },
@@ -795,6 +821,7 @@
         "name": "Camisa da Equipe Rainbow Rocket"
     },
     "m_shirt_tshirt_fest_chicago_2017": {},
+    "m_shirt_tshirt_fest_chicago_2018": {},
     "m_shirt_tshirt_geometric_0": {
         "name": "Camisa diagonal"
     },
@@ -869,6 +896,9 @@
     "m_shoes_jogger_0": {
         "name": "Tênis de corredor"
     },
+    "m_shoes_pikachufan_0": {
+        "name": "Tênis Fã de Pikachu"
+    },
     "m_shoes_teamrocket_0": {
         "name": "Botas da Equipe Rocket"
     },
diff --git a/output/locales/pt-BR/move.json b/output/locales/pt-BR/move.json
index cc9aea7..51cd56f 100644
--- a/output/locales/pt-BR/move.json
+++ b/output/locales/pt-BR/move.json
@@ -583,5 +583,8 @@
     },
     "HYDRO_CANNON": {
         "name": "Hidro Canhão"
+    },
+    "LAST_RESORT": {
+        "name": "Último Recurso"
     }
 }
\ No newline at end of file
diff --git a/output/locales/zh-TW/avatar-customization.json b/output/locales/zh-TW/avatar-customization.json
index d0736ab..5cb6ff7 100644
--- a/output/locales/zh-TW/avatar-customization.json
+++ b/output/locales/zh-TW/avatar-customization.json
@@ -86,6 +86,9 @@
     "f_glasses_mask_1": {
         "name": "神祕面具"
     },
+    "f_glasses_teardrop_0": {
+        "name": "淚滴型墨鏡"
+    },
     "f_glasses_thick_0": {
         "name": "黑粗框眼鏡"
     },
@@ -170,6 +173,9 @@
         "name": "鯉魚王帽"
     },
     "f_hat_mimikyu_0": {},
+    "f_hat_pikachufan_0": {
+        "name": "皮卡丘頭飾"
+    },
     "f_hat_teamrocket_0": {
         "name": "火箭隊帽"
     },
@@ -261,6 +267,9 @@
     "f_pants_neon_stripes_1": {
         "name": "螢光內搭褲"
     },
+    "f_pants_pikachufan_0": {
+        "name": "皮卡丘發燒友短褲"
+    },
     "f_pants_shorts_0": {
         "name": "跑步短褲"
     },
@@ -343,6 +352,9 @@
     "f_shirt_mew_0": {
         "name": "夢幻T恤"
     },
+    "f_shirt_pikachufan_0": {
+        "name": "皮卡丘發燒友上衣"
+    },
     "f_shirt_sweater_30_0": {
         "name": "30紀念款"
     },
@@ -407,6 +419,7 @@
         "name": "休閒短袖T恤"
     },
     "f_shirt_tshirt_fest_chicago_2017": {},
+    "f_shirt_tshirt_fest_chicago_2018": {},
     "f_shirt_tshirt_global_goals_2017": {},
     "f_shirt_tshirt_pikachu_0": {
         "name": "皮卡丘短袖T恤"
@@ -469,6 +482,9 @@
     "f_shoes_gymleader_2": {
         "name": "道館館主運動鞋"
     },
+    "f_shoes_pikachufan_0": {
+        "name": "皮卡丘發燒友運動鞋"
+    },
     "f_shoes_teamrocket_0": {
         "name": "火箭隊長靴"
     },
@@ -536,6 +552,7 @@
     "m_glasses_mask_1": {
         "name": "神祕面具"
     },
+    "m_glasses_teardrop_0": {},
     "m_glasses_thick_0": {
         "name": "黑粗框眼鏡"
     },
@@ -630,6 +647,9 @@
         "name": "鯉魚王帽"
     },
     "m_hat_mimikyu_0": {},
+    "m_hat_pikachufan_0": {
+        "name": "皮卡丘頭飾"
+    },
     "m_hat_teamrocket_0": {
         "name": "火箭隊帽"
     },
@@ -658,6 +678,9 @@
     "m_pants_jogger_0": {
         "name": "慢跑者短褲"
     },
+    "m_pants_pikachufan_0": {
+        "name": "皮卡丘發燒友短褲"
+    },
     "m_pants_skinnyjeans_0": {
         "name": "窄管牛仔褲"
     },
@@ -761,6 +784,9 @@
     "m_shirt_mew_0": {
         "name": "夢幻T恤"
     },
+    "m_shirt_pikachufan_0": {
+        "name": "皮卡丘發燒友T恤"
+    },
     "m_shirt_sweatshirt_sporty_0": {
         "name": "運動連帽上衣"
     },
@@ -795,6 +821,7 @@
         "name": "彩虹火箭隊上衣"
     },
     "m_shirt_tshirt_fest_chicago_2017": {},
+    "m_shirt_tshirt_fest_chicago_2018": {},
     "m_shirt_tshirt_geometric_0": {
         "name": "幾何花紋短袖T恤"
     },
@@ -869,6 +896,9 @@
     "m_shoes_jogger_0": {
         "name": "慢跑者鞋"
     },
+    "m_shoes_pikachufan_0": {
+        "name": "皮卡丘發燒友運動鞋"
+    },
     "m_shoes_teamrocket_0": {
         "name": "火箭隊長靴"
     },
diff --git a/output/locales/zh-TW/move.json b/output/locales/zh-TW/move.json
index eddf7fe..d5dfa1c 100644
--- a/output/locales/zh-TW/move.json
+++ b/output/locales/zh-TW/move.json
@@ -583,5 +583,8 @@
     },
     "HYDRO_CANNON": {
         "name": "加農水砲"
+    },
+    "LAST_RESORT": {
+        "name": "珍藏"
     }
 }
\ No newline at end of file
diff --git a/output/move.json b/output/move.json
index fb7d86b..00d42de 100644
--- a/output/move.json
+++ b/output/move.json
@@ -4009,5 +4009,26 @@
         },
         "name": "Hydro Cannon",
         "internalId": 299
+    },
+    {
+        "accuracyChange": 1,
+        "animationId": 5,
+        "power": 90,
+        "criticalChance": 0.05,
+        "staminaLossScalar": 0.065,
+        "trainerLevelMin": 1,
+        "trainerLevelMax": 100,
+        "vfxName": "last_resort",
+        "durationMs": 2900,
+        "damageWindowStartMs": 2700,
+        "damageWindowEndMs": 2850,
+        "energyDelta": -50,
+        "id": "LAST_RESORT",
+        "pokemonType": {
+            "id": "POKEMON_TYPE_NORMAL",
+            "name": "Normal"
+        },
+        "name": "Last Resort",
+        "internalId": 300
     }
 ]
\ No newline at end of file
diff --git a/output/pokemon.json b/output/pokemon.json
index 65044b5..9bc3bcd 100644
--- a/output/pokemon.json
+++ b/output/pokemon.json
@@ -27287,12 +27287,14 @@
             }
         ],
         "encounter": {
+            "attackProbability": 0.3,
             "attackTimer": 20,
             "baseFleeRate": 0.1,
             "baseCaptureRate": 0.4,
             "cameraDistance": 2.9,
             "collisionRadius": 0.2,
             "dodgeDistance": 1,
+            "dodgeProbability": 0.15,
             "jumpTime": 0.9,
             "maxPokemonActionFrequency": 1.6,
             "minPokemonActionFrequency": 0.2,
@@ -27761,7 +27763,7 @@
         ],
         "height": 0.61,
         "modelHeight": 0.65,
-        "kmBuddyDistance": 5,
+        "kmBuddyDistance": 20,
         "weight": 5,
         "modelScale": 1.2,
         "maxCP": 3090,
@@ -27819,7 +27821,7 @@
         "encounter": {
             "attackProbability": 0.1,
             "attackTimer": 20,
-            "baseFleeRate": 0.04,
+            "baseCaptureRate": 100,
             "cameraDistance": 3.12,
             "collisionRadius": 0.25,
             "dodgeDistance": 1,
diff --git a/package.json b/package.json
index 12198a9..57f29b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pokemongo-json-pokedex",
-  "version": "3.2.3-d",
+  "version": "3.3.0",
   "description": "This program transforms the data from the Pokemon GO master files to a better readable & processable JSON file.",
   "main": "lib/index.js",
   "scripts": {
diff --git a/src/income/gameMaster.ts b/src/income/gameMaster.ts
index f9ee1bf..77e9cd0 100644
--- a/src/income/gameMaster.ts
+++ b/src/income/gameMaster.ts
@@ -16,6 +16,7 @@ export interface ItemTemplate {
   iapCategoryDisplay?: IapCategoryDisplay;
   iapSettings?: IapSettings;
   itemSettings?: ItemSettings;
+  luckyPokemonSettings?: LuckyPokemonSettings;
   playerLevel?: PlayerLevel;
   pokemonScaleSettings?: PokemonScaleSettings;
   typeEffective?: TypeEffective;
@@ -199,6 +200,9 @@ export interface PlayerLevel {
   maxEncounterPlayerLevel: number;
   maxQuestEncounterPlayerLevel: number;
 }
+export interface LuckyPokemonSettings {
+  powerUpStardustDiscountPercent: number;
+}
 export interface ItemSettings {
   itemId: string;
   itemType: string;
@@ -260,6 +264,8 @@ export interface IapCategoryDisplay {
   category: string;
   sortOrder: number;
   bannerEnabled?: boolean;
+  imageUrl?: string;
+  description?: string;
   bannerTitle?: string;
 }
 export interface GymLevel {