Misc. patches force push haha

-- fix better enraged blow existing
-- fix dissolution location
-- fix cheaper dash to death magnet connection
-- fix last laugh location
-- fix death magnet dependency for fatal spin
This commit is contained in:
hppeng 2023-02-17 01:46:28 -08:00
parent dc878caf1c
commit e3b2ea4cdf
4 changed files with 90 additions and 58 deletions

File diff suppressed because one or more lines are too long

View file

@ -668,7 +668,10 @@ const atree_scaling = new (class extends ComputeNode {
if ('output' in effect) { // sometimes nodes will modify slider without having effect. if ('output' in effect) { // sometimes nodes will modify slider without having effect.
if (round) { total = Math.floor(round_near(total)); } if (round) { total = Math.floor(round_near(total)); }
if (positive && total < 0) { total = 0; } // Normal stat scaling will not go negative. if (positive && total < 0) { total = 0; } // Normal stat scaling will not go negative.
if ('max' in effect && total > effect.max) { total = effect.max; } if ('max' in effect) {
if (effect.max > 0 && total > effect.max) { total = effect.max; }
if (effect.max < 0 && total < effect.max) { total = effect.max; }
}
if (Array.isArray(effect.output)) { if (Array.isArray(effect.output)) {
for (const output of effect.output) { for (const output of effect.output) {
apply_bonus(output, total); apply_bonus(output, total);

View file

@ -3694,7 +3694,6 @@ const atrees = {
} }
] ]
}, },
{ {
"display_name": "Flying Kick", "display_name": "Flying Kick",
"desc": "When using Charge, mobs hit will halt your momentum and get knocked back", "desc": "When using Charge, mobs hit will halt your momentum and get knocked back",
@ -4443,30 +4442,6 @@ const atrees = {
} }
] ]
}, },
{
"display_name": "Cheaper War Scream II",
"desc": "Reduce the Mana cost of War Scream",
"base_abil": "War Scream",
"parents": ["Massive Bash"],
"dependencies": [],
"blockers": [],
"cost": 1,
"display": {
"row": 31,
"col": 0,
"icon": "node_0"
},
"properties": {},
"effects": [
{
"type": "add_spell_prop",
"base_spell": 4,
"cost": -5
}
]
},
{ {
"display_name": "Cheaper War Scream I", "display_name": "Cheaper War Scream I",
"desc": "Reduce the Mana cost of War Scream", "desc": "Reduce the Mana cost of War Scream",
@ -4489,7 +4464,69 @@ const atrees = {
} }
] ]
}, },
{
"display_name": "Cheaper War Scream II",
"desc": "Reduce the Mana cost of War Scream",
"base_abil": "War Scream",
"parents": ["Massive Bash"],
"dependencies": [],
"blockers": [],
"cost": 1,
"display": {
"row": 31,
"col": 0,
"icon": "node_0"
},
"properties": {},
"effects": [
{
"type": "add_spell_prop",
"base_spell": 4,
"cost": -5
}
]
},
{
"display_name": "Better Enraged Blow",
"desc": "Increases the cap of Enraged Blow by +60%.",
"archetype": "Fallen",
"base_abil": "Bak'al's Grasp",
"parents": ["Cheaper War Scream II"],
"dependencies": ["Bak'al's Grasp"],
"blockers": [],
"cost": 1,
"display": {
"row": 32,
"col": 1,
"icon": "node_0"
},
"properties": {
},
"effects": [
{
"type": "stat_scaling",
"slider_name": "Corrupted",
"slider": true,
"output": {
"type": "stat",
"name": "damMult.Enraged"
},
"max": -80,
"scaling": [-1.5]
},
{
"type": "stat_scaling",
"slider_name": "Corrupted",
"slider": true,
"output": {
"type": "stat",
"name": "damMult.Enraged"
},
"max": 140,
"scaling": [1.5]
}
]
},
{ {
"display_name": "Discombobulate", "display_name": "Discombobulate",
"desc": "Damaging enemies will inflict them with +5 Discombobulated. (Max 100) You will deal +1 neutral and elemental damage to enemies for every Discombobulated they have. -5 of the bonus decays every second.", "desc": "Damaging enemies will inflict them with +5 Discombobulated. (Max 100) You will deal +1 neutral and elemental damage to enemies for every Discombobulated they have. -5 of the bonus decays every second.",
@ -4614,7 +4651,6 @@ const atrees = {
"properties": {}, "properties": {},
"effects": [] "effects": []
}, },
{ {
"display_name": "Blood Pact", "display_name": "Blood Pact",
"desc": "If you do not have enough mana to cast a spell, spend health instead (0.4% health per mana)", "desc": "If you do not have enough mana to cast a spell, spend health instead (0.4% health per mana)",
@ -4625,8 +4661,8 @@ const atrees = {
"blockers": [], "blockers": [],
"cost": 2, "cost": 2,
"display": { "display": {
"row": 34, "row": 33,
"col": 1, "col": 0,
"icon": "node_3" "icon": "node_3"
}, },
"properties": { "properties": {
@ -4642,7 +4678,7 @@ const atrees = {
"blockers": [], "blockers": [],
"cost": 2, "cost": 2,
"display": { "display": {
"row": 35, "row": 34,
"col": 4, "col": 4,
"icon": "node_2" "icon": "node_2"
}, },
@ -4665,7 +4701,7 @@ const atrees = {
"blockers": [], "blockers": [],
"cost": 1, "cost": 1,
"display": { "display": {
"row": 35, "row": 34,
"col": 6, "col": 6,
"icon": "node_0" "icon": "node_0"
}, },
@ -4689,7 +4725,7 @@ const atrees = {
"blockers": [], "blockers": [],
"cost": 2, "cost": 2,
"display": { "display": {
"row": 35, "row": 34,
"col": 8, "col": 8,
"icon": "node_1" "icon": "node_1"
}, },
@ -4714,7 +4750,7 @@ const atrees = {
"blockers": [], "blockers": [],
"cost": 1, "cost": 1,
"display": { "display": {
"row": 35, "row": 34,
"col": 2, "col": 2,
"icon": "node_0" "icon": "node_0"
}, },
@ -7375,8 +7411,6 @@ const atrees = {
{ {
"display_name": "Cheaper Dash", "display_name": "Cheaper Dash",
"desc": "Reduce the Mana cost of Dash", "desc": "Reduce the Mana cost of Dash",
"archetype": "",
"archetype_req": 0,
"base_abil": "Dash", "base_abil": "Dash",
"parents": [ "parents": [
"Smoke Bomb", "Smoke Bomb",
@ -7402,8 +7436,6 @@ const atrees = {
{ {
"display_name": "Multihit", "display_name": "Multihit",
"desc": "Unleash a rapid flurry of 8 hits to enemies facing you, dealing overwhelming damage", "desc": "Unleash a rapid flurry of 8 hits to enemies facing you, dealing overwhelming damage",
"archetype": "",
"archetype_req": 0,
"parents": [ "parents": [
"Double Slice", "Double Slice",
"Cheaper Dash" "Cheaper Dash"
@ -7528,7 +7560,6 @@ const atrees = {
"display_name": "Fire Mastery", "display_name": "Fire Mastery",
"desc": "Increases base damage from all Fire attacks", "desc": "Increases base damage from all Fire attacks",
"archetype": "Trickster", "archetype": "Trickster",
"archetype_req": 0,
"base_abil": 998, "base_abil": 998,
"parents": [ "parents": [
"Cheaper Dash", "Cheaper Dash",
@ -7570,7 +7601,6 @@ const atrees = {
"display_name": "Water Mastery", "display_name": "Water Mastery",
"desc": "Increases base damage from all Water attacks", "desc": "Increases base damage from all Water attacks",
"archetype": "Acrobat", "archetype": "Acrobat",
"archetype_req": 0,
"base_abil": 998, "base_abil": 998,
"parents": [ "parents": [
"Cheaper Dash", "Cheaper Dash",
@ -8171,8 +8201,7 @@ const atrees = {
"archetype_req": 3, "archetype_req": 3,
"base_abil": "Dash", "base_abil": "Dash",
"parents": [ "parents": [
"Shadow Travel", "Mirror Image"
"Cheaper Multihit"
], ],
"dependencies": [ "dependencies": [
"Mirror Image" "Mirror Image"
@ -8687,13 +8716,12 @@ const atrees = {
] ]
}, },
{ {
"display_name": "Cheaper Dash 2", "display_name": "Cheaper Dash II",
"desc": "Reduce the Mana cost of Dash", "desc": "Reduce the Mana cost of Dash",
"archetype": "",
"archetype_req": 0,
"base_abil": "Dash", "base_abil": "Dash",
"parents": [ "parents": [
"Echo" "Echo",
"Death Magnet"
], ],
"dependencies": [], "dependencies": [],
"blockers": [], "blockers": [],
@ -8765,7 +8793,8 @@ const atrees = {
"archetype_req": 0, "archetype_req": 0,
"base_abil": "Dash", "base_abil": "Dash",
"parents": [ "parents": [
"Marked" "Marked",
"Cheaper Dash II"
], ],
"dependencies": [ "dependencies": [
"Vanish" "Vanish"
@ -8781,7 +8810,7 @@ const atrees = {
"effects": [] "effects": []
}, },
{ {
"display_name": "Cheaper Multihit 2", "display_name": "Cheaper Multihit II",
"desc": "Reduce the Mana cost of Multihit", "desc": "Reduce the Mana cost of Multihit",
"base_abil": "Multihit", "base_abil": "Multihit",
"parents": [ "parents": [
@ -8813,8 +8842,8 @@ const atrees = {
"archetype_req": 1, "archetype_req": 1,
"base_abil": "Spin Attack", "base_abil": "Spin Attack",
"parents": [ "parents": [
"Cheaper Multihit 2", "Cheaper Multihit II",
"Cheaper Dash 2", "Cheaper Dash II",
"Choke Bomb" "Choke Bomb"
], ],
"dependencies": [ "dependencies": [
@ -8881,8 +8910,8 @@ const atrees = {
"archetype_req": 8, "archetype_req": 8,
"base_abil": "Spin Attack", "base_abil": "Spin Attack",
"parents": [ "parents": [
"Death Magnet", "Nightcloak Knife",
"Cheaper Multihit 2" "Cheaper Multihit II"
], ],
"dependencies": [ "dependencies": [
"Marked" "Marked"
@ -9412,7 +9441,7 @@ const atrees = {
"archetype": "Shadestepper", "archetype": "Shadestepper",
"archetype_req": 0, "archetype_req": 0,
"parents": [ "parents": [
"Cheaper Multihit 2", "Cheaper Multihit II",
"Ambush" "Ambush"
], ],
"dependencies": ["Marked"], "dependencies": ["Marked"],
@ -9459,7 +9488,7 @@ const atrees = {
"archetype_req": 0, "archetype_req": 0,
"base_abil": "Vanish", "base_abil": "Vanish",
"parents": [ "parents": [
"Cheaper Multihit 2", "Cheaper Multihit II",
"Hoodwink" "Hoodwink"
], ],
"dependencies": ["Vanish"], "dependencies": ["Vanish"],
@ -9467,7 +9496,7 @@ const atrees = {
"cost": 1, "cost": 1,
"display": { "display": {
"row": 34, "row": 34,
"col": 5, "col": 3,
"icon": "node_0" "icon": "node_0"
}, },
"effects": [{ "effects": [{

File diff suppressed because one or more lines are too long