diff --git a/app/tables/encounters.py b/app/tables/encounters.py index 9473f53..69628d1 100644 --- a/app/tables/encounters.py +++ b/app/tables/encounters.py @@ -12,7 +12,7 @@ class EncounterTable: 'forest': ['hisser', 'sep', 'blaash', 'blackun', 'terl', 'win seen', 'pineto', 'perth', 'obb', 'kailin', 'gren', 'badder', 'arn', 'lil', 'blood bird', 'horl choo', 'soul besh', 'dabber', 'centisteed', None], - 'desert': ['serf', 'kamodo', 'blight', 'perth', 'parn', 'zarn', 'yexil', 'hisser', 'sep', 'calthen', + 'desert': ['serf', 'kamodo', 'blight', 'perth', 'parn', 'zarn', 'yexil', 'hisser', 'sep', 'cal then', 'manta', 'kep plant', 'carrin', 'podog', None, None, None, None, None, None], 'watery': ['win seen', 'crep plant', 'seroon lou', 'terl', 'ert telden', 'barl nep', 'ert', 'fleshin', 'keeshin', 'narl ep', 'menarl', 'herkel', 'ber lep', 'cren tosh', 'fen', 'gator', None, None, None, diff --git a/web/encounter.js b/web/encounter.js index 1c65f33..e8af8ff 100644 --- a/web/encounter.js +++ b/web/encounter.js @@ -43,11 +43,11 @@ document.getElementById('terrainForm').addEventListener('submit', function (even function setResultImage(name) { let imgElement = document.createElement('img'); - imgElement.src = './img/' + name + ".jpg"; + imgElement.src = '/img/' + name + ".jpg"; console.log(imgElement.src); imgElement.onerror = function () { this.onerror = null; - this.src = './img/404.jpg'; + this.src = '/img/404.jpg'; }; resultSection.appendChild(imgElement); } @@ -67,6 +67,7 @@ document.getElementById('terrainForm').addEventListener('submit', function (even // Make the key names bold: tdKey.style.fontWeight = 'bold'; + if (Array.isArray(data[key])) { if (key === 'environ' || key === 'mutations') { tdValue.innerText = data[key].join(', '); @@ -98,34 +99,25 @@ document.getElementById('terrainForm').addEventListener('submit', function (even tdValue.innerText = data[key]; } + if (key === 'name') { + let imgURL = "/img/" + data[key] + ".jpg"; + tdKey.innerHTML = ` +
+

${data[key].toUpperCase()}

+
`; + tdValue.innerHTML = ` +
+ +
`; + console.log(tdValue.innerHTML); + } + + tr.appendChild(tdKey); tr.appendChild(tdValue); table.appendChild(tr); } - // append image row if name key exists - if(data.name) { - let tr = document.createElement('tr'); - let tdKey = document.createElement('td'); - let tdValue = document.createElement('td'); - let imgElement = document.createElement('img'); - - tdKey.innerText = 'IMAGE'; - tdKey.style.fontWeight = 'bold'; - - imgElement.src = './img/' + data.name + ".jpg"; - imgElement.onerror = function() { - this.onerror = null; - this.src = './img/404.jpg'; - }; - - tdValue.appendChild(imgElement); - tr.appendChild(tdKey); - tr.appendChild(tdValue); - - table.appendChild(tr); - } - resultSection.appendChild(table); } }, 1000); diff --git a/web/img/android.jpg b/web/img/android.jpg index 605da06..f0f6987 100644 Binary files a/web/img/android.jpg and b/web/img/android.jpg differ diff --git a/web/img/ark.jpg b/web/img/ark.jpg index 9a2af0c..526fc6d 100644 Binary files a/web/img/ark.jpg and b/web/img/ark.jpg differ diff --git a/web/img/barl nep.jpg b/web/img/barl nep.jpg index f0510b5..0b9f74d 100644 Binary files a/web/img/barl nep.jpg and b/web/img/barl nep.jpg differ diff --git a/web/img/ber lep.jpg b/web/img/ber lep.jpg index c75becf..d091874 100644 Binary files a/web/img/ber lep.jpg and b/web/img/ber lep.jpg differ diff --git a/web/img/blaash.jpg b/web/img/blaash.jpg index f5ec0ce..b119d81 100644 Binary files a/web/img/blaash.jpg and b/web/img/blaash.jpg differ diff --git a/web/img/blackun.jpg b/web/img/blackun.jpg index 5154b76..e126b11 100644 Binary files a/web/img/blackun.jpg and b/web/img/blackun.jpg differ diff --git a/web/img/blight.jpg b/web/img/blight.jpg index 6ff03e7..59b8fa2 100644 Binary files a/web/img/blight.jpg and b/web/img/blight.jpg differ diff --git a/web/img/blood bird.jpg b/web/img/blood bird.jpg index e39d577..ee753cd 100644 Binary files a/web/img/blood bird.jpg and b/web/img/blood bird.jpg differ diff --git a/web/img/cal then.jpg b/web/img/cal then.jpg index f7f8d47..0c74561 100644 Binary files a/web/img/cal then.jpg and b/web/img/cal then.jpg differ diff --git a/web/img/carrin.jpg b/web/img/carrin.jpg index d3ad454..2cd4131 100644 Binary files a/web/img/carrin.jpg and b/web/img/carrin.jpg differ diff --git a/web/img/cren tosh.jpg b/web/img/cren tosh.jpg index 2a65a0d..ec1ac6b 100644 Binary files a/web/img/cren tosh.jpg and b/web/img/cren tosh.jpg differ diff --git a/web/img/crep plant.jpg b/web/img/crep plant.jpg index e23dc78..699527a 100644 Binary files a/web/img/crep plant.jpg and b/web/img/crep plant.jpg differ diff --git a/web/img/dabber.jpg b/web/img/dabber.jpg index 61f2fab..e3d348e 100644 Binary files a/web/img/dabber.jpg and b/web/img/dabber.jpg differ diff --git a/web/img/ert telden.jpg b/web/img/ert telden.jpg index 4a539c1..3e77ea8 100644 Binary files a/web/img/ert telden.jpg and b/web/img/ert telden.jpg differ