Revive

Nezerit6 · Oct 28, 2023 · 5166f06 · 5166f06
1 parent 59f42c1
commit 5166f06
Show file tree

Hide file tree

Showing 13 changed files with 248 additions and 92 deletions.
diff --git a/assets/icon.png b/assets/icon.png
diff --git a/assets/sprites/blocks/power/wind-generator.png b/assets/sprites/blocks/power/wind-generator.png
diff --git a/assets/sprites/blocks/turrets/destruction-heat.png b/assets/sprites/blocks/turrets/destruction-heat.png
diff --git a/assets/sprites/blocks/turrets/destruction.png b/assets/sprites/blocks/turrets/destruction.png
diff --git a/assets/sprites/blocks/turrets/pulse.png b/assets/sprites/blocks/turrets/pulse.png
diff --git a/assets/sprites/units/frontis.png b/assets/sprites/units/frontis.png
diff --git a/assets/sprites/units/weapon/w1.png b/assets/sprites/units/weapon/w1.png
diff --git a/build.gradle b/build.gradle
@@ -9,12 +9,13 @@ sourceSets.main.java.srcDirs = ["src"]
 
 repositories{
     mavenCentral()
+    maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
     maven{ url 'https://www.jitpack.io' }
 }
 
 ext{
     //the build number that this mod is made for
-    mindustryVersion = 'v140.3'
+    mindustryVersion = 'v146'
     jabelVersion = "93fde537c7"
     sdkRoot = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT")
 }

diff --git a/icon.png b/icon.png
diff --git a/src/stus/content/StuasutBlocks.java b/src/stus/content/StuasutBlocks.java
@@ -8,6 +8,7 @@
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;
 import mindustry.entities.effect.*;
+import mindustry.entities.pattern.ShootHelix;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
@@ -72,7 +73,7 @@ public class StuasutBlocks {
     zincBridge, zincDuct, bariumDuct, itemRouter,
 
     //turrets
-    clor, togis, pulse, collapse, landAir, landAirLaser, landAirMinigun,
+    clor, togis, pulse, collapse, landAir, destruction,
 
     //units
     airFactory;
@@ -342,7 +343,82 @@ public static void load() {
             itemCapacity = 10;
             drawer = new DrawMulti(new DrawDefault(), new DrawFlame());
         }};
