shields maye crashes

uujuju1 · Feb 15, 2024 · 7eb1062 · 7eb1062
1 parent 5844bac
commit 7eb1062
Show file tree

Hide file tree

Showing 42 changed files with 383 additions and 173 deletions.
diff --git a/assets/maps/dawn.msav b/assets/maps/dawn.msav
diff --git a/assets/sprites/units/shields/ceno-big-cannon-outline.png b/assets/sprites/units/shields/ceno-big-cannon-outline.png
diff --git a/assets/sprites/units/shields/ceno-big-cannon.png b/assets/sprites/units/shields/ceno-big-cannon.png
diff --git a/assets/sprites/units/shields/ceno-cell.png b/assets/sprites/units/shields/ceno-cell.png
diff --git a/assets/sprites/units/shields/ceno-full.png b/assets/sprites/units/shields/ceno-full.png
diff --git a/assets/sprites/units/shields/ceno-leg-base.png b/assets/sprites/units/shields/ceno-leg-base.png
diff --git a/assets/sprites/units/shields/ceno-leg.png b/assets/sprites/units/shields/ceno-leg.png
diff --git a/assets/sprites/units/shields/ceno-outline.png b/assets/sprites/units/shields/ceno-outline.png
diff --git a/assets/sprites/units/shields/ceno-shield-outline.png b/assets/sprites/units/shields/ceno-shield-outline.png
diff --git a/assets/sprites/units/shields/ceno-shield.png b/assets/sprites/units/shields/ceno-shield.png
diff --git a/assets/sprites/units/shields/ceno-side-cannon-outline.png b/assets/sprites/units/shields/ceno-side-cannon-outline.png
diff --git a/assets/sprites/units/shields/ceno-side-cannon.png b/assets/sprites/units/shields/ceno-side-cannon.png
diff --git a/assets/sprites/units/shields/ceno.png b/assets/sprites/units/shields/ceno.png
diff --git a/assets/sprites/units/shields/meso-cannon-heat.png b/assets/sprites/units/shields/meso-cannon-heat.png
diff --git a/assets/sprites/units/shields/meso-cannon-outline.png b/assets/sprites/units/shields/meso-cannon-outline.png
diff --git a/assets/sprites/units/shields/meso-cannon.png b/assets/sprites/units/shields/meso-cannon.png
diff --git a/assets/sprites/units/shields/meso-cell.png b/assets/sprites/units/shields/meso-cell.png
diff --git a/assets/sprites/units/shields/meso-full.png b/assets/sprites/units/shields/meso-full.png
diff --git a/assets/sprites/units/shields/meso-leg-base.png b/assets/sprites/units/shields/meso-leg-base.png
diff --git a/assets/sprites/units/shields/meso-leg.png b/assets/sprites/units/shields/meso-leg.png
diff --git a/assets/sprites/units/shields/meso-outline.png b/assets/sprites/units/shields/meso-outline.png
diff --git a/assets/sprites/units/shields/meso-shield-outline.png b/assets/sprites/units/shields/meso-shield-outline.png
diff --git a/assets/sprites/units/shields/meso-shield.png b/assets/sprites/units/shields/meso-shield.png
diff --git a/assets/sprites/units/shields/meso.png b/assets/sprites/units/shields/meso.png
diff --git a/assets/sprites/units/shields/paleo-cannon-back-outline.png b/assets/sprites/units/shields/paleo-cannon-back-outline.png
diff --git a/assets/sprites/units/shields/paleo-cannon-back.png b/assets/sprites/units/shields/paleo-cannon-back.png
diff --git a/assets/sprites/units/shields/paleo-cannon-top-outline.png b/assets/sprites/units/shields/paleo-cannon-top-outline.png
diff --git a/assets/sprites/units/shields/paleo-cannon-top.png b/assets/sprites/units/shields/paleo-cannon-top.png
diff --git a/assets/sprites/units/shields/paleo-cell.png b/assets/sprites/units/shields/paleo-cell.png
diff --git a/assets/sprites/units/shields/paleo-full.png b/assets/sprites/units/shields/paleo-full.png
diff --git a/assets/sprites/units/shields/paleo-leg-base.png b/assets/sprites/units/shields/paleo-leg-base.png
diff --git a/assets/sprites/units/shields/paleo-leg.png b/assets/sprites/units/shields/paleo-leg.png
diff --git a/assets/sprites/units/shields/paleo-outline.png b/assets/sprites/units/shields/paleo-outline.png
diff --git a/assets/sprites/units/shields/paleo-shield-outline.png b/assets/sprites/units/shields/paleo-shield-outline.png
diff --git a/assets/sprites/units/shields/paleo-shield.png b/assets/sprites/units/shields/paleo-shield.png
diff --git a/assets/sprites/units/shields/paleo.png b/assets/sprites/units/shields/paleo.png
diff --git a/atlas.sai2 b/atlas.sai2
diff --git a/src/sw/ai/ShieldAI.java b/src/sw/ai/ShieldAI.java
@@ -1,34 +1,29 @@
 package sw.ai;
 
