Implement Lv50 recipe, lv45 smart recipe

main
Joshua Sigona 3 years ago
parent 4452398eba
commit a347839022
  1. 8
      SigCrafter/src/sig/Condition.java
  2. 10
      SigCrafter/src/sig/Craft.java
  3. 183
      SigCrafter/src/sig/SigCraft.java
  4. 18
      SigCrafter/src/sig/Skill.java
  5. 3
      SigCrafter/src/sig/skills/BasicSynthesis.java
  6. 3
      SigCrafter/src/sig/skills/BasicTouch.java
  7. 3
      SigCrafter/src/sig/skills/BrandOfTheElements.java
  8. 6
      SigCrafter/src/sig/skills/ByregotsBlessing.java
  9. 1
      SigCrafter/src/sig/skills/GreatStrides.java
  10. 3
      SigCrafter/src/sig/skills/HastyTouch.java
  11. 1
      SigCrafter/src/sig/skills/InnerQuiet.java
  12. 1
      SigCrafter/src/sig/skills/Innovation.java
  13. 1
      SigCrafter/src/sig/skills/MastersMend.java
  14. 1
      SigCrafter/src/sig/skills/NameOfTheElements.java
  15. 1
      SigCrafter/src/sig/skills/Observe.java
  16. 3
      SigCrafter/src/sig/skills/RapidSynthesis.java
  17. 3
      SigCrafter/src/sig/skills/StandardTouch.java
  18. 3
      SigCrafter/src/sig/skills/TricksOfTheTrade.java
  19. 1
      SigCrafter/src/sig/skills/Veneration.java
  20. 1
      SigCrafter/src/sig/skills/WasteNot.java
  21. 1
      SigCrafter/src/sig/skills/WasteNotII.java

@ -0,0 +1,8 @@
package sig;
public enum Condition {
NORMAL,
GOOD,
POOR,
EXCELLENT;
}

@ -57,4 +57,14 @@ public class Craft {
+ quality_mult + ", durability_mult=" + durability_mult + ", SkillList=" + SkillList + ", BuffList=" + quality_mult + ", durability_mult=" + durability_mult + ", SkillList=" + SkillList + ", BuffList="
+ BuffList + ", CraftList=" + CraftList + "]"; + BuffList + ", CraftList=" + CraftList + "]";
} }
public String getRotationString() {
StringBuilder sb = new StringBuilder();
for (Skill s : SkillList) {
if (sb.length()>0) {
sb.append(" -> ");
}
sb.append(s.getName());
}
return sb.toString();
}
} }

