add images

lhung · Jul 22, 2016 · 25c3098 · 25c3098
1 parent 797535c
commit 25c3098
Show file tree

Hide file tree

Showing 163 changed files with 38 additions and 164 deletions.
diff --git a/web/catchable.json b/web/catchable.json
@@ -0,0 +1 @@
+{"pokemon_id": 41, "spawnpoint_id": "47957c8342b", "longitude": 6.644660700480692, "expiration_timestamp_ms": 1469221416684, "latitude": 49.75081094565466, "encounter_id": 16122124223608303245}
diff --git a/web/image/forts/Gym.png b/web/image/forts/Gym.png
diff --git a/web/image/forts/Harmony_large.png b/web/image/forts/Harmony_large.png
diff --git a/web/image/forts/Instinct.png b/web/image/forts/Instinct.png
diff --git a/web/image/forts/Instinct_large.png b/web/image/forts/Instinct_large.png
diff --git a/web/image/forts/Mystic.png b/web/image/forts/Mystic.png
diff --git a/web/image/forts/Mystic_large.png b/web/image/forts/Mystic_large.png
diff --git a/web/image/forts/Pstop.png b/web/image/forts/Pstop.png
diff --git a/web/image/forts/PstopLured.png b/web/image/forts/PstopLured.png
diff --git a/web/image/forts/Valor.png b/web/image/forts/Valor.png
diff --git a/web/image/forts/Valor_large.png b/web/image/forts/Valor_large.png
diff --git a/web/image/icons/1.png b/web/image/icons/1.png
diff --git a/web/image/icons/10.png b/web/image/icons/10.png
diff --git a/web/image/icons/100.png b/web/image/icons/100.png
diff --git a/web/image/icons/101.png b/web/image/icons/101.png
diff --git a/web/image/icons/102.png b/web/image/icons/102.png
diff --git a/web/image/icons/103.png b/web/image/icons/103.png
diff --git a/web/image/icons/104.png b/web/image/icons/104.png
diff --git a/web/image/icons/105.png b/web/image/icons/105.png
diff --git a/web/image/icons/106.png b/web/image/icons/106.png
diff --git a/web/image/icons/107.png b/web/image/icons/107.png
diff --git a/web/image/icons/108.png b/web/image/icons/108.png
diff --git a/web/image/icons/109.png b/web/image/icons/109.png
diff --git a/web/image/icons/11.png b/web/image/icons/11.png
diff --git a/web/image/icons/110.png b/web/image/icons/110.png
diff --git a/web/image/icons/111.png b/web/image/icons/111.png
diff --git a/web/image/icons/112.png b/web/image/icons/112.png
diff --git a/web/image/icons/113.png b/web/image/icons/113.png
diff --git a/web/image/icons/114.png b/web/image/icons/114.png
diff --git a/web/image/icons/115.png b/web/image/icons/115.png
diff --git a/web/image/icons/116.png b/web/image/icons/116.png
diff --git a/web/image/icons/117.png b/web/image/icons/117.png
diff --git a/web/image/icons/118.png b/web/image/icons/118.png
diff --git a/web/image/icons/119.png b/web/image/icons/119.png
diff --git a/web/image/icons/12.png b/web/image/icons/12.png
diff --git a/web/image/icons/120.png b/web/image/icons/120.png
diff --git a/web/image/icons/121.png b/web/image/icons/121.png
diff --git a/web/image/icons/122.png b/web/image/icons/122.png
diff --git a/web/image/icons/123.png b/web/image/icons/123.png
diff --git a/web/image/icons/124.png b/web/image/icons/124.png
diff --git a/web/image/icons/125.png b/web/image/icons/125.png
diff --git a/web/image/icons/126.png b/web/image/icons/126.png
diff --git a/web/image/icons/127.png b/web/image/icons/127.png
diff --git a/web/image/icons/128.png b/web/image/icons/128.png
diff --git a/web/image/icons/129.png b/web/image/icons/129.png
diff --git a/web/image/icons/13.png b/web/image/icons/13.png
diff --git a/web/image/icons/130.png b/web/image/icons/130.png
diff --git a/web/image/icons/131.png b/web/image/icons/131.png
diff --git a/web/image/icons/132.png b/web/image/icons/132.png
diff --git a/web/image/icons/133.png b/web/image/icons/133.png
diff --git a/web/image/icons/134.png b/web/image/icons/134.png
diff --git a/web/image/icons/135.png b/web/image/icons/135.png
diff --git a/web/image/icons/136.png b/web/image/icons/136.png
diff --git a/web/image/icons/137.png b/web/image/icons/137.png
diff --git a/web/image/icons/138.png b/web/image/icons/138.png
diff --git a/web/image/icons/139.png b/web/image/icons/139.png
diff --git a/web/image/icons/14.png b/web/image/icons/14.png
diff --git a/web/image/icons/140.png b/web/image/icons/140.png
diff --git a/web/image/icons/141.png b/web/image/icons/141.png
diff --git a/web/image/icons/142.png b/web/image/icons/142.png
diff --git a/web/image/icons/143.png b/web/image/icons/143.png
diff --git a/web/image/icons/144.png b/web/image/icons/144.png
diff --git a/web/image/icons/145.png b/web/image/icons/145.png
diff --git a/web/image/icons/146.png b/web/image/icons/146.png
diff --git a/web/image/icons/147.png b/web/image/icons/147.png
diff --git a/web/image/icons/148.png b/web/image/icons/148.png
diff --git a/web/image/icons/149.png b/web/image/icons/149.png
diff --git a/web/image/icons/15.png b/web/image/icons/15.png
diff --git a/web/image/icons/150.png b/web/image/icons/150.png
diff --git a/web/image/icons/151.png b/web/image/icons/151.png
diff --git a/web/image/icons/16.png b/web/image/icons/16.png
diff --git a/web/image/icons/17.png b/web/image/icons/17.png
diff --git a/web/image/icons/18.png b/web/image/icons/18.png
diff --git a/web/image/icons/19.png b/web/image/icons/19.png
diff --git a/web/image/icons/2.png b/web/image/icons/2.png
diff --git a/web/image/icons/20.png b/web/image/icons/20.png
diff --git a/web/image/icons/21.png b/web/image/icons/21.png
diff --git a/web/image/icons/22.png b/web/image/icons/22.png
diff --git a/web/image/icons/23.png b/web/image/icons/23.png
diff --git a/web/image/icons/24.png b/web/image/icons/24.png
diff --git a/web/image/icons/25.png b/web/image/icons/25.png
diff --git a/web/image/icons/26.png b/web/image/icons/26.png
diff --git a/web/image/icons/27.png b/web/image/icons/27.png
diff --git a/web/image/icons/28.png b/web/image/icons/28.png
diff --git a/web/image/icons/29.png b/web/image/icons/29.png
diff --git a/web/image/icons/3.png b/web/image/icons/3.png
diff --git a/web/image/icons/30.png b/web/image/icons/30.png
diff --git a/web/image/icons/31.png b/web/image/icons/31.png
diff --git a/web/image/icons/32.png b/web/image/icons/32.png
diff --git a/web/image/icons/33.png b/web/image/icons/33.png
diff --git a/web/image/icons/34.png b/web/image/icons/34.png
diff --git a/web/image/icons/35.png b/web/image/icons/35.png
diff --git a/web/image/icons/36.png b/web/image/icons/36.png
diff --git a/web/image/icons/37.png b/web/image/icons/37.png
diff --git a/web/image/icons/38.png b/web/image/icons/38.png
diff --git a/web/image/icons/39.png b/web/image/icons/39.png
diff --git a/web/image/icons/4.png b/web/image/icons/4.png
diff --git a/web/image/icons/40.png b/web/image/icons/40.png
diff --git a/web/image/icons/41.png b/web/image/icons/41.png
diff --git a/web/image/icons/42.png b/web/image/icons/42.png
diff --git a/web/image/icons/43.png b/web/image/icons/43.png
diff --git a/web/image/icons/44.png b/web/image/icons/44.png
diff --git a/web/image/icons/45.png b/web/image/icons/45.png
diff --git a/web/image/icons/46.png b/web/image/icons/46.png
diff --git a/web/image/icons/47.png b/web/image/icons/47.png
diff --git a/web/image/icons/48.png b/web/image/icons/48.png
diff --git a/web/image/icons/49.png b/web/image/icons/49.png
diff --git a/web/image/icons/5.png b/web/image/icons/5.png
diff --git a/web/image/icons/50.png b/web/image/icons/50.png
diff --git a/web/image/icons/51.png b/web/image/icons/51.png
diff --git a/web/image/icons/52.png b/web/image/icons/52.png
diff --git a/web/image/icons/53.png b/web/image/icons/53.png
diff --git a/web/image/icons/54.png b/web/image/icons/54.png
diff --git a/web/image/icons/55.png b/web/image/icons/55.png
diff --git a/web/image/icons/56.png b/web/image/icons/56.png
diff --git a/web/image/icons/57.png b/web/image/icons/57.png
diff --git a/web/image/icons/58.png b/web/image/icons/58.png
diff --git a/web/image/icons/59.png b/web/image/icons/59.png
diff --git a/web/image/icons/6.png b/web/image/icons/6.png
diff --git a/web/image/icons/60.png b/web/image/icons/60.png
diff --git a/web/image/icons/61.png b/web/image/icons/61.png
diff --git a/web/image/icons/62.png b/web/image/icons/62.png
diff --git a/web/image/icons/63.png b/web/image/icons/63.png
diff --git a/web/image/icons/64.png b/web/image/icons/64.png
diff --git a/web/image/icons/65.png b/web/image/icons/65.png
diff --git a/web/image/icons/66.png b/web/image/icons/66.png
diff --git a/web/image/icons/67.png b/web/image/icons/67.png
diff --git a/web/image/icons/68.png b/web/image/icons/68.png
diff --git a/web/image/icons/69.png b/web/image/icons/69.png
diff --git a/web/image/icons/7.png b/web/image/icons/7.png
diff --git a/web/image/icons/70.png b/web/image/icons/70.png
diff --git a/web/image/icons/71.png b/web/image/icons/71.png
diff --git a/web/image/icons/72.png b/web/image/icons/72.png
diff --git a/web/image/icons/73.png b/web/image/icons/73.png
diff --git a/web/image/icons/74.png b/web/image/icons/74.png
diff --git a/web/image/icons/75.png b/web/image/icons/75.png
diff --git a/web/image/icons/76.png b/web/image/icons/76.png
diff --git a/web/image/icons/77.png b/web/image/icons/77.png
diff --git a/web/image/icons/78.png b/web/image/icons/78.png
diff --git a/web/image/icons/79.png b/web/image/icons/79.png
diff --git a/web/image/icons/8.png b/web/image/icons/8.png
diff --git a/web/image/icons/80.png b/web/image/icons/80.png
diff --git a/web/image/icons/81.png b/web/image/icons/81.png
diff --git a/web/image/icons/82.png b/web/image/icons/82.png
diff --git a/web/image/icons/83.png b/web/image/icons/83.png
diff --git a/web/image/icons/84.png b/web/image/icons/84.png
diff --git a/web/image/icons/85.png b/web/image/icons/85.png
diff --git a/web/image/icons/86.png b/web/image/icons/86.png
diff --git a/web/image/icons/87.png b/web/image/icons/87.png
diff --git a/web/image/icons/88.png b/web/image/icons/88.png
diff --git a/web/image/icons/89.png b/web/image/icons/89.png
diff --git a/web/image/icons/9.png b/web/image/icons/9.png
diff --git a/web/image/icons/90.png b/web/image/icons/90.png
diff --git a/web/image/icons/91.png b/web/image/icons/91.png
diff --git a/web/image/icons/92.png b/web/image/icons/92.png
diff --git a/web/image/icons/93.png b/web/image/icons/93.png
diff --git a/web/image/icons/94.png b/web/image/icons/94.png
diff --git a/web/image/icons/95.png b/web/image/icons/95.png
diff --git a/web/image/icons/96.png b/web/image/icons/96.png
diff --git a/web/image/icons/97.png b/web/image/icons/97.png
diff --git a/web/image/icons/98.png b/web/image/icons/98.png
diff --git a/web/image/icons/99.png b/web/image/icons/99.png
diff --git a/web/index.html b/web/index.html
@@ -17,171 +17,24 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
   </head>
   <body>
