Skip to content

[pull] master from foodgame:master #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Nov 15, 2021
Merged

[pull] master from foodgame:master #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
482 changes: 385 additions & 97 deletions css/food.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/food.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/data.min.json
View file
Open in desktop

Large diffs are not rendered by default.

1,253 changes: 606 additions & 647 deletions index.html
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 10 additions & 13 deletions js/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ function getRecipeQuantity(recipe, materials, rule) {
return quantity;
}

function getRecipeResult(chef, equip, recipe, quantity, maxQuantity, materials, rule, decoration, condiment) {
function getRecipeResult(chef, equip, recipe, quantity, maxQuantity, materials, rule, decoration, condiment, forCal) {

var resultData = {};

Expand All @@ -225,14 +225,12 @@ function getRecipeResult(chef, equip, recipe, quantity, maxQuantity, materials,
var bonusAddition = 0;
var condimentSkillAddition = 0;

resultData["disp"] = recipe.name + " <small>" + recipe.condimentDisp + "</small>";

if (chef) {
if (chef && chef.chefId) {
var rankData = getRankInfo(recipe, chef);
resultData["rankVal"] = rankData.rankVal;
resultData["rankDisp"] = rankData.rankDisp;

if (rankData.rankVal == 0) {
if (!forCal && rankData.rankVal == 0) {
return resultData;
}

Expand All @@ -257,15 +255,15 @@ function getRecipeResult(chef, equip, recipe, quantity, maxQuantity, materials,
}
resultData["equipSkillAdditionDisp"] = getPercentDisp(equipSkillAddition);

if (condiment) {
resultData["useCondiment"] = "加料";
condimentSkillAddition = getRecipeSkillAddition(condiment.effect, recipe, rule);
}
resultData["condimentSkillAdditionDisp"] = getPercentDisp(condimentSkillAddition);

bonusAddition = bonusAddition + Number(chef.addition);
}

if (condiment) {
resultData["useCondiment"] = true;
condimentSkillAddition = getRecipeSkillAddition(condiment.effect, recipe, rule);
}
resultData["condimentSkillAdditionDisp"] = getPercentDisp(condimentSkillAddition);

if (!rule || !rule.hasOwnProperty("DisableDecorationEffect") || rule.DisableDecorationEffect == false) {
if (decoration) {
decorationAddition = decoration;
Expand All @@ -289,7 +287,6 @@ function getRecipeResult(chef, equip, recipe, quantity, maxQuantity, materials,
resultData["bonusAdditionDisp"] = getPercentDisp(+(bonusAddition * 100).toFixed(2));
resultData["totalPrice"] = recipe.price * quantity;
resultData["realPrice"] = Math.ceil(+(recipe.price * (1 + priceAddition)).toFixed(2));
resultData["totalRealPrice"] = resultData.realPrice * quantity;
var score = Math.ceil(+(recipe.price * (1 + priceAddition + bonusAddition)).toFixed(2));
resultData["bonusScore"] = score - resultData.realPrice;
resultData["totalBonusScore"] = resultData.bonusScore * quantity;
Expand Down Expand Up @@ -542,7 +539,7 @@ function setDataForChef(chef, equip, useEquip, globalUltimateEffect, selfPartial
chef["bitterDisp"] = getAtrributeDisp(chef.bitterVal, chef.bitter, showFinal);
chef["tastyDisp"] = getAtrributeDisp(chef.tastyVal, chef.tasty, showFinal);

chef["disp"] = chef.name + "<br><small>";
chef["disp"] = "<span class='name'>" + chef.name + "</span><br><small>";
var count = 0;
if (chef.stirfryDisp) {
chef.disp += "炒" + chef.stirfryDisp + " ";
Expand Down
2 changes: 1 addition & 1 deletion js/common.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading