Added more animations

resources/config2/npcs.json

@@ -3,25 +3,25 @@
       {
         "id": "npc_01_default",
         "name": "NPC Default Guard",
-        "animationIdlePath": "resources/w/new_anims/gg_stand_idle003.anim",
-		  "animationWalkPath": "resources/w/new_anims/gg_run003.anim",
+        "animationIdlePath": "resources/w/jam/man_stand_idle002.anim",
+		  "animationWalkPath": "resources/w/jam/man_walk002.anim",
 		  "meshTextures": {
-			"Body":      "resources/w/new_anims/male_packed0_diffuse.png",
-			"Bottoms":   "resources/w/new_anims/male_packed1_diffuse.png",
-			"Eyelashes": "resources/w/new_anims/male_packed0_diffuse.png",
-			"Eyes":      "resources/w/new_anims/male_packed0_diffuse.png",
-			"Eyewear":   "resources/w/new_anims/male_packed0_diffuse.png",
-			"Gloves":    "resources/w/new_anims/male_packed1_diffuse.png",
-			"Hair":      "resources/w/new_anims/male_packed0_diffuse.png",
-			"Shoes":     "resources/w/new_anims/male_packed1_diffuse.png",
-			"Tops":      "resources/w/new_anims/male_packed2_diffuse.png"
+			"Body":      "resources/w/jam/male_packed0_diffuse.png",
+			"Bottoms":   "resources/w/jam/male_packed1_diffuse.png",
+			"Eyelashes": "resources/w/jam/male_packed0_diffuse.png",
+			"Eyes":      "resources/w/jam/male_packed0_diffuse.png",
+			"Eyewear":   "resources/w/jam/male_packed0_diffuse.png",
+			"Gloves":    "resources/w/jam/male_packed1_diffuse.png",
+			"Hair":      "resources/w/jam/male_packed0_diffuse.png",
+			"Shoes":     "resources/w/jam/male_packed1_diffuse.png",
+			"Tops":      "resources/w/jam/male_packed2_diffuse.png"
 		  },
         "positionX": 0.0,
         "positionY": 0.0,
         "positionZ": -10.0,
         "walkSpeed": 1.5,
         "rotationSpeed": 8.0,
-        "modelScale": 0.01,
+        "modelScale": 0.0001,
         "modelCorrectionRotX": 0.0,
         "modelCorrectionRotY": 180.0,
         "modelCorrectionRotZ": 0.0,
@@ -57,9 +57,35 @@
         "modelCorrectionRotY": 180.0,
         "modelCorrectionRotZ": 0.0,
         "interactionRadius": 2.0
+      },
+	  {
+        "id": "npc_03_salesman",
+        "name": "NPC salesman",
+        "animationIdlePath": "resources/w/jam/salesperson_stand_idle003.anim",
+		  "animationWalkPath": "resources/w/jam/salesperson_walk001.anim",
+		  "meshTextures": {
+			"Body":      "resources/w/jam/Salesperson_packed0_diffuse.png",
+			"Bottoms":   "resources/w/jam/Salesperson_packed2_diffuse.png",
+			"Eyelashes": "resources/w/jam/Salesperson_packed0_diffuse.png",
+			"Eyes":      "resources/w/jam/Salesperson_packed0_diffuse.png",
+			"Hats":      "resources/w/jam/Salesperson_packed1_diffuse.png",
+			"Mustashes": "resources/w/jam/Salesperson_packed1_diffuse.png",
+			"Shoes":     "resources/w/jam/Salesperson_packed1_diffuse.png",
+			"Tops":      "resources/w/jam/Salesperson_packed1_diffuse.png"
+		  },
+        "positionX": 1.0,
+        "positionY": 0.0,
+        "positionZ": -7.0,
+        "walkSpeed": 1.5,
+        "rotationSpeed": 8.0,
+        "modelScale": 0.001,
+        "modelCorrectionRotX": 0.0,
+        "modelCorrectionRotY": 180.0,
+        "modelCorrectionRotZ": 0.0,
+        "interactionRadius": 2.0
       },
       {
-        "id": "npc_03_ghost",
+        "id": "npc_04_ghost",
         "name": "NPC Floating Ghost",
         "texturePath": "resources/w/ghost_skin001.png",
         "animationIdlePath": "resources/w/default_float001.anim",

resources/start.lua

@@ -18,15 +18,15 @@ end
 step1()
 
 local function step3x()
-    game_api.npc_walk_to(1, 2.0, 0.0, -27.0, step1x)
+    game_api.npc_walk_to(2, 2.0, 0.0, -27.0, step1x)
 end
 
 local function step2x()
-    game_api.npc_walk_to(1, -1.0, 0.0, -12.0, step3x)
+    game_api.npc_walk_to(2, -1.0, 0.0, -12.0, step3x)
 end
 
 function step1x()
-    game_api.npc_walk_to(1, 2.0, 0.0, -16.0, step2x)
+    game_api.npc_walk_to(2, 2.0, 0.0, -16.0, step2x)
 end
 
 step1x()

src/Location.cpp

@@ -61,9 +61,10 @@ namespace ZL
 		
 		player->loadBinaryAnimation(AnimationState::ACTION_ATTACK, "resources/w/gg/gg_action_chop001.anim", CONST_ZIP_FILE);
 		player->loadBinaryAnimation(AnimationState::ACTION_ATTACK_2, "resources/w/gg/gg_action_stab001.anim", CONST_ZIP_FILE);
-		player->loadBinaryAnimation(AnimationState::ACTION_IDLE, "resources/w/gg/gg_action_idle001.anim", CONST_ZIP_FILE);
+		player->loadBinaryAnimation(AnimationState::ACTION_IDLE, "resources/w/gg/gg_action_idle002.anim", CONST_ZIP_FILE);
 		player->loadBinaryAnimation(AnimationState::ACTION_TO_STAND, "resources/w/gg/new/gg_action_to_stand001.anim", CONST_ZIP_FILE);
 
+
 		player->weaponTexture = std::make_shared<Texture>(CreateTextureDataFromPng("resources/w/white.png", CONST_ZIP_FILE));
 		//player->weaponMesh.AssignFrom(LoadFromTextFile02("resources/w/gg/knife001.txt", CONST_ZIP_FILE));