diff --git a/bin/json/game_equipattrlibrary.json b/bin/json/game_equipattrlibrary.json index 74a53ad8e..25d67c15d 100644 --- a/bin/json/game_equipattrlibrary.json +++ b/bin/json/game_equipattrlibrary.json @@ -6,7 +6,14 @@ "atk", "20" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 2, @@ -15,7 +22,14 @@ "atk", "20" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 3, @@ -24,7 +38,14 @@ "def", "20" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 4, @@ -33,7 +54,14 @@ "hp", "100" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 5, @@ -42,7 +70,14 @@ "atkpro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 6, @@ -51,7 +86,14 @@ "defpro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 7, @@ -60,7 +102,14 @@ "hppro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 8, @@ -69,7 +118,14 @@ "def", "20" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 9, @@ -78,7 +134,14 @@ "atk", "20" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 10, @@ -87,7 +150,14 @@ "def", "20" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 11, @@ -96,7 +166,14 @@ "hp", "100" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 12, @@ -105,7 +182,14 @@ "atkpro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 13, @@ -114,7 +198,14 @@ "defpro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 14, @@ -123,7 +214,14 @@ "hppro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 15, @@ -132,7 +230,14 @@ "hp", "100" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 16, @@ -141,7 +246,14 @@ "atk", "20" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 17, @@ -150,7 +262,14 @@ "def", "20" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 18, @@ -159,7 +278,14 @@ "hp", "100" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 19, @@ -168,7 +294,14 @@ "atkpro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 20, @@ -177,7 +310,14 @@ "defpro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 21, @@ -186,7 +326,14 @@ "hppro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 22, @@ -195,7 +342,14 @@ "atk", "26" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 23, @@ -204,7 +358,14 @@ "atk", "26" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 24, @@ -213,7 +374,14 @@ "def", "26" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 25, @@ -222,7 +390,14 @@ "hp", "130" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 26, @@ -231,7 +406,14 @@ "atkpro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 27, @@ -240,7 +422,14 @@ "defpro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 28, @@ -249,7 +438,14 @@ "hppro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 29, @@ -258,7 +454,14 @@ "def", "26" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 30, @@ -267,7 +470,14 @@ "atk", "26" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 31, @@ -276,7 +486,14 @@ "def", "26" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 32, @@ -285,7 +502,14 @@ "hp", "130" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 33, @@ -294,7 +518,14 @@ "atkpro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 34, @@ -303,7 +534,14 @@ "defpro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 35, @@ -312,7 +550,14 @@ "hppro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 36, @@ -321,7 +566,14 @@ "hp", "130" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 37, @@ -330,7 +582,14 @@ "atk", "26" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 38, @@ -339,7 +598,14 @@ "def", "26" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 39, @@ -348,7 +614,14 @@ "hp", "130" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 40, @@ -357,7 +630,14 @@ "atkpro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 41, @@ -366,7 +646,14 @@ "defpro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 42, @@ -375,7 +662,14 @@ "hppro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 43, @@ -384,7 +678,14 @@ "atk", "33" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 44, @@ -393,7 +694,14 @@ "atk", "33" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 45, @@ -402,7 +710,14 @@ "def", "33" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 46, @@ -411,7 +726,14 @@ "hp", "169" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 47, @@ -420,7 +742,14 @@ "atkpro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 48, @@ -429,7 +758,14 @@ "defpro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 49, @@ -438,7 +774,14 @@ "hppro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 50, @@ -447,7 +790,14 @@ "def", "33" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 51, @@ -456,7 +806,14 @@ "atk", "33" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 52, @@ -465,7 +822,14 @@ "def", "33" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 53, @@ -474,7 +838,14 @@ "hp", "169" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 54, @@ -483,7 +854,14 @@ "atkpro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 55, @@ -492,7 +870,14 @@ "defpro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 56, @@ -501,7 +886,14 @@ "hppro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 57, @@ -510,7 +902,14 @@ "hp", "169" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 58, @@ -519,7 +918,14 @@ "atk", "33" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 59, @@ -528,7 +934,14 @@ "def", "33" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 60, @@ -537,7 +950,14 @@ "hp", "169" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 61, @@ -546,7 +966,14 @@ "atkpro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 62, @@ -555,7 +982,14 @@ "defpro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 63, @@ -564,7 +998,14 @@ "hppro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 64, @@ -573,7 +1014,14 @@ "atk", "42" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 65, @@ -582,7 +1030,14 @@ "atk", "42" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 66, @@ -591,7 +1046,14 @@ "def", "42" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 67, @@ -600,7 +1062,14 @@ "hp", "219" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 68, @@ -609,7 +1078,14 @@ "atkpro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 69, @@ -618,7 +1094,14 @@ "defpro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 70, @@ -627,7 +1110,14 @@ "hppro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 71, @@ -636,7 +1126,14 @@ "def", "42" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 72, @@ -645,7 +1142,14 @@ "atk", "42" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 73, @@ -654,7 +1158,14 @@ "def", "42" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 74, @@ -663,7 +1174,14 @@ "hp", "219" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 75, @@ -672,7 +1190,14 @@ "atkpro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 76, @@ -681,7 +1206,14 @@ "defpro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 77, @@ -690,7 +1222,14 @@ "hppro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 78, @@ -699,7 +1238,14 @@ "hp", "219" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 79, @@ -708,7 +1254,14 @@ "atk", "42" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 80, @@ -717,7 +1270,14 @@ "def", "42" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 81, @@ -726,7 +1286,14 @@ "hp", "219" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 82, @@ -735,7 +1302,14 @@ "atkpro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 83, @@ -744,7 +1318,14 @@ "defpro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 84, @@ -753,7 +1334,14 @@ "hppro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 85, @@ -762,7 +1350,14 @@ "atk", "54" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 86, @@ -771,7 +1366,14 @@ "atk", "54" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 87, @@ -780,7 +1382,14 @@ "def", "54" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 88, @@ -789,7 +1398,14 @@ "hp", "284" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 89, @@ -798,7 +1414,14 @@ "atkpro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 90, @@ -807,7 +1430,14 @@ "defpro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 91, @@ -816,7 +1446,14 @@ "hppro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 92, @@ -825,7 +1462,14 @@ "def", "54" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 93, @@ -834,7 +1478,14 @@ "atk", "54" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 94, @@ -843,7 +1494,14 @@ "def", "54" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 95, @@ -852,7 +1510,14 @@ "hp", "284" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 96, @@ -861,7 +1526,14 @@ "atkpro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 97, @@ -870,7 +1542,14 @@ "defpro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 98, @@ -879,7 +1558,14 @@ "hppro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 99, @@ -888,7 +1574,14 @@ "hp", "284" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 100, @@ -897,7 +1590,14 @@ "atk", "54" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 101, @@ -906,7 +1606,14 @@ "def", "54" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 102, @@ -915,7 +1622,14 @@ "hp", "284" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 103, @@ -924,7 +1638,14 @@ "atkpro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 104, @@ -933,7 +1654,14 @@ "defpro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 105, @@ -942,7 +1670,14 @@ "hppro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 106, @@ -951,7 +1686,14 @@ "atk", "70" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 107, @@ -960,7 +1702,14 @@ "atk", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 108, @@ -969,7 +1718,14 @@ "def", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 109, @@ -978,7 +1734,14 @@ "hp", "369" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 110, @@ -987,7 +1750,14 @@ "atkpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 111, @@ -996,7 +1766,14 @@ "defpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 112, @@ -1005,7 +1782,14 @@ "hppro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 113, @@ -1014,7 +1798,14 @@ "def", "70" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 114, @@ -1023,7 +1814,14 @@ "atk", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 115, @@ -1032,7 +1830,14 @@ "def", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 116, @@ -1041,7 +1846,14 @@ "hp", "369" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 117, @@ -1050,7 +1862,14 @@ "atkpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 118, @@ -1059,7 +1878,14 @@ "defpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 119, @@ -1068,7 +1894,14 @@ "hppro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 120, @@ -1077,7 +1910,14 @@ "hp", "369" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 121, @@ -1086,7 +1926,14 @@ "atk", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 122, @@ -1095,7 +1942,14 @@ "def", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 123, @@ -1104,7 +1958,14 @@ "hp", "369" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 124, @@ -1113,7 +1974,14 @@ "atkpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 125, @@ -1122,7 +1990,14 @@ "defpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 126, @@ -1131,7 +2006,14 @@ "hppro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 127, @@ -1140,7 +2022,14 @@ "atk", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 128, @@ -1149,7 +2038,14 @@ "def", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 129, @@ -1158,7 +2054,14 @@ "hp", "369" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 130, @@ -1167,7 +2070,14 @@ "atkpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 131, @@ -1176,7 +2086,14 @@ "defpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 132, @@ -1185,7 +2102,14 @@ "hppro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 133, @@ -1194,7 +2118,14 @@ "atk", "20" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 134, @@ -1203,7 +2134,14 @@ "atk", "20" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 135, @@ -1212,7 +2150,14 @@ "def", "20" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 136, @@ -1221,7 +2166,14 @@ "hp", "100" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 137, @@ -1230,7 +2182,14 @@ "atkpro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 138, @@ -1239,7 +2198,14 @@ "defpro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 139, @@ -1248,7 +2214,14 @@ "hppro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 140, @@ -1257,7 +2230,14 @@ "def", "20" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 141, @@ -1266,7 +2246,14 @@ "atk", "20" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 142, @@ -1275,7 +2262,14 @@ "def", "20" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 143, @@ -1284,7 +2278,14 @@ "hp", "100" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 144, @@ -1293,7 +2294,14 @@ "atkpro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 145, @@ -1302,7 +2310,14 @@ "defpro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 146, @@ -1311,7 +2326,14 @@ "hppro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 147, @@ -1320,7 +2342,14 @@ "hp", "100" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 148, @@ -1329,7 +2358,14 @@ "atk", "20" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 149, @@ -1338,7 +2374,14 @@ "def", "20" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 150, @@ -1347,7 +2390,14 @@ "hp", "100" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 151, @@ -1356,7 +2406,14 @@ "atkpro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 152, @@ -1365,7 +2422,14 @@ "defpro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 153, @@ -1374,7 +2438,14 @@ "hppro", "20" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 154, @@ -1383,7 +2454,14 @@ "atk", "26" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 155, @@ -1392,7 +2470,14 @@ "atk", "26" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 156, @@ -1401,7 +2486,14 @@ "def", "26" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 157, @@ -1410,7 +2502,14 @@ "hp", "130" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 158, @@ -1419,7 +2518,14 @@ "atkpro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 159, @@ -1428,7 +2534,14 @@ "defpro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 160, @@ -1437,7 +2550,14 @@ "hppro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 161, @@ -1446,7 +2566,14 @@ "def", "26" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 162, @@ -1455,7 +2582,14 @@ "atk", "26" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 163, @@ -1464,7 +2598,14 @@ "def", "26" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 164, @@ -1473,7 +2614,14 @@ "hp", "130" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 165, @@ -1482,7 +2630,14 @@ "atkpro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 166, @@ -1491,7 +2646,14 @@ "defpro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 167, @@ -1500,7 +2662,14 @@ "hppro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 168, @@ -1509,7 +2678,14 @@ "hp", "130" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 169, @@ -1518,7 +2694,14 @@ "atk", "26" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 170, @@ -1527,7 +2710,14 @@ "def", "26" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 171, @@ -1536,7 +2726,14 @@ "hp", "130" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 172, @@ -1545,7 +2742,14 @@ "atkpro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 173, @@ -1554,7 +2758,14 @@ "defpro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 174, @@ -1563,7 +2774,14 @@ "hppro", "26" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 175, @@ -1572,7 +2790,14 @@ "atk", "33" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 176, @@ -1581,7 +2806,14 @@ "atk", "33" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 177, @@ -1590,7 +2822,14 @@ "def", "33" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 178, @@ -1599,7 +2838,14 @@ "hp", "169" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 179, @@ -1608,7 +2854,14 @@ "atkpro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 180, @@ -1617,7 +2870,14 @@ "defpro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 181, @@ -1626,7 +2886,14 @@ "hppro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 182, @@ -1635,7 +2902,14 @@ "def", "33" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 183, @@ -1644,7 +2918,14 @@ "atk", "33" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 184, @@ -1653,7 +2934,14 @@ "def", "33" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 185, @@ -1662,7 +2950,14 @@ "hp", "169" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 186, @@ -1671,7 +2966,14 @@ "atkpro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 187, @@ -1680,7 +2982,14 @@ "defpro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 188, @@ -1689,7 +2998,14 @@ "hppro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 189, @@ -1698,7 +3014,14 @@ "hp", "169" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 190, @@ -1707,7 +3030,14 @@ "atk", "33" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 191, @@ -1716,7 +3046,14 @@ "def", "33" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 192, @@ -1725,7 +3062,14 @@ "hp", "169" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 193, @@ -1734,7 +3078,14 @@ "atkpro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 194, @@ -1743,7 +3094,14 @@ "defpro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 195, @@ -1752,7 +3110,14 @@ "hppro", "33" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 196, @@ -1761,7 +3126,14 @@ "atk", "42" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 197, @@ -1770,7 +3142,14 @@ "atk", "42" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 198, @@ -1779,7 +3158,14 @@ "def", "42" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 199, @@ -1788,7 +3174,14 @@ "hp", "219" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 200, @@ -1797,7 +3190,14 @@ "atkpro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 201, @@ -1806,7 +3206,14 @@ "defpro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 202, @@ -1815,7 +3222,14 @@ "hppro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 203, @@ -1824,7 +3238,14 @@ "def", "42" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 204, @@ -1833,7 +3254,14 @@ "atk", "42" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 205, @@ -1842,7 +3270,14 @@ "def", "42" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 206, @@ -1851,7 +3286,14 @@ "hp", "219" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 207, @@ -1860,7 +3302,14 @@ "atkpro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 208, @@ -1869,7 +3318,14 @@ "defpro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 209, @@ -1878,7 +3334,14 @@ "hppro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 210, @@ -1887,7 +3350,14 @@ "hp", "219" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 211, @@ -1896,7 +3366,14 @@ "atk", "42" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 212, @@ -1905,7 +3382,14 @@ "def", "42" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 213, @@ -1914,7 +3398,14 @@ "hp", "219" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 214, @@ -1923,7 +3414,14 @@ "atkpro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 215, @@ -1932,7 +3430,14 @@ "defpro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 216, @@ -1941,7 +3446,14 @@ "hppro", "42" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 217, @@ -1950,7 +3462,14 @@ "atk", "54" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 218, @@ -1959,7 +3478,14 @@ "atk", "54" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 219, @@ -1968,7 +3494,14 @@ "def", "54" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 220, @@ -1977,7 +3510,14 @@ "hp", "284" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 221, @@ -1986,7 +3526,14 @@ "atkpro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 222, @@ -1995,7 +3542,14 @@ "defpro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 223, @@ -2004,7 +3558,14 @@ "hppro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 224, @@ -2013,7 +3574,14 @@ "def", "54" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 225, @@ -2022,7 +3590,14 @@ "atk", "54" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 226, @@ -2031,7 +3606,14 @@ "def", "54" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 227, @@ -2040,7 +3622,14 @@ "hp", "284" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 228, @@ -2049,7 +3638,14 @@ "atkpro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 229, @@ -2058,7 +3654,14 @@ "defpro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 230, @@ -2067,7 +3670,14 @@ "hppro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 231, @@ -2076,7 +3686,14 @@ "hp", "284" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 232, @@ -2085,7 +3702,14 @@ "atk", "54" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 233, @@ -2094,7 +3718,14 @@ "def", "54" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 234, @@ -2103,7 +3734,14 @@ "hp", "284" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 235, @@ -2112,7 +3750,14 @@ "atkpro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 236, @@ -2121,7 +3766,14 @@ "defpro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 237, @@ -2130,7 +3782,14 @@ "hppro", "54" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 238, @@ -2139,7 +3798,14 @@ "atk", "70" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 239, @@ -2148,7 +3814,14 @@ "atk", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 240, @@ -2157,7 +3830,14 @@ "def", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 241, @@ -2166,7 +3846,14 @@ "hp", "369" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 242, @@ -2175,7 +3862,14 @@ "atkpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 243, @@ -2184,7 +3878,14 @@ "defpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 244, @@ -2193,7 +3894,14 @@ "hppro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 245, @@ -2202,7 +3910,14 @@ "def", "70" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 246, @@ -2211,7 +3926,14 @@ "atk", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 247, @@ -2220,7 +3942,14 @@ "def", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 248, @@ -2229,7 +3958,14 @@ "hp", "369" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 249, @@ -2238,7 +3974,14 @@ "atkpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 250, @@ -2247,7 +3990,14 @@ "defpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 251, @@ -2256,7 +4006,14 @@ "hppro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 252, @@ -2265,7 +4022,14 @@ "hp", "369" ], - "probability": 1000 + "probability": 1000, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 253, @@ -2274,7 +4038,14 @@ "atk", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 254, @@ -2283,7 +4054,14 @@ "def", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 255, @@ -2292,7 +4070,14 @@ "hp", "369" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 256, @@ -2301,7 +4086,14 @@ "atkpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 257, @@ -2310,7 +4102,14 @@ "defpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 258, @@ -2319,7 +4118,14 @@ "hppro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 259, @@ -2328,7 +4134,14 @@ "atk", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 260, @@ -2337,7 +4150,14 @@ "def", "70" ], - "probability": 150 + "probability": 150, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 261, @@ -2346,7 +4166,14 @@ "hp", "369" ], - "probability": 400 + "probability": 400, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 262, @@ -2355,7 +4182,14 @@ "atkpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 263, @@ -2364,7 +4198,14 @@ "defpro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] }, { "key": 264, @@ -2373,6 +4214,13 @@ "hppro", "70" ], - "probability": 100 + "probability": 100, + "Addition": [ + 800, + 900, + 1000, + 1100, + 1200 + ] } ] \ No newline at end of file diff --git a/bin/json/game_equipsuit.json b/bin/json/game_equipsuit.json index 9bab661d9..e836e9203 100644 --- a/bin/json/game_equipsuit.json +++ b/bin/json/game_equipsuit.json @@ -2,86 +2,103 @@ { "suittype": 0, "suitnum": 4, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 1, "suitnum": 4, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 2, "suitnum": 4, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 3, "suitnum": 4, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 4, "suitnum": 4, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 5, "suitnum": 4, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 6, "suitnum": 4, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 7, "suitnum": 4, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 8, "suitnum": 4, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 9, "suitnum": 4, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 100, "suitnum": 2, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 101, "suitnum": 2, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 102, "suitnum": 2, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 103, "suitnum": 2, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 104, "suitnum": 2, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 105, "suitnum": 2, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" }, { "suittype": 106, "suitnum": 2, - "skill": 100012000 + "skill": 100012000, + "skillintr": "" } ] \ No newline at end of file diff --git a/bin/json/game_herolevelup.json b/bin/json/game_herolevelup.json index 816313fd0..cbb4fb0b7 100644 --- a/bin/json/game_herolevelup.json +++ b/bin/json/game_herolevelup.json @@ -1,480 +1,1200 @@ [ { "level": 1, - "heroexp": 300, - "gold": 300, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 300 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 300 + } + ], "hp": 1857, "atk": 137, "def": 137 }, { "level": 2, - "heroexp": 320, - "gold": 320, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 320 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 320 + } + ], "hp": 1953, "atk": 142.7, "def": 143.7 }, { "level": 3, - "heroexp": 340, - "gold": 340, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 340 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 340 + } + ], "hp": 2049, "atk": 148.4, "def": 150.4 }, { "level": 4, - "heroexp": 360, - "gold": 360, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 360 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 360 + } + ], "hp": 2145, "atk": 154.1, "def": 157.1 }, { "level": 5, - "heroexp": 380, - "gold": 380, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 380 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 380 + } + ], "hp": 2241, "atk": 159.8, "def": 163.8 }, { "level": 6, - "heroexp": 400, - "gold": 400, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 400 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 400 + } + ], "hp": 2337, "atk": 165.5, "def": 170.5 }, { "level": 7, - "heroexp": 420, - "gold": 420, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 420 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 420 + } + ], "hp": 2433, "atk": 171.2, "def": 177.2 }, { "level": 8, - "heroexp": 440, - "gold": 440, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 440 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 440 + } + ], "hp": 2529, "atk": 176.9, "def": 183.9 }, { "level": 9, - "heroexp": 460, - "gold": 460, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 460 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 460 + } + ], "hp": 2625, "atk": 182.6, "def": 190.6 }, { "level": 10, - "heroexp": 480, - "gold": 480, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 480 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 480 + } + ], "hp": 2721, "atk": 188.3, "def": 197.3 }, { "level": 11, - "heroexp": 1100, - "gold": 1100, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 1100 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 1100 + } + ], "hp": 2817, "atk": 194, "def": 204 }, { "level": 12, - "heroexp": 1200, - "gold": 1200, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 1200 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 1200 + } + ], "hp": 2913, "atk": 199.7, "def": 210.7 }, { "level": 13, - "heroexp": 1300, - "gold": 1300, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 1300 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 1300 + } + ], "hp": 3009, "atk": 205.4, "def": 217.4 }, { "level": 14, - "heroexp": 1400, - "gold": 1400, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 1400 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 1400 + } + ], "hp": 3105, "atk": 211.1, "def": 224.1 }, { "level": 15, - "heroexp": 1500, - "gold": 1500, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 1500 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 1500 + } + ], "hp": 3201, "atk": 216.8, "def": 230.8 }, { "level": 16, - "heroexp": 1600, - "gold": 1600, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 1600 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 1600 + } + ], "hp": 3297, "atk": 222.5, "def": 237.5 }, { "level": 17, - "heroexp": 1700, - "gold": 1700, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 1700 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 1700 + } + ], "hp": 3393, "atk": 228.2, "def": 244.2 }, { "level": 18, - "heroexp": 1800, - "gold": 1800, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 1800 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 1800 + } + ], "hp": 3489, "atk": 233.9, "def": 250.9 }, { "level": 19, - "heroexp": 1900, - "gold": 1900, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 1900 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 1900 + } + ], "hp": 3585, "atk": 239.6, "def": 257.6 }, { "level": 20, - "heroexp": 2000, - "gold": 2000, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 2000 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + } + ], "hp": 3681, "atk": 245.3, "def": 264.3 }, { "level": 21, - "heroexp": 6300, - "gold": 6300, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 6300 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 6300 + } + ], "hp": 3777, "atk": 251, "def": 271 }, { "level": 22, - "heroexp": 6600, - "gold": 6600, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 6600 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 6600 + } + ], "hp": 3873, "atk": 256.7, "def": 277.7 }, { "level": 23, - "heroexp": 6900, - "gold": 6900, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 6900 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 6900 + } + ], "hp": 3969, "atk": 262.4, "def": 284.4 }, { "level": 24, - "heroexp": 7200, - "gold": 7200, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 7200 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 7200 + } + ], "hp": 4065, "atk": 268.1, "def": 291.1 }, { "level": 25, - "heroexp": 7500, - "gold": 7500, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 7500 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 7500 + } + ], "hp": 4161, "atk": 273.8, "def": 297.8 }, { "level": 26, - "heroexp": 7800, - "gold": 7800, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 7800 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 7800 + } + ], "hp": 4257, "atk": 279.5, "def": 304.5 }, { "level": 27, - "heroexp": 8100, - "gold": 8100, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 8100 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 8100 + } + ], "hp": 4353, "atk": 285.2, "def": 311.2 }, { "level": 28, - "heroexp": 8400, - "gold": 8400, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 8400 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 8400 + } + ], "hp": 4449, "atk": 290.9, "def": 317.9 }, { "level": 29, - "heroexp": 8700, - "gold": 8700, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 8700 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 8700 + } + ], "hp": 4545, "atk": 296.6, "def": 324.6 }, { "level": 30, - "heroexp": 9000, - "gold": 9000, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 9000 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 9000 + } + ], "hp": 4641, "atk": 302.3, "def": 331.3 }, { "level": 31, - "heroexp": 15500, - "gold": 15500, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 15500 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 15500 + } + ], "hp": 4737, "atk": 308, "def": 338 }, { "level": 32, - "heroexp": 16000, - "gold": 16000, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 16000 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 16000 + } + ], "hp": 4833, "atk": 313.7, "def": 344.7 }, { "level": 33, - "heroexp": 16500, - "gold": 16500, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 16500 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 16500 + } + ], "hp": 4929, "atk": 319.4, "def": 351.4 }, { "level": 34, - "heroexp": 17000, - "gold": 17000, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 17000 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 17000 + } + ], "hp": 5025, "atk": 325.1, "def": 358.1 }, { "level": 35, - "heroexp": 17500, - "gold": 17500, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 17500 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 17500 + } + ], "hp": 5121, "atk": 330.8, "def": 364.8 }, { "level": 36, - "heroexp": 18000, - "gold": 18000, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 18000 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 18000 + } + ], "hp": 5217, "atk": 336.5, "def": 371.5 }, { "level": 37, - "heroexp": 18500, - "gold": 18500, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 18500 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 18500 + } + ], "hp": 5313, "atk": 342.2, "def": 378.2 }, { "level": 38, - "heroexp": 19000, - "gold": 19000, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 19000 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 19000 + } + ], "hp": 5409, "atk": 347.9, "def": 384.9 }, { "level": 39, - "heroexp": 19500, - "gold": 19500, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 19500 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 19500 + } + ], "hp": 5505, "atk": 353.6, "def": 391.6 }, { "level": 40, - "heroexp": 20000, - "gold": 20000, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 20000 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], "hp": 5601, "atk": 359.3, "def": 398.3 }, { "level": 41, - "heroexp": 24600, - "gold": 24600, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 24600 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 24600 + } + ], "hp": 5697, "atk": 365, "def": 405 }, { "level": 42, - "heroexp": 25200, - "gold": 25200, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 25200 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 25200 + } + ], "hp": 5793, "atk": 370.7, "def": 411.7 }, { "level": 43, - "heroexp": 25800, - "gold": 25800, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 25800 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 25800 + } + ], "hp": 5889, "atk": 376.4, "def": 418.4 }, { "level": 44, - "heroexp": 26400, - "gold": 26400, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 26400 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 26400 + } + ], "hp": 5985, "atk": 382.1, "def": 425.1 }, { "level": 45, - "heroexp": 27000, - "gold": 27000, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 27000 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 27000 + } + ], "hp": 6081, "atk": 387.8, "def": 431.8 }, { "level": 46, - "heroexp": 27600, - "gold": 27600, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 27600 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 27600 + } + ], "hp": 6177, "atk": 393.5, "def": 438.5 }, { "level": 47, - "heroexp": 28200, - "gold": 28200, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 28200 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 28200 + } + ], "hp": 6273, "atk": 399.2, "def": 445.2 }, { "level": 48, - "heroexp": 28800, - "gold": 28800, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 28800 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 28800 + } + ], "hp": 6369, "atk": 404.9, "def": 451.9 }, { "level": 49, - "heroexp": 29400, - "gold": 29400, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 29400 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 29400 + } + ], "hp": 6465, "atk": 410.6, "def": 458.6 }, { "level": 50, - "heroexp": 30000, - "gold": 30000, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 30000 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], "hp": 6561, "atk": 416.3, "def": 465.3 }, { "level": 51, - "heroexp": 48450, - "gold": 48450, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 48450 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 48450 + } + ], "hp": 6657, "atk": 422, "def": 472 }, { "level": 52, - "heroexp": 49400, - "gold": 49400, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 49400 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 49400 + } + ], "hp": 6753, "atk": 427.7, "def": 478.7 }, { "level": 53, - "heroexp": 50350, - "gold": 50350, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 50350 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 50350 + } + ], "hp": 6849, "atk": 433.4, "def": 485.4 }, { "level": 54, - "heroexp": 51300, - "gold": 51300, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 51300 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 51300 + } + ], "hp": 6945, "atk": 439.1, "def": 492.1 }, { "level": 55, - "heroexp": 52250, - "gold": 52250, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 52250 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 52250 + } + ], "hp": 7041, "atk": 444.8, "def": 498.8 }, { "level": 56, - "heroexp": 53200, - "gold": 53200, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 53200 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 53200 + } + ], "hp": 7137, "atk": 450.5, "def": 505.5 }, { "level": 57, - "heroexp": 54150, - "gold": 54150, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 54150 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 54150 + } + ], "hp": 7233, "atk": 456.2, "def": 512.2 }, { "level": 58, - "heroexp": 55100, - "gold": 55100, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 55100 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 55100 + } + ], "hp": 7329, "atk": 461.9, "def": 518.9 }, { "level": 59, - "heroexp": 56050, - "gold": 56050, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 56050 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 56050 + } + ], "hp": 7425, "atk": 467.6, "def": 525.6 }, { "level": 60, - "heroexp": 57000, - "gold": 57000, + "heroexp": [ + { + "a": "attr", + "t": "heroexp", + "n": 57000 + } + ], + "gold": [ + { + "a": "attr", + "t": "gold", + "n": 57000 + } + ], "hp": 7521, "atk": 473.3, "def": 532.3 diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index d6228dcc2..88acf186b 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -2,11 +2,16 @@ { "Id": 200011101, "Desc": "对敌方1个目标造成攻击力80%", - "Target": "", - "EmitPR": 0, + "From": 4, + "Limit": 1, + "Where": [], + "Order": [ + "Type=rand" + ], + "EmitPR": 1000, "Type": "tongyongshanghai", "Argu": [ - "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800," + "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800" ], "AddEffect": false, "FollowSK": [], @@ -16,9 +21,14 @@ }, { "Id": 200012101, - "Desc": "对全体1个目标造成攻击力80%以及防御力120%的伤害", - "Target": "", - "EmitPR": 0, + "Desc": "对敌方全体造成攻击力80%以及防御力120%的伤害", + "From": 2, + "Limit": 5, + "Where": [], + "Order": [ + "Type=rand" + ], + "EmitPR": 1000, "Type": "tongyongshanghai", "Argu": [ "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800,ProSou2=0,Pro2=Total_Def,ProPar2=1200" @@ -31,12 +41,17 @@ }, { "Id": 200013101, - "Desc": "对全体攻击小于自身的目标造成攻击力80%的伤害", - "Target": "Action=ProJudge,JudgeType=0,Key=Total_Atk,Op=0", + "Desc": "对敌方全体攻击小于自身的目标造成攻击力80%的伤害", + "From": 2, + "Limit": 5, + "Where": [ + "Type=ProJudge,JudgeType=0,Key=Total_Atk,Op=1" + ], + "Order": [], "EmitPR": 1000, "Type": "tongyongshanghai", "Argu": [ - "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800," + "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800" ], "AddEffect": false, "FollowSK": [], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index eacb3d6ca..c5b86e138 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -99,7 +99,7 @@ "Id": 100013000, "Name": "", "Type": 1, - "Desc": "对全体攻击小于自身的目标造成攻击力80%的伤害", + "Desc": "对敌方全体攻击小于自身的目标造成攻击力80%的伤害", "MaxLV": 6, "CD": [ 4, diff --git a/comm/const.go b/comm/const.go index e3c82d468..9cc2a61a5 100644 --- a/comm/const.go +++ b/comm/const.go @@ -38,6 +38,7 @@ const ( SM_EquipmentModule core.M_Modules = "equipment" //装备模块 SM_HeroModule core.M_Modules = "hero" //英雄模块 SM_ForumModule core.M_Modules = "forum" //论坛模块 + SM_ItemsModule core.M_Modules = "item" ) //RPC服务接口定义处 diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 2e9ae8819..124671d8e 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -36,7 +36,7 @@ func (this *ModelHero) initHero(uid string, heroCfgId int32) *pb.DB_HeroData { newHero := &pb.DB_HeroData{ Id: objId, Uid: uid, - HeroID: heroCfg.Hid, + HeroID: heroCfg.Id, Star: heroCfg.Star, Lv: 1, //初始等级 NormalSkill: []*pb.SkillData{}, diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 8b4f8fcc6..fc2b47427 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -1,3 +1,4 @@ + //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -11,111 +12,152 @@ package cfg type JsonLoader func(string) ([]map[string]interface{}, error) type Tables struct { - ui *Game_ui - skill *Game_skill - plot *Game_plot - language *Game_language - extservers *Game_extservers - skillAtk *Game_skillAtk - skillAfteratk *Game_skillAfteratk - skillBuff *Game_skillBuff - skillPassive *Game_skillPassive - newHero *Game_newHero - heroStargrow *Game_heroStargrow - heroLevelgrow *Game_heroLevelgrow - heroStarup *Game_heroStarup - heroLevelup *Game_heroLevelup + hero *Game_hero + ui *Game_ui + skill *Game_skill + plot *Game_plot + language *Game_language + extservers *Game_extservers + skillAtk *Game_skillAtk + skillAfteratk *Game_skillAfteratk + skillBuff *Game_skillBuff + skillPassive *Game_skillPassive + newHero *Game_newHero + heroStargrow *Game_heroStargrow + heroLevelgrow *Game_heroLevelgrow + heroStarup *Game_heroStarup + heroLevelup *Game_heroLevelup + equip *Game_equip + equipAttrlibrary *Game_equipAttrlibrary + equipSuit *Game_equipSuit + equipIntensify *Game_equipIntensify + item *Game_item } func NewTables(loader JsonLoader) (*Tables, error) { - var err error - var buf []map[string]interface{} + var err error + var buf []map[string]interface{} - tables := &Tables{} - - if buf, err = loader("game_ui"); err != nil { - return nil, err - } - if tables.ui, err = NewGame_ui(buf); err != nil { - return nil, err - } - if buf, err = loader("game_skill"); err != nil { - return nil, err - } - if tables.skill, err = NewGame_skill(buf); err != nil { - return nil, err - } - if buf, err = loader("game_plot"); err != nil { - return nil, err - } - if tables.plot, err = NewGame_plot(buf); err != nil { - return nil, err - } - if buf, err = loader("game_language"); err != nil { - return nil, err - } - if tables.language, err = NewGame_language(buf); err != nil { - return nil, err - } - if buf, err = loader("game_extservers"); err != nil { - return nil, err - } - if tables.extservers, err = NewGame_extservers(buf); err != nil { - return nil, err - } - if buf, err = loader("game_skillatk"); err != nil { - return nil, err - } - if tables.skillAtk, err = NewGame_skillAtk(buf); err != nil { - return nil, err - } - if buf, err = loader("game_skillafteratk"); err != nil { - return nil, err - } - if tables.skillAfteratk, err = NewGame_skillAfteratk(buf); err != nil { - return nil, err - } - if buf, err = loader("game_skillbuff"); err != nil { - return nil, err - } - if tables.skillBuff, err = NewGame_skillBuff(buf); err != nil { - return nil, err - } - if buf, err = loader("game_skillpassive"); err != nil { - return nil, err - } - if tables.skillPassive, err = NewGame_skillPassive(buf); err != nil { - return nil, err - } - if buf, err = loader("game_newhero"); err != nil { - return nil, err - } - if tables.newHero, err = NewGame_newHero(buf); err != nil { - return nil, err - } - if buf, err = loader("game_herostargrow"); err != nil { - return nil, err - } - if tables.heroStargrow, err = NewGame_heroStargrow(buf); err != nil { - return nil, err - } - if buf, err = loader("game_herolevelgrow"); err != nil { - return nil, err - } - if tables.heroLevelgrow, err = NewGame_heroLevelgrow(buf); err != nil { - return nil, err - } - if buf, err = loader("game_herostarup"); err != nil { - return nil, err - } - if tables.heroStarup, err = NewGame_heroStarup(buf); err != nil { - return nil, err - } - if buf, err = loader("game_herolevelup"); err != nil { - return nil, err - } - if tables.heroLevelup, err = NewGame_heroLevelup(buf); err != nil { - return nil, err - } - return tables, nil + tables := &Tables{} + if buf, err = loader("game_hero") ; err != nil { + return nil, err + } + if tables.hero, err = NewGame_hero(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_ui") ; err != nil { + return nil, err + } + if tables.ui, err = NewGame_ui(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_skill") ; err != nil { + return nil, err + } + if tables.skill, err = NewGame_skill(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_plot") ; err != nil { + return nil, err + } + if tables.plot, err = NewGame_plot(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_language") ; err != nil { + return nil, err + } + if tables.language, err = NewGame_language(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_extservers") ; err != nil { + return nil, err + } + if tables.extservers, err = NewGame_extservers(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_skillatk") ; err != nil { + return nil, err + } + if tables.skillAtk, err = NewGame_skillAtk(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_skillafteratk") ; err != nil { + return nil, err + } + if tables.skillAfteratk, err = NewGame_skillAfteratk(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_skillbuff") ; err != nil { + return nil, err + } + if tables.skillBuff, err = NewGame_skillBuff(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_skillpassive") ; err != nil { + return nil, err + } + if tables.skillPassive, err = NewGame_skillPassive(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_newhero") ; err != nil { + return nil, err + } + if tables.newHero, err = NewGame_newHero(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_herostargrow") ; err != nil { + return nil, err + } + if tables.heroStargrow, err = NewGame_heroStargrow(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_herolevelgrow") ; err != nil { + return nil, err + } + if tables.heroLevelgrow, err = NewGame_heroLevelgrow(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_herostarup") ; err != nil { + return nil, err + } + if tables.heroStarup, err = NewGame_heroStarup(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_herolevelup") ; err != nil { + return nil, err + } + if tables.heroLevelup, err = NewGame_heroLevelup(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_equip") ; err != nil { + return nil, err + } + if tables.equip, err = NewGame_equip(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_equipattrlibrary") ; err != nil { + return nil, err + } + if tables.equipAttrlibrary, err = NewGame_equipAttrlibrary(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_equipsuit") ; err != nil { + return nil, err + } + if tables.equipSuit, err = NewGame_equipSuit(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_equipintensify") ; err != nil { + return nil, err + } + if tables.equipIntensify, err = NewGame_equipIntensify(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_item") ; err != nil { + return nil, err + } + if tables.item, err = NewGame_item(buf) ; err != nil { + return nil, err + } + return tables, nil } diff --git a/sys/configure/structs/game.atn.go b/sys/configure/structs/game.atn.go index d8352cb10..67a89b5b5 100644 --- a/sys/configure/structs/game.atn.go +++ b/sys/configure/structs/game.atn.go @@ -1,3 +1,4 @@ + //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -10,39 +11,19 @@ package cfg import "errors" type Game_atn struct { - A string - T string - N int32 + A string + T string + N int32 } func (Game_atn) GetTypeId() int { - return -1770297697 + return -1770297697 } func NewGame_atn(_buf map[string]interface{}) (_v *Game_atn, err error) { - _v = &Game_atn{} - { - var _ok_ bool - if _v.A, _ok_ = _buf["a"].(string); !_ok_ { - err = errors.New("a error") - return - } - } - { - var _ok_ bool - if _v.T, _ok_ = _buf["t"].(string); !_ok_ { - err = errors.New("t error") - return - } - } - { - var _ok_ bool - var _tempNum_ float64 - if _tempNum_, _ok_ = _buf["n"].(float64); !_ok_ { - err = errors.New("n error") - return - } - _v.N = int32(_tempNum_) - } - return + _v = &Game_atn{} + { var _ok_ bool; if _v.A, _ok_ = _buf["a"].(string); !_ok_ { err = errors.New("a error"); return } } + { var _ok_ bool; if _v.T, _ok_ = _buf["t"].(string); !_ok_ { err = errors.New("t error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["n"].(float64); !_ok_ { err = errors.New("n error"); return }; _v.N = int32(_tempNum_) } + return } diff --git a/sys/configure/structs/game.equipAttrlibraryData.go b/sys/configure/structs/game.equipAttrlibraryData.go index bad8e3c2e..9d8ac77f4 100644 --- a/sys/configure/structs/game.equipAttrlibraryData.go +++ b/sys/configure/structs/game.equipAttrlibraryData.go @@ -15,6 +15,7 @@ type Game_equipAttrlibraryData struct { Libraryid int32 Attr []string Probability int32 + Addition []int32 } func (Game_equipAttrlibraryData) GetTypeId() int { @@ -40,5 +41,19 @@ func NewGame_equipAttrlibraryData(_buf map[string]interface{}) (_v *Game_equipAt } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["Addition"].([]interface{}); !_ok_ { err = errors.New("Addition error"); return } + + _v.Addition = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Addition = append(_v.Addition, _list_v_) + } + } + return } diff --git a/sys/configure/structs/game.equipSuitData.go b/sys/configure/structs/game.equipSuitData.go index ca7a39602..dc1e8c638 100644 --- a/sys/configure/structs/game.equipSuitData.go +++ b/sys/configure/structs/game.equipSuitData.go @@ -14,6 +14,7 @@ type Game_equipSuitData struct { Suittype int32 Suitnum int32 Skill int32 + Skillintr string } func (Game_equipSuitData) GetTypeId() int { @@ -25,5 +26,6 @@ func NewGame_equipSuitData(_buf map[string]interface{}) (_v *Game_equipSuitData, { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suitnum"].(float64); !_ok_ { err = errors.New("suitnum error"); return }; _v.Suitnum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill"].(float64); !_ok_ { err = errors.New("skill error"); return }; _v.Skill = int32(_tempNum_) } + { var _ok_ bool; if _v.Skillintr, _ok_ = _buf["skillintr"].(string); !_ok_ { err = errors.New("skillintr error"); return } } return } diff --git a/sys/configure/structs/game.heroLevelupData.go b/sys/configure/structs/game.heroLevelupData.go index eb0971988..bb6c7eb65 100644 --- a/sys/configure/structs/game.heroLevelupData.go +++ b/sys/configure/structs/game.heroLevelupData.go @@ -12,7 +12,8 @@ import "errors" type Game_heroLevelupData struct { Level int32 - Heroexp int32 + Heroexp []*Game_atn + Gold []*Game_atn Hp float32 Atk float32 Def float32 @@ -25,7 +26,34 @@ func (Game_heroLevelupData) GetTypeId() int { func NewGame_heroLevelupData(_buf map[string]interface{}) (_v *Game_heroLevelupData, err error) { _v = &Game_heroLevelupData{} { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["heroexp"].([]interface{}); !_ok_ { err = errors.New("heroexp error"); return } + + _v.Heroexp = make([]*Game_atn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Game_atn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } } + _v.Heroexp = append(_v.Heroexp, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["gold"].([]interface{}); !_ok_ { err = errors.New("gold error"); return } + + _v.Gold = make([]*Game_atn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Game_atn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } } + _v.Gold = append(_v.Gold, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["def"].(float64); !_ok_ { err = errors.New("def error"); return }; _v.Def = float32(_tempNum_) } diff --git a/sys/configure/structs/game.heroStargrow.go b/sys/configure/structs/game.heroStargrow.go index ea1ee30fa..07a977d12 100644 --- a/sys/configure/structs/game.heroStargrow.go +++ b/sys/configure/structs/game.heroStargrow.go @@ -21,7 +21,7 @@ func NewGame_heroStargrow(_buf []map[string]interface{}) (*Game_heroStargrow, er return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Color] = _v + dataMap[_v.Star] = _v } } return &Game_heroStargrow{_dataList:_dataList, _dataMap:dataMap}, nil diff --git a/sys/configure/structs/game.heroStargrowData.go b/sys/configure/structs/game.heroStargrowData.go index 6055e695e..e76aa6b09 100644 --- a/sys/configure/structs/game.heroStargrowData.go +++ b/sys/configure/structs/game.heroStargrowData.go @@ -11,7 +11,8 @@ package cfg import "errors" type Game_heroStargrowData struct { - Color int32 + Star int32 + Level int32 StarupHp float32 StarupAtk float32 StarupDef float32 @@ -24,7 +25,8 @@ func (Game_heroStargrowData) GetTypeId() int { func NewGame_heroStargrowData(_buf map[string]interface{}) (_v *Game_heroStargrowData, err error) { _v = &Game_heroStargrowData{} - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_hp"].(float64); !_ok_ { err = errors.New("starup_hp error"); return }; _v.StarupHp = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_atk"].(float64); !_ok_ { err = errors.New("starup_atk error"); return }; _v.StarupAtk = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_def"].(float64); !_ok_ { err = errors.New("starup_def error"); return }; _v.StarupDef = float32(_tempNum_) } diff --git a/sys/configure/structs/game.heroStarupData.go b/sys/configure/structs/game.heroStarupData.go index b963b7c25..4d3ee0549 100644 --- a/sys/configure/structs/game.heroStarupData.go +++ b/sys/configure/structs/game.heroStarupData.go @@ -21,6 +21,7 @@ type Game_heroStarupData struct { Needrace []int32 Needracestar int32 Needracenum int32 + Gold int32 } func (Game_heroStarupData) GetTypeId() int { @@ -52,5 +53,6 @@ func NewGame_heroStarupData(_buf map[string]interface{}) (_v *Game_heroStarupDat { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needracestar"].(float64); !_ok_ { err = errors.New("needracestar error"); return }; _v.Needracestar = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needracenum"].(float64); !_ok_ { err = errors.New("needracenum error"); return }; _v.Needracenum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gold"].(float64); !_ok_ { err = errors.New("gold error"); return }; _v.Gold = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.newHero.go b/sys/configure/structs/game.newHero.go index dec18c06c..ddcd1117a 100644 --- a/sys/configure/structs/game.newHero.go +++ b/sys/configure/structs/game.newHero.go @@ -21,7 +21,7 @@ func NewGame_newHero(_buf []map[string]interface{}) (*Game_newHero, error) { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v + dataMap[_v.Hid] = _v } } return &Game_newHero{_dataList:_dataList, _dataMap:dataMap}, nil diff --git a/sys/configure/structs/game.newHeroData.go b/sys/configure/structs/game.newHeroData.go index 35848c0b8..c69185f07 100644 --- a/sys/configure/structs/game.newHeroData.go +++ b/sys/configure/structs/game.newHeroData.go @@ -12,7 +12,7 @@ import "errors" import "bright/math" type Game_newHeroData struct { - Id int32 + Hid int32 Name string Star int32 Color int32 @@ -40,7 +40,7 @@ func (Game_newHeroData) GetTypeId() int { func NewGame_newHeroData(_buf map[string]interface{}) (_v *Game_newHeroData, err error) { _v = &Game_newHeroData{} - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hid"].(float64); !_ok_ { err = errors.New("hid error"); return }; _v.Hid = int32(_tempNum_) } { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } diff --git a/sys/configure/structs/game.skillAfteratkData.go b/sys/configure/structs/game.skillAfteratkData.go index e98532e36..3f8f86d19 100644 --- a/sys/configure/structs/game.skillAfteratkData.go +++ b/sys/configure/structs/game.skillAfteratkData.go @@ -13,7 +13,10 @@ import "errors" type Game_skillAfteratkData struct { Id int32 Desc string - Target string + From int32 + Limit int32 + Where []string + Order []string EmitPR int32 Type string Argu []string @@ -32,7 +35,36 @@ func NewGame_skillAfteratkData(_buf map[string]interface{}) (_v *Game_skillAfter _v = &Game_skillAfteratkData{} { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; if _v.Desc, _ok_ = _buf["Desc"].(string); !_ok_ { err = errors.New("Desc error"); return } } - { var _ok_ bool; if _v.Target, _ok_ = _buf["Target"].(string); !_ok_ { err = errors.New("Target error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["From"].(float64); !_ok_ { err = errors.New("From error"); return }; _v.From = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Limit"].(float64); !_ok_ { err = errors.New("Limit error"); return }; _v.Limit = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["Where"].([]interface{}); !_ok_ { err = errors.New("Where error"); return } + + _v.Where = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Where = append(_v.Where, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["Order"].([]interface{}); !_ok_ { err = errors.New("Order error"); return } + + _v.Order = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Order = append(_v.Order, _list_v_) + } + } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EmitPR"].(float64); !_ok_ { err = errors.New("EmitPR error"); return }; _v.EmitPR = int32(_tempNum_) } { var _ok_ bool; if _v.Type, _ok_ = _buf["Type"].(string); !_ok_ { err = errors.New("Type error"); return } } {