Skip to content

Commit

Permalink
Animation work
Browse files Browse the repository at this point in the history 
Texture work
Model work
Giant clams give black pearls 25% of the time
  • Loading branch information
@MysticKoko
MysticKoko committed Feb 15, 2024
1 parent 87ec245 commit f388d63
Show file tree
Hide file tree
Showing 24 changed files with 1,407 additions and 873 deletions.
6 changes: 5 additions & 1 deletion src/main/kotlin/dev/hybridlabs/aquatic/block/GiantClamBlock.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,11 @@ class GiantClamBlock(settings: Settings) : PlantBlock(settings), BlockEntityProv
if (blockEntity is GiantClamBlockEntity && blockEntity.pearlCooldown == 0) {
blockEntity.pearlCooldown = world.random.nextBetween(1200, 6000)

dropStack(world, pos, ItemStack(HybridAquaticItems.PEARL, 1))
if (world.random.nextInt(4) == 0) {
dropStack(world, pos, ItemStack(HybridAquaticItems.BLACK_PEARL, 1))
} else {
dropStack(world, pos, ItemStack(HybridAquaticItems.PEARL, 1))
}
world.playSound(
null,
pos,
Expand Down
119 changes: 59 additions & 60 deletions src/main/resources/assets/hybrid-aquatic/animations/atolla_jellyfish.animation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,71 +3,70 @@
"animations": {
"bob": {
"loop": true,
"animation_length": 3,
"animation_length": 4,
"bones": {
"bottom_tentacles": {
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"1.875": {
"vector": [0, 2, 0]
},
"3.0": {
"vector": [0, 0, 0]
}
},
"scale": {
"0.0": {
"vector": [1, 1, 1]
},
"2.3333": {
"vector": [1.2, 1, 1.2]
},
"3.0": {
"vector": [1, 1, 1]
}
}
},
"head": {
"position": [0, "-0.5+Math.SIN(query.anim_time * 90)*0.25", 0],
"scale": {
"0.0": {
"vector": [1, 1.1, 1]
},
"1.875": {
"vector": [1.3, 1, 1.3]
},
"3.0": {
"vector": [1, 1.1, 1]
}
"0.0": [0.9, 0.9, 0.9],
"2.5": [1, 1, 1],
"4.0": [0.9, 0.9, 0.9]
}
},
"tentacles": {
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.375": {
"vector": [0, 0, 0]
},
"1.875": {
"vector": [0, 2, 0]
},
"3.0": {
"vector": [0, 0, 0]
}
},
"scale": {
"0.0": {
"vector": [1, 1, 1]
},
"1.875": {
"vector": [1.2, 1, 1.2]
},
"3.0": {
"vector": [1, 1, 1]
}
}
"core_tentacles": {
"rotation": [0, 0, 0.01],
"position": [0, "Math.SIN(query.anim_time * 90)*0.25", 0]
},
"tentacle_a1": {
"rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0]
},
"tentacle_a2": {
"rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0]
},
"tentacle_b1": {
"rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0]
},
"tentacle_b2": {
"rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0]
},
"tentacle_c1": {
"rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0]
},
"tentacle_c2": {
"rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0]
},
"tentacle_d1": {
"rotation": ["Math.cos(query.anim_time * 90)*-10", 0, 0]
},
"tentacle_d2": {
"rotation": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0]
},
"tentacle_e1": {
"rotation": ["Math.cos(query.anim_time * 90)*-10", 0, 0]
},
"tentacle_e2": {
"rotation": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0]
},
"tentacle_h1": {
"rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0]
},
"tentacle_h2": {
"rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0]
},
"tentacle_g1": {
"rotation": ["Math.cos(query.anim_time * 90)*10", 0, 0]
},
"tentacle_g2": {
"rotation": ["Math.sin(query.anim_time * 90)*12.5", 0, 0]
},
"tentacle_f1": {
"rotation": ["Math.cos(query.anim_time * 90)*-10", 0, 0]
},
"tentacle_f2": {
"rotation": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0]
},
"atolla_jellyfish": {
"position": [0, "Math.sin(query.anim_time * 90)*1", 0]
}
}
}
Expand Down
147 changes: 96 additions & 51 deletions src/main/resources/assets/hybrid-aquatic/animations/blue_jellyfish.animation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,70 +3,115 @@
"animations": {
"bob": {
"loop": true,
"animation_length": 3,
"animation_length": 4,
"bones": {
"inner_tentacles": {
"head": {
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"1.875": {
"vector": [0, 2, 0]
},
"3.0": {
"vector": [0, 0, 0]
}
"vector": [0, "-0.5+Math.SIN(query.anim_time * 90)*0.25", 0]
},
"scale": {
"0.0": {
"vector": [1, 1, 1]
"vector": [0.9, 0.9, 0.9]
},
"2.3333": {
"vector": [1.2, 1, 1.2]
},
"3.0": {
"2.5": {
"vector": [1, 1, 1]
},
"4.0": {
"vector": [0.9, 0.9, 0.9]
}
}
},
"head": {
"scale": {
"0.0": {
"vector": [1, 1.1, 1]
},
"1.875": {
"vector": [1.3, 1, 1.3]
},
"3.0": {
"vector": [1, 1.1, 1]
}
"core_tentacles": {
"rotation": {
"vector": [0, 0, 0.01]
},
"position": {
"vector": [0, "Math.SIN(query.anim_time * 90)*0.25", 0]
}
},
"outer_tentacles": {
"tentacle_a1": {
"rotation": {
"vector": ["Math.cos(query.anim_time * 90)*10", 0, 0]
}
},
"tentacle_a2": {
"rotation": {
"vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0]
}
},
"tentacle_b1": {
"rotation": {
"vector": ["Math.cos(query.anim_time * 90)*10", 0, 0]
}
},
"tentacle_b2": {
"rotation": {
"vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0]
}
},
"tentacle_c1": {
"rotation": {
"vector": ["Math.cos(query.anim_time * 90)*10", 0, 0]
}
},
"tentacle_c2": {
"rotation": {
"vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0]
}
},
"tentacle_d1": {
"rotation": {
"vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0]
}
},
"tentacle_d2": {
"rotation": {
"vector": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0]
}
},
"tentacle_e1": {
"rotation": {
"vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0]
}
},
"tentacle_e2": {
"rotation": {
"vector": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0]
}
},
"tentacle_h1": {
"rotation": {
"vector": ["Math.cos(query.anim_time * 90)*10", 0, 0]
}
},
"tentacle_h2": {
"rotation": {
"vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0]
}
},
"tentacle_g1": {
"rotation": {
"vector": ["Math.cos(query.anim_time * 90)*10", 0, 0]
}
},
"tentacle_g2": {
"rotation": {
"vector": ["Math.sin(query.anim_time * 90)*12.5", 0, 0]
}
},
"tentacle_f1": {
"rotation": {
"vector": ["Math.cos(query.anim_time * 90)*-10", 0, 0]
}
},
"tentacle_f2": {
"rotation": {
"vector": ["Math.sin(query.anim_time * 90)*-12.5", 0, 0]
}
},
"blue_jellyfish": {
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.375": {
"vector": [0, 0, 0]
},
"1.875": {
"vector": [0, 2, 0]
},
"3.0": {
"vector": [0, 0, 0]
}
},
"scale": {
"0.0": {
"vector": [1, 1, 1]
},
"1.875": {
"vector": [1.2, 1, 1.2]
},
"3.0": {
"vector": [1, 1, 1]
}
"vector": [0, "Math.sin(query.anim_time * 90)*1", 0]
}
}
}
Expand Down
Loading

0 comments on commit f388d63

Please sign in to comment.