diff --git a/src/main/kotlin/Editors.kt b/src/main/kotlin/Editors.kt index db6a8d6..081bbc8 100644 --- a/src/main/kotlin/Editors.kt +++ b/src/main/kotlin/Editors.kt @@ -205,7 +205,8 @@ enum class Editors(val data: EditorData) { val npcs = if(shopData["npcs"].toString().isNotBlank()) shopData["npcs"].toString() else "" val currency = shopData["currency"].toString().toInt() val highAlch = shopData["high_alch"].toString() == "1" - TableData.shops[id] = TableData.Shop(id,title,stock,npcs,currency,general,highAlch) + val forceShared = shopData.getOrDefault("force_shared", "false").toString().toBoolean() + TableData.shops[id] = TableData.Shop(id,title,stock,npcs,currency,general,highAlch, forceShared) counter++ } @@ -232,6 +233,8 @@ enum class Editors(val data: EditorData) { sh.put("currency",shop.currency.toString()) sh.put("high_alch",if(shop.high_alch) "1" else "0") sh.put("general_store",shop.general_store.toString()) + if (shop.forceShared) + sh.put("force_shared", shop.forceShared.toString()) shs.add(sh) } diff --git a/src/main/kotlin/ShopEdit.kt b/src/main/kotlin/ShopEdit.kt index b38f1bf..80376d7 100644 --- a/src/main/kotlin/ShopEdit.kt +++ b/src/main/kotlin/ShopEdit.kt @@ -14,6 +14,7 @@ class ShopEdit(val shopID: Int) : JFrame("Edit Shop") { val currencyField = JTextField() val generalCheckbox = JCheckBox("General Store") val highAlchCheckbox = JCheckBox("High Alch Prices") + val forceSharedCheckbox = JCheckBox("Force Shared") var model = DefaultTableModel() @@ -86,6 +87,12 @@ class ShopEdit(val shopID: Int) : JFrame("Edit Shop") { shop!!.high_alch = !shop.high_alch } checkPanel.add(highAlchCheckbox) + forceSharedCheckbox.isBorderPaintedFlat = shop?.forceShared ?: false + forceSharedCheckbox.isSelected = shop?.forceShared ?: false + forceSharedCheckbox.addChangeListener { + shop!!.forceShared = !shop.forceShared + } + checkPanel.add(forceSharedCheckbox) val addButton = JButton("Add Item") addButton.addActionListener { diff --git a/src/main/kotlin/ShopList.kt b/src/main/kotlin/ShopList.kt index 502f5b7..0ae1e1c 100644 --- a/src/main/kotlin/ShopList.kt +++ b/src/main/kotlin/ShopList.kt @@ -26,7 +26,7 @@ class ShopList : JFrame("RS09 Shop Editor") { val saveButton = JButton("Save Shops") addButton.addActionListener { val highestID = TableData.shops.keys.toIntArray()[TableData.shops.size - 1] - TableData.shops.put(highestID + 1, TableData.Shop(highestID + 1,"", ArrayList(),"",995,false,false)) + TableData.shops.put(highestID + 1, TableData.Shop(highestID + 1,"", ArrayList(),"",995,false,false,false)) ShopEdit(highestID + 1).open() } saveButton.addActionListener { diff --git a/src/main/kotlin/TableData.kt b/src/main/kotlin/TableData.kt index d5d6194..9e0b837 100644 --- a/src/main/kotlin/TableData.kt +++ b/src/main/kotlin/TableData.kt @@ -7,7 +7,7 @@ import java.lang.StringBuilder import javax.script.ScriptEngineManager object TableData { - class Shop(var id: Int,var title: String,var stock: ArrayList,var npcs: String,var currency: Int,var general_store: Boolean,var high_alch: Boolean) + class Shop(var id: Int,var title: String,var stock: ArrayList,var npcs: String,var currency: Int,var general_store: Boolean,var high_alch: Boolean,var forceShared: Boolean) val tables = ArrayList() val itemNames = hashMapOf() val npcNames = hashMapOf()