From d8966696fbbc31d9afedde39026944bd994a5c22 Mon Sep 17 00:00:00 2001
From: nakami <nakami@users.noreply.github.com>
Date: Fri, 29 Dec 2017 19:30:57 +0100
Subject: [PATCH 1/2] Add DLC2 charms

Sprintmaster,
Dreamshield,
Weaversong,
Grimmchild (without Carefree Melody)
added
---
 src/HKSM/app/editor/component/CharmPanel.java | 51 +++++++++++++------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/HKSM/app/editor/component/CharmPanel.java b/src/HKSM/app/editor/component/CharmPanel.java
index 562f174..7b3a84f 100644
--- a/src/HKSM/app/editor/component/CharmPanel.java
+++ b/src/HKSM/app/editor/component/CharmPanel.java
@@ -65,12 +65,17 @@ public class CharmPanel extends JPanel implements Comparable<CharmPanel>  {
 			"Spell Twister",
 			"Deep Focus",
 			"Grubberfly's Elegy",
-			"Void Soul"
+			"Void Soul",
+			// The Grimm Troupe DLC
+			"Sprintmaster",
+			"Dreamshield",
+			"Weaversong",
+			"Grimmchild / Carefree Melody"
 	};
 	
 	public static List<CharmPanel> createCharmPanels(JsonObject playerData, Notches notches, JCheckBox autoCalc, JCheckBox overcharmed){
 		List<CharmPanel> out = new ArrayList<CharmPanel>(); 
-		for( int i = 0; i < 36; i++){
+		for( int i = 0; i < 40; i++){
 			CharmPanel charm = new CharmPanel(i, charmNames[i], playerData, notches, autoCalc, overcharmed);
 			out.add(charm);
 		}
@@ -122,23 +127,39 @@ public CharmPanel(int id, String name, JsonObject playerData, Notches notches, J
 		gbc.gridx = 1;
 		info.add(equipped, gbc);
 		
-		
-		//CHARM_NAME_23_BRK   Fragile Heart (Repair)
-		//CHARM_NAME_24_BRK   Fragile Greed (Repair)
-		//CHARM_NAME_25_BRK   Fragile Strength (Repair)
+
 		if( id == 22 || id == 23 || id == 24){
+			String [] unbrNm = new String[]{"Health", "Greed", "Strength"};
+
 			//Charm is breakable
-			boolean br = playerData.get("brokenCharm_" + s).getAsBoolean();
-			JCheckBox broken = new JCheckBox("", br);
-			broken.setToolTipText("Charm broken");
-			broken.addActionListener(new BoolCheckboxListener(broken, playerData, "brokenCharm_" + s));
+			boolean broken = playerData.get("brokenCharm_" + s).getAsBoolean();
+			JCheckBox brokenBox = new JCheckBox("", broken);
+			brokenBox.setToolTipText("Charm broken");
+			brokenBox.addActionListener(new BoolCheckboxListener(brokenBox,
+					playerData,
+					"brokenCharm_" + s));
+			gbc.gridx = 1;
+			info.add(brokenBox, gbc);
 			gbc.gridx = 2;
-			info.add(broken, gbc);
+
+			//Unbreakable Version
+			boolean nonBreakable = playerData.get("fragile" + unbrNm[id-22] + "_unbreakable").getAsBoolean();
+			JCheckBox nonBreakableBox = new JCheckBox("", nonBreakable);
+			nonBreakableBox.setToolTipText("Unbreakable");
+			nonBreakableBox.addActionListener(new BoolCheckboxListener(nonBreakableBox,
+				playerData,
+				"fragile" + unbrNm[id-22] + "_unbreakable"));
+			info.add(nonBreakableBox, gbc);
 			gbc.gridx = 3;
 		} else {
 			gbc.gridx = 2;
 		}
-		
+
+
+		if( id == 39 ){
+			//TODO: add Box for Charm: Grimmchild -> Carefree Melody
+		}
+
 		//CHARM_NAME_36_A White Fragment
 		//CHARM_NAME_36_B Kingsoul
 		//CHARM_NAME_36_C Void Heart
@@ -169,9 +190,9 @@ public CharmPanel(int id, String name, JsonObject playerData, Notches notches, J
 			gbc.gridx = 5;
 		} else {
 			gbc.gridx = 2;
-		}	
-		
-		
+		}
+
+
 		gbc.weightx = 1;
 		info.add(cost, gbc);
 		

From 05832b9510eca51d51cc81e993ca35b3b4b8ccbb Mon Sep 17 00:00:00 2001
From: nakami <nakami@users.noreply.github.com>
Date: Fri, 29 Dec 2017 19:52:58 +0100
Subject: [PATCH 2/2] Add some items

Pale Ore,
Rancid Eggs,
Simple Keys
added
---
 src/HKSM/app/editor/SaveEditor.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/HKSM/app/editor/SaveEditor.java b/src/HKSM/app/editor/SaveEditor.java
index 832a724..96d3ba6 100644
--- a/src/HKSM/app/editor/SaveEditor.java
+++ b/src/HKSM/app/editor/SaveEditor.java
@@ -85,7 +85,11 @@ public void actionPerformed(ActionEvent e){
 		inventoryEditor.add(new SaveField(json, new String[]{p, "maxHealthBase"}, "HP", SaveField.INTEGER));
 		inventoryEditor.add(new SaveField(json, new String[]{p, "MPReserveMax"}, "MP", SaveField.INTEGER));
 		inventoryEditor.add(new SaveField(json, new String[]{p, "nailDamage"}, "Nail Damage", SaveField.INTEGER));
-		
+
+		inventoryEditor.add(new SaveField(json, new String[]{p, "ore"}, "Pale Ore", SaveField.INTEGER));
+		inventoryEditor.add(new SaveField(json, new String[]{p, "rancidEggs"}, "Rancid Eggs", SaveField.INTEGER));
+		inventoryEditor.add(new SaveField(json, new String[]{p, "simpleKeys"}, "Simple Keys", SaveField.INTEGER));
+
 		inventoryEditor.add(new SaveField(json, new String[]{p, "geo"}, "Geo", SaveField.INTEGER));
 		inventoryEditor.add(new SaveField(json, new String[]{p, "dreamOrbs"}, "Dream Orbs", SaveField.INTEGER));
 		inventoryEditor.add(new SaveField(json, new String[]{p, "permadeathMode"}, "Steel Soul", SaveField.BOOL));