@ -9,6 +9,7 @@ import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -33,9 +34,9 @@ import sig.skills.WasteNot;
import sig.skills.WasteNotII; import sig.skills.WasteNotII;
public class SigCraft { public class SigCraft {
public static int LEVEL = 48; public static int LEVEL = 100;
public static int RECIPE_LEVEL = 41; public static int RECIPE_LEVEL = 41;
public static int CP = 282; public static int CP = 280;
public static int BASE_PROGRESS = 57; public static int BASE_PROGRESS = 57;
public static int CONTROL = 185; public static int CONTROL = 185;
public static int PROGRESS_GOAL = 143; public static int PROGRESS_GOAL = 143;
@ -43,6 +44,8 @@ public class SigCraft {
public static boolean GUARANTEED = true; public static boolean GUARANTEED = true;
public static int DURABILITY = 80; public static int DURABILITY = 80;
public static List<String> VALID_TOUCH_ACTIONS = Arrays.asList("Basic Touch","Standard Touch","Byregot's Blessing");
public static Map<String,Buff> BUFFLIST = new HashMap<String,Buff>(); public static Map<String,Buff> BUFFLIST = new HashMap<String,Buff>();
public static Map<String,Skill> SKILLLIST = new HashMap<String,Skill>(); public static Map<String,Skill> SKILLLIST = new HashMap<String,Skill>();
@ -59,6 +62,7 @@ public class SigCraft {
public static ColorPosition CRAFTING_WINDOW_PIXELS = new ColorPosition(284,68,77,77,77); public static ColorPosition CRAFTING_WINDOW_PIXELS = new ColorPosition(284,68,77,77,77);
public static ColorPosition CRAFT_START_PIXELS = new ColorPosition(334,130,74,77,74); public static ColorPosition CRAFT_START_PIXELS = new ColorPosition(334,130,74,77,74);
public static ColorPosition PRACTICE_CRAFT_START_PIXELS = new ColorPosition(334,130,41,40,41);
public static ColorPosition READY_FOR_ACTION_PIXELS = new ColorPosition(1031,892,230,197,164); public static ColorPosition READY_FOR_ACTION_PIXELS = new ColorPosition(1031,892,230,197,164);
//Quality = (0.37 * Control + 32.6) * (1 - 0.05 * min(max(Recipe Level - Character Level, 0), 5)) //Quality = (0.37 * Control + 32.6) * (1 - 0.05 * min(max(Recipe Level - Character Level, 0), 5))
@ -67,6 +71,10 @@ public class SigCraft {
//Fail conditions: Progress does not reach 100% when durability reaches 0 //Fail conditions: Progress does not reach 100% when durability reaches 0
public static ArrayList<Craft> SucceededCrafts = new ArrayList<Craft>(); public static ArrayList<Craft> SucceededCrafts = new ArrayList<Craft>();
public static Craft CURRENT_CRAFT;
public static Condition CURRENT_CONDITION;
public static void main(String[] args) { public static void main(String[] args) {
@ -109,21 +117,30 @@ public class SigCraft {
//284,68 77,77,77 //284,68 77,77,77
while (true) { while (true) {
r.delay(1000); r.delay(100);
//LookForScreenPixels(CRAFT_START_PIXELS);
//System.out.println(GetCondition());
CURRENT_CRAFT = new Craft(CONTROL,LEVEL,CP,BASE_PROGRESS,PROGRESS_GOAL,QUALITY_GOAL,GUARANTEED,DURABILITY,CRAFT_PROGRESS,CRAFT_QUALITY,DURABILITY,CP,1,1,1,RECIPE_LEVEL,Status.NORMAL,BUFFLIST);
try { try {
Color col=null; Color col=null;
LookForScreenPixels(CRAFTING_WINDOW_PIXELS); LookForScreenPixels(CRAFTING_WINDOW_PIXELS);
r.delay(150);
System.out.println("Detected crafting window..."); System.out.println("Detected crafting window...");
PressKey(KeyEvent.VK_NUMPAD0);r.delay(300); BufferedImage img;
PressKey(KeyEvent.VK_NUMPAD0);r.delay(300); do {
PressKey(KeyEvent.VK_NUMPAD0);r.delay(300); PressKey(KeyEvent.VK_NUMPAD0);r.delay(300);
PressKey(KeyEvent.VK_NUMPAD0);r.delay(300); img = CaptureScreen();
} while (new Color(img.getRGB(CRAFTING_WINDOW_PIXELS.p.x,CRAFTING_WINDOW_PIXELS.p.y)).equals(CRAFTING_WINDOW_PIXELS.c));
//334,130 74,77,74 //334,130 74,77,74
LookForScreenPixels(CRAFT_START_PIXELS); LookForScreenPixels(CRAFT_START_PIXELS,PRACTICE_CRAFT_START_PIXELS);
System.out.println("Craft started..."); System.out.println("Craft started...");
//336,267 151,220,96 //336,267 151,220,96
LookForScreenPixels(READY_FOR_ACTION_PIXELS); LookForScreenPixels(READY_FOR_ACTION_PIXELS);
LoadRotation_40Durability_1700Quality_1Synth_280CP_LV47(); UpdateCondition();
LoadRotation_40Durability_1900Quality_1Synth_280CP_LV50();
//LoadRotation_40Durability_1700Quality_1Synth_278CP_LV47();
//LoadRotation_40Durability_1900Quality_1Synth_280CP_LV45();
System.out.println("Rotation: "+CURRENT_CRAFT.getRotationString());
} catch (IOException | InterruptedException e) { } catch (IOException | InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -131,37 +148,117 @@ public class SigCraft {
} }
} }
private static void LoadRotation_40Durability_1700Quality_1Synth_280CP_LV47() { private static void LoadRotation_40Durability_1900Quality_1Synth_280CP_LV50() {
DURABILITY=40;
CURRENT_CRAFT = new Craft(CONTROL,LEVEL,CP,BASE_PROGRESS,PROGRESS_GOAL,QUALITY_GOAL,GUARANTEED,DURABILITY,CRAFT_PROGRESS,CRAFT_QUALITY,DURABILITY,CP,1,1,1,RECIPE_LEVEL,Status.NORMAL,BUFFLIST);
PerformSkill("Inner Quiet");
PerformSkill("Waste Not II");
UseRegularTouch();
UseRegularTouch();
UseRegularTouch();
UseRegularTouch();
UseRegularTouch();
UseRegularTouch();
PerformSkill("Great Strides");
PerformSkill("Byregot's Blessing");
PerformSkill("Basic Synthesis");
}
private static void LoadRotation_40Durability_1700Quality_1Synth_278CP_LV47() {
DURABILITY=40;
CURRENT_CRAFT = new Craft(CONTROL,LEVEL,CP,BASE_PROGRESS,PROGRESS_GOAL,QUALITY_GOAL,GUARANTEED,DURABILITY,CRAFT_PROGRESS,CRAFT_QUALITY,DURABILITY,CP,1,1,1,RECIPE_LEVEL,Status.NORMAL,BUFFLIST);
PerformSkill("Inner Quiet"); PerformSkill("Inner Quiet");
PerformSkill("Innovation"); PerformSkill("Innovation");
PerformSkill("Waste Not II"); PerformSkill("Waste Not II");
PerformSkill("Basic Touch",true); UseRegularTouch();
PerformSkill("Standard Touch",true); UseRegularTouch();
PerformSkill("Basic Touch",true); UseRegularTouch();
PerformSkill("Standard Touch",true); UseRegularTouch();
PerformSkill("Innovation",true); PerformSkill("Innovation",true);
PerformSkill("Basic Touch",true); UseRegularTouch();
PerformSkill("Standard Touch",true); UseRegularTouch();
PerformSkill("Basic Touch",true); UseRegularTouch();
PerformSkill("Basic Synthesis"); PerformSkill("Basic Synthesis");
} }
private static void LoadRotation_40Durability_1900Quality_1Synth_280CP_LV45() { private static void LoadRotation_40Durability_1900Quality_1Synth_280CP_LV45() {
DURABILITY=40;
CURRENT_CRAFT = new Craft(CONTROL,LEVEL,CP,BASE_PROGRESS,PROGRESS_GOAL,QUALITY_GOAL,GUARANTEED,DURABILITY,CRAFT_PROGRESS,CRAFT_QUALITY,DURABILITY,CP,1,1,1,RECIPE_LEVEL,Status.NORMAL,BUFFLIST);
boolean combo=false;
PerformSkill("Inner Quiet"); PerformSkill("Inner Quiet");
PerformSkill("Waste Not"); CheckForRecoveryCP();PerformSkill("Innovation");
PerformSkill("Basic Touch",true); CheckForRecoveryCP();PerformSkill("Waste Not");
PerformSkill("Standard Touch",true); while (!MaxQuality()) {
PerformSkill("Basic Touch",true); if (CURRENT_CONDITION==Condition.EXCELLENT) {
PerformSkill("Standard Touch",true); UseRegularTouch();
PerformSkill("Innovation",true); } else
PerformSkill("Basic Touch",true); if (CURRENT_CRAFT.BuffList.get("Waste Not").stackCount!=0) {
PerformSkill("Standard Touch",true); if (!IsThereEnoughTurns(CURRENT_CRAFT.craft_durability,CURRENT_CRAFT.BuffList,1)) {
PerformSkill("Basic Touch",true); break;
}
UseRegularTouch();
} else {
CheckForRecoveryCP();PerformSkill("Innovation");
CheckForRecoveryCP();PerformSkill("Waste Not");
}
//System.out.println(IsThereEnoughTurns(CURRENT_CRAFT.craft_durability,CURRENT_CRAFT.BuffList,2));
}
PerformSkill("Basic Synthesis"); PerformSkill("Basic Synthesis");
} }
private static void UseRegularTouch() {
if ((CURRENT_CRAFT.craft_durability>5&&CURRENT_CRAFT.BuffList.get("Waste Not").stackCount>0)||(CURRENT_CRAFT.craft_durability>10&&CURRENT_CRAFT.BuffList.get("Waste Not").stackCount==0)) {
if (CURRENT_CRAFT.craft_cp>=18) {
if (IsCombo()) {
PerformSkill("Standard Touch",true);
} else {
PerformSkill("Basic Touch",true);
}
} else {
PerformSkill("Hasty Touch",true);
}
}
}
private static boolean IsCombo() {
return CURRENT_CRAFT.SkillList.get(CURRENT_CRAFT.SkillList.size()-1).name.equals("Basic Touch");
}
private static void CheckForRecoveryCP() {
if (CURRENT_CONDITION==Condition.GOOD) {PerformSkill("Tricks of the Trade");}
}
private static void GetCondition() { private static void UpdateCondition() {
//160,282 255,255,255 NORMAL
//160,282 255,194,214 GOOD
//160,282 <150,<150,<150 POOR
//ELSE EXCELLENT
try {
r.delay(50);
LookForScreenPixels(READY_FOR_ACTION_PIXELS,CRAFTING_WINDOW_PIXELS);
} catch (IOException | InterruptedException e1) {
e1.printStackTrace();
}
try {
Color col = new Color(CaptureScreen().getRGB(160, 282));
//System.out.println(col);
if (col.getRed()<=150&&col.getGreen()<=150&&col.getBlue()<=150) {
CURRENT_CONDITION = Condition.POOR;
return;
} else
if (col.getRed()>=235&&col.getGreen()>=130&&col.getGreen()<=214&&col.getBlue()>=194&&col.getBlue()<=234) {
CURRENT_CONDITION = Condition.GOOD;
return;
} else
if (col.getRed()>=245&&col.getGreen()>=245&&col.getBlue()>=245) {
CURRENT_CONDITION = Condition.NORMAL;
return;
}
} catch (IOException e) {
e.printStackTrace();
}
CURRENT_CONDITION = Condition.EXCELLENT;
return;
} }
private static void PerformSkill(String string) { private static void PerformSkill(String string) {
@ -169,12 +266,17 @@ public class SigCraft {
} }
private static void PerformSkill(String string,boolean checkForMaxQuality) { private static void PerformSkill(String string,boolean checkForMaxQuality) {
if (CURRENT_CONDITION==Condition.EXCELLENT&&
!VALID_TOUCH_ACTIONS.contains(string)) {
UseRegularTouch();
}
try { try {
LookForScreenPixels(READY_FOR_ACTION_PIXELS); LookForScreenPixels(READY_FOR_ACTION_PIXELS);
} catch (IOException | InterruptedException e) { } catch (IOException | InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
r.delay(100); r.delay(40);
Skill s = SKILLLIST.get(string); Skill s = SKILLLIST.get(string);
if (s==null) { if (s==null) {
System.err.println("Could not find skill "+string+"!"); System.err.println("Could not find skill "+string+"!");
@ -186,7 +288,13 @@ public class SigCraft {
} else { } else {
PressKey(s.key); PressKey(s.key);
} }
r.delay(500); if (CURRENT_CRAFT.craft_cp>=s.CPCost) {
s.useSkill(CURRENT_CRAFT);
System.out.println(" Durability: "+CURRENT_CRAFT.craft_durability);
}
r.delay(300);
UpdateCondition();
System.out.println("Condition is now: "+CURRENT_CONDITION);
//1031,892 115,98,82 230,197,164 //1031,892 115,98,82 230,197,164
} }
@ -200,12 +308,20 @@ public class SigCraft {
return col.getRed()==151&&col.getGreen()==220&&col.getBlue()==96; return col.getRed()==151&&col.getGreen()==220&&col.getBlue()==96;
} }
private static void LookForScreenPixels(ColorPosition cp) throws IOException, InterruptedException { private static void LookForScreenPixels(ColorPosition...cp) throws IOException, InterruptedException {
Color col; Color col;
boolean found=false;
do { do {
col = new Color(CaptureScreen().getRGB(cp.p.x, cp.p.y)); BufferedImage screen = CaptureScreen();
for (ColorPosition cpp : cp) {
col = new Color(screen.getRGB(cpp.p.x, cpp.p.y));
if (cpp.c.equals(col)) {
found=true;
break;
}
}
r.delay(100); r.delay(100);
} while (!cp.c.equals(col)); } while (!found);
} }
private static BufferedImage CaptureScreen() throws IOException { private static BufferedImage CaptureScreen() throws IOException {
@ -231,6 +347,7 @@ public class SigCraft {
int turnsRemaining = (int)(durability%2==1&&wasteNot.stackCount%2==1?Math.ceil(((double)wasteNot.stackCount/2))-1:Math.ceil((double)wasteNot.stackCount/2))+(int)Math.ceil(durability/10); int turnsRemaining = (int)(durability%2==1&&wasteNot.stackCount%2==1?Math.ceil(((double)wasteNot.stackCount/2))-1:Math.ceil((double)wasteNot.stackCount/2))+(int)Math.ceil(durability/10);
int maxHalfTurnsRemaining = durability/5; int maxHalfTurnsRemaining = durability/5;
turnsRemaining = Math.min(maxHalfTurnsRemaining,turnsRemaining); turnsRemaining = Math.min(maxHalfTurnsRemaining,turnsRemaining);
System.out.println("Turns Remaining: "+turnsRemaining);
return turnsRemaining>turnsRequired; return turnsRemaining>turnsRequired;
} }

@ -45,9 +45,6 @@ public class Skill implements SkillInterface{
@Override @Override
public void useSkill(Craft c) { public void useSkill(Craft c) {
c.craft_cp -= CPCost; c.craft_cp -= CPCost;
c.progress_mult=1;
c.quality_mult=1;
c.durability_mult=1;
c.control = c.base_control; c.control = c.base_control;
for (String key : c.BuffList.keySet()) { for (String key : c.BuffList.keySet()) {
if (c.BuffList.get(key).stackCount>0 && !key.equalsIgnoreCase("Inner Quiet") && !key.equalsIgnoreCase("Name of the Elements Has Been Used")) { if (c.BuffList.get(key).stackCount>0 && !key.equalsIgnoreCase("Inner Quiet") && !key.equalsIgnoreCase("Name of the Elements Has Been Used")) {
@ -55,15 +52,20 @@ public class Skill implements SkillInterface{
} }
} }
c.control += c.base_control * 0.2 * c.BuffList.get("Inner Quiet").stackCount; 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;
c.durability_mult = c.BuffList.get("Waste Not").stackCount>0?0.5:1;
c.SkillList.add(this); c.SkillList.add(this);
} }
@Override @Override
public boolean canBeUsed(Craft c) { public boolean canBeUsed(Craft c) {
return c.craft_cp>=CPCost; return c.craft_cp>=CPCost;
}
public void updateBuffs(Craft c) {
c.progress_mult=1;
c.quality_mult=1;
c.durability_mult=1;
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;
c.durability_mult = c.BuffList.get("Waste Not").stackCount>0?0.5:1;
} }
} }

@ -15,9 +15,10 @@ public class BasicSynthesis extends Skill {
@Override @Override
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c);
c.craft_progress += c.base_progress * c.progress_mult * 1.2; c.craft_progress += c.base_progress * c.progress_mult * 1.2;
c.craft_durability -= 10 * c.durability_mult; c.craft_durability -= 10 * c.durability_mult;
super.useSkill(c);
super.updateBuffs(c);
} }
} }

@ -14,10 +14,11 @@ public class BasicTouch extends Skill {
@Override @Override
public void useSkill(Craft c) { public void useSkill(Craft c) {
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_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; c.craft_durability -= 10 * c.durability_mult;
super.useSkill(c);
if (c.BuffList.get("Inner Quiet").stackCount>0) {c.BuffList.get("Inner Quiet").stackCount++;} if (c.BuffList.get("Inner Quiet").stackCount>0) {c.BuffList.get("Inner Quiet").stackCount++;}
super.updateBuffs(c);
} }
} }

@ -15,9 +15,10 @@ public class BrandOfTheElements extends Skill {
@Override @Override
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c);
c.craft_progress += c.base_progress * c.progress_mult * c.BuffList.get("Name of the Elements").getStackCount()>0?((1-(c.craft_progress/c.progress_goal))*2):1; c.craft_progress += c.base_progress * c.progress_mult * c.BuffList.get("Name of the Elements").getStackCount()>0?((1-(c.craft_progress/c.progress_goal))*2):1;
c.craft_durability -= 10 * c.durability_mult; c.craft_durability -= 10 * c.durability_mult;
super.useSkill(c);
super.updateBuffs(c);
} }
} }

@ -15,10 +15,10 @@ public class ByregotsBlessing extends Skill {
@Override @Override
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c);
//TODO Actually implement it.
c.craft_quality += 1 * (c.quality_mult+c.BuffList.get("Inner Quiet").stackCount*0.2) * (0.37*c.control+32.6)*(1-0.05*Math.min(Math.max(c.recipe_level-c.level,0),5)); c.craft_quality += 1 * (c.quality_mult+c.BuffList.get("Inner Quiet").stackCount*0.2) * (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; c.craft_durability -= 10 * c.durability_mult;
if (c.BuffList.get("Inner Quiet").stackCount>0) {c.BuffList.get("Inner Quiet").stackCount++;} super.useSkill(c);
c.BuffList.get("Inner Quiet").stackCount=0;
super.updateBuffs(c);
} }
} }

@ -17,5 +17,6 @@ public class GreatStrides extends Skill {
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c); super.useSkill(c);
c.BuffList.put("Great Strides",new Buff("Great Strides",3)); c.BuffList.put("Great Strides",new Buff("Great Strides",3));
super.updateBuffs(c);
} }
} }

