Merge branch 'atree' into atree_active_box
This commit is contained in:
commit
3ff4421de4
9 changed files with 34 additions and 14 deletions
19
LICENSE.txt
Normal file
19
LICENSE.txt
Normal file
|
@ -0,0 +1,19 @@
|
|||
Copyright (c) 2022 Wynnbuilder team
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
|
@ -1333,7 +1333,7 @@
|
|||
<p>Hard refresh the page (Ctrl+Shift+R on windows/chrome) if it isn't updating correctly.</p>
|
||||
</div>
|
||||
<div id="credits">
|
||||
<a href="credits.txt" class="link">Additional credits</a>
|
||||
<a href="../credits.txt" class="link">Additional credits</a>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
|
|
|
@ -1307,7 +1307,7 @@
|
|||
<p>Hard refresh the page (Ctrl+Shift+R on windows/chrome) if it isn't updating correctly.</p>
|
||||
</div>
|
||||
<div id="credits">
|
||||
<a href="credits.txt" class="link">Additional credits</a>
|
||||
<a href="../credits.txt" class="link">Additional credits</a>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
|
|
|
@ -287,7 +287,7 @@
|
|||
<p>Hard refresh the page (Ctrl+Shift+R on windows/chrome) if it isn't updating correctly.</p>
|
||||
</div>
|
||||
<div id="credits">
|
||||
<a href="credits.txt" class="link">Additional credits</a>
|
||||
<a href="../credits.txt" class="link">Additional credits</a>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
|
|
|
@ -1889,7 +1889,7 @@
|
|||
<p>Hard refresh the page (Ctrl+Shift+R on windows/chrome) if it isn't updating correctly.</p>
|
||||
</div>
|
||||
<div id="credits">
|
||||
<a href="credits.txt" class="link">Additional credits</a>
|
||||
<a href="../credits.txt" class="link">Additional credits</a>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
<div class = "col">
|
||||
<div class = "row">
|
||||
<div class = "col text-start" id = "credits">
|
||||
<a href="credits.txt" class="link">Additional credits</a>
|
||||
<a href="../credits.txt" class="link">Additional credits</a>
|
||||
</div>
|
||||
<div class = "col text-center" id = "help">
|
||||
<a href="items_2_help.html" class="link" target="_blank">Search Guide</a>
|
||||
|
|
|
@ -1240,7 +1240,7 @@ const atrees = {
|
|||
"display_name": "Refined Gunpowder",
|
||||
"desc": "Increase the damage of Arrow Bomb.",
|
||||
"base_abil": "Arrow Bomb",
|
||||
"parents": ["Windstorm"],
|
||||
"parents": ["Windstorm", "Traveler"],
|
||||
"dependencies": [],
|
||||
"blockers": [],
|
||||
"cost": 1,
|
||||
|
@ -1949,7 +1949,7 @@ const atrees = {
|
|||
"desc": "Phantom Ray will increase its damage by 10% everytime you do not miss with it (Max 50%)",
|
||||
"archetype": "Sharpshooter",
|
||||
"archetype_req": 0,
|
||||
"parents": ["Cheaper Arrow Shield"],
|
||||
"parents": ["Cheaper Arrow Shield", "Cheaper Escape (2)"],
|
||||
"dependencies": ["Phantom Ray"],
|
||||
"blockers": [],
|
||||
"cost": 1,
|
||||
|
@ -2282,7 +2282,7 @@ const atrees = {
|
|||
"parts": [
|
||||
{
|
||||
"name": "Uppercut",
|
||||
"multipliers": [150, 50, 50, 0, 0, 0]
|
||||
"multipliers": [200, 40, 40, 0, 0, 0]
|
||||
},
|
||||
{
|
||||
"name": "Total Damage",
|
||||
|
@ -2967,6 +2967,7 @@ const atrees = {
|
|||
"desc": "While Corriupted, every 1% of Health you lose will increase your damage by +3% (Max 300%)",
|
||||
"archetype": "Fallen",
|
||||
"archetype_req": 0,
|
||||
"base_abil": "Bak'al's Grasp",
|
||||
"parents": ["Spear Proficiency 2"],
|
||||
"dependencies": ["Bak'al's Grasp"],
|
||||
"blockers": [],
|
||||
|
@ -3030,6 +3031,7 @@ const atrees = {
|
|||
"desc": "Add +2 additional charges to Mantle of the Bovemists",
|
||||
"archetype": "Paladin",
|
||||
"archetype_req": 0,
|
||||
"base_abil": "Mantle of the Bovemists",
|
||||
"parents": ["Manachism", "Flying Kick"],
|
||||
"dependencies": ["Mantle of the Bovemists"],
|
||||
"blockers": [],
|
||||
|
@ -3078,8 +3080,7 @@ const atrees = {
|
|||
{
|
||||
"display_name": "Boiling Blood",
|
||||
"desc": "Bash leaves a trail of boiling blood behind its first explosion, slowing down and damaging enemies above it every 0.4 seconds",
|
||||
"archetype": "",
|
||||
"archetype_req": 0,
|
||||
"base_abil": "Bash",
|
||||
"parents": ["Enraged Blow", "Ragnarokkr"],
|
||||
"dependencies": [],
|
||||
"blockers": [],
|
||||
|
@ -3816,7 +3817,7 @@ const atrees = {
|
|||
"parents": ["Spirit of the Rabbit"],
|
||||
"dependencies": [],
|
||||
"blockers": [],
|
||||
"cost": 1,
|
||||
"cost": 2,
|
||||
"display": {
|
||||
"row": 31,
|
||||
"col": 4,
|
||||
|
@ -3866,7 +3867,7 @@ const atrees = {
|
|||
{
|
||||
"display_name": "Blood Pact",
|
||||
"desc": "If you do not have enough mana to cast a spell, spend health instead (0.6% health per mana)",
|
||||
"archetype": "",
|
||||
"archetype": "Fallen",
|
||||
"archetype_req": 10,
|
||||
"parents": ["Cheaper War Scream"],
|
||||
"dependencies": [],
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -38,7 +38,7 @@ function calculateSpellDamage(stats, weapon, conversions, use_spell_damage, igno
|
|||
else {
|
||||
weapon_damages = damage_keys.map(x => weapon.get(x));
|
||||
}
|
||||
let present = weapon.get(damage_present_key);
|
||||
let present = deepcopy(weapon.get(damage_present_key));
|
||||
|
||||
// 2. Conversions.
|
||||
// 2.1. First, apply neutral conversion (scale weapon damage). Keep track of total weapon damage here.
|
||||
|
|
Loading…
Reference in a new issue