From 93040e573b2b49e24ce17a8c46369bfde71e877d Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Tue, 31 Aug 2021 05:17:29 +0000 Subject: [PATCH] Add in additional checks. --- SigCrafter/src/sig/SigCraft.java | 229 +++++++++++++++++++++++++++++++ SigCrafter/src/sig/Skill.java | 1 + 2 files changed, 230 insertions(+) diff --git a/SigCrafter/src/sig/SigCraft.java b/SigCrafter/src/sig/SigCraft.java index 92632e7..5aefcd9 100644 --- a/SigCrafter/src/sig/SigCraft.java +++ b/SigCrafter/src/sig/SigCraft.java @@ -177,6 +177,235 @@ public class SigCraft { 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."); + + //Add Waste Not + List quality_rotation4 = new ArrayList(); + Craft c6 = 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); + current_rotation = quality_rotation4; + current_craft = c6; + 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); + s = SKILLLIST.get("Waste Not"); + 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 + Waste Not Rotation leaves "+current_craft.craft_cp+" CP, "+current_craft.craft_durability+" durability, "+(current_craft.quality_goal-current_craft.craft_quality)+" quality from the goal."); + + //No Innovation + List quality_rotation5 = new ArrayList(); + Craft c7 = 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); + current_rotation = quality_rotation5; + current_craft = c7; + s = SKILLLIST.get("Inner Quiet"); + s.useSkill(current_craft); + current_rotation.add(s); + s = SKILLLIST.get("Waste Not"); + s.useSkill(current_craft); + current_rotation.add(s); + combo=false; + while (current_craft.craft_qualityprogressSteps*10) { + 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 + Waste Not Rotation leaves "+current_craft.craft_cp+" CP, "+current_craft.craft_durability+" durability, "+(current_craft.quality_goal-current_craft.craft_quality)+" quality from the goal."); + + + //Add Waste Not II + List quality_rotation6 = new ArrayList(); + Craft c8 = 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); + current_rotation = quality_rotation6; + current_craft = c8; + 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); + s = SKILLLIST.get("Waste Not II"); + 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 + Waste Not II Rotation leaves "+current_craft.craft_cp+" CP, "+current_craft.craft_durability+" durability, "+(current_craft.quality_goal-current_craft.craft_quality)+" quality from the goal."); + + //No Innovation + List quality_rotation7 = new ArrayList(); + Craft c9 = 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); + current_rotation = quality_rotation7; + current_craft = c9; + s = SKILLLIST.get("Inner Quiet"); + s.useSkill(current_craft); + current_rotation.add(s); + s = SKILLLIST.get("Waste Not II"); + s.useSkill(current_craft); + current_rotation.add(s); + combo=false; + while (current_craft.craft_qualityprogressSteps*10) { + 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 + Waste Not II Rotation leaves "+current_craft.craft_cp+" CP, "+current_craft.craft_durability+" durability, "+(current_craft.quality_goal-current_craft.craft_quality)+" quality from the goal."); + + //Hasty Touch versions + List quality_rotation8 = new ArrayList(); + Craft c10 = 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); + current_rotation = quality_rotation8; + current_craft = c10; + s = SKILLLIST.get("Inner Quiet"); + s.useSkill(current_craft); + current_rotation.add(s); + s = SKILLLIST.get("Waste Not II"); + s.useSkill(current_craft); + current_rotation.add(s); + while (current_craft.craft_qualityprogressSteps*10) { + if (current_craft.BuffList.get("Waste Not II").stackCount==0) { + s = SKILLLIST.get("Waste Not II"); + s.useSkill(current_craft); + current_rotation.add(s); + } + s = SKILLLIST.get("Hasty Touch"); + s.useSkill(current_craft); + current_rotation.add(s); + } + System.out.println("Hasty Touch + Inner Quiet + Waste Not II Rotation leaves "+current_craft.craft_cp+" CP, "+current_craft.craft_durability+" durability, ~"+(int)Math.floor((current_craft.quality_goal-current_craft.craft_quality)*0.6)+" quality from the goal."); + + List quality_rotation9 = new ArrayList(); + Craft c11 = 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); + current_rotation = quality_rotation9; + current_craft = c11; + s = SKILLLIST.get("Inner Quiet"); + s.useSkill(current_craft); + current_rotation.add(s); + s = SKILLLIST.get("Waste Not II"); + s.useSkill(current_craft); + current_rotation.add(s); + 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); + } + if (current_craft.BuffList.get("Waste Not II").stackCount==0) { + s = SKILLLIST.get("Waste Not II"); + s.useSkill(current_craft); + current_rotation.add(s); + } + s = SKILLLIST.get("Hasty Touch"); + s.useSkill(current_craft); + current_rotation.add(s); + } + System.out.println("Hasty Touch + Inner Quiet + Innovation + Waste Not II Rotation leaves "+current_craft.craft_cp+" CP, "+current_craft.craft_durability+" durability, ~"+(int)Math.floor((current_craft.quality_goal-current_craft.craft_quality)*0.6)+" quality from the goal."); + + List quality_rotation10 = new ArrayList(); + Craft c12 = 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); + current_rotation = quality_rotation10; + current_craft = c12; + s = SKILLLIST.get("Inner Quiet"); + s.useSkill(current_craft); + current_rotation.add(s); + s = SKILLLIST.get("Waste Not"); + s.useSkill(current_craft); + current_rotation.add(s); + 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); + } + if (current_craft.BuffList.get("Waste Not").stackCount==0) { + s = SKILLLIST.get("Waste Not"); + s.useSkill(current_craft); + current_rotation.add(s); + } + s = SKILLLIST.get("Hasty Touch"); + s.useSkill(current_craft); + current_rotation.add(s); + } + System.out.println("Hasty Touch + Inner Quiet + Innovation + Waste Not Rotation leaves "+current_craft.craft_cp+" CP, "+current_craft.craft_durability+" durability, ~"+(int)Math.floor((current_craft.quality_goal-current_craft.craft_quality)*0.6)+" quality from the goal."); + + List quality_rotation11 = new ArrayList(); + Craft c13 = 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); + current_rotation = quality_rotation11; + current_craft = c13; + s = SKILLLIST.get("Inner Quiet"); + s.useSkill(current_craft); + current_rotation.add(s); + s = SKILLLIST.get("Waste Not"); + s.useSkill(current_craft); + current_rotation.add(s); + if (current_craft.BuffList.get("Innovation").stackCount==0) { + s = SKILLLIST.get("Innovation"); + s.useSkill(current_craft); + current_rotation.add(s); + } + while (current_craft.craft_qualityprogressSteps*10) { + if (current_craft.BuffList.get("Waste Not").stackCount==0) { + s = SKILLLIST.get("Waste Not"); + s.useSkill(current_craft); + current_rotation.add(s); + } + s = SKILLLIST.get("Hasty Touch"); + s.useSkill(current_craft); + current_rotation.add(s); + } + System.out.println("Hasty Touch + Inner Quiet + Innovation (Once) + Waste Not Rotation leaves "+current_craft.craft_cp+" CP, "+current_craft.craft_durability+" durability, ~"+(int)Math.floor((current_craft.quality_goal-current_craft.craft_quality)*0.6)+" quality from the goal."); + + List quality_rotation12 = new ArrayList(); + Craft c14 = 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); + current_rotation = quality_rotation12; + current_craft = c14; + s = SKILLLIST.get("Inner Quiet"); + s.useSkill(current_craft); + current_rotation.add(s); + s = SKILLLIST.get("Waste Not II"); + s.useSkill(current_craft); + current_rotation.add(s); + if (current_craft.BuffList.get("Innovation").stackCount==0) { + s = SKILLLIST.get("Innovation"); + s.useSkill(current_craft); + current_rotation.add(s); + } + while (current_craft.craft_qualityprogressSteps*10) { + if (current_craft.BuffList.get("Waste Not II").stackCount==0) { + s = SKILLLIST.get("Waste Not II"); + s.useSkill(current_craft); + current_rotation.add(s); + } + s = SKILLLIST.get("Hasty Touch"); + s.useSkill(current_craft); + current_rotation.add(s); + } + System.out.println("Hasty Touch + Inner Quiet + Innovation (Once) + Waste Not II Rotation leaves "+current_craft.craft_cp+" CP, "+current_craft.craft_durability+" durability, ~"+(int)Math.floor((current_craft.quality_goal-current_craft.craft_quality)*0.6)+" quality from the goal."); + } } diff --git a/SigCrafter/src/sig/Skill.java b/SigCrafter/src/sig/Skill.java index d268537..6581aa1 100644 --- a/SigCrafter/src/sig/Skill.java +++ b/SigCrafter/src/sig/Skill.java @@ -48,6 +48,7 @@ public class Skill implements SkillInterface{ } } c.control += c.base_control * 0.2 * c.BuffList.get("Inner Quiet").stackCount; + c.quality_mult += c.craft_status==Status.GOOD?0.5:c.craft_status==Status.EXCELLENT?3.0:0; c.progress_mult += c.BuffList.get("Veneration").stackCount>0?0.5:0; c.quality_mult += c.BuffList.get("Great Strides").stackCount>0?1:0; c.quality_mult += c.BuffList.get("Innovation").stackCount>0?0.5:0;