From 66918f032272c4c413ac0fbb0e7a59e23e8799cc Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 27 Nov 2020 17:37:22 -0500 Subject: [PATCH] Campaign balancing --- core/assets/maps/desolateRift.msav | Bin 8516 -> 8827 bytes core/assets/maps/tarFields.msav | Bin 15511 -> 15520 bytes core/src/mindustry/Vars.java | 2 +- core/src/mindustry/content/SectorPresets.java | 2 +- core/src/mindustry/content/TechTree.java | 3 ++- core/src/mindustry/content/UnitTypes.java | 4 ++-- core/src/mindustry/content/Weathers.java | 2 +- core/src/mindustry/core/World.java | 2 +- core/src/mindustry/editor/WaveGraph.java | 4 ++-- core/src/mindustry/maps/SectorDamage.java | 2 +- .../maps/planet/TantrosPlanetGenerator.java | 11 +++++++++++ .../world/blocks/distribution/Conveyor.java | 2 +- .../world/blocks/distribution/ItemBridge.java | 4 ++-- 13 files changed, 25 insertions(+), 13 deletions(-) diff --git a/core/assets/maps/desolateRift.msav b/core/assets/maps/desolateRift.msav index ca3181301ad786177ffc465f04770cd4d123953b..06bb064d0d183e73cb9f7f701e889ad14d0a4d37 100644 GIT binary patch literal 8827 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%0DnHyhP zhX0>zY&TKPQOoMJ%EtN&%Mb4q-Fa$GTW66=xnIisJ+t>kxbX#VGFA~a(sFW()mbCP zwOn>mpqSCL!#l2h;!4~WVH+grS7v*$Gf$ht_f=H+t5XejpX~z#1X31D>ds<){Q0*c zt3p>$t%%dagn2)MypK#{(f#Un>xsyOh4;H-N)ClB-H@Q@BkLug_0Q9@zQ%jc$Idrd z|2GK;Z4qJ9js1B|f07=Dq!w@NpV^%40aB}kCVD@K)G3Z*owxmhepB;hE#WN^LQC$4 zu)H*z>^zlgxlG$vFFw{Vf#O4TbDG2V&s^#9>O>U(ocZT3_V{Vve98I0`OoW5vh9_# zxG(8jy!tjF^5NSv*Y&TZ&SulMe)+Nf(X8(J*!o*;@;NA~2HqlhafG8L3L$_zuv&`&Tu!Qy2f$aRYJx@J@zJAl- zsof$x)i+(sB9GF7f)Mu_B9lSW}hmZPuD~afWQW+|`1*lM6(4+FgFQ`km*FhVX3$SNhKc z%bt!=YucpJ@x}PhQ3IP0=LJ=5XVrR&54p2t*s`y1+cAsd%(Sds-Mb#{ao7HG=Hm+I zT9s+4SHEle(@8%U+?z9FrrsvEbFC4g<}81j4Ss4@Jk{9Dd;C+ifPt(i#Ud4Pa z4G&)5Udk8UndhkaBw_Zvlq;DXkE8hbOdCxZSIKYA^bon=I4R8Ab$X%1p4e!eeWEo} zl$+16?VT3Fkh$VmF<;H`|Mgb&6#`jlrY+*#yPhA85bBOqWzrYTKD8oxcWi0On$tUa zA|rTH6CCdf=}q?hm-h3n!0!AOyA}VxD{*~^R)y{y^m(GSKHxQwa?=V!@6J-@5iEjU~&T zeP49_-JYMhLVMbumG`~S*|+pA`;q@*7mFvpST~_2X_CG`yzipq&+~O}&#%zG9P>42+V2HE%NQ?rzWzKVL%aH$Wc9c31=Vl5 zKh0p;U>E)Emzbw}j&zT_;+8kn3etya*43`QvfRTU=={Ahon8-X0b7Zp!}~b@F1s>4 z_lMm>*BZZb79O`Y8bmycuc(`KA;0}c%AVC%)YUAL=9`^d_VlO7quKS#?51mAou{1;yDJNZHJoq~@}ze|kY-jokWGhZwB(UOm6 z`@`jOyrt{!>Sl?vzjb&s>F+9sZ3UA*B>&d^{Co18Z>I0dFW+K$#kV{*_P12SR&IeG ze)+zy?>n3~%->a~an*iHiS>N#h`sgiZJcOTLG% zJ=t7Z{%5zN!Mp&8!)D<+Idhg4e{%XByJ=Zv7~6j4SmidUA`j!@a9btF;kvq zNTfR4SG-_sxg>^ddhDwsr>wpnPQTtc^@;9Z{Ye?w^)2)FJ{3CXaEH5LxBSjijM;J; zw@zOvlid+iB)31uw|zCsb-5L~RX5ofW-fm$Ub)9L>v7%2uR`Ln68sIPxmL&R_YHdL z{HncP=B56mmm95i%3r$q^}*c5|4cLAzj$`0LvTUHZA&}Bd~Nq>XVSgz96#9eqH=CY z^~?vk6$SSa^&&6STR&MVbHSV=WoE>j#SD{$eqWU-I(;Nq^J9ZKaCW#XHQVyym)i@YADxF)qcQoF#(I7B$rG@OC-b_}l!& zKeHDKifVNm>)W3+2ySuwurVWArGod6z3=zuj@+)(q7UvXU&wm@Y`|};t=^t&8S}1t ztcy9K(=4WVqrNSru^^4pPtbuYrmZ#ciPgnxOP=TavT?{1IK#Rqv#ns6oKD$BX_nQw zx#tdQcx-&wwL9`s;FF8jwC z81(Id`n+1BnlpQzbL6$xEcW<2-B!{tW*Xyh*_L1i-i_KR^HclhYfkd*yrtjFm$#vQ z)`2V67kzVW+U!-J75CrhVDhe{Mclu)ue85)VA=KkUf-e_!oRGos#xoGqGtmnx-eEFiy!C9Y5PHelPG`Cpiaii0tgHiSDvJ=jwz9`za+4;kk6HguEdQ+yb ze`k8JV2RVmgsykVlMah~?5@vwY`1P#`|5cIrwZv^(VZ@5^Wbeqzja+2hkx^vh|iB~ z!fzbqskxT!Qt?dp?7H~gH)|gMl>cPxYm_fIkL!hs6Qjkvj|`F-i+mox;`+$9#Qem= z*3#gG_h)CK0XW^Jg$!6&{VnqdvH=l|; z^x|Z{9jMwoIa%;iVP8oAPtB!+F)F`PW*8m}`Ca(0xbH{Ar-V)SlrNS07)7dBRXXXj z^==GgGrQbf6`>ZnrQz|sS2pJ!L@4djZ}jsM)%+)_nYKpgj_ZZ`i<15)8ji5B?`O!{ z5Tjsaa4qiRBZcEXx^7JQ?Ayb?*=7Fc(yi0Cv70aau2b9-8}6u{RngRPx`aXYPf?_O z`rnfFR~*L66y&+~yW{T28(++j`x9lMLHqKi9b#Ip3ep)?5BY zJJ0FF)@T*kv(-PhJvzC^Wyi+-$AYi#=UW%{>GynfS^wbwMjsz$O_4nnnA4pleSO7! zofl6EnDP#-cPkLId-j{P>Ga2*&%)2IMP8T_!#ZzG$W4XZ?jx5?FNq%Sll=5>k6pd@ zlEv*T?!c>*Htz`vhy>74_Zs$~ojuFJX#0y!mc%@0qe-wF+&O@^#Hp zEYm-`v_6V-sWI52^>x43pQ69FPwcUG|8m8sq(0=p)8f9h8P=EOYUZ7I{8DIL>$VeR zwL9kYTe6*N^b48J=|A^L-Q)*%6o07x*q$~czM22}8H4+Zzslb=9{fGM<(5~w_Mu7X zy1QI9_=--O?SFW`>#Jh-MJFVE-ZxjZap+yvXFJ9%$LVS`AvG!EqOeHB7OpQm)9ycN z{$4-haEk5WdX-b9hcDkVs%(vyTwGSJ*`2U^_oaJ=`&=fbPSp7qD3|1y*duZFnbn7o zX6;hTltm@aIbH|}etK-PAos#bBe~>j&;4_Ku*zHQG25R*B~fks{Y>Ux z{?{e?R-G+2o9A?R|4z?{kM&a=CyH!iyg$QD^v8^iHNuYf7RO(x-@j?S-KFsKsI0pa z+&fOJbbT|uQC(|$X5Wp%!d8uo|BD)2J_%(=%BvKw-y^;@-J;0hzPrlK4@K6yOMd)j zFe-UeQfc08*FH;T-{Z}1&sDcNUcI+p)`!#W?{cApW;Q!8vv!m5#FPLDQ@b%#OyUq3U&)(n3f4}{n%6yKvQ^)ViGwF3?oOJN2 z_2&Kf|9A6yrInuibL>7obg!4T`BNY9^~sj5Pjb7a#;wV^@~`*|-(02Vi5FiV-5j5z ze!qHlq=$)y|E52i`(wW2@BF~D==P&ldC_mmp6gW33-o%5 zr?XoB{PRQQcgRn@D#nt``k7jDwBJkqD(*OQmUTaG_TTl-9MymQ2;XdX~h(_#p0dsZ5XM5dl{G7wCV}4~{z2cAWSwHO!D9ePo?opdEX@-79 z!oN$)ANpL-@yW7ujL{amZQXT*Q}3UgYU(%ptNwDg_e86zs;;kWd#HY=^UfLO6L<1H z&*l8=GjrDA6Wi`iGhxlEn{d6oQuw*+kKoIx7k6D*ulW4Ef9JRIBXx5w9LQYK+Y|et zCWFc9eB0ywrQ8vXzY8p8J*sbh&63_V@3UQ##2uTt_P3NA;}j=@M4jYl$*1erX40T$Hc)-fcAh(C!H_xwZTa+t%zBRWsi`UHZM4qxurTKhBrj+fPI; zn0e$oZ)LiYv!CYd%U#SdK8(G~5AS-c`v2Vb4$W#3u0H7(Zp=&cFrJ`>MI ztJt2Iw&&lO*C)RpT$}&#p1`}y%hLCJ>#aAhx7D@KlYOW8U}kJ=@N?d~|DL^X`Jmez zegAX%>&oB)moJ}wHB=uD?zp|BY$LCHogXy@g;t2?9GYiN!wH2^gaB} zq8+ck|GcnRx-|6Dk1K!Otxe7@eSJ^jz@M)*(}dqgYgH6wPV|#*S?+33v3dXMj@a3! z7regbku6+bvYuuA|2#pR`P-yUMt*KPwC~wLm;ALtd-p6~om;$Oas9-UbJDvi^=eNx zmrwlR$C2mdxzKHk-T||-t9RdtQU4jP!R4|+_xBlrdsZ)2G`yDI_F3xU>etKOO*pS} z(SCYkd{aSemQ=~y8s3WfCHwh(a;LtRlz%Upu*bJ)dR0Z`+THa$yX@C8rT|qv!BiRi>M4>p#Apr)#(2K(@*r ziwjE92{Zkg-)&8Zj#a#|X1&qFw3t2fjqe!0SoB-wg`(Cy{i|&EoTZOB#a&Lb4S90! zrHQIkmfZc+2d46}SC7iQGpgSa7%G`Fowq;k9B0mQ;{(5ooo=jNVA*$lPQAU# zto2nNgqjZjDYvQE=ljWyv!#q9D*Jc$V7^uXc}mFTgAMsk!NTd$Q#GEKi#%0kLPz%9k#R*gh6kh-oia_wlyh<;}eP`tf!< zcKvS1*vGxc{LsmNTrc9}maJs0x-l`G?R{gtT-qwZ+&j~=+aK!|#yRWyn6+JnqacDnd)q~SVnVzSHojfw znU6Q?u0PMd;J5tp18Y~5pUl7R$bW6B!}p4LK)&-$r3uG!M* z{NXm1E^_iS zM?{}vJP}oQ__8zCuJ=9s){AAzc)+&agChK6HoZ4tL%98$oBl_lx)%S-<~#OQ^fuvY%(y_nu^~+n!guUk4w#t@Ch|Am2Ul?VRiS9&FZn zvsw4jO_4Voe19GrEBQ8^w`_mDGVNsi>H}Nv@V#AkgR`u$a9+NUT%6x?+avW3Wye2e z%=$4y@rP-_V_yZ^B`WK6`c6#Fy?xp8_2$=C8G9Bp@5)}wllSJ-m*2_XBT5#2{i4h9 zoGn5vCVN_9`?sI34kpGqeykVFYp!_A{2<&RTix#aLA%q1`+05$y^m+N+q_x%vFW^1 zT`z2}Uz1s!b+1JLL-BE@jM!6!r8i&QI{H!TL(1Ay>o~3KCrx_0{e+lB+_}l; z8{Gd_*56ooRWe=pk0Fzt`vrxF+)3v{FU)PJlRcAcagFtTcf8^b-b2AEyT3eKE?0B6 z?McS7ns}DG^6w5ml?Xh2;5olf0nhh`kK=!x`{{U3GD5M>a`ne_$6F7Sa>TUL*KvJ# zA!l5DPU+I_{o$Ld_ZF#dYChDZ!&%8R>VEF;l zb=7rpF}Z>2w-dM|jO#DfH@xmBy`(T-^x>WJ+WS}!o!!`8K2PM}QKS3Qe&)cC@%@gXN9?Vb?yvOKB^CLFHYYetE=bB%3AGojTuyteWp8J=qE{9A! za?+3cKx3~kGrwA8PdtQNgGv|6I$PeVsr^5<`tkekFJh;i(u-uZ^$o9A^L{XS zmd+0|!;_&)<~?{md0$n~@^_(Z(sGA;JH79{kI{X;)KG0TgH^=?=Sen+SC{-YYl+Wz z$Sm)Z<+5w1?|zR*sTZ6T|CCC^DRgLlU2*PbwlSX>zfVQNX2u$gtDP)wKXP3>)IPsL zX^Og0slbDrbjcEhlau8gwspL>XPf&cu3kjK;ma<@=b{gsJaczA@9%dI_t|0Z7H@Z8 z`@{OZ;1Ja#w^}u!+A8`|8(~0O?x=3 zCcfsY-?P*7EpPw!&_$`TB|+ba6AdhEY3Pu-y4!xpW~ zv%IgwSDy8MF;`D*=OOXiXC}%&nBHcVFq^Bkp79Xxx@{feb_XN`{jWRl-ztiEa#Hus z7DMK|OJ!##3)dfh#?;!cEh(Y9h?kx3_5-ymclNpd+jqL&On2YM#)@7>5B)Hnj$Zzl z*NvNHKh`qDUU|@TtM+`Fb;oDX3rBkYm~d-YD~dSb@}_>NT^nj0YXS6}B;^84*%9=^WpH~JPVJGdSyNuT`a@o*00-YG#C=+ zvd@({82@FyxeL2|(%MEo9_3f(+hb=Q*KV2o`{R=(`!yOSw*@cYmfjQaOn;lA?S96! zfm}2HU0!he>Cf)0KbEWNnP(k8b*28~Wp)0RK(*&9YNs50udlS#W7gW47=ae@+yeaxE{~!8E{y+c3 H%gGA?SdI9o diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 8b89e09732..d0995ca3a8 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -88,7 +88,7 @@ public class Vars implements Loadable{ /** duration of time between turns in ticks */ public static final float turnDuration = 2 * Time.toMinutes; /** chance of an invasion per turn, 1 = 100% */ - public static final float baseInvasionChance = 1f / 90f; + public static final float baseInvasionChance = 1f / 100f; /** how many turns have to pass before invasions start */ public static final int invasionGracePeriod = 20; /** min armor fraction damage; e.g. 0.05 = at least 5% damage */ diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index dbfddbc142..e84547dd5f 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -83,7 +83,7 @@ public class SectorPresets implements ContentList{ }}; desolateRift = new SectorPreset("desolateRift", serpulo, 123){{ - captureWave = 30; + captureWave = 18; difficulty = 8; }}; diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index 6d82895b97..a20917c054 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -471,7 +471,8 @@ public class TechTree implements ContentList{ node(desolateRift, Seq.with( new SectorComplete(impact0078), new Research(thermalGenerator), - new Research(thoriumReactor) + new Research(thoriumReactor), + new Research(coreNucleus) ), () -> { node(planetaryTerminal, Seq.with( new SectorComplete(desolateRift), diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 7295f1dba3..ca74a26868 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1252,8 +1252,8 @@ public class UnitTypes implements ContentList{ mineTier = 3; mineSpeed = 4f; - health = 500; - armor = 5f; + health = 460; + armor = 3f; speed = 2.5f; accel = 0.06f; drag = 0.017f; diff --git a/core/src/mindustry/content/Weathers.java b/core/src/mindustry/content/Weathers.java index 0d5c47e56a..2006e6fb05 100644 --- a/core/src/mindustry/content/Weathers.java +++ b/core/src/mindustry/content/Weathers.java @@ -53,7 +53,7 @@ public class Weathers implements ContentList{ baseSpeed = 5.4f; attrs.set(Attribute.light, -0.1f); attrs.set(Attribute.water, -0.1f); - opacityMultiplier = 0.4f; + opacityMultiplier = 0.35f; force = 0.1f; sound = Sounds.wind; soundVol = 0.8f; diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java index c4819ed222..a167a32ecb 100644 --- a/core/src/mindustry/core/World.java +++ b/core/src/mindustry/core/World.java @@ -311,7 +311,7 @@ public class World{ //TODO bad code boolean hasSnow = floors[0].name.contains("ice") || floors[0].name.contains("snow"); boolean hasRain = !hasSnow && content.contains(Liquids.water) && !floors[0].name.contains("sand"); - boolean hasDesert = !hasSnow && !hasRain && floors[0].name.contains("sand"); + boolean hasDesert = !hasSnow && !hasRain && floors[0] == Blocks.sand; boolean hasSpores = floors[0].name.contains("spore") || floors[0].name.contains("moss") || floors[0].name.contains("tainted"); if(hasSnow){ diff --git a/core/src/mindustry/editor/WaveGraph.java b/core/src/mindustry/editor/WaveGraph.java index e908e7d934..d6a33bf6ff 100644 --- a/core/src/mindustry/editor/WaveGraph.java +++ b/core/src/mindustry/editor/WaveGraph.java @@ -17,7 +17,7 @@ import mindustry.ui.*; public class WaveGraph extends Table{ public Seq groups = new Seq<>(); - public int from, to = 20; + public int from = 0, to = 20; private Mode mode = Mode.counts; private int[][] values; @@ -114,7 +114,7 @@ public class WaveGraph extends Table{ Lines.line(cx, cy, cx, cy + len); if(i == values.length/2){ - font.draw("" + (i + from), cx, cy - 2f, Align.center); + font.draw("" + (i + from + 1), cx, cy - 2f, Align.center); } } font.setColor(Color.white); diff --git a/core/src/mindustry/maps/SectorDamage.java b/core/src/mindustry/maps/SectorDamage.java index cab8c2060b..e2da570bf8 100644 --- a/core/src/mindustry/maps/SectorDamage.java +++ b/core/src/mindustry/maps/SectorDamage.java @@ -382,7 +382,7 @@ public class SectorDamage{ for(Tile tile : tiles){ if((tile.block() instanceof CoreBlock && tile.team() == state.rules.waveTeam) || tile.overlay() == Blocks.spawn){ frontier.add(tile); - values[tile.x][tile.y] = fraction * 26; + values[tile.x][tile.y] = fraction * 24; } } diff --git a/core/src/mindustry/maps/planet/TantrosPlanetGenerator.java b/core/src/mindustry/maps/planet/TantrosPlanetGenerator.java index 934291dab8..d74f94e250 100644 --- a/core/src/mindustry/maps/planet/TantrosPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/TantrosPlanetGenerator.java @@ -3,6 +3,8 @@ package mindustry.maps.planet; import arc.graphics.*; import arc.math.*; import arc.math.geom.*; +import mindustry.content.*; +import mindustry.game.*; import mindustry.maps.generators.*; public class TantrosPlanetGenerator extends PlanetGenerator{ @@ -18,4 +20,13 @@ public class TantrosPlanetGenerator extends PlanetGenerator{ float depth = (float)noise.octaveNoise3D(2, 0.56, 1.7f, position.x, position.y, position.z) / 2f; return c1.write(out).lerp(c2, Mathf.clamp(Mathf.round(depth, 0.15f))).a(0.6f); } + + @Override + protected void generate(){ + pass((x, y) -> { + floor = Blocks.deepwater; + }); + + Schematics.placeLaunchLoadout(width / 2, height / 2); + } } diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index b3218ea7be..0b6181c80d 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -311,7 +311,7 @@ public class Conveyor extends Block implements Autotiler{ if(len >= capacity) return false; Tile facing = Edges.getFacingEdge(source.tile, tile); int direction = Math.abs(facing.relativeTo(tile.x, tile.y) - rotation); - return (((direction == 0) && minitem >= itemSpace) || ((direction % 2 == 1) && minitem > 0.7f)) && !(source.block.rotate && (source.rotation + 2) % 4 == rotation); + return (((direction == 0) && minitem >= itemSpace) || ((direction % 2 == 1) && minitem > 0.7f)) && !(source.block.rotate && next == source); } @Override diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index 6e310d0e55..efaeaec5ba 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -93,7 +93,7 @@ public class ItemBridge extends Block{ Draw.reset(); Draw.color(Pal.placing); Lines.stroke(1f); - if(link != null){ + if(link != null && Math.abs(link.x - x) + Math.abs(link.y - y) > 1){ int rot = link.absoluteRelativeTo(x, y); float w = (link.x == x ? tilesize : Math.abs(link.x - x) * tilesize - tilesize); float h = (link.y == y ? tilesize : Math.abs(link.y - y) * tilesize - tilesize); @@ -145,7 +145,7 @@ public class ItemBridge extends Block{ if(config != null) return; Tile link = findLink(tile.x, tile.y); - if(linkValid(tile, link)){ + if(linkValid(tile, link) && !proximity.contains(link.build)){ link.build.configure(tile.pos()); }