diff --git a/bin/json/game_horoscope.json b/bin/json/game_horoscope.json
index 603b85cf7..f17d8c8d3 100644
--- a/bin/json/game_horoscope.json
+++ b/bin/json/game_horoscope.json
@@ -39,7 +39,7 @@
       }
     ],
     "position": "11001|1001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -82,7 +82,7 @@
       }
     ],
     "position": "11001|1001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -125,7 +125,7 @@
       }
     ],
     "position": "11001|1001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -168,7 +168,7 @@
       }
     ],
     "position": "11001|1001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -211,7 +211,7 @@
       }
     ],
     "position": "11001|1001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -254,7 +254,7 @@
       }
     ],
     "position": "11001|1001",
-    "front": "0",
+    "front": 0,
     "behind": "100200|100500"
   },
   {
@@ -297,7 +297,7 @@
       }
     ],
     "position": "11001|1001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -340,7 +340,7 @@
       }
     ],
     "position": "11001|1001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -383,7 +383,7 @@
       }
     ],
     "position": "11001|1001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -426,7 +426,7 @@
       }
     ],
     "position": "11001|1001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -463,7 +463,7 @@
       }
     ],
     "position": "11001|1001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -506,7 +506,7 @@
       }
     ],
     "position": "11001|1002",
-    "front": "100105",
+    "front": 100105,
     "behind": "0"
   },
   {
@@ -549,7 +549,7 @@
       }
     ],
     "position": "11001|1002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -592,7 +592,7 @@
       }
     ],
     "position": "11001|1002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -635,7 +635,7 @@
       }
     ],
     "position": "11001|1002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -678,7 +678,7 @@
       }
     ],
     "position": "11001|1002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -721,7 +721,7 @@
       }
     ],
     "position": "11001|1002",
-    "front": "0",
+    "front": 0,
     "behind": "100300"
   },
   {
@@ -764,7 +764,7 @@
       }
     ],
     "position": "11001|1002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -807,7 +807,7 @@
       }
     ],
     "position": "11001|1002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -850,7 +850,7 @@
       }
     ],
     "position": "11001|1002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -893,7 +893,7 @@
       }
     ],
     "position": "11001|1002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -930,7 +930,7 @@
       }
     ],
     "position": "11001|1002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -973,7 +973,7 @@
       }
     ],
     "position": "11001|1003",
-    "front": "100205",
+    "front": 100205,
     "behind": "0"
   },
   {
@@ -1016,7 +1016,7 @@
       }
     ],
     "position": "11001|1003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1059,7 +1059,7 @@
       }
     ],
     "position": "11001|1003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1102,7 +1102,7 @@
       }
     ],
     "position": "11001|1003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1145,7 +1145,7 @@
       }
     ],
     "position": "11001|1003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1188,7 +1188,7 @@
       }
     ],
     "position": "11001|1003",
-    "front": "0",
+    "front": 0,
     "behind": "100400"
   },
   {
@@ -1231,7 +1231,7 @@
       }
     ],
     "position": "11001|1003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1274,7 +1274,7 @@
       }
     ],
     "position": "11001|1003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1317,7 +1317,7 @@
       }
     ],
     "position": "11001|1003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1360,7 +1360,7 @@
       }
     ],
     "position": "11001|1003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1397,7 +1397,7 @@
       }
     ],
     "position": "11001|1003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1440,7 +1440,7 @@
       }
     ],
     "position": "11001|1004",
-    "front": "100305",
+    "front": 100305,
     "behind": "0"
   },
   {
@@ -1483,7 +1483,7 @@
       }
     ],
     "position": "11001|1004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1526,7 +1526,7 @@
       }
     ],
     "position": "11001|1004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1569,7 +1569,7 @@
       }
     ],
     "position": "11001|1004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1612,7 +1612,7 @@
       }
     ],
     "position": "11001|1004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1649,7 +1649,7 @@
       }
     ],
     "position": "11001|1004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1692,7 +1692,7 @@
       }
     ],
     "position": "11001|1005",
-    "front": "100105",
+    "front": 100105,
     "behind": "0"
   },
   {
@@ -1735,7 +1735,7 @@
       }
     ],
     "position": "11001|1005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1778,7 +1778,7 @@
       }
     ],
     "position": "11001|1005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1821,7 +1821,7 @@
       }
     ],
     "position": "11001|1005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1864,7 +1864,7 @@
       }
     ],
     "position": "11001|1005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1907,7 +1907,7 @@
       }
     ],
     "position": "11001|1005",
