Added client implementation for 50 achievemenets

2019-09-13 22:02:13 -04:00
parent d4d060a500
commit 6c07c5006a
64 changed files with 516 additions and 106 deletions
@@ -1,6 +1,7 @@
 package io.anuke.mindustry.entities;

 import io.anuke.annotations.Annotations.Struct;
+import io.anuke.arc.*;
 import io.anuke.arc.collection.GridBits;
 import io.anuke.arc.collection.IntQueue;
 import io.anuke.arc.function.*;
@@ -11,10 +12,11 @@ import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Bullets;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.entities.Effects.Effect;
-import io.anuke.mindustry.entities.bullet.Bullet;
+import io.anuke.mindustry.entities.type.Bullet;
 import io.anuke.mindustry.entities.effect.Fire;
 import io.anuke.mindustry.entities.effect.Lightning;
 import io.anuke.mindustry.entities.type.Unit;
+import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.gen.PropCell;
@@ -187,6 +189,10 @@ public class Damage{
            //TODO better velocity displacement
            float dst = tr.set(entity.x - x, entity.y - y).len();
            entity.velocity().add(tr.setLength((1f - dst / radius) * 2f / entity.mass()));
+
+            if(complete && damage >= 9999999f && entity == player){
+                Events.fire(Trigger.exclusionDeath);
+            }
        };

        rect.setSize(radius * 2).setCenter(x, y);
@@ -7,7 +7,7 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Position;
 import io.anuke.arc.util.pooling.Pools;
