diff --git a/app/helpers/instance_helper.rb b/app/helpers/instance_helper.rb index 19cbc1b..1c5d39a 100644 --- a/app/helpers/instance_helper.rb +++ b/app/helpers/instance_helper.rb @@ -23,12 +23,14 @@ module InstanceHelper def get_map_x(zone) case zone when "anemos" then 1584 + when "pagos" then 1825 end end def get_map_y(zone) case zone when "anemos" then 1249 + when "pagos" then 1158 end end diff --git a/data/pagos.toml b/data/pagos.toml index fff082c..515dc0d 100644 --- a/data/pagos.toml +++ b/data/pagos.toml @@ -6,3 +6,242 @@ weather = [ ["thunder", 18], ["blizzards", 18] ] + +fairies = [ + { x = 538, y = 82, mx = 12.6, my = 10.6 }, + { x = 387, y = 166, mx = 9.4, my = 12.3 }, + { x = 259, y = 353, mx = 7.1, my = 15.9 }, + { x = 399, y = 463, mx = 9.9, my = 18.1 }, + { x = 489, y = 603, mx = 11.7, my = 21.0 }, + { x = 711, y = 284, mx = 16.1, my = 14.5 }, + { x = 831, y = 342, mx = 18.6, my = 15.8 }, + { x = 743, y = 515, mx = 16.7, my = 19.2 }, + { x = 747, y = 643, mx = 16.7, my = 21.8 }, + { x = 280, y = 674, mx = 7.6, my = 22.3 }, + { x = 847, y = 521, mx = 18.9, my = 19.1 }, + { x = 1010, y = 609, mx = 22.0, my = 21.1 }, + { x = 1072, y = 464, mx = 23.3, my = 18.2 }, + { x = 943, y = 295, mx = 20.7, my = 14.7 }, + { x = 1148, y = 393, mx = 24.8, my = 16.8 }, + { x = 1259, y = 509, mx = 27.0, my = 19.0 }, + { x = 1444, y = 402, mx = 30.7, my = 16.8 }, + { x = 1514, y = 420, mx = 32.2, my = 17.3 }, + { x = 1380, y = 573, mx = 29.6, my = 20.2 }, + { x = 1688, y = 319, mx = 35.7, my = 15.3 }, + { x = 1707, y = 359, mx = 35.9, my = 16.0 }, + { x = 320, y = 764, mx = 8.4, my = 24.1 }, + { x = 650, y = 780, mx = 14.9, my = 24.3 }, + { x = 511, y = 913, mx = 12.3, my = 27.2 }, + { x = 496, y = 997, mx = 11.8, my = 28.4 }, + { x = 679, y = 1035, mx = 15.5, my = 29.6 }, + { x = 764, y = 826, mx = 17.3, my = 25.5 }, + { x = 788, y = 1037, mx = 17.7, my = 29.5 }, + { x = 876, y = 1038, mx = 19.3, my = 29.7 }, + { x = 1009, y = 952, mx = 22.1, my = 27.9 }, + { x = 972, y = 831, mx = 21.3, my = 25.4 }, + { x = 1310, y = 913, mx = 28.0, my = 27.0 }, + { x = 1438, y = 1062, mx = 30.5, my = 30.1 }, + { x = 1415, y = 872, mx = 30.2, my = 26.2 }, + { x = 1489, y = 666, mx = 31.6, my = 22.0 }, + { x = 1269, y = 765, mx = 27.2, my = 24.1 } +] + +[[nms]] +name = "The Snow Queen" +level = 20 +element = "ice" +x = 21 +y = 26 +drops = "Yukinko (card)" + +[nms.spawned_by] +name = "Yukinko" +level = 25 + +[[nms]] +name = "Taxim" +level = 21 +element = "earth" +x = 25 +y = 28 + +[nms.spawned_by] +name = "Demon of the Incunable" +level = 26 +night_only = true + +[[nms]] +name = "Ash Dragon" +level = 22 +element = "fire" +x = 29 +y = 30 + +[nms.spawned_by] +name = "Blood Demon" +level = 27 + +[[nms]] +name = "Glavoid" +level = 23 +element = "earth" +x = 32 +y = 26 + +[nms.spawned_by] +name = "Val Worm" +level = 28 + +[[nms]] +name = "Anapos" +level = 24 +element = "water" +x = 34 +y = 21 + +[nms.spawned_by] +name = "Snowmelt Sprite" +level = 29 +weather = "fog" + +[[nms]] +name = "Hakutaku" +level = 25 +element = "fire" +x = 29 +y = 22 +drops = "Optical Hat" + +[nms.spawned_by] +name = "Blubber Eyes" +level = 30 + +[[nms]] +name = "King Igloo" +level = 26 +element = "ice" +x = 17 +y = 16 + +[nms.spawned_by] +name = "Huwasi" +level = 31 + +[[nms]] +name = "Asag" +level = 27 +element = "lightning" +x = 10 +y = 10 + +[nms.spawned_by] +name = "Wandering Opken" +level = 32 + +[[nms]] +name = "Surabhi" +level = 28 +element = "earth" +x = 10 +y = 20 + +[nms.spawned_by] +name = "Pagos Billygoat" +level = 33 + +[[nms]] +name = "King Arthro" +level = 29 +element = "water" +x = 8 +y = 15 +water = "fog" +drops = "Blitzring" + +[nms.spawned_by] +name = "Val Snipper" +level = 34 + +[[nms]] +name = "Mindertaur/Eldertaur" +level = 30 +element = "earth" +x = 13 +y = 18 + +[nms.spawned_by] +name = "Lab Minotaur" +level = 35 + +[[nms]] +name = "Holy Cow" +level = 31 +element = "water" +x = 26 +y = 16 + +[nms.spawned_by] +name = "Elder Buffalo" +level = 36 + +[[nms]] +name = "Hadhayosh" +level = 32 +element = "lightning" +x = 30 +y = 19 +drops = "Behemoth Horn/Pelt" +weather = "thunder" + +[nms.spawned_by] +name = "Lesser Void Dragon" +level = 37 + +[[nms]] +name = "Horus" +level = 33 +element = "fire" +x = 25 +y = 19 +weather = "heat" + +[nms.spawned_by] +name = "Void Vouivre" +level = 38 + +[[nms]] +name = "Arch Angra Mainyu" +level = 34 +element = "wind" +x = 24 +y = 25 + +[nms.spawned_by] +name = "Gawper" +level = 39 + +[[nms]] +name = "Copycat Cassie" +level = 35 +element = "ice" +x = 22 +y = 14 +drops = "Cassie Earring" +weather = "blizzards" + +[nms.spawned_by] +name = "Ameretat" +level = 40 + +[[nms]] +name = "Louhi" +level = 35 +element = "ice" +x = 36 +y = 19 +drops = "Louhi (card)" + +[nms.spawned_by] +name = "Val Corpse" +level = 40 +night_only = true diff --git a/lib/weather.rb b/lib/weather.rb index c09fe84..cd6c24f 100644 --- a/lib/weather.rb +++ b/lib/weather.rb @@ -9,7 +9,7 @@ class Weather end end - def self.forecast(zone, seed = get_seed, count = 10) + def self.forecast(zone, seed = get_seed, count = 20) res = [] prev_hash = hash(seed - 1) prev_weather = get_weather(zone, prev_hash) diff --git a/public/maps/pagos.jpg b/public/maps/pagos.jpg index 226e9d7..0c56196 100644 Binary files a/public/maps/pagos.jpg and b/public/maps/pagos.jpg differ diff --git a/public/weather/blizzards.png b/public/weather/blizzards.png new file mode 100644 index 0000000..8629159 Binary files /dev/null and b/public/weather/blizzards.png differ diff --git a/public/weather/heat.png b/public/weather/heat.png new file mode 100644 index 0000000..695b6ee Binary files /dev/null and b/public/weather/heat.png differ