-    <div id="pokedex">
-      <div id="p1"></div>
-      <div id="p2"></div>
-      <div id="p3"></div>
-      <div id="p4"></div>
-      <div id="p5"></div>
-      <div id="p6"></div>
-      <div id="p7"></div>
-      <div id="p8"></div>
-      <div id="p9"></div>
-      <div id="p10"></div>
-      <div id="p11"></div>
-      <div id="p12"></div>
-      <div id="p13"></div>
-      <div id="p14"></div>
-      <div id="p15"></div>
-      <div id="p16"></div>
-      <div id="p17"></div>
-      <div id="p18"></div>
-      <div id="p19"></div>
-      <div id="p20"></div>
-      <div id="p21"></div>
-      <div id="p22"></div>
-      <div id="p23"></div>
-      <div id="p24"></div>
-      <div id="p25"></div>
-      <div id="p26"></div>
-      <div id="p27"></div>
-      <div id="p28"></div>
-      <div id="p29"></div>
-      <div id="p30"></div>
-      <div id="p31"></div>
-      <div id="p32"></div>
-      <div id="p33"></div>
-      <div id="p34"></div>
-      <div id="p35"></div>
-      <div id="p36"></div>
-      <div id="p37"></div>
-      <div id="p38"></div>
-      <div id="p39"></div>
-      <div id="p40"></div>
-      <div id="p41"></div>
-      <div id="p42"></div>
-      <div id="p43"></div>
-      <div id="p44"></div>
-      <div id="p45"></div>
-      <div id="p46"></div>
-      <div id="p47"></div>
-      <div id="p48"></div>
-      <div id="p49"></div>
-      <div id="p50"></div>
-      <div id="p51"></div>
-      <div id="p52"></div>
-      <div id="p53"></div>
-      <div id="p54"></div>
-      <div id="p55"></div>
-      <div id="p56"></div>
-      <div id="p57"></div>
-      <div id="p58"></div>
-      <div id="p59"></div>
-      <div id="p60"></div>
-      <div id="p61"></div>
-      <div id="p62"></div>
-      <div id="p63"></div>
-      <div id="p64"></div>
-      <div id="p65"></div>
-      <div id="p66"></div>
-      <div id="p67"></div>
-      <div id="p68"></div>
-      <div id="p69"></div>
-      <div id="p70"></div>
-      <div id="p71"></div>
-      <div id="p72"></div>
-      <div id="p73"></div>
-      <div id="p74"></div>
-      <div id="p75"></div>
-      <div id="p76"></div>
-      <div id="p77"></div>
-      <div id="p78"></div>
-      <div id="p79"></div>
-      <div id="p80"></div>
-      <div id="p81"></div>
-      <div id="p82"></div>
-      <div id="p83"></div>
-      <div id="p84"></div>
-      <div id="p85"></div>
-      <div id="p86"></div>
-      <div id="p87"></div>
-      <div id="p88"></div>
-      <div id="p89"></div>
-      <div id="p90"></div>
-      <div id="p91"></div>
-      <div id="p92"></div>
-      <div id="p93"></div>
-      <div id="p94"></div>
-      <div id="p95"></div>
-      <div id="p96"></div>
-      <div id="p97"></div>
-      <div id="p98"></div>
-      <div id="p99"></div>
-      <div id="p100"></div>
-      <div id="p101"></div>
-      <div id="p102"></div>
-      <div id="p103"></div>
-      <div id="p104"></div>
-      <div id="p105"></div>
-      <div id="p106"></div>
-      <div id="p107"></div>
-      <div id="p108"></div>
-      <div id="p109"></div>
-      <div id="p110"></div>
-      <div id="p111"></div>
-      <div id="p112"></div>
-      <div id="p113"></div>
-      <div id="p114"></div>
-      <div id="p115"></div>
-      <div id="p116"></div>
-      <div id="p117"></div>
-      <div id="p118"></div>
-      <div id="p119"></div>
-      <div id="p120"></div>
-      <div id="p121"></div>
-      <div id="p122"></div>
-      <div id="p123"></div>
-      <div id="p124"></div>
-      <div id="p125"></div>
-      <div id="p126"></div>
-      <div id="p127"></div>
-      <div id="p128"></div>
-      <div id="p129"></div>
-      <div id="p130"></div>
-      <div id="p131"></div>
-      <div id="p132"></div>
-      <div id="p133"></div>
-      <div id="p134"></div>
-      <div id="p135"></div>
-      <div id="p136"></div>
-      <div id="p137"></div>
-      <div id="p138"></div>
-      <div id="p139"></div>
-      <div id="p140"></div>
-      <div id="p141"></div>
-      <div id="p142"></div>
-      <div id="p143"></div>
-      <div id="p144"></div>
-      <div id="p145"></div>
-      <div id="p146"></div>
-      <div id="p147"></div>
-      <div id="p148"></div>
-      <div id="p149"></div>
-      <div id="p150"></div>
-      <div id="p151"></div>
-    </div>
+    <div id="pokedex"><div id="p1"></div><div id="p2"></div><div id="p3"></div><div id="p4"></div><div id="p5"></div><div id="p6"></div><div id="p7"></div><div id="p8"></div><div id="p9"></div><div id="p10"></div><div id="p11"></div><div id="p12"></div><div id="p13"></div><div id="p14"></div><div id="p15"></div><div id="p16"></div><div id="p17"></div><div id="p18"></div><div id="p19"></div><div id="p20"></div><div id="p21"></div><div id="p22"></div><div id="p23"></div><div id="p24"></div><div id="p25"></div><div id="p26"></div><div id="p27"></div><div id="p28"></div><div id="p29"></div><div id="p30"></div><div id="p31"></div><div id="p32"></div><div id="p33"></div><div id="p34"></div><div id="p35"></div><div id="p36"></div><div id="p37"></div><div id="p38"></div><div id="p39"></div><div id="p40"></div><div id="p41"></div><div id="p42"></div><div id="p43"></div><div id="p44"></div><div id="p45"></div><div id="p46"></div><div id="p47"></div><div id="p48"></div><div id="p49"></div><div id="p50"></div><div id="p51"></div><div id="p52"></div><div id="p53"></div><div id="p54"></div><div id="p55"></div><div id="p56"></div><div id="p57"></div><div id="p58"></div><div id="p59"></div><div id="p60"></div><div id="p61"></div><div id="p62"></div><div id="p63"></div><div id="p64"></div><div id="p65"></div><div id="p66"></div><div id="p67"></div><div id="p68"></div><div id="p69"></div><div id="p70"></div><div id="p71"></div><div id="p72"></div><div id="p73"></div><div id="p74"></div><div id="p75"></div><div id="p76"></div><div id="p77"></div><div id="p78"></div><div id="p79"></div><div id="p80"></div><div id="p81"></div><div id="p82"></div><div id="p83"></div><div id="p84"></div><div id="p85"></div><div id="p86"></div><div id="p87"></div><div id="p88"></div><div id="p89"></div><div id="p90"></div><div id="p91"></div><div id="p92"></div><div id="p93"></div><div id="p94"></div><div id="p95"></div><div id="p96"></div><div id="p97"></div><div id="p98"></div><div id="p99"></div><div id="p100"></div><div id="p101"></div><div id="p102"></div><div id="p103"></div><div id="p104"></div><div id="p105"></div><div id="p106"></div><div id="p107"></div><div id="p108"></div><div id="p109"></div><div id="p110"></div><div id="p111"></div><div id="p112"></div><div id="p113"></div><div id="p114"></div><div id="p115"></div><div id="p116"></div><div id="p117"></div><div id="p118"></div><div id="p119"></div><div id="p120"></div><div id="p121"></div><div id="p122"></div><div id="p123"></div><div id="p124"></div><div id="p125"></div><div id="p126"></div><div id="p127"></div><div id="p128"></div><div id="p129"></div><div id="p130"></div><div id="p131"></div><div id="p132"></div><div id="p133"></div><div id="p134"></div><div id="p135"></div><div id="p136"></div><div id="p137"></div><div id="p138"></div><div id="p139"></div><div id="p140"></div><div id="p141"></div><div id="p142"></div><div id="p143"></div><div id="p144"></div><div id="p145"></div><div id="p146"></div><div id="p147"></div><div id="p148"></div><div id="p149"></div><div id="p150"></div><div id="p151"></div></div>
     <div id="map"></div>
     <script>
       var map;
