add: warrior & CharacterMode

assets/pack/pc/shaman_m/motions.json

@@ -1,57 +1,168 @@
 {
-    "groups": [
-      {
-        "name": "WAIT",
-        "motions": [
-          {
-            "file": "wait",
-            "probability": 70
-          },
-          {
-            "file": "wait_1",
-            "probability": 30
-          }
-        ]
-      },
-      {
-        "name": "RUN",
-        "motions": [
-          {
-            "file": "run",
-            "probability": 100
-          }
-        ]
-      },
-      {
-        "name": "ATTACK",
-        "motions": [
-          {
-            "file": "attack",
-            "probability": 50
-          },
-          {
-            "file": "attack_1",
-            "probability": 50
-          }
-        ]
-      },
-      {
-        "name": "FAN_WAIT",
-        "motions": [
-          {
-            "file": "fan/wait",
-            "probability": 100
-          }
-        ]
-      },
-      {
-        "name": "FAN_RUN",
-        "motions": [
-          {
-            "file": "fan/run",
-            "probability": 100
-          }
-        ]
-      }
-    ]
+  "groups": [
+    {
+      "name": "WAIT",
+      "motions": [
+        {
+          "file": "wait",
+          "probability": 70
+        },
+        {
+          "file": "wait_1",
+          "probability": 30
+        }
+      ]
+    },
+    {
+      "name": "RUN",
+      "motions": [
+        {
+          "file": "run",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "ATTACK",
+      "motions": [
+        {
+          "file": "attack",
+          "probability": 50
+        },
+        {
+          "file": "attack_1",
+          "probability": 50
+        }
+      ]
+    },
+    {
+      "name": "FAN_WAIT",
+      "motions": [
+        {
+          "file": "fan/wait",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "FAN_RUN",
+      "motions": [
+        {
+          "file": "fan/run",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "BELL_WALK",
+      "motions": [
+        {
+          "file": "bell/walk",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "BELL_RUN",
+      "motions": [
+        {
+          "file": "bell/run",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "BELL_WAIT",
+      "motions": [
+        {
+          "file": "bell/wait",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "BELL_COMBO_1",
+      "motions": [
+        {
+          "file": "bell/combo_01",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "BELL_COMBO_2",
+      "motions": [
+        {
+          "file": "bell/combo_02",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "BELL_COMBO_3",
+      "motions": [
+        {
+          "file": "bell/combo_03",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "BELL_COMBO_4",
+      "motions": [
+        {
+          "file": "bell/combo_04",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "BELL_COMBO_5",
+      "motions": [
+        {
+          "file": "bell/combo_05",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "BELL_COMBO_6",
+      "motions": [
+        {
+          "file": "bell/combo_06",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "BELL_COMBO_7",
+      "motions": [
+        {
+          "file": "bell/combo_07",
+          "probability": 100
+        }
+      ]
+    },
+    {
+      "name": "BELL_DAMAGE",
+      "motions": [
+        {
+          "file": "bell/damage",
+          "probability": 25
+        },
+        {
+          "file": "bell/damage_1",
+          "probability": 25
+        },
+        {
+          "file": "bell/damage_2",
+          "probability": 25
+        },
+        {
+          "file": "bell/damage_3",
+          "probability": 25
+        }
+      ]
+    }
+  ]
 }

assets/pack/pc/warrior_m/motions.json

@@ -0,0 +1,143 @@
+{
+    "groups": [
+      {
+        "name": "GENERAL_WAIT",
+        "motions": [
+          {
+            "file": "general/wait",
+            "probability": 70
+          },
+          {
+            "file": "general/wait",
+            "probability": 30
+          }
+        ]
+      },
+      {
+        "name": "GENERAL_RUN",
+        "motions": [
+          {
+            "file": "general/run",
+            "probability": 100
+          }
+        ]
+      },
+      {
+        "name": "GENERAL_ATTACK",
+        "motions": [
+          {
+            "file": "general/attack",
+            "probability": 50
+          },
+          {
+            "file": "general/attack_1",
+            "probability": 50
+          }
+        ]
+      },
+      {
+        "name": "ONEHANDSWORD_WAIT",
+        "motions": [
+          {
+            "file": "onehand_sword/wait",
+            "probability": 70
+          },
+          {
+            "file": "onehand_sword/wait_1",
+            "probability": 30
+          }
+        ]
+      },
+      {
+        "name": "ONEHANDSWORD_RUN",
+        "motions": [
+          {
+            "file": "onehand_sword/run",
+            "probability": 100
+          }
+        ]
+      },
+      {
+        "name": "ONEHANDSWORD_WALK",
+        "motions": [
+          {
+            "file": "onehand_sword/walk",
+            "probability": 100
+          }
+        ]
+      },
+      {
+        "name": "ONEHANDSWORD_DAMAGE",
+        "motions": [
+          {
+            "file": "onehand_sword/damage",
+            "probability": 25
+          },
+          {
+            "file": "onehand_sword/damage_1",
+            "probability": 25
+          },
+          {
+            "file": "onehand_sword/damage_2",
+            "probability": 25
+          },
+          {
+            "file": "onehand_sword/damage_3",
+            "probability": 25
+          }
+        ]
+      },
+      {
+        "name": "TWOHANDSWORD_WAIT",
+        "motions": [
+          {
+            "file": "twohand_sword/wait",
+            "probability": 70
+          },
+          {
+            "file": "twohand_sword/wait_1",
+            "probability": 30
+          }
+        ]
+      },
+      {
+        "name": "TWOHANDSWORD_RUN",
+        "motions": [
+          {
+            "file": "twohand_sword/run",
+            "probability": 100
+          }
+        ]
+      },
+      {
+        "name": "TWOHANDSWORD_WALK",
+        "motions": [
+          {
+            "file": "twohand_sword/walk",
+            "probability": 100
+          }
+        ]
+      },
+      {
+        "name": "TWOHANDSWORD_DAMAGE",
+        "motions": [
+          {
+            "file": "twohand_sword/damage",
+            "probability": 25
+          },
+          {
+            "file": "twohand_sword/damage_1",
+            "probability": 25
+          },
+          {
+            "file": "twohand_sword/damage_2",
+            "probability": 25
+          },
+          {
+            "file": "twohand_sword/damage_3",
+            "probability": 25
+          }
+        ]
+      }
+    ]
+}

src/modules/assets/gltf_loader.rs

@@ -192,8 +192,8 @@ fn extract_skeleton(
                             )
                         );
                         match name {
-                            "equip_left" => skeleton.equip_left = Some(skeleton.bones.len() - 1),
-                            "equip_right" => skeleton.equip_right = Some(skeleton.bones.len() - 1),
+                            "equip_left" | "equip_left_hand" => skeleton.equip_left = Some(skeleton.bones.len() - 1),
+                            "equip_right" | "equip_right_hand" => skeleton.equip_right = Some(skeleton.bones.len() - 1),
                             _ => (),
                         };
                     }