resource units

This commit is contained in:
Azgaar 2021-08-08 13:44:50 +03:00
parent 16c316a74f
commit a3043f932f
5 changed files with 51 additions and 13 deletions

View file

@ -535,7 +535,7 @@ window.FMG.data.resourceModels = {
Marine_and_rivers: 'shore(-1) && (type("ocean", "freshwater", "salt") || (river() && shore(1, 2)))', Marine_and_rivers: 'shore(-1) && (type("ocean", "freshwater", "salt") || (river() && shore(1, 2)))',
Pastures_and_temperate_forest: '(biome(3, 4) && !elevation()) || (biome(6) && random(70)) || (biome(5) && nth(5))', Pastures_and_temperate_forest: '(biome(3, 4) && !elevation()) || (biome(6) && random(70)) || (biome(5) && nth(5))',
Tropical_forests: 'biome(5, 7)', Tropical_forests: 'biome(5, 7)',
Arid_land_and_salt_lakes: 'type("salt", "dry") || (biome(1, 2) && random(70)) || (biome(12) && nth(10))', Arid_land_and_salt_lakes: 'shore(1) && type("salt", "dry") || (biome(1, 2) && random(70)) || (biome(12) && nth(10))',
Hot_desert: 'biome(1)', Hot_desert: 'biome(1)',
Deserts: 'biome(1, 2)', Deserts: 'biome(1, 2)',
Grassland_and_cold_desert: 'biome(3) || (biome(2) && nth(4))', Grassland_and_cold_desert: 'biome(3) || (biome(2) && nth(4))',

View file

@ -2036,6 +2036,16 @@
<span id="burgExport"></span> <span id="burgExport"></span>
</div> </div>
<div data-tip="Burg monthly import (goods purchased)">
<div class="label">Import:</div>
<span id="burgImport"></span>
</div>
<div data-tip="Burg montly goods consumption">
<div class="label">Consumption:</div>
<span id="burgConsumption"></span>
</div>
<div data-tip="Burg mean annual temperature and real-world city for comparison"> <div data-tip="Burg mean annual temperature and real-world city for comparison">
<div class="label">Temperature:</div> <div class="label">Temperature:</div>
<span id="burgTemperature"></span>, like in <span id="burgTemperature"></span>, like in

View file

@ -654,6 +654,7 @@ function generate() {
BurgsAndStates.defineStateForms(); BurgsAndStates.defineStateForms();
Production.collectResources(); Production.collectResources();
Production.defineExport();
BurgsAndStates.generateProvinces(); BurgsAndStates.generateProvinces();
BurgsAndStates.defineBurgFeatures(); BurgsAndStates.defineBurgFeatures();

View file

@ -110,5 +110,24 @@ window.Production = (function () {
} }
}; };
return {collectResources}; const defineExport = () => {
const {cells, burgs} = pack;
for (const burg of burgs) {
if (!burg.i || burg.removed) continue;
const {population, production: resourcePool} = burg;
const localUsage = Math.ceil(population);
const surplus = {};
for (const resourceId in resourcePool) {
const production = resourcePool[resourceId];
const extraProduction = production - localUsage;
if (extraProduction > 0) surplus[resourceId] = extraProduction;
}
burg.export = surplus;
}
};
return {collectResources, defineExport};
})(); })();

View file

@ -98,17 +98,8 @@ function editBurg(id) {
else document.getElementById('burgShanty').classList.add('inactive'); else document.getElementById('burgShanty').classList.add('inactive');
// economics block // economics block
let productionHTML = ''; document.getElementById('burgProduction').innerHTML = getProduction(b.production);
for (const resourceId in b.production) { document.getElementById('burgExport').innerHTML = getProduction(b.export);
const {name, unit, icon} = Resources.get(+resourceId);
const production = b.production[resourceId];
const unitName = production > 1 ? unit + 's' : unit;
productionHTML += `<span data-tip="${name}: ${production} ${unitName}">
<svg class="resIcon"><use href="#${icon}"></svg>
<span style="margin: 0 0.2em 0 -0.2em">${production}</span>
</span>`;
}
document.getElementById('burgProduction').innerHTML = productionHTML;
//toggle lock //toggle lock
updateBurgLockIcon(); updateBurgLockIcon();
@ -128,6 +119,23 @@ function editBurg(id) {
document.getElementById('burgEmblem').setAttribute('href', '#' + coaID); document.getElementById('burgEmblem').setAttribute('href', '#' + coaID);
} }
function getProduction(resources) {
let html = '';
for (const resourceId in resources) {
const {name, unit, icon} = Resources.get(+resourceId);
const production = resources[resourceId];
const unitName = production > 1 ? unit + 's' : unit;
html += `<span data-tip="${name}: ${production} ${unitName}">
<svg class="resIcon"><use href="#${icon}"></svg>
<span style="margin: 0 0.2em 0 -0.2em">${production}</span>
</span>`;
}
return html;
}
// [-1; 31] °C, source: https://en.wikipedia.org/wiki/List_of_cities_by_average_temperature // [-1; 31] °C, source: https://en.wikipedia.org/wiki/List_of_cities_by_average_temperature
function getTemperatureLikeness(temperature) { function getTemperatureLikeness(temperature) {
if (temperature < -15) return 'nowhere in the real-world'; if (temperature < -15) return 'nowhere in the real-world';