R2 B37

R2 B37

core/assets/bundles/bundle.properties

@@ -12,9 +12,11 @@ sector.gravillaso-caustic-gorge.name = Caustic Gorge
 sector.gravillaso-caustic-gorge.description = Huge cave. Some new ores can be mined in this place for example Quartz, a material that can be grind into sand.
 sector.gravillaso-caustic-gorge.details = Gravilo::47
 ###UI
+bar.gravity-module = Gravity %d%%
+stat.gravity = Gravity Affect
 @content.planet.name = Planets
 @gravillaso-beta = It's beta version of Gravillaso Mod!
-@gravillaso-beta.description = [gray]These are the first versions of the Java mod,\n if you notice bugs, errors, or incorrect translation \nplease notify me on GitHub
+@gravillaso-beta.description = [gray]Please create backup your process,\n if you notice bugs, errors, or incorrect translation \nplease notify me on GitHub
 @gravillaso-hide = Hide
 @gravillaso-unlock-gravillo = You're unlocked Gravillo!
 @gravillaso-unlock-gravillo.description = TODO: Add description
@@ -105,6 +107,8 @@ block.gravillaso-renunciation.description = Large swarm cannon, fires projectile
 block.gravillaso-sunrise.name = Sunrise
 block.gravillaso-sunrise.description = The use of new technologies allows you to concentrate an incredible amount of energy in one place.
 block.gravillaso-sunrise.details = You need 350 solar panels per shot.
+block.gravillaso-slt.name = SLT
+block.gravillaso-slt.description = Fires generated gravity particles at enemies.\nThe greater the charge of gravity, the stronger the turret.
 block.gravillaso-phase-fuse.name = Phase Fuse
 block.gravillaso-phase-fuse.description = Fires for far-range piercing blasts at enemies.
 block.gravillaso-voltum.name = Voltum
@@ -158,6 +162,8 @@ block.gravillaso-colossal-healing-dome.name = Colossal Healing Dome
 block.gravillaso-colossal-healing-dome.description = Restores the strength of buildings over a great distance.
 block.gravillaso-colossal-force-projector.name = Colossal Force Projector
 block.gravillaso-colossal-force-projector.description = Creates a hexagonal force field around itself, protecting buildings and units inside from damage.\nOverheats if too much damage is sustained. Optionally uses coolant to prevent overheating. Phase fabric increases shield size.
+block.gravillaso-gravity-projector.name = Gravity Projector
+block.gravillaso-gravity-projector.description = Creates gravity particles in the atmosphere.\nEnhances blocks that use gravity.
 ###Blocks-Units
 block.gravillaso-repair-laser.name = Repair Laser
 block.gravillaso-repair-laser.description = Continuously repair the closest damaged unit in its vicinity.\nUses advanced laser tech.

core/src/nitis/gravillaso/GRMod.java

@@ -1,15 +1,47 @@
 package nitis.gravillaso;
 
+import arc.Core;
+import arc.Events;
+import arc.graphics.Color;
 import arc.util.Log;
+import arc.util.Time;
 import mindustry.Vars;
 import mindustry.ctype.ContentList;