-    "front": "0",
+    "front": 0,
     "behind": "100600"
   },
   {
@@ -1950,7 +1950,7 @@
       }
     ],
     "position": "11001|1005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -1993,7 +1993,7 @@
       }
     ],
     "position": "11001|1005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2036,7 +2036,7 @@
       }
     ],
     "position": "11001|1005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2079,7 +2079,7 @@
       }
     ],
     "position": "11001|1005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2116,7 +2116,7 @@
       }
     ],
     "position": "11001|1005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2159,7 +2159,7 @@
       }
     ],
     "position": "11001|1006",
-    "front": "100505",
+    "front": 100505,
     "behind": "0"
   },
   {
@@ -2202,7 +2202,7 @@
       }
     ],
     "position": "11001|1006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2245,7 +2245,7 @@
       }
     ],
     "position": "11001|1006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2288,7 +2288,7 @@
       }
     ],
     "position": "11001|1006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2331,7 +2331,7 @@
       }
     ],
     "position": "11001|1006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2374,7 +2374,7 @@
       }
     ],
     "position": "11001|1006",
-    "front": "0",
+    "front": 0,
     "behind": "100700"
   },
   {
@@ -2417,7 +2417,7 @@
       }
     ],
     "position": "11001|1006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2460,7 +2460,7 @@
       }
     ],
     "position": "11001|1006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2503,7 +2503,7 @@
       }
     ],
     "position": "11001|1006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2546,7 +2546,7 @@
       }
     ],
     "position": "11001|1006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2583,7 +2583,7 @@
       }
     ],
     "position": "11001|1006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2626,7 +2626,7 @@
       }
     ],
     "position": "11001|1007",
-    "front": "100605",
+    "front": 100605,
     "behind": "0"
   },
   {
@@ -2669,7 +2669,7 @@
       }
     ],
     "position": "11001|1007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2712,7 +2712,7 @@
       }
     ],
     "position": "11001|1007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2755,7 +2755,7 @@
       }
     ],
     "position": "11001|1007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2798,7 +2798,7 @@
       }
     ],
     "position": "11001|1007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2835,7 +2835,7 @@
       }
     ],
     "position": "11001|1007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2878,7 +2878,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2921,7 +2921,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -2964,7 +2964,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3007,7 +3007,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3050,7 +3050,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3093,7 +3093,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3136,7 +3136,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3179,7 +3179,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3222,7 +3222,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3265,7 +3265,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3308,7 +3308,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "200200"
   },
   {
@@ -3351,7 +3351,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3394,7 +3394,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3437,7 +3437,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3480,7 +3480,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3523,7 +3523,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3566,7 +3566,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3609,7 +3609,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3652,7 +3652,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3695,7 +3695,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3732,7 +3732,7 @@
       }
     ],
     "position": "21001|2001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3775,7 +3775,7 @@
       }
     ],
     "position": "21001|2002",
-    "front": "200110",
+    "front": 200110,
     "behind": "0"
   },
   {
@@ -3818,7 +3818,7 @@
       }
     ],
     "position": "21001|2002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3861,7 +3861,7 @@
       }
     ],
     "position": "21001|2002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3904,7 +3904,7 @@
       }
     ],
     "position": "21001|2002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3947,7 +3947,7 @@
       }
     ],
     "position": "21001|2002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -3990,7 +3990,7 @@
       }
     ],
     "position": "21001|2002",
-    "front": "0",
+    "front": 0,
     "behind": "200300"
   },
   {
@@ -4033,7 +4033,7 @@
       }
     ],
     "position": "21001|2002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4076,7 +4076,7 @@
       }
     ],
     "position": "21001|2002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4119,7 +4119,7 @@
       }
     ],
     "position": "21001|2002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4162,7 +4162,7 @@
       }
     ],
     "position": "21001|2002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4199,7 +4199,7 @@
       }
     ],
     "position": "21001|2002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4242,7 +4242,7 @@
       }
     ],
     "position": "21001|2003",
-    "front": "200205",
+    "front": 200205,
     "behind": "0"
   },
   {
@@ -4285,7 +4285,7 @@
       }
     ],
     "position": "21001|2003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4328,7 +4328,7 @@
       }
     ],
     "position": "21001|2003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4371,7 +4371,7 @@
       }
     ],
     "position": "21001|2003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4414,7 +4414,7 @@
       }
     ],
     "position": "21001|2003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4457,7 +4457,7 @@
       }
     ],
     "position": "21001|2003",