-
+        forgeT2 = new MultiCrafter("forge-t2") {{
+            requirements(Category.crafting, with(StuasutItems.zinc, 140, StuasutItems.barium, 106, StuasutItems.cadmium, 80));
+            health = 80;
+            size = 3;
+            craftEffect = new MultiEffect(Fx.pointShockwave, Fx.pointShockwave, Fx.drillSteam);
+            resolvedRecipes = Seq.with(
+                    //barium recipe
+                    new Recipe(
+                            //consumes
+                            new IOEntry(
+                                    //items
+                                    Seq.with(ItemStack.with(
+                                            StuasutItems.barium, 2,
+                                            StuasutItems.cadmiumraw, 2
+                                    )),
+                                    //liquids
+                                    Seq.with(),
+                                    200f / 60f),
+                            //outputs
+                            new IOEntry(
+                                    //items
+                                    Seq.with(ItemStack.with(
+                                            StuasutItems.dencealloy, 1
+                                    )),
+                                    //liquids
+                                    Seq.with()),
+                            //craftTime
+                            4f * 60f
+                    ),
+                    //cadmium recipe
+                    new Recipe(
+                            //consumes
+                            new IOEntry(
+                                    //items
+                                    Seq.with(ItemStack.with(
+                                            StuasutItems.rheniumraw, 4
+                                    )),
+                                    //liquids
+                                    Seq.with(),
+                                    280f / 60f),
+                            //outputs
+                            new IOEntry(
+                                    //items
+                                    Seq.with(ItemStack.with(
+                                            StuasutItems.rhenium, 1
+                                    )),
+                                    //liquids
+                                    Seq.with()),
+                            //craftTime
+                            5f * 60f
+                    ),
+                    //rhenium recipe
+                    new Recipe(
+                            //consumes
+                            new IOEntry(
+                                    //items
+                                    Seq.with(ItemStack.with(
+                                            StuasutItems.antimonyraw, 4
+                                    )),
+                                    //liquids
+                                    Seq.with(),
+                                    400f / 60f),
+                            //outputs
+                            new IOEntry(
+                                    //items
+                                    Seq.with(ItemStack.with(
+                                            StuasutItems.antimony, 1
+                                    )),
+                                    //liquids
+                                    Seq.with()),
+                            //craftTime
+                            6f * 60f
+                    ));
+            itemCapacity = 12;
+            drawer = new DrawMulti(new DrawDefault(), new DrawFlame());
+        }};
         //production
 
         zinccrusher = new BurstDrill("zinc-crusher") {{
@@ -714,7 +790,7 @@ StuasutItems.dencealloy, new BasicBulletType() {{
         landAir = new ItemTurret("land-air") {{
             requirements(Category.turret, with(StuasutItems.zinc, 160, StuasutItems.barium, 120, StuasutItems.bariumraw, 90));
             scaledHealth = 250;
-            reload = 80f;
+            reload = 60f;
             range = 100f;
             recoil = 2f;
             rotateSpeed = 2f;
@@ -750,19 +826,7 @@ StuasutItems.barium, new BasicBulletType() {{
                                 }};
                             }});
                         }};
-                    }});
-            drawer = new DrawTurret("rapu-");
-            researchCost = with(StuasutItems.zinc, 800, StuasutItems.barium, 600, StuasutItems.bariumraw, 450);
-        }};
-        landAirLaser = new ItemTurret("land-air-laser") {{
-            requirements(Category.turret, with(StuasutItems.zinc, 180, StuasutItems.cadmium, 80, StuasutItems.cadmiumraw, 85));
-            scaledHealth = 250;
-            reload = 140f;
-            range = 100f;
-            recoil = 2f;
-            rotateSpeed = 2f;
-            size = 3;
-            ammo(
+                    }},
                     StuasutItems.cadmium, new BasicBulletType() {{
                         damage = 0f;
                         lifetime = 0f;
@@ -796,19 +860,7 @@ StuasutItems.cadmium, new BasicBulletType() {{
                                 }};
                             }});
                         }};
-                    }});
-            drawer = new DrawTurret("rapu-");
-            researchCost = with(StuasutItems.zinc, 900, StuasutItems.cadmium, 400, StuasutItems.cadmiumraw, 425);
-        }};
-        landAirMinigun = new ItemTurret("land-air-minigun") {{
-            requirements(Category.turret, with(StuasutItems.zinc, 260, StuasutItems.cadmium, 80, StuasutItems.rheniumraw, 120));
-            scaledHealth = 250;
-            reload = 120f;
-            range = 100f;
-            recoil = 2f;
-            rotateSpeed = 2f;
-            size = 3;
-            ammo(
+                    }},
                     StuasutItems.rheniumraw, new BasicBulletType() {{
                         damage = 0f;
                         lifetime = 0f;
@@ -840,7 +892,42 @@ StuasutItems.rheniumraw, new BasicBulletType() {{
                         }};
                     }});
             drawer = new DrawTurret("rapu-");
