From ac9e77479588754a8793fa933577e462cdae8ce3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 31 Aug 2018 00:02:38 -0400
Subject: [PATCH] Added basic turret blob structures

---
 .../sprites/blocks/turrets/turrets/fuse.png   | Bin 714 -> 715 bytes
 .../content/blocks/DefenseBlocks.java         |  11 +-
 .../io/anuke/mindustry/entities/Player.java   |   2 +-
 .../maps/generation/FortressGenerator.java    |  94 ++++++++++++++++--
 .../mindustry/maps/generation/Generation.java |   7 ++
 5 files changed, 93 insertions(+), 21 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/turrets/fuse.png
index 2c1946a064663dd06997fd2643f0e58dcfd9ca99..a204f941ad75920e9e80dc0398abfb9dcab9a483 100644
GIT binary patch
delta 662
zcmX@bdYW~DW4%1Htorw&YJLU=rYuhv#}JR>Q^O21gcC*nz1!ernQ>IDK&1WH=_>II
zF~R8q95)tj?Y_z<JEfufVVhHaVNvG=#j6`%JP7FVUfiuPMUT(PV8W4$CXzBt+b-}Z
zPMPwD?^oTw-|zR|`RS}sUitp_yS?9Q^_O4GGIg0-wf7vugL^0IC$cf<w|nz2%(JOm
z;rjGdAY=Z$ed%BRzU<#GKl8_a4xh^{nX_2rmhbw(!lF~(Z&kjou3Jsvz-e3Y>D7At
z1v%UdA3k0dWH4Y@bNekLL)2S7h6hiM)vByYRaup4+Q>0)<&%hIlaiG@SKmE&D{Ef-
z@*wXy5$7g*mKbWhz5CSpbVz+s&hZyNo34j_wp&zx%4yl8&rds5tQyt1Bh4~;4Bqq`
zzUi+l2>Cy`RcEn`VZVn{s@K7|%tx=wSKod3_GWCngU-x(c@;nYKHbg6(0ok8p=iT=
zu7>=j=NTD3pWe)PVOjN>xp@@_xwi427jS!YLrmtj)9SkquXa3WKE}~}jN@teulkb3
zdw*Bnbq}if*R5W;lyiOB?+-ld?PES4y~NDMA#~N~zP?fC4WZD}ArI!~KV96uXNOVy
z(W#dAZG$31<`kW<cI(e~3p%&K{@Gu#)wguYe#SgmmGN4uU8kA(z`yR<c0yUL$<Y<x
z9yqNu`xqmrUv^!bNmoJW@SKFrH(HaUZ+OkGPp<o^^g#OXoW}533tnoq&CyA5j?JE7
z+*rM6N~&kK-?e>qyUrdAU8YztNo#9&jE(N{mvY%vb87va=RTVrAlkZ?vuGJtjTEQn
z%xkS~^}kkG3K-6u5XL&QKaMG+l5u9&)DFi*?kNSoVyC*hPmYhy_?0xFBEDvUMP)sM
agjW6fH~hi=n;94w7(8A5T-G@yGywoQ%RFxY

delta 661
zcmX@jdWv;|W4(;1iSj=8fQt+aOqrf8jv*e$r-s>P2q#L^?Mo1~%y131@M=Hyx=K7l
zypX%m$$HDKh_@FUId@3pX?zh|t|urHB-_l#mlPu<t0m$j&aP-O;mE~5JV8vk3pHB;
zf<9Tk`2F#2dHu)c19v~}IbZz#x83{d#HB%;fy;wd7BEEQO|6$?*z@XqAw$KtFNWP+
zy{?S+_WnQe^4HJv`|U%2>}M&7ZD04=#m=wnF}J|RD%sL^@&5&N9a_S7o2@I$W!&Jy
z%<$o9wj_fE!@az628OS0!VDL7{bl%=#P>1jT)cyt|FdA5nf`^5OYUVP<(lfg6YjKB
zTyt!tlA)-}_meeU`Ps7d;uX23Z-st6*YTgDBc%N4<x<zWJ@t)s<sEh98V3Tu&X0?F
z!eCRVB9sx#WPNku>U&?^f~P$Hde~YoCt<Sxb=f&GGKLH<LfPde_P4gQ*A)MgVKCTQ
z5d6TjmWd%?Gylz(yB?oS$bQe`s5C9}fD!K%Y2S&xKKEAh73`^RyfZuENBx4@AEl>N
zCsqE8X0g0E@kCnod!Bsz`vr+FS#6m<Ci%S)4|UP&j6eD3#QwX!?&g(gsY1rulh>v1
zeRbe+fc>2O$=kQ~-ROBTr><P%m2UdhiJ9H|RzzOB_BD5t7av3G+{o!1Qx6&O?x`qw
z`P%Gf%;fy0n%EmNTbK23n3#Fkh&Sh4{ru#thnI}aXW22TTRWZombuAh;w#1a)qgpp
z{3<8i{I33;W#^mhsdLtNJzbP@I4SF!BKO}#7o&rM4?k1A;OdyI)MMk*qBiSV>wCRL
z4U?Od-M%fobV7dN)3BMWM=Nu*x=$!nx;;sCkK^xJeE7<K-7B?{D)!UkGv@5De<IsG
Wp{IZ^;TZ!11B0ilpUXO@geCwerZdw3

diff --git a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
index 3dade68ae1..dbccab63b9 100644
--- a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
@@ -7,7 +7,7 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.blocks.defense.*;
 
 public class DefenseBlocks extends BlockList implements ContentList{
-    public static Block copperWall, copperWallLarge, compositeWall, compositeWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, deflectorwall, deflectorwalllarge,
+    public static Block copperWall, copperWallLarge, compositeWall, compositeWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
             phaseWall, phaseWallLarge, surgeWall, surgeWallLarge, mendProjector;
 
     @Override
@@ -41,15 +41,6 @@ public class DefenseBlocks extends BlockList implements ContentList{
             size = 2;
         }};
 
-        deflectorwall = new DeflectorWall("deflector-wall"){{
-            health = 150 * wallHealthMultiplier;
-        }};
-
-        deflectorwalllarge = new DeflectorWall("deflector-wall-large"){{
-            health = 150 * 4 * wallHealthMultiplier;
-            size = 2;
-        }};
-
         phaseWall = new DeflectorWall("phase-wall"){{
             health = 150 * wallHealthMultiplier;
         }};
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index e3311173be..9cfc987a14 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -522,7 +522,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
             isBoosting = true;
         }
 
-        float speed = isBoosting && !mech.flying ? mech.boostSpeed : mech.speed;
+        float speed = isBoosting && !mech.flying ? debug ? 5f : mech.boostSpeed : mech.speed;
         //fraction of speed when at max load
         float carrySlowdown = 0.7f;
 
diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
index 260dc5432b..0c59008089 100644
--- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
@@ -1,5 +1,6 @@
 package io.anuke.mindustry.maps.generation;
 
+import com.badlogic.gdx.math.GridPoint2;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.Predicate;
@@ -9,8 +10,18 @@ import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.type.AmmoType;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Block;
+import io.anuke.mindustry.world.Edges;
+import io.anuke.mindustry.world.Tile;
+import io.anuke.mindustry.world.blocks.defense.Door;
+import io.anuke.mindustry.world.blocks.defense.Wall;
 import io.anuke.mindustry.world.blocks.defense.turrets.ItemTurret;
 import io.anuke.mindustry.world.blocks.defense.turrets.PowerTurret;
+import io.anuke.mindustry.world.blocks.defense.turrets.Turret;
+import io.anuke.mindustry.world.blocks.power.PowerGenerator;
+import io.anuke.mindustry.world.blocks.power.SolarGenerator;
+import io.anuke.mindustry.world.blocks.production.Drill;
+import io.anuke.mindustry.world.consumers.ConsumePower;
+import io.anuke.ucore.util.Mathf;
 
 public class FortressGenerator{
     private final static int coreDst = 60;
@@ -31,33 +42,96 @@ public class FortressGenerator{
     }
 
     void gen(){
-        gen.tiles[enemyX][enemyY].setBlock(StorageBlocks.core, team);
-        Item[] acceptedItems = {Items.copper, Items.densealloy, Items.silicon, Items.thorium};
+        gen.setBlock(enemyX, enemyY, StorageBlocks.core, team);
 
-        Array<Block> turrets = find(b -> (b instanceof ItemTurret && accepts(((ItemTurret) b).getAmmoTypes(), acceptedItems) || b instanceof PowerTurret));
+        float difficultyScl = Mathf.clamp(gen.sector.difficulty / 25f + Mathf.range(1f/2f), 0f, 0.9999f);
 
+        Array<Block> turrets = find(b -> (b instanceof ItemTurret && accepts(((ItemTurret) b).getAmmoTypes(), Items.copper) || b instanceof PowerTurret));
+        Array<Block> drills = find(b -> b instanceof Drill && !b.consumes.has(ConsumePower.class));
+        Array<Block> gens = find(b -> b instanceof SolarGenerator);
+        Array<Block> walls = find(b -> b instanceof Wall && !(b instanceof Door) && b.size == 1);
+
+        Block wall = walls.get((int)(difficultyScl * walls.size));
+        Drill drill = (Drill) drills.get((int)(difficultyScl * drills.size));
+
+        //place down drills
         for(int x = 0; x < gen.width; x++){
             for(int y = 0; y < gen.height; y++){
                 if(Vector2.dst(x, y, enemyX, enemyY) > coreDst){
                     continue;
                 }
 
-                Block turret =  turrets.first();
+                Item item = gen.drillItem(x, y, drill);
 
-                if(gen.random.chance(0.01) && gen.canPlace(x, y, turret)){
+                if(item != null && item == Items.copper && gen.canPlace(x, y, drill)){
+                    gen.setBlock(x, y, drill, team);
+                }
+            }
+        }
+
+        Turret turret = (Turret) turrets.first();
+
+        //place down turrets
+        for(int x = 0; x < gen.width; x++){
+            for(int y = 0; y < gen.height; y++){
+                if(Vector2.dst(x, y, enemyX, enemyY) > coreDst + 4 || !gen.canPlace(x, y, turret)){
+                    continue;
+                }
+
+                boolean found = false;
+
+                for(GridPoint2 point : Edges.getEdges(turret.size)){
+                    Tile tile = gen.tile(x + point.x, y + point.y);
+
+                    if(tile != null){
+                        tile = tile.target();
+
+                        if(turret instanceof PowerTurret && tile.target().block() instanceof PowerGenerator){
+                            found = true;
+                            break;
+                        }else if(turret instanceof ItemTurret && tile.block() instanceof Drill && accepts(((ItemTurret) turret).getAmmoTypes(), gen.drillItem(tile.x, tile.y, (Drill) tile.block()))){
+                            found = true;
+                            break;
+                        }
+                    }
+                }
+
+                if(found){
                     gen.setBlock(x, y, turret, team);
                 }
             }
         }
 
+        //place down drills
+        for(int x = 0; x < gen.width; x++){
+            for(int y = 0; y < gen.height; y++){
+                if(Vector2.dst(x, y, enemyX, enemyY) > coreDst || !gen.canPlace(x, y, wall)){
+                    continue;
+                }
+
+                boolean found = false;
+                for(GridPoint2 point : Edges.getEdges(wall.size)){
+                    Tile tile = gen.tile(x + point.x, y + point.y);
+                    if(tile != null){
+                        tile = tile.target();
+                        if(tile.getTeamID() == team.ordinal() && !(tile.block() instanceof Wall)){
+                            found = true;
+                            break;
+                        }
+                    }
+                }
+                if(found){
+                    gen.setBlock(x, y, wall, team);
+                }
+            }
+        }
+
     }
 
-    boolean accepts(AmmoType[] types, Item[] items){
+    boolean accepts(AmmoType[] types, Item item){
         for(AmmoType type : types){
-            for(Item item : items){
-                if(type.item == item){
-                    return true;
-                }
+            if(type.item == item){
+                return true;
             }
         }
         return false;
diff --git a/core/src/io/anuke/mindustry/maps/generation/Generation.java b/core/src/io/anuke/mindustry/maps/generation/Generation.java
index aa7535279d..5677d57f86 100644
--- a/core/src/io/anuke/mindustry/maps/generation/Generation.java
+++ b/core/src/io/anuke/mindustry/maps/generation/Generation.java
@@ -23,6 +23,13 @@ public class Generation{
         this.random = random;
     }
 
+    Tile tile(int x, int y){
+        if(!Mathf.inBounds(x, y, tiles)){
+            return null;
+        }
+        return tiles[x][y];
+    }
+
     //TODO implement
     Item drillItem(int x, int y, Drill block){
         if(block.isMultiblock()){