From 9c0f7d9ef8d4d0da3e4b1e9036d9181a32c1304d Mon Sep 17 00:00:00 2001 From: Nighthawk Date: Thu, 8 Jun 2023 01:51:51 -0400 Subject: [PATCH] Project restructuring. --- .gitignore | 1 + LICENSE | 4 +- data/Yoda_Stories.tiled-session | 428 +++++++++++++++++++++--- data/combined_maps/dagobah/dagobah.tmx | 137 ++++++++ data/maps/0/{combined.png => 0.jpg} | Bin data/maps/1/{combined.png => 1.jpg} | Bin data/maps/10/{combined.png => 10.jpg} | Bin data/maps/100/{combined.png => 100.jpg} | Bin data/maps/101/{combined.png => 101.jpg} | Bin data/maps/102/{combined.png => 102.jpg} | Bin data/maps/103/{combined.png => 103.jpg} | Bin data/maps/104/{combined.png => 104.jpg} | Bin data/maps/105/{combined.png => 105.jpg} | Bin data/maps/106/{combined.png => 106.jpg} | Bin data/maps/107/{combined.png => 107.jpg} | Bin data/maps/108/{combined.png => 108.jpg} | Bin data/maps/109/{combined.png => 109.jpg} | Bin data/maps/11/{combined.png => 11.jpg} | Bin data/maps/110/{combined.png => 110.jpg} | Bin data/maps/111/{combined.png => 111.jpg} | Bin data/maps/112/{combined.png => 112.jpg} | Bin data/maps/113/{combined.png => 113.jpg} | Bin data/maps/114/{combined.png => 114.jpg} | Bin data/maps/115/{combined.png => 115.jpg} | Bin data/maps/116/{combined.png => 116.jpg} | Bin data/maps/117/{combined.png => 117.jpg} | Bin data/maps/118/{combined.png => 118.jpg} | Bin data/maps/119/{combined.png => 119.jpg} | Bin data/maps/12/{combined.png => 12.jpg} | Bin data/maps/120/{combined.png => 120.jpg} | Bin data/maps/121/{combined.png => 121.jpg} | Bin data/maps/122/{combined.png => 122.jpg} | Bin data/maps/123/{combined.png => 123.jpg} | Bin data/maps/124/{combined.png => 124.jpg} | Bin data/maps/125/{combined.png => 125.jpg} | Bin data/maps/126/{combined.png => 126.jpg} | Bin data/maps/127/{combined.png => 127.jpg} | Bin data/maps/128/{combined.png => 128.jpg} | Bin data/maps/129/{combined.png => 129.jpg} | Bin data/maps/13/{combined.png => 13.jpg} | Bin data/maps/130/{combined.png => 130.jpg} | Bin data/maps/131/{combined.png => 131.jpg} | Bin data/maps/132/{combined.png => 132.jpg} | Bin data/maps/133/{combined.png => 133.jpg} | Bin data/maps/134/{combined.png => 134.jpg} | Bin data/maps/135/{combined.png => 135.jpg} | Bin data/maps/136/{combined.png => 136.jpg} | Bin data/maps/137/{combined.png => 137.jpg} | Bin data/maps/138/{combined.png => 138.jpg} | Bin data/maps/139/{combined.png => 139.jpg} | Bin data/maps/14/{combined.png => 14.jpg} | Bin data/maps/140/{combined.png => 140.jpg} | Bin data/maps/141/{combined.png => 141.jpg} | Bin data/maps/142/{combined.png => 142.jpg} | Bin data/maps/143/{combined.png => 143.jpg} | Bin data/maps/144/{combined.png => 144.jpg} | Bin data/maps/145/{combined.png => 145.jpg} | Bin data/maps/146/{combined.png => 146.jpg} | Bin data/maps/147/{combined.png => 147.jpg} | Bin data/maps/148/{combined.png => 148.jpg} | Bin data/maps/149/{combined.png => 149.jpg} | Bin data/maps/15/{combined.png => 15.jpg} | Bin data/maps/150/{combined.png => 150.jpg} | Bin data/maps/151/{combined.png => 151.jpg} | Bin data/maps/152/{combined.png => 152.jpg} | Bin data/maps/153/{combined.png => 153.jpg} | Bin data/maps/154/{combined.png => 154.jpg} | Bin data/maps/155/{combined.png => 155.jpg} | Bin data/maps/156/{combined.png => 156.jpg} | Bin data/maps/157/{combined.png => 157.jpg} | Bin data/maps/158/{combined.png => 158.jpg} | Bin data/maps/159/{combined.png => 159.jpg} | Bin data/maps/16/{combined.png => 16.jpg} | Bin data/maps/160/{combined.png => 160.jpg} | Bin data/maps/161/{combined.png => 161.jpg} | Bin data/maps/162/{combined.png => 162.jpg} | Bin data/maps/163/{combined.png => 163.jpg} | Bin data/maps/164/{combined.png => 164.jpg} | Bin data/maps/165/{combined.png => 165.jpg} | Bin data/maps/166/{combined.png => 166.jpg} | Bin data/maps/167/{combined.png => 167.jpg} | Bin data/maps/168/{combined.png => 168.jpg} | Bin data/maps/169/{combined.png => 169.jpg} | Bin data/maps/17/{combined.png => 17.jpg} | Bin data/maps/170/{combined.png => 170.jpg} | Bin data/maps/171/{combined.png => 171.jpg} | Bin data/maps/172/{combined.png => 172.jpg} | Bin data/maps/173/{combined.png => 173.jpg} | Bin data/maps/174/{combined.png => 174.jpg} | Bin data/maps/175/{combined.png => 175.jpg} | Bin data/maps/176/{combined.png => 176.jpg} | Bin data/maps/177/{combined.png => 177.jpg} | Bin data/maps/178/{combined.png => 178.jpg} | Bin data/maps/179/{combined.png => 179.jpg} | Bin data/maps/18/{combined.png => 18.jpg} | Bin data/maps/180/{combined.png => 180.jpg} | Bin data/maps/181/{combined.png => 181.jpg} | Bin data/maps/182/{combined.png => 182.jpg} | Bin data/maps/183/{combined.png => 183.jpg} | Bin data/maps/184/{combined.png => 184.jpg} | Bin data/maps/185/{combined.png => 185.jpg} | Bin data/maps/186/{combined.png => 186.jpg} | Bin data/maps/187/{combined.png => 187.jpg} | Bin data/maps/188/{combined.png => 188.jpg} | Bin data/maps/189/{combined.png => 189.jpg} | Bin data/maps/19/{combined.png => 19.jpg} | Bin data/maps/190/{combined.png => 190.jpg} | Bin data/maps/191/{combined.png => 191.jpg} | Bin data/maps/192/{combined.png => 192.jpg} | Bin data/maps/193/{combined.png => 193.jpg} | Bin data/maps/194/{combined.png => 194.jpg} | Bin data/maps/195/{combined.png => 195.jpg} | Bin data/maps/196/{combined.png => 196.jpg} | Bin data/maps/197/{combined.png => 197.jpg} | Bin data/maps/198/{combined.png => 198.jpg} | Bin data/maps/199/{combined.png => 199.jpg} | Bin data/maps/2/{combined.png => 2.jpg} | Bin data/maps/20/{combined.png => 20.jpg} | Bin data/maps/200/{combined.png => 200.jpg} | Bin data/maps/201/{combined.png => 201.jpg} | Bin data/maps/202/{combined.png => 202.jpg} | Bin data/maps/203/{combined.png => 203.jpg} | Bin data/maps/204/{combined.png => 204.jpg} | Bin data/maps/205/{combined.png => 205.jpg} | Bin data/maps/206/{combined.png => 206.jpg} | Bin data/maps/207/{combined.png => 207.jpg} | Bin data/maps/208/{combined.png => 208.jpg} | Bin data/maps/209/{combined.png => 209.jpg} | Bin data/maps/21/{combined.png => 21.jpg} | Bin data/maps/210/{combined.png => 210.jpg} | Bin data/maps/211/{combined.png => 211.jpg} | Bin data/maps/212/{combined.png => 212.jpg} | Bin data/maps/213/{combined.png => 213.jpg} | Bin data/maps/214/{combined.png => 214.jpg} | Bin data/maps/215/{combined.png => 215.jpg} | Bin data/maps/216/{combined.png => 216.jpg} | Bin data/maps/217/{combined.png => 217.jpg} | Bin data/maps/218/{combined.png => 218.jpg} | Bin data/maps/219/{combined.png => 219.jpg} | Bin data/maps/22/{combined.png => 22.jpg} | Bin data/maps/220/{combined.png => 220.jpg} | Bin data/maps/221/{combined.png => 221.jpg} | Bin data/maps/222/{combined.png => 222.jpg} | Bin data/maps/223/{combined.png => 223.jpg} | Bin data/maps/224/{combined.png => 224.jpg} | Bin data/maps/225/{combined.png => 225.jpg} | Bin data/maps/226/{combined.png => 226.jpg} | Bin data/maps/227/{combined.png => 227.jpg} | Bin data/maps/228/{combined.png => 228.jpg} | Bin data/maps/229/{combined.png => 229.jpg} | Bin data/maps/23/{combined.png => 23.jpg} | Bin data/maps/230/{combined.png => 230.jpg} | Bin data/maps/231/{combined.png => 231.jpg} | Bin data/maps/232/{combined.png => 232.jpg} | Bin data/maps/233/{combined.png => 233.jpg} | Bin data/maps/234/{combined.png => 234.jpg} | Bin data/maps/235/{combined.png => 235.jpg} | Bin data/maps/236/{combined.png => 236.jpg} | Bin data/maps/237/{combined.png => 237.jpg} | Bin data/maps/238/{combined.png => 238.jpg} | Bin data/maps/239/{combined.png => 239.jpg} | Bin data/maps/24/{combined.png => 24.jpg} | Bin data/maps/240/{combined.png => 240.jpg} | Bin data/maps/241/{combined.png => 241.jpg} | Bin data/maps/242/{combined.png => 242.jpg} | Bin data/maps/243/{combined.png => 243.jpg} | Bin data/maps/244/{combined.png => 244.jpg} | Bin data/maps/245/{combined.png => 245.jpg} | Bin data/maps/246/{combined.png => 246.jpg} | Bin data/maps/247/{combined.png => 247.jpg} | Bin data/maps/248/{combined.png => 248.jpg} | Bin data/maps/249/{combined.png => 249.jpg} | Bin data/maps/25/{combined.png => 25.jpg} | Bin data/maps/250/{combined.png => 250.jpg} | Bin data/maps/251/{combined.png => 251.jpg} | Bin data/maps/252/{combined.png => 252.jpg} | Bin data/maps/253/{combined.png => 253.jpg} | Bin data/maps/254/{combined.png => 254.jpg} | Bin data/maps/255/{combined.png => 255.jpg} | Bin data/maps/256/{combined.png => 256.jpg} | Bin data/maps/257/{combined.png => 257.jpg} | Bin data/maps/258/{combined.png => 258.jpg} | Bin data/maps/259/{combined.png => 259.jpg} | Bin data/maps/26/{combined.png => 26.jpg} | Bin data/maps/260/{combined.png => 260.jpg} | Bin data/maps/261/{combined.png => 261.jpg} | Bin data/maps/262/{combined.png => 262.jpg} | Bin data/maps/263/{combined.png => 263.jpg} | Bin data/maps/264/{combined.png => 264.jpg} | Bin data/maps/265/{combined.png => 265.jpg} | Bin data/maps/266/{combined.png => 266.jpg} | Bin data/maps/267/{combined.png => 267.jpg} | Bin data/maps/268/{combined.png => 268.jpg} | Bin data/maps/269/{combined.png => 269.jpg} | Bin data/maps/27/{combined.png => 27.jpg} | Bin data/maps/270/{combined.png => 270.jpg} | Bin data/maps/271/{combined.png => 271.jpg} | Bin data/maps/272/{combined.png => 272.jpg} | Bin data/maps/273/{combined.png => 273.jpg} | Bin data/maps/274/{combined.png => 274.jpg} | Bin data/maps/275/{combined.png => 275.jpg} | Bin data/maps/276/{combined.png => 276.jpg} | Bin data/maps/277/{combined.png => 277.jpg} | Bin data/maps/278/{combined.png => 278.jpg} | Bin data/maps/279/{combined.png => 279.jpg} | Bin data/maps/28/{combined.png => 28.jpg} | Bin data/maps/280/{combined.png => 280.jpg} | Bin data/maps/281/{combined.png => 281.jpg} | Bin data/maps/282/{combined.png => 282.jpg} | Bin data/maps/283/{combined.png => 283.jpg} | Bin data/maps/284/{combined.png => 284.jpg} | Bin data/maps/285/{combined.png => 285.jpg} | Bin data/maps/286/{combined.png => 286.jpg} | Bin data/maps/287/{combined.png => 287.jpg} | Bin data/maps/288/{combined.png => 288.jpg} | Bin data/maps/289/{combined.png => 289.jpg} | Bin data/maps/29/{combined.png => 29.jpg} | Bin data/maps/290/{combined.png => 290.jpg} | Bin data/maps/291/{combined.png => 291.jpg} | Bin data/maps/292/{combined.png => 292.jpg} | Bin data/maps/293/{combined.png => 293.jpg} | Bin data/maps/294/{combined.png => 294.jpg} | Bin data/maps/295/{combined.png => 295.jpg} | Bin data/maps/296/{combined.png => 296.jpg} | Bin data/maps/297/{combined.png => 297.jpg} | Bin data/maps/298/{combined.png => 298.jpg} | Bin data/maps/299/{combined.png => 299.jpg} | Bin data/maps/3/{combined.png => 3.jpg} | Bin data/maps/30/{combined.png => 30.jpg} | Bin data/maps/300/{combined.png => 300.jpg} | Bin data/maps/301/{combined.png => 301.jpg} | Bin data/maps/302/{combined.png => 302.jpg} | Bin data/maps/303/{combined.png => 303.jpg} | Bin data/maps/304/{combined.png => 304.jpg} | Bin data/maps/305/{combined.png => 305.jpg} | Bin data/maps/306/{combined.png => 306.jpg} | Bin data/maps/307/{combined.png => 307.jpg} | Bin data/maps/308/{combined.png => 308.jpg} | Bin data/maps/309/{combined.png => 309.jpg} | Bin data/maps/31/{combined.png => 31.jpg} | Bin data/maps/310/{combined.png => 310.jpg} | Bin data/maps/311/{combined.png => 311.jpg} | Bin data/maps/312/{combined.png => 312.jpg} | Bin data/maps/313/{combined.png => 313.jpg} | Bin data/maps/314/{combined.png => 314.jpg} | Bin data/maps/315/{combined.png => 315.jpg} | Bin data/maps/316/{combined.png => 316.jpg} | Bin data/maps/317/{combined.png => 317.jpg} | Bin data/maps/318/{combined.png => 318.jpg} | Bin data/maps/319/{combined.png => 319.jpg} | Bin data/maps/32/{combined.png => 32.jpg} | Bin data/maps/320/{combined.png => 320.jpg} | Bin data/maps/321/{combined.png => 321.jpg} | Bin data/maps/322/{combined.png => 322.jpg} | Bin data/maps/323/{combined.png => 323.jpg} | Bin data/maps/324/{combined.png => 324.jpg} | Bin data/maps/325/{combined.png => 325.jpg} | Bin data/maps/326/{combined.png => 326.jpg} | Bin data/maps/327/{combined.png => 327.jpg} | Bin data/maps/328/{combined.png => 328.jpg} | Bin data/maps/329/{combined.png => 329.jpg} | Bin data/maps/33/{combined.png => 33.jpg} | Bin data/maps/330/{combined.png => 330.jpg} | Bin data/maps/331/{combined.png => 331.jpg} | Bin data/maps/332/{combined.png => 332.jpg} | Bin data/maps/333/{combined.png => 333.jpg} | Bin data/maps/334/{combined.png => 334.jpg} | Bin data/maps/335/{combined.png => 335.jpg} | Bin data/maps/336/{combined.png => 336.jpg} | Bin data/maps/337/{combined.png => 337.jpg} | Bin data/maps/338/{combined.png => 338.jpg} | Bin data/maps/339/{combined.png => 339.jpg} | Bin data/maps/34/{combined.png => 34.jpg} | Bin data/maps/340/{combined.png => 340.jpg} | Bin data/maps/341/{combined.png => 341.jpg} | Bin data/maps/342/{combined.png => 342.jpg} | Bin data/maps/343/{combined.png => 343.jpg} | Bin data/maps/344/{combined.png => 344.jpg} | Bin data/maps/345/{combined.png => 345.jpg} | Bin data/maps/346/{combined.png => 346.jpg} | Bin data/maps/347/{combined.png => 347.jpg} | Bin data/maps/348/{combined.png => 348.jpg} | Bin data/maps/349/{combined.png => 349.jpg} | Bin data/maps/35/{combined.png => 35.jpg} | Bin data/maps/350/{combined.png => 350.jpg} | Bin data/maps/351/{combined.png => 351.jpg} | Bin data/maps/352/{combined.png => 352.jpg} | Bin data/maps/353/{combined.png => 353.jpg} | Bin data/maps/354/{combined.png => 354.jpg} | Bin data/maps/355/{combined.png => 355.jpg} | Bin data/maps/356/{combined.png => 356.jpg} | Bin data/maps/357/{combined.png => 357.jpg} | Bin data/maps/358/{combined.png => 358.jpg} | Bin data/maps/359/{combined.png => 359.jpg} | Bin data/maps/36/{combined.png => 36.jpg} | Bin data/maps/360/{combined.png => 360.jpg} | Bin data/maps/361/{combined.png => 361.jpg} | Bin data/maps/362/{combined.png => 362.jpg} | Bin data/maps/363/{combined.png => 363.jpg} | Bin data/maps/364/{combined.png => 364.jpg} | Bin data/maps/365/{combined.png => 365.jpg} | Bin data/maps/366/{combined.png => 366.jpg} | Bin data/maps/367/{combined.png => 367.jpg} | Bin data/maps/368/{combined.png => 368.jpg} | Bin data/maps/369/{combined.png => 369.jpg} | Bin data/maps/37/{combined.png => 37.jpg} | Bin data/maps/370/{combined.png => 370.jpg} | Bin data/maps/371/{combined.png => 371.jpg} | Bin data/maps/372/{combined.png => 372.jpg} | Bin data/maps/373/{combined.png => 373.jpg} | Bin data/maps/374/{combined.png => 374.jpg} | Bin data/maps/375/{combined.png => 375.jpg} | Bin data/maps/376/{combined.png => 376.jpg} | Bin data/maps/377/{combined.png => 377.jpg} | Bin data/maps/378/{combined.png => 378.jpg} | Bin data/maps/379/{combined.png => 379.jpg} | Bin data/maps/38/{combined.png => 38.jpg} | Bin data/maps/380/{combined.png => 380.jpg} | Bin data/maps/381/{combined.png => 381.jpg} | Bin data/maps/382/{combined.png => 382.jpg} | Bin data/maps/383/{combined.png => 383.jpg} | Bin data/maps/384/{combined.png => 384.jpg} | Bin data/maps/385/{combined.png => 385.jpg} | Bin data/maps/386/{combined.png => 386.jpg} | Bin data/maps/387/{combined.png => 387.jpg} | Bin data/maps/388/{combined.png => 388.jpg} | Bin data/maps/389/{combined.png => 389.jpg} | Bin data/maps/39/{combined.png => 39.jpg} | Bin data/maps/390/{combined.png => 390.jpg} | Bin data/maps/391/{combined.png => 391.jpg} | Bin data/maps/392/{combined.png => 392.jpg} | Bin data/maps/393/{combined.png => 393.jpg} | Bin data/maps/394/{combined.png => 394.jpg} | Bin data/maps/395/{combined.png => 395.jpg} | Bin data/maps/396/{combined.png => 396.jpg} | Bin data/maps/397/{combined.png => 397.jpg} | Bin data/maps/398/{combined.png => 398.jpg} | Bin data/maps/399/{combined.png => 399.jpg} | Bin data/maps/4/{combined.png => 4.jpg} | Bin data/maps/40/{combined.png => 40.jpg} | Bin data/maps/400/{combined.png => 400.jpg} | Bin data/maps/401/{combined.png => 401.jpg} | Bin data/maps/402/{combined.png => 402.jpg} | Bin data/maps/403/{combined.png => 403.jpg} | Bin data/maps/404/{combined.png => 404.jpg} | Bin data/maps/405/{combined.png => 405.jpg} | Bin data/maps/406/{combined.png => 406.jpg} | Bin data/maps/407/{combined.png => 407.jpg} | Bin data/maps/408/{combined.png => 408.jpg} | Bin data/maps/409/{combined.png => 409.jpg} | Bin data/maps/41/{combined.png => 41.jpg} | Bin data/maps/410/{combined.png => 410.jpg} | Bin data/maps/411/{combined.png => 411.jpg} | Bin data/maps/412/{combined.png => 412.jpg} | Bin data/maps/413/{combined.png => 413.jpg} | Bin data/maps/414/{combined.png => 414.jpg} | Bin data/maps/415/{combined.png => 415.jpg} | Bin data/maps/416/{combined.png => 416.jpg} | Bin data/maps/417/{combined.png => 417.jpg} | Bin data/maps/418/{combined.png => 418.jpg} | Bin data/maps/419/{combined.png => 419.jpg} | Bin data/maps/42/{combined.png => 42.jpg} | Bin data/maps/420/{combined.png => 420.jpg} | Bin data/maps/421/{combined.png => 421.jpg} | Bin data/maps/422/{combined.png => 422.jpg} | Bin data/maps/423/{combined.png => 423.jpg} | Bin data/maps/424/{combined.png => 424.jpg} | Bin data/maps/425/{combined.png => 425.jpg} | Bin data/maps/426/{combined.png => 426.jpg} | Bin data/maps/427/{combined.png => 427.jpg} | Bin data/maps/428/{combined.png => 428.jpg} | Bin data/maps/429/{combined.png => 429.jpg} | Bin data/maps/43/{combined.png => 43.jpg} | Bin data/maps/430/{combined.png => 430.jpg} | Bin data/maps/431/{combined.png => 431.jpg} | Bin data/maps/432/{combined.png => 432.jpg} | Bin data/maps/433/{combined.png => 433.jpg} | Bin data/maps/434/{combined.png => 434.jpg} | Bin data/maps/435/{combined.png => 435.jpg} | Bin data/maps/436/{combined.png => 436.jpg} | Bin data/maps/437/{combined.png => 437.jpg} | Bin data/maps/438/{combined.png => 438.jpg} | Bin data/maps/439/{combined.png => 439.jpg} | Bin data/maps/44/{combined.png => 44.jpg} | Bin data/maps/440/{combined.png => 440.jpg} | Bin data/maps/441/{combined.png => 441.jpg} | Bin data/maps/442/{combined.png => 442.jpg} | Bin data/maps/443/{combined.png => 443.jpg} | Bin data/maps/444/{combined.png => 444.jpg} | Bin data/maps/445/{combined.png => 445.jpg} | Bin data/maps/446/{combined.png => 446.jpg} | Bin data/maps/447/{combined.png => 447.jpg} | Bin data/maps/448/{combined.png => 448.jpg} | Bin data/maps/449/{combined.png => 449.jpg} | Bin data/maps/45/{combined.png => 45.jpg} | Bin data/maps/450/{combined.png => 450.jpg} | Bin data/maps/451/{combined.png => 451.jpg} | Bin data/maps/452/{combined.png => 452.jpg} | Bin data/maps/453/{combined.png => 453.jpg} | Bin data/maps/454/{combined.png => 454.jpg} | Bin data/maps/455/{combined.png => 455.jpg} | Bin data/maps/456/{combined.png => 456.jpg} | Bin data/maps/457/{combined.png => 457.jpg} | Bin data/maps/458/{combined.png => 458.jpg} | Bin data/maps/459/{combined.png => 459.jpg} | Bin data/maps/46/{combined.png => 46.jpg} | Bin data/maps/460/{combined.png => 460.jpg} | Bin data/maps/461/{combined.png => 461.jpg} | Bin data/maps/462/{combined.png => 462.jpg} | Bin data/maps/463/{combined.png => 463.jpg} | Bin data/maps/464/{combined.png => 464.jpg} | Bin data/maps/465/{combined.png => 465.jpg} | Bin data/maps/466/{combined.png => 466.jpg} | Bin data/maps/467/{combined.png => 467.jpg} | Bin data/maps/468/{combined.png => 468.jpg} | Bin data/maps/469/{combined.png => 469.jpg} | Bin data/maps/47/{combined.png => 47.jpg} | Bin data/maps/470/{combined.png => 470.jpg} | Bin data/maps/471/{combined.png => 471.jpg} | Bin data/maps/472/{combined.png => 472.jpg} | Bin data/maps/473/{combined.png => 473.jpg} | Bin data/maps/474/{combined.png => 474.jpg} | Bin data/maps/475/{combined.png => 475.jpg} | Bin data/maps/476/{combined.png => 476.jpg} | Bin data/maps/477/{combined.png => 477.jpg} | Bin data/maps/478/{combined.png => 478.jpg} | Bin data/maps/479/{combined.png => 479.jpg} | Bin data/maps/48/{combined.png => 48.jpg} | Bin data/maps/480/{combined.png => 480.jpg} | Bin data/maps/481/{combined.png => 481.jpg} | Bin data/maps/482/{combined.png => 482.jpg} | Bin data/maps/483/{combined.png => 483.jpg} | Bin data/maps/484/{combined.png => 484.jpg} | Bin data/maps/485/{combined.png => 485.jpg} | Bin data/maps/486/{combined.png => 486.jpg} | Bin data/maps/487/{combined.png => 487.jpg} | Bin data/maps/488/{combined.png => 488.jpg} | Bin data/maps/489/{combined.png => 489.jpg} | Bin data/maps/49/{combined.png => 49.jpg} | Bin data/maps/490/{combined.png => 490.jpg} | Bin data/maps/491/{combined.png => 491.jpg} | Bin data/maps/492/{combined.png => 492.jpg} | Bin data/maps/493/{combined.png => 493.jpg} | Bin data/maps/494/{combined.png => 494.jpg} | Bin data/maps/495/{combined.png => 495.jpg} | Bin data/maps/496/{combined.png => 496.jpg} | Bin data/maps/497/{combined.png => 497.jpg} | Bin data/maps/498/{combined.png => 498.jpg} | Bin data/maps/499/{combined.png => 499.jpg} | Bin data/maps/5/{combined.png => 5.jpg} | Bin data/maps/50/{combined.png => 50.jpg} | Bin data/maps/500/{combined.png => 500.jpg} | Bin data/maps/501/{combined.png => 501.jpg} | Bin data/maps/502/{combined.png => 502.jpg} | Bin data/maps/503/{combined.png => 503.jpg} | Bin data/maps/504/{combined.png => 504.jpg} | Bin data/maps/505/{combined.png => 505.jpg} | Bin data/maps/506/{combined.png => 506.jpg} | Bin data/maps/507/{combined.png => 507.jpg} | Bin data/maps/508/{combined.png => 508.jpg} | Bin data/maps/509/{combined.png => 509.jpg} | Bin data/maps/51/{combined.png => 51.jpg} | Bin data/maps/510/{combined.png => 510.jpg} | Bin data/maps/511/{combined.png => 511.jpg} | Bin data/maps/512/{combined.png => 512.jpg} | Bin data/maps/513/{combined.png => 513.jpg} | Bin data/maps/514/{combined.png => 514.jpg} | Bin data/maps/515/{combined.png => 515.jpg} | Bin data/maps/516/{combined.png => 516.jpg} | Bin data/maps/517/{combined.png => 517.jpg} | Bin data/maps/518/{combined.png => 518.jpg} | Bin data/maps/519/{combined.png => 519.jpg} | Bin data/maps/52/{combined.png => 52.jpg} | Bin data/maps/520/{combined.png => 520.jpg} | Bin data/maps/521/{combined.png => 521.jpg} | Bin data/maps/522/{combined.png => 522.jpg} | Bin data/maps/523/{combined.png => 523.jpg} | Bin data/maps/524/{combined.png => 524.jpg} | Bin data/maps/525/{combined.png => 525.jpg} | Bin data/maps/526/{combined.png => 526.jpg} | Bin data/maps/527/{combined.png => 527.jpg} | Bin data/maps/528/{combined.png => 528.jpg} | Bin data/maps/529/{combined.png => 529.jpg} | Bin data/maps/53/{combined.png => 53.jpg} | Bin data/maps/530/{combined.png => 530.jpg} | Bin data/maps/531/{combined.png => 531.jpg} | Bin data/maps/532/{combined.png => 532.jpg} | Bin data/maps/533/{combined.png => 533.jpg} | Bin data/maps/534/{combined.png => 534.jpg} | Bin data/maps/535/{combined.png => 535.jpg} | Bin data/maps/536/{combined.png => 536.jpg} | Bin data/maps/537/{combined.png => 537.jpg} | Bin data/maps/538/{combined.png => 538.jpg} | Bin data/maps/539/{combined.png => 539.jpg} | Bin data/maps/54/{combined.png => 54.jpg} | Bin data/maps/540/{combined.png => 540.jpg} | Bin data/maps/541/{combined.png => 541.jpg} | Bin data/maps/542/{combined.png => 542.jpg} | Bin data/maps/543/{combined.png => 543.jpg} | Bin data/maps/544/{combined.png => 544.jpg} | Bin data/maps/545/{combined.png => 545.jpg} | Bin data/maps/546/{combined.png => 546.jpg} | Bin data/maps/547/{combined.png => 547.jpg} | Bin data/maps/548/{combined.png => 548.jpg} | Bin data/maps/549/{combined.png => 549.jpg} | Bin data/maps/55/{combined.png => 55.jpg} | Bin data/maps/550/{combined.png => 550.jpg} | Bin data/maps/551/{combined.png => 551.jpg} | Bin data/maps/552/{combined.png => 552.jpg} | Bin data/maps/553/{combined.png => 553.jpg} | Bin data/maps/554/{combined.png => 554.jpg} | Bin data/maps/555/{combined.png => 555.jpg} | Bin data/maps/556/{combined.png => 556.jpg} | Bin data/maps/557/{combined.png => 557.jpg} | Bin data/maps/558/{combined.png => 558.jpg} | Bin data/maps/559/{combined.png => 559.jpg} | Bin data/maps/56/{combined.png => 56.jpg} | Bin data/maps/560/{combined.png => 560.jpg} | Bin data/maps/561/{combined.png => 561.jpg} | Bin data/maps/562/{combined.png => 562.jpg} | Bin data/maps/563/{combined.png => 563.jpg} | Bin data/maps/564/{combined.png => 564.jpg} | Bin data/maps/565/{combined.png => 565.jpg} | Bin data/maps/566/{combined.png => 566.jpg} | Bin data/maps/567/{combined.png => 567.jpg} | Bin data/maps/568/{combined.png => 568.jpg} | Bin data/maps/569/{combined.png => 569.jpg} | Bin data/maps/57/{combined.png => 57.jpg} | Bin data/maps/570/{combined.png => 570.jpg} | Bin data/maps/571/{combined.png => 571.jpg} | Bin data/maps/572/{combined.png => 572.jpg} | Bin data/maps/573/{combined.png => 573.jpg} | Bin data/maps/574/{combined.png => 574.jpg} | Bin data/maps/575/{combined.png => 575.jpg} | Bin data/maps/576/{combined.png => 576.jpg} | Bin data/maps/577/{combined.png => 577.jpg} | Bin data/maps/578/{combined.png => 578.jpg} | Bin data/maps/579/{combined.png => 579.jpg} | Bin data/maps/58/{combined.png => 58.jpg} | Bin data/maps/580/{combined.png => 580.jpg} | Bin data/maps/581/{combined.png => 581.jpg} | Bin data/maps/582/{combined.png => 582.jpg} | Bin data/maps/583/{combined.png => 583.jpg} | Bin data/maps/584/{combined.png => 584.jpg} | Bin data/maps/585/{combined.png => 585.jpg} | Bin data/maps/586/{combined.png => 586.jpg} | Bin data/maps/587/{combined.png => 587.jpg} | Bin data/maps/588/{combined.png => 588.jpg} | Bin data/maps/589/{combined.png => 589.jpg} | Bin data/maps/59/{combined.png => 59.jpg} | Bin data/maps/590/{combined.png => 590.jpg} | Bin data/maps/591/{combined.png => 591.jpg} | Bin data/maps/592/{combined.png => 592.jpg} | Bin data/maps/593/{combined.png => 593.jpg} | Bin data/maps/594/{combined.png => 594.jpg} | Bin data/maps/595/{combined.png => 595.jpg} | Bin data/maps/596/{combined.png => 596.jpg} | Bin data/maps/597/{combined.png => 597.jpg} | Bin data/maps/598/{combined.png => 598.jpg} | Bin data/maps/599/{combined.png => 599.jpg} | Bin data/maps/6/{combined.png => 6.jpg} | Bin data/maps/60/{combined.png => 60.jpg} | Bin data/maps/600/{combined.png => 600.jpg} | Bin data/maps/601/{combined.png => 601.jpg} | Bin data/maps/602/{combined.png => 602.jpg} | Bin data/maps/603/{combined.png => 603.jpg} | Bin data/maps/604/{combined.png => 604.jpg} | Bin data/maps/605/{combined.png => 605.jpg} | Bin data/maps/606/{combined.png => 606.jpg} | Bin data/maps/607/{combined.png => 607.jpg} | Bin data/maps/608/{combined.png => 608.jpg} | Bin data/maps/609/{combined.png => 609.jpg} | Bin data/maps/61/{combined.png => 61.jpg} | Bin data/maps/610/{combined.png => 610.jpg} | Bin data/maps/611/{combined.png => 611.jpg} | Bin data/maps/612/{combined.png => 612.jpg} | Bin data/maps/613/{combined.png => 613.jpg} | Bin data/maps/614/{combined.png => 614.jpg} | Bin data/maps/615/{combined.png => 615.jpg} | Bin data/maps/616/{combined.png => 616.jpg} | Bin data/maps/617/{combined.png => 617.jpg} | Bin data/maps/618/{combined.png => 618.jpg} | Bin data/maps/619/{combined.png => 619.jpg} | Bin data/maps/62/{combined.png => 62.jpg} | Bin data/maps/620/{combined.png => 620.jpg} | Bin data/maps/621/{combined.png => 621.jpg} | Bin data/maps/622/{combined.png => 622.jpg} | Bin data/maps/623/{combined.png => 623.jpg} | Bin data/maps/624/{combined.png => 624.jpg} | Bin data/maps/625/{combined.png => 625.jpg} | Bin data/maps/626/{combined.png => 626.jpg} | Bin data/maps/627/{combined.png => 627.jpg} | Bin data/maps/628/{combined.png => 628.jpg} | Bin data/maps/629/{combined.png => 629.jpg} | Bin data/maps/63/{combined.png => 63.jpg} | Bin data/maps/630/{combined.png => 630.jpg} | Bin data/maps/631/{combined.png => 631.jpg} | Bin data/maps/632/{combined.png => 632.jpg} | Bin data/maps/633/{combined.png => 633.jpg} | Bin data/maps/634/{combined.png => 634.jpg} | Bin data/maps/635/{combined.png => 635.jpg} | Bin data/maps/636/{combined.png => 636.jpg} | Bin data/maps/637/{combined.png => 637.jpg} | Bin data/maps/638/{combined.png => 638.jpg} | Bin data/maps/639/{combined.png => 639.jpg} | Bin data/maps/64/{combined.png => 64.jpg} | Bin data/maps/640/{combined.png => 640.jpg} | Bin data/maps/641/{combined.png => 641.jpg} | Bin data/maps/642/{combined.png => 642.jpg} | Bin data/maps/643/{combined.png => 643.jpg} | Bin data/maps/644/{combined.png => 644.jpg} | Bin data/maps/645/{combined.png => 645.jpg} | Bin data/maps/646/{combined.png => 646.jpg} | Bin data/maps/647/{combined.png => 647.jpg} | Bin data/maps/648/{combined.png => 648.jpg} | Bin data/maps/649/{combined.png => 649.jpg} | Bin data/maps/65/{combined.png => 65.jpg} | Bin data/maps/650/{combined.png => 650.jpg} | Bin data/maps/651/{combined.png => 651.jpg} | Bin data/maps/652/{combined.png => 652.jpg} | Bin data/maps/653/{combined.png => 653.jpg} | Bin data/maps/654/{combined.png => 654.jpg} | Bin data/maps/655/{combined.png => 655.jpg} | Bin data/maps/656/{combined.png => 656.jpg} | Bin data/maps/657/{combined.png => 657.jpg} | Bin data/maps/66/{combined.png => 66.jpg} | Bin data/maps/67/{combined.png => 67.jpg} | Bin data/maps/68/{combined.png => 68.jpg} | Bin data/maps/69/{combined.png => 69.jpg} | Bin data/maps/7/{combined.png => 7.jpg} | Bin data/maps/70/{combined.png => 70.jpg} | Bin data/maps/71/{combined.png => 71.jpg} | Bin data/maps/72/{combined.png => 72.jpg} | Bin data/maps/73/{combined.png => 73.jpg} | Bin data/maps/74/{combined.png => 74.jpg} | Bin data/maps/75/{combined.png => 75.jpg} | Bin data/maps/76/{combined.png => 76.jpg} | Bin data/maps/77/{combined.png => 77.jpg} | Bin data/maps/78/{combined.png => 78.jpg} | Bin data/maps/79/{combined.png => 79.jpg} | Bin data/maps/8/{combined.png => 8.jpg} | Bin data/maps/80/{combined.png => 80.jpg} | Bin data/maps/81/{combined.png => 81.jpg} | Bin data/maps/82/{combined.png => 82.jpg} | Bin data/maps/83/{combined.png => 83.jpg} | Bin data/maps/84/{combined.png => 84.jpg} | Bin data/maps/85/{combined.png => 85.jpg} | Bin data/maps/86/{combined.png => 86.jpg} | Bin data/maps/87/{combined.png => 87.jpg} | Bin data/maps/88/{combined.png => 88.jpg} | Bin data/maps/89/{combined.png => 89.jpg} | Bin data/maps/9/{combined.png => 9.jpg} | Bin data/maps/90/{combined.png => 90.jpg} | Bin data/maps/91/{combined.png => 91.jpg} | Bin data/maps/92/{combined.png => 92.jpg} | Bin data/maps/93/{combined.png => 93.jpg} | Bin data/maps/94/{combined.png => 94.jpg} | Bin data/maps/95/{combined.png => 95.jpg} | Bin data/maps/96/{combined.png => 96.jpg} | Bin data/maps/97/{combined.png => 97.jpg} | Bin data/maps/98/{combined.png => 98.jpg} | Bin data/maps/99/{combined.png => 99.jpg} | Bin data/maps/combine.py | 28 ++ modules/debug.py | 12 - modules/{classes.py => menu.py} | 50 ++- modules/multiplayer.py | 1 - modules/settings.py | 31 ++ modules/systems.py | 125 +++++++ pyyoda.py | 99 +++--- requirements.txt | 4 +- settings.json | 10 + 671 files changed, 796 insertions(+), 134 deletions(-) create mode 100644 data/combined_maps/dagobah/dagobah.tmx rename data/maps/0/{combined.png => 0.jpg} (100%) rename data/maps/1/{combined.png => 1.jpg} (100%) rename data/maps/10/{combined.png => 10.jpg} (100%) rename data/maps/100/{combined.png => 100.jpg} (100%) rename data/maps/101/{combined.png => 101.jpg} (100%) rename data/maps/102/{combined.png => 102.jpg} (100%) rename data/maps/103/{combined.png => 103.jpg} (100%) rename data/maps/104/{combined.png => 104.jpg} (100%) rename data/maps/105/{combined.png => 105.jpg} (100%) rename data/maps/106/{combined.png => 106.jpg} (100%) rename data/maps/107/{combined.png => 107.jpg} (100%) rename data/maps/108/{combined.png => 108.jpg} (100%) rename data/maps/109/{combined.png => 109.jpg} (100%) rename data/maps/11/{combined.png => 11.jpg} (100%) rename data/maps/110/{combined.png => 110.jpg} (100%) rename data/maps/111/{combined.png => 111.jpg} (100%) rename data/maps/112/{combined.png => 112.jpg} (100%) rename data/maps/113/{combined.png => 113.jpg} (100%) rename data/maps/114/{combined.png => 114.jpg} (100%) rename data/maps/115/{combined.png => 115.jpg} (100%) rename data/maps/116/{combined.png => 116.jpg} (100%) rename data/maps/117/{combined.png => 117.jpg} (100%) rename data/maps/118/{combined.png => 118.jpg} (100%) rename data/maps/119/{combined.png => 119.jpg} (100%) rename data/maps/12/{combined.png => 12.jpg} (100%) rename data/maps/120/{combined.png => 120.jpg} (100%) rename data/maps/121/{combined.png => 121.jpg} (100%) rename data/maps/122/{combined.png => 122.jpg} (100%) rename data/maps/123/{combined.png => 123.jpg} (100%) rename data/maps/124/{combined.png => 124.jpg} (100%) rename data/maps/125/{combined.png => 125.jpg} (100%) rename data/maps/126/{combined.png => 126.jpg} (100%) rename data/maps/127/{combined.png => 127.jpg} (100%) rename data/maps/128/{combined.png => 128.jpg} (100%) rename data/maps/129/{combined.png => 129.jpg} (100%) rename data/maps/13/{combined.png => 13.jpg} (100%) rename data/maps/130/{combined.png => 130.jpg} (100%) rename data/maps/131/{combined.png => 131.jpg} (100%) rename data/maps/132/{combined.png => 132.jpg} (100%) rename data/maps/133/{combined.png => 133.jpg} (100%) rename data/maps/134/{combined.png => 134.jpg} (100%) rename data/maps/135/{combined.png => 135.jpg} (100%) rename data/maps/136/{combined.png => 136.jpg} (100%) rename data/maps/137/{combined.png => 137.jpg} (100%) rename data/maps/138/{combined.png => 138.jpg} (100%) rename data/maps/139/{combined.png => 139.jpg} (100%) rename data/maps/14/{combined.png => 14.jpg} (100%) rename data/maps/140/{combined.png => 140.jpg} (100%) rename data/maps/141/{combined.png => 141.jpg} (100%) rename data/maps/142/{combined.png => 142.jpg} (100%) rename data/maps/143/{combined.png => 143.jpg} (100%) rename data/maps/144/{combined.png => 144.jpg} (100%) rename data/maps/145/{combined.png => 145.jpg} (100%) rename data/maps/146/{combined.png => 146.jpg} (100%) rename data/maps/147/{combined.png => 147.jpg} (100%) rename data/maps/148/{combined.png => 148.jpg} (100%) rename data/maps/149/{combined.png => 149.jpg} (100%) rename data/maps/15/{combined.png => 15.jpg} (100%) rename data/maps/150/{combined.png => 150.jpg} (100%) rename data/maps/151/{combined.png => 151.jpg} (100%) rename data/maps/152/{combined.png => 152.jpg} (100%) rename data/maps/153/{combined.png => 153.jpg} (100%) rename data/maps/154/{combined.png => 154.jpg} (100%) rename data/maps/155/{combined.png => 155.jpg} (100%) rename data/maps/156/{combined.png => 156.jpg} (100%) rename data/maps/157/{combined.png => 157.jpg} (100%) rename data/maps/158/{combined.png => 158.jpg} (100%) rename data/maps/159/{combined.png => 159.jpg} (100%) rename data/maps/16/{combined.png => 16.jpg} (100%) rename data/maps/160/{combined.png => 160.jpg} (100%) rename data/maps/161/{combined.png => 161.jpg} (100%) rename data/maps/162/{combined.png => 162.jpg} (100%) rename data/maps/163/{combined.png => 163.jpg} (100%) rename data/maps/164/{combined.png => 164.jpg} (100%) rename data/maps/165/{combined.png => 165.jpg} (100%) rename data/maps/166/{combined.png => 166.jpg} (100%) rename data/maps/167/{combined.png => 167.jpg} (100%) rename data/maps/168/{combined.png => 168.jpg} (100%) rename data/maps/169/{combined.png => 169.jpg} (100%) rename data/maps/17/{combined.png => 17.jpg} (100%) rename data/maps/170/{combined.png => 170.jpg} (100%) rename data/maps/171/{combined.png => 171.jpg} (100%) rename data/maps/172/{combined.png => 172.jpg} (100%) rename data/maps/173/{combined.png => 173.jpg} (100%) rename data/maps/174/{combined.png => 174.jpg} (100%) rename data/maps/175/{combined.png => 175.jpg} (100%) rename data/maps/176/{combined.png => 176.jpg} (100%) rename data/maps/177/{combined.png => 177.jpg} (100%) rename data/maps/178/{combined.png => 178.jpg} (100%) rename data/maps/179/{combined.png => 179.jpg} (100%) rename data/maps/18/{combined.png => 18.jpg} (100%) rename data/maps/180/{combined.png => 180.jpg} (100%) rename data/maps/181/{combined.png => 181.jpg} (100%) rename data/maps/182/{combined.png => 182.jpg} (100%) rename data/maps/183/{combined.png => 183.jpg} (100%) rename data/maps/184/{combined.png => 184.jpg} (100%) rename data/maps/185/{combined.png => 185.jpg} (100%) rename data/maps/186/{combined.png => 186.jpg} (100%) rename data/maps/187/{combined.png => 187.jpg} (100%) rename data/maps/188/{combined.png => 188.jpg} (100%) rename data/maps/189/{combined.png => 189.jpg} (100%) rename data/maps/19/{combined.png => 19.jpg} (100%) rename data/maps/190/{combined.png => 190.jpg} (100%) rename data/maps/191/{combined.png => 191.jpg} (100%) rename data/maps/192/{combined.png => 192.jpg} (100%) rename data/maps/193/{combined.png => 193.jpg} (100%) rename data/maps/194/{combined.png => 194.jpg} (100%) rename data/maps/195/{combined.png => 195.jpg} (100%) rename data/maps/196/{combined.png => 196.jpg} (100%) rename data/maps/197/{combined.png => 197.jpg} (100%) rename data/maps/198/{combined.png => 198.jpg} (100%) rename data/maps/199/{combined.png => 199.jpg} (100%) rename data/maps/2/{combined.png => 2.jpg} (100%) rename data/maps/20/{combined.png => 20.jpg} (100%) rename data/maps/200/{combined.png => 200.jpg} (100%) rename data/maps/201/{combined.png => 201.jpg} (100%) rename data/maps/202/{combined.png => 202.jpg} (100%) rename data/maps/203/{combined.png => 203.jpg} (100%) rename data/maps/204/{combined.png => 204.jpg} (100%) rename data/maps/205/{combined.png => 205.jpg} (100%) rename data/maps/206/{combined.png => 206.jpg} (100%) rename data/maps/207/{combined.png => 207.jpg} (100%) rename data/maps/208/{combined.png => 208.jpg} (100%) rename data/maps/209/{combined.png => 209.jpg} (100%) rename data/maps/21/{combined.png => 21.jpg} (100%) rename data/maps/210/{combined.png => 210.jpg} (100%) rename data/maps/211/{combined.png => 211.jpg} (100%) rename data/maps/212/{combined.png => 212.jpg} (100%) rename data/maps/213/{combined.png => 213.jpg} (100%) rename data/maps/214/{combined.png => 214.jpg} (100%) rename data/maps/215/{combined.png => 215.jpg} (100%) rename data/maps/216/{combined.png => 216.jpg} (100%) rename data/maps/217/{combined.png => 217.jpg} (100%) rename data/maps/218/{combined.png => 218.jpg} (100%) rename data/maps/219/{combined.png => 219.jpg} (100%) rename data/maps/22/{combined.png => 22.jpg} (100%) rename data/maps/220/{combined.png => 220.jpg} (100%) rename data/maps/221/{combined.png => 221.jpg} (100%) rename data/maps/222/{combined.png => 222.jpg} (100%) rename data/maps/223/{combined.png => 223.jpg} (100%) rename data/maps/224/{combined.png => 224.jpg} (100%) rename data/maps/225/{combined.png => 225.jpg} (100%) rename data/maps/226/{combined.png => 226.jpg} (100%) rename data/maps/227/{combined.png => 227.jpg} (100%) rename data/maps/228/{combined.png => 228.jpg} (100%) rename data/maps/229/{combined.png => 229.jpg} (100%) rename data/maps/23/{combined.png => 23.jpg} (100%) rename data/maps/230/{combined.png => 230.jpg} (100%) rename data/maps/231/{combined.png => 231.jpg} (100%) rename data/maps/232/{combined.png => 232.jpg} (100%) rename data/maps/233/{combined.png => 233.jpg} (100%) rename data/maps/234/{combined.png => 234.jpg} (100%) rename data/maps/235/{combined.png => 235.jpg} (100%) rename data/maps/236/{combined.png => 236.jpg} (100%) rename data/maps/237/{combined.png => 237.jpg} (100%) rename data/maps/238/{combined.png => 238.jpg} (100%) rename data/maps/239/{combined.png => 239.jpg} (100%) rename data/maps/24/{combined.png => 24.jpg} (100%) rename data/maps/240/{combined.png => 240.jpg} (100%) rename data/maps/241/{combined.png => 241.jpg} (100%) rename data/maps/242/{combined.png => 242.jpg} (100%) rename data/maps/243/{combined.png => 243.jpg} (100%) rename data/maps/244/{combined.png => 244.jpg} (100%) rename data/maps/245/{combined.png => 245.jpg} (100%) rename data/maps/246/{combined.png => 246.jpg} (100%) rename data/maps/247/{combined.png => 247.jpg} (100%) rename data/maps/248/{combined.png => 248.jpg} (100%) rename data/maps/249/{combined.png => 249.jpg} (100%) rename data/maps/25/{combined.png => 25.jpg} (100%) rename data/maps/250/{combined.png => 250.jpg} (100%) rename data/maps/251/{combined.png => 251.jpg} (100%) rename data/maps/252/{combined.png => 252.jpg} (100%) rename data/maps/253/{combined.png => 253.jpg} (100%) rename data/maps/254/{combined.png => 254.jpg} (100%) rename data/maps/255/{combined.png => 255.jpg} (100%) rename data/maps/256/{combined.png => 256.jpg} (100%) rename data/maps/257/{combined.png => 257.jpg} (100%) rename data/maps/258/{combined.png => 258.jpg} (100%) rename data/maps/259/{combined.png => 259.jpg} (100%) rename data/maps/26/{combined.png => 26.jpg} (100%) rename data/maps/260/{combined.png => 260.jpg} (100%) rename data/maps/261/{combined.png => 261.jpg} (100%) rename data/maps/262/{combined.png => 262.jpg} (100%) rename data/maps/263/{combined.png => 263.jpg} (100%) rename data/maps/264/{combined.png => 264.jpg} (100%) rename data/maps/265/{combined.png => 265.jpg} (100%) rename data/maps/266/{combined.png => 266.jpg} (100%) rename data/maps/267/{combined.png => 267.jpg} (100%) rename data/maps/268/{combined.png => 268.jpg} (100%) rename data/maps/269/{combined.png => 269.jpg} (100%) rename data/maps/27/{combined.png => 27.jpg} (100%) rename data/maps/270/{combined.png => 270.jpg} (100%) rename data/maps/271/{combined.png => 271.jpg} (100%) rename data/maps/272/{combined.png => 272.jpg} (100%) rename data/maps/273/{combined.png => 273.jpg} (100%) rename data/maps/274/{combined.png => 274.jpg} (100%) rename data/maps/275/{combined.png => 275.jpg} (100%) rename data/maps/276/{combined.png => 276.jpg} (100%) rename data/maps/277/{combined.png => 277.jpg} (100%) rename data/maps/278/{combined.png => 278.jpg} (100%) rename data/maps/279/{combined.png => 279.jpg} (100%) rename data/maps/28/{combined.png => 28.jpg} (100%) rename data/maps/280/{combined.png => 280.jpg} (100%) rename data/maps/281/{combined.png => 281.jpg} (100%) rename data/maps/282/{combined.png => 282.jpg} (100%) rename data/maps/283/{combined.png => 283.jpg} (100%) rename data/maps/284/{combined.png => 284.jpg} (100%) rename data/maps/285/{combined.png => 285.jpg} (100%) rename data/maps/286/{combined.png => 286.jpg} (100%) rename data/maps/287/{combined.png => 287.jpg} (100%) rename data/maps/288/{combined.png => 288.jpg} (100%) rename data/maps/289/{combined.png => 289.jpg} (100%) rename data/maps/29/{combined.png => 29.jpg} (100%) rename data/maps/290/{combined.png => 290.jpg} (100%) rename data/maps/291/{combined.png => 291.jpg} (100%) rename data/maps/292/{combined.png => 292.jpg} (100%) rename data/maps/293/{combined.png => 293.jpg} (100%) rename data/maps/294/{combined.png => 294.jpg} (100%) rename data/maps/295/{combined.png => 295.jpg} (100%) rename data/maps/296/{combined.png => 296.jpg} (100%) rename data/maps/297/{combined.png => 297.jpg} (100%) rename data/maps/298/{combined.png => 298.jpg} (100%) rename data/maps/299/{combined.png => 299.jpg} (100%) rename data/maps/3/{combined.png => 3.jpg} (100%) rename data/maps/30/{combined.png => 30.jpg} (100%) rename data/maps/300/{combined.png => 300.jpg} (100%) rename data/maps/301/{combined.png => 301.jpg} (100%) rename data/maps/302/{combined.png => 302.jpg} (100%) rename data/maps/303/{combined.png => 303.jpg} (100%) rename data/maps/304/{combined.png => 304.jpg} (100%) rename data/maps/305/{combined.png => 305.jpg} (100%) rename data/maps/306/{combined.png => 306.jpg} (100%) rename data/maps/307/{combined.png => 307.jpg} (100%) rename data/maps/308/{combined.png => 308.jpg} (100%) rename data/maps/309/{combined.png => 309.jpg} (100%) rename data/maps/31/{combined.png => 31.jpg} (100%) rename data/maps/310/{combined.png => 310.jpg} (100%) rename data/maps/311/{combined.png => 311.jpg} (100%) rename data/maps/312/{combined.png => 312.jpg} (100%) rename data/maps/313/{combined.png => 313.jpg} (100%) rename data/maps/314/{combined.png => 314.jpg} (100%) rename data/maps/315/{combined.png => 315.jpg} (100%) rename data/maps/316/{combined.png => 316.jpg} (100%) rename data/maps/317/{combined.png => 317.jpg} (100%) rename data/maps/318/{combined.png => 318.jpg} (100%) rename data/maps/319/{combined.png => 319.jpg} (100%) rename data/maps/32/{combined.png => 32.jpg} (100%) rename data/maps/320/{combined.png => 320.jpg} (100%) rename data/maps/321/{combined.png => 321.jpg} (100%) rename data/maps/322/{combined.png => 322.jpg} (100%) rename data/maps/323/{combined.png => 323.jpg} (100%) rename data/maps/324/{combined.png => 324.jpg} (100%) rename data/maps/325/{combined.png => 325.jpg} (100%) rename data/maps/326/{combined.png => 326.jpg} (100%) rename data/maps/327/{combined.png => 327.jpg} (100%) rename data/maps/328/{combined.png => 328.jpg} (100%) rename data/maps/329/{combined.png => 329.jpg} (100%) rename data/maps/33/{combined.png => 33.jpg} (100%) rename data/maps/330/{combined.png => 330.jpg} (100%) rename data/maps/331/{combined.png => 331.jpg} (100%) rename data/maps/332/{combined.png => 332.jpg} (100%) rename data/maps/333/{combined.png => 333.jpg} (100%) rename data/maps/334/{combined.png => 334.jpg} (100%) rename data/maps/335/{combined.png => 335.jpg} (100%) rename data/maps/336/{combined.png => 336.jpg} (100%) rename data/maps/337/{combined.png => 337.jpg} (100%) rename data/maps/338/{combined.png => 338.jpg} (100%) rename data/maps/339/{combined.png => 339.jpg} (100%) rename data/maps/34/{combined.png => 34.jpg} (100%) rename data/maps/340/{combined.png => 340.jpg} (100%) rename data/maps/341/{combined.png => 341.jpg} (100%) rename data/maps/342/{combined.png => 342.jpg} (100%) rename data/maps/343/{combined.png => 343.jpg} (100%) rename data/maps/344/{combined.png => 344.jpg} (100%) rename data/maps/345/{combined.png => 345.jpg} (100%) rename data/maps/346/{combined.png => 346.jpg} (100%) rename data/maps/347/{combined.png => 347.jpg} (100%) rename data/maps/348/{combined.png => 348.jpg} (100%) rename data/maps/349/{combined.png => 349.jpg} (100%) rename data/maps/35/{combined.png => 35.jpg} (100%) rename data/maps/350/{combined.png => 350.jpg} (100%) rename data/maps/351/{combined.png => 351.jpg} (100%) rename data/maps/352/{combined.png => 352.jpg} (100%) rename data/maps/353/{combined.png => 353.jpg} (100%) rename data/maps/354/{combined.png => 354.jpg} (100%) rename data/maps/355/{combined.png => 355.jpg} (100%) rename data/maps/356/{combined.png => 356.jpg} (100%) rename data/maps/357/{combined.png => 357.jpg} (100%) rename data/maps/358/{combined.png => 358.jpg} (100%) rename data/maps/359/{combined.png => 359.jpg} (100%) rename data/maps/36/{combined.png => 36.jpg} (100%) rename data/maps/360/{combined.png => 360.jpg} (100%) rename data/maps/361/{combined.png => 361.jpg} (100%) rename data/maps/362/{combined.png => 362.jpg} (100%) rename data/maps/363/{combined.png => 363.jpg} (100%) rename data/maps/364/{combined.png => 364.jpg} (100%) rename data/maps/365/{combined.png => 365.jpg} (100%) rename data/maps/366/{combined.png => 366.jpg} (100%) rename data/maps/367/{combined.png => 367.jpg} (100%) rename data/maps/368/{combined.png => 368.jpg} (100%) rename data/maps/369/{combined.png => 369.jpg} (100%) rename data/maps/37/{combined.png => 37.jpg} (100%) rename data/maps/370/{combined.png => 370.jpg} (100%) rename data/maps/371/{combined.png => 371.jpg} (100%) rename data/maps/372/{combined.png => 372.jpg} (100%) rename data/maps/373/{combined.png => 373.jpg} (100%) rename data/maps/374/{combined.png => 374.jpg} (100%) rename data/maps/375/{combined.png => 375.jpg} (100%) rename data/maps/376/{combined.png => 376.jpg} (100%) rename data/maps/377/{combined.png => 377.jpg} (100%) rename data/maps/378/{combined.png => 378.jpg} (100%) rename data/maps/379/{combined.png => 379.jpg} (100%) rename data/maps/38/{combined.png => 38.jpg} (100%) rename data/maps/380/{combined.png => 380.jpg} (100%) rename data/maps/381/{combined.png => 381.jpg} (100%) rename data/maps/382/{combined.png => 382.jpg} (100%) rename data/maps/383/{combined.png => 383.jpg} (100%) rename data/maps/384/{combined.png => 384.jpg} (100%) rename data/maps/385/{combined.png => 385.jpg} (100%) rename data/maps/386/{combined.png => 386.jpg} (100%) rename data/maps/387/{combined.png => 387.jpg} (100%) rename data/maps/388/{combined.png => 388.jpg} (100%) rename data/maps/389/{combined.png => 389.jpg} (100%) rename data/maps/39/{combined.png => 39.jpg} (100%) rename data/maps/390/{combined.png => 390.jpg} (100%) rename data/maps/391/{combined.png => 391.jpg} (100%) rename data/maps/392/{combined.png => 392.jpg} (100%) rename data/maps/393/{combined.png => 393.jpg} (100%) rename data/maps/394/{combined.png => 394.jpg} (100%) rename data/maps/395/{combined.png => 395.jpg} (100%) rename data/maps/396/{combined.png => 396.jpg} (100%) rename data/maps/397/{combined.png => 397.jpg} (100%) rename data/maps/398/{combined.png => 398.jpg} (100%) rename data/maps/399/{combined.png => 399.jpg} (100%) rename data/maps/4/{combined.png => 4.jpg} (100%) rename data/maps/40/{combined.png => 40.jpg} (100%) rename data/maps/400/{combined.png => 400.jpg} (100%) rename data/maps/401/{combined.png => 401.jpg} (100%) rename data/maps/402/{combined.png => 402.jpg} (100%) rename data/maps/403/{combined.png => 403.jpg} (100%) rename data/maps/404/{combined.png => 404.jpg} (100%) rename data/maps/405/{combined.png => 405.jpg} (100%) rename data/maps/406/{combined.png => 406.jpg} (100%) rename data/maps/407/{combined.png => 407.jpg} (100%) rename data/maps/408/{combined.png => 408.jpg} (100%) rename data/maps/409/{combined.png => 409.jpg} (100%) rename data/maps/41/{combined.png => 41.jpg} (100%) rename data/maps/410/{combined.png => 410.jpg} (100%) rename data/maps/411/{combined.png => 411.jpg} (100%) rename data/maps/412/{combined.png => 412.jpg} (100%) rename data/maps/413/{combined.png => 413.jpg} (100%) rename data/maps/414/{combined.png => 414.jpg} (100%) rename data/maps/415/{combined.png => 415.jpg} (100%) rename data/maps/416/{combined.png => 416.jpg} (100%) rename data/maps/417/{combined.png => 417.jpg} (100%) rename data/maps/418/{combined.png => 418.jpg} (100%) rename data/maps/419/{combined.png => 419.jpg} (100%) rename data/maps/42/{combined.png => 42.jpg} (100%) rename data/maps/420/{combined.png => 420.jpg} (100%) rename data/maps/421/{combined.png => 421.jpg} (100%) rename data/maps/422/{combined.png => 422.jpg} (100%) rename data/maps/423/{combined.png => 423.jpg} (100%) rename data/maps/424/{combined.png => 424.jpg} (100%) rename data/maps/425/{combined.png => 425.jpg} (100%) rename data/maps/426/{combined.png => 426.jpg} (100%) rename data/maps/427/{combined.png => 427.jpg} (100%) rename data/maps/428/{combined.png => 428.jpg} (100%) rename data/maps/429/{combined.png => 429.jpg} (100%) rename data/maps/43/{combined.png => 43.jpg} (100%) rename data/maps/430/{combined.png => 430.jpg} (100%) rename data/maps/431/{combined.png => 431.jpg} (100%) rename data/maps/432/{combined.png => 432.jpg} (100%) rename data/maps/433/{combined.png => 433.jpg} (100%) rename data/maps/434/{combined.png => 434.jpg} (100%) rename data/maps/435/{combined.png => 435.jpg} (100%) rename data/maps/436/{combined.png => 436.jpg} (100%) rename data/maps/437/{combined.png => 437.jpg} (100%) rename data/maps/438/{combined.png => 438.jpg} (100%) rename data/maps/439/{combined.png => 439.jpg} (100%) rename data/maps/44/{combined.png => 44.jpg} (100%) rename data/maps/440/{combined.png => 440.jpg} (100%) rename data/maps/441/{combined.png => 441.jpg} (100%) rename data/maps/442/{combined.png => 442.jpg} (100%) rename data/maps/443/{combined.png => 443.jpg} (100%) rename data/maps/444/{combined.png => 444.jpg} (100%) rename data/maps/445/{combined.png => 445.jpg} (100%) rename data/maps/446/{combined.png => 446.jpg} (100%) rename data/maps/447/{combined.png => 447.jpg} (100%) rename data/maps/448/{combined.png => 448.jpg} (100%) rename data/maps/449/{combined.png => 449.jpg} (100%) rename data/maps/45/{combined.png => 45.jpg} (100%) rename data/maps/450/{combined.png => 450.jpg} (100%) rename data/maps/451/{combined.png => 451.jpg} (100%) rename data/maps/452/{combined.png => 452.jpg} (100%) rename data/maps/453/{combined.png => 453.jpg} (100%) rename data/maps/454/{combined.png => 454.jpg} (100%) rename data/maps/455/{combined.png => 455.jpg} (100%) rename data/maps/456/{combined.png => 456.jpg} (100%) rename data/maps/457/{combined.png => 457.jpg} (100%) rename data/maps/458/{combined.png => 458.jpg} (100%) rename data/maps/459/{combined.png => 459.jpg} (100%) rename data/maps/46/{combined.png => 46.jpg} (100%) rename data/maps/460/{combined.png => 460.jpg} (100%) rename data/maps/461/{combined.png => 461.jpg} (100%) rename data/maps/462/{combined.png => 462.jpg} (100%) rename data/maps/463/{combined.png => 463.jpg} (100%) rename data/maps/464/{combined.png => 464.jpg} (100%) rename data/maps/465/{combined.png => 465.jpg} (100%) rename data/maps/466/{combined.png => 466.jpg} (100%) rename data/maps/467/{combined.png => 467.jpg} (100%) rename data/maps/468/{combined.png => 468.jpg} (100%) rename data/maps/469/{combined.png => 469.jpg} (100%) rename data/maps/47/{combined.png => 47.jpg} (100%) rename data/maps/470/{combined.png => 470.jpg} (100%) rename data/maps/471/{combined.png => 471.jpg} (100%) rename data/maps/472/{combined.png => 472.jpg} (100%) rename data/maps/473/{combined.png => 473.jpg} (100%) rename data/maps/474/{combined.png => 474.jpg} (100%) rename data/maps/475/{combined.png => 475.jpg} (100%) rename data/maps/476/{combined.png => 476.jpg} (100%) rename data/maps/477/{combined.png => 477.jpg} (100%) rename data/maps/478/{combined.png => 478.jpg} (100%) rename data/maps/479/{combined.png => 479.jpg} (100%) rename data/maps/48/{combined.png => 48.jpg} (100%) rename data/maps/480/{combined.png => 480.jpg} (100%) rename data/maps/481/{combined.png => 481.jpg} (100%) rename data/maps/482/{combined.png => 482.jpg} (100%) rename data/maps/483/{combined.png => 483.jpg} (100%) rename data/maps/484/{combined.png => 484.jpg} (100%) rename data/maps/485/{combined.png => 485.jpg} (100%) rename data/maps/486/{combined.png => 486.jpg} (100%) rename data/maps/487/{combined.png => 487.jpg} (100%) rename data/maps/488/{combined.png => 488.jpg} (100%) rename data/maps/489/{combined.png => 489.jpg} (100%) rename data/maps/49/{combined.png => 49.jpg} (100%) rename data/maps/490/{combined.png => 490.jpg} (100%) rename data/maps/491/{combined.png => 491.jpg} (100%) rename data/maps/492/{combined.png => 492.jpg} (100%) rename data/maps/493/{combined.png => 493.jpg} (100%) rename data/maps/494/{combined.png => 494.jpg} (100%) rename data/maps/495/{combined.png => 495.jpg} (100%) rename data/maps/496/{combined.png => 496.jpg} (100%) rename data/maps/497/{combined.png => 497.jpg} (100%) rename data/maps/498/{combined.png => 498.jpg} (100%) rename data/maps/499/{combined.png => 499.jpg} (100%) rename data/maps/5/{combined.png => 5.jpg} (100%) rename data/maps/50/{combined.png => 50.jpg} (100%) rename data/maps/500/{combined.png => 500.jpg} (100%) rename data/maps/501/{combined.png => 501.jpg} (100%) rename data/maps/502/{combined.png => 502.jpg} (100%) rename data/maps/503/{combined.png => 503.jpg} (100%) rename data/maps/504/{combined.png => 504.jpg} (100%) rename data/maps/505/{combined.png => 505.jpg} (100%) rename data/maps/506/{combined.png => 506.jpg} (100%) rename data/maps/507/{combined.png => 507.jpg} (100%) rename data/maps/508/{combined.png => 508.jpg} (100%) rename data/maps/509/{combined.png => 509.jpg} (100%) rename data/maps/51/{combined.png => 51.jpg} (100%) rename data/maps/510/{combined.png => 510.jpg} (100%) rename data/maps/511/{combined.png => 511.jpg} (100%) rename data/maps/512/{combined.png => 512.jpg} (100%) rename data/maps/513/{combined.png => 513.jpg} (100%) rename data/maps/514/{combined.png => 514.jpg} (100%) rename data/maps/515/{combined.png => 515.jpg} (100%) rename data/maps/516/{combined.png => 516.jpg} (100%) rename data/maps/517/{combined.png => 517.jpg} (100%) rename data/maps/518/{combined.png => 518.jpg} (100%) rename data/maps/519/{combined.png => 519.jpg} (100%) rename data/maps/52/{combined.png => 52.jpg} (100%) rename data/maps/520/{combined.png => 520.jpg} (100%) rename data/maps/521/{combined.png => 521.jpg} (100%) rename data/maps/522/{combined.png => 522.jpg} (100%) rename data/maps/523/{combined.png => 523.jpg} (100%) rename data/maps/524/{combined.png => 524.jpg} (100%) rename data/maps/525/{combined.png => 525.jpg} (100%) rename data/maps/526/{combined.png => 526.jpg} (100%) rename data/maps/527/{combined.png => 527.jpg} (100%) rename data/maps/528/{combined.png => 528.jpg} (100%) rename data/maps/529/{combined.png => 529.jpg} (100%) rename data/maps/53/{combined.png => 53.jpg} (100%) rename data/maps/530/{combined.png => 530.jpg} (100%) rename data/maps/531/{combined.png => 531.jpg} (100%) rename data/maps/532/{combined.png => 532.jpg} (100%) rename data/maps/533/{combined.png => 533.jpg} (100%) rename data/maps/534/{combined.png => 534.jpg} (100%) rename data/maps/535/{combined.png => 535.jpg} (100%) rename data/maps/536/{combined.png => 536.jpg} (100%) rename data/maps/537/{combined.png => 537.jpg} (100%) rename data/maps/538/{combined.png => 538.jpg} (100%) rename data/maps/539/{combined.png => 539.jpg} (100%) rename data/maps/54/{combined.png => 54.jpg} (100%) rename data/maps/540/{combined.png => 540.jpg} (100%) rename data/maps/541/{combined.png => 541.jpg} (100%) rename data/maps/542/{combined.png => 542.jpg} (100%) rename data/maps/543/{combined.png => 543.jpg} (100%) rename data/maps/544/{combined.png => 544.jpg} (100%) rename data/maps/545/{combined.png => 545.jpg} (100%) rename data/maps/546/{combined.png => 546.jpg} (100%) rename data/maps/547/{combined.png => 547.jpg} (100%) rename data/maps/548/{combined.png => 548.jpg} (100%) rename data/maps/549/{combined.png => 549.jpg} (100%) rename data/maps/55/{combined.png => 55.jpg} (100%) rename data/maps/550/{combined.png => 550.jpg} (100%) rename data/maps/551/{combined.png => 551.jpg} (100%) rename data/maps/552/{combined.png => 552.jpg} (100%) rename data/maps/553/{combined.png => 553.jpg} (100%) rename data/maps/554/{combined.png => 554.jpg} (100%) rename data/maps/555/{combined.png => 555.jpg} (100%) rename data/maps/556/{combined.png => 556.jpg} (100%) rename data/maps/557/{combined.png => 557.jpg} (100%) rename data/maps/558/{combined.png => 558.jpg} (100%) rename data/maps/559/{combined.png => 559.jpg} (100%) rename data/maps/56/{combined.png => 56.jpg} (100%) rename data/maps/560/{combined.png => 560.jpg} (100%) rename data/maps/561/{combined.png => 561.jpg} (100%) rename data/maps/562/{combined.png => 562.jpg} (100%) rename data/maps/563/{combined.png => 563.jpg} (100%) rename data/maps/564/{combined.png => 564.jpg} (100%) rename data/maps/565/{combined.png => 565.jpg} (100%) rename data/maps/566/{combined.png => 566.jpg} (100%) rename data/maps/567/{combined.png => 567.jpg} (100%) rename data/maps/568/{combined.png => 568.jpg} (100%) rename data/maps/569/{combined.png => 569.jpg} (100%) rename data/maps/57/{combined.png => 57.jpg} (100%) rename data/maps/570/{combined.png => 570.jpg} (100%) rename data/maps/571/{combined.png => 571.jpg} (100%) rename data/maps/572/{combined.png => 572.jpg} (100%) rename data/maps/573/{combined.png => 573.jpg} (100%) rename data/maps/574/{combined.png => 574.jpg} (100%) rename data/maps/575/{combined.png => 575.jpg} (100%) rename data/maps/576/{combined.png => 576.jpg} (100%) rename data/maps/577/{combined.png => 577.jpg} (100%) rename data/maps/578/{combined.png => 578.jpg} (100%) rename data/maps/579/{combined.png => 579.jpg} (100%) rename data/maps/58/{combined.png => 58.jpg} (100%) rename data/maps/580/{combined.png => 580.jpg} (100%) rename data/maps/581/{combined.png => 581.jpg} (100%) rename data/maps/582/{combined.png => 582.jpg} (100%) rename data/maps/583/{combined.png => 583.jpg} (100%) rename data/maps/584/{combined.png => 584.jpg} (100%) rename data/maps/585/{combined.png => 585.jpg} (100%) rename data/maps/586/{combined.png => 586.jpg} (100%) rename data/maps/587/{combined.png => 587.jpg} (100%) rename data/maps/588/{combined.png => 588.jpg} (100%) rename data/maps/589/{combined.png => 589.jpg} (100%) rename data/maps/59/{combined.png => 59.jpg} (100%) rename data/maps/590/{combined.png => 590.jpg} (100%) rename data/maps/591/{combined.png => 591.jpg} (100%) rename data/maps/592/{combined.png => 592.jpg} (100%) rename data/maps/593/{combined.png => 593.jpg} (100%) rename data/maps/594/{combined.png => 594.jpg} (100%) rename data/maps/595/{combined.png => 595.jpg} (100%) rename data/maps/596/{combined.png => 596.jpg} (100%) rename data/maps/597/{combined.png => 597.jpg} (100%) rename data/maps/598/{combined.png => 598.jpg} (100%) rename data/maps/599/{combined.png => 599.jpg} (100%) rename data/maps/6/{combined.png => 6.jpg} (100%) rename data/maps/60/{combined.png => 60.jpg} (100%) rename data/maps/600/{combined.png => 600.jpg} (100%) rename data/maps/601/{combined.png => 601.jpg} (100%) rename data/maps/602/{combined.png => 602.jpg} (100%) rename data/maps/603/{combined.png => 603.jpg} (100%) rename data/maps/604/{combined.png => 604.jpg} (100%) rename data/maps/605/{combined.png => 605.jpg} (100%) rename data/maps/606/{combined.png => 606.jpg} (100%) rename data/maps/607/{combined.png => 607.jpg} (100%) rename data/maps/608/{combined.png => 608.jpg} (100%) rename data/maps/609/{combined.png => 609.jpg} (100%) rename data/maps/61/{combined.png => 61.jpg} (100%) rename data/maps/610/{combined.png => 610.jpg} (100%) rename data/maps/611/{combined.png => 611.jpg} (100%) rename data/maps/612/{combined.png => 612.jpg} (100%) rename data/maps/613/{combined.png => 613.jpg} (100%) rename data/maps/614/{combined.png => 614.jpg} (100%) rename data/maps/615/{combined.png => 615.jpg} (100%) rename data/maps/616/{combined.png => 616.jpg} (100%) rename data/maps/617/{combined.png => 617.jpg} (100%) rename data/maps/618/{combined.png => 618.jpg} (100%) rename data/maps/619/{combined.png => 619.jpg} (100%) rename data/maps/62/{combined.png => 62.jpg} (100%) rename data/maps/620/{combined.png => 620.jpg} (100%) rename data/maps/621/{combined.png => 621.jpg} (100%) rename data/maps/622/{combined.png => 622.jpg} (100%) rename data/maps/623/{combined.png => 623.jpg} (100%) rename data/maps/624/{combined.png => 624.jpg} (100%) rename data/maps/625/{combined.png => 625.jpg} (100%) rename data/maps/626/{combined.png => 626.jpg} (100%) rename data/maps/627/{combined.png => 627.jpg} (100%) rename data/maps/628/{combined.png => 628.jpg} (100%) rename data/maps/629/{combined.png => 629.jpg} (100%) rename data/maps/63/{combined.png => 63.jpg} (100%) rename data/maps/630/{combined.png => 630.jpg} (100%) rename data/maps/631/{combined.png => 631.jpg} (100%) rename data/maps/632/{combined.png => 632.jpg} (100%) rename data/maps/633/{combined.png => 633.jpg} (100%) rename data/maps/634/{combined.png => 634.jpg} (100%) rename data/maps/635/{combined.png => 635.jpg} (100%) rename data/maps/636/{combined.png => 636.jpg} (100%) rename data/maps/637/{combined.png => 637.jpg} (100%) rename data/maps/638/{combined.png => 638.jpg} (100%) rename data/maps/639/{combined.png => 639.jpg} (100%) rename data/maps/64/{combined.png => 64.jpg} (100%) rename data/maps/640/{combined.png => 640.jpg} (100%) rename data/maps/641/{combined.png => 641.jpg} (100%) rename data/maps/642/{combined.png => 642.jpg} (100%) rename data/maps/643/{combined.png => 643.jpg} (100%) rename data/maps/644/{combined.png => 644.jpg} (100%) rename data/maps/645/{combined.png => 645.jpg} (100%) rename data/maps/646/{combined.png => 646.jpg} (100%) rename data/maps/647/{combined.png => 647.jpg} (100%) rename data/maps/648/{combined.png => 648.jpg} (100%) rename data/maps/649/{combined.png => 649.jpg} (100%) rename data/maps/65/{combined.png => 65.jpg} (100%) rename data/maps/650/{combined.png => 650.jpg} (100%) rename data/maps/651/{combined.png => 651.jpg} (100%) rename data/maps/652/{combined.png => 652.jpg} (100%) rename data/maps/653/{combined.png => 653.jpg} (100%) rename data/maps/654/{combined.png => 654.jpg} (100%) rename data/maps/655/{combined.png => 655.jpg} (100%) rename data/maps/656/{combined.png => 656.jpg} (100%) rename data/maps/657/{combined.png => 657.jpg} (100%) rename data/maps/66/{combined.png => 66.jpg} (100%) rename data/maps/67/{combined.png => 67.jpg} (100%) rename data/maps/68/{combined.png => 68.jpg} (100%) rename data/maps/69/{combined.png => 69.jpg} (100%) rename data/maps/7/{combined.png => 7.jpg} (100%) rename data/maps/70/{combined.png => 70.jpg} (100%) rename data/maps/71/{combined.png => 71.jpg} (100%) rename data/maps/72/{combined.png => 72.jpg} (100%) rename data/maps/73/{combined.png => 73.jpg} (100%) rename data/maps/74/{combined.png => 74.jpg} (100%) rename data/maps/75/{combined.png => 75.jpg} (100%) rename data/maps/76/{combined.png => 76.jpg} (100%) rename data/maps/77/{combined.png => 77.jpg} (100%) rename data/maps/78/{combined.png => 78.jpg} (100%) rename data/maps/79/{combined.png => 79.jpg} (100%) rename data/maps/8/{combined.png => 8.jpg} (100%) rename data/maps/80/{combined.png => 80.jpg} (100%) rename data/maps/81/{combined.png => 81.jpg} (100%) rename data/maps/82/{combined.png => 82.jpg} (100%) rename data/maps/83/{combined.png => 83.jpg} (100%) rename data/maps/84/{combined.png => 84.jpg} (100%) rename data/maps/85/{combined.png => 85.jpg} (100%) rename data/maps/86/{combined.png => 86.jpg} (100%) rename data/maps/87/{combined.png => 87.jpg} (100%) rename data/maps/88/{combined.png => 88.jpg} (100%) rename data/maps/89/{combined.png => 89.jpg} (100%) rename data/maps/9/{combined.png => 9.jpg} (100%) rename data/maps/90/{combined.png => 90.jpg} (100%) rename data/maps/91/{combined.png => 91.jpg} (100%) rename data/maps/92/{combined.png => 92.jpg} (100%) rename data/maps/93/{combined.png => 93.jpg} (100%) rename data/maps/94/{combined.png => 94.jpg} (100%) rename data/maps/95/{combined.png => 95.jpg} (100%) rename data/maps/96/{combined.png => 96.jpg} (100%) rename data/maps/97/{combined.png => 97.jpg} (100%) rename data/maps/98/{combined.png => 98.jpg} (100%) rename data/maps/99/{combined.png => 99.jpg} (100%) create mode 100644 data/maps/combine.py delete mode 100644 modules/debug.py rename modules/{classes.py => menu.py} (72%) delete mode 100644 modules/multiplayer.py create mode 100644 modules/settings.py create mode 100644 modules/systems.py create mode 100644 settings.json diff --git a/.gitignore b/.gitignore index 1dcf6f9..8aab026 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ Prompts.txt Idea.txt data/data_old.7z *.pyc +PyYoda_2.7z diff --git a/LICENSE b/LICENSE index 51d1038..d9f08fa 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Nighthawk +Copyright (c) 2023 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +SOFTWARE. \ No newline at end of file diff --git a/data/Yoda_Stories.tiled-session b/data/Yoda_Stories.tiled-session index cc7e383..14dd9ce 100644 --- a/data/Yoda_Stories.tiled-session +++ b/data/Yoda_Stories.tiled-session @@ -1,32 +1,75 @@ { - "activeFile": "maps/111/tiled.tmx", + "Map/SizeTest": { + "height": 4300, + "width": 2 + }, + "activeFile": "tiles/Yoda Stories.tsx", "expandedProjectPaths": [ - "maps/106", - "maps/101", - "maps/1", - "maps", - "maps/102", - "maps/104", - "maps/111", + "maps/94", + "combined_maps/dagobah", + "maps/96", + "maps/95", + "maps/93", "tiles", - "maps/0", ".", - "maps/109", - "maps/10", - "maps/103", - "maps/107", - "maps/108", - "maps/105", - "maps/100", - "maps/11", - "maps/110" + "combined_maps" ], "fileStates": { + "C:/Users/Nighthawk/Desktop/LearnPython/Contra/data/Platforms.tsx": { + "scaleInDock": 1 + }, + "C:/Users/Nighthawk/Desktop/LearnPython/Contra/data/map.tmx": { + "scale": 0.06791015625, + "selectedLayer": 0, + "viewCenter": { + "x": 7848.605119355765, + "y": 3350.0143802128264 + } + }, + "C:/Users/Nighthawk/Desktop/LearnPython/Contra/data/tiles_out.tsx": { + "scaleInDock": 1 + }, + "C:/Users/Nighthawk/Desktop/LearnPython/Western/data/fence.tsx": { + "scaleInDock": 1 + }, + "C:/Users/Nighthawk/Desktop/LearnPython/Western/data/ground.tsx": { + "scaleInDock": 1 + }, + "C:/Users/Nighthawk/Desktop/LearnPython/Western/data/map.tmx": { + "scale": 0.22191406249999998, + "selectedLayer": 3, + "viewCenter": { + "x": 2748.811828903362, + "y": 1403.6965323006514 + } + }, + "C:/Users/Nighthawk/Desktop/LearnPython/Western/data/objects.tsx": { + "scaleInDock": 1 + }, "Yoda_Stories_Tiles.tsx": { "dynamicWrapping": false, "scaleInDock": 1, "scaleInEditor": 1 }, + "combined_maps/dagobah/dagobah.tmx": { + "scale": 0.7397135416666667, + "selectedLayer": 0, + "viewCenter": { + "x": 577.250484069706, + "y": 576.5745467347298 + } + }, + "combined_maps/dagobah/degobah.tmx": { + "expandedObjectLayers": [ + 5 + ], + "scale": 1.5, + "selectedLayer": 3, + "viewCenter": { + "x": -258, + "y": 913.6666666666666 + } + }, "maps/0/tiled.tmx": { "scale": 1, "selectedLayer": 0, @@ -39,32 +82,32 @@ "scale": 2.96875, "selectedLayer": 0, "viewCenter": { - "x": 144, - "y": 143.66315789473686 + "x": 143.1578947368421, + "y": 142.98947368421054 } }, "maps/10/tiled.tmx": { "scale": 1.484375, "selectedLayer": 0, "viewCenter": { - "x": 288, - "y": 288 + "x": 286.3157894736842, + "y": 287.3263157894737 } }, "maps/100/tiled.tmx": { "scale": 1.484375, "selectedLayer": 0, "viewCenter": { - "x": 288, - "y": 288 + "x": 286.3157894736842, + "y": 287.3263157894737 } }, "maps/101/tiled.tmx": { "scale": 1.484375, "selectedLayer": 0, "viewCenter": { - "x": 288.33684210526314, - "y": 288.33684210526314 + "x": 287.66315789473686, + "y": 287.3263157894737 } }, "maps/102/tiled.tmx": { @@ -135,8 +178,8 @@ "scale": 1.484375, "selectedLayer": 0, "viewCenter": { - "x": 288, - "y": 288 + "x": 286.9894736842105, + "y": 287.3263157894737 } }, "maps/110/tiled.tmx": { @@ -151,8 +194,304 @@ "scale": 2.96875, "selectedLayer": 0, "viewCenter": { - "x": 22.56842105263157, - "y": 14.652631578947378 + "x": 21.89473684210526, + "y": 14.31578947368422 + } + }, + "maps/15/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/262/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/263/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/264/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/265/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/266/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/267/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/268/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/270/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/271/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/272/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/273/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/274/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/275/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/277/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/278/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/279/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/28/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/280/tiled.tmx": { + "scale": 2.958854166666667, + "selectedLayer": 0, + "viewCenter": { + "x": 144.3126210174265, + "y": 144.14363668368244 + } + }, + "maps/32/tiled.tmx": { + "scale": 0.6036458333333332, + "selectedLayer": 0, + "viewCenter": { + "x": 288.24849007765323, + "y": 289.0767903364971 + } + }, + "maps/530/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/592/tiled.tmx": { + "scale": 0.6036458333333332, + "selectedLayer": 0, + "viewCenter": { + "x": 288.24849007765323, + "y": 289.0767903364971 + } + }, + "maps/593/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/606/tiled.tmx": { + "scale": 0.6036458333333332, + "selectedLayer": 0, + "viewCenter": { + "x": 288.24849007765323, + "y": 289.0767903364971 + } + }, + "maps/622/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/647/tiled.tmx": { + "scale": 0.6036458333333332, + "selectedLayer": 0, + "viewCenter": { + "x": 288.24849007765323, + "y": 289.0767903364971 + } + }, + "maps/648/tiled.tmx": { + "scale": 0.6036458333333332, + "selectedLayer": 0, + "viewCenter": { + "x": 288.24849007765323, + "y": 289.0767903364971 + } + }, + "maps/7/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/70/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/91/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/93/tiled.tmx": { + "scale": 1, + "selectedLayer": 0, + "viewCenter": { + "x": 326, + "y": 224.5 + } + }, + "maps/94/tiled.tmx": { + "scale": 0.5, + "selectedLayer": 2, + "viewCenter": { + "x": 548, + "y": 303 + } + }, + "maps/95/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 2, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/96/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/97/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/98/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 + } + }, + "maps/99/tiled.tmx": { + "scale": 1.4794270833333334, + "selectedLayer": 0, + "viewCenter": { + "x": 288.625242034853, + "y": 288.2872733673649 } }, "tiles/Yoda Stories.tsx": { @@ -162,23 +501,26 @@ } }, "last.exportedFilePath": "C:/Users/Nighthawk/Desktop", + "map.height": 36, "map.lastUsedExportFilter": "CSV files (*.csv)", + "map.lastUsedFormat": "tmx", + "map.width": 36, "openFiles": [ - "maps/111/tiled.tmx" + "tiles/Yoda Stories.tsx" ], "project": "Yoda_Stories.tiled-project", "recentFiles": [ - "maps/111/tiled.tmx", - "maps/110/tiled.tmx", - "maps/11/tiled.tmx", - "maps/109/tiled.tmx", - "maps/108/tiled.tmx", - "maps/107/tiled.tmx", - "maps/105/tiled.tmx", - "maps/104/tiled.tmx", - "maps/103/tiled.tmx", - "maps/102/tiled.tmx", - "maps/100/tiled.tmx", - "maps/10/tiled.tmx" + "tiles/Yoda Stories.tsx", + "combined_maps/dagobah/dagobah.tmx", + "combined_maps/dagobah/degobah.tmx", + "C:/Users/Nighthawk/Desktop/LearnPython/Western/data/map.tmx", + "maps/96/tiled.tmx", + "maps/95/tiled.tmx", + "maps/94/tiled.tmx", + "maps/93/tiled.tmx", + "maps/28/tiled.tmx", + "maps/280/tiled.tmx", + "maps/279/tiled.tmx", + "maps/278/tiled.tmx" ] } diff --git a/data/combined_maps/dagobah/dagobah.tmx b/data/combined_maps/dagobah/dagobah.tmx new file mode 100644 index 0000000..2350583 --- /dev/null +++ b/data/combined_maps/dagobah/dagobah.tmx @@ -0,0 +1,137 @@ + + + + + +1,1,859,859,1,859,859,859,859,1,859,859,859,859,859,859,859,859,1,859,859,859,859,859,859,859,1,859,859,859,859,859,859,859,859,859, +859,859,859,859,859,859,859,859,859,1920,1,859,859,859,859,859,859,859,859,859,859,904,906,906,904,859,1,859,859,859,904,904,904,859,859,859, +859,904,904,906,904,904,859,1,904,904,906,904,904,859,859,859,859,859,859,859,859,859,859,859,903,904,904,904,904,904,906,905,859,904,904,859, +859,859,859,859,859,859,904,906,905,857,859,859,859,904,904,859,859,859,859,859,859,925,859,859,859,859,859,859,859,859,859,906,905,859,904,859, +859,859,859,859,857,903,905,859,858,859,859,859,903,905,859,904,904,906,904,906,904,905,922,925,923,859,1,859,859,937,859,859,858,1,859,859, +859,859,859,859,859,859,859,859,859,859,859,859,859,859,858,859,859,859,859,859,859,859,859,859,857,903,904,904,904,859,859,859,1210,859,903,904, +859,859,859,859,859,859,859,859,859,859,859,859,859,859,937,938,939,857,859,859,937,859,939,920,924,921,859,859,859,859,859,859,859,859,859,859, +859,904,906,905,859,859,859,859,859,859,859,904,904,905,859,859,859,859,859,859,859,859,859,928,933,929,921,903,904,904,1,859,859,859,859,859, +859,859,859,858,859,859,859,859,859,859,859,858,859,859,859,859,859,859,859,859,859,922,859,856,919,919,927,859,903,904,904,905,859,922,859,859, +859,859,859,937,938,939,859,859,904,904,906,905,857,859,859,859,859,859,858,937,859,939,922,859,919,919,929,859,859,859,859,859,859,859,922,925, +859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,924,928,856,919,856,859,925,925,923,859,859,859,859,859,859, +859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,922,919,856,859,925,859,919,859,859,859,859,859,857,859,859,859,859, +859,859,859,859,859,904,904,904,904,904,859,859,859,859,937,938,939,859,859,859,859,919,859,859,859,856,919,856,919,856,859,859,859,859,904,859, +859,903,904,905,859,859,858,859,857,859,859,859,859,859,859,858,859,859,857,859,859,919,919,919,919,919,919,859,859,859,925,923,859,903,904,905, +859,859,859,859,859,859,859,859,859,903,904,906,906,904,905,859,859,859,859,859,922,925,925,925,925,925,925,859,859,859,859,859,859,859,859,859, +859,859,859,859,937,938,939,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,903,904,904,905,922,925,856,925,923,859,859,939,904,859, +859,859,904,905,859,857,859,859,859,859,859,859,859,859,859,859,859,859,859,937,859,939,859,859,857,859,859,922,923,859,859,859,857,903,906,904, +859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,1,859,859,859,903,904,905,859,859,859,859,859,858,859,859,859,859,859,1, +859,859,859,859,859,859,859,859,859,859,859,857,859,859,859,859,859,859,1,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,1, +859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,1,859,859,857,859,859,859,859,859,859,859,857,859,922,923,859,859,859, +859,859,904,906,905,859,859,859,859,859,859,859,859,1,859,859,859,859,859,859,859,859,859,937,859,939,859,859,859,859,859,859,903,904,904,904, +859,859,859,857,859,859,859,904,904,904,905,859,859,1,859,904,904,904,904,905,859,859,859,859,859,859,859,859,859,859,859,859,859,858,859,859, +859,904,905,859,859,859,859,859,859,859,859,859,903,904,906,905,859,858,859,859,859,859,859,859,937,859,859,859,859,919,859,859,859,859,859,859, +859,859,858,859,903,904,904,905,859,859,859,859,859,859,859,937,938,939,859,859,937,859,939,859,859,859,859,859,859,859,859,859,859,859,903,904, +859,859,859,859,859,859,859,859,859,859,859,858,859,859,859,859,857,859,859,859,859,859,859,859,859,859,922,925,925,859,859,859,859,859,859,859, +859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,937,859,939,859,859,859,922,859,859,859,859,859,859, +859,859,859,903,904,904,859,859,1,859,859,859,922,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,922,925,925,923,859,859, +859,859,859,859,859,903,904,906,906,904,905,859,859,922,859,859,923,859,859,859,858,859,859,859,859,859,859,859,922,925,925,923,859,859,1,859, +904,904,906,905,859,859,859,858,859,857,859,859,859,922,922,923,859,859,859,859,859,859,859,859,859,859,859,859,859,859,937,859,939,903,904,904, +904,905,859,859,859,859,859,859,859,859,859,857,859,859,922,923,859,859,859,859,859,859,937,859,939,859,859,859,859,859,859,859,859,859,859,859, +859,859,857,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,858,859,859,937,859,939,859, +859,859,859,859,859,859,859,859,859,859,859,903,937,859,939,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,857,859,859,859, +904,905,859,859,859,859,859,859,859,859,859,859,859,857,859,859,859,859,859,859,859,937,859,939,859,859,859,859,859,859,937,859,939,859,859,859, +859,859,859,859,859,1,856,859,925,923,858,859,859,859,859,859,859,859,859,857,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859, +859,922,925,925,859,859,1,923,859,859,859,859,859,859,859,859,1,859,859,859,859,859,859,859,859,904,904,904,905,859,859,859,859,859,859,859, +859,859,859,859,922,925,923,859,859,922,923,859,859,859,859,859,859,1,859,859,859,859,859,903,904,905,859,859,859,859,859,859,859,859,859,1 + + + + +916,916,916,916,916,356,916,916,916,916,916,916,356,916,916,916,916,916,916,916,916,914,918,918,916,916,916,916,916,914,916,916,916,916,916,916, +916,916,916,918,916,916,0,916,914,916,918,916,916,916,916,356,916,916,916,916,916,0,0,0,915,916,916,916,916,916,0,917,356,356,356,916, +916,917,0,0,0,915,916,918,917,0,0,0,356,914,916,913,916,916,916,916,916,920,924,921,0,0,0,0,0,0,0,0,915,916,916,916, +916,916,356,0,0,915,917,0,0,0,0,0,915,917,0,915,916,918,916,918,916,917,930,929,921,915,916,915,916,0,0,1203,1204,1205,356,356, +916,916,916,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,915,916,916,916,0,938,1206,1207,1208,915,916, +916,916,916,0,0,0,0,0,0,0,356,916,916,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1209,0,1211,0,356, +916,916,918,917,0,0,0,0,0,0,916,916,916,917,0,938,0,0,0,0,0,938,0,920,924,921,0,915,916,916,916,0,0,920,924,924, +916,0,0,0,0,0,940,356,916,916,0,0,0,0,0,0,0,0,0,0,0,920,924,928,0,929,921,0,915,916,916,917,0,926,856,919, +916,0,0,0,0,0,0,916,916,916,918,917,0,0,0,0,0,0,0,0,0,0,930,0,0,0,927,0,0,0,0,0,0,0,930,919, +916,916,0,0,938,0,916,0,0,0,0,0,0,940,0,0,0,0,0,0,938,939,926,930,0,0,929,924,924,921,0,0,0,0,0,356, +916,916,356,0,0,0,916,916,916,0,356,0,0,0,0,0,0,0,0,920,924,0,0,0,0,0,931,936,0,0,0,0,0,0,356,916, +916,356,356,0,0,915,916,916,916,916,916,916,916,356,0,0,0,0,0,0,930,0,931,936,930,0,929,924,924,924,921,0,0,0,916,916, +916,916,916,917,0,0,0,0,0,0,916,916,916,916,0,938,0,0,936,0,926,0,929,924,928,0,0,931,930,856,929,921,0,915,916,917, +916,916,356,0,0,0,0,940,0,915,916,918,918,916,917,0,0,0,0,0,926,0,0,0,356,0,0,927,926,931,0,0,0,0,0,356, +916,916,356,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,932,922,925,925,916,916,917,930,929,928,929,921,0,0,0,356,356, +916,916,916,917,0,938,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,930,931,0,0,0,940,915,918,916, +916,916,356,0,0,0,0,0,0,0,0,0,0,0,0,0,356,916,356,0,938,0,916,917,0,0,932,0,0,936,0,0,0,0,0,356, +916,916,916,356,0,0,0,916,916,916,0,0,0,0,0,916,916,916,916,0,0,0,0,0,0,0,0,0,0,0,0,920,921,0,916,916, +916,916,356,356,0,0,0,916,916,916,0,0,0,0,0,916,916,916,916,0,0,0,0,0,0,0,0,0,0,0,0,926,927,356,356,916, +916,916,916,918,917,0,916,916,916,916,0,0,0,0,916,916,916,916,916,0,0,0,0,0,0,0,0,0,0,0,0,0,915,916,916,916, +916,356,356,0,0,0,916,916,916,916,0,0,0,916,916,914,916,916,916,917,0,0,0,0,938,0,0,920,921,0,0,0,0,0,356,916, +916,916,917,0,0,916,916,0,0,0,0,0,915,916,918,917,0,0,0,0,0,0,0,0,0,0,920,928,929,924,924,921,0,0,0,356, +916,0,0,0,915,916,916,917,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,940,926,919,856,0,856,927,0,0,915,916, +916,0,0,0,0,0,0,0,916,356,0,932,0,0,0,0,938,0,0,0,0,938,0,0,0,0,926,933,919,919,919,929,921,0,0,356, +916,0,0,0,916,916,916,916,916,916,0,0,0,920,921,0,0,0,0,0,0,0,0,0,0,0,0,0,0,930,856,933,929,921,0,356, +916,916,0,915,916,913,916,916,916,916,0,0,920,928,929,921,0,0,0,0,0,0,0,0,938,0,0,0,0,0,930,919,856,927,0,916, +916,916,0,0,0,915,916,918,918,916,0,0,936,930,919,929,921,0,0,0,0,0,0,0,0,0,0,0,920,924,928,931,0,0,916,356, +916,916,918,917,0,0,0,0,0,0,0,0,0,0,930,931,0,0,0,940,0,0,0,0,0,0,0,0,0,0,0,0,0,915,916,916, +916,917,0,0,0,0,940,0,0,0,0,0,0,0,926,927,932,0,0,0,0,0,0,0,0,0,0,0,0,0,0,938,0,0,0,356, +0,0,0,0,0,949,950,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,938,0,0,0,0,0,0,0,0,0,0,0,356, +0,0,0,0,0,951,952,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,940,0,0,0,0,938,0,356, +916,917,0,0,0,0,0,920,924,921,0,0,0,938,0,0,0,0,0,0,0,0,0,0,0,356,356,0,0,0,0,0,0,0,0,356, +0,0,920,924,924,924,924,928,919,927,0,0,0,0,0,0,0,0,0,0,0,0,938,0,356,916,916,916,0,0,0,938,0,356,916,916, +924,924,928,919,919,919,856,931,0,0,0,940,0,0,0,0,356,916,916,356,0,0,0,0,916,916,916,916,917,0,0,0,356,916,916,916, +919,856,931,0,930,933,931,0,938,920,921,0,0,356,916,916,916,916,916,916,356,0,0,915,916,917,0,0,0,0,0,356,916,916,916,916, +916,916,927,940,0,0,0,0,0,0,0,0,0,916,916,918,916,918,916,916,916,356,0,0,0,0,0,943,0,356,916,916,916,916,916,916 + + + + +876,912,908,910,908,911,876,876,912,908,910,908,911,876,876,876,876,876,876,876,876,877,0,0,907,908,908,908,908,909,945,946,946,876,876,876, +876,877,0,0,0,875,912,910,0,0,0,0,875,912,908,911,876,876,876,876,876,877,0,0,0,0,0,872,874,945,946,943,907,908,911,876, +876,879,874,0,0,907,909,0,0,0,0,0,907,0,0,0,908,910,908,910,908,909,0,0,0,872,873,878,879,874,943,941,0,0,875,876, +876,876,879,874,0,0,0,0,0,0,0,872,873,874,945,946,947,0,0,0,945,946,947,0,0,907,908,911,876,877,941,0,0,0,907,911, +876,876,876,877,0,0,0,0,0,0,872,878,876,877,942,943,944,0,0,0,942,943,944,0,0,0,0,875,876,877,0,0,0,0,0,875, +876,912,910,909,0,945,946,947,0,872,878,912,908,909,0,941,0,0,0,0,0,941,0,0,0,0,0,907,911,879,873,874,0,0,0,875, +876,877,0,945,946,947,948,872,873,878,876,877,0,0,0,0,0,0,0,945,946,947,0,0,2036,0,0,0,907,908,908,909,0,0,0,875, +876,877,0,942,943,944,872,878,912,908,910,909,945,946,947,0,0,0,0,942,943,944,0,2036,2036,2036,0,0,0,0,0,0,0,0,0,875, +876,879,874,0,941,872,878,876,879,874,0,0,0,948,0,0,0,0,0,0,941,0,0,2036,2036,2036,945,946,947,0,0,0,0,0,0,875, +876,876,877,0,0,875,876,876,876,879,874,0,0,0,945,946,947,0,0,0,0,0,945,946,947,2036,0,935,0,0,0,0,0,0,872,878, +876,876,879,874,0,907,908,908,908,911,879,873,873,874,942,943,944,0,934,0,0,2036,2036,935,2036,2036,0,0,0,0,0,0,0,872,878,876, +876,912,908,909,0,0,945,946,947,875,876,876,876,879,874,941,0,0,935,0,0,2036,0,0,0,2036,0,0,0,0,0,0,0,907,908,911, +876,879,874,0,945,946,947,948,0,907,908,910,910,908,909,0,0,0,0,0,0,2036,0,872,873,874,2036,0,0,0,0,945,946,947,0,875, +876,876,879,874,942,943,944,0,0,0,0,0,0,0,0,0,0,0,0,945,946,947,2036,912,908,909,2036,0,0,0,0,942,943,872,873,878, +876,876,912,909,0,941,0,0,0,0,0,0,0,0,0,0,0,0,0,942,943,872,878,877,0,0,0,0,0,0,0,0,941,907,910,908, +876,876,877,0,0,0,0,0,0,0,0,0,0,0,0,0,872,873,874,0,941,907,908,909,0,0,0,0,0,934,0,0,0,0,0,872, +876,876,879,874,0,0,872,873,873,873,874,0,0,0,872,873,878,876,879,874,0,915,0,0,0,0,0,0,0,0,0,0,0,872,873,878, +876,876,876,879,874,0,875,876,876,876,877,0,0,0,875,876,876,876,876,877,0,0,0,945,946,947,0,0,0,0,0,0,872,878,876,876, +876,876,912,910,909,872,878,876,876,876,877,0,0,872,878,876,876,876,876,877,0,0,0,942,943,944,0,0,0,0,0,0,907,908,911,876, +876,876,877,0,0,875,876,912,908,908,909,0,872,878,876,912,908,908,908,909,0,0,0,0,941,0,0,0,0,0,0,0,0,0,875,876, +876,912,909,0,872,878,876,877,0,0,917,0,907,908,910,945,946,947,0,0,945,946,947,0,945,946,947,0,0,0,0,0,0,0,875,876, +876,877,0,0,907,908,908,909,0,0,0,0,0,0,0,942,943,944,0,0,942,943,944,0,942,943,944,0,0,0,0,0,0,0,907,911, +876,877,0,0,0,0,872,873,873,874,0,0,0,0,0,0,941,0,0,0,0,941,0,945,946,947,0,0,0,2036,0,0,0,0,0,875, +876,877,0,872,873,873,878,876,876,879,874,0,0,0,0,0,0,0,0,0,0,0,0,942,943,944,0,0,0,0,0,0,0,0,0,875, +876,879,874,907,908,911,876,876,876,876,877,0,0,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,0,0,872,878, +876,876,879,874,0,0,908,910,910,908,909,0,934,0,0,0,0,0,945,946,947,0,0,0,0,0,0,0,0,0,945,946,947,872,878,876, +876,912,910,909,0,945,946,947,0,0,917,0,0,0,0,0,0,0,0,948,0,0,945,946,947,0,0,0,0,0,942,943,944,907,908,911, +912,909,0,0,0,0,948,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,942,943,944,0,0,0,0,0,0,941,945,946,947,875, +877,0,0,0,0,0,0,0,0,0,0,0,945,946,947,0,0,0,0,0,0,0,0,941,0,0,0,945,946,947,0,0,942,943,944,875, +879,874,0,0,0,0,0,0,0,0,0,0,942,943,944,0,0,0,0,0,0,945,946,947,0,0,0,0,948,0,945,946,947,941,0,875, +912,909,0,0,0,0,0,0,0,0,0,0,0,941,0,0,0,0,0,0,0,942,943,944,0,872,874,0,0,0,942,943,944,0,0,875, +877,0,0,0,0,0,0,945,946,947,945,946,947,0,0,0,0,0,0,0,0,0,941,0,872,878,879,873,874,0,0,941,0,872,873,878, +877,0,0,0,0,0,0,942,943,944,0,948,0,0,0,0,872,873,873,874,0,0,0,872,878,912,908,908,909,0,0,0,872,878,876,876, +877,0,945,946,947,0,0,0,941,0,0,0,0,872,873,873,878,876,876,879,874,0,0,907,908,909,0,0,0,0,0,872,878,876,876,876, +879,873,874,948,0,0,872,873,874,0,0,872,873,878,912,910,908,910,876,876,879,874,0,0,0,0,945,946,947,872,873,878,876,876,876,876, +876,876,879,873,873,873,878,876,879,873,873,878,876,876,877,945,946,947,876,876,876,879,873,873,873,873,873,873,873,878,876,876,876,912,908,908 + + + + + + + + + + + + + + + + diff --git a/data/maps/0/combined.png b/data/maps/0/0.jpg similarity index 100% rename from data/maps/0/combined.png rename to data/maps/0/0.jpg diff --git a/data/maps/1/combined.png b/data/maps/1/1.jpg similarity index 100% rename from data/maps/1/combined.png rename to data/maps/1/1.jpg diff --git a/data/maps/10/combined.png b/data/maps/10/10.jpg similarity index 100% rename from data/maps/10/combined.png rename to data/maps/10/10.jpg diff --git a/data/maps/100/combined.png b/data/maps/100/100.jpg similarity index 100% rename from data/maps/100/combined.png rename to data/maps/100/100.jpg diff --git a/data/maps/101/combined.png b/data/maps/101/101.jpg similarity index 100% rename from data/maps/101/combined.png rename to data/maps/101/101.jpg diff --git a/data/maps/102/combined.png b/data/maps/102/102.jpg similarity index 100% rename from data/maps/102/combined.png rename to data/maps/102/102.jpg diff --git a/data/maps/103/combined.png b/data/maps/103/103.jpg similarity index 100% rename from data/maps/103/combined.png rename to data/maps/103/103.jpg diff --git a/data/maps/104/combined.png b/data/maps/104/104.jpg similarity index 100% rename from data/maps/104/combined.png rename to data/maps/104/104.jpg diff --git a/data/maps/105/combined.png b/data/maps/105/105.jpg similarity index 100% rename from data/maps/105/combined.png rename to data/maps/105/105.jpg diff --git a/data/maps/106/combined.png b/data/maps/106/106.jpg similarity index 100% rename from data/maps/106/combined.png rename to data/maps/106/106.jpg diff --git a/data/maps/107/combined.png b/data/maps/107/107.jpg similarity index 100% rename from data/maps/107/combined.png rename to data/maps/107/107.jpg diff --git a/data/maps/108/combined.png b/data/maps/108/108.jpg similarity index 100% rename from data/maps/108/combined.png rename to data/maps/108/108.jpg diff --git a/data/maps/109/combined.png b/data/maps/109/109.jpg similarity index 100% rename from data/maps/109/combined.png rename to data/maps/109/109.jpg diff --git a/data/maps/11/combined.png b/data/maps/11/11.jpg similarity index 100% rename from data/maps/11/combined.png rename to data/maps/11/11.jpg diff --git a/data/maps/110/combined.png b/data/maps/110/110.jpg similarity index 100% rename from data/maps/110/combined.png rename to data/maps/110/110.jpg diff --git a/data/maps/111/combined.png b/data/maps/111/111.jpg similarity index 100% rename from data/maps/111/combined.png rename to data/maps/111/111.jpg diff --git a/data/maps/112/combined.png b/data/maps/112/112.jpg similarity index 100% rename from data/maps/112/combined.png rename to data/maps/112/112.jpg diff --git a/data/maps/113/combined.png b/data/maps/113/113.jpg similarity index 100% rename from data/maps/113/combined.png rename to data/maps/113/113.jpg diff --git a/data/maps/114/combined.png b/data/maps/114/114.jpg similarity index 100% rename from data/maps/114/combined.png rename to data/maps/114/114.jpg diff --git a/data/maps/115/combined.png b/data/maps/115/115.jpg similarity index 100% rename from data/maps/115/combined.png rename to data/maps/115/115.jpg diff --git a/data/maps/116/combined.png b/data/maps/116/116.jpg similarity index 100% rename from data/maps/116/combined.png rename to data/maps/116/116.jpg diff --git a/data/maps/117/combined.png b/data/maps/117/117.jpg similarity index 100% rename from data/maps/117/combined.png rename to data/maps/117/117.jpg diff --git a/data/maps/118/combined.png b/data/maps/118/118.jpg similarity index 100% rename from data/maps/118/combined.png rename to data/maps/118/118.jpg diff --git a/data/maps/119/combined.png b/data/maps/119/119.jpg similarity index 100% rename from data/maps/119/combined.png rename to data/maps/119/119.jpg diff --git a/data/maps/12/combined.png b/data/maps/12/12.jpg similarity index 100% rename from data/maps/12/combined.png rename to data/maps/12/12.jpg diff --git a/data/maps/120/combined.png b/data/maps/120/120.jpg similarity index 100% rename from data/maps/120/combined.png rename to data/maps/120/120.jpg diff --git a/data/maps/121/combined.png b/data/maps/121/121.jpg similarity index 100% rename from data/maps/121/combined.png rename to data/maps/121/121.jpg diff --git a/data/maps/122/combined.png b/data/maps/122/122.jpg similarity index 100% rename from data/maps/122/combined.png rename to data/maps/122/122.jpg diff --git a/data/maps/123/combined.png b/data/maps/123/123.jpg similarity index 100% rename from data/maps/123/combined.png rename to data/maps/123/123.jpg diff --git a/data/maps/124/combined.png b/data/maps/124/124.jpg similarity index 100% rename from data/maps/124/combined.png rename to data/maps/124/124.jpg diff --git a/data/maps/125/combined.png b/data/maps/125/125.jpg similarity index 100% rename from data/maps/125/combined.png rename to data/maps/125/125.jpg diff --git a/data/maps/126/combined.png b/data/maps/126/126.jpg similarity index 100% rename from data/maps/126/combined.png rename to data/maps/126/126.jpg diff --git a/data/maps/127/combined.png b/data/maps/127/127.jpg similarity index 100% rename from data/maps/127/combined.png rename to data/maps/127/127.jpg diff --git a/data/maps/128/combined.png b/data/maps/128/128.jpg similarity index 100% rename from data/maps/128/combined.png rename to data/maps/128/128.jpg diff --git a/data/maps/129/combined.png b/data/maps/129/129.jpg similarity index 100% rename from data/maps/129/combined.png rename to data/maps/129/129.jpg diff --git a/data/maps/13/combined.png b/data/maps/13/13.jpg similarity index 100% rename from data/maps/13/combined.png rename to data/maps/13/13.jpg diff --git a/data/maps/130/combined.png b/data/maps/130/130.jpg similarity index 100% rename from data/maps/130/combined.png rename to data/maps/130/130.jpg diff --git a/data/maps/131/combined.png b/data/maps/131/131.jpg similarity index 100% rename from data/maps/131/combined.png rename to data/maps/131/131.jpg diff --git a/data/maps/132/combined.png b/data/maps/132/132.jpg similarity index 100% rename from data/maps/132/combined.png rename to data/maps/132/132.jpg diff --git a/data/maps/133/combined.png b/data/maps/133/133.jpg similarity index 100% rename from data/maps/133/combined.png rename to data/maps/133/133.jpg diff --git a/data/maps/134/combined.png b/data/maps/134/134.jpg similarity index 100% rename from data/maps/134/combined.png rename to data/maps/134/134.jpg diff --git a/data/maps/135/combined.png b/data/maps/135/135.jpg similarity index 100% rename from data/maps/135/combined.png rename to data/maps/135/135.jpg diff --git a/data/maps/136/combined.png b/data/maps/136/136.jpg similarity index 100% rename from data/maps/136/combined.png rename to data/maps/136/136.jpg diff --git a/data/maps/137/combined.png b/data/maps/137/137.jpg similarity index 100% rename from data/maps/137/combined.png rename to data/maps/137/137.jpg diff --git a/data/maps/138/combined.png b/data/maps/138/138.jpg similarity index 100% rename from data/maps/138/combined.png rename to data/maps/138/138.jpg diff --git a/data/maps/139/combined.png b/data/maps/139/139.jpg similarity index 100% rename from data/maps/139/combined.png rename to data/maps/139/139.jpg diff --git a/data/maps/14/combined.png b/data/maps/14/14.jpg similarity index 100% rename from data/maps/14/combined.png rename to data/maps/14/14.jpg diff --git a/data/maps/140/combined.png b/data/maps/140/140.jpg similarity index 100% rename from data/maps/140/combined.png rename to data/maps/140/140.jpg diff --git a/data/maps/141/combined.png b/data/maps/141/141.jpg similarity index 100% rename from data/maps/141/combined.png rename to data/maps/141/141.jpg diff --git a/data/maps/142/combined.png b/data/maps/142/142.jpg similarity index 100% rename from data/maps/142/combined.png rename to data/maps/142/142.jpg diff --git a/data/maps/143/combined.png b/data/maps/143/143.jpg similarity index 100% rename from data/maps/143/combined.png rename to data/maps/143/143.jpg diff --git a/data/maps/144/combined.png b/data/maps/144/144.jpg similarity index 100% rename from data/maps/144/combined.png rename to data/maps/144/144.jpg diff --git a/data/maps/145/combined.png b/data/maps/145/145.jpg similarity index 100% rename from data/maps/145/combined.png rename to data/maps/145/145.jpg diff --git a/data/maps/146/combined.png b/data/maps/146/146.jpg similarity index 100% rename from data/maps/146/combined.png rename to data/maps/146/146.jpg diff --git a/data/maps/147/combined.png b/data/maps/147/147.jpg similarity index 100% rename from data/maps/147/combined.png rename to data/maps/147/147.jpg diff --git a/data/maps/148/combined.png b/data/maps/148/148.jpg similarity index 100% rename from data/maps/148/combined.png rename to data/maps/148/148.jpg diff --git a/data/maps/149/combined.png b/data/maps/149/149.jpg similarity index 100% rename from data/maps/149/combined.png rename to data/maps/149/149.jpg diff --git a/data/maps/15/combined.png b/data/maps/15/15.jpg similarity index 100% rename from data/maps/15/combined.png rename to data/maps/15/15.jpg diff --git a/data/maps/150/combined.png b/data/maps/150/150.jpg similarity index 100% rename from data/maps/150/combined.png rename to data/maps/150/150.jpg diff --git a/data/maps/151/combined.png b/data/maps/151/151.jpg similarity index 100% rename from data/maps/151/combined.png rename to data/maps/151/151.jpg diff --git a/data/maps/152/combined.png b/data/maps/152/152.jpg similarity index 100% rename from data/maps/152/combined.png rename to data/maps/152/152.jpg diff --git a/data/maps/153/combined.png b/data/maps/153/153.jpg similarity index 100% rename from data/maps/153/combined.png rename to data/maps/153/153.jpg diff --git a/data/maps/154/combined.png b/data/maps/154/154.jpg similarity index 100% rename from data/maps/154/combined.png rename to data/maps/154/154.jpg diff --git a/data/maps/155/combined.png b/data/maps/155/155.jpg similarity index 100% rename from data/maps/155/combined.png rename to data/maps/155/155.jpg diff --git a/data/maps/156/combined.png b/data/maps/156/156.jpg similarity index 100% rename from data/maps/156/combined.png rename to data/maps/156/156.jpg diff --git a/data/maps/157/combined.png b/data/maps/157/157.jpg similarity index 100% rename from data/maps/157/combined.png rename to data/maps/157/157.jpg diff --git a/data/maps/158/combined.png b/data/maps/158/158.jpg similarity index 100% rename from data/maps/158/combined.png rename to data/maps/158/158.jpg diff --git a/data/maps/159/combined.png b/data/maps/159/159.jpg similarity index 100% rename from data/maps/159/combined.png rename to data/maps/159/159.jpg diff --git a/data/maps/16/combined.png b/data/maps/16/16.jpg similarity index 100% rename from data/maps/16/combined.png rename to data/maps/16/16.jpg diff --git a/data/maps/160/combined.png b/data/maps/160/160.jpg similarity index 100% rename from data/maps/160/combined.png rename to data/maps/160/160.jpg diff --git a/data/maps/161/combined.png b/data/maps/161/161.jpg similarity index 100% rename from data/maps/161/combined.png rename to data/maps/161/161.jpg diff --git a/data/maps/162/combined.png b/data/maps/162/162.jpg similarity index 100% rename from data/maps/162/combined.png rename to data/maps/162/162.jpg diff --git a/data/maps/163/combined.png b/data/maps/163/163.jpg similarity index 100% rename from data/maps/163/combined.png rename to data/maps/163/163.jpg diff --git a/data/maps/164/combined.png b/data/maps/164/164.jpg similarity index 100% rename from data/maps/164/combined.png rename to data/maps/164/164.jpg diff --git a/data/maps/165/combined.png b/data/maps/165/165.jpg similarity index 100% rename from data/maps/165/combined.png rename to data/maps/165/165.jpg diff --git a/data/maps/166/combined.png b/data/maps/166/166.jpg similarity index 100% rename from data/maps/166/combined.png rename to data/maps/166/166.jpg diff --git a/data/maps/167/combined.png b/data/maps/167/167.jpg similarity index 100% rename from data/maps/167/combined.png rename to data/maps/167/167.jpg diff --git a/data/maps/168/combined.png b/data/maps/168/168.jpg similarity index 100% rename from data/maps/168/combined.png rename to data/maps/168/168.jpg diff --git a/data/maps/169/combined.png b/data/maps/169/169.jpg similarity index 100% rename from data/maps/169/combined.png rename to data/maps/169/169.jpg diff --git a/data/maps/17/combined.png b/data/maps/17/17.jpg similarity index 100% rename from data/maps/17/combined.png rename to data/maps/17/17.jpg diff --git a/data/maps/170/combined.png b/data/maps/170/170.jpg similarity index 100% rename from data/maps/170/combined.png rename to data/maps/170/170.jpg diff --git a/data/maps/171/combined.png b/data/maps/171/171.jpg similarity index 100% rename from data/maps/171/combined.png rename to data/maps/171/171.jpg diff --git a/data/maps/172/combined.png b/data/maps/172/172.jpg similarity index 100% rename from data/maps/172/combined.png rename to data/maps/172/172.jpg diff --git a/data/maps/173/combined.png b/data/maps/173/173.jpg similarity index 100% rename from data/maps/173/combined.png rename to data/maps/173/173.jpg diff --git a/data/maps/174/combined.png b/data/maps/174/174.jpg similarity index 100% rename from data/maps/174/combined.png rename to data/maps/174/174.jpg diff --git a/data/maps/175/combined.png b/data/maps/175/175.jpg similarity index 100% rename from data/maps/175/combined.png rename to data/maps/175/175.jpg diff --git a/data/maps/176/combined.png b/data/maps/176/176.jpg similarity index 100% rename from data/maps/176/combined.png rename to data/maps/176/176.jpg diff --git a/data/maps/177/combined.png b/data/maps/177/177.jpg similarity index 100% rename from data/maps/177/combined.png rename to data/maps/177/177.jpg diff --git a/data/maps/178/combined.png b/data/maps/178/178.jpg similarity index 100% rename from data/maps/178/combined.png rename to data/maps/178/178.jpg diff --git a/data/maps/179/combined.png b/data/maps/179/179.jpg similarity index 100% rename from data/maps/179/combined.png rename to data/maps/179/179.jpg diff --git a/data/maps/18/combined.png b/data/maps/18/18.jpg similarity index 100% rename from data/maps/18/combined.png rename to data/maps/18/18.jpg diff --git a/data/maps/180/combined.png b/data/maps/180/180.jpg similarity index 100% rename from data/maps/180/combined.png rename to data/maps/180/180.jpg diff --git a/data/maps/181/combined.png b/data/maps/181/181.jpg similarity index 100% rename from data/maps/181/combined.png rename to data/maps/181/181.jpg diff --git a/data/maps/182/combined.png b/data/maps/182/182.jpg similarity index 100% rename from data/maps/182/combined.png rename to data/maps/182/182.jpg diff --git a/data/maps/183/combined.png b/data/maps/183/183.jpg similarity index 100% rename from data/maps/183/combined.png rename to data/maps/183/183.jpg diff --git a/data/maps/184/combined.png b/data/maps/184/184.jpg similarity index 100% rename from data/maps/184/combined.png rename to data/maps/184/184.jpg diff --git a/data/maps/185/combined.png b/data/maps/185/185.jpg similarity index 100% rename from data/maps/185/combined.png rename to data/maps/185/185.jpg diff --git a/data/maps/186/combined.png b/data/maps/186/186.jpg similarity index 100% rename from data/maps/186/combined.png rename to data/maps/186/186.jpg diff --git a/data/maps/187/combined.png b/data/maps/187/187.jpg similarity index 100% rename from data/maps/187/combined.png rename to data/maps/187/187.jpg diff --git a/data/maps/188/combined.png b/data/maps/188/188.jpg similarity index 100% rename from data/maps/188/combined.png rename to data/maps/188/188.jpg diff --git a/data/maps/189/combined.png b/data/maps/189/189.jpg similarity index 100% rename from data/maps/189/combined.png rename to data/maps/189/189.jpg diff --git a/data/maps/19/combined.png b/data/maps/19/19.jpg similarity index 100% rename from data/maps/19/combined.png rename to data/maps/19/19.jpg diff --git a/data/maps/190/combined.png b/data/maps/190/190.jpg similarity index 100% rename from data/maps/190/combined.png rename to data/maps/190/190.jpg diff --git a/data/maps/191/combined.png b/data/maps/191/191.jpg similarity index 100% rename from data/maps/191/combined.png rename to data/maps/191/191.jpg diff --git a/data/maps/192/combined.png b/data/maps/192/192.jpg similarity index 100% rename from data/maps/192/combined.png rename to data/maps/192/192.jpg diff --git a/data/maps/193/combined.png b/data/maps/193/193.jpg similarity index 100% rename from data/maps/193/combined.png rename to data/maps/193/193.jpg diff --git a/data/maps/194/combined.png b/data/maps/194/194.jpg similarity index 100% rename from data/maps/194/combined.png rename to data/maps/194/194.jpg diff --git a/data/maps/195/combined.png b/data/maps/195/195.jpg similarity index 100% rename from data/maps/195/combined.png rename to data/maps/195/195.jpg diff --git a/data/maps/196/combined.png b/data/maps/196/196.jpg similarity index 100% rename from data/maps/196/combined.png rename to data/maps/196/196.jpg diff --git a/data/maps/197/combined.png b/data/maps/197/197.jpg similarity index 100% rename from data/maps/197/combined.png rename to data/maps/197/197.jpg diff --git a/data/maps/198/combined.png b/data/maps/198/198.jpg similarity index 100% rename from data/maps/198/combined.png rename to data/maps/198/198.jpg diff --git a/data/maps/199/combined.png b/data/maps/199/199.jpg similarity index 100% rename from data/maps/199/combined.png rename to data/maps/199/199.jpg diff --git a/data/maps/2/combined.png b/data/maps/2/2.jpg similarity index 100% rename from data/maps/2/combined.png rename to data/maps/2/2.jpg diff --git a/data/maps/20/combined.png b/data/maps/20/20.jpg similarity index 100% rename from data/maps/20/combined.png rename to data/maps/20/20.jpg diff --git a/data/maps/200/combined.png b/data/maps/200/200.jpg similarity index 100% rename from data/maps/200/combined.png rename to data/maps/200/200.jpg diff --git a/data/maps/201/combined.png b/data/maps/201/201.jpg similarity index 100% rename from data/maps/201/combined.png rename to data/maps/201/201.jpg diff --git a/data/maps/202/combined.png b/data/maps/202/202.jpg similarity index 100% rename from data/maps/202/combined.png rename to data/maps/202/202.jpg diff --git a/data/maps/203/combined.png b/data/maps/203/203.jpg similarity index 100% rename from data/maps/203/combined.png rename to data/maps/203/203.jpg diff --git a/data/maps/204/combined.png b/data/maps/204/204.jpg similarity index 100% rename from data/maps/204/combined.png rename to data/maps/204/204.jpg diff --git a/data/maps/205/combined.png b/data/maps/205/205.jpg similarity index 100% rename from data/maps/205/combined.png rename to data/maps/205/205.jpg diff --git a/data/maps/206/combined.png b/data/maps/206/206.jpg similarity index 100% rename from data/maps/206/combined.png rename to data/maps/206/206.jpg diff --git a/data/maps/207/combined.png b/data/maps/207/207.jpg similarity index 100% rename from data/maps/207/combined.png rename to data/maps/207/207.jpg diff --git a/data/maps/208/combined.png b/data/maps/208/208.jpg similarity index 100% rename from data/maps/208/combined.png rename to data/maps/208/208.jpg diff --git a/data/maps/209/combined.png b/data/maps/209/209.jpg similarity index 100% rename from data/maps/209/combined.png rename to data/maps/209/209.jpg diff --git a/data/maps/21/combined.png b/data/maps/21/21.jpg similarity index 100% rename from data/maps/21/combined.png rename to data/maps/21/21.jpg diff --git a/data/maps/210/combined.png b/data/maps/210/210.jpg similarity index 100% rename from data/maps/210/combined.png rename to data/maps/210/210.jpg diff --git a/data/maps/211/combined.png b/data/maps/211/211.jpg similarity index 100% rename from data/maps/211/combined.png rename to data/maps/211/211.jpg diff --git a/data/maps/212/combined.png b/data/maps/212/212.jpg similarity index 100% rename from data/maps/212/combined.png rename to data/maps/212/212.jpg diff --git a/data/maps/213/combined.png b/data/maps/213/213.jpg similarity index 100% rename from data/maps/213/combined.png rename to data/maps/213/213.jpg diff --git a/data/maps/214/combined.png b/data/maps/214/214.jpg similarity index 100% rename from data/maps/214/combined.png rename to data/maps/214/214.jpg diff --git a/data/maps/215/combined.png b/data/maps/215/215.jpg similarity index 100% rename from data/maps/215/combined.png rename to data/maps/215/215.jpg diff --git a/data/maps/216/combined.png b/data/maps/216/216.jpg similarity index 100% rename from data/maps/216/combined.png rename to data/maps/216/216.jpg diff --git a/data/maps/217/combined.png b/data/maps/217/217.jpg similarity index 100% rename from data/maps/217/combined.png rename to data/maps/217/217.jpg diff --git a/data/maps/218/combined.png b/data/maps/218/218.jpg similarity index 100% rename from data/maps/218/combined.png rename to data/maps/218/218.jpg diff --git a/data/maps/219/combined.png b/data/maps/219/219.jpg similarity index 100% rename from data/maps/219/combined.png rename to data/maps/219/219.jpg diff --git a/data/maps/22/combined.png b/data/maps/22/22.jpg similarity index 100% rename from data/maps/22/combined.png rename to data/maps/22/22.jpg diff --git a/data/maps/220/combined.png b/data/maps/220/220.jpg similarity index 100% rename from data/maps/220/combined.png rename to data/maps/220/220.jpg diff --git a/data/maps/221/combined.png b/data/maps/221/221.jpg similarity index 100% rename from data/maps/221/combined.png rename to data/maps/221/221.jpg diff --git a/data/maps/222/combined.png b/data/maps/222/222.jpg similarity index 100% rename from data/maps/222/combined.png rename to data/maps/222/222.jpg diff --git a/data/maps/223/combined.png b/data/maps/223/223.jpg similarity index 100% rename from data/maps/223/combined.png rename to data/maps/223/223.jpg diff --git a/data/maps/224/combined.png b/data/maps/224/224.jpg similarity index 100% rename from data/maps/224/combined.png rename to data/maps/224/224.jpg diff --git a/data/maps/225/combined.png b/data/maps/225/225.jpg similarity index 100% rename from data/maps/225/combined.png rename to data/maps/225/225.jpg diff --git a/data/maps/226/combined.png b/data/maps/226/226.jpg similarity index 100% rename from data/maps/226/combined.png rename to data/maps/226/226.jpg diff --git a/data/maps/227/combined.png b/data/maps/227/227.jpg similarity index 100% rename from data/maps/227/combined.png rename to data/maps/227/227.jpg diff --git a/data/maps/228/combined.png b/data/maps/228/228.jpg similarity index 100% rename from data/maps/228/combined.png rename to data/maps/228/228.jpg diff --git a/data/maps/229/combined.png b/data/maps/229/229.jpg similarity index 100% rename from data/maps/229/combined.png rename to data/maps/229/229.jpg diff --git a/data/maps/23/combined.png b/data/maps/23/23.jpg similarity index 100% rename from data/maps/23/combined.png rename to data/maps/23/23.jpg diff --git a/data/maps/230/combined.png b/data/maps/230/230.jpg similarity index 100% rename from data/maps/230/combined.png rename to data/maps/230/230.jpg diff --git a/data/maps/231/combined.png b/data/maps/231/231.jpg similarity index 100% rename from data/maps/231/combined.png rename to data/maps/231/231.jpg diff --git a/data/maps/232/combined.png b/data/maps/232/232.jpg similarity index 100% rename from data/maps/232/combined.png rename to data/maps/232/232.jpg diff --git a/data/maps/233/combined.png b/data/maps/233/233.jpg similarity index 100% rename from data/maps/233/combined.png rename to data/maps/233/233.jpg diff --git a/data/maps/234/combined.png b/data/maps/234/234.jpg similarity index 100% rename from data/maps/234/combined.png rename to data/maps/234/234.jpg diff --git a/data/maps/235/combined.png b/data/maps/235/235.jpg similarity index 100% rename from data/maps/235/combined.png rename to data/maps/235/235.jpg diff --git a/data/maps/236/combined.png b/data/maps/236/236.jpg similarity index 100% rename from data/maps/236/combined.png rename to data/maps/236/236.jpg diff --git a/data/maps/237/combined.png b/data/maps/237/237.jpg similarity index 100% rename from data/maps/237/combined.png rename to data/maps/237/237.jpg diff --git a/data/maps/238/combined.png b/data/maps/238/238.jpg similarity index 100% rename from data/maps/238/combined.png rename to data/maps/238/238.jpg diff --git a/data/maps/239/combined.png b/data/maps/239/239.jpg similarity index 100% rename from data/maps/239/combined.png rename to data/maps/239/239.jpg diff --git a/data/maps/24/combined.png b/data/maps/24/24.jpg similarity index 100% rename from data/maps/24/combined.png rename to data/maps/24/24.jpg diff --git a/data/maps/240/combined.png b/data/maps/240/240.jpg similarity index 100% rename from data/maps/240/combined.png rename to data/maps/240/240.jpg diff --git a/data/maps/241/combined.png b/data/maps/241/241.jpg similarity index 100% rename from data/maps/241/combined.png rename to data/maps/241/241.jpg diff --git a/data/maps/242/combined.png b/data/maps/242/242.jpg similarity index 100% rename from data/maps/242/combined.png rename to data/maps/242/242.jpg diff --git a/data/maps/243/combined.png b/data/maps/243/243.jpg similarity index 100% rename from data/maps/243/combined.png rename to data/maps/243/243.jpg diff --git a/data/maps/244/combined.png b/data/maps/244/244.jpg similarity index 100% rename from data/maps/244/combined.png rename to data/maps/244/244.jpg diff --git a/data/maps/245/combined.png b/data/maps/245/245.jpg similarity index 100% rename from data/maps/245/combined.png rename to data/maps/245/245.jpg diff --git a/data/maps/246/combined.png b/data/maps/246/246.jpg similarity index 100% rename from data/maps/246/combined.png rename to data/maps/246/246.jpg diff --git a/data/maps/247/combined.png b/data/maps/247/247.jpg similarity index 100% rename from data/maps/247/combined.png rename to data/maps/247/247.jpg diff --git a/data/maps/248/combined.png b/data/maps/248/248.jpg similarity index 100% rename from data/maps/248/combined.png rename to data/maps/248/248.jpg diff --git a/data/maps/249/combined.png b/data/maps/249/249.jpg similarity index 100% rename from data/maps/249/combined.png rename to data/maps/249/249.jpg diff --git a/data/maps/25/combined.png b/data/maps/25/25.jpg similarity index 100% rename from data/maps/25/combined.png rename to data/maps/25/25.jpg diff --git a/data/maps/250/combined.png b/data/maps/250/250.jpg similarity index 100% rename from data/maps/250/combined.png rename to data/maps/250/250.jpg diff --git a/data/maps/251/combined.png b/data/maps/251/251.jpg similarity index 100% rename from data/maps/251/combined.png rename to data/maps/251/251.jpg diff --git a/data/maps/252/combined.png b/data/maps/252/252.jpg similarity index 100% rename from data/maps/252/combined.png rename to data/maps/252/252.jpg diff --git a/data/maps/253/combined.png b/data/maps/253/253.jpg similarity index 100% rename from data/maps/253/combined.png rename to data/maps/253/253.jpg diff --git a/data/maps/254/combined.png b/data/maps/254/254.jpg similarity index 100% rename from data/maps/254/combined.png rename to data/maps/254/254.jpg diff --git a/data/maps/255/combined.png b/data/maps/255/255.jpg similarity index 100% rename from data/maps/255/combined.png rename to data/maps/255/255.jpg diff --git a/data/maps/256/combined.png b/data/maps/256/256.jpg similarity index 100% rename from data/maps/256/combined.png rename to data/maps/256/256.jpg diff --git a/data/maps/257/combined.png b/data/maps/257/257.jpg similarity index 100% rename from data/maps/257/combined.png rename to data/maps/257/257.jpg diff --git a/data/maps/258/combined.png b/data/maps/258/258.jpg similarity index 100% rename from data/maps/258/combined.png rename to data/maps/258/258.jpg diff --git a/data/maps/259/combined.png b/data/maps/259/259.jpg similarity index 100% rename from data/maps/259/combined.png rename to data/maps/259/259.jpg diff --git a/data/maps/26/combined.png b/data/maps/26/26.jpg similarity index 100% rename from data/maps/26/combined.png rename to data/maps/26/26.jpg diff --git a/data/maps/260/combined.png b/data/maps/260/260.jpg similarity index 100% rename from data/maps/260/combined.png rename to data/maps/260/260.jpg diff --git a/data/maps/261/combined.png b/data/maps/261/261.jpg similarity index 100% rename from data/maps/261/combined.png rename to data/maps/261/261.jpg diff --git a/data/maps/262/combined.png b/data/maps/262/262.jpg similarity index 100% rename from data/maps/262/combined.png rename to data/maps/262/262.jpg diff --git a/data/maps/263/combined.png b/data/maps/263/263.jpg similarity index 100% rename from data/maps/263/combined.png rename to data/maps/263/263.jpg diff --git a/data/maps/264/combined.png b/data/maps/264/264.jpg similarity index 100% rename from data/maps/264/combined.png rename to data/maps/264/264.jpg diff --git a/data/maps/265/combined.png b/data/maps/265/265.jpg similarity index 100% rename from data/maps/265/combined.png rename to data/maps/265/265.jpg diff --git a/data/maps/266/combined.png b/data/maps/266/266.jpg similarity index 100% rename from data/maps/266/combined.png rename to data/maps/266/266.jpg diff --git a/data/maps/267/combined.png b/data/maps/267/267.jpg similarity index 100% rename from data/maps/267/combined.png rename to data/maps/267/267.jpg diff --git a/data/maps/268/combined.png b/data/maps/268/268.jpg similarity index 100% rename from data/maps/268/combined.png rename to data/maps/268/268.jpg diff --git a/data/maps/269/combined.png b/data/maps/269/269.jpg similarity index 100% rename from data/maps/269/combined.png rename to data/maps/269/269.jpg diff --git a/data/maps/27/combined.png b/data/maps/27/27.jpg similarity index 100% rename from data/maps/27/combined.png rename to data/maps/27/27.jpg diff --git a/data/maps/270/combined.png b/data/maps/270/270.jpg similarity index 100% rename from data/maps/270/combined.png rename to data/maps/270/270.jpg diff --git a/data/maps/271/combined.png b/data/maps/271/271.jpg similarity index 100% rename from data/maps/271/combined.png rename to data/maps/271/271.jpg diff --git a/data/maps/272/combined.png b/data/maps/272/272.jpg similarity index 100% rename from data/maps/272/combined.png rename to data/maps/272/272.jpg diff --git a/data/maps/273/combined.png b/data/maps/273/273.jpg similarity index 100% rename from data/maps/273/combined.png rename to data/maps/273/273.jpg diff --git a/data/maps/274/combined.png b/data/maps/274/274.jpg similarity index 100% rename from data/maps/274/combined.png rename to data/maps/274/274.jpg diff --git a/data/maps/275/combined.png b/data/maps/275/275.jpg similarity index 100% rename from data/maps/275/combined.png rename to data/maps/275/275.jpg diff --git a/data/maps/276/combined.png b/data/maps/276/276.jpg similarity index 100% rename from data/maps/276/combined.png rename to data/maps/276/276.jpg diff --git a/data/maps/277/combined.png b/data/maps/277/277.jpg similarity index 100% rename from data/maps/277/combined.png rename to data/maps/277/277.jpg diff --git a/data/maps/278/combined.png b/data/maps/278/278.jpg similarity index 100% rename from data/maps/278/combined.png rename to data/maps/278/278.jpg diff --git a/data/maps/279/combined.png b/data/maps/279/279.jpg similarity index 100% rename from data/maps/279/combined.png rename to data/maps/279/279.jpg diff --git a/data/maps/28/combined.png b/data/maps/28/28.jpg similarity index 100% rename from data/maps/28/combined.png rename to data/maps/28/28.jpg diff --git a/data/maps/280/combined.png b/data/maps/280/280.jpg similarity index 100% rename from data/maps/280/combined.png rename to data/maps/280/280.jpg diff --git a/data/maps/281/combined.png b/data/maps/281/281.jpg similarity index 100% rename from data/maps/281/combined.png rename to data/maps/281/281.jpg diff --git a/data/maps/282/combined.png b/data/maps/282/282.jpg similarity index 100% rename from data/maps/282/combined.png rename to data/maps/282/282.jpg diff --git a/data/maps/283/combined.png b/data/maps/283/283.jpg similarity index 100% rename from data/maps/283/combined.png rename to data/maps/283/283.jpg diff --git a/data/maps/284/combined.png b/data/maps/284/284.jpg similarity index 100% rename from data/maps/284/combined.png rename to data/maps/284/284.jpg diff --git a/data/maps/285/combined.png b/data/maps/285/285.jpg similarity index 100% rename from data/maps/285/combined.png rename to data/maps/285/285.jpg diff --git a/data/maps/286/combined.png b/data/maps/286/286.jpg similarity index 100% rename from data/maps/286/combined.png rename to data/maps/286/286.jpg diff --git a/data/maps/287/combined.png b/data/maps/287/287.jpg similarity index 100% rename from data/maps/287/combined.png rename to data/maps/287/287.jpg diff --git a/data/maps/288/combined.png b/data/maps/288/288.jpg similarity index 100% rename from data/maps/288/combined.png rename to data/maps/288/288.jpg diff --git a/data/maps/289/combined.png b/data/maps/289/289.jpg similarity index 100% rename from data/maps/289/combined.png rename to data/maps/289/289.jpg diff --git a/data/maps/29/combined.png b/data/maps/29/29.jpg similarity index 100% rename from data/maps/29/combined.png rename to data/maps/29/29.jpg diff --git a/data/maps/290/combined.png b/data/maps/290/290.jpg similarity index 100% rename from data/maps/290/combined.png rename to data/maps/290/290.jpg diff --git a/data/maps/291/combined.png b/data/maps/291/291.jpg similarity index 100% rename from data/maps/291/combined.png rename to data/maps/291/291.jpg diff --git a/data/maps/292/combined.png b/data/maps/292/292.jpg similarity index 100% rename from data/maps/292/combined.png rename to data/maps/292/292.jpg diff --git a/data/maps/293/combined.png b/data/maps/293/293.jpg similarity index 100% rename from data/maps/293/combined.png rename to data/maps/293/293.jpg diff --git a/data/maps/294/combined.png b/data/maps/294/294.jpg similarity index 100% rename from data/maps/294/combined.png rename to data/maps/294/294.jpg diff --git a/data/maps/295/combined.png b/data/maps/295/295.jpg similarity index 100% rename from data/maps/295/combined.png rename to data/maps/295/295.jpg diff --git a/data/maps/296/combined.png b/data/maps/296/296.jpg similarity index 100% rename from data/maps/296/combined.png rename to data/maps/296/296.jpg diff --git a/data/maps/297/combined.png b/data/maps/297/297.jpg similarity index 100% rename from data/maps/297/combined.png rename to data/maps/297/297.jpg diff --git a/data/maps/298/combined.png b/data/maps/298/298.jpg similarity index 100% rename from data/maps/298/combined.png rename to data/maps/298/298.jpg diff --git a/data/maps/299/combined.png b/data/maps/299/299.jpg similarity index 100% rename from data/maps/299/combined.png rename to data/maps/299/299.jpg diff --git a/data/maps/3/combined.png b/data/maps/3/3.jpg similarity index 100% rename from data/maps/3/combined.png rename to data/maps/3/3.jpg diff --git a/data/maps/30/combined.png b/data/maps/30/30.jpg similarity index 100% rename from data/maps/30/combined.png rename to data/maps/30/30.jpg diff --git a/data/maps/300/combined.png b/data/maps/300/300.jpg similarity index 100% rename from data/maps/300/combined.png rename to data/maps/300/300.jpg diff --git a/data/maps/301/combined.png b/data/maps/301/301.jpg similarity index 100% rename from data/maps/301/combined.png rename to data/maps/301/301.jpg diff --git a/data/maps/302/combined.png b/data/maps/302/302.jpg similarity index 100% rename from data/maps/302/combined.png rename to data/maps/302/302.jpg diff --git a/data/maps/303/combined.png b/data/maps/303/303.jpg similarity index 100% rename from data/maps/303/combined.png rename to data/maps/303/303.jpg diff --git a/data/maps/304/combined.png b/data/maps/304/304.jpg similarity index 100% rename from data/maps/304/combined.png rename to data/maps/304/304.jpg diff --git a/data/maps/305/combined.png b/data/maps/305/305.jpg similarity index 100% rename from data/maps/305/combined.png rename to data/maps/305/305.jpg diff --git a/data/maps/306/combined.png b/data/maps/306/306.jpg similarity index 100% rename from data/maps/306/combined.png rename to data/maps/306/306.jpg diff --git a/data/maps/307/combined.png b/data/maps/307/307.jpg similarity index 100% rename from data/maps/307/combined.png rename to data/maps/307/307.jpg diff --git a/data/maps/308/combined.png b/data/maps/308/308.jpg similarity index 100% rename from data/maps/308/combined.png rename to data/maps/308/308.jpg diff --git a/data/maps/309/combined.png b/data/maps/309/309.jpg similarity index 100% rename from data/maps/309/combined.png rename to data/maps/309/309.jpg diff --git a/data/maps/31/combined.png b/data/maps/31/31.jpg similarity index 100% rename from data/maps/31/combined.png rename to data/maps/31/31.jpg diff --git a/data/maps/310/combined.png b/data/maps/310/310.jpg similarity index 100% rename from data/maps/310/combined.png rename to data/maps/310/310.jpg diff --git a/data/maps/311/combined.png b/data/maps/311/311.jpg similarity index 100% rename from data/maps/311/combined.png rename to data/maps/311/311.jpg diff --git a/data/maps/312/combined.png b/data/maps/312/312.jpg similarity index 100% rename from data/maps/312/combined.png rename to data/maps/312/312.jpg diff --git a/data/maps/313/combined.png b/data/maps/313/313.jpg similarity index 100% rename from data/maps/313/combined.png rename to data/maps/313/313.jpg diff --git a/data/maps/314/combined.png b/data/maps/314/314.jpg similarity index 100% rename from data/maps/314/combined.png rename to data/maps/314/314.jpg diff --git a/data/maps/315/combined.png b/data/maps/315/315.jpg similarity index 100% rename from data/maps/315/combined.png rename to data/maps/315/315.jpg diff --git a/data/maps/316/combined.png b/data/maps/316/316.jpg similarity index 100% rename from data/maps/316/combined.png rename to data/maps/316/316.jpg diff --git a/data/maps/317/combined.png b/data/maps/317/317.jpg similarity index 100% rename from data/maps/317/combined.png rename to data/maps/317/317.jpg diff --git a/data/maps/318/combined.png b/data/maps/318/318.jpg similarity index 100% rename from data/maps/318/combined.png rename to data/maps/318/318.jpg diff --git a/data/maps/319/combined.png b/data/maps/319/319.jpg similarity index 100% rename from data/maps/319/combined.png rename to data/maps/319/319.jpg diff --git a/data/maps/32/combined.png b/data/maps/32/32.jpg similarity index 100% rename from data/maps/32/combined.png rename to data/maps/32/32.jpg diff --git a/data/maps/320/combined.png b/data/maps/320/320.jpg similarity index 100% rename from data/maps/320/combined.png rename to data/maps/320/320.jpg diff --git a/data/maps/321/combined.png b/data/maps/321/321.jpg similarity index 100% rename from data/maps/321/combined.png rename to data/maps/321/321.jpg diff --git a/data/maps/322/combined.png b/data/maps/322/322.jpg similarity index 100% rename from data/maps/322/combined.png rename to data/maps/322/322.jpg diff --git a/data/maps/323/combined.png b/data/maps/323/323.jpg similarity index 100% rename from data/maps/323/combined.png rename to data/maps/323/323.jpg diff --git a/data/maps/324/combined.png b/data/maps/324/324.jpg similarity index 100% rename from data/maps/324/combined.png rename to data/maps/324/324.jpg diff --git a/data/maps/325/combined.png b/data/maps/325/325.jpg similarity index 100% rename from data/maps/325/combined.png rename to data/maps/325/325.jpg diff --git a/data/maps/326/combined.png b/data/maps/326/326.jpg similarity index 100% rename from data/maps/326/combined.png rename to data/maps/326/326.jpg diff --git a/data/maps/327/combined.png b/data/maps/327/327.jpg similarity index 100% rename from data/maps/327/combined.png rename to data/maps/327/327.jpg diff --git a/data/maps/328/combined.png b/data/maps/328/328.jpg similarity index 100% rename from data/maps/328/combined.png rename to data/maps/328/328.jpg diff --git a/data/maps/329/combined.png b/data/maps/329/329.jpg similarity index 100% rename from data/maps/329/combined.png rename to data/maps/329/329.jpg diff --git a/data/maps/33/combined.png b/data/maps/33/33.jpg similarity index 100% rename from data/maps/33/combined.png rename to data/maps/33/33.jpg diff --git a/data/maps/330/combined.png b/data/maps/330/330.jpg similarity index 100% rename from data/maps/330/combined.png rename to data/maps/330/330.jpg diff --git a/data/maps/331/combined.png b/data/maps/331/331.jpg similarity index 100% rename from data/maps/331/combined.png rename to data/maps/331/331.jpg diff --git a/data/maps/332/combined.png b/data/maps/332/332.jpg similarity index 100% rename from data/maps/332/combined.png rename to data/maps/332/332.jpg diff --git a/data/maps/333/combined.png b/data/maps/333/333.jpg similarity index 100% rename from data/maps/333/combined.png rename to data/maps/333/333.jpg diff --git a/data/maps/334/combined.png b/data/maps/334/334.jpg similarity index 100% rename from data/maps/334/combined.png rename to data/maps/334/334.jpg diff --git a/data/maps/335/combined.png b/data/maps/335/335.jpg similarity index 100% rename from data/maps/335/combined.png rename to data/maps/335/335.jpg diff --git a/data/maps/336/combined.png b/data/maps/336/336.jpg similarity index 100% rename from data/maps/336/combined.png rename to data/maps/336/336.jpg diff --git a/data/maps/337/combined.png b/data/maps/337/337.jpg similarity index 100% rename from data/maps/337/combined.png rename to data/maps/337/337.jpg diff --git a/data/maps/338/combined.png b/data/maps/338/338.jpg similarity index 100% rename from data/maps/338/combined.png rename to data/maps/338/338.jpg diff --git a/data/maps/339/combined.png b/data/maps/339/339.jpg similarity index 100% rename from data/maps/339/combined.png rename to data/maps/339/339.jpg diff --git a/data/maps/34/combined.png b/data/maps/34/34.jpg similarity index 100% rename from data/maps/34/combined.png rename to data/maps/34/34.jpg diff --git a/data/maps/340/combined.png b/data/maps/340/340.jpg similarity index 100% rename from data/maps/340/combined.png rename to data/maps/340/340.jpg diff --git a/data/maps/341/combined.png b/data/maps/341/341.jpg similarity index 100% rename from data/maps/341/combined.png rename to data/maps/341/341.jpg diff --git a/data/maps/342/combined.png b/data/maps/342/342.jpg similarity index 100% rename from data/maps/342/combined.png rename to data/maps/342/342.jpg diff --git a/data/maps/343/combined.png b/data/maps/343/343.jpg similarity index 100% rename from data/maps/343/combined.png rename to data/maps/343/343.jpg diff --git a/data/maps/344/combined.png b/data/maps/344/344.jpg similarity index 100% rename from data/maps/344/combined.png rename to data/maps/344/344.jpg diff --git a/data/maps/345/combined.png b/data/maps/345/345.jpg similarity index 100% rename from data/maps/345/combined.png rename to data/maps/345/345.jpg diff --git a/data/maps/346/combined.png b/data/maps/346/346.jpg similarity index 100% rename from data/maps/346/combined.png rename to data/maps/346/346.jpg diff --git a/data/maps/347/combined.png b/data/maps/347/347.jpg similarity index 100% rename from data/maps/347/combined.png rename to data/maps/347/347.jpg diff --git a/data/maps/348/combined.png b/data/maps/348/348.jpg similarity index 100% rename from data/maps/348/combined.png rename to data/maps/348/348.jpg diff --git a/data/maps/349/combined.png b/data/maps/349/349.jpg similarity index 100% rename from data/maps/349/combined.png rename to data/maps/349/349.jpg diff --git a/data/maps/35/combined.png b/data/maps/35/35.jpg similarity index 100% rename from data/maps/35/combined.png rename to data/maps/35/35.jpg diff --git a/data/maps/350/combined.png b/data/maps/350/350.jpg similarity index 100% rename from data/maps/350/combined.png rename to data/maps/350/350.jpg diff --git a/data/maps/351/combined.png b/data/maps/351/351.jpg similarity index 100% rename from data/maps/351/combined.png rename to data/maps/351/351.jpg diff --git a/data/maps/352/combined.png b/data/maps/352/352.jpg similarity index 100% rename from data/maps/352/combined.png rename to data/maps/352/352.jpg diff --git a/data/maps/353/combined.png b/data/maps/353/353.jpg similarity index 100% rename from data/maps/353/combined.png rename to data/maps/353/353.jpg diff --git a/data/maps/354/combined.png b/data/maps/354/354.jpg similarity index 100% rename from data/maps/354/combined.png rename to data/maps/354/354.jpg diff --git a/data/maps/355/combined.png b/data/maps/355/355.jpg similarity index 100% rename from data/maps/355/combined.png rename to data/maps/355/355.jpg diff --git a/data/maps/356/combined.png b/data/maps/356/356.jpg similarity index 100% rename from data/maps/356/combined.png rename to data/maps/356/356.jpg diff --git a/data/maps/357/combined.png b/data/maps/357/357.jpg similarity index 100% rename from data/maps/357/combined.png rename to data/maps/357/357.jpg diff --git a/data/maps/358/combined.png b/data/maps/358/358.jpg similarity index 100% rename from data/maps/358/combined.png rename to data/maps/358/358.jpg diff --git a/data/maps/359/combined.png b/data/maps/359/359.jpg similarity index 100% rename from data/maps/359/combined.png rename to data/maps/359/359.jpg diff --git a/data/maps/36/combined.png b/data/maps/36/36.jpg similarity index 100% rename from data/maps/36/combined.png rename to data/maps/36/36.jpg diff --git a/data/maps/360/combined.png b/data/maps/360/360.jpg similarity index 100% rename from data/maps/360/combined.png rename to data/maps/360/360.jpg diff --git a/data/maps/361/combined.png b/data/maps/361/361.jpg similarity index 100% rename from data/maps/361/combined.png rename to data/maps/361/361.jpg diff --git a/data/maps/362/combined.png b/data/maps/362/362.jpg similarity index 100% rename from data/maps/362/combined.png rename to data/maps/362/362.jpg diff --git a/data/maps/363/combined.png b/data/maps/363/363.jpg similarity index 100% rename from data/maps/363/combined.png rename to data/maps/363/363.jpg diff --git a/data/maps/364/combined.png b/data/maps/364/364.jpg similarity index 100% rename from data/maps/364/combined.png rename to data/maps/364/364.jpg diff --git a/data/maps/365/combined.png b/data/maps/365/365.jpg similarity index 100% rename from data/maps/365/combined.png rename to data/maps/365/365.jpg diff --git a/data/maps/366/combined.png b/data/maps/366/366.jpg similarity index 100% rename from data/maps/366/combined.png rename to data/maps/366/366.jpg diff --git a/data/maps/367/combined.png b/data/maps/367/367.jpg similarity index 100% rename from data/maps/367/combined.png rename to data/maps/367/367.jpg diff --git a/data/maps/368/combined.png b/data/maps/368/368.jpg similarity index 100% rename from data/maps/368/combined.png rename to data/maps/368/368.jpg diff --git a/data/maps/369/combined.png b/data/maps/369/369.jpg similarity index 100% rename from data/maps/369/combined.png rename to data/maps/369/369.jpg diff --git a/data/maps/37/combined.png b/data/maps/37/37.jpg similarity index 100% rename from data/maps/37/combined.png rename to data/maps/37/37.jpg diff --git a/data/maps/370/combined.png b/data/maps/370/370.jpg similarity index 100% rename from data/maps/370/combined.png rename to data/maps/370/370.jpg diff --git a/data/maps/371/combined.png b/data/maps/371/371.jpg similarity index 100% rename from data/maps/371/combined.png rename to data/maps/371/371.jpg diff --git a/data/maps/372/combined.png b/data/maps/372/372.jpg similarity index 100% rename from data/maps/372/combined.png rename to data/maps/372/372.jpg diff --git a/data/maps/373/combined.png b/data/maps/373/373.jpg similarity index 100% rename from data/maps/373/combined.png rename to data/maps/373/373.jpg diff --git a/data/maps/374/combined.png b/data/maps/374/374.jpg similarity index 100% rename from data/maps/374/combined.png rename to data/maps/374/374.jpg diff --git a/data/maps/375/combined.png b/data/maps/375/375.jpg similarity index 100% rename from data/maps/375/combined.png rename to data/maps/375/375.jpg diff --git a/data/maps/376/combined.png b/data/maps/376/376.jpg similarity index 100% rename from data/maps/376/combined.png rename to data/maps/376/376.jpg diff --git a/data/maps/377/combined.png b/data/maps/377/377.jpg similarity index 100% rename from data/maps/377/combined.png rename to data/maps/377/377.jpg diff --git a/data/maps/378/combined.png b/data/maps/378/378.jpg similarity index 100% rename from data/maps/378/combined.png rename to data/maps/378/378.jpg diff --git a/data/maps/379/combined.png b/data/maps/379/379.jpg similarity index 100% rename from data/maps/379/combined.png rename to data/maps/379/379.jpg diff --git a/data/maps/38/combined.png b/data/maps/38/38.jpg similarity index 100% rename from data/maps/38/combined.png rename to data/maps/38/38.jpg diff --git a/data/maps/380/combined.png b/data/maps/380/380.jpg similarity index 100% rename from data/maps/380/combined.png rename to data/maps/380/380.jpg diff --git a/data/maps/381/combined.png b/data/maps/381/381.jpg similarity index 100% rename from data/maps/381/combined.png rename to data/maps/381/381.jpg diff --git a/data/maps/382/combined.png b/data/maps/382/382.jpg similarity index 100% rename from data/maps/382/combined.png rename to data/maps/382/382.jpg diff --git a/data/maps/383/combined.png b/data/maps/383/383.jpg similarity index 100% rename from data/maps/383/combined.png rename to data/maps/383/383.jpg diff --git a/data/maps/384/combined.png b/data/maps/384/384.jpg similarity index 100% rename from data/maps/384/combined.png rename to data/maps/384/384.jpg diff --git a/data/maps/385/combined.png b/data/maps/385/385.jpg similarity index 100% rename from data/maps/385/combined.png rename to data/maps/385/385.jpg diff --git a/data/maps/386/combined.png b/data/maps/386/386.jpg similarity index 100% rename from data/maps/386/combined.png rename to data/maps/386/386.jpg diff --git a/data/maps/387/combined.png b/data/maps/387/387.jpg similarity index 100% rename from data/maps/387/combined.png rename to data/maps/387/387.jpg diff --git a/data/maps/388/combined.png b/data/maps/388/388.jpg similarity index 100% rename from data/maps/388/combined.png rename to data/maps/388/388.jpg diff --git a/data/maps/389/combined.png b/data/maps/389/389.jpg similarity index 100% rename from data/maps/389/combined.png rename to data/maps/389/389.jpg diff --git a/data/maps/39/combined.png b/data/maps/39/39.jpg similarity index 100% rename from data/maps/39/combined.png rename to data/maps/39/39.jpg diff --git a/data/maps/390/combined.png b/data/maps/390/390.jpg similarity index 100% rename from data/maps/390/combined.png rename to data/maps/390/390.jpg diff --git a/data/maps/391/combined.png b/data/maps/391/391.jpg similarity index 100% rename from data/maps/391/combined.png rename to data/maps/391/391.jpg diff --git a/data/maps/392/combined.png b/data/maps/392/392.jpg similarity index 100% rename from data/maps/392/combined.png rename to data/maps/392/392.jpg diff --git a/data/maps/393/combined.png b/data/maps/393/393.jpg similarity index 100% rename from data/maps/393/combined.png rename to data/maps/393/393.jpg diff --git a/data/maps/394/combined.png b/data/maps/394/394.jpg similarity index 100% rename from data/maps/394/combined.png rename to data/maps/394/394.jpg diff --git a/data/maps/395/combined.png b/data/maps/395/395.jpg similarity index 100% rename from data/maps/395/combined.png rename to data/maps/395/395.jpg diff --git a/data/maps/396/combined.png b/data/maps/396/396.jpg similarity index 100% rename from data/maps/396/combined.png rename to data/maps/396/396.jpg diff --git a/data/maps/397/combined.png b/data/maps/397/397.jpg similarity index 100% rename from data/maps/397/combined.png rename to data/maps/397/397.jpg diff --git a/data/maps/398/combined.png b/data/maps/398/398.jpg similarity index 100% rename from data/maps/398/combined.png rename to data/maps/398/398.jpg diff --git a/data/maps/399/combined.png b/data/maps/399/399.jpg similarity index 100% rename from data/maps/399/combined.png rename to data/maps/399/399.jpg diff --git a/data/maps/4/combined.png b/data/maps/4/4.jpg similarity index 100% rename from data/maps/4/combined.png rename to data/maps/4/4.jpg diff --git a/data/maps/40/combined.png b/data/maps/40/40.jpg similarity index 100% rename from data/maps/40/combined.png rename to data/maps/40/40.jpg diff --git a/data/maps/400/combined.png b/data/maps/400/400.jpg similarity index 100% rename from data/maps/400/combined.png rename to data/maps/400/400.jpg diff --git a/data/maps/401/combined.png b/data/maps/401/401.jpg similarity index 100% rename from data/maps/401/combined.png rename to data/maps/401/401.jpg diff --git a/data/maps/402/combined.png b/data/maps/402/402.jpg similarity index 100% rename from data/maps/402/combined.png rename to data/maps/402/402.jpg diff --git a/data/maps/403/combined.png b/data/maps/403/403.jpg similarity index 100% rename from data/maps/403/combined.png rename to data/maps/403/403.jpg diff --git a/data/maps/404/combined.png b/data/maps/404/404.jpg similarity index 100% rename from data/maps/404/combined.png rename to data/maps/404/404.jpg diff --git a/data/maps/405/combined.png b/data/maps/405/405.jpg similarity index 100% rename from data/maps/405/combined.png rename to data/maps/405/405.jpg diff --git a/data/maps/406/combined.png b/data/maps/406/406.jpg similarity index 100% rename from data/maps/406/combined.png rename to data/maps/406/406.jpg diff --git a/data/maps/407/combined.png b/data/maps/407/407.jpg similarity index 100% rename from data/maps/407/combined.png rename to data/maps/407/407.jpg diff --git a/data/maps/408/combined.png b/data/maps/408/408.jpg similarity index 100% rename from data/maps/408/combined.png rename to data/maps/408/408.jpg diff --git a/data/maps/409/combined.png b/data/maps/409/409.jpg similarity index 100% rename from data/maps/409/combined.png rename to data/maps/409/409.jpg diff --git a/data/maps/41/combined.png b/data/maps/41/41.jpg similarity index 100% rename from data/maps/41/combined.png rename to data/maps/41/41.jpg diff --git a/data/maps/410/combined.png b/data/maps/410/410.jpg similarity index 100% rename from data/maps/410/combined.png rename to data/maps/410/410.jpg diff --git a/data/maps/411/combined.png b/data/maps/411/411.jpg similarity index 100% rename from data/maps/411/combined.png rename to data/maps/411/411.jpg diff --git a/data/maps/412/combined.png b/data/maps/412/412.jpg similarity index 100% rename from data/maps/412/combined.png rename to data/maps/412/412.jpg diff --git a/data/maps/413/combined.png b/data/maps/413/413.jpg similarity index 100% rename from data/maps/413/combined.png rename to data/maps/413/413.jpg diff --git a/data/maps/414/combined.png b/data/maps/414/414.jpg similarity index 100% rename from data/maps/414/combined.png rename to data/maps/414/414.jpg diff --git a/data/maps/415/combined.png b/data/maps/415/415.jpg similarity index 100% rename from data/maps/415/combined.png rename to data/maps/415/415.jpg diff --git a/data/maps/416/combined.png b/data/maps/416/416.jpg similarity index 100% rename from data/maps/416/combined.png rename to data/maps/416/416.jpg diff --git a/data/maps/417/combined.png b/data/maps/417/417.jpg similarity index 100% rename from data/maps/417/combined.png rename to data/maps/417/417.jpg diff --git a/data/maps/418/combined.png b/data/maps/418/418.jpg similarity index 100% rename from data/maps/418/combined.png rename to data/maps/418/418.jpg diff --git a/data/maps/419/combined.png b/data/maps/419/419.jpg similarity index 100% rename from data/maps/419/combined.png rename to data/maps/419/419.jpg diff --git a/data/maps/42/combined.png b/data/maps/42/42.jpg similarity index 100% rename from data/maps/42/combined.png rename to data/maps/42/42.jpg diff --git a/data/maps/420/combined.png b/data/maps/420/420.jpg similarity index 100% rename from data/maps/420/combined.png rename to data/maps/420/420.jpg diff --git a/data/maps/421/combined.png b/data/maps/421/421.jpg similarity index 100% rename from data/maps/421/combined.png rename to data/maps/421/421.jpg diff --git a/data/maps/422/combined.png b/data/maps/422/422.jpg similarity index 100% rename from data/maps/422/combined.png rename to data/maps/422/422.jpg diff --git a/data/maps/423/combined.png b/data/maps/423/423.jpg similarity index 100% rename from data/maps/423/combined.png rename to data/maps/423/423.jpg diff --git a/data/maps/424/combined.png b/data/maps/424/424.jpg similarity index 100% rename from data/maps/424/combined.png rename to data/maps/424/424.jpg diff --git a/data/maps/425/combined.png b/data/maps/425/425.jpg similarity index 100% rename from data/maps/425/combined.png rename to data/maps/425/425.jpg diff --git a/data/maps/426/combined.png b/data/maps/426/426.jpg similarity index 100% rename from data/maps/426/combined.png rename to data/maps/426/426.jpg diff --git a/data/maps/427/combined.png b/data/maps/427/427.jpg similarity index 100% rename from data/maps/427/combined.png rename to data/maps/427/427.jpg diff --git a/data/maps/428/combined.png b/data/maps/428/428.jpg similarity index 100% rename from data/maps/428/combined.png rename to data/maps/428/428.jpg diff --git a/data/maps/429/combined.png b/data/maps/429/429.jpg similarity index 100% rename from data/maps/429/combined.png rename to data/maps/429/429.jpg diff --git a/data/maps/43/combined.png b/data/maps/43/43.jpg similarity index 100% rename from data/maps/43/combined.png rename to data/maps/43/43.jpg diff --git a/data/maps/430/combined.png b/data/maps/430/430.jpg similarity index 100% rename from data/maps/430/combined.png rename to data/maps/430/430.jpg diff --git a/data/maps/431/combined.png b/data/maps/431/431.jpg similarity index 100% rename from data/maps/431/combined.png rename to data/maps/431/431.jpg diff --git a/data/maps/432/combined.png b/data/maps/432/432.jpg similarity index 100% rename from data/maps/432/combined.png rename to data/maps/432/432.jpg diff --git a/data/maps/433/combined.png b/data/maps/433/433.jpg similarity index 100% rename from data/maps/433/combined.png rename to data/maps/433/433.jpg diff --git a/data/maps/434/combined.png b/data/maps/434/434.jpg similarity index 100% rename from data/maps/434/combined.png rename to data/maps/434/434.jpg diff --git a/data/maps/435/combined.png b/data/maps/435/435.jpg similarity index 100% rename from data/maps/435/combined.png rename to data/maps/435/435.jpg diff --git a/data/maps/436/combined.png b/data/maps/436/436.jpg similarity index 100% rename from data/maps/436/combined.png rename to data/maps/436/436.jpg diff --git a/data/maps/437/combined.png b/data/maps/437/437.jpg similarity index 100% rename from data/maps/437/combined.png rename to data/maps/437/437.jpg diff --git a/data/maps/438/combined.png b/data/maps/438/438.jpg similarity index 100% rename from data/maps/438/combined.png rename to data/maps/438/438.jpg diff --git a/data/maps/439/combined.png b/data/maps/439/439.jpg similarity index 100% rename from data/maps/439/combined.png rename to data/maps/439/439.jpg diff --git a/data/maps/44/combined.png b/data/maps/44/44.jpg similarity index 100% rename from data/maps/44/combined.png rename to data/maps/44/44.jpg diff --git a/data/maps/440/combined.png b/data/maps/440/440.jpg similarity index 100% rename from data/maps/440/combined.png rename to data/maps/440/440.jpg diff --git a/data/maps/441/combined.png b/data/maps/441/441.jpg similarity index 100% rename from data/maps/441/combined.png rename to data/maps/441/441.jpg diff --git a/data/maps/442/combined.png b/data/maps/442/442.jpg similarity index 100% rename from data/maps/442/combined.png rename to data/maps/442/442.jpg diff --git a/data/maps/443/combined.png b/data/maps/443/443.jpg similarity index 100% rename from data/maps/443/combined.png rename to data/maps/443/443.jpg diff --git a/data/maps/444/combined.png b/data/maps/444/444.jpg similarity index 100% rename from data/maps/444/combined.png rename to data/maps/444/444.jpg diff --git a/data/maps/445/combined.png b/data/maps/445/445.jpg similarity index 100% rename from data/maps/445/combined.png rename to data/maps/445/445.jpg diff --git a/data/maps/446/combined.png b/data/maps/446/446.jpg similarity index 100% rename from data/maps/446/combined.png rename to data/maps/446/446.jpg diff --git a/data/maps/447/combined.png b/data/maps/447/447.jpg similarity index 100% rename from data/maps/447/combined.png rename to data/maps/447/447.jpg diff --git a/data/maps/448/combined.png b/data/maps/448/448.jpg similarity index 100% rename from data/maps/448/combined.png rename to data/maps/448/448.jpg diff --git a/data/maps/449/combined.png b/data/maps/449/449.jpg similarity index 100% rename from data/maps/449/combined.png rename to data/maps/449/449.jpg diff --git a/data/maps/45/combined.png b/data/maps/45/45.jpg similarity index 100% rename from data/maps/45/combined.png rename to data/maps/45/45.jpg diff --git a/data/maps/450/combined.png b/data/maps/450/450.jpg similarity index 100% rename from data/maps/450/combined.png rename to data/maps/450/450.jpg diff --git a/data/maps/451/combined.png b/data/maps/451/451.jpg similarity index 100% rename from data/maps/451/combined.png rename to data/maps/451/451.jpg diff --git a/data/maps/452/combined.png b/data/maps/452/452.jpg similarity index 100% rename from data/maps/452/combined.png rename to data/maps/452/452.jpg diff --git a/data/maps/453/combined.png b/data/maps/453/453.jpg similarity index 100% rename from data/maps/453/combined.png rename to data/maps/453/453.jpg diff --git a/data/maps/454/combined.png b/data/maps/454/454.jpg similarity index 100% rename from data/maps/454/combined.png rename to data/maps/454/454.jpg diff --git a/data/maps/455/combined.png b/data/maps/455/455.jpg similarity index 100% rename from data/maps/455/combined.png rename to data/maps/455/455.jpg diff --git a/data/maps/456/combined.png b/data/maps/456/456.jpg similarity index 100% rename from data/maps/456/combined.png rename to data/maps/456/456.jpg diff --git a/data/maps/457/combined.png b/data/maps/457/457.jpg similarity index 100% rename from data/maps/457/combined.png rename to data/maps/457/457.jpg diff --git a/data/maps/458/combined.png b/data/maps/458/458.jpg similarity index 100% rename from data/maps/458/combined.png rename to data/maps/458/458.jpg diff --git a/data/maps/459/combined.png b/data/maps/459/459.jpg similarity index 100% rename from data/maps/459/combined.png rename to data/maps/459/459.jpg diff --git a/data/maps/46/combined.png b/data/maps/46/46.jpg similarity index 100% rename from data/maps/46/combined.png rename to data/maps/46/46.jpg diff --git a/data/maps/460/combined.png b/data/maps/460/460.jpg similarity index 100% rename from data/maps/460/combined.png rename to data/maps/460/460.jpg diff --git a/data/maps/461/combined.png b/data/maps/461/461.jpg similarity index 100% rename from data/maps/461/combined.png rename to data/maps/461/461.jpg diff --git a/data/maps/462/combined.png b/data/maps/462/462.jpg similarity index 100% rename from data/maps/462/combined.png rename to data/maps/462/462.jpg diff --git a/data/maps/463/combined.png b/data/maps/463/463.jpg similarity index 100% rename from data/maps/463/combined.png rename to data/maps/463/463.jpg diff --git a/data/maps/464/combined.png b/data/maps/464/464.jpg similarity index 100% rename from data/maps/464/combined.png rename to data/maps/464/464.jpg diff --git a/data/maps/465/combined.png b/data/maps/465/465.jpg similarity index 100% rename from data/maps/465/combined.png rename to data/maps/465/465.jpg diff --git a/data/maps/466/combined.png b/data/maps/466/466.jpg similarity index 100% rename from data/maps/466/combined.png rename to data/maps/466/466.jpg diff --git a/data/maps/467/combined.png b/data/maps/467/467.jpg similarity index 100% rename from data/maps/467/combined.png rename to data/maps/467/467.jpg diff --git a/data/maps/468/combined.png b/data/maps/468/468.jpg similarity index 100% rename from data/maps/468/combined.png rename to data/maps/468/468.jpg diff --git a/data/maps/469/combined.png b/data/maps/469/469.jpg similarity index 100% rename from data/maps/469/combined.png rename to data/maps/469/469.jpg diff --git a/data/maps/47/combined.png b/data/maps/47/47.jpg similarity index 100% rename from data/maps/47/combined.png rename to data/maps/47/47.jpg diff --git a/data/maps/470/combined.png b/data/maps/470/470.jpg similarity index 100% rename from data/maps/470/combined.png rename to data/maps/470/470.jpg diff --git a/data/maps/471/combined.png b/data/maps/471/471.jpg similarity index 100% rename from data/maps/471/combined.png rename to data/maps/471/471.jpg diff --git a/data/maps/472/combined.png b/data/maps/472/472.jpg similarity index 100% rename from data/maps/472/combined.png rename to data/maps/472/472.jpg diff --git a/data/maps/473/combined.png b/data/maps/473/473.jpg similarity index 100% rename from data/maps/473/combined.png rename to data/maps/473/473.jpg diff --git a/data/maps/474/combined.png b/data/maps/474/474.jpg similarity index 100% rename from data/maps/474/combined.png rename to data/maps/474/474.jpg diff --git a/data/maps/475/combined.png b/data/maps/475/475.jpg similarity index 100% rename from data/maps/475/combined.png rename to data/maps/475/475.jpg diff --git a/data/maps/476/combined.png b/data/maps/476/476.jpg similarity index 100% rename from data/maps/476/combined.png rename to data/maps/476/476.jpg diff --git a/data/maps/477/combined.png b/data/maps/477/477.jpg similarity index 100% rename from data/maps/477/combined.png rename to data/maps/477/477.jpg diff --git a/data/maps/478/combined.png b/data/maps/478/478.jpg similarity index 100% rename from data/maps/478/combined.png rename to data/maps/478/478.jpg diff --git a/data/maps/479/combined.png b/data/maps/479/479.jpg similarity index 100% rename from data/maps/479/combined.png rename to data/maps/479/479.jpg diff --git a/data/maps/48/combined.png b/data/maps/48/48.jpg similarity index 100% rename from data/maps/48/combined.png rename to data/maps/48/48.jpg diff --git a/data/maps/480/combined.png b/data/maps/480/480.jpg similarity index 100% rename from data/maps/480/combined.png rename to data/maps/480/480.jpg diff --git a/data/maps/481/combined.png b/data/maps/481/481.jpg similarity index 100% rename from data/maps/481/combined.png rename to data/maps/481/481.jpg diff --git a/data/maps/482/combined.png b/data/maps/482/482.jpg similarity index 100% rename from data/maps/482/combined.png rename to data/maps/482/482.jpg diff --git a/data/maps/483/combined.png b/data/maps/483/483.jpg similarity index 100% rename from data/maps/483/combined.png rename to data/maps/483/483.jpg diff --git a/data/maps/484/combined.png b/data/maps/484/484.jpg similarity index 100% rename from data/maps/484/combined.png rename to data/maps/484/484.jpg diff --git a/data/maps/485/combined.png b/data/maps/485/485.jpg similarity index 100% rename from data/maps/485/combined.png rename to data/maps/485/485.jpg diff --git a/data/maps/486/combined.png b/data/maps/486/486.jpg similarity index 100% rename from data/maps/486/combined.png rename to data/maps/486/486.jpg diff --git a/data/maps/487/combined.png b/data/maps/487/487.jpg similarity index 100% rename from data/maps/487/combined.png rename to data/maps/487/487.jpg diff --git a/data/maps/488/combined.png b/data/maps/488/488.jpg similarity index 100% rename from data/maps/488/combined.png rename to data/maps/488/488.jpg diff --git a/data/maps/489/combined.png b/data/maps/489/489.jpg similarity index 100% rename from data/maps/489/combined.png rename to data/maps/489/489.jpg diff --git a/data/maps/49/combined.png b/data/maps/49/49.jpg similarity index 100% rename from data/maps/49/combined.png rename to data/maps/49/49.jpg diff --git a/data/maps/490/combined.png b/data/maps/490/490.jpg similarity index 100% rename from data/maps/490/combined.png rename to data/maps/490/490.jpg diff --git a/data/maps/491/combined.png b/data/maps/491/491.jpg similarity index 100% rename from data/maps/491/combined.png rename to data/maps/491/491.jpg diff --git a/data/maps/492/combined.png b/data/maps/492/492.jpg similarity index 100% rename from data/maps/492/combined.png rename to data/maps/492/492.jpg diff --git a/data/maps/493/combined.png b/data/maps/493/493.jpg similarity index 100% rename from data/maps/493/combined.png rename to data/maps/493/493.jpg diff --git a/data/maps/494/combined.png b/data/maps/494/494.jpg similarity index 100% rename from data/maps/494/combined.png rename to data/maps/494/494.jpg diff --git a/data/maps/495/combined.png b/data/maps/495/495.jpg similarity index 100% rename from data/maps/495/combined.png rename to data/maps/495/495.jpg diff --git a/data/maps/496/combined.png b/data/maps/496/496.jpg similarity index 100% rename from data/maps/496/combined.png rename to data/maps/496/496.jpg diff --git a/data/maps/497/combined.png b/data/maps/497/497.jpg similarity index 100% rename from data/maps/497/combined.png rename to data/maps/497/497.jpg diff --git a/data/maps/498/combined.png b/data/maps/498/498.jpg similarity index 100% rename from data/maps/498/combined.png rename to data/maps/498/498.jpg diff --git a/data/maps/499/combined.png b/data/maps/499/499.jpg similarity index 100% rename from data/maps/499/combined.png rename to data/maps/499/499.jpg diff --git a/data/maps/5/combined.png b/data/maps/5/5.jpg similarity index 100% rename from data/maps/5/combined.png rename to data/maps/5/5.jpg diff --git a/data/maps/50/combined.png b/data/maps/50/50.jpg similarity index 100% rename from data/maps/50/combined.png rename to data/maps/50/50.jpg diff --git a/data/maps/500/combined.png b/data/maps/500/500.jpg similarity index 100% rename from data/maps/500/combined.png rename to data/maps/500/500.jpg diff --git a/data/maps/501/combined.png b/data/maps/501/501.jpg similarity index 100% rename from data/maps/501/combined.png rename to data/maps/501/501.jpg diff --git a/data/maps/502/combined.png b/data/maps/502/502.jpg similarity index 100% rename from data/maps/502/combined.png rename to data/maps/502/502.jpg diff --git a/data/maps/503/combined.png b/data/maps/503/503.jpg similarity index 100% rename from data/maps/503/combined.png rename to data/maps/503/503.jpg diff --git a/data/maps/504/combined.png b/data/maps/504/504.jpg similarity index 100% rename from data/maps/504/combined.png rename to data/maps/504/504.jpg diff --git a/data/maps/505/combined.png b/data/maps/505/505.jpg similarity index 100% rename from data/maps/505/combined.png rename to data/maps/505/505.jpg diff --git a/data/maps/506/combined.png b/data/maps/506/506.jpg similarity index 100% rename from data/maps/506/combined.png rename to data/maps/506/506.jpg diff --git a/data/maps/507/combined.png b/data/maps/507/507.jpg similarity index 100% rename from data/maps/507/combined.png rename to data/maps/507/507.jpg diff --git a/data/maps/508/combined.png b/data/maps/508/508.jpg similarity index 100% rename from data/maps/508/combined.png rename to data/maps/508/508.jpg diff --git a/data/maps/509/combined.png b/data/maps/509/509.jpg similarity index 100% rename from data/maps/509/combined.png rename to data/maps/509/509.jpg diff --git a/data/maps/51/combined.png b/data/maps/51/51.jpg similarity index 100% rename from data/maps/51/combined.png rename to data/maps/51/51.jpg diff --git a/data/maps/510/combined.png b/data/maps/510/510.jpg similarity index 100% rename from data/maps/510/combined.png rename to data/maps/510/510.jpg diff --git a/data/maps/511/combined.png b/data/maps/511/511.jpg similarity index 100% rename from data/maps/511/combined.png rename to data/maps/511/511.jpg diff --git a/data/maps/512/combined.png b/data/maps/512/512.jpg similarity index 100% rename from data/maps/512/combined.png rename to data/maps/512/512.jpg diff --git a/data/maps/513/combined.png b/data/maps/513/513.jpg similarity index 100% rename from data/maps/513/combined.png rename to data/maps/513/513.jpg diff --git a/data/maps/514/combined.png b/data/maps/514/514.jpg similarity index 100% rename from data/maps/514/combined.png rename to data/maps/514/514.jpg diff --git a/data/maps/515/combined.png b/data/maps/515/515.jpg similarity index 100% rename from data/maps/515/combined.png rename to data/maps/515/515.jpg diff --git a/data/maps/516/combined.png b/data/maps/516/516.jpg similarity index 100% rename from data/maps/516/combined.png rename to data/maps/516/516.jpg diff --git a/data/maps/517/combined.png b/data/maps/517/517.jpg similarity index 100% rename from data/maps/517/combined.png rename to data/maps/517/517.jpg diff --git a/data/maps/518/combined.png b/data/maps/518/518.jpg similarity index 100% rename from data/maps/518/combined.png rename to data/maps/518/518.jpg diff --git a/data/maps/519/combined.png b/data/maps/519/519.jpg similarity index 100% rename from data/maps/519/combined.png rename to data/maps/519/519.jpg diff --git a/data/maps/52/combined.png b/data/maps/52/52.jpg similarity index 100% rename from data/maps/52/combined.png rename to data/maps/52/52.jpg diff --git a/data/maps/520/combined.png b/data/maps/520/520.jpg similarity index 100% rename from data/maps/520/combined.png rename to data/maps/520/520.jpg diff --git a/data/maps/521/combined.png b/data/maps/521/521.jpg similarity index 100% rename from data/maps/521/combined.png rename to data/maps/521/521.jpg diff --git a/data/maps/522/combined.png b/data/maps/522/522.jpg similarity index 100% rename from data/maps/522/combined.png rename to data/maps/522/522.jpg diff --git a/data/maps/523/combined.png b/data/maps/523/523.jpg similarity index 100% rename from data/maps/523/combined.png rename to data/maps/523/523.jpg diff --git a/data/maps/524/combined.png b/data/maps/524/524.jpg similarity index 100% rename from data/maps/524/combined.png rename to data/maps/524/524.jpg diff --git a/data/maps/525/combined.png b/data/maps/525/525.jpg similarity index 100% rename from data/maps/525/combined.png rename to data/maps/525/525.jpg diff --git a/data/maps/526/combined.png b/data/maps/526/526.jpg similarity index 100% rename from data/maps/526/combined.png rename to data/maps/526/526.jpg diff --git a/data/maps/527/combined.png b/data/maps/527/527.jpg similarity index 100% rename from data/maps/527/combined.png rename to data/maps/527/527.jpg diff --git a/data/maps/528/combined.png b/data/maps/528/528.jpg similarity index 100% rename from data/maps/528/combined.png rename to data/maps/528/528.jpg diff --git a/data/maps/529/combined.png b/data/maps/529/529.jpg similarity index 100% rename from data/maps/529/combined.png rename to data/maps/529/529.jpg diff --git a/data/maps/53/combined.png b/data/maps/53/53.jpg similarity index 100% rename from data/maps/53/combined.png rename to data/maps/53/53.jpg diff --git a/data/maps/530/combined.png b/data/maps/530/530.jpg similarity index 100% rename from data/maps/530/combined.png rename to data/maps/530/530.jpg diff --git a/data/maps/531/combined.png b/data/maps/531/531.jpg similarity index 100% rename from data/maps/531/combined.png rename to data/maps/531/531.jpg diff --git a/data/maps/532/combined.png b/data/maps/532/532.jpg similarity index 100% rename from data/maps/532/combined.png rename to data/maps/532/532.jpg diff --git a/data/maps/533/combined.png b/data/maps/533/533.jpg similarity index 100% rename from data/maps/533/combined.png rename to data/maps/533/533.jpg diff --git a/data/maps/534/combined.png b/data/maps/534/534.jpg similarity index 100% rename from data/maps/534/combined.png rename to data/maps/534/534.jpg diff --git a/data/maps/535/combined.png b/data/maps/535/535.jpg similarity index 100% rename from data/maps/535/combined.png rename to data/maps/535/535.jpg diff --git a/data/maps/536/combined.png b/data/maps/536/536.jpg similarity index 100% rename from data/maps/536/combined.png rename to data/maps/536/536.jpg diff --git a/data/maps/537/combined.png b/data/maps/537/537.jpg similarity index 100% rename from data/maps/537/combined.png rename to data/maps/537/537.jpg diff --git a/data/maps/538/combined.png b/data/maps/538/538.jpg similarity index 100% rename from data/maps/538/combined.png rename to data/maps/538/538.jpg diff --git a/data/maps/539/combined.png b/data/maps/539/539.jpg similarity index 100% rename from data/maps/539/combined.png rename to data/maps/539/539.jpg diff --git a/data/maps/54/combined.png b/data/maps/54/54.jpg similarity index 100% rename from data/maps/54/combined.png rename to data/maps/54/54.jpg diff --git a/data/maps/540/combined.png b/data/maps/540/540.jpg similarity index 100% rename from data/maps/540/combined.png rename to data/maps/540/540.jpg diff --git a/data/maps/541/combined.png b/data/maps/541/541.jpg similarity index 100% rename from data/maps/541/combined.png rename to data/maps/541/541.jpg diff --git a/data/maps/542/combined.png b/data/maps/542/542.jpg similarity index 100% rename from data/maps/542/combined.png rename to data/maps/542/542.jpg diff --git a/data/maps/543/combined.png b/data/maps/543/543.jpg similarity index 100% rename from data/maps/543/combined.png rename to data/maps/543/543.jpg diff --git a/data/maps/544/combined.png b/data/maps/544/544.jpg similarity index 100% rename from data/maps/544/combined.png rename to data/maps/544/544.jpg diff --git a/data/maps/545/combined.png b/data/maps/545/545.jpg similarity index 100% rename from data/maps/545/combined.png rename to data/maps/545/545.jpg diff --git a/data/maps/546/combined.png b/data/maps/546/546.jpg similarity index 100% rename from data/maps/546/combined.png rename to data/maps/546/546.jpg diff --git a/data/maps/547/combined.png b/data/maps/547/547.jpg similarity index 100% rename from data/maps/547/combined.png rename to data/maps/547/547.jpg diff --git a/data/maps/548/combined.png b/data/maps/548/548.jpg similarity index 100% rename from data/maps/548/combined.png rename to data/maps/548/548.jpg diff --git a/data/maps/549/combined.png b/data/maps/549/549.jpg similarity index 100% rename from data/maps/549/combined.png rename to data/maps/549/549.jpg diff --git a/data/maps/55/combined.png b/data/maps/55/55.jpg similarity index 100% rename from data/maps/55/combined.png rename to data/maps/55/55.jpg diff --git a/data/maps/550/combined.png b/data/maps/550/550.jpg similarity index 100% rename from data/maps/550/combined.png rename to data/maps/550/550.jpg diff --git a/data/maps/551/combined.png b/data/maps/551/551.jpg similarity index 100% rename from data/maps/551/combined.png rename to data/maps/551/551.jpg diff --git a/data/maps/552/combined.png b/data/maps/552/552.jpg similarity index 100% rename from data/maps/552/combined.png rename to data/maps/552/552.jpg diff --git a/data/maps/553/combined.png b/data/maps/553/553.jpg similarity index 100% rename from data/maps/553/combined.png rename to data/maps/553/553.jpg diff --git a/data/maps/554/combined.png b/data/maps/554/554.jpg similarity index 100% rename from data/maps/554/combined.png rename to data/maps/554/554.jpg diff --git a/data/maps/555/combined.png b/data/maps/555/555.jpg similarity index 100% rename from data/maps/555/combined.png rename to data/maps/555/555.jpg diff --git a/data/maps/556/combined.png b/data/maps/556/556.jpg similarity index 100% rename from data/maps/556/combined.png rename to data/maps/556/556.jpg diff --git a/data/maps/557/combined.png b/data/maps/557/557.jpg similarity index 100% rename from data/maps/557/combined.png rename to data/maps/557/557.jpg diff --git a/data/maps/558/combined.png b/data/maps/558/558.jpg similarity index 100% rename from data/maps/558/combined.png rename to data/maps/558/558.jpg diff --git a/data/maps/559/combined.png b/data/maps/559/559.jpg similarity index 100% rename from data/maps/559/combined.png rename to data/maps/559/559.jpg diff --git a/data/maps/56/combined.png b/data/maps/56/56.jpg similarity index 100% rename from data/maps/56/combined.png rename to data/maps/56/56.jpg diff --git a/data/maps/560/combined.png b/data/maps/560/560.jpg similarity index 100% rename from data/maps/560/combined.png rename to data/maps/560/560.jpg diff --git a/data/maps/561/combined.png b/data/maps/561/561.jpg similarity index 100% rename from data/maps/561/combined.png rename to data/maps/561/561.jpg diff --git a/data/maps/562/combined.png b/data/maps/562/562.jpg similarity index 100% rename from data/maps/562/combined.png rename to data/maps/562/562.jpg diff --git a/data/maps/563/combined.png b/data/maps/563/563.jpg similarity index 100% rename from data/maps/563/combined.png rename to data/maps/563/563.jpg diff --git a/data/maps/564/combined.png b/data/maps/564/564.jpg similarity index 100% rename from data/maps/564/combined.png rename to data/maps/564/564.jpg diff --git a/data/maps/565/combined.png b/data/maps/565/565.jpg similarity index 100% rename from data/maps/565/combined.png rename to data/maps/565/565.jpg diff --git a/data/maps/566/combined.png b/data/maps/566/566.jpg similarity index 100% rename from data/maps/566/combined.png rename to data/maps/566/566.jpg diff --git a/data/maps/567/combined.png b/data/maps/567/567.jpg similarity index 100% rename from data/maps/567/combined.png rename to data/maps/567/567.jpg diff --git a/data/maps/568/combined.png b/data/maps/568/568.jpg similarity index 100% rename from data/maps/568/combined.png rename to data/maps/568/568.jpg diff --git a/data/maps/569/combined.png b/data/maps/569/569.jpg similarity index 100% rename from data/maps/569/combined.png rename to data/maps/569/569.jpg diff --git a/data/maps/57/combined.png b/data/maps/57/57.jpg similarity index 100% rename from data/maps/57/combined.png rename to data/maps/57/57.jpg diff --git a/data/maps/570/combined.png b/data/maps/570/570.jpg similarity index 100% rename from data/maps/570/combined.png rename to data/maps/570/570.jpg diff --git a/data/maps/571/combined.png b/data/maps/571/571.jpg similarity index 100% rename from data/maps/571/combined.png rename to data/maps/571/571.jpg diff --git a/data/maps/572/combined.png b/data/maps/572/572.jpg similarity index 100% rename from data/maps/572/combined.png rename to data/maps/572/572.jpg diff --git a/data/maps/573/combined.png b/data/maps/573/573.jpg similarity index 100% rename from data/maps/573/combined.png rename to data/maps/573/573.jpg diff --git a/data/maps/574/combined.png b/data/maps/574/574.jpg similarity index 100% rename from data/maps/574/combined.png rename to data/maps/574/574.jpg diff --git a/data/maps/575/combined.png b/data/maps/575/575.jpg similarity index 100% rename from data/maps/575/combined.png rename to data/maps/575/575.jpg diff --git a/data/maps/576/combined.png b/data/maps/576/576.jpg similarity index 100% rename from data/maps/576/combined.png rename to data/maps/576/576.jpg diff --git a/data/maps/577/combined.png b/data/maps/577/577.jpg similarity index 100% rename from data/maps/577/combined.png rename to data/maps/577/577.jpg diff --git a/data/maps/578/combined.png b/data/maps/578/578.jpg similarity index 100% rename from data/maps/578/combined.png rename to data/maps/578/578.jpg diff --git a/data/maps/579/combined.png b/data/maps/579/579.jpg similarity index 100% rename from data/maps/579/combined.png rename to data/maps/579/579.jpg diff --git a/data/maps/58/combined.png b/data/maps/58/58.jpg similarity index 100% rename from data/maps/58/combined.png rename to data/maps/58/58.jpg diff --git a/data/maps/580/combined.png b/data/maps/580/580.jpg similarity index 100% rename from data/maps/580/combined.png rename to data/maps/580/580.jpg diff --git a/data/maps/581/combined.png b/data/maps/581/581.jpg similarity index 100% rename from data/maps/581/combined.png rename to data/maps/581/581.jpg diff --git a/data/maps/582/combined.png b/data/maps/582/582.jpg similarity index 100% rename from data/maps/582/combined.png rename to data/maps/582/582.jpg diff --git a/data/maps/583/combined.png b/data/maps/583/583.jpg similarity index 100% rename from data/maps/583/combined.png rename to data/maps/583/583.jpg diff --git a/data/maps/584/combined.png b/data/maps/584/584.jpg similarity index 100% rename from data/maps/584/combined.png rename to data/maps/584/584.jpg diff --git a/data/maps/585/combined.png b/data/maps/585/585.jpg similarity index 100% rename from data/maps/585/combined.png rename to data/maps/585/585.jpg diff --git a/data/maps/586/combined.png b/data/maps/586/586.jpg similarity index 100% rename from data/maps/586/combined.png rename to data/maps/586/586.jpg diff --git a/data/maps/587/combined.png b/data/maps/587/587.jpg similarity index 100% rename from data/maps/587/combined.png rename to data/maps/587/587.jpg diff --git a/data/maps/588/combined.png b/data/maps/588/588.jpg similarity index 100% rename from data/maps/588/combined.png rename to data/maps/588/588.jpg diff --git a/data/maps/589/combined.png b/data/maps/589/589.jpg similarity index 100% rename from data/maps/589/combined.png rename to data/maps/589/589.jpg diff --git a/data/maps/59/combined.png b/data/maps/59/59.jpg similarity index 100% rename from data/maps/59/combined.png rename to data/maps/59/59.jpg diff --git a/data/maps/590/combined.png b/data/maps/590/590.jpg similarity index 100% rename from data/maps/590/combined.png rename to data/maps/590/590.jpg diff --git a/data/maps/591/combined.png b/data/maps/591/591.jpg similarity index 100% rename from data/maps/591/combined.png rename to data/maps/591/591.jpg diff --git a/data/maps/592/combined.png b/data/maps/592/592.jpg similarity index 100% rename from data/maps/592/combined.png rename to data/maps/592/592.jpg diff --git a/data/maps/593/combined.png b/data/maps/593/593.jpg similarity index 100% rename from data/maps/593/combined.png rename to data/maps/593/593.jpg diff --git a/data/maps/594/combined.png b/data/maps/594/594.jpg similarity index 100% rename from data/maps/594/combined.png rename to data/maps/594/594.jpg diff --git a/data/maps/595/combined.png b/data/maps/595/595.jpg similarity index 100% rename from data/maps/595/combined.png rename to data/maps/595/595.jpg diff --git a/data/maps/596/combined.png b/data/maps/596/596.jpg similarity index 100% rename from data/maps/596/combined.png rename to data/maps/596/596.jpg diff --git a/data/maps/597/combined.png b/data/maps/597/597.jpg similarity index 100% rename from data/maps/597/combined.png rename to data/maps/597/597.jpg diff --git a/data/maps/598/combined.png b/data/maps/598/598.jpg similarity index 100% rename from data/maps/598/combined.png rename to data/maps/598/598.jpg diff --git a/data/maps/599/combined.png b/data/maps/599/599.jpg similarity index 100% rename from data/maps/599/combined.png rename to data/maps/599/599.jpg diff --git a/data/maps/6/combined.png b/data/maps/6/6.jpg similarity index 100% rename from data/maps/6/combined.png rename to data/maps/6/6.jpg diff --git a/data/maps/60/combined.png b/data/maps/60/60.jpg similarity index 100% rename from data/maps/60/combined.png rename to data/maps/60/60.jpg diff --git a/data/maps/600/combined.png b/data/maps/600/600.jpg similarity index 100% rename from data/maps/600/combined.png rename to data/maps/600/600.jpg diff --git a/data/maps/601/combined.png b/data/maps/601/601.jpg similarity index 100% rename from data/maps/601/combined.png rename to data/maps/601/601.jpg diff --git a/data/maps/602/combined.png b/data/maps/602/602.jpg similarity index 100% rename from data/maps/602/combined.png rename to data/maps/602/602.jpg diff --git a/data/maps/603/combined.png b/data/maps/603/603.jpg similarity index 100% rename from data/maps/603/combined.png rename to data/maps/603/603.jpg diff --git a/data/maps/604/combined.png b/data/maps/604/604.jpg similarity index 100% rename from data/maps/604/combined.png rename to data/maps/604/604.jpg diff --git a/data/maps/605/combined.png b/data/maps/605/605.jpg similarity index 100% rename from data/maps/605/combined.png rename to data/maps/605/605.jpg diff --git a/data/maps/606/combined.png b/data/maps/606/606.jpg similarity index 100% rename from data/maps/606/combined.png rename to data/maps/606/606.jpg diff --git a/data/maps/607/combined.png b/data/maps/607/607.jpg similarity index 100% rename from data/maps/607/combined.png rename to data/maps/607/607.jpg diff --git a/data/maps/608/combined.png b/data/maps/608/608.jpg similarity index 100% rename from data/maps/608/combined.png rename to data/maps/608/608.jpg diff --git a/data/maps/609/combined.png b/data/maps/609/609.jpg similarity index 100% rename from data/maps/609/combined.png rename to data/maps/609/609.jpg diff --git a/data/maps/61/combined.png b/data/maps/61/61.jpg similarity index 100% rename from data/maps/61/combined.png rename to data/maps/61/61.jpg diff --git a/data/maps/610/combined.png b/data/maps/610/610.jpg similarity index 100% rename from data/maps/610/combined.png rename to data/maps/610/610.jpg diff --git a/data/maps/611/combined.png b/data/maps/611/611.jpg similarity index 100% rename from data/maps/611/combined.png rename to data/maps/611/611.jpg diff --git a/data/maps/612/combined.png b/data/maps/612/612.jpg similarity index 100% rename from data/maps/612/combined.png rename to data/maps/612/612.jpg diff --git a/data/maps/613/combined.png b/data/maps/613/613.jpg similarity index 100% rename from data/maps/613/combined.png rename to data/maps/613/613.jpg diff --git a/data/maps/614/combined.png b/data/maps/614/614.jpg similarity index 100% rename from data/maps/614/combined.png rename to data/maps/614/614.jpg diff --git a/data/maps/615/combined.png b/data/maps/615/615.jpg similarity index 100% rename from data/maps/615/combined.png rename to data/maps/615/615.jpg diff --git a/data/maps/616/combined.png b/data/maps/616/616.jpg similarity index 100% rename from data/maps/616/combined.png rename to data/maps/616/616.jpg diff --git a/data/maps/617/combined.png b/data/maps/617/617.jpg similarity index 100% rename from data/maps/617/combined.png rename to data/maps/617/617.jpg diff --git a/data/maps/618/combined.png b/data/maps/618/618.jpg similarity index 100% rename from data/maps/618/combined.png rename to data/maps/618/618.jpg diff --git a/data/maps/619/combined.png b/data/maps/619/619.jpg similarity index 100% rename from data/maps/619/combined.png rename to data/maps/619/619.jpg diff --git a/data/maps/62/combined.png b/data/maps/62/62.jpg similarity index 100% rename from data/maps/62/combined.png rename to data/maps/62/62.jpg diff --git a/data/maps/620/combined.png b/data/maps/620/620.jpg similarity index 100% rename from data/maps/620/combined.png rename to data/maps/620/620.jpg diff --git a/data/maps/621/combined.png b/data/maps/621/621.jpg similarity index 100% rename from data/maps/621/combined.png rename to data/maps/621/621.jpg diff --git a/data/maps/622/combined.png b/data/maps/622/622.jpg similarity index 100% rename from data/maps/622/combined.png rename to data/maps/622/622.jpg diff --git a/data/maps/623/combined.png b/data/maps/623/623.jpg similarity index 100% rename from data/maps/623/combined.png rename to data/maps/623/623.jpg diff --git a/data/maps/624/combined.png b/data/maps/624/624.jpg similarity index 100% rename from data/maps/624/combined.png rename to data/maps/624/624.jpg diff --git a/data/maps/625/combined.png b/data/maps/625/625.jpg similarity index 100% rename from data/maps/625/combined.png rename to data/maps/625/625.jpg diff --git a/data/maps/626/combined.png b/data/maps/626/626.jpg similarity index 100% rename from data/maps/626/combined.png rename to data/maps/626/626.jpg diff --git a/data/maps/627/combined.png b/data/maps/627/627.jpg similarity index 100% rename from data/maps/627/combined.png rename to data/maps/627/627.jpg diff --git a/data/maps/628/combined.png b/data/maps/628/628.jpg similarity index 100% rename from data/maps/628/combined.png rename to data/maps/628/628.jpg diff --git a/data/maps/629/combined.png b/data/maps/629/629.jpg similarity index 100% rename from data/maps/629/combined.png rename to data/maps/629/629.jpg diff --git a/data/maps/63/combined.png b/data/maps/63/63.jpg similarity index 100% rename from data/maps/63/combined.png rename to data/maps/63/63.jpg diff --git a/data/maps/630/combined.png b/data/maps/630/630.jpg similarity index 100% rename from data/maps/630/combined.png rename to data/maps/630/630.jpg diff --git a/data/maps/631/combined.png b/data/maps/631/631.jpg similarity index 100% rename from data/maps/631/combined.png rename to data/maps/631/631.jpg diff --git a/data/maps/632/combined.png b/data/maps/632/632.jpg similarity index 100% rename from data/maps/632/combined.png rename to data/maps/632/632.jpg diff --git a/data/maps/633/combined.png b/data/maps/633/633.jpg similarity index 100% rename from data/maps/633/combined.png rename to data/maps/633/633.jpg diff --git a/data/maps/634/combined.png b/data/maps/634/634.jpg similarity index 100% rename from data/maps/634/combined.png rename to data/maps/634/634.jpg diff --git a/data/maps/635/combined.png b/data/maps/635/635.jpg similarity index 100% rename from data/maps/635/combined.png rename to data/maps/635/635.jpg diff --git a/data/maps/636/combined.png b/data/maps/636/636.jpg similarity index 100% rename from data/maps/636/combined.png rename to data/maps/636/636.jpg diff --git a/data/maps/637/combined.png b/data/maps/637/637.jpg similarity index 100% rename from data/maps/637/combined.png rename to data/maps/637/637.jpg diff --git a/data/maps/638/combined.png b/data/maps/638/638.jpg similarity index 100% rename from data/maps/638/combined.png rename to data/maps/638/638.jpg diff --git a/data/maps/639/combined.png b/data/maps/639/639.jpg similarity index 100% rename from data/maps/639/combined.png rename to data/maps/639/639.jpg diff --git a/data/maps/64/combined.png b/data/maps/64/64.jpg similarity index 100% rename from data/maps/64/combined.png rename to data/maps/64/64.jpg diff --git a/data/maps/640/combined.png b/data/maps/640/640.jpg similarity index 100% rename from data/maps/640/combined.png rename to data/maps/640/640.jpg diff --git a/data/maps/641/combined.png b/data/maps/641/641.jpg similarity index 100% rename from data/maps/641/combined.png rename to data/maps/641/641.jpg diff --git a/data/maps/642/combined.png b/data/maps/642/642.jpg similarity index 100% rename from data/maps/642/combined.png rename to data/maps/642/642.jpg diff --git a/data/maps/643/combined.png b/data/maps/643/643.jpg similarity index 100% rename from data/maps/643/combined.png rename to data/maps/643/643.jpg diff --git a/data/maps/644/combined.png b/data/maps/644/644.jpg similarity index 100% rename from data/maps/644/combined.png rename to data/maps/644/644.jpg diff --git a/data/maps/645/combined.png b/data/maps/645/645.jpg similarity index 100% rename from data/maps/645/combined.png rename to data/maps/645/645.jpg diff --git a/data/maps/646/combined.png b/data/maps/646/646.jpg similarity index 100% rename from data/maps/646/combined.png rename to data/maps/646/646.jpg diff --git a/data/maps/647/combined.png b/data/maps/647/647.jpg similarity index 100% rename from data/maps/647/combined.png rename to data/maps/647/647.jpg diff --git a/data/maps/648/combined.png b/data/maps/648/648.jpg similarity index 100% rename from data/maps/648/combined.png rename to data/maps/648/648.jpg diff --git a/data/maps/649/combined.png b/data/maps/649/649.jpg similarity index 100% rename from data/maps/649/combined.png rename to data/maps/649/649.jpg diff --git a/data/maps/65/combined.png b/data/maps/65/65.jpg similarity index 100% rename from data/maps/65/combined.png rename to data/maps/65/65.jpg diff --git a/data/maps/650/combined.png b/data/maps/650/650.jpg similarity index 100% rename from data/maps/650/combined.png rename to data/maps/650/650.jpg diff --git a/data/maps/651/combined.png b/data/maps/651/651.jpg similarity index 100% rename from data/maps/651/combined.png rename to data/maps/651/651.jpg diff --git a/data/maps/652/combined.png b/data/maps/652/652.jpg similarity index 100% rename from data/maps/652/combined.png rename to data/maps/652/652.jpg diff --git a/data/maps/653/combined.png b/data/maps/653/653.jpg similarity index 100% rename from data/maps/653/combined.png rename to data/maps/653/653.jpg diff --git a/data/maps/654/combined.png b/data/maps/654/654.jpg similarity index 100% rename from data/maps/654/combined.png rename to data/maps/654/654.jpg diff --git a/data/maps/655/combined.png b/data/maps/655/655.jpg similarity index 100% rename from data/maps/655/combined.png rename to data/maps/655/655.jpg diff --git a/data/maps/656/combined.png b/data/maps/656/656.jpg similarity index 100% rename from data/maps/656/combined.png rename to data/maps/656/656.jpg diff --git a/data/maps/657/combined.png b/data/maps/657/657.jpg similarity index 100% rename from data/maps/657/combined.png rename to data/maps/657/657.jpg diff --git a/data/maps/66/combined.png b/data/maps/66/66.jpg similarity index 100% rename from data/maps/66/combined.png rename to data/maps/66/66.jpg diff --git a/data/maps/67/combined.png b/data/maps/67/67.jpg similarity index 100% rename from data/maps/67/combined.png rename to data/maps/67/67.jpg diff --git a/data/maps/68/combined.png b/data/maps/68/68.jpg similarity index 100% rename from data/maps/68/combined.png rename to data/maps/68/68.jpg diff --git a/data/maps/69/combined.png b/data/maps/69/69.jpg similarity index 100% rename from data/maps/69/combined.png rename to data/maps/69/69.jpg diff --git a/data/maps/7/combined.png b/data/maps/7/7.jpg similarity index 100% rename from data/maps/7/combined.png rename to data/maps/7/7.jpg diff --git a/data/maps/70/combined.png b/data/maps/70/70.jpg similarity index 100% rename from data/maps/70/combined.png rename to data/maps/70/70.jpg diff --git a/data/maps/71/combined.png b/data/maps/71/71.jpg similarity index 100% rename from data/maps/71/combined.png rename to data/maps/71/71.jpg diff --git a/data/maps/72/combined.png b/data/maps/72/72.jpg similarity index 100% rename from data/maps/72/combined.png rename to data/maps/72/72.jpg diff --git a/data/maps/73/combined.png b/data/maps/73/73.jpg similarity index 100% rename from data/maps/73/combined.png rename to data/maps/73/73.jpg diff --git a/data/maps/74/combined.png b/data/maps/74/74.jpg similarity index 100% rename from data/maps/74/combined.png rename to data/maps/74/74.jpg diff --git a/data/maps/75/combined.png b/data/maps/75/75.jpg similarity index 100% rename from data/maps/75/combined.png rename to data/maps/75/75.jpg diff --git a/data/maps/76/combined.png b/data/maps/76/76.jpg similarity index 100% rename from data/maps/76/combined.png rename to data/maps/76/76.jpg diff --git a/data/maps/77/combined.png b/data/maps/77/77.jpg similarity index 100% rename from data/maps/77/combined.png rename to data/maps/77/77.jpg diff --git a/data/maps/78/combined.png b/data/maps/78/78.jpg similarity index 100% rename from data/maps/78/combined.png rename to data/maps/78/78.jpg diff --git a/data/maps/79/combined.png b/data/maps/79/79.jpg similarity index 100% rename from data/maps/79/combined.png rename to data/maps/79/79.jpg diff --git a/data/maps/8/combined.png b/data/maps/8/8.jpg similarity index 100% rename from data/maps/8/combined.png rename to data/maps/8/8.jpg diff --git a/data/maps/80/combined.png b/data/maps/80/80.jpg similarity index 100% rename from data/maps/80/combined.png rename to data/maps/80/80.jpg diff --git a/data/maps/81/combined.png b/data/maps/81/81.jpg similarity index 100% rename from data/maps/81/combined.png rename to data/maps/81/81.jpg diff --git a/data/maps/82/combined.png b/data/maps/82/82.jpg similarity index 100% rename from data/maps/82/combined.png rename to data/maps/82/82.jpg diff --git a/data/maps/83/combined.png b/data/maps/83/83.jpg similarity index 100% rename from data/maps/83/combined.png rename to data/maps/83/83.jpg diff --git a/data/maps/84/combined.png b/data/maps/84/84.jpg similarity index 100% rename from data/maps/84/combined.png rename to data/maps/84/84.jpg diff --git a/data/maps/85/combined.png b/data/maps/85/85.jpg similarity index 100% rename from data/maps/85/combined.png rename to data/maps/85/85.jpg diff --git a/data/maps/86/combined.png b/data/maps/86/86.jpg similarity index 100% rename from data/maps/86/combined.png rename to data/maps/86/86.jpg diff --git a/data/maps/87/combined.png b/data/maps/87/87.jpg similarity index 100% rename from data/maps/87/combined.png rename to data/maps/87/87.jpg diff --git a/data/maps/88/combined.png b/data/maps/88/88.jpg similarity index 100% rename from data/maps/88/combined.png rename to data/maps/88/88.jpg diff --git a/data/maps/89/combined.png b/data/maps/89/89.jpg similarity index 100% rename from data/maps/89/combined.png rename to data/maps/89/89.jpg diff --git a/data/maps/9/combined.png b/data/maps/9/9.jpg similarity index 100% rename from data/maps/9/combined.png rename to data/maps/9/9.jpg diff --git a/data/maps/90/combined.png b/data/maps/90/90.jpg similarity index 100% rename from data/maps/90/combined.png rename to data/maps/90/90.jpg diff --git a/data/maps/91/combined.png b/data/maps/91/91.jpg similarity index 100% rename from data/maps/91/combined.png rename to data/maps/91/91.jpg diff --git a/data/maps/92/combined.png b/data/maps/92/92.jpg similarity index 100% rename from data/maps/92/combined.png rename to data/maps/92/92.jpg diff --git a/data/maps/93/combined.png b/data/maps/93/93.jpg similarity index 100% rename from data/maps/93/combined.png rename to data/maps/93/93.jpg diff --git a/data/maps/94/combined.png b/data/maps/94/94.jpg similarity index 100% rename from data/maps/94/combined.png rename to data/maps/94/94.jpg diff --git a/data/maps/95/combined.png b/data/maps/95/95.jpg similarity index 100% rename from data/maps/95/combined.png rename to data/maps/95/95.jpg diff --git a/data/maps/96/combined.png b/data/maps/96/96.jpg similarity index 100% rename from data/maps/96/combined.png rename to data/maps/96/96.jpg diff --git a/data/maps/97/combined.png b/data/maps/97/97.jpg similarity index 100% rename from data/maps/97/combined.png rename to data/maps/97/97.jpg diff --git a/data/maps/98/combined.png b/data/maps/98/98.jpg similarity index 100% rename from data/maps/98/combined.png rename to data/maps/98/98.jpg diff --git a/data/maps/99/combined.png b/data/maps/99/99.jpg similarity index 100% rename from data/maps/99/combined.png rename to data/maps/99/99.jpg diff --git a/data/maps/combine.py b/data/maps/combine.py new file mode 100644 index 0000000..502ea37 --- /dev/null +++ b/data/maps/combine.py @@ -0,0 +1,28 @@ +import os +from tqdm import tqdm + +# Set the directory path where your folders are located +directory_path = r"C:\Users\Nighthawk\Desktop\PyYoda\data\maps" + +# Get a list of all folders in the directory +folders = [folder for folder in os.listdir(directory_path) if os.path.isdir(os.path.join(directory_path, folder))] + +# Create a progress bar +progress_bar = tqdm(folders, desc="Renaming files") + +# Iterate through each folder +for folder in progress_bar: + folder_path = os.path.join(directory_path, folder) + combined_file_path = os.path.join(folder_path, "combined.png") + new_file_name = os.path.join(folder_path, folder + ".jpg") + + # Check if the combined.png file exists in the folder + if os.path.exists(combined_file_path): + # Rename the combined.png file to .jpg + os.rename(combined_file_path, new_file_name) + progress_bar.set_postfix({"Renamed": folder}) + else: + progress_bar.set_postfix({"File not found": folder}) + +# Close the progress bar +progress_bar.close() \ No newline at end of file diff --git a/modules/debug.py b/modules/debug.py deleted file mode 100644 index 8e622f2..0000000 --- a/modules/debug.py +++ /dev/null @@ -1,12 +0,0 @@ -# debug.py - This is a simple debug module for the game. - -import pygame -pygame -font = pygame.font.Font(None, 30) - -def debug(info, y = 10, x = 10): - display_surface = pygame.display.get_surface() - debug_surf = font.render(str(info), True, 'White') - debug_rect = debug_surf.get_rect(topleft = (x, y)) - pygame.draw.rect(display_surface, 'Black', debug_rect) - display_surface.blit(debug_surf, debug_rect) \ No newline at end of file diff --git a/modules/classes.py b/modules/menu.py similarity index 72% rename from modules/classes.py rename to modules/menu.py index 3c08f31..f1321c2 100644 --- a/modules/classes.py +++ b/modules/menu.py @@ -1,10 +1,10 @@ -# classes.py - This contains our Python Classes for the game. +# menu.py -import pygame, sys, os, random, math +import pygame +from pytmx.util_pygame import load_pygame import tkinter as tk from tkinter import filedialog -# Main Menu Classes. class MainMenu: def __init__(self, win): self.win = win @@ -33,31 +33,35 @@ class MainMenu: frame_scaled = pygame.transform.scale(frame, self.win.get_size()) self.background_frames.append(frame_scaled) -class NewGameScreen: - def __init__(self, win, menu_music): + self.button_rects = [ + self.button_newgame_rect, + self.button_loadgame_rect, + self.button_options_rect, + self.button_quit_rect + ] + +class NewGame: + def __init__(self, win, menu_music, settings): self.win = win - self.screen_width = win.get_width() - self.screen_height = win.get_height() self.menu_music = menu_music + self.settings = settings + self.screen_width = self.settings.window_width + self.screen_height = self.settings.window_height def start(self): - pygame.init() # Initialize Pygame's video system - self.menu_music.stop() # Stop the menu music - self.draw_blank_screen() + pass - game_running = True - while game_running: - for event in pygame.event.get(): - if event.type == pygame.QUIT: - game_running = False + def draw_game(self): + # Clear the screen + self.win.fill((0, 0, 0)) - pygame.display.update() + # Draw game elements + # ... - pygame.quit() # Quit Pygame - - def draw_blank_screen(self): - self.win.fill((0, 0, 0)) # Fill the screen with black + # Draw other game objects, characters, UI, etc. + # Add any additional drawing logic specific to Dagobah + class LoadGame: def __init__(self): self.root = tk.Tk() @@ -70,9 +74,3 @@ class LoadGame: # Perform further actions with the selected save file else: print("No save file selected.") - -# Gameplay classes. -class Player: - class Player(pygame.sprite.Sprite): - def __init__(self,pos,groups): - super().__init__(groups) \ No newline at end of file diff --git a/modules/multiplayer.py b/modules/multiplayer.py deleted file mode 100644 index da99d12..0000000 --- a/modules/multiplayer.py +++ /dev/null @@ -1 +0,0 @@ -# multiplayer.py - This is the main multiplayer code for the game. \ No newline at end of file diff --git a/modules/settings.py b/modules/settings.py new file mode 100644 index 0000000..d301fa6 --- /dev/null +++ b/modules/settings.py @@ -0,0 +1,31 @@ +# modules/settings.py + +import json + +class Settings: + def __init__(self, settings_file_path): + self.settings_file_path = settings_file_path + self.settings = self.load_settings() + + def load_settings(self): + try: + with open(self.settings_file_path) as settings_file: + return json.load(settings_file) + except FileNotFoundError: + # Use default settings if the file doesn't exist + return { + "player": "Luke Skywalker", + "windowed_width": 1280, + "windowed_height": 720, + "fullscreen": False, + "volume": 1.0, + "world_size": "small", + "difficulty": "easy", + "highscore": 0 + } + + def save_settings(self): + with open(self.settings_file_path, 'w') as settings_file: + json.dump(self.settings, settings_file, indent=4) + + # Add any additional methods for manipulating the settings as needed \ No newline at end of file diff --git a/modules/systems.py b/modules/systems.py new file mode 100644 index 0000000..5e7fb27 --- /dev/null +++ b/modules/systems.py @@ -0,0 +1,125 @@ +import pygame + +class AssetManager: + def __init__(self): + # Initialize the asset manager + self.spritesheet_images = {} # Dictionary to store sprite sheet images + self.sound_effects = {} # Dictionary to store sound effect files + self.music_tracks = {} # Dictionary to store music tracks + self.tilemaps = {} # Dictionary to store tilemap files + + def import_spritesheet(self, spritesheet_name, file_path): + # Import a sprite sheet image + # Store the image in the spritesheet_images dictionary using spritesheet_name as the key + pass + + def get_spritesheet_image(self, spritesheet_name): + # Get a spritesheet image from the asset manager using the spritesheet_name as the key + pass + + def import_sound_effect(self, sound_effect_name, file_path): + # Import a sound effect file + # Store the file in the sound_effects dictionary using sound_effect_name as the key + pass + + def get_sound_effect(self, sound_effect_name): + # Get a sound effect file from the asset manager using the sound_effect_name as the key + pass + + def import_music_track(self, music_track_name, file_path): + # Import a music track file + # Store the file in the music_tracks dictionary using music_track_name as the key + pass + + def get_music_track(self, music_track_name): + # Get a music track file from the asset manager using the music_track_name as the key + pass + + def import_tilemap(self, tilemap_name, file_path): + # Import a tilemap file + # Store the file in the tilemaps dictionary using tilemap_name as the key + pass + + def get_tilemap(self, tilemap_name): + # Get a tilemap file from the asset manager using the tilemap_name as the key + pass + + # Add any additional methods for importing and managing assets + +class AudioManager: + def __init__(self): + # Initialize audio system and load sound assets + pass + + def play_sound(self, sound): + # Play a sound effect + pass + + def play_music(self, music): + # Play background music + pass + + def stop_music(self): + # Stop playing background music + pass + + # Add any additional methods for audio management + +class CollisionDetector: + def __init__(self): + # Initialize collision detection system + pass + + def detect_collision(self, sprite1, sprite2): + # Check for collision between two sprites + pass + + # Add any additional methods for collision detection + +class SaveLoadSystem: + def __init__(self): + # Initialize the save/load system + pass + + def save_game(self, game_state): + # Save the current game state to a file + pass + + def load_game(self, save_file): + # Load a saved game state from a file + pass + + # Add any additional methods for save/load functionality + +class Sprite: + def __init__(self, image, position): + self.image = image + self.position = position + + def update(self): + # Update sprite position or state + pass + + def draw(self): + # Draw sprite on the screen + pass + +class SpriteManager: + def __init__(self): + self.sprites = [] + + def add_sprite(self, sprite): + self.sprites.append(sprite) + + def remove_sprite(self, sprite): + self.sprites.remove(sprite) + + def update(self): + for sprite in self.sprites: + sprite.update() + + def draw(self, surface): + for sprite in self.sprites: + sprite.draw(surface) + +# Add any additional classes or systems here diff --git a/pyyoda.py b/pyyoda.py index 0e93eea..8ea71b0 100644 --- a/pyyoda.py +++ b/pyyoda.py @@ -1,19 +1,27 @@ import pygame -from modules.classes import MainMenu, NewGameScreen, LoadGame, Player +from modules.menu import MainMenu, NewGame, LoadGame +from modules.settings import Settings -class Main: +class PyYoda: def __init__(self): pygame.init() # Set up the game window - win_width = 1280 - win_height = 720 + game_settings = Settings("settings.json") + fullscreen = game_settings.settings["fullscreen"] + if fullscreen: + screen_info = pygame.display.Info() + win_width = screen_info.current_w + win_height = screen_info.current_h + else: + win_width = game_settings.settings["windowed_width"] + win_height = game_settings.settings["windowed_height"] self.win = pygame.display.set_mode((win_width, win_height)) - pygame.display.set_caption("Yoda Stories") + pygame.display.set_caption("Yoda Stories - PyYoda") # Initialize game objects self.main_menu = MainMenu(self.win) - self.new_game_screen = NewGameScreen(self.win, self.main_menu.menu_music) + self.new_game_screen = NewGame(self.win, self.main_menu.menu_music, game_settings) self.load_game = LoadGame() def run(self): @@ -27,58 +35,55 @@ class Main: for event in pygame.event.get(): if event.type == pygame.QUIT: game_running = False - elif event.type == pygame.MOUSEBUTTONDOWN: - if self.main_menu.button_newgame_rect.collidepoint(event.pos): - self.new_game_screen.start() - - elif self.main_menu.button_loadgame_rect.collidepoint(event.pos): - self.load_game.select_save_file() - - elif self.main_menu.button_options_rect.collidepoint(event.pos): - print("Options clicked!") - - elif self.main_menu.button_quit_rect.collidepoint(event.pos): - game_running = False + self.handle_mouse_click(event.pos) if pygame.get_init(): - # Draw the background - self.win.blit(self.main_menu.background_frames[frame_index], (0, 0)) + self.update_display(frame_index) frame_index = (frame_index + 1) % len(self.main_menu.background_frames) - # Draw the logo image onto the screen - self.win.blit(self.main_menu.logo_img, (self.win.get_width() // 2 - self.main_menu.logo_img.get_width() // 2, 0)) - - # Draw the menu buttons onto the screen - self.win.blit(self.main_menu.button_newgame_img, self.main_menu.button_newgame_rect) - self.win.blit(self.main_menu.button_loadgame_img, self.main_menu.button_loadgame_rect) - self.win.blit(self.main_menu.button_options_img, self.main_menu.button_options_rect) - self.win.blit(self.main_menu.button_quit_img, self.main_menu.button_quit_rect) - - # Get the mouse position - mouse_pos = pygame.mouse.get_pos() - - # Check if the mouse is hovering over any menu option - if self.main_menu.button_newgame_rect.collidepoint(mouse_pos): - pygame.draw.rect(self.win, (255, 255, 0), self.main_menu.button_newgame_rect, 3) - elif self.main_menu.button_loadgame_rect.collidepoint(mouse_pos): - pygame.draw.rect(self.win, (255, 255, 0), self.main_menu.button_loadgame_rect, 3) - elif self.main_menu.button_options_rect.collidepoint(mouse_pos): - pygame.draw.rect(self.win, (255, 255, 0), self.main_menu.button_options_rect, 3) - elif self.main_menu.button_quit_rect.collidepoint(mouse_pos): - pygame.draw.rect(self.win, (255, 255, 0), self.main_menu.button_quit_rect, 3) - - # Update the screen - pygame.display.update() - pygame.quit() + def handle_mouse_click(self, pos): + if self.main_menu.button_newgame_rect.collidepoint(pos): + self.new_game_screen.start() + elif self.main_menu.button_loadgame_rect.collidepoint(pos): + self.load_game.select_save_file() + elif self.main_menu.button_options_rect.collidepoint(pos): + print("Options clicked!") + elif self.main_menu.button_quit_rect.collidepoint(pos): + pygame.quit() + + def update_display(self, frame_index): + # Draw the background + self.win.blit(self.main_menu.background_frames[frame_index], (0, 0)) + + # Draw the logo image onto the screen + self.win.blit(self.main_menu.logo_img, (self.win.get_width() // 2 - self.main_menu.logo_img.get_width() // 2, 0)) + + # Draw the menu buttons onto the screen + self.win.blit(self.main_menu.button_newgame_img, self.main_menu.button_newgame_rect) + self.win.blit(self.main_menu.button_loadgame_img, self.main_menu.button_loadgame_rect) + self.win.blit(self.main_menu.button_options_img, self.main_menu.button_options_rect) + self.win.blit(self.main_menu.button_quit_img, self.main_menu.button_quit_rect) + + # Get the mouse position + mouse_pos = pygame.mouse.get_pos() + + # Check if the mouse is hovering over any menu option + for button_rect in self.main_menu.button_rects: + if button_rect.collidepoint(mouse_pos): + pygame.draw.rect(self.win, (255, 255, 0), button_rect, 3) + + # Update the screen + pygame.display.update() + if __name__ == '__main__': print("Yoda Stories - Powered by PyYoda") print("Version 0.0.1 - 5/21/2023") print("Copyright (c) 2023 - Lucasfilm Ltd. and The Walt Disney Company") print("This is free software, and you are welcome to redistribute it under certain conditions.") print("See the LICENSE file for details.") - - game = Main() + + game = PyYoda() game.run() \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 9fa56b9..231dd17 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1 @@ -pygame -pygase -pyglet \ No newline at end of file +pygame \ No newline at end of file diff --git a/settings.json b/settings.json new file mode 100644 index 0000000..95131e2 --- /dev/null +++ b/settings.json @@ -0,0 +1,10 @@ +{ + "player": "Luke Skywalker", + "windowed_width": 1280, + "windowed_height": 720, + "fullscreen": false, + "volume": 1.0, + "world_size": "small", + "difficulty": "easy", + "highscore": 0 +} \ No newline at end of file