Merge pull request #38 from way-zer/3.0

fix UnlockableContent.Stats
way-zer · Feb 23, 2024 · d8b1139 · d8b1139
2 parents a09bb0c + 39bfedd
commit d8b1139
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/kotlin/cf/wayzer/contentsTweaker/resolvers/MindustryContentsResolver.kt b/src/main/kotlin/cf/wayzer/contentsTweaker/resolvers/MindustryContentsResolver.kt
@@ -54,8 +54,9 @@ object MindustryContentsResolver : ContentsTweaker.NodeCollector {
                 +CTNode.ObjInfo(it)
                 +CTNode.AfterHandler {
                     if (it is UnlockableContent) {
-                        it.stats = Stats()
-                        it.setStats()
+                        it.stats = Stats().apply {
+                            useCategories = it.stats.useCategories
+                        }
                     }
                     if (it is Block) {
                         it.barMap.clear()

diff --git a/src/main/kotlin/cf/wayzer/contentsTweaker/resolvers/UIExtResolver.kt b/src/main/kotlin/cf/wayzer/contentsTweaker/resolvers/UIExtResolver.kt
@@ -118,7 +118,10 @@ object UIExtResolver : ContentsTweaker.NodeCollector {
     private fun CTNodeTypeChecked<Table>.extendTable() {
         val obj = objInfo.obj
         node.getOrCreate("cellDefaults") += CTNode.ObjInfo(obj.defaults())
-        node.getOrCreate("row") += CTNode.Modifier { obj.row() }
+        node.getOrCreate("row") += CTNode.Modifier {
+            if (obj.cells.peek()?.isEndRow == false)
+                obj.row()
+        }
         node.getOrCreate("align") += CTNode.Modifier {
             val v = if (it.isNumber) it.asInt() else alignMap[it.asString()] ?: error("invalid align: $it")
             obj.align(v)