diff --git a/backend/src/app/seeds/data/black-2.json b/backend/src/app/seeds/data/black-2.json index 2003343..1f28cd6 100644 --- a/backend/src/app/seeds/data/black-2.json +++ b/backend/src/app/seeds/data/black-2.json @@ -2005,6 +2005,20 @@ } ] }, + { + "name": "Dragonspiral Tower (2F)", + "order": 40, + "encounters": [ + { + "pokeapi_id": 623, + "pokemon_name": "Golurk", + "method": "walk", + "encounter_rate": 100, + "min_level": 55, + "max_level": 58 + } + ] + }, { "name": "Dragonspiral Tower (Entrance)", "order": 40, @@ -2058,20 +2072,6 @@ "max_level": 58 } ] - }, - { - "name": "Dragonspiral Tower (2F)", - "order": 40, - "encounters": [ - { - "pokeapi_id": 623, - "pokemon_name": "Golurk", - "method": "walk", - "encounter_rate": 100, - "min_level": 55, - "max_level": 58 - } - ] } ] }, diff --git a/backend/src/app/seeds/data/black.json b/backend/src/app/seeds/data/black.json index f89390f..42128ff 100644 --- a/backend/src/app/seeds/data/black.json +++ b/backend/src/app/seeds/data/black.json @@ -1965,20 +1965,6 @@ } ] }, - { - "name": "Dragonspiral Tower (2F)", - "order": 44, - "encounters": [ - { - "pokeapi_id": 622, - "pokemon_name": "Golett", - "method": "walk", - "encounter_rate": 100, - "min_level": 30, - "max_level": 33 - } - ] - }, { "name": "Dragonspiral Tower (Entrance)", "order": 44, @@ -2032,6 +2018,20 @@ "max_level": 33 } ] + }, + { + "name": "Dragonspiral Tower (2F)", + "order": 44, + "encounters": [ + { + "pokeapi_id": 622, + "pokemon_name": "Golett", + "method": "walk", + "encounter_rate": 100, + "min_level": 30, + "max_level": 33 + } + ] } ] }, @@ -2192,44 +2192,6 @@ } ] }, - { - "name": "Victory Road (4F Middle Room)", - "order": 50, - "encounters": [ - { - "pokeapi_id": 632, - "pokemon_name": "Durant", - "method": "walk", - "encounter_rate": 40, - "min_level": 39, - "max_level": 42 - }, - { - "pokeapi_id": 525, - "pokemon_name": "Boldore", - "method": "walk", - "encounter_rate": 30, - "min_level": 39, - "max_level": 41 - }, - { - "pokeapi_id": 527, - "pokemon_name": "Woobat", - "method": "walk", - "encounter_rate": 20, - "min_level": 39, - "max_level": 42 - }, - { - "pokeapi_id": 619, - "pokemon_name": "Mienfoo", - "method": "walk", - "encounter_rate": 10, - "min_level": 41, - "max_level": 41 - } - ] - }, { "name": "Victory Road (Unknown Area 54)", "order": 50, @@ -2268,6 +2230,44 @@ } ] }, + { + "name": "Victory Road (4F Middle Room)", + "order": 50, + "encounters": [ + { + "pokeapi_id": 632, + "pokemon_name": "Durant", + "method": "walk", + "encounter_rate": 40, + "min_level": 39, + "max_level": 42 + }, + { + "pokeapi_id": 525, + "pokemon_name": "Boldore", + "method": "walk", + "encounter_rate": 30, + "min_level": 39, + "max_level": 41 + }, + { + "pokeapi_id": 527, + "pokemon_name": "Woobat", + "method": "walk", + "encounter_rate": 20, + "min_level": 39, + "max_level": 42 + }, + { + "pokeapi_id": 619, + "pokemon_name": "Mienfoo", + "method": "walk", + "encounter_rate": 10, + "min_level": 41, + "max_level": 41 + } + ] + }, { "name": "Victory Road (Unknown Area 55)", "order": 51, diff --git a/backend/src/app/seeds/data/omega-ruby-bosses.json b/backend/src/app/seeds/data/omega-ruby-bosses.json new file mode 100644 index 0000000..2ee2f46 --- /dev/null +++ b/backend/src/app/seeds/data/omega-ruby-bosses.json @@ -0,0 +1,16 @@ +[ + { + "name": "Wattson", + "boss_type": "gym_leader", + "specialty_type": "electric", + "badge_name": "Dynamo Badge", + "badge_image_url": "/badges/dynamo-badge.png", + "level_cap": 15, + "order": 1, + "after_route_name": "Rustboro City", + "location": "Mauville Gym", + "section": "Main Story", + "sprite_url": "/boss-sprites/omega-ruby/wattson.png", + "pokemon": [] + } +] diff --git a/backend/src/app/seeds/data/platinum.json b/backend/src/app/seeds/data/platinum.json index 588593b..2900bde 100644 --- a/backend/src/app/seeds/data/platinum.json +++ b/backend/src/app/seeds/data/platinum.json @@ -1797,6 +1797,76 @@ } ] }, + { + "name": "Mt Coronet (1F Route 216)", + "order": 23, + "encounters": [ + { + "pokeapi_id": 75, + "pokemon_name": "Graveler", + "method": "walk", + "encounter_rate": 30, + "min_level": 32, + "max_level": 34 + }, + { + "pokeapi_id": 307, + "pokemon_name": "Meditite", + "method": "walk", + "encounter_rate": 30, + "min_level": 33, + "max_level": 35 + }, + { + "pokeapi_id": 436, + "pokemon_name": "Bronzor", + "method": "walk", + "encounter_rate": 20, + "min_level": 33, + "max_level": 33 + }, + { + "pokeapi_id": 35, + "pokemon_name": "Clefairy", + "method": "walk", + "encounter_rate": 20, + "min_level": 32, + "max_level": 32 + }, + { + "pokeapi_id": 42, + "pokemon_name": "Golbat", + "method": "walk", + "encounter_rate": 15, + "min_level": 33, + "max_level": 34 + }, + { + "pokeapi_id": 433, + "pokemon_name": "Chingling", + "method": "walk", + "encounter_rate": 10, + "min_level": 32, + "max_level": 34 + }, + { + "pokeapi_id": 67, + "pokemon_name": "Machoke", + "method": "walk", + "encounter_rate": 10, + "min_level": 35, + "max_level": 35 + }, + { + "pokeapi_id": 299, + "pokemon_name": "Nosepass", + "method": "walk", + "encounter_rate": 5, + "min_level": 33, + "max_level": 33 + } + ] + }, { "name": "Mt Coronet (Exterior Blizzard)", "order": 23, @@ -1899,76 +1969,6 @@ } ] }, - { - "name": "Mt Coronet (1F Route 216)", - "order": 23, - "encounters": [ - { - "pokeapi_id": 75, - "pokemon_name": "Graveler", - "method": "walk", - "encounter_rate": 30, - "min_level": 32, - "max_level": 34 - }, - { - "pokeapi_id": 307, - "pokemon_name": "Meditite", - "method": "walk", - "encounter_rate": 30, - "min_level": 33, - "max_level": 35 - }, - { - "pokeapi_id": 436, - "pokemon_name": "Bronzor", - "method": "walk", - "encounter_rate": 20, - "min_level": 33, - "max_level": 33 - }, - { - "pokeapi_id": 35, - "pokemon_name": "Clefairy", - "method": "walk", - "encounter_rate": 20, - "min_level": 32, - "max_level": 32 - }, - { - "pokeapi_id": 42, - "pokemon_name": "Golbat", - "method": "walk", - "encounter_rate": 15, - "min_level": 33, - "max_level": 34 - }, - { - "pokeapi_id": 433, - "pokemon_name": "Chingling", - "method": "walk", - "encounter_rate": 10, - "min_level": 32, - "max_level": 34 - }, - { - "pokeapi_id": 67, - "pokemon_name": "Machoke", - "method": "walk", - "encounter_rate": 10, - "min_level": 35, - "max_level": 35 - }, - { - "pokeapi_id": 299, - "pokemon_name": "Nosepass", - "method": "walk", - "encounter_rate": 5, - "min_level": 33, - "max_level": 33 - } - ] - }, { "name": "Mt Coronet (1F Route 211)", "order": 24, @@ -3396,6 +3396,60 @@ } ] }, + { + "name": "Victory Road (Inside Exit)", + "order": 55, + "encounters": [ + { + "pokeapi_id": 75, + "pokemon_name": "Graveler", + "method": "walk", + "encounter_rate": 40, + "min_level": 47, + "max_level": 49 + }, + { + "pokeapi_id": 419, + "pokemon_name": "Floatzel", + "method": "walk", + "encounter_rate": 35, + "min_level": 47, + "max_level": 49 + }, + { + "pokeapi_id": 95, + "pokemon_name": "Onix", + "method": "walk", + "encounter_rate": 20, + "min_level": 48, + "max_level": 50 + }, + { + "pokeapi_id": 42, + "pokemon_name": "Golbat", + "method": "walk", + "encounter_rate": 15, + "min_level": 49, + "max_level": 49 + }, + { + "pokeapi_id": 444, + "pokemon_name": "Gabite", + "method": "walk", + "encounter_rate": 5, + "min_level": 50, + "max_level": 50 + }, + { + "pokeapi_id": 208, + "pokemon_name": "Steelix", + "method": "walk", + "encounter_rate": 5, + "min_level": 50, + "max_level": 50 + } + ] + }, { "name": "Victory Road (B1F)", "order": 55, @@ -3498,60 +3552,6 @@ } ] }, - { - "name": "Victory Road (Inside Exit)", - "order": 55, - "encounters": [ - { - "pokeapi_id": 75, - "pokemon_name": "Graveler", - "method": "walk", - "encounter_rate": 40, - "min_level": 47, - "max_level": 49 - }, - { - "pokeapi_id": 419, - "pokemon_name": "Floatzel", - "method": "walk", - "encounter_rate": 35, - "min_level": 47, - "max_level": 49 - }, - { - "pokeapi_id": 95, - "pokemon_name": "Onix", - "method": "walk", - "encounter_rate": 20, - "min_level": 48, - "max_level": 50 - }, - { - "pokeapi_id": 42, - "pokemon_name": "Golbat", - "method": "walk", - "encounter_rate": 15, - "min_level": 49, - "max_level": 49 - }, - { - "pokeapi_id": 444, - "pokemon_name": "Gabite", - "method": "walk", - "encounter_rate": 5, - "min_level": 50, - "max_level": 50 - }, - { - "pokeapi_id": 208, - "pokemon_name": "Steelix", - "method": "walk", - "encounter_rate": 5, - "min_level": 50, - "max_level": 50 - } - ] - }, { "name": "Victory Road (Inside B1F)", "order": 56, @@ -5394,20 +5394,6 @@ } ] }, - { - "name": "Old Chateau (2F Leftmost Room)", - "order": 102, - "encounters": [ - { - "pokeapi_id": 92, - "pokemon_name": "Gastly", - "method": "walk", - "encounter_rate": 100, - "min_level": 14, - "max_level": 17 - } - ] - }, { "name": "Old Chateau (Entrance)", "order": 102, @@ -5423,8 +5409,8 @@ ] }, { - "name": "Old Chateau (2F Left Room)", - "order": 103, + "name": "Old Chateau (2F Leftmost Room)", + "order": 102, "encounters": [ { "pokeapi_id": 92, @@ -5450,6 +5436,20 @@ } ] }, + { + "name": "Old Chateau (2F Left Room)", + "order": 103, + "encounters": [ + { + "pokeapi_id": 92, + "pokemon_name": "Gastly", + "method": "walk", + "encounter_rate": 100, + "min_level": 14, + "max_level": 17 + } + ] + }, { "name": "Old Chateau (2F Middle Room)", "order": 104, diff --git a/backend/src/app/seeds/data/white-2.json b/backend/src/app/seeds/data/white-2.json index f534242..8949e92 100644 --- a/backend/src/app/seeds/data/white-2.json +++ b/backend/src/app/seeds/data/white-2.json @@ -2005,6 +2005,20 @@ } ] }, + { + "name": "Dragonspiral Tower (2F)", + "order": 40, + "encounters": [ + { + "pokeapi_id": 623, + "pokemon_name": "Golurk", + "method": "walk", + "encounter_rate": 100, + "min_level": 55, + "max_level": 58 + } + ] + }, { "name": "Dragonspiral Tower (Entrance)", "order": 40, @@ -2058,20 +2072,6 @@ "max_level": 58 } ] - }, - { - "name": "Dragonspiral Tower (2F)", - "order": 40, - "encounters": [ - { - "pokeapi_id": 623, - "pokemon_name": "Golurk", - "method": "walk", - "encounter_rate": 100, - "min_level": 55, - "max_level": 58 - } - ] } ] }, diff --git a/backend/src/app/seeds/data/white.json b/backend/src/app/seeds/data/white.json index fb85eb4..a8cf543 100644 --- a/backend/src/app/seeds/data/white.json +++ b/backend/src/app/seeds/data/white.json @@ -1965,20 +1965,6 @@ } ] }, - { - "name": "Dragonspiral Tower (2F)", - "order": 44, - "encounters": [ - { - "pokeapi_id": 622, - "pokemon_name": "Golett", - "method": "walk", - "encounter_rate": 100, - "min_level": 30, - "max_level": 33 - } - ] - }, { "name": "Dragonspiral Tower (Entrance)", "order": 44, @@ -2032,6 +2018,20 @@ "max_level": 33 } ] + }, + { + "name": "Dragonspiral Tower (2F)", + "order": 44, + "encounters": [ + { + "pokeapi_id": 622, + "pokemon_name": "Golett", + "method": "walk", + "encounter_rate": 100, + "min_level": 30, + "max_level": 33 + } + ] } ] }, @@ -2192,44 +2192,6 @@ } ] }, - { - "name": "Victory Road (4F Middle Room)", - "order": 50, - "encounters": [ - { - "pokeapi_id": 632, - "pokemon_name": "Durant", - "method": "walk", - "encounter_rate": 40, - "min_level": 39, - "max_level": 42 - }, - { - "pokeapi_id": 525, - "pokemon_name": "Boldore", - "method": "walk", - "encounter_rate": 30, - "min_level": 39, - "max_level": 41 - }, - { - "pokeapi_id": 527, - "pokemon_name": "Woobat", - "method": "walk", - "encounter_rate": 20, - "min_level": 39, - "max_level": 42 - }, - { - "pokeapi_id": 619, - "pokemon_name": "Mienfoo", - "method": "walk", - "encounter_rate": 10, - "min_level": 41, - "max_level": 41 - } - ] - }, { "name": "Victory Road (Unknown Area 54)", "order": 50, @@ -2268,6 +2230,44 @@ } ] }, + { + "name": "Victory Road (4F Middle Room)", + "order": 50, + "encounters": [ + { + "pokeapi_id": 632, + "pokemon_name": "Durant", + "method": "walk", + "encounter_rate": 40, + "min_level": 39, + "max_level": 42 + }, + { + "pokeapi_id": 525, + "pokemon_name": "Boldore", + "method": "walk", + "encounter_rate": 30, + "min_level": 39, + "max_level": 41 + }, + { + "pokeapi_id": 527, + "pokemon_name": "Woobat", + "method": "walk", + "encounter_rate": 20, + "min_level": 39, + "max_level": 42 + }, + { + "pokeapi_id": 619, + "pokemon_name": "Mienfoo", + "method": "walk", + "encounter_rate": 10, + "min_level": 41, + "max_level": 41 + } + ] + }, { "name": "Victory Road (Unknown Area 55)", "order": 51, diff --git a/frontend/public/boss-sprites/omega-ruby/wattson.png b/frontend/public/boss-sprites/omega-ruby/wattson.png new file mode 100644 index 0000000..6fef85b Binary files /dev/null and b/frontend/public/boss-sprites/omega-ruby/wattson.png differ diff --git a/frontend/public/boss-sprites/ruby/flannery.png b/frontend/public/boss-sprites/ruby/flannery.png index af106db..9648bd3 100644 Binary files a/frontend/public/boss-sprites/ruby/flannery.png and b/frontend/public/boss-sprites/ruby/flannery.png differ diff --git a/frontend/public/boss-sprites/ruby/norman.png b/frontend/public/boss-sprites/ruby/norman.png index 1d1c04a..80d9ca0 100644 Binary files a/frontend/public/boss-sprites/ruby/norman.png and b/frontend/public/boss-sprites/ruby/norman.png differ diff --git a/frontend/public/boss-sprites/ruby/tate--lisa.png b/frontend/public/boss-sprites/ruby/tate--lisa.png index a25d13b..b4948e9 100644 Binary files a/frontend/public/boss-sprites/ruby/tate--lisa.png and b/frontend/public/boss-sprites/ruby/tate--lisa.png differ diff --git a/frontend/public/boss-sprites/ruby/wallace.png b/frontend/public/boss-sprites/ruby/wallace.png index 815a93d..d4fe2ff 100644 Binary files a/frontend/public/boss-sprites/ruby/wallace.png and b/frontend/public/boss-sprites/ruby/wallace.png differ diff --git a/frontend/public/boss-sprites/ruby/wattson.png b/frontend/public/boss-sprites/ruby/wattson.png index ad19d27..331741f 100644 Binary files a/frontend/public/boss-sprites/ruby/wattson.png and b/frontend/public/boss-sprites/ruby/wattson.png differ diff --git a/frontend/public/boss-sprites/ruby/winona.png b/frontend/public/boss-sprites/ruby/winona.png index 6fa69b2..9bb0004 100644 Binary files a/frontend/public/boss-sprites/ruby/winona.png and b/frontend/public/boss-sprites/ruby/winona.png differ