-    "front": "0",
+    "front": 0,
     "behind": "200400"
   },
   {
@@ -4500,7 +4500,7 @@
       }
     ],
     "position": "21001|2003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4543,7 +4543,7 @@
       }
     ],
     "position": "21001|2003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4586,7 +4586,7 @@
       }
     ],
     "position": "21001|2003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4629,7 +4629,7 @@
       }
     ],
     "position": "21001|2003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4666,7 +4666,7 @@
       }
     ],
     "position": "21001|2003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4709,7 +4709,7 @@
       }
     ],
     "position": "21001|2004",
-    "front": "200305",
+    "front": 200305,
     "behind": "0"
   },
   {
@@ -4752,7 +4752,7 @@
       }
     ],
     "position": "21001|2004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4795,7 +4795,7 @@
       }
     ],
     "position": "21001|2004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4838,7 +4838,7 @@
       }
     ],
     "position": "21001|2004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4881,7 +4881,7 @@
       }
     ],
     "position": "21001|2004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4924,7 +4924,7 @@
       }
     ],
     "position": "21001|2004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -4967,7 +4967,7 @@
       }
     ],
     "position": "21001|2004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5010,7 +5010,7 @@
       }
     ],
     "position": "21001|2004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5053,7 +5053,7 @@
       }
     ],
     "position": "21001|2004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5096,7 +5096,7 @@
       }
     ],
     "position": "21001|2004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5133,7 +5133,7 @@
       }
     ],
     "position": "21001|2004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5176,7 +5176,7 @@
       }
     ],
     "position": "21001|2005",
-    "front": "200110",
+    "front": 200110,
     "behind": "0"
   },
   {
@@ -5219,7 +5219,7 @@
       }
     ],
     "position": "21001|2005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5262,7 +5262,7 @@
       }
     ],
     "position": "21001|2005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5305,7 +5305,7 @@
       }
     ],
     "position": "21001|2005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5348,7 +5348,7 @@
       }
     ],
     "position": "21001|2005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5391,7 +5391,7 @@
       }
     ],
     "position": "21001|2005",
-    "front": "0",
+    "front": 0,
     "behind": "200600"
   },
   {
@@ -5434,7 +5434,7 @@
       }
     ],
     "position": "21001|2005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5477,7 +5477,7 @@
       }
     ],
     "position": "21001|2005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5520,7 +5520,7 @@
       }
     ],
     "position": "21001|2005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5563,7 +5563,7 @@
       }
     ],
     "position": "21001|2005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5600,7 +5600,7 @@
       }
     ],
     "position": "21001|2005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5643,7 +5643,7 @@
       }
     ],
     "position": "21001|2006",
-    "front": "200505",
+    "front": 200505,
     "behind": "0"
   },
   {
@@ -5686,7 +5686,7 @@
       }
     ],
     "position": "21001|2006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5729,7 +5729,7 @@
       }
     ],
     "position": "21001|2006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5772,7 +5772,7 @@
       }
     ],
     "position": "21001|2006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5815,7 +5815,7 @@
       }
     ],
     "position": "21001|2006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5858,7 +5858,7 @@
       }
     ],
     "position": "21001|2006",
-    "front": "0",
+    "front": 0,
     "behind": "200700"
   },
   {
@@ -5901,7 +5901,7 @@
       }
     ],
     "position": "21001|2006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5944,7 +5944,7 @@
       }
     ],
     "position": "21001|2006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -5987,7 +5987,7 @@
       }
     ],
     "position": "21001|2006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6030,7 +6030,7 @@
       }
     ],
     "position": "21001|2006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6067,7 +6067,7 @@
       }
     ],
     "position": "21001|2006",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6110,7 +6110,7 @@
       }
     ],
     "position": "21001|2007",
-    "front": "200605",
+    "front": 200605,
     "behind": "0"
   },
   {
@@ -6153,7 +6153,7 @@
       }
     ],
     "position": "21001|2007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6196,7 +6196,7 @@
       }
     ],
     "position": "21001|2007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6239,7 +6239,7 @@
       }
     ],
     "position": "21001|2007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6282,7 +6282,7 @@
       }
     ],
     "position": "21001|2007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6325,7 +6325,7 @@
       }
     ],
     "position": "21001|2007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6368,7 +6368,7 @@
       }
     ],
     "position": "21001|2007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6411,7 +6411,7 @@
       }
     ],
     "position": "21001|2007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6454,7 +6454,7 @@
       }
     ],
     "position": "21001|2007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6497,7 +6497,7 @@
       }
     ],
     "position": "21001|2007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6534,7 +6534,7 @@
       }
     ],
     "position": "21001|2007",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6577,7 +6577,7 @@
       }
     ],
     "position": "21001|2008",
