drawer and sprite

uujuju1 · May 6, 2022 · f16a40a · f16a40a
1 parent 3955bcf
commit f16a40a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/assets/sprites/units/carmanite/weapons/expo-weapon-outline.png b/assets/sprites/units/carmanite/weapons/expo-weapon-outline.png
diff --git a/assets/sprites/units/carmanite/weapons/expo-weapon.png b/assets/sprites/units/carmanite/weapons/expo-weapon.png
diff --git a/mod.hjson b/mod.hjson
@@ -3,6 +3,6 @@ name: "oblivion"
 author: "Uujuju"
 main: "oblivion.ProjectOblivion"
 description: "The technology of the oblivion awaits you..."
-version: 0.6
+version: 1
 minGameVersion: 135
 java: true
diff --git a/src/oblivion/content/OblivionUnits.java b/src/oblivion/content/OblivionUnits.java
@@ -794,6 +794,7 @@ public void load() {
 				DrawEx.circleEngine(unit, 2.5f, -5.5f, 2f);
 				DrawEx.circleEngine(unit, -2.5f, -5.5f, 2f);
 			};
+			hitSize = 7f;
 			range = 18f * 8f;
 			maxRange = range;
 			weapons.add(
@@ -820,6 +821,7 @@ public void load() {
 			engineDrawer = unit -> {
 				DrawEx.circleEngine(unit, 0f, -5.5f, 4f);
 			};
+			hitSize = 13f;
 			range = 23 * 8f;
 			maxRange = range;
 			weapons.add(
@@ -854,6 +856,7 @@ public void load() {
 				DrawEx.circleEngine(unit, 6f, -11f, 4f);
 				DrawEx.circleEngine(unit, -8f, -11f, 4f);
 			};
+			hitSize = 20f;
 			range = 26f * 8f;
 			maxRange = range;
 			weapons.add(
@@ -905,6 +908,7 @@ public void load() {
 					DrawEx.circleEngine(unit, i * 10f, -15f, 4f);
 				}
 			};
+			hitSize = 25f;
 			range = 33 * 8f;
 			maxRange = range;
 			weapons.add(
@@ -972,11 +976,19 @@ public void load() {
 			flying = lowAltitude = true;
 			constructor = UnitEntity::create;
 			outlineColor = Color.valueOf("3F424D");
+			engineDrawer = unit -> {
+				for (int i = -1; i <= 2; i += 2) {
+					DrawEx.circleEngine(unit, i * 12f, 14f, 4f);
+					DrawEx.circleEngine(unit, i * 9f, -11f, 4f);
+				}
+				DrawEx.circleEngine(unit, 0f, -13f, 8f);
+			};
+			hitSize = 28f;
 			range = 33 * 8f;
 			maxRange = range;
 			weapons.add(
 				new Weapon("oblivion-pow-weapon") {{
-					x = 0f;
+					x = 25f;
 					y = 0f;
 					reload = 10f;
 					shake = 5f;