Fixed a tm and made progress towards zygarde cube.

Waterpicker · Waterpicker · commit cdcf075b3b4f · 2025-02-22T05:57:19.000-06:00
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/api/GenerationsMolangFunctions.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/api/GenerationsMolangFunctions.kt
@@ -104,7 +104,12 @@ object GenerationsMolangFunctions {
                         it.getDoubleOrNull(0)?.
                         toInt()?.let {
                             party.get(it)
-                        }?.asMoLangValue() ?: DoubleValue(0.0) }
+                        }?.asMoLangValue() ?: DoubleValue(0.0) },
+                    "add" to java.util.function.Function {
+                        it.getStringOrNull(0)?.toProperties()?.also { party.add(it.create()) }
+
+                        return@Function Unit
+                    }
                 )
             })
 
@@ -118,6 +123,9 @@ object GenerationsMolangFunctions {
         }
 
         MoLangFunctions.playerFunctions.add { player ->
+            Struct
+
+            var selected = player.inventory.removeFromSelected(selected
             hashMapOf(
                 "capped" to Function<MoParams, Any> {
                     val speciesKey = it.getStringOrNull(0)?.let { SpeciesKey.fromString(it) }
@@ -127,7 +135,7 @@ object GenerationsMolangFunctions {
                     return@Function DoubleValue(if (GenerationsCore.CONFIG.caught.capped(player, speciesKey)) 1.0 else 0.0)
                 },
                 "main_hand" to Function<MoParams, Any> {
-                    player.mainHandItem.toMolang()
+                    player.inventory.get.mainHandItem.toMolang()
                 },
                 "party" to Function<MoParams, Any> {
                     player.party().asMoLangValue()
@@ -239,6 +247,9 @@ private fun ItemStack.toMolang(): ObjectValue<ItemStack> {
         "damage" to Function<MoParams, Any> {
             val value = it.getIntOrNull(0) ?: return@Function DoubleValue(this.damageValue)
             this.damageValue += value
+        },
+        "damage_as_string" to Function<MoParams, Any> {
+            return@Function StringValue(this.damageValue.toString())
         }
     ))
 }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt
@@ -344,7 +344,7 @@ object GenerationsItems {
     @JvmField val TM_207 = registerTmRegular("tm_207", "temperflare")
     @JvmField val TM_208 = registerTmRegular("tm_208", "whirlpool")
     @JvmField val TM_209 = registerTmRegular("tm_209", "muddywater")
-    @JvmField val TM_210 = registerTmRegular("tm_210", "supercellslame")
+    @JvmField val TM_210 = registerTmRegular("tm_210", "supercellslam")
     @JvmField val TM_211 = registerTmRegular("tm_211", "electroweb")
     @JvmField val TM_212 = registerTmRegular("tm_212", "tripleaxel")
     @JvmField val TM_213 = registerTmRegular("tm_213", "coaching")
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/ZygardeCubeItem.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/ZygardeCubeItem.kt
@@ -21,9 +21,9 @@ class ZygardeCubeItem(properties: Properties) : Item(properties), LangTooltip {
         tooltipComponents: MutableList<Component>,
         isAdvanced: TooltipFlag
     ) {
-        tooltipComponents.add(Component.translatable("item.zygarde_cell.tooltip"))
-        tooltipComponents.add(Component.translatable("item.zygarde_cell.tooltip.lore1"))
-        tooltipComponents.add(Component.translatable("item.zygarde_cell.tooltip.lore2", stack.damageValue, stack.maxDamage))
+        tooltipComponents.add(Component.translatable("item.generations_core.zygarde_cube.tooltip"))
+        tooltipComponents.add(Component.translatable("item.generations_core.zygarde_cube.lore1"))
+        tooltipComponents.add(Component.translatable("item.generations_core.zygarde_cube.lore2", stack.damageValue, stack.maxDamage))
 //        LangTooltip.appendHoverText(stack, level, tooltipComponents, isAdvanced)
     }
 
diff --git a/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json b/common/src/main/resources/data/cobblemon/species/generation6/zygarde.json
@@ -150,7 +150,7 @@
   "evolutions": [],
   "forms": [
     {
-      "name": "10%",
+      "name": "Zygarde-10%",
       "primaryType": "dragon",
       "secondaryType": "ground",
       "abilities": [
@@ -209,7 +209,7 @@
       "battleOnly": false
     },
     {
-      "name": "10% complete",
+      "name": "Zygarde-Complete",
       "primaryType": "dragon",
       "secondaryType": "ground",
       "abilities": [
@@ -254,7 +254,7 @@
       "battleOnly": true
     },
     {
-      "name": "50% complete",
+      "name": "Zygarde-Complete",
       "primaryType": "dragon",
       "secondaryType": "ground",
       "abilities": [
diff --git a/common/src/main/resources/data/generations_core/dialogues/zygarde_cell.json b/common/src/main/resources/data/generations_core/dialogues/zygarde_cell.json
@@ -15,15 +15,26 @@
         "Select what you want to do.",
         {
           "type": "expression",
-          "expression": "'You currently have ' + q.player.main_hand.damage + ' cells available."
+          "expression": "'You currently have ' + q.player.main_hand.damage_as_string + ' cells available."
         }
       ],
       "input": {
         "type": "option",
-        "allowSkip": false,
-        "delay": 1,
-        "action": [
-          "v.cells = q.player.main_hand.damage;"
+        "options": [
+          {
+            "text": "Create",
+            "isVisible": "q.player.capped('cobblemon:zygarde')",
+            "action": [
+              "v.cells = q.player.main_hand.damage;",
+              "q.dialogue.set_page('form');"
+            ]
+          },
+          {
+            "text": "Modify",
+            "action": [
+              "v.cells = q.player.main_hand.damage;"
+            ]
+          }
         ]
       }
     },
@@ -38,23 +49,78 @@
           {
             "text": "10%",
             "value": "10",
-            "isVisible": "q.cells >= 10",
+            "isVisible": "v.cells >= 10",
             "action": [
               "v.form = '10%';",
-              "q.dialogue.close();"
+              "v.cells_needed = 10;",
+              "q.dialogue.set_page('ability');"
             ]
           },
           {
             "text": "50",
             "value": "50",
-            "isVisible": "q.cells >= 10",
+            "isVisible": "v.cells >= 10",
             "action": [
               "v.form = '50%';",
-              "q.dialogue.close();"
+              "v.cells_needed = 10;",
+              "q.dialogue.set_page('ability');"
             ]
           }
         ]
       }
+    },
+    {
+      "id": "ability",
+      "lines": [
+        "Which ability should your new Zygarde have?"
+      ],
+      "input": {
+        "type": "option",
+        "options": [
+          {
+            "text": "Aura Break",
+            "value": "aurabreak",
+            "action": [
+              "v.ability = 'aurabreak';",
+              "v.ability_name = 'Aura Break';",
+              "q.dialogue.set_page('create_congrats');"
+            ]
+          },
+          {
+            "text": "Power Construct",
+            "value": "powerconstruct",
+            "isVisible": "v.cells >= (100 - v.cell_needed)",
+            "action": [
+              "v.ability = 'powerconstruct';",
+              "v.ability_name = 'Power Construct';",
+              "v.cells_needed = 100",
+              "q.dialogue.set_page('create_congrats');"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "id": "create_congrats",
+      "allowSkip": false,
+      "lines": [
+        "Congradulations!",
+        {
+          "type": "expression",
+          "expression": "'You created have created a ' + v.form + ' zygarde with the ability ' + v.ability_name + '."
+        },
+        "It was added to your party."
+      ],
+      "input": {
+        "type": "auto-continue",
+        "allowSkip": false,
+        "delay": 1,
+        "action": [
+          "q.player.main_hand.damage(v.cells_needed);",
+          "q.player.party.add('zygarde lvl=70 zygarde_form=' + v.form + ' ability=' + v.ability);",
+          "q.dialogue.close();"
+        ]
+      }
     }
   ]
 }
diff --git a/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/lang/GeneralLang.java b/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/lang/GeneralLang.java
@@ -174,7 +174,7 @@ protected void addTranslations() {
         add("painting.generations_core.blue_poster.author.author", "Pokemon");
         add("painting.generations_core.blue_poster.title.title", "Blue Poster");
         add("painting.generations_core.blue_poster_sprite.author", "Pokemon");
-        add("painting.generations_core.blue_poster_sprite.title", "Blue Poster SPrite");
+        add("painting.generations_core.blue_poster_sprite.title", "Blue Poster Sprite");
         add("painting.generations_core.blue_scroll.author", "Pokemon");
         add("painting.generations_core.blue_scroll.title", "Blue Scroll");
         add("painting.generations_core.clefairy_poster_sprite.author", "Pokemon");