-      var marker;
-      var loc = {}, cachedLoc = {};
+      var tMarker;
+      var cMarker;
+      var tLoc = {}, cachedtLoc = {};
+      var cLoc = {}, cachedcLoc = {};
       var inventory = {};
       var playerInfo = {};
       var pokedex = {};
       var bagPokemon = {};
       var bagItems = {};
       var bagCandy = {};
       var emptyDex = [];
+      var cInfo = {};
+      var catchable = {};
+      var pokemonArray = {};
       var div = document.createElement('div');
       function initMap() {
         map = new google.maps.Map(document.getElementById('map'), {
@@ -190,34 +43,54 @@
         });
       setTimeout(function(){
         placeTrainer();
+        addCatchable();
         updateInventory();
         setTimeout(function(){
           setInterval(updateTrainer, 1000);
+          setInterval(addCatchable, 1000);
         }, 5000);
       }, 5000);
       }
       function placeTrainer() {
         loadJSON('location.json',
-          function(data) { loc = data; map.setZoom(16); map.panTo({lat: parseFloat(loc.lat), lng: parseFloat(loc.lng)}); },
+          function(data) { tLoc = data; map.setZoom(16); map.panTo({lat: parseFloat(tLoc.lat), lng: parseFloat(tLoc.lng)}); },
           function(xhr) { console.error(xhr);}
         );
-        console.log("New Marker: Trainer - " + loc.lat + ", " + loc.lng);
-        marker = new google.maps.Marker({
+        console.log("New Marker: Trainer - " + tLoc.lat + ", " + tLoc.lng);
+        tMarker = new google.maps.Marker({
           map: map,
-          position: {lat: parseFloat(loc.lat), lng: parseFloat(loc.lng)},
+          position: {lat: parseFloat(tLoc.lat), lng: parseFloat(tLoc.lng)},
           icon: "image/trainer-icon.png"
         });
       }
       function updateTrainer() {
         loadJSON('location.json',
-          function(data) { loc = data; map.panTo({lat: parseFloat(loc.lat), lng: parseFloat(loc.lng)}); },
+          function(data) { tLoc = data; map.panTo({lat: parseFloat(tLoc.lat), lng: parseFloat(tLoc.lng)}); },
           function(xhr) { console.error(xhr); }
         );
 
-        if (loc.lat === cachedLoc.lat && loc.lng === cachedLoc.lng) return;
-        cachedLoc = loc;
-        console.log("Move Marker: Trainer - " + loc.lat + ", " + loc.lng);
-        marker.setPosition({lat: parseFloat(loc.lat), lng: parseFloat(loc.lng)});
+        if (tLoc.lat === cachedtLoc.lat && tLoc.lng === cachedtLoc.lng) return;
+        cachedtLoc = tLoc;
+        console.log("Move Marker: Trainer - " + tLoc.lat + ", " + tLoc.lng);
+        tMarker.setPosition({lat: parseFloat(tLoc.lat), lng: parseFloat(tLoc.lng)});
+      }
+      function addCatchable() {
+        loadJSON('catchable.json',
+          function(data) { cInfo = data; },
+          function(xhr) { console.error(xhr); }
+        );
+        loadJSON('../data/pokemon.json',
+          function(data) { pokemonArray = data; },
+          function(xhr) { console.error(xhr); }
+        );
+        if(cInfo['latitude'] != undefined) {
+          console.log("New Marker: Catchable Pokemon - " + parseFloat(cInfo['latitude']) + ", " + parseFloat(cInfo['longitude']));
+          cMarker = new google.maps.Marker({
+            map: map,
+            position: {lat: parseFloat(cInfo['latitude']), lng: parseFloat(cInfo['longitude'])},
+            icon: "image/" + cInfo['pokemon_id'] + ".png"
+          });
+        }
       }
       function updateInventory() {
         loadJSON('info.json',
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"pokemon_id": 41, "spawnpoint_id": "47957c8342b", "longitude": 6.644660700480692, "expiration_timestamp_ms": 1469221416684, "latitude": 49.75081094565466, "encounter_id": 16122124223608303245}