-            researchCost = with(StuasutItems.zinc, 1300, StuasutItems.cadmium, 400, StuasutItems.rheniumraw, 600);
+            researchCost = with(StuasutItems.zinc, 800, StuasutItems.barium, 600, StuasutItems.bariumraw, 450);
+        }};
+        destruction = new ItemTurret("destruction") {{
+            requirements(Category.turret, with(StuasutItems.zinc, 2600, StuasutItems.barium, 120, StuasutItems.cadmium, 60));
+            scaledHealth = 240;
+            reload = 90f;
+            range = 280f;
+            recoil = 2f;
+            shootCone = 30f;
+            rotateSpeed = 1.9f;
+            shoot = new ShootHelix();
+            size = 3;
+            targetAir = false;
+            ammo(
+                    StuasutItems.cadmiumraw, new ArtilleryBulletType() {{
+                        damage = 0f;
+                        lifetime = 30f;
+                        splashDamage = 60;
+                        splashDamageRadius = 12;
+                        speed = 4f;
+                        width = 9f;
+                        height = 9f;
+                        fragBullets = 8;
+                        fragVelocityMin = 0.7f;
+                        fragRandomSpread = 20;
+                        fragLifeMin = 0.7f;
+                        fragBullet = new BasicBulletType() {{
+                            damage = 30f;
+                            speed = 2f;
+                            lifetime = 60f;
+                            width = 5f;
+                            height = 8f;
+                        }};
+                    }});
+            drawer = new DrawTurret("rapu-");
+            researchCost = with(StuasutItems.zinc, 4000, StuasutItems.barium, 360, StuasutItems.cadmium, 230);
         }};
         //units
         airFactory = new UnitFactory("air-fuck") {{

diff --git a/src/stus/content/StuasutTechTree.java b/src/stus/content/StuasutTechTree.java
@@ -80,6 +80,8 @@ public static void load() {
                 });
             });
             node(StuasutBlocks.forgeT1, () -> {
+                node(StuasutBlocks.forgeT2, () -> {
+                });
                 //TODO more factories
             });
             node(StuasutBlocks.bariumWall, () -> {
@@ -101,6 +103,9 @@ public static void load() {
                 node(StuasutBlocks.pulse, () -> {
                     node(StuasutBlocks.collapse, () -> {
 
+                    });
+                    node(StuasutBlocks.destruction, () -> {
+
                     });
                 });
             });

diff --git a/src/stus/content/StuasutUnits.java b/src/stus/content/StuasutUnits.java
@@ -13,7 +13,7 @@ public class StuasutUnits {
     public static UnitType
 
     //units
-    navicula,
+    navicula, frontis,
 
     //core units
     sunrise;
@@ -101,6 +101,37 @@ public static Weapon getNaviculaWeapon(float x, float y){
         weapon.y = y;
         return weapon;
     }
+    public static Weapon getFrontisWeapon(float x, float y){
+        Weapon weapon = new Weapon("stus-w1"){{
+            reload = 50f;
+            rotate = false;
+            shootCone = 20f;
+            mirror = false;
+            bullet = new LaserBoltBulletType(4f, 30){{
+                width = 4f;
+                height = 9f;
+
+                lifetime = 40f;
+                pierceArmor = true;
+                pierce = true;
+                pierceCap = 2;
+                pierceBuilding = true;
+
+                trailLength = 14;
+                trailWidth = 2f;
+                trailSinScl = 2f;
+                trailSinMag = 0.5f;
+                trailEffect = Fx.none;
+                trailColor = Color.valueOf("FF6F89FF");
+
+                frontColor = Color.valueOf("FFFFFF");
+                backColor = Color.valueOf("D85876FF");
+            }};
+        }};
+        weapon.x = x;
+        weapon.y = y;
+        return weapon;
+    }
     public static void load(){
 
         navicula = new UnitType("navicula"){{
@@ -126,6 +157,28 @@ public static void load(){
 
             weapons.add(getNaviculaWeapon(0, -2));
         }};
+        frontis = new UnitType("frontis"){{
+            health = 230;
+            hitSize = 17;
+            outlineColor = RapuPal.rapuOutline;
+            constructor = UnitEntity::create;
+
+            speed = 2.1f;
+            rotateSpeed = 5.4f;
+            drag = 0.05f;
+            accel = 0.05f;
+
+            targetFlags = new BlockFlag[]{BlockFlag.factory, null};
+            faceTarget = true;
+            flying = true;
+
+            engineOffset = 7f;
+            engineSize = 2;
+            lowAltitude = true;
+            itemCapacity = 20;
+
+            weapons.add(getNaviculaWeapon(3.5f, -4.75f), getNaviculaWeapon(-3.5f, -4.75f), getFrontisWeapon(3.5f, 5.5f), getFrontisWeapon(-3.5f, 5.5f));
+        }};
         sunrise = new UnitType("sunrise"){{
            aiController = BuilderAI::new;
            isEnemy = false;