-    "front": "200110",
+    "front": 200110,
     "behind": "0"
   },
   {
@@ -6620,7 +6620,7 @@
       }
     ],
     "position": "21001|2008",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6663,7 +6663,7 @@
       }
     ],
     "position": "21001|2008",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6706,7 +6706,7 @@
       }
     ],
     "position": "21001|2008",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6749,7 +6749,7 @@
       }
     ],
     "position": "21001|2008",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6792,7 +6792,7 @@
       }
     ],
     "position": "21001|2008",
-    "front": "0",
+    "front": 0,
     "behind": "200900"
   },
   {
@@ -6835,7 +6835,7 @@
       }
     ],
     "position": "21001|2008",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6878,7 +6878,7 @@
       }
     ],
     "position": "21001|2008",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6921,7 +6921,7 @@
       }
     ],
     "position": "21001|2008",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -6964,7 +6964,7 @@
       }
     ],
     "position": "21001|2008",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7001,7 +7001,7 @@
       }
     ],
     "position": "21001|2008",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7044,7 +7044,7 @@
       }
     ],
     "position": "21001|2009",
-    "front": "200805",
+    "front": 200805,
     "behind": "0"
   },
   {
@@ -7087,7 +7087,7 @@
       }
     ],
     "position": "21001|2009",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7130,7 +7130,7 @@
       }
     ],
     "position": "21001|2009",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7173,7 +7173,7 @@
       }
     ],
     "position": "21001|2009",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7216,7 +7216,7 @@
       }
     ],
     "position": "21001|2009",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7259,7 +7259,7 @@
       }
     ],
     "position": "21001|2009",
-    "front": "0",
+    "front": 0,
     "behind": "201000"
   },
   {
@@ -7302,7 +7302,7 @@
       }
     ],
     "position": "21001|2009",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7345,7 +7345,7 @@
       }
     ],
     "position": "21001|2009",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7388,7 +7388,7 @@
       }
     ],
     "position": "21001|2009",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7431,7 +7431,7 @@
       }
     ],
     "position": "21001|2009",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7468,7 +7468,7 @@
       }
     ],
     "position": "21001|2009",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7511,7 +7511,7 @@
       }
     ],
     "position": "21001|2010",
-    "front": "200905",
+    "front": 200905,
     "behind": "0"
   },
   {
@@ -7554,7 +7554,7 @@
       }
     ],
     "position": "21001|2010",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7597,7 +7597,7 @@
       }
     ],
     "position": "21001|2010",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7640,7 +7640,7 @@
       }
     ],
     "position": "21001|2010",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7683,7 +7683,7 @@
       }
     ],
     "position": "21001|2010",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7726,7 +7726,7 @@
       }
     ],
     "position": "21001|2010",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7769,7 +7769,7 @@
       }
     ],
     "position": "21001|2010",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7812,7 +7812,7 @@
       }
     ],
     "position": "21001|2010",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7855,7 +7855,7 @@
       }
     ],
     "position": "21001|2010",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7898,7 +7898,7 @@
       }
     ],
     "position": "21001|2010",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7935,7 +7935,7 @@
       }
     ],
     "position": "21001|2010",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -7978,7 +7978,7 @@
       }
     ],
     "position": "21001|2011",
-    "front": "200110",
+    "front": 200110,
     "behind": "0"
   },
   {
@@ -8021,7 +8021,7 @@
       }
     ],
     "position": "21001|2011",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8064,7 +8064,7 @@
       }
     ],
     "position": "21001|2011",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8107,7 +8107,7 @@
       }
     ],
     "position": "21001|2011",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8150,7 +8150,7 @@
       }
     ],
     "position": "21001|2011",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8193,7 +8193,7 @@
       }
     ],
     "position": "21001|2011",
-    "front": "0",
+    "front": 0,
     "behind": "201200"
   },
   {
@@ -8236,7 +8236,7 @@
       }
     ],
     "position": "21001|2011",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8279,7 +8279,7 @@
       }
     ],
     "position": "21001|2011",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8322,7 +8322,7 @@
       }
     ],
     "position": "21001|2011",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8365,7 +8365,7 @@
       }
     ],
     "position": "21001|2011",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8402,7 +8402,7 @@
       }
     ],
     "position": "21001|2011",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8445,7 +8445,7 @@
       }
     ],
     "position": "21001|2012",