-import io.anuke.mindustry.entities.impl.EffectEntity;
+import io.anuke.mindustry.entities.type.EffectEntity;
 import io.anuke.mindustry.entities.traits.ScaleTrait;

 public class Effects{
@@ -4,6 +4,7 @@ import io.anuke.arc.graphics.g2d.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.Effects.*;
+import io.anuke.mindustry.entities.type.Bullet;
 import io.anuke.mindustry.gen.*;

 //TODO scale velocity depending on fslope()
@@ -20,7 +21,7 @@ public class ArtilleryBulletType extends BasicBulletType{
    }

    @Override
-    public void update(Bullet b){
+    public void update(io.anuke.mindustry.entities.type.Bullet b){
        super.update(b);

        if(b.timer.get(0, 3 + b.fslope() * 2f)){
@@ -4,6 +4,7 @@ import io.anuke.arc.Core;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.graphics.g2d.TextureRegion;
+import io.anuke.mindustry.entities.type.Bullet;
 import io.anuke.mindustry.graphics.Pal;

 /** An extended BulletType for most ammo-based bullets shot from turrets and units. */
@@ -7,6 +7,7 @@ import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.Effects.*;
 import io.anuke.mindustry.entities.effect.*;
 import io.anuke.mindustry.entities.traits.*;
+import io.anuke.mindustry.entities.type.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
@@ -4,6 +4,7 @@ import io.anuke.arc.math.geom.Rectangle;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.entities.Units;
+import io.anuke.mindustry.entities.type.Bullet;

 public abstract class FlakBulletType extends BasicBulletType{
    protected static Rectangle rect = new Rectangle();
@@ -6,6 +6,7 @@ import io.anuke.arc.math.geom.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.effect.*;
+import io.anuke.mindustry.entities.type.Bullet;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.*;

@@ -35,7 +36,7 @@ public class LiquidBulletType extends BulletType{
    }

    @Override
-    public void update(Bullet b){
+    public void update(io.anuke.mindustry.entities.type.Bullet b){
        super.update(b);

        if(liquid.canExtinguish()){
@@ -49,7 +50,7 @@ public class LiquidBulletType extends BulletType{
    }

    @Override
-    public void draw(Bullet b){
+    public void draw(io.anuke.mindustry.entities.type.Bullet b){
        Draw.color(liquid.color, Color.white, b.fout() / 100f);

        Fill.circle(b.x, b.y, 0.5f + b.fout() * 2.5f);
@@ -6,6 +6,7 @@ import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.entities.Effects;
+import io.anuke.mindustry.entities.type.Bullet;
 import io.anuke.mindustry.graphics.Pal;
 import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData;

@@ -23,7 +24,7 @@ public class MassDriverBolt extends BulletType{
    }

    @Override
-    public void draw(Bullet b){
+    public void draw(io.anuke.mindustry.entities.type.Bullet b){
        float w = 11f, h = 13f;

        Draw.color(Pal.bulletYellowBack);
@@ -36,7 +37,7 @@ public class MassDriverBolt extends BulletType{
    }

    @Override
-    public void update(Bullet b){
+    public void update(io.anuke.mindustry.entities.type.Bullet b){
        //data MUST be an instance of DriverBulletData
        if(!(b.getData() instanceof DriverBulletData)){
            hit(b);
@@ -82,7 +83,7 @@ public class MassDriverBolt extends BulletType{
    }

    @Override
-    public void despawned(Bullet b){
+    public void despawned(io.anuke.mindustry.entities.type.Bullet b){
        super.despawned(b);

        if(!(b.getData() instanceof DriverBulletData)) return;
@@ -5,6 +5,7 @@ import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.entities.Effects;
+import io.anuke.mindustry.entities.type.Bullet;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.Pal;

@@ -3,7 +3,7 @@ package io.anuke.mindustry.entities.effect;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.math.Mathf;
 import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.impl.TimedEntity;
+import io.anuke.mindustry.entities.type.TimedEntity;
 import io.anuke.mindustry.entities.traits.BelowLiquidTrait;
 import io.anuke.mindustry.entities.traits.DrawTrait;
 import io.anuke.mindustry.graphics.Pal;
@@ -8,9 +8,9 @@ import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.impl.*;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.entities.type.*;
+import io.anuke.mindustry.entities.type.TimedEntity;
 import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
@@ -6,7 +6,7 @@ import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.entities.Effects.Effect;
 import io.anuke.mindustry.entities.Effects.EffectRenderer;
-import io.anuke.mindustry.entities.impl.EffectEntity;
+import io.anuke.mindustry.entities.type.EffectEntity;
 import io.anuke.mindustry.world.Tile;

 /**
@@ -10,7 +10,7 @@ import io.anuke.arc.math.geom.Vector2;
 import io.anuke.arc.util.Time;
 import io.anuke.arc.util.pooling.Pools;
 import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.impl.TimedEntity;
+import io.anuke.mindustry.entities.type.TimedEntity;
 import io.anuke.mindustry.entities.traits.DrawTrait;
 import io.anuke.mindustry.entities.type.Unit;
 import io.anuke.mindustry.graphics.Pal;
@@ -12,8 +12,8 @@ import io.anuke.arc.util.pooling.Pools;
 import io.anuke.mindustry.content.Bullets;
 import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.Units;
-import io.anuke.mindustry.entities.bullet.Bullet;
-import io.anuke.mindustry.entities.impl.TimedEntity;
+import io.anuke.mindustry.entities.type.Bullet;
+import io.anuke.mindustry.entities.type.TimedEntity;
 import io.anuke.mindustry.entities.traits.DrawTrait;
 import io.anuke.mindustry.entities.traits.TimeTrait;
 import io.anuke.mindustry.entities.type.Unit;
@@ -14,11 +14,10 @@ import io.anuke.arc.util.pooling.Pool.Poolable;
 import io.anuke.arc.util.pooling.Pools;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
-import io.anuke.mindustry.entities.impl.SolidEntity;
+import io.anuke.mindustry.entities.type.SolidEntity;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.game.TypeID;
 import io.anuke.mindustry.gen.Call;
-import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;

@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.impl;
+package io.anuke.mindustry.entities.type;

 import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.traits.Entity;
@@ -11,11 +11,12 @@ import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.entities.units.*;
+import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
-import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.*;
+import io.anuke.mindustry.world.blocks.defense.DeflectorWall.*;
 import io.anuke.mindustry.world.blocks.units.CommandCenter.*;
 import io.anuke.mindustry.world.blocks.units.UnitFactory.*;
 import io.anuke.mindustry.world.meta.*;
@@ -79,6 +80,17 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
        return type.typeID;
    }

+    @Override
+    public void onHit(SolidTrait entity){
+        if(entity instanceof Bullet && ((Bullet)entity).getOwner() instanceof DeflectorEntity && player != null && getTeam() != player.getTeam()){
+            Core.app.post(() -> {
+                if(isDead()){
+                    Events.fire(Trigger.phaseDeflectHit);
+                }
+            });
+        }
+    }
+
    public @Nullable Tile getSpawner(){
        return world.tile(spawner);
    }
@@ -1,23 +1,19 @@
-package io.anuke.mindustry.entities.bullet;
+package io.anuke.mindustry.entities.type;

-import io.anuke.annotations.Annotations.Loc;
-import io.anuke.annotations.Annotations.Remote;
-import io.anuke.arc.math.Mathf;
-import io.anuke.arc.math.geom.Rectangle;
-import io.anuke.arc.math.geom.Vector2;
+import io.anuke.annotations.Annotations.*;
+import io.anuke.arc.math.*;
+import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
-import io.anuke.arc.util.pooling.Pool.Poolable;
-import io.anuke.arc.util.pooling.Pools;
-import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.effect.Lightning;
-import io.anuke.mindustry.entities.impl.SolidEntity;
+import io.anuke.arc.util.pooling.Pool.*;
+import io.anuke.arc.util.pooling.*;
+import io.anuke.mindustry.entities.*;
+import io.anuke.mindustry.entities.bullet.*;
+import io.anuke.mindustry.entities.effect.*;
 import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.entities.type.Unit;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.world.Tile;
+import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.world.*;

-import static io.anuke.mindustry.Vars.bulletGroup;
-import static io.anuke.mindustry.Vars.world;
+import static io.anuke.mindustry.Vars.*;

 public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Poolable, DrawTrait, VelocityTrait, TimeTrait, TeamTrait, AbsorbTrait{
    public Interval timer = new Interval(3);
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.impl;
+package io.anuke.mindustry.entities.type;


 import io.anuke.mindustry.entities.traits.*;
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.impl;
+package io.anuke.mindustry.entities.type;

 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.util.pooling.Pool.Poolable;
@@ -15,7 +15,6 @@ import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.core.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.traits.*;
-import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.gen.*;
 import io.anuke.mindustry.graphics.*;
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.impl;
+package io.anuke.mindustry.entities.type;

 import io.anuke.arc.math.geom.Vector2;
 import io.anuke.mindustry.entities.traits.SolidTrait;
@@ -8,8 +8,6 @@ import io.anuke.arc.math.geom.Point2;
 import io.anuke.arc.math.geom.Vector2;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.entities.EntityGroup;
-import io.anuke.mindustry.entities.bullet.Bullet;
-import io.anuke.mindustry.entities.impl.BaseEntity;
 import io.anuke.mindustry.entities.traits.HealthTrait;
 import io.anuke.mindustry.entities.traits.TargetTrait;
 import io.anuke.mindustry.game.*;
@@ -1,4 +1,4 @@
-package io.anuke.mindustry.entities.impl;
+package io.anuke.mindustry.entities.type;

 import io.anuke.arc.util.pooling.Pool.Poolable;
 import io.anuke.mindustry.entities.traits.ScaleTrait;
@@ -11,7 +11,6 @@ import io.anuke.arc.util.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.effect.*;
-import io.anuke.mindustry.entities.impl.*;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.entities.units.*;
 import io.anuke.mindustry.game.EventType.*;
@@ -110,6 +109,10 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
        drownTime = 0f;
        status.clear();
        Events.fire(new UnitDestroyEvent(this));
+
+        if(explosiveness > 7f && this == player){
+            Events.fire(Trigger.suicideBomb);
+        }
    }

    @Override
@@ -310,6 +313,9 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ

            if(drownTime >= 0.999f && !net.client()){
                damage(health + 1);
+                if(this == player){
+                    Events.fire(Trigger.drown);
+                }
            }

            float px = x, py = y;