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.

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

Update MajorIDs & Base Spells for 2.1 #275

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
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
2 changes: 1 addition & 1 deletion data/2.1.0.0/atree.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/2.1.0.0/majid.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data/2.1.0.1/atree.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data/2.1.0.1/ingreds.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data/2.1.0.1/items.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data/2.1.0.1/majid.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data/2.1.0.1/recipes.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data/2.1.0.1/tomes.json

Large diffs are not rendered by default.

22 changes: 19 additions & 3 deletions js/builder/atree.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ stat_scaling: {
behavior: Optional[str] // One of: "merge", "modify". default: merge
// merge: add if exist, make new part if not exist
// modify: change existing part, by incrementing properties. do nothing if not exist
// overwrite: set part. do nothing if not exist
slider_max: Optional[int] // affected by behavior
slider_default: Optional[int] // affected by behavior
inputs: Optional[list[scaling_target]] // List of things to scale. Omit this if using slider
Expand Down Expand Up @@ -590,11 +591,26 @@ const atree_make_interactives = new (class extends ComputeNode {
for (let i = 0; i < k; ++i) {
for (const [effect, abil_id, ability] of to_process) {
if (effect['type'] === "stat_scaling" && effect['slider'] === true) {
const { slider_name, behavior = 'merge', slider_max = 0, slider_step, slider_default = 0 } = effect;
const { slider_name, behavior = 'merge', slider_max = 0, slider_step, slider_default = 0, scaling = [0]} = effect;
if (slider_map.has(slider_name)) {
const slider_info = slider_map.get(slider_name);
slider_info.max += slider_max;
slider_info.default_val += slider_default;
if (behavior === 'overwrite') {
if('slider_max' in effect)
slider_info.max = slider_max;
if('slider_default' in effect)
slider_info.default_val = slider_default;
if('scaling' in effect){
for(let j = 0; j < slider_info.abil.effects.length; ++j){
if('scaling' in slider_info.abil.effects[j] && slider_info.abil.effects[j] !== effect &&slider_info.abil.effects[j].output.name === effect.output.name){
slider_info.abil.effects[j].scaling = [0];
}
}
}
}
else{
slider_info.max += slider_max;
slider_info.default_val += slider_default;
}
}
else if (behavior === 'merge') {
slider_map.set(slider_name, {
Expand Down
Loading