Fixed Kyruem fusion and defusion with dna splicer

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/api/GenerationsMolangFunctions.kt

@@ -123,9 +123,7 @@ object GenerationsMolangFunctions {
         }
 
         MoLangFunctions.playerFunctions.add { player ->
-            Struct
-
-            var selected = player.inventory.removeFromSelected(selected
+            var selected = player.inventory.selected;
             hashMapOf(
                 "capped" to Function<MoParams, Any> {
                     val speciesKey = it.getStringOrNull(0)?.let { SpeciesKey.fromString(it) }
@@ -135,8 +133,13 @@ object GenerationsMolangFunctions {
                     return@Function DoubleValue(if (GenerationsCore.CONFIG.caught.capped(player, speciesKey)) 1.0 else 0.0)
                 },
                 "main_hand" to Function<MoParams, Any> {
-                    player.inventory.get.mainHandItem.toMolang()
+                    player.mainHandItem.toMolang()
+                },
+                "selected_item" to Function<MoParams, Any> {
+                    player.inventory.getItem(selected).toMolang()
                 },
+
+
                 "party" to Function<MoParams, Any> {
                     player.party().asMoLangValue()
                 },

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/DnaSplicer.kt

@@ -58,6 +58,23 @@ class DnaSplicer(properties: Properties): PokemonStoringItem(properties) {
 
                 player.sendSystemMessage("generations_core.pokemon.extracted_dna_fiber_succeed".asTranslated(pokemon.getDisplayName().string))
 
+                return true
+            } else if(pokemon.isSpecies("kyurem")) {
+                val dembeded: Pokemon = entity.pokemon.dembedPokemon()?.also { player.party().add(it) } ?: return false
+
+                val provider = entity.pokemon.getProviderOrNull<ChoiceSpeciesFeatureProvider>("kyurem_form") ?: return false
+                val feature = provider.getOrCreate(entity.pokemon)
+
+                feature.value = "false"
+                feature.apply(entity)
+
+                player.sendSystemMessage(
+                    "generations_core.pokemon.defused".asTranslated(
+                        dembeded.getDisplayName().string,
+                        pokemon.getDisplayName().string
+                    )
+                )
+
                 return true
             }
         } else if (pokemon.isSpecies("kyurem")) {
@@ -91,20 +108,6 @@ class DnaSplicer(properties: Properties): PokemonStoringItem(properties) {
 
                     return true
                 }
-            } else {
-                val dembeded: Pokemon = entity.pokemon.dembedPokemon()?.also { player.party().add(it) } ?: return false
-
-                feature.value = "false"
-                feature.apply(entity)
-
-                player.sendSystemMessage(
-                    "generations_core.pokemon.defused".asTranslated(
-                        pokemon.getDisplayName().string,
-                        dembeded.getDisplayName().string
-                    )
-                )
-
-                return true
             }
         }
 

common/src/main/resources/data/generations_core/dialogues/zygarde_cell.json

@@ -15,24 +15,25 @@
         "Select what you want to do.",
         {
           "type": "expression",
-          "expression": "'You currently have ' + q.player.main_hand.damage_as_string + ' cells available."
+          "expression": "'You currently have ' + q.player.selected_item.damage_as_string + ' cells available."
         }
       ],
       "input": {
         "type": "option",
         "options": [
           {
             "text": "Create",
-            "isVisible": "q.player.capped('cobblemon:zygarde')",
+            "isVisible": "q.player.capped('cobblemon:zygarde') && q.player.selected_item.damage >= 10",
             "action": [
-              "v.cells = q.player.main_hand.damage;",
+              "v.cells = q.player.selected_item.damage;",
               "q.dialogue.set_page('form');"
             ]
           },
           {
-            "text": "Modify",
+            "text": "No actions available",
+            "isVisible": "(!q.player.has_in_party('cobblemon:zygarde') || !q.player.capped('cobblemon:zygarde')) && q.player.selected_item.damage < 10",
             "action": [
-              "v.cells = q.player.main_hand.damage;"
+              "q.dialogue.close();"
             ]
           }
         ]
@@ -57,12 +58,12 @@
             ]
           },
           {
-            "text": "50",
+            "text": "50%",
             "value": "50",
             "isVisible": "v.cells >= 10",
             "action": [
               "v.form = '50%';",
-              "v.cells_needed = 10;",
+              "v.cells_needed = 50;",
               "q.dialogue.set_page('ability');"
             ]
           }
@@ -93,7 +94,7 @@
             "action": [
               "v.ability = 'powerconstruct';",
               "v.ability_name = 'Power Construct';",
-              "v.cells_needed = 100",
+              "v.cells_needed = 100;",
               "q.dialogue.set_page('create_congrats');"
             ]
           }
@@ -116,7 +117,7 @@
         "allowSkip": false,
         "delay": 1,
         "action": [
-          "q.player.main_hand.damage(v.cells_needed);",
+          "q.player.selected_item.damage(-v.cells_needed);",
           "q.player.party.add('zygarde lvl=70 zygarde_form=' + v.form + ' ability=' + v.ability);",
           "q.dialogue.close();"
         ]