2009Scape/rs09-json-editor
1
0
Fork 0
mirror of https://gitlab.com/2009scape/tools/rs09-thanos-tool.git synced 2026-08-01 14:39:20 -06:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-charms' into 'master'

Browse source 
Correctly load "Nothing" entries in charm drop tables.

See merge request 2009scape/rs09-thanos-tool!1
This commit is contained in:
Ceikry 2021-12-26 18:04:21 +00:00
commit 4a6b19af30
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/Editors.kt
View file

@ -21,7 +21,7 @@ enum class Editors(val data: EditorData) {
table.ids = dropTable["ids"].toString()
parseTable(dropTable["main"] as JSONArray,table,false)
parseTable(dropTable["default"] as JSONArray,table,true)
parseTable(dropTable["charm"] as JSONArray,table,false)
parseTable(dropTable["charm"] as JSONArray,table.charmTable,false)
table.description = (dropTable["description"] ?: "").toString()
TableData.tables.add(table)
counter++

4
src/main/kotlin/FileLoader.kt
View file

@ -36,7 +36,7 @@ object FileLoader{
table.ids = dropTable["ids"].toString()
parseTable(dropTable["main"] as JSONArray,table,false)
parseTable(dropTable["default"] as JSONArray,table,true)
parseTable(dropTable["charm"] as JSONArray,table,false)
parseTable(dropTable["charm"] as JSONArray,table.charmTable,false)
table.description = (dropTable["description"] ?: "").toString()
TableData.tables.add(table)
counter++
@ -103,4 +103,4 @@ class NPCDropTable() : WeightBasedTable(){
}
return super.add(element)
}
}
}