+import mindustry.game.EventType;
+import mindustry.gen.Icon;
+import mindustry.ui.dialogs.BaseDialog;
 import mma.MMAMod;
 
 public class GRMod extends MMAMod {
+    public static final boolean isBeta = true;
+    public static final String githubLink = "https://github.com/NickName73/Gravillaso";
 
     public GRMod(){
         super();
         GRVars.load();
+        Events.on(EventType.ClientLoadEvent.class, e -> {
+            Time.runTask(10f, () -> {
+                if(isBeta & Core.settings.getBool("gravillaso-beta-show",true)){
+                    BaseDialog dialog = new BaseDialog("Gravillaso Beta");
+                    dialog.cont.add(Core.bundle.format("warning").replace('.','!'), Color.red).fontScale(1.15f).row();
+                    dialog.cont.add(Core.bundle.format("@gravillaso-beta")).fontScale(1f).row();
+                    dialog.cont.add().size(20f).row();
+                    dialog.cont.add(Core.bundle.format("@gravillaso-beta.description")).row();
+                    dialog.cont.add().size(20f).row();
+                    dialog.cont.button(Core.bundle.format("ok"), () ->{
+                        dialog.hide();
+                    }).size(140f,60f).center().row();
+                    dialog.cont.button(Core.bundle.format("@gravillaso-hide"), () ->{
+                        dialog.hide();
+                        Core.settings.put("gravillaso-beta-show",false);
+                    }).size(140f,60f).row();
+                    dialog.cont.button(Icon.github, () ->{
+                        Core.app.openURI(githubLink);
+                    }).size(140f,60f);
+                    dialog.show();
+                }
+            });
+        });
     }
     @Deprecated
     public static String fullName(String name){

core/src/nitis/gravillaso/GRVars.java

@@ -1,7 +1,9 @@
 package nitis.gravillaso;
 
 import arc.util.Log;
+import mindustry.content.Planets;
 import mindustry.ctype.ContentList;
+import mindustry.type.Planet;
 import mma.ModVars;
 import nitis.gravillaso.content.*;
 
@@ -47,7 +49,15 @@ public ContentList[] getContentList() {
     public String getFullName(String name) {
         return MODID + "-" + name;
     }
-
+    public static int getGravity(Planet planet) {
+        if (planet == Planets.serpulo) {
+            return 113;
+        }
+        if (planet == GRPlanets.gravillo) {
+            return 213;
+        }
+        return 110;
+    }
     static {
         instance = new GRVars();
     }

core/src/nitis/gravillaso/content/GRBlocks.java

@@ -3,8 +3,10 @@
 import arc.graphics.Color;
 import arc.struct.ObjectMap;
 import arc.struct.Seq;
-import nitis.gravillaso.world.blocks.production.OverdriveDrill;
-import mindustry.content.*;
+import mindustry.content.Fx;
+import mindustry.content.Items;
+import mindustry.content.Liquids;
+import mindustry.content.StatusEffects;
 import mindustry.ctype.ContentList;
 import mindustry.entities.bullet.*;
 import mindustry.gen.Sounds;
@@ -38,12 +40,16 @@
 import mindustry.world.draw.DrawMixer;
 import mindustry.world.draw.DrawWeave;
 import mindustry.world.meta.Attribute;
+import mindustry.world.meta.BuildVisibility;
+import nitis.gravillaso.entity.bullet.GraviBullet;
+import nitis.gravillaso.world.blocks.defence.turrets.GravityTurret;
+import nitis.gravillaso.world.blocks.gravity.GravityProjector;
+import nitis.gravillaso.world.blocks.production.OverdriveDrill;
 
 import static mindustry.type.ItemStack.with;
 
 public class GRBlocks implements ContentList {
     public static final int gravitiumDefence = 1280 ,magneturnDefence = 2300;
-    public static final Color baseHealColor = Color.valueOf("84f490"), phaseHealColor = Color.valueOf("B5ffbd");
 
     public static Block
     //Environment
@@ -52,6 +58,8 @@ public class GRBlocks implements ContentList {
     advancedPyratiteMixer,advancedBlastMixer,gasolineBarrel,cryofluidChamber,flammableLiquidChamber,phaseCaldron,molecularConverter,molecularReconstructor,magneturnSmelter,electroSmelter,molecularPhaseWeaver,plastaniumMolecularPress,
     //Defence
     gravitiumWall,gravitiumWallLarge,magneturnWall,magneturnWallLarge,hyperMender,colossalHealingDome,colossalForceProjector,
+    //Gravity
+    gravityProjector,
     //Distribution
     magneturnConveyor,electroConveyor,colossalDriver,
     //Power
@@ -63,14 +71,14 @@ public class GRBlocks implements ContentList {
     //Turrets
     public static Block
     destiny,arhiepiscop,fierySpray,renunciation,phaseFuse,voltum,sunrise,
+    //Gravity Turrets
+    slt,
     //Units
     repairLaser,advancedNavalFactory,additiveReassembler, multiplicativeReassembler,
     //Light
     sunshine,
     //PlanetUnlocks
     _end;
-    @Deprecated
-    public static Block slt;
 
     @Override
     public void load() {
@@ -315,8 +323,8 @@ public void load() {
             size = 3;
             health = 80 * size * size;
 
-            baseColor = baseHealColor;
-            phaseColor = phaseHealColor;
+            baseColor = GRPal.baseHealColor;
+            phaseColor = GRPal.phaseHealColor;
 
             range = 120;
             healPercent = 15;
@@ -333,8 +341,8 @@ public void load() {
             size = 4;
             health = 120 * size * size;
 
-            baseColor = baseHealColor;
-            phaseColor = phaseHealColor;
+            baseColor = GRPal.baseHealColor;
+            phaseColor = GRPal.phaseHealColor;
 
             range = 1200;
             healPercent = 1;
@@ -347,6 +355,17 @@ public void load() {
             consumes.power(9.5f);
         }};
         //endregion
+        //region Gravity
+        gravityProjector = new GravityProjector("gravity-projector"){{
+            requirements(Category.effect, BuildVisibility.sandboxOnly, ItemStack.with(Items.lead, 320, Items.plastanium, 120, GRItems.gravitium, 220));
+            health = 540;
+            itemCapacity = 15;
+            size = 3;
+
+            consumes.item(Items.phaseFabric).boost();
+            consumes.power(24.5f);
+        }};
+        //endregion
         //region Distribution
         magneturnConveyor = new ArmoredConveyor("magneturn-conveyor"){{
             requirements(Category.distribution, ItemStack.with(Items.thorium, 1, GRItems.magneturn, 1));
@@ -760,6 +779,19 @@ Items.phaseFabric, new ShrapnelBulletType(){{
             }};
         }};
         //endregion
+        //region Gravity Turrets
+        slt = new GravityTurret("slt"){{
+            requirements(Category.turret, BuildVisibility.sandboxOnly, ItemStack.with(Items.lead, 240, Items.graphite, 190, Items.metaglass, 110, Items.surgeAlloy, 70, GRItems.magneturn, 45));
+            size = 3;
+            range = 320f;
+
+            consumes.power(8.5f);
+
+            shootType = new GraviBullet(98) {{
+                speed = 14f;
+            }};
+        }};
+        //endregion
         //region Units
         repairLaser = new RepairPoint("repair-laser"){{
             requirements(Category.units, ItemStack.with(Items.thorium,120,Items.silicon,160,Items.plastanium,75,GRItems.gravitium,45));

core/src/nitis/gravillaso/content/GRPal.java

@@ -0,0 +1,13 @@
+package nitis.gravillaso.content;
+
+import arc.graphics.Color;
+
+public class GRPal {
+    public static Color
+
+    baseHealColor = Color.valueOf("84f490"),
+    phaseHealColor = Color.valueOf("B5ffbd"),
+
+    magneturn = Color.valueOf("62528d"),
+    magneturnLight = Color.valueOf("9370c0");
+}

core/src/nitis/gravillaso/content/GRUnitTypes.java

@@ -167,21 +167,21 @@ public void load() {
             commandLimit = 5;
             circleTarget = true;
             engineOffset = -1.5f;
-            abilities.add(new MoveLightningAbility(14, 12, 0.05f, 0f, 2.5f, 3f, Color.valueOf("747FFF")){{
+            abilities.add(new MoveLightningAbility(7, 9, 0.05f, 0f, 2.5f, 3f, Color.valueOf("747FFF")){{
                 bulletSpread = 90f;
                 bulletAngle = 90f;
             }});
             weapons.add(new Weapon(){{
                 minShootVelocity = 0.75f;
                 x = 3f;
                 shootY = 0f;
-                reload = 12f;
+                reload = 30f;
                 shootCone = 180f;
                 ejectEffect = Fx.none;
                 inaccuracy = 2f;
                 ignoreRotation = true;
                 shootSound = Sounds.none;
-                bullet = new BombBulletType(14f, 35f){{
+                bullet = new BombBulletType(12f, 12f){{
                     width = 7f;
                     height = 9f;
                     hitEffect = Fx.explosion;

core/src/nitis/gravillaso/entity/bullet/GraviBullet.java

@@ -0,0 +1,15 @@
+package nitis.gravillaso.entity.bullet;
+
+import mindustry.entities.bullet.BasicBulletType;
+import nitis.gravillaso.GRVars;
+import nitis.gravillaso.content.GRStatusEffects;
+
+public class GraviBullet extends BasicBulletType {
+    public GraviBullet(float damage) {
+        this.damage = damage;
+        this.status = GRStatusEffects.pressure;
+        this.homingRange = 15f;
+        this.homingPower = 0.7f;
+        this.sprite = GRVars.fullName("gravi-bullet");
+    }
+}