-    "front": "201105",
+    "front": 201105,
     "behind": "0"
   },
   {
@@ -8488,7 +8488,7 @@
       }
     ],
     "position": "21001|2012",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8531,7 +8531,7 @@
       }
     ],
     "position": "21001|2012",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8574,7 +8574,7 @@
       }
     ],
     "position": "21001|2012",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8617,7 +8617,7 @@
       }
     ],
     "position": "21001|2012",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8660,7 +8660,7 @@
       }
     ],
     "position": "21001|2012",
-    "front": "0",
+    "front": 0,
     "behind": "201300"
   },
   {
@@ -8703,7 +8703,7 @@
       }
     ],
     "position": "21001|2012",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8746,7 +8746,7 @@
       }
     ],
     "position": "21001|2012",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8789,7 +8789,7 @@
       }
     ],
     "position": "21001|2012",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8832,7 +8832,7 @@
       }
     ],
     "position": "21001|2012",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8869,7 +8869,7 @@
       }
     ],
     "position": "21001|2012",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8912,7 +8912,7 @@
       }
     ],
     "position": "21001|2013",
-    "front": "201205",
+    "front": 201205,
     "behind": "0"
   },
   {
@@ -8955,7 +8955,7 @@
       }
     ],
     "position": "21001|2013",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -8998,7 +8998,7 @@
       }
     ],
     "position": "21001|2013",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9041,7 +9041,7 @@
       }
     ],
     "position": "21001|2013",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9084,7 +9084,7 @@
       }
     ],
     "position": "21001|2013",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9127,7 +9127,7 @@
       }
     ],
     "position": "21001|2013",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9170,7 +9170,7 @@
       }
     ],
     "position": "21001|2013",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9213,7 +9213,7 @@
       }
     ],
     "position": "21001|2013",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9256,7 +9256,7 @@
       }
     ],
     "position": "21001|2013",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9299,7 +9299,7 @@
       }
     ],
     "position": "21001|2013",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9336,7 +9336,7 @@
       }
     ],
     "position": "21001|2013",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9379,7 +9379,7 @@
       }
     ],
     "position": "21001|2014",
-    "front": "200110",
+    "front": 200110,
     "behind": "0"
   },
   {
@@ -9422,7 +9422,7 @@
       }
     ],
     "position": "21001|2014",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9465,7 +9465,7 @@
       }
     ],
     "position": "21001|2014",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9508,7 +9508,7 @@
       }
     ],
     "position": "21001|2014",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9551,7 +9551,7 @@
       }
     ],
     "position": "21001|2014",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9594,7 +9594,7 @@
       }
     ],
     "position": "21001|2014",
-    "front": "0",
+    "front": 0,
     "behind": "201500"
   },
   {
@@ -9637,7 +9637,7 @@
       }
     ],
     "position": "21001|2014",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9680,7 +9680,7 @@
       }
     ],
     "position": "21001|2014",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9723,7 +9723,7 @@
       }
     ],
     "position": "21001|2014",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9766,7 +9766,7 @@
       }
     ],
     "position": "21001|2014",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9803,7 +9803,7 @@
       }
     ],
     "position": "21001|2014",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9846,7 +9846,7 @@
       }
     ],
     "position": "21001|2015",
-    "front": "201405",
+    "front": 201405,
     "behind": "0"
   },
   {
@@ -9889,7 +9889,7 @@
       }
     ],
     "position": "21001|2015",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9932,7 +9932,7 @@
       }
     ],
     "position": "21001|2015",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -9975,7 +9975,7 @@
       }
     ],
     "position": "21001|2015",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10018,7 +10018,7 @@
       }
     ],
     "position": "21001|2015",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10061,7 +10061,7 @@
       }
     ],
     "position": "21001|2015",
-    "front": "0",
+    "front": 0,
     "behind": "201600"
   },
   {
@@ -10104,7 +10104,7 @@
       }
     ],
     "position": "21001|2015",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10147,7 +10147,7 @@
       }
     ],
     "position": "21001|2015",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10190,7 +10190,7 @@
       }
     ],
     "position": "21001|2015",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10233,7 +10233,7 @@
       }
     ],
     "position": "21001|2015",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10270,7 +10270,7 @@
       }
     ],
     "position": "21001|2015",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10313,7 +10313,7 @@
       }
     ],
     "position": "21001|2016",