@ -15,9 +15,10 @@ public class HastyTouch extends Skill {
@Override @Override
public void useSkill(Craft c) { public void useSkill(Craft c) {
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_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; c.craft_durability -= 10 * c.durability_mult;
super.useSkill(c);
super.updateBuffs(c);
} }
} }

@ -22,5 +22,6 @@ public class InnerQuiet extends Skill {
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c); super.useSkill(c);
c.BuffList.put("Inner Quiet",new Buff("Inner Quiet",1)); c.BuffList.put("Inner Quiet",new Buff("Inner Quiet",1));
super.updateBuffs(c);
} }
} }

@ -17,5 +17,6 @@ public class Innovation extends Skill {
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c); super.useSkill(c);
c.BuffList.put("Innovation",new Buff("Innovation",4)); c.BuffList.put("Innovation",new Buff("Innovation",4));
super.updateBuffs(c);
} }
} }

@ -17,6 +17,7 @@ public class MastersMend extends Skill {
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c); super.useSkill(c);
c.craft_durability = Math.min(c.durability,c.craft_durability+30); c.craft_durability = Math.min(c.durability,c.craft_durability+30);
super.updateBuffs(c);
} }
} }

@ -23,5 +23,6 @@ public class NameOfTheElements extends Skill {
super.useSkill(c); super.useSkill(c);
c.BuffList.put("Name of the Elements",new Buff("Name of the Elements",3)); c.BuffList.put("Name of the Elements",new Buff("Name of the Elements",3));
c.BuffList.put("Name of the Elements Has Been Used",new Buff("Name of the Elements Has Been Used",1)); c.BuffList.put("Name of the Elements Has Been Used",new Buff("Name of the Elements Has Been Used",1));
super.updateBuffs(c);
} }
} }

