Fixed various Pokemon not being marked as implemented when they are, fixed Golem and Lairon legs moving in a hurry

2024-03-18 11:37:24 +10:00
parent 2fee86e7bc
commit 460e8f7501
32 changed files with 111 additions and 25 deletions
@@ -52,7 +52,7 @@ class GolemModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFr
            poseTypes = MOVING_POSES,
            quirks = arrayOf(blink),
            idleAnimations = arrayOf(
-                BipedWalkAnimation(this, periodMultiplier = 1.2F, amplitudeMultiplier = 0.9f),
+                BipedWalkAnimation(this, periodMultiplier = 0.7F, amplitudeMultiplier = 0.6f),
                singleBoneLook(),
                bedrock("golem", "test")
                //bedrock("golem", "ground_walk")
@@ -53,7 +53,7 @@ class LaironModel  (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad
            poseTypes = PoseType.MOVING_POSES,
            quirks = arrayOf(blink),
            idleAnimations = arrayOf(
-                QuadrupedWalkAnimation(this, periodMultiplier = 1.1F),
+                QuadrupedWalkAnimation(this, amplitudeMultiplier = 1.0F, periodMultiplier = 0.7F),
                singleBoneLook(),
                bedrock("lairon", "ground_idle")
            )
@@ -1,4 +1,4 @@
-{
+{
  "implemented": true,
  "name": "Marowak",
  "nationalPokedexNumber": 105,
@@ -1,4 +1,4 @@
-{
+{
  "implemented": true,
  "name": "Heracross",
  "nationalPokedexNumber": 214,
@@ -1,4 +1,5 @@
 {
+  "implemented": true,
  "name": "Cranidos",
  "nationalPokedexNumber": 408,
  "primaryType": "rock",
@@ -1,4 +1,5 @@
 {
+  "implemented": true,
  "name": "Rampardos",
  "nationalPokedexNumber": 409,
  "primaryType": "rock",
@@ -1,4 +1,4 @@
-{
+{
  "implemented": true,
  "name": "Basculin",
  "nationalPokedexNumber": 550,
@@ -1,4 +1,4 @@
-{
+{
  "implemented": true,
  "name": "Darmanitan",
  "nationalPokedexNumber": 555,
@@ -1,4 +1,5 @@
 {
+  "implemented": true,
  "name": "Ferroseed",
  "nationalPokedexNumber": 597,
  "primaryType": "grass",
@@ -1,4 +1,5 @@
 {
+  "implemented": true,
  "name": "Ferrothorn",
  "nationalPokedexNumber": 598,
  "primaryType": "grass",
@@ -1,4 +1,4 @@
-{
+{
  "name": "Landorus",
  "nationalPokedexNumber": 645,
  "primaryType": "ground",
@@ -1,4 +1,4 @@
-{
+{
  "implemented": true,
  "name": "Lilligant",
  "nationalPokedexNumber": 549,
@@ -1,4 +1,4 @@
-{
+{
  "name": "Meloetta",
  "nationalPokedexNumber": 648,
  "primaryType": "normal",
@@ -1,4 +1,4 @@
-{
+{
  "name": "Thundurus",
  "nationalPokedexNumber": 642,
  "primaryType": "electric",
@@ -1,4 +1,4 @@
-{
+{
  "name": "Tornadus",
  "nationalPokedexNumber": 641,
  "primaryType": "flying",
@@ -1,4 +1,4 @@
-{
+{
  "implemented": true,
  "name": "Zoroark",
  "nationalPokedexNumber": 571,
@@ -1,4 +1,4 @@
-{
+{
  "implemented": true,
  "name": "Floette",
  "nationalPokedexNumber": 670,
@@ -1,4 +1,4 @@
-{
+{
  "implemented": true,
  "name": "Goodra",
  "nationalPokedexNumber": 706,
@@ -1,4 +1,4 @@
-{
+{
  "name": "Hoopa",
  "nationalPokedexNumber": 720,
  "primaryType": "psychic",
@@ -1,4 +1,4 @@
-{
+{
  "name": "Zygarde",
  "nationalPokedexNumber": 718,
  "primaryType": "dragon",
@@ -1,4 +1,4 @@
-{
+{
  "implemented": true,
  "name": "Kommo-o",
  "nationalPokedexNumber": 784,
@@ -1,4 +1,4 @@
-{
+{
  "implemented": true,
  "name": "Lurantis",
  "nationalPokedexNumber": 754,
@@ -1,4 +1,4 @@
-{
+{
  "name": "Minior",
  "nationalPokedexNumber": 774,
  "primaryType": "rock",
@@ -1,4 +1,4 @@
-{
+{
  "implemented": true,
  "name": "Salazzle",
  "nationalPokedexNumber": 758,
@@ -1,4 +1,4 @@
-{
+{
  "implemented": true,
  "name": "Copperajah",
  "nationalPokedexNumber": 879,
@@ -1,4 +1,5 @@
 {
+  "implemented": true,
  "name": "Stonjourner",
  "nationalPokedexNumber": 874,
  "primaryType": "rock",
@@ -1,4 +1,4 @@
-{
+{
  "name": "Urshifu",
  "nationalPokedexNumber": 892,
  "primaryType": "fighting",
@@ -1,4 +1,5 @@
 {
+  "implemented": true,
  "name": "Gholdengo",
  "nationalPokedexNumber": 1000,
  "primaryType": "steel",
@@ -100,7 +100,7 @@
    "cobblemon:damp_rock",
    "cobblemon:heat_rock",
    "cobblemon:smooth_rock",
-    "cobblemon:icy_rock"
+    "cobblemon:icy_rock",
    "cobblemon:life_orb",
    "cobblemon:toxic_orb",
    "cobblemon:flame_orb",
@@ -111,11 +111,9 @@
 	"cobblemon:deep_sea_scale",
 	"cobblemon:deep_sea_tooth",
 	"cobblemon:metal_coat",
-	
 	"cobblemon:medicinal_leek",
 	"minecraft:bone",
 	"minecraft:snowball",
-	
 	"#cobblemon:type_gems"
  ]
 }
@@ -0,0 +1,24 @@
+import os
+import codecs
+
+# Specify the directory you want to convert JSON files in
+directory = '../common/src/main/resources/data/cobblemon/species/generation1'
+
+# Get a list of all files in the directory
+files = os.listdir(directory)
+
+# Loop through each file
+for filename in files:
+    # Check if the file is a JSON file
+    if filename.endswith('.json'):
+        # Construct the full file path
+        filepath = os.path.join(directory, filename)
+        
+        # Open the file with 'utf-8-sig' encoding and read its contents
+        with codecs.open(filepath, 'r', 'utf-8-sig') as file:
+            contents = file.read()
+        
+        # Write the contents back to the file with 'utf-8' encoding
+        with codecs.open(filepath, 'w', 'utf-8') as file:
+            file.write(contents)
+print('Done');
@@ -0,0 +1,17 @@
+import re
+
+# Define the path to the PokemonModelRepository.kt file
+repository_file = '../common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt'
+
+# Initialize an empty list to store the Pokemon names
+pokemon_names_in_repository = []
+
+# Open the PokemonModelRepository.kt file
+with open(repository_file, 'r') as file:
+    # Read the file
+    content = file.read()
+    # Find all the Pokemon names mentioned in the inbuilt function
+    pokemon_names_in_repository = re.findall(r'inbuilt\("(.*?)"', content)
+
+# Print the Pokemon names
+print(pokemon_names_in_repository)