keb/poketest
1
0
Fork 0
Code Issues Releases Activity

Adding 3 new 9G monsters

Browse Source
This commit is contained in:
Théo Marchal 2022-10-17 23:39:00 +02:00
parent 109334f441
commit c3f84ab2ab
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flashdex.js
View File

@ -9,10 +9,10 @@ $(document).ready(function()
var G6 = [650, 721];
var G7 = [722, 809];
var G8 = [810, 905];
var G9 = [906, 920];
var MEGA = [921, 970];
var GIGA = [971, 1002];
var REG = [1003, 1055];
var G9 = [906, 923];
var MEGA = [924, 973];
var GIGA = [974, 1005];
var REG = [1006, 1058];
var EXCEPTION = 990; // urshifu g-max
@ -95,7 +95,7 @@ $(document).ready(function()
function getFormattedNumber(num)
{
if (num > 905 && num < 921) // 9G temporary numbers
if (num > 905 && num < 924) // 9G temporary numbers
return "???";
if (num[0] == 'M' || num[0] == 'R' || num[0] == 'G')
return num.substring(1, num.length);

2
pokemon

@ -1 +1 @@
Subproject commit 6f4c80d56010359dbb9c30bc70c140878d5cac68
Subproject commit ed382c773327cef52c6f98fd794bcc55496e8d39

7
pokemon.json
View File

@ -916,8 +916,11 @@
{ "num": 916, "fr": "Craparoi", "en": "Klawf", "ja": "ガケガニ", "romaji": "Gakegani", "de": "Klibbe", "kr": "절벼게", "cn": "毛崖蟹", "cs": "毛崖蟹", "origin": "9G", "type": [ "Rock" ] },
{ "num": 917, "fr": "Carmadura", "en": "Armarouge", "ja": "グレンアルマ", "romaji": "Gurenaruma", "de": "Crimanzo", "kr": "카디나르마", "cn": "紅蓮鎧騎", "cs": "红莲铠骑", "origin": "9G", "type": [ "Fire", "Psychic" ] },
{ "num": 918, "fr": "Malvalame", "en": "Ceruledge", "ja": "ソウブレイズ", "romaji": "Soubureizu", "de": "Azugladis", "kr": "파라블레이즈", "cn": "蒼炎刃鬼", "cs": "苍炎刃鬼", "origin": "9G", "type": [ "Fire", "Ghost" ] },
{ "num": 919, "fr": "Koraidon", "en": "Koraidon", "ja": "コライドン", "romaji": "Koraidon", "de": "Koraidon", "kr": "코라이돈", "cn": "故勒頓", "cs": "故勒顿", "origin": "9G", "type": [ "" ] },
{ "num": 920, "fr": "Miraidon", "en": "Miraidon", "ja": "ミライドン", "romaji": "Miraidon", "de": "Miraidon", "kr": "미라이돈", "cn": "密勒頓", "cs": "密勒顿", "origin": "9G", "type": [ "" ] },
{ "num": 919, "fr": "Taupikeau", "en": "Wiglett", "ja": "ウミディグダ", "romaji": "Umidiguda", "de": "Schligda", "kr": "바다그다", "cn": "海地鼠", "cs": "海地鼠", "origin": "9G", "type": [ "Water" ] },
{ "num": 920, "fr": "Farigiraf", "en": "Farigiraf", "ja": "リキキリン", "romaji": "Rikikirin", "de": "Farigiraf", "kr": "키키링", "cn": "奇麒麟", "cs": "奇麒麟", "origin": "9G", "type": [ "Normal", "Psychic" ] },
{ "num": 921, "fr": "Ampibidou", "en": "Bellibolt", "ja": "ハラバリー", "romaji": "Harabarī", "de": "Wampitz", "kr": "찌리배리", "cn": "電肚蛙", "cs": "电肚蛙", "origin": "9G", "type": [ "Electric" ] },
{ "num": 922, "fr": "Koraidon", "en": "Koraidon", "ja": "コライドン", "romaji": "Koraidon", "de": "Koraidon", "kr": "코라이돈", "cn": "故勒頓", "cs": "故勒顿", "origin": "9G", "type": [ "" ] },
{ "num": 923, "fr": "Miraidon", "en": "Miraidon", "ja": "ミライドン", "romaji": "Miraidon", "de": "Miraidon", "kr": "미라이돈", "cn": "密勒頓", "cs": "密勒顿", "origin": "9G", "type": [ "" ] },
{ "num": "M3", "fr": "Méga-Florizarre", "en": "Mega Venusaur", "ja": "メガ フシギバナ", "romaji": "Mega Fushigibana", "de": "Mega-Bisaflor", "kr": "메가이상해꽃", "cn": "超級妙蛙花", "cs": "超级妙蛙花", "form": "mega", "type": [ "Grass", "Poison" ] },
{ "num": "M6X", "fr": "Méga-Dracaufeu X", "en": "Mega Charizard X", "ja": "メガ リザードン X", "romaji": "Mega Lizardon X", "de": "Mega-Glurak X", "kr": "메가리자몽 X", "cn": "超級噴火龍X", "cs": "超级喷火龙X", "form": "mega", "type": [ "Fire", "Dragon" ] },
{ "num": "M6Y", "fr": "Méga-Dracaufeu Y", "en": "Mega Charizard Y", "ja": "メガ リザードン Y", "romaji": "Mega Lizardon Y", "de": "Mega-Glurak Y", "kr": "메가리자몽 Y", "cn": "超級噴火龍Y", "cs": "超级喷火龙Y", "form": "mega", "type": [ "Fire", "Flying" ] },

8
poketest.js
View File

@ -29,10 +29,10 @@ $(document).ready(function() {
var G6 = [650, 721];
var G7 = [722, 809];
var G8 = [810, 905];
var G9 = [906, 920];
var MEGA = [921, 970];
var GIGA = [971, 1002];
var REG = [1003, 1055];
var G9 = [906, 923];
var MEGA = [924, 973];
var GIGA = [974, 1005];
var REG = [1006, 1058];
var gen_number = 9;
var extra_number = 3; // mega, giga, reg