Started tiger shark overhaul

hybridlabs · Dec 14, 2024 · 9f74a6f · 9f74a6f
1 parent 60eccab
commit 9f74a6f
Show file tree

Hide file tree

Showing 4 changed files with 162 additions and 129 deletions.
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/shark/TigerSharkEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/shark/TigerSharkEntity.kt
@@ -29,9 +29,9 @@ class TigerSharkEntity(entityType: EntityType<out TigerSharkEntity>, world: Worl
         fun createMobAttributes(): DefaultAttributeContainer.Builder {
             return WaterCreatureEntity.createMobAttributes()
                 .add(EntityAttributes.GENERIC_MAX_HEALTH, 54.0)
-                .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.9)
+                .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.8)
                 .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 8.0)
-                .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 26.0)
+                .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 16.0)
         }
     }
 

diff --git a/src/main/resources/assets/hybrid-aquatic/animations/tiger_shark.animation.json b/src/main/resources/assets/hybrid-aquatic/animations/tiger_shark.animation.json
@@ -1,145 +1,170 @@
 {
 	"format_version": "1.8.0",
 	"animations": {
-		"misc.sit": {
-			"loop": true,
-			"animation_length": 2,
-			"bones": {
-				"body": {
-					"rotation": [2.5, 0, 0],
-					"position": [0, -1, 0]
-				},
-				"head": {
-					"rotation": [-5, 0, 0]
-				},
-				"body_2": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"tail": {
-					"rotation": [-7.5, 0, 0]
-				},
-				"mouth": {
-					"rotation": [0, 0, 0]
-				}
-			}
-		},
 		"move.swim": {
 			"loop": true,
-			"animation_length": 2,
 			"bones": {
 				"body": {
-					"rotation": {
-						"vector": [0, "Math.cos(query.anim_time * 180)*-5", 0]
-					}
-				},
-				"body_2": {
-					"rotation": {
-						"vector": [0, "Math.sin(query.anim_time * 180)*-10", 0]
-					}
+					"rotation": [0, "Math.cos(query.anim_time * 90)*-10", "Math.cos(query.anim_time * 90)*-2.5"]
 				},
 				"right_back_fin": {
-					"rotation": {
-						"vector": [0, "22.5+Math.cos(query.anim_time * 180)*-5", -22.5]
-					}
+					"rotation": [0, "22.5+Math.cos(query.anim_time * 180)*-5", -22.5]
 				},
 				"body_3": {
-					"rotation": {
-						"vector": [0, "Math.sin(query.anim_time * 180)*-10", 0]
-					}
+					"rotation": [0, "Math.sin(query.anim_time * 360)*-10", 0]
 				},
 				"tail": {
-					"rotation": {
-						"vector": [0, "Math.sin(query.anim_time * 180)*-15", 0]
-					}
+					"rotation": [0, "Math.sin(query.anim_time * 90)*-20", 0]
 				},
 				"head": {
-					"rotation": {
-						"vector": [0, "Math.sin(query.anim_time * 180)*5", 0]
-					}
+					"rotation": [0, "Math.sin(query.anim_time * 90)*15", 0]
 				},
 				"mouth": {
-					"rotation": {
-						"vector": ["5+Math.cos(query.anim_time * 180)*5", 0, 0]
-					}
+					"rotation": ["5+Math.cos(query.anim_time * 180)*5", 0, 0]
 				},
 				"right_fin": {
-					"rotation": {
-						"vector": [0, "22.5+Math.sin(query.anim_time * 180)*-5", -22.5]
-					}
+					"rotation": [-3.28397, "12.0676+Math.sin(query.anim_time * 90)*-12.5", "-37.8472+Math.cos(query.anim_time * 90)*12.5"]
 				},
 				"left_back_fin": {
-					"rotation": {
-						"vector": [0, "-22.5+Math.cos(query.anim_time * 180)*5", 22.5]
-					}
+					"rotation": [0, "-22.5+Math.cos(query.anim_time * 180)*5", 22.5]
 				},
 				"left_fin": {
-					"rotation": {
-						"vector": [0, "-22.5+Math.sin(query.anim_time * 180)*-5", 22.5]
-					}
+					"rotation": [-3.28397, "-12.0676+Math.sin(query.anim_time * 90)*-12.5", "37.8472+Math.cos(query.anim_time * 90)*12.5"]
+				},
+				"tail_fin": {
+					"rotation": [0, "Math.sin(query.anim_time * 90)*-15", 0]
+				},
+				"body_2": {
+					"rotation": [0, "Math.sin(query.anim_time * 90)*-15", 0]
 				}
 			}
 		},
 		"move.run": {
 			"loop": true,
-			"animation_length": 1,
 			"bones": {
 				"body": {
-					"rotation": {
-						"vector": [0, "Math.cos(query.anim_time * 360)*-5", 0]
-					}
-				},
-				"body_2": {
-					"rotation": {
-						"vector": [0, "Math.sin(query.anim_time * 360)*-10", 0]
-					}
-				},
-				"right_back_fin": {
-					"rotation": {
-						"vector": [0, "22.5+Math.cos(query.anim_time * 360)*-5", -22.5]
-					}
-				},
-				"body_3": {
-					"rotation": {
-						"vector": [0, "Math.sin(query.anim_time * 360)*-10", 0]
-					}
+					"rotation": [0, "Math.cos(query.anim_time * 180)*-5", "Math.cos(query.anim_time * 180)*-5"]
 				},
 				"tail": {
-					"rotation": {
-						"vector": [0, "Math.sin(query.anim_time * 360)*-15", 0]
-					}
+					"rotation": [0, "Math.sin(query.anim_time * 180)*-20", 0]
 				},
 				"head": {
-					"rotation": {
-						"vector": [0, "Math.sin(query.anim_time * 360)*5", 0]
-					}
+					"rotation": [0, "Math.sin(query.anim_time * 180)*15", 0]
 				},
 				"mouth": {
-					"rotation": {
-						"vector": [45, 0, 0]
-					}
+					"rotation": [7.5, 0, 0]
 				},
 				"right_fin": {
+					"rotation": [-3.28397, "12.0676+Math.sin(query.anim_time * 180)*-12.5", "-37.8472+Math.cos(query.anim_time * 180)*12.5"]
+				},
+				"left_back_fin": {
+					"rotation": [0, "-22.5+Math.cos(query.anim_time * 360)*5", 22.5]
+				},
+				"left_fin": {
+					"rotation": [-3.28397, "-12.0676+Math.sin(query.anim_time * 180)*-12.5", "37.8472+Math.cos(query.anim_time * 180)*12.5"]
+				},
+				"tail_fin": {
+					"rotation": [0, "Math.sin(query.anim_time * 180)*-15", 0]
+				},
+				"body_2": {
+					"rotation": [0, "Math.sin(query.anim_time * 180)*-15", 0]
+				}
+			}
+		},
+		"attack.bite": {
+			"animation_length": 0.75,
+			"bones": {
+				"mouth": {
 					"rotation": {
-						"vector": [0, "22.5+Math.sin(query.anim_time * 360)*-5", -22.5]
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [45, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
 					}
 				},
-				"left_back_fin": {
+				"body": {
 					"rotation": {
-						"vector": [0, "-22.5+Math.cos(query.anim_time * 360)*5", 22.5]
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [-15, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [7.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
+					},
+					"position": {
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [0, 5, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
 					}
 				},
-				"left_fin": {
+				"head": {
 					"rotation": {
-						"vector": [0, "-22.5+Math.sin(query.anim_time * 360)*-5", 22.5]
+						"0.0": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.2083": {
+							"post": [-12.5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.5": {
+							"post": [5, 0, 0],
+							"lerp_mode": "catmullrom"
+						},
+						"0.75": {
+							"post": [0, 0, 0],
+							"lerp_mode": "catmullrom"
+						}
 					}
 				}
 			}
 		},
-		"attack.bite": {
-			"animation_length": 0.5,
+		"misc.sit": {
+			"loop": true,
+			"animation_length": 2,
 			"bones": {
+				"body": {
+					"rotation": [2.5, 0, 0],
+					"position": [0, -1, 0]
+				},
+				"head": {
+					"rotation": [-5, 0, 0]
+				},
+				"body_2": {
+					"rotation": [-7.5, 0, 0]
+				},
+				"tail": {
+					"rotation": [-7.5, 0, 0]
+				},
 				"mouth": {
-					"rotation": ["30+Math.cos(query.anim_time * 720)*-30", 0, 0]
+					"rotation": [0, 0, 0]
 				}
 			}
 		}