@ -15,5 +15,6 @@ public class Observe extends Skill {
@Override @Override
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c); super.useSkill(c);
super.updateBuffs(c);
} }
} }

@ -15,9 +15,10 @@ public class RapidSynthesis extends Skill {
@Override @Override
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c);
c.craft_progress += c.base_progress * c.progress_mult * 2.5; c.craft_progress += c.base_progress * c.progress_mult * 2.5;
c.craft_durability -= 10 * c.durability_mult; c.craft_durability -= 10 * c.durability_mult;
super.useSkill(c);
super.updateBuffs(c);
} }
} }

@ -20,10 +20,11 @@ public class StandardTouch extends Skill {
} else { } else {
CPCost = 32; CPCost = 32;
} }
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_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; c.craft_durability -= 10 * c.durability_mult;
super.useSkill(c);
if (c.BuffList.get("Inner Quiet").stackCount>0) {c.BuffList.get("Inner Quiet").stackCount++;} if (c.BuffList.get("Inner Quiet").stackCount>0) {c.BuffList.get("Inner Quiet").stackCount++;}
super.updateBuffs(c);
} }
} }

@ -21,8 +21,9 @@ public class TricksOfTheTrade extends Skill {
@Override @Override
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c);
c.craft_cp = Math.min(c.cp,c.craft_cp+20); c.craft_cp = Math.min(c.cp,c.craft_cp+20);
super.useSkill(c);
super.updateBuffs(c);
} }
} }

@ -17,5 +17,6 @@ public class Veneration extends Skill {
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c); super.useSkill(c);
c.BuffList.put("Veneration",new Buff("Veneration",4)); c.BuffList.put("Veneration",new Buff("Veneration",4));
super.updateBuffs(c);
} }
} }

@ -18,6 +18,7 @@ public class WasteNot extends Skill {
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c); super.useSkill(c);
c.BuffList.put("Waste Not",new Buff("Waste Not",4)); c.BuffList.put("Waste Not",new Buff("Waste Not",4));
super.updateBuffs(c);
} }
} }

@ -17,5 +17,6 @@ public class WasteNotII extends Skill {
public void useSkill(Craft c) { public void useSkill(Craft c) {
super.useSkill(c); super.useSkill(c);
c.BuffList.put("Waste Not",new Buff("Waste Not",8)); c.BuffList.put("Waste Not",new Buff("Waste Not",8));
super.updateBuffs(c);
} }
} }

Loading…
Cancel
Save