From 8f582283179dfa7dc17ae29eb5e693466ba71978 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 20 Oct 2020 15:43:06 -0400 Subject: [PATCH] More base parts --- core/assets/baseparts/1603219216674.msch | Bin 0 -> 213 bytes core/assets/baseparts/1603219241094.msch | Bin 0 -> 167 bytes core/assets/baseparts/1603219316221.msch | Bin 0 -> 249 bytes core/assets/baseparts/1603219367279.msch | 2 ++ core/assets/baseparts/1603219428262.msch | Bin 0 -> 176 bytes core/assets/baseparts/1603219511695.msch | Bin 0 -> 104 bytes core/assets/baseparts/1603219540119.msch | 2 ++ core/assets/baseparts/1603222786081.msch | 2 ++ core/assets/baseparts/1603222833941.msch | Bin 0 -> 251 bytes core/assets/baseparts/1603222912251.msch | Bin 0 -> 302 bytes core/src/mindustry/ai/types/FlyingAI.java | 2 -- core/src/mindustry/ai/types/FormationAI.java | 2 +- core/src/mindustry/ai/types/GroundAI.java | 16 ---------------- core/src/mindustry/content/Blocks.java | 2 +- .../mindustry/entities/comp/CommanderComp.java | 2 +- 15 files changed, 9 insertions(+), 21 deletions(-) create mode 100644 core/assets/baseparts/1603219216674.msch create mode 100644 core/assets/baseparts/1603219241094.msch create mode 100644 core/assets/baseparts/1603219316221.msch create mode 100644 core/assets/baseparts/1603219367279.msch create mode 100644 core/assets/baseparts/1603219428262.msch create mode 100644 core/assets/baseparts/1603219511695.msch create mode 100644 core/assets/baseparts/1603219540119.msch create mode 100644 core/assets/baseparts/1603222786081.msch create mode 100644 core/assets/baseparts/1603222833941.msch create mode 100644 core/assets/baseparts/1603222912251.msch diff --git a/core/assets/baseparts/1603219216674.msch b/core/assets/baseparts/1603219216674.msch new file mode 100644 index 0000000000000000000000000000000000000000..95e7a00d9ab2c6e8f779f7c2c038a4c1132e1ed5 GIT binary patch literal 213 zcmc~TPR?Mgn4@|=Hm}8ihvfkykIw0TQ&zRV;O4g#N?L3t)S}ViwYN66jic7$;6!$L z2``TsVeMu=CB(nC{(Jf@vir?;hAR@A&If-uZgnpDM`?ZZA!D}kHNoFL|M04dyzu+Y zwZi*-Ce|i#^IrCyw);oYh#f@Iq^cXOaODys_u~tc5~6zak@- MF8;^-TU+%%0Dxa+SO5S3 literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/1603219241094.msch b/core/assets/baseparts/1603219241094.msch new file mode 100644 index 0000000000000000000000000000000000000000..d80f4f4b19d069b35cb8f04368cc8652868d40d5 GIT binary patch literal 167 zcmc~TPR?Mgn4{Wvn(MHFfa`iSwM-`6*e}L+zVsjQ&_2SR#r5~M)!d^6&*YvRN;s-z z=q4=l>`}4Z9pT&WR=r*LQ-rbg_39aazMXv;6SH=Q`F)=+=@-n7_Wxei)Vce{uh0vo zbB|ixDJn@fI2*lJyk3SuuGYYrqhsG6MTtp<25xOhJ}fu6gT6JlUUJBM5zrO4#7$gT aRBd`6~7g_v+L2WpKE9TvD^07=I^fk zmI}$tTAsact==yzx6q$_`*_~x+TT2N5)3v^Tw5-4{yH+T=D3T~5*N28E{;=L6txZs znLdiJS`sRq?Q%<_W9dh4<&}P&BC|z|Ug-CQ{5$4*RYv~E@_RELuM1u{G33IE$Olc2 zm(8wH{rbuFZedIXM_bdv1PQ~QkS|(#+IqUS-sdlE?ul^As@kfjxMTGNgPR7GVSkwY HRh_Eyr%}E}d`Jb~p0N3=^NC z)yE_5&-6O`Bu+*wK8-7y*OF0o*`&qFyLUcW{Pg-xp;hs@C#}!QoH|#(?ODJ2miF7p zMU lIKmS}@(%qyQsB7#&Y#O4BTE;xx*0fWmoSOf87FIT0sy-ZRTBUJ literal 0 HcmV?d00001 diff --git a/core/assets/baseparts/1603219511695.msch b/core/assets/baseparts/1603219511695.msch new file mode 100644 index 0000000000000000000000000000000000000000..ad1b2081190d43f46eec12e1de164b38c6b6d725 GIT binary patch literal 104 zcmc~TPR?Mgn4{Yj$kl8h!m`|O(W8D_55BJ*{DMhBLI+Pzzcr<-zU)RMn_6>kk;YcZrF_\n?2^x(Rv Hg^}N'ς$6r4Tl"=ZނbA4W'&wt3-l`PC?6s}+iyf$15a-~Y/gD>X \ No newline at end of file diff --git a/core/assets/baseparts/1603222833941.msch b/core/assets/baseparts/1603222833941.msch new file mode 100644 index 0000000000000000000000000000000000000000..565eecf779464c69bf9f53a8fa9618272e81557a GIT binary patch literal 251 zcmc~TPR?Mgm}5F2JFitiptb+O>RZwI;ulnZEcRBiGE|8%=%`(@H}j2SFvrhlh0lDL z*m$^>n)4q_c(i3!#vJ2#L*4f;(r+%yxSrC?KCd9TH0Fr6iKfdH!#AEvag%+I-TrIn zcd-71dGxHX9qS(kKYDRkXR&di;Fka2UTi;bX@`_P-(F+s*5WOFoxYzWwr@D@$*||4 z&8h~glhF>VjV%`HPZ3|m{k8R()9i(uQ%hTx@m)xrwp};-)epcde9>Mp7Wdw^WK`ZRrY><)F}2eZF%=s!MA0+lVu-$N@K2CbvR`&ubLj? z^3YYy@#o44+N8QR#3&zKZsGp;`Rh~(@&8%*Q?_y{bEW^$=#BGPQvUn@n$oo7#lg;ygjhV=;6k% Mfm7_aW(Mm30H#!u(f|Me literal 0 HcmV?d00001 diff --git a/core/src/mindustry/ai/types/FlyingAI.java b/core/src/mindustry/ai/types/FlyingAI.java index f88a125e93..10aea42e2f 100644 --- a/core/src/mindustry/ai/types/FlyingAI.java +++ b/core/src/mindustry/ai/types/FlyingAI.java @@ -43,8 +43,6 @@ public class FlyingAI extends AIController{ return null; } - //TODO clean up - protected void attack(float circleLength){ vec.set(target).sub(unit); diff --git a/core/src/mindustry/ai/types/FormationAI.java b/core/src/mindustry/ai/types/FormationAI.java index ed175524d8..3226fbc300 100644 --- a/core/src/mindustry/ai/types/FormationAI.java +++ b/core/src/mindustry/ai/types/FormationAI.java @@ -94,7 +94,7 @@ public class FormationAI extends AIController implements FormationMember{ @Override public float formationSize(){ - return unit.hitSize * 1f; + return unit.hitSize * 1.1f; } @Override diff --git a/core/src/mindustry/ai/types/GroundAI.java b/core/src/mindustry/ai/types/GroundAI.java index 0134a424fc..2a711235c9 100644 --- a/core/src/mindustry/ai/types/GroundAI.java +++ b/core/src/mindustry/ai/types/GroundAI.java @@ -13,8 +13,6 @@ import java.util.*; import static mindustry.Vars.*; public class GroundAI extends AIController{ - //static final float commandCooldown = 60f * 10; - //float commandTimer = 60*3; @Override public void updateMovement(){ @@ -57,19 +55,5 @@ public class GroundAI extends AIController{ unit.lookAt(unit.vel().angle()); } - //auto-command works but it's very buggy - /* - if(unit instanceof Commanderc){ - Commanderc c = (Commanderc)unit; - //try to command when missing members - if(c.controlling().size <= unit.type().commandLimit/2){ - commandTimer -= Time.delta; - - if(commandTimer <= 0){ - c.commandNearby(new SquareFormation(), u -> !(u.controller() instanceof FormationAI) && !(u instanceof Commanderc)); - commandTimer = commandCooldown; - } - } - }*/ } } diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 056b94d27b..414fe99d36 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1186,7 +1186,7 @@ public class Blocks implements ContentList{ requirements(Category.power, with(Items.lead, 100, Items.silicon, 75, Items.phasefabric, 25, Items.plastanium, 75, Items.thorium, 50)); size = 2; powerProduction = 4.5f; - itemDuration = 60 * 15f; + itemDuration = 60 * 18f; }}; solarPanel = new SolarGenerator("solar-panel"){{ diff --git a/core/src/mindustry/entities/comp/CommanderComp.java b/core/src/mindustry/entities/comp/CommanderComp.java index e03147d63c..124eb06d91 100644 --- a/core/src/mindustry/entities/comp/CommanderComp.java +++ b/core/src/mindustry/entities/comp/CommanderComp.java @@ -74,7 +74,7 @@ abstract class CommanderComp implements Entityc, Posc{ void command(Formation formation, Seq units){ clearCommand(); - float spacing = hitSize * 0.65f; + float spacing = hitSize * 0.8f; minFormationSpeed = type.speed; controlling.addAll(units);