-import arc.math.*;
-import arc.util.*;
-import mindustry.entities.part.*;
 import mindustry.entities.units.*;
-import sw.gen.*;
-import sw.type.*;
 
 public class ShieldAI extends AIController {
-	public float getRotation() {
-		if (!(unit instanceof TetherUnitc u) || !(u.tetherUnit() instanceof Shieldedc b) || !(b.type() instanceof SWUnitType type)) return 0f;
-		if (b.mounts().length > 0) {
-			WeaponMount first = b.mounts()[0];
-			DrawPart.params.set(first.warmup, first.reload / b.type().weapons.first().reload, first.smoothReload, first.heat, first.recoil, first.charge, u.x(), u.y(), u.rotation());
-		} else {
-			DrawPart.params.set(0, 0, 0, 0, 0, 0, u.x(), u.y(), u.rotation());
-		}
-		return Mathf.lerp(
-			type.shieldStartAng + (b.rotation() - 90 + type.shieldEndAng /(type.shields - 1f) * b.units().indexOf(unit)),
-			type.shieldShootingStartAng + (b.rotation() - 90 + type.shieldShootingEndAng /(type.shields - 1f) * b.units().indexOf(unit)),
-			type.shieldProgress.get(DrawPart.params)
-		);
-	}
-
-	@Override
-	public void updateMovement() {
-		if (unit instanceof TetherUnitc u && u.tetherUnit() != null && u.tetherUnit().type() instanceof SWUnitType type) {
-			Tmp.v1.trns(getRotation(), type.shieldSeparateRadius);
-			u.set(Tmp.v1.add(u.tetherUnit()));
-			u.rotation(u.angleTo(u.tetherUnit()) + 180f);
-		}
-	}
+//	public float getRotation() {
+//		if (!(unit instanceof TetherUnitc u) || !(u.tetherUnit() instanceof Shieldedc b) || !(b.type() instanceof SWUnitType type)) return 0f;
+//		if (b.mounts().length > 0) {
+//			WeaponMount first = b.mounts()[0];
+//			DrawPart.params.set(first.warmup, first.reload / b.type().weapons.first().reload, first.smoothReload, first.heat, first.recoil, first.charge, u.x(), u.y(), u.rotation());
+//		} else {
+//			DrawPart.params.set(0, 0, 0, 0, 0, 0, u.x(), u.y(), u.rotation());
+//		}
+//		return Mathf.lerp(
+//			type.shieldStartAng + (b.rotation() - 90 + type.shieldEndAng /(type.shields - 1f) * b.units().indexOf(unit)),
+//			type.shieldShootingStartAng + (b.rotation() - 90 + type.shieldShootingEndAng /(type.shields - 1f) * b.units().indexOf(unit)),
+//			type.shieldProgress.get(DrawPart.params)
+//		);
+//	}
+//
+//	@Override
+//	public void updateMovement() {
+//		if (unit instanceof TetherUnitc u && u.tetherUnit() != null && u.tetherUnit().type() instanceof SWUnitType type) {
+//			Tmp.v1.trns(getRotation(), type.shieldSeparateRadius);
+//			u.set(Tmp.v1.add(u.tetherUnit()));
+//			u.rotation(u.angleTo(u.tetherUnit()) + 180f);
+//		}
+//	}
 }