function_tweaks and striped basculin details.

Author: Waterpicker

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

@@ -75,15 +75,13 @@ object GenerationsMolangFunctions {
                         val feature = pokemon.getOrCreateFeature(featureName) ?: return@Function DoubleValue.ZERO
 
                         when (feature) {
-                            is StringSpeciesFeature -> it.getStringOrNull(1)?.also {
-                                feature.value = it
-                            }?.also {
-                                feature.apply(pokemon)
-                            } ?: return@Function StringValue(feature.value)
+                            is StringSpeciesFeature -> it.getStringOrNull(1)?.also { feature.value = it }?.also { feature.apply(pokemon) }
                             is FlagSpeciesFeature -> it.getBooleanOrNull(1)?.also { feature.enabled = it }?.also { feature.apply(pokemon) }
                             is IntSpeciesFeature -> it.getIntOrNull(1)?.also { feature.value = it }?.also { feature.apply(pokemon) }
-                            else -> return@Function DoubleValue.ZERO
+                            else -> {}
                         }
+
+                        DoubleValue.ZERO
                     },
 
                     "remove_rotom_move" to Function {

common/src/main/java/generations/gg/generations/core/generationscore/common/util/PokemonFunctions.kt

@@ -129,7 +129,7 @@ private fun Stat.color(): String {
 }
 
 private fun String.properCase(): String {
-    return this.get(0) + this.substring(1).toLowerCase()
+    return this.get(0) + this.substring(1).lowercase()
 }
 
 fun MutableList<Component>.add(pokemon: Pokemon) {

common/src/main/resources/data/generations_core/species_additions/generation5/basculin.json

@@ -1,5 +1,5 @@
 {
-    "target": "cobblemon:basculin_bluestriped",
+    "target": "cobblemon:basculin",
     "behaviour": {
         "moving": {
             "swim": {

common/src/main/resources/data/generations_core/species_feature_assignments/striped.json

@@ -0,0 +1,4 @@
+{
+  "pokemon": ["basculin"],
+  "features": ["striped"]
+}

common/src/main/resources/data/generations_core/species_features/striped.json

@@ -0,0 +1,14 @@
+{
+  "type": "choice",
+  "keys": [
+    "striped"
+  ],
+  "default": "random",
+  "choices": [
+    "blue",
+    "white",
+    "red"
+  ],
+  "isAspect": true,
+  "aspectFormat": "{{choice}}striped"
+}