Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions process/process.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
if (!process.env.ONETECH_FOOD_BONUS) {
process.env.ONETECH_FOOD_BONUS = 0;
}
if (!process.env.ONETECH_FOOD_SCALE) {
process.env.ONETECH_FOOD_SCALE = 0.5;
}

const MainProcessor = require('./src/MainProcessor');

Expand Down
1 change: 1 addition & 0 deletions process/src/GameData.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ class GameData {
biomeIds: this.biomes.map(b => b.id),
biomeNames: this.biomes.map(b => b.name()),
foodBonus: parseInt(process.env.ONETECH_FOOD_BONUS),
foodScale: parseFloat(process.env.ONETECH_FOOD_SCALE),
};
}

Expand Down
8 changes: 5 additions & 3 deletions process/src/ObjectBadges.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ const Food = {
return objects.filter(o => o.data.foodValue > 0);
},
value(object) {
if (object.data.numUses > 1)
return `${object.data.foodValue + parseInt(process.env.ONETECH_FOOD_BONUS)} x ${object.data.numUses}`;
return object.data.foodValue + parseInt(process.env.ONETECH_FOOD_BONUS);
const foodValue = Math.ceil(object.data.foodValue * parseFloat(process.env.ONETECH_FOOD_SCALE)) + parseInt(process.env.ONETECH_FOOD_BONUS);
if (object.data.numUses > 1) {
return `${foodValue} x ${object.data.numUses}`;
}
return foodValue;
}
}

Expand Down
33 changes: 17 additions & 16 deletions src/components/ObjectInspector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
</div>

<ul v-if="object.data">
<li v-if="foodWithBonus">
Food: {{foodWithBonus}}
<span class="details" v-if="hasFoodBonus">({{foodBase}}+{{foodBonus}} bonus)</span>
<span class="details" v-else>(without bonus)</span>
<li v-if="foodValue">
Food: {{foodValue}}
<span class="helpTip" v-tippy :title="foodValueTip">?</span>
</li>
<li v-if="object.data.heatValue">Heat: {{object.data.heatValue}}</li>
<li v-if="object.clothingPart()">Clothing: {{object.clothingPart()}}</li>
Expand Down Expand Up @@ -224,19 +223,21 @@ export default {
modName() {
return process.env.ONETECH_MOD_NAME;
},
hasFoodBonus() {
return parseInt(GameObject.foodBonus) > 0;
},
foodBonus() {
return GameObject.foodBonus;
},
foodBase() {
if (!this.object.data.foodValue) return;
return this.object.data.foodValue;
foodValue() {
let foodValue = this.object.data.foodValue;
if (!foodValue) {
return null;
}
if (GameObject.foodScale) {
foodValue = Math.ceil(foodValue * parseFloat(GameObject.foodScale));
}
if (GameObject.foodBonus) {
foodValue += parseInt(GameObject.foodBonus);
}
return foodValue;
},
foodWithBonus() {
if (!this.foodBase) return;
return this.foodBase + this.foodBonus;
foodValueTip() {
return `${this.object.data.foodValue} (food) x ${GameObject.foodScale} (scale) + ${GameObject.foodBonus} (bonus)`;
},
totalFood() {
if (!this.foodValue || !this.numUses) return;
Expand Down
1 change: 1 addition & 0 deletions src/models/GameObject.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export default class GameObject {
this.date = new Date(data.date);
this.versions = data.versions;
this.foodBonus = data.foodBonus;
this.foodScale = data.foodScale;
this.legacyObjectsMap = {};
callback(data);
});
Expand Down