Skip to content
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

Add default values and Adapt kouzin job bonus #192

Merged
merged 3 commits into from
May 18, 2019
Merged

Add default values and Adapt kouzin job bonus #192

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7010506
Adapt kouzinBonus of job
May 4, 2019
1258424
Set to default
May 4, 2019
6662d49
Merge branch 'master' into add-default-and-kouzin-jobbonus
May 18, 2019
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
2 changes: 1 addition & 1 deletion src/global_const.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ module.exports.Jobs = {
"favArm2": "katana",
"type": "attack",
"atBonus": 2000.0,
"kouzinBonus": 0.0,
"kouzinBonus": 20.0,
"hpBonus": 600.0,
"shugoBonus": 0.0,
"DaBonus": 57.0,
Expand Down
9 changes: 6 additions & 3 deletions src/global_logic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) {
for (var key in totals) {
var totalSummon = totals[key]["totalSummon"][summonind];

// Calculation of various attack coefficients
// Calculation of various attack coefficients 各種攻刃係数の計算
var magnaCoeff = 1.0 + (0.01 * totals[key]["magna"] + 0.01 * totals[key]["magnaSoka"]) * totalSummon["magna"];
var magnaHaisuiCoeff = 1.0 + 0.01 * (totals[key]["magnaHaisui"] * totalSummon["magna"]);
var magnaKonshinCoeff = 1.0 + 0.01 * (totals[key]["magnaKonshin"] * totalSummon["magna"]);
Expand All @@ -390,15 +390,18 @@ module.exports.calcBasedOneSummon = function (summonind, prof, buff, totals) {
normalCoeff += totalSummon["chara"];
normalCoeff += buff["normal"];
normalCoeff += totals[key]["normalBuff"];
// Add pre-emptive to normal attack
// Add pre-emptive to normal attack 先制を通常攻刃へ加算
normalCoeff += 0.01 * totals[key]["sensei"];
if (key == "Djeeta") {
normalCoeff += 0.01 * totals["Djeeta"]["job"].kouzinBonus;
}

var normalHaisuiCoeff = 1.0 + 0.01 * totals[key]["normalHaisui"] * totalSummon["zeus"];
normalHaisuiCoeff += 0.01 * totals[key]["normalOtherHaisui"];

var normalKonshinCoeff = 1.0 + 0.01 * totals[key]["normalKonshin"] * totalSummon["zeus"];
normalKonshinCoeff += 0.01 * totals[key]["normalOtherKonshin"];
// Also calculate the attribute (elapsed turn) with the maximum value
// Also calculate the attribute (elapsed turn) with the maximum value 属性(経過ターン)も最大値で計算する
var elementCoeff = totals[key]["typeBonus"];
elementCoeff += totalSummon["element"] - 1.0;
elementCoeff += totalSummon["elementTurn"] - 1.0;
Expand Down
4 changes: 2 additions & 2 deletions src/profile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ var Profile = CreateClass({
<span style={{display: "block"}}
className="label label-success">{intl.translate("HPボーナス", locale)} {Jobs[this.state.job].hpBonus}</span>
<span style={{display: "block"}}
className="label label-danger">{intl.translate("攻刃ボーナス", locale)} {Jobs[this.state.job].kouzinBonus}</span>
className="label label-danger">{intl.translate("攻刃ボーナス", locale)} {Jobs[this.state.job].kouzinBonus}%</span>
<span style={{display: "block"}}
className="label label-success">{intl.translate("守護ボーナス", locale)} {Jobs[this.state.job].shugoBonus}</span>
className="label label-success">{intl.translate("守護ボーナス", locale)} {Jobs[this.state.job].shugoBonus}%</span>
<span style={{display: "block"}}
className="label label-warning">{intl.translate("基礎DA率", locale)} {Jobs[this.state.job].DaBonus}%</span>
<span style={{display: "block"}}
Expand Down
6 changes: 3 additions & 3 deletions src/summon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ var Summon = CreateClass({
selfSummonAmount2: 0,
selfElement: "fire",
friendSummonType: "element",
friendSummonAmount: 80,
friendSummonAmount: 140,
friendSummonAmount2: 0,
friendElement: "fire",
attack: 0,
hp: 0,
attack: 9500,
hp: 4000,
hpBonus: 0,
DA: 0,
TA: 0,
Expand Down