-    "front": "201505",
+    "front": 201505,
     "behind": "0"
   },
   {
@@ -10356,7 +10356,7 @@
       }
     ],
     "position": "21001|2016",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10399,7 +10399,7 @@
       }
     ],
     "position": "21001|2016",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10442,7 +10442,7 @@
       }
     ],
     "position": "21001|2016",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10485,7 +10485,7 @@
       }
     ],
     "position": "21001|2016",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10528,7 +10528,7 @@
       }
     ],
     "position": "21001|2016",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10571,7 +10571,7 @@
       }
     ],
     "position": "21001|2016",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10614,7 +10614,7 @@
       }
     ],
     "position": "21001|2016",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10657,7 +10657,7 @@
       }
     ],
     "position": "21001|2016",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10700,7 +10700,7 @@
       }
     ],
     "position": "21001|2016",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10737,7 +10737,7 @@
       }
     ],
     "position": "21001|2016",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10780,7 +10780,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10823,7 +10823,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10866,7 +10866,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10909,7 +10909,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10952,7 +10952,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -10995,7 +10995,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11038,7 +11038,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11081,7 +11081,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11124,7 +11124,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11167,7 +11167,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11210,7 +11210,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "300200"
   },
   {
@@ -11253,7 +11253,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11296,7 +11296,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11339,7 +11339,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11382,7 +11382,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11425,7 +11425,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11468,7 +11468,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11511,7 +11511,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11554,7 +11554,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11597,7 +11597,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11634,7 +11634,7 @@
       }
     ],
     "position": "31001|3001",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11677,7 +11677,7 @@
       }
     ],
     "position": "31001|3002",
-    "front": "300110",
+    "front": 300110,
     "behind": "0"
   },
   {
@@ -11720,7 +11720,7 @@
       }
     ],
     "position": "31001|3002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11763,7 +11763,7 @@
       }
     ],
     "position": "31001|3002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11806,7 +11806,7 @@
       }
     ],
     "position": "31001|3002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11849,7 +11849,7 @@
       }
     ],
     "position": "31001|3002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11892,7 +11892,7 @@
       }
     ],
     "position": "31001|3002",
-    "front": "0",
+    "front": 0,
     "behind": "300300"
   },
   {
@@ -11935,7 +11935,7 @@
       }
     ],
     "position": "31001|3002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -11978,7 +11978,7 @@
       }
     ],
     "position": "31001|3002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12021,7 +12021,7 @@
       }
     ],
     "position": "31001|3002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12064,7 +12064,7 @@
       }
     ],
     "position": "31001|3002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12101,7 +12101,7 @@
       }
     ],
     "position": "31001|3002",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12144,7 +12144,7 @@
       }
     ],
     "position": "31001|3003",
-    "front": "300205",
+    "front": 300205,
     "behind": "0"
   },
   {
@@ -12187,7 +12187,7 @@
       }
     ],
     "position": "31001|3003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12230,7 +12230,7 @@
       }
     ],
     "position": "31001|3003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12273,7 +12273,7 @@
       }
     ],
     "position": "31001|3003",
-    "front": "0",
+    "front": 0,
     "behind": "300400"
   },
   {
@@ -12316,7 +12316,7 @@
       }
     ],
     "position": "31001|3003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12359,7 +12359,7 @@
       }
     ],
     "position": "31001|3003",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12402,7 +12402,7 @@
       }
     ],
     "position": "31001|3004",
-    "front": "300303",
+    "front": 300303,
     "behind": "0"
   },
   {
@@ -12445,7 +12445,7 @@
       }
     ],
     "position": "31001|3004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12488,7 +12488,7 @@
       }
     ],
     "position": "31001|3004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12531,7 +12531,7 @@
       }
     ],
     "position": "31001|3004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12574,7 +12574,7 @@
       }
     ],
     "position": "31001|3004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12617,7 +12617,7 @@
       }
     ],
     "position": "31001|3004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12660,7 +12660,7 @@
       }
     ],
     "position": "31001|3004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12703,7 +12703,7 @@
       }
     ],
     "position": "31001|3004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12746,7 +12746,7 @@
       }
     ],
     "position": "31001|3004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12789,7 +12789,7 @@
       }
     ],
     "position": "31001|3004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12826,7 +12826,7 @@
       }
     ],
     "position": "31001|3004",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12869,7 +12869,7 @@
       }
     ],
     "position": "31001|3005",
-    "front": "300110",
+    "front": 300110,
     "behind": "0"
   },
   {
@@ -12912,7 +12912,7 @@
       }
     ],
     "position": "31001|3005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12955,7 +12955,7 @@
       }
     ],
     "position": "31001|3005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -12998,7 +12998,7 @@
       }
     ],
     "position": "31001|3005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -13041,7 +13041,7 @@
       }
     ],
     "position": "31001|3005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -13084,7 +13084,7 @@
       }
     ],
     "position": "31001|3005",
-    "front": "0",
+    "front": 0,
     "behind": ""
   },
   {
@@ -13127,7 +13127,7 @@
       }
     ],
     "position": "31001|3005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -13170,7 +13170,7 @@
       }
     ],
     "position": "31001|3005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -13213,7 +13213,7 @@
       }
     ],
     "position": "31001|3005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -13256,7 +13256,7 @@
       }
     ],
     "position": "31001|3005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   },
   {
@@ -13293,7 +13293,7 @@
       }
     ],
     "position": "31001|3005",
-    "front": "0",
+    "front": 0,
     "behind": "0"
   }
 ]
\ No newline at end of file
diff --git a/modules/horoscope/api_info.go b/modules/horoscope/api_info.go
index 34410ef05..62ac50093 100644
--- a/modules/horoscope/api_info.go
+++ b/modules/horoscope/api_info.go
@@ -15,11 +15,17 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HoroscopeInfoR
 
 ///获取自己的排行榜信息
 func (this *apiComp) Info(session comm.IUserSession, req *pb.HoroscopeInfoReq) (code pb.ErrorCode, data proto.Message) {
-	var ()
+	var (
+		info *pb.DBHoroscope
+		err  error
+	)
 	if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}
-
-	session.SendMsg(string(this.module.GetType()), "info", &pb.HoroscopeInfoResp{})
+	if info, err = this.module.modelHoroscope.queryInfo(session.GetUserId()); err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
+	session.SendMsg(string(this.module.GetType()), "info", &pb.HoroscopeInfoResp{Info: info})
 	return
 }
diff --git a/modules/horoscope/api_upgrade.go b/modules/horoscope/api_upgrade.go
index d16694f3a..a7ac82608 100644
--- a/modules/horoscope/api_upgrade.go
+++ b/modules/horoscope/api_upgrade.go
@@ -3,6 +3,7 @@ package horoscope
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -15,11 +16,46 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.HoroscopeUp
 
 ///获取自己的排行榜信息
 func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgradeReq) (code pb.ErrorCode, data proto.Message) {
-	var ()
+	var (
+		info  *pb.DBHoroscope
+		conf  *cfg.GameHoroscopeData
+		front *cfg.GameHoroscopeData
+		err   error
+	)
 	if code = this.UpgradeCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}
-
+	if info, err = this.module.modelHoroscope.queryInfo(session.GetUserId()); err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
+	if conf, err = this.module.configure.getHoroscope(req.Nid); err != nil {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+	if conf.CostItem != nil && len(conf.CostItem) > 0 { //可有升级
+		if conf.Front > 0 {
+			if front, err = this.module.configure.getHoroscope(conf.Front); err != nil {
+				code = pb.ErrorCode_ConfigNoFound
+				return
+			}
+			if v, ok := info.Nodes[front.GrowType]; !ok || v < front.Lv {
+				code = pb.ErrorCode_HoroscopeNotTurnedOn
+				return
+			}
+		}
+	} else {
+		code = pb.ErrorCode_ReqParameterError
+		return
+	}
+	if code = this.module.ConsumeRes(session, conf.CostItem, true); code != pb.ErrorCode_Success {
+		return
+	}
+	info.Nodes[conf.GrowType] = conf.Lv
+	if err = this.module.modelHoroscope.updateInfo(info); err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
 	session.SendMsg(string(this.module.GetType()), "upgrade", &pb.HoroscopeUpgradeResp{})
 	return
 }
diff --git a/modules/horoscope/modelhoroscope.go b/modules/horoscope/modelhoroscope.go
index 39627dc3e..eef581066 100644
--- a/modules/horoscope/modelhoroscope.go
+++ b/modules/horoscope/modelhoroscope.go
@@ -23,11 +23,19 @@ func (this *modelHoroscope) Init(service core.IService, module core.IModule, com
 }
 
 //查询用户装备数据
-func (this *modelHoroscope) queryInfo(uId string) (result *pb.DBArenaUser, err error) {
-	result = &pb.DBArenaUser{}
+func (this *modelHoroscope) queryInfo(uId string) (result *pb.DBHoroscope, err error) {
+	result = &pb.DBHoroscope{}
 	if err = this.Get(uId, result); err != nil && err != mgo.MongodbNil {
 		this.module.Errorln(err)
 		return
 	}
 	return
 }
+
+///保存用户竞技场信息
+func (this *modelHoroscope) updateInfo(info *pb.DBHoroscope) (err error) {
+	err = this.Change(info.Uid, map[string]interface{}{
+		"nodes": info.Nodes,
+	})
+	return
+}
diff --git a/modules/horoscope/module.go b/modules/horoscope/module.go
index 774769a31..d7963ab1c 100644
--- a/modules/horoscope/module.go
+++ b/modules/horoscope/module.go
@@ -20,8 +20,11 @@ func NewModule() core.IModule {
 
 type Horoscope struct {
 	modules.ModuleBase
-	service base.IRPCXService //rpc服务对象 通过这个对象可以发布服务和调用其他服务的接口
-	options *Options
+	service        base.IRPCXService //rpc服务对象 通过这个对象可以发布服务和调用其他服务的接口
+	options        *Options
+	api_comp       *apiComp
+	configure      *configureComp
+	modelHoroscope *modelHoroscope
 }
 
 //模块名
@@ -41,6 +44,14 @@ func (this *Horoscope) Start() (err error) {
 	return
 }
 
+//装备组件
+func (this *Horoscope) OnInstallComp() {
+	this.ModuleBase.OnInstallComp()
+	this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp)
+	this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
+	this.modelHoroscope = this.RegisterComp(new(modelHoroscope)).(*modelHoroscope)
+}
+
 //计算英雄数值
 func (this *Horoscope) ComputeHeroNumeric(hero *pb.DBHero) (code pb.ErrorCode) {
 	return
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 73ac6cc1a..5861e1453 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -240,6 +240,8 @@ const (
 	ErrorCode_TrollSellMax      ErrorCode = 3302 // 卖出上限
 	ErrorCode_TrollMaxSellCount ErrorCode = 3303 // 单日最大交易次数
 	ErrorCode_TrollMaxItemCount ErrorCode = 3304 //背包格子达到上限
+	// horoscope
+	ErrorCode_HoroscopeNotTurnedOn ErrorCode = 3401 //未开启
 )
 
 // Enum value maps for ErrorCode.
@@ -440,6 +442,7 @@ var (
 		3302:  "TrollSellMax",
 		3303:  "TrollMaxSellCount",
 		3304:  "TrollMaxItemCount",
+		3401:  "HoroscopeNotTurnedOn",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                     0,
@@ -637,6 +640,7 @@ var (
 		"TrollSellMax":                3302,
 		"TrollMaxSellCount":           3303,
 		"TrollMaxItemCount":           3304,
+		"HoroscopeNotTurnedOn":        3401,
 	}
 )
 
@@ -671,7 +675,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0x96, 0x22, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xb1, 0x22, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
 	0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
 	0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
@@ -944,8 +948,10 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72,
 	0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10,
 	0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74,
-	0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
-	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f,
+	0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64,
+	0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/sys/configure/structs/Game.HoroscopeData.go b/sys/configure/structs/Game.HoroscopeData.go
index 8c60bcf24..cf9ab4e49 100644
--- a/sys/configure/structs/Game.HoroscopeData.go
+++ b/sys/configure/structs/Game.HoroscopeData.go
@@ -26,7 +26,7 @@ type GameHoroscopeData struct {
     Text string
     Upgrade []*Gameatr
     Position string
-    Front string
+    Front int32
     Behind string
 }
 
@@ -78,7 +78,7 @@ func (_v *GameHoroscopeData)Deserialize(_buf map[string]interface{}) (err error)
             }
 
     { var _ok_ bool; if _v.Position, _ok_ = _buf["position"].(string); !_ok_ { err = errors.New("position error"); return } }
-    { var _ok_ bool; if _v.Front, _ok_ = _buf["front"].(string); !_ok_ { err = errors.New("front error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["front"].(float64); !_ok_ { err = errors.New("front error"); return }; _v.Front = int32(_tempNum_) }
     { var _ok_ bool; if _v.Behind, _ok_ = _buf["behind"].(string); !_ok_ { err = errors.New("behind error"); return } }
     return
 }