From e7b1ee7d3cafa9484fc21ae96802565d9302e6a8 Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Mon, 30 Aug 2021 07:25:39 +0000 Subject: [PATCH] Calculate 3 strategies. --- SigCrafter/src/sig/SigCraft.java | 52 ++++++++++++++++++++ SigCrafter/src/sig/skills/BasicTouch.java | 1 + SigCrafter/src/sig/skills/StandardTouch.java | 1 + 3 files changed, 54 insertions(+) diff --git a/SigCrafter/src/sig/SigCraft.java b/SigCrafter/src/sig/SigCraft.java index 96f1e41..92632e7 100644 --- a/SigCrafter/src/sig/SigCraft.java +++ b/SigCrafter/src/sig/SigCraft.java @@ -125,6 +125,58 @@ public class SigCraft { qualityCPRemaining = c1.craft_cp; System.out.println("\tUsing standard rotation for Progress. Quality CP Available: "+qualityCPRemaining); } + + //Can we just straight up craft? + List quality_rotation1 = new ArrayList(); + Craft c3 = new Craft(CONTROL,LEVEL,CP,BASE_PROGRESS,PROGRESS_GOAL,QUALITY_GOAL,GUARANTEED,DURABILITY,CRAFT_PROGRESS,CRAFT_QUALITY,DURABILITY,qualityCPRemaining,1,1,1,RECIPE_LEVEL,Status.NORMAL,BUFFLIST); + boolean combo=false; + while (c3.craft_qualityprogressSteps*10) { + s = !combo?SKILLLIST.get("Basic Touch"):SKILLLIST.get("Standard Touch"); + s.useSkill(c3); + quality_rotation1.add(s); + combo=!combo; + } + System.out.println("Raw Quality Rotation leaves "+c3.craft_cp+" CP, "+c3.craft_durability+" durability, "+(c3.quality_goal-c3.craft_quality)+" quality from the goal."); + + //Add Inner Quiet + List quality_rotation2 = new ArrayList(); + Craft c4 = new Craft(CONTROL,LEVEL,CP,BASE_PROGRESS,PROGRESS_GOAL,QUALITY_GOAL,GUARANTEED,DURABILITY,CRAFT_PROGRESS,CRAFT_QUALITY,DURABILITY,qualityCPRemaining,1,1,1,RECIPE_LEVEL,Status.NORMAL,BUFFLIST); + s = SKILLLIST.get("Inner Quiet"); + s.useSkill(c4); + quality_rotation2.add(s); + combo=false; + while (c4.craft_qualityprogressSteps*10) { + s = !combo?SKILLLIST.get("Basic Touch"):SKILLLIST.get("Standard Touch"); + s.useSkill(c4); + quality_rotation2.add(s); + combo=!combo; + } + System.out.println("Raw Quality + Inner Quiet Rotation leaves "+c4.craft_cp+" CP, "+c4.craft_durability+" durability, "+(c4.quality_goal-c4.craft_quality)+" quality from the goal."); + + //Add Innovation + List quality_rotation3 = new ArrayList(); + Craft c5 = new Craft(CONTROL,LEVEL,CP,BASE_PROGRESS,PROGRESS_GOAL,QUALITY_GOAL,GUARANTEED,DURABILITY,CRAFT_PROGRESS,CRAFT_QUALITY,DURABILITY,qualityCPRemaining,1,1,1,RECIPE_LEVEL,Status.NORMAL,BUFFLIST); + List current_rotation = quality_rotation3; + Craft current_craft = c5; + s = SKILLLIST.get("Inner Quiet"); + s.useSkill(current_craft); + current_rotation.add(s); + s = SKILLLIST.get("Innovation"); + s.useSkill(current_craft); + current_rotation.add(s); + combo=false; + while (current_craft.craft_qualityprogressSteps*10) { + if (current_craft.BuffList.get("Innovation").stackCount==0) { + s = SKILLLIST.get("Innovation"); + s.useSkill(current_craft); + current_rotation.add(s); + } + s = !combo?SKILLLIST.get("Basic Touch"):SKILLLIST.get("Standard Touch"); + s.useSkill(current_craft); + current_rotation.add(s); + combo=!combo; + } + System.out.println("Raw Quality + Inner Quiet + Innovation Rotation leaves "+current_craft.craft_cp+" CP, "+current_craft.craft_durability+" durability, "+(current_craft.quality_goal-current_craft.craft_quality)+" quality from the goal."); } } diff --git a/SigCrafter/src/sig/skills/BasicTouch.java b/SigCrafter/src/sig/skills/BasicTouch.java index 38fea26..7f4a1b3 100644 --- a/SigCrafter/src/sig/skills/BasicTouch.java +++ b/SigCrafter/src/sig/skills/BasicTouch.java @@ -14,6 +14,7 @@ public class BasicTouch extends Skill { super.useSkill(c); c.craft_quality += 1 * c.quality_mult * (0.37*c.control+32.6)*(1-0.05*Math.min(Math.max(c.recipe_level-c.level,0),5)); c.craft_durability -= 10 * c.durability_mult; + if (c.BuffList.get("Inner Quiet").stackCount>0) {c.BuffList.get("Inner Quiet").stackCount++;} } } diff --git a/SigCrafter/src/sig/skills/StandardTouch.java b/SigCrafter/src/sig/skills/StandardTouch.java index 18d9764..fee9b4b 100644 --- a/SigCrafter/src/sig/skills/StandardTouch.java +++ b/SigCrafter/src/sig/skills/StandardTouch.java @@ -19,6 +19,7 @@ public class StandardTouch extends Skill { super.useSkill(c); c.craft_quality += 1.25 * c.quality_mult * (0.37*c.control+32.6)*(1-0.05*Math.min(Math.max(c.recipe_level-c.level,0),5)); c.craft_durability -= 10 * c.durability_mult; + if (c.BuffList.get("Inner Quiet").stackCount>0) {c.BuffList.get("Inner Quiet").stackCount++;} } }