From af019c02d2ba1aa8cbef79ff1a7a4eb1bbaa3779 Mon Sep 17 00:00:00 2001 From: b Date: Sat, 7 Aug 2021 16:15:44 -0700 Subject: [PATCH] Wynncon support (maybe breaks everything idk) --- AIn/atlas_games/index.html | 19 ------------------- AIn/atlas_games/index.js | 7 ------- AIn/atlas_games/manifest.json | 4 ---- build.js | 2 +- build_utils.js | 5 +++-- custom.js | 1 + customizer.js | 2 ++ damage_calc.js | 17 +++++++++++++++++ py_script/tmp.py | 8 -------- 9 files changed, 24 insertions(+), 41 deletions(-) delete mode 100644 AIn/atlas_games/index.html delete mode 100644 AIn/atlas_games/index.js delete mode 100644 AIn/atlas_games/manifest.json delete mode 100644 py_script/tmp.py diff --git a/AIn/atlas_games/index.html b/AIn/atlas_games/index.html deleted file mode 100644 index da1ecb0..0000000 --- a/AIn/atlas_games/index.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - WynnBuilder - - -

Hello world!

- - - diff --git a/AIn/atlas_games/index.js b/AIn/atlas_games/index.js deleted file mode 100644 index 5088412..0000000 --- a/AIn/atlas_games/index.js +++ /dev/null @@ -1,7 +0,0 @@ -let url = "https://media.discordapp.net/attachments/662775844032348171/872287608061952062/unknown.png?width=735&height=613"; - - -let img = document.createElement('img'); - -img.src = url; -document.body.appendChild(img); diff --git a/AIn/atlas_games/manifest.json b/AIn/atlas_games/manifest.json deleted file mode 100644 index f10e7f2..0000000 --- a/AIn/atlas_games/manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "display": "standalone", - "orientation": "portrait" -} \ No newline at end of file diff --git a/build.js b/build.js index aa4581d..934a53b 100644 --- a/build.js +++ b/build.js @@ -1,6 +1,6 @@ -const classDefenseMultipliers = new Map([ ["relik",0.50], ["bow",0.60], ["wand", 0.80], ["dagger", 1.0], ["spear",1.20] ]); +const classDefenseMultipliers = new Map([ ["relik",0.50], ["bow",0.60], ["wand", 0.80], ["dagger", 1.0], ["spear",1.20], ["sword", 1.10]]); /** * @description Error to catch items that don't exist. diff --git a/build_utils.js b/build_utils.js index 5bfc542..7f66eb5 100644 --- a/build_utils.js +++ b/build_utils.js @@ -56,10 +56,11 @@ const baseDamageMultiplier = [ 0.51, 0.83, 1.5, 2.05, 2.5, 3.1, 4.3 ]; //0.51, 0.82, 1.50, 2.05, 2.50, 3.11, 4.27 const classes = ["Warrior", "Assassin", "Mage", "Archer", "Shaman"]; const tiers = ["Normal", "Unique", "Rare", "Legendary", "Fabled", "Mythic", "Set", "Crafted"] //I'm not sure why you would make a custom crafted but if you do you should be able to use it w/ the correct powder formula -const types = armorTypes.concat(accessoryTypes).concat(weaponTypes).concat(consumableTypes).map(x => x.substring(0,1).toUpperCase() + x.substring(1)); +const types = armorTypes.concat(accessoryTypes).concat(weaponTypes).concat(consumableTypes).concat(["sword"]).map(x => x.substring(0,1).toUpperCase() + x.substring(1)); +weaponTypes.push("sword"); +console.log(types) let itemTypes = armorTypes.concat(accessoryTypes).concat(weaponTypes); - let elementIcons = ["\u2724","\u2726", "\u2749", "\u2739", "\u274b" ]; let skpReqs = skp_order.map(x => x + "Req"); diff --git a/custom.js b/custom.js index 1cae53a..0ffee4e 100644 --- a/custom.js +++ b/custom.js @@ -238,6 +238,7 @@ class Custom{ //this.setHashVerbose(); //do NOT move sethash from here please this.statMap.set("custom", true); + console.log(this.statMap); for (const id of ci_save_order) { if (rolledIDs.includes(id)) { diff --git a/customizer.js b/customizer.js index 695a1f7..2cac2b9 100644 --- a/customizer.js +++ b/customizer.js @@ -735,4 +735,6 @@ function full_range_to_base(min, max) { } } + + load_init(_init_customizer); diff --git a/damage_calc.js b/damage_calc.js index c15c3b9..0266ebb 100644 --- a/damage_calc.js +++ b/damage_calc.js @@ -294,6 +294,23 @@ const spell_table = { { subtitle: "Total Damage", type: "damage", multiplier: 100, conversion: [70, 30, 0, 0, 0, 0], summary: true }, ] }, ], + "sword": [ + { title: "Successive Strikes", cost: 5, parts: [ + { subtitle: "Damage", type: "damage", multiplier: 65, conversion: [70, 0, 15, 0, 0, 15]}, + { subtitle: "Final Strike", type: "damage", multiplier: 120, conversion: [70, 0, 15, 0, 0, 15]}, + { subtitle: "Total Damage (Normal)", type: "total", factors: [2, 0], summary: true }, + ] }, + { title: "Dash", cost: 3, parts: [ + { subtitle: "Damage", type: "damage", multiplier: 120, conversion: [60, 0, 0, 0, 0, 40], summary: true }, + ] }, + { title: "Execute", cost: 8, parts: [ + { subtitle: "Minimum Damage", type: "damage", multiplier: 100, conversion: [60, 0, 20, 0, 20, 0]}, + { subtitle: "Maximum Damage", type: "damage", multiplier: 1200, conversion: [60, 0, 20, 0, 20, 0], summary: true }, + ] }, + { title: "Blade Echo", cost: 4, parts: [ + { subtitle: "Damage", type: "damage", multiplier: 125, conversion: [60, 0, 0, 20, 0, 20], summary: true }, + ] }, + ], "powder": [ //This is how instant-damage powder specials are implemented. { title: "Quake", cost: 0, parts:[ { subtitle: "Total Damage", type: "damage", multiplier: [155, 220, 285, 350, 415], conversion: [0,100,0,0,0,0], summary: true}, diff --git a/py_script/tmp.py b/py_script/tmp.py deleted file mode 100644 index de7546a..0000000 --- a/py_script/tmp.py +++ /dev/null @@ -1,8 +0,0 @@ - -#for i in range(0, 360, 5): -# print(f"tp @s ~ ~ ~ {i} 0\n"+ -#"""execute at @s run summon armor_stand ^ ^ ^0.8 {Tags:["aura_vector"],Invisible:1b} -#execute as @e[tag=aura_vector,limit=1,sort=nearest] at @s run tp @s ~ ~ ~ facing entity @e[tag=aura_execute,limit=1,sort=nearest]""") - -for i in range(2, 21): - print("execute as @s[scores={"+f"auraTimer={i}"+"}] run execute as @e[tag=aura_vector] at @s run tp @s ^ ^ ^"+f"-{'{0:3.1f}'.format(0.8*(i-1))}")