diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/Agm65Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/Agm65Entity.java index ce35474e4..79a8e4189 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/Agm65Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/Agm65Entity.java @@ -238,13 +238,13 @@ public class Agm65Entity extends FastThrowableProjectile implements GeoEntity, D entity.level().playSound(null, entity.getOnPos(), entity instanceof Pig ? SoundEvents.PIG_HURT : ModSounds.MISSILE_WARNING.get(), SoundSource.PLAYERS, 2, 1f); } - Vec3 targetPos = new Vec3(entity.getX(), entity.getY() + (entity instanceof EnderDragon ? -3 : 0) + 0.15 * distanceTo(entity), entity.getZ()); + Vec3 targetPos = new Vec3(entity.getX(), entity.getY() + (entity instanceof EnderDragon ? -2 : 0) + 0.1 * distanceTo(entity), entity.getZ()); Vec3 toVec = getEyePosition().vectorTo(targetPos).normalize(); if (this.tickCount > 8) { boolean lostTarget = (VectorTool.calculateAngle(getDeltaMovement(), toVec) > 80); if (!lostTarget) { - setDeltaMovement(getDeltaMovement().add(toVec.scale(1.4)).scale(0.75).add(entity.getDeltaMovement())); + setDeltaMovement(getDeltaMovement().add(toVec.scale(1.4)).scale(0.25).add(entity.getDeltaMovement())); } } } diff --git a/src/main/resources/assets/superbwarfare/geo/trachelium.geo.json b/src/main/resources/assets/superbwarfare/geo/trachelium.geo.json index 0e0ce778e..c39cafe51 100644 --- a/src/main/resources/assets/superbwarfare/geo/trachelium.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/trachelium.geo.json @@ -9943,8 +9943,22 @@ { "name": "hou", "parent": "gun", - "pivot": [4.72, -12.72, -10.02], + "pivot": [4.72, -12.72, -10.02] + }, + { + "name": "flower_illuminated", + "parent": "hou", + "pivot": [0.5028, 0.77, 1.50967], "cubes": [ + { + "origin": [0.5228, -0.505, 0.38467], + "size": [0.05, 1.15, 1.15], + "pivot": [0.5478, 0.07, 0.95967], + "rotation": [68.77432, -5.16507, -2.29168], + "uv": { + "west": {"uv": [11.75, 68], "uv_size": [14, 14]} + } + }, { "origin": [0.6028, 0.965, 0.48467], "size": [0.05, 1.15, 1.15], @@ -9962,15 +9976,6 @@ "uv": { "west": {"uv": [11.75, 68], "uv_size": [14, 14]} } - }, - { - "origin": [0.5228, -0.505, 0.38467], - "size": [0.05, 1.15, 1.15], - "pivot": [0.5478, 0.07, 0.95967], - "rotation": [68.77432, -5.16507, -2.29168], - "uv": { - "west": {"uv": [11.75, 68], "uv_size": [14, 14]} - } } ] }, diff --git a/src/main/resources/assets/superbwarfare/textures/item/hunting_rifle_e.png b/src/main/resources/assets/superbwarfare/textures/item/hunting_rifle_e.png deleted file mode 100644 index bb2173f1a..000000000 Binary files a/src/main/resources/assets/superbwarfare/textures/item/hunting_rifle_e.png and /dev/null differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/trachelium_texture.png b/src/main/resources/assets/superbwarfare/textures/item/trachelium_texture.png index 22f30ec57..e09e62bbf 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/trachelium_texture.png and b/src/main/resources/assets/superbwarfare/textures/item/trachelium_texture.png differ