From 38e55ab54155fba51a3d44a4b40f7c264fcf79ab Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 24 Jul 2020 23:38:33 -0400 Subject: [PATCH] Added most things to tech tree --- .../defense/large-overdrive-projector-top.png | Bin 516 -> 0 bytes .../defense/large-overdrive-projector.png | Bin 1333 -> 0 bytes core/src/mindustry/content/Items.java | 2 +- core/src/mindustry/content/Liquids.java | 1 + core/src/mindustry/content/TechTree.java | 431 +++++++++++------- .../world/blocks/units/UnitFactory.java | 8 +- gradle.properties | 2 +- 7 files changed, 264 insertions(+), 180 deletions(-) delete mode 100644 core/assets-raw/sprites/blocks/defense/large-overdrive-projector-top.png delete mode 100644 core/assets-raw/sprites/blocks/defense/large-overdrive-projector.png diff --git a/core/assets-raw/sprites/blocks/defense/large-overdrive-projector-top.png b/core/assets-raw/sprites/blocks/defense/large-overdrive-projector-top.png deleted file mode 100644 index 4daa23ba53a6f620e90c37b3a57cb93ff576abb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 516 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z_`!T z#WAE}&f7Z&9S<7_xLoAD+v2t$j=ng4Sd2@Rn)LVbbwdN4f<{ahY@D4B_#en9DKwco9AJ1?{ejg(BEIMQqyHRMGK^<965JS!nPvzc z=wV1>F;H%hgbV#-;`zh;bHC*Kqrasm2pp{8|JSeZoPp7v;U7cjJVmBs>%BMwu3CGX z_z~*KxT>m+Q)<7KuEW(kjfak{e>A^Xzw^)Yn9d#nt2$Bsj6Erx>?SHoPCtHx+AR65 z?rpb3eYJbUFT>DC(?eqXS*NoEw^fBUt`SN+J-yVUs%33_xbjNDzKX=jOI$5pO--F7 y^zg*=Z=KeMF0NlI5_d=H!If}vW>`EhRR3n3Te&IX@}uUjATdu@KbLh*2~7Z;CDUmD diff --git a/core/assets-raw/sprites/blocks/defense/large-overdrive-projector.png b/core/assets-raw/sprites/blocks/defense/large-overdrive-projector.png deleted file mode 100644 index 61515689d04adcc92ce857510a0d27fe68d3e4e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1333 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^SB{&>1LhE&{od)K<}ih~I2 zg(zjE`LYU5hd3jdl+qYIQZksB!VW7*q^KwdUwK~puKNAA3yqs+zWQW)S8sP+p1fUM z)xSSqrT_f+`BbpTuX3_cw9iWa>VWINDs zpihD?pz}bTq&M>lhlKnSml=%&Z{(+*W>_T9XHv(aO=O69k^S z%qjiDyuk57$O89-8Igg#1#2J2GYGMqW}nZY6CAB2_{-`a^9H96E7t$pmK9(pofvXl z@c_p`;eV@cI|)e%IegZ3R66s@f^~1+*d8tfC=^c_F6#Wymr zN{Dvw)VDTp*-Ix*na-IIy5Q;TjlY-13hqhf=3qI`+qO*hmR-l!&t-jqYOlWrHa*~# zZ%oL2-k0;MIKaN+tlyJ4S4#N4M!px?vVG4yMPKfwuX^v#ES>*n>8q|8bB~mU-7MX6 zmC3-_p*`Pm!#D9*C6InJm zWlUNgs@<^kU~I4YnY7@=`tFmqIdU6lFMsQ_nQ4Lb&$8f~dpT}J2Xh}-F-PsC)(M6W zE&UEBm|mRD+I?UZgAGS z8%y1@zt7oFk~+Q2-I)JGhM-C8O%rCLGtQHwShyw5PEh&0pyrC4Yf1B`Gna#m4lSQC zEy&i8yK}=Wk*=zwu&Y;GR1UrQZ@PJt_j0u~|8rLrBKXg)$>}<|GxG9fV*!)Rn^rDc z?yi5~gu{h1r|JZ`O(t+$IvKIsGb*TMcEqA7tq*=)jX3q;PC|?BrS6DjTAW9#Z(f?V zIqG=KHXqZZh1*ydFXm;Oidvhj7rjDuV`w7_+}#o(9=U)~McUI- z;KA(Dl$@)F_!Mrw*GSnt>x`~!B%{i2+18vJAsg4HnJ_8+5oD@4y{W^s;9@S*uMZ_3 zF6Kp7YIDq!3;Wd@eN%AN;dZ7wQcdMKjY0}Z#li2N-F@*fA* ze3fMy8|oUJk67mmaOi%r%69FjYV|x~oxg`ech|1HN`RW$-)<=RIYtU^4B)MUKF)4$3CWJ}f?bdRFK{$BdkZ?y+{8mT&VA vluG{bg3V-=97oGBDZ5u map = new ObjectMap<>(); @@ -72,6 +73,260 @@ public class TechTree implements ContentList{ }); }); + node(mechanicalDrill, () -> { + + node(mechanicalPump, () -> { + node(conduit, () -> { + node(liquidJunction, () -> { + node(liquidRouter, () -> { + node(liquidTank); + + node(bridgeConduit); + + node(pulseConduit, () -> { + node(phaseConduit, () -> { + + }); + + node(platedConduit, () -> { + + }); + }); + + node(rotaryPump, () -> { + node(thermalPump, () -> { + + }); + }); + }); + }); + }); + }); + + node(Items.coal, () -> { + node(Items.graphite, () -> { + node(graphitePress, () -> { + node(Items.titanium, () -> { + node(pneumaticDrill, () -> { + node(Items.sporePod, () -> { + node(cultivator, () -> { + + }); + }); + + node(Items.thorium, () -> { + node(laserDrill, () -> { + node(blastDrill, () -> { + + }); + + node(waterExtractor, () -> { + node(oilExtractor, () -> { + + }); + }); + }); + }); + }); + }); + + node(Items.pyratite, () -> { + node(pyratiteMixer, () -> { + node(Items.blastCompound, () -> { + node(blastMixer, () -> { + + }); + }); + }); + }); + + node(Items.silicon, () -> { + node(siliconSmelter, () -> { + + node(Liquids.oil, () -> { + node(sporePress, () -> { + node(coalCentrifuge, () -> { + node(multiPress, () -> { + node(siliconCrucible, () -> { + + }); + }); + }); + + node(Items.plastanium, () -> { + node(plastaniumCompressor, () -> { + node(Items.phasefabric, () -> { + node(phaseWeaver, () -> { + + }); + }); + }); + }); + }); + }); + + node(Items.metaglass, () -> { + node(kiln, () -> { + node(incinerator, () -> { + node(Items.scrap, () -> { + node(Liquids.slag, () -> { + node(melter, () -> { + node(Items.surgealloy, () -> { + node(surgeSmelter, () -> { + + }); + }); + + node(separator, () -> { + node(pulverizer, () -> { + node(disassembler, () -> { + + }); + }); + }); + + node(Liquids.cryofluid, () -> { + node(cryofluidMixer, () -> { + + }); + }); + }); + }); + }); + }); + }); + }); + }); + }); + }); + }); + + + node(combustionGenerator, () -> { + node(powerNode, () -> { + node(powerNodeLarge, () -> { + node(diode, () -> { + node(surgeTower, () -> { + + }); + }); + }); + + node(battery, () -> { + node(batteryLarge, () -> { + + }); + }); + + node(mender, () -> { + node(mendProjector, () -> { + node(forceProjector, () -> { + node(overdriveProjector, () -> { + node(overdriveDome, () -> { + + }); + }); + }); + + node(repairPoint, () -> { + + }); + }); + }); + + node(turbineGenerator, () -> { + node(thermalGenerator, () -> { + node(differentialGenerator, () -> { + node(thoriumReactor, () -> { + node(impactReactor, () -> { + + }); + + node(rtgGenerator, () -> { + + }); + }); + }); + }); + }); + + node(solarPanel, () -> { + node(largeSolarPanel, () -> { + + }); + }); + + node(groundFactory, () -> { + node(dagger, () -> { + node(mace, () -> { + node(fortress, () -> { + + }); + }); + + node(nova, () -> { + node(pulsar, () -> { + node(quasar, () -> { + + }); + }); + }); + + node(crawler, () -> { + node(atrax, () -> { + node(spiroct, () -> { + + }); + }); + }); + }); + + node(airFactory, () -> { + node(flare, () -> { + node(horizon, () -> { + node(zenith, () -> { + node(antumbra, () -> { + node(eclipse, () -> { + + }); + }); + }); + }); + + node(mono, () -> { + node(poly, () -> { + node(mega, () -> { + + }); + }); + }); + }); + + node(navalFactory, () -> { + node(risso, () -> { + node(minke, () -> { + node(bryde, () -> { + + }); + }); + }); + }); + }); + + node(additiveReconstructor, () -> { + node(multiplicativeReconstructor, () -> { + node(exponentialReconstructor, () -> { + node(tetrativeReconstructor, () -> { + }); + }); + }); + }); + }); + }); + }); + }); + }); + node(coreFoundation, () -> { node(coreNucleus, () -> { @@ -149,182 +404,6 @@ public class TechTree implements ContentList{ }); }); }); - - node(mechanicalDrill, () -> { - - node(Liquids.water, () -> { - node(mechanicalPump, () -> { - node(conduit, () -> { - node(liquidJunction, () -> { - node(liquidRouter, () -> { - node(liquidTank); - - node(bridgeConduit); - - node(pulseConduit, () -> { - node(phaseConduit, () -> { - - }); - - node(platedConduit, () -> { - - }); - }); - - node(rotaryPump, () -> { - node(thermalPump, () -> { - - }); - }); - }); - }); - }); - }); - }); - - node(Items.coal, () -> { - node(graphitePress, () -> { - node(pneumaticDrill, () -> { - node(cultivator, () -> { - - }); - - node(laserDrill, () -> { - node(blastDrill, () -> { - - }); - - node(waterExtractor, () -> { - node(oilExtractor, () -> { - - }); - }); - }); - }); - - node(pyratiteMixer, () -> { - node(blastMixer, () -> { - - }); - }); - - node(siliconSmelter, () -> { - - node(sporePress, () -> { - node(coalCentrifuge, () -> { - node(multiPress, () -> { - node(siliconCrucible, () -> { - - }); - }); - }); - - - node(plastaniumCompressor, () -> { - node(phaseWeaver, () -> { - - }); - }); - }); - - node(kiln, () -> { - node(incinerator, () -> { - node(melter, () -> { - node(surgeSmelter, () -> { - - }); - - node(separator, () -> { - node(pulverizer, () -> { - node(disassembler, () -> { - - }); - }); - }); - - node(cryofluidMixer, () -> { - - }); - }); - }); - }); - }); - }); - - node(combustionGenerator, () -> { - node(powerNode, () -> { - node(powerNodeLarge, () -> { - node(diode, () -> { - node(surgeTower, () -> { - - }); - }); - }); - - node(battery, () -> { - node(batteryLarge, () -> { - - }); - }); - - node(mender, () -> { - node(mendProjector, () -> { - node(forceProjector, () -> { - node(overdriveProjector, () -> { - node(overdriveDome, () -> { - - }); - }); - }); - - node(repairPoint, () -> { - - }); - }); - }); - - node(turbineGenerator, () -> { - node(thermalGenerator, () -> { - node(differentialGenerator, () -> { - node(thoriumReactor, () -> { - node(impactReactor, () -> { - - }); - - node(rtgGenerator, () -> { - - }); - }); - }); - }); - }); - - node(solarPanel, () -> { - node(largeSolarPanel, () -> { - - }); - }); - - node(groundFactory, () -> { - node(airFactory, () -> { - node(navalFactory, () -> { - - }); - - node(additiveReconstructor, () -> { - node(multiplicativeReconstructor, () -> { - node(exponentialReconstructor, () -> { - node(tetrativeReconstructor, () -> { - }); - }); - }); - }); - }); - }); - }); - }); - }); - }); }); } diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java index f2804359b4..6f7bec33d7 100644 --- a/core/src/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/mindustry/world/blocks/units/UnitFactory.java @@ -127,9 +127,13 @@ public class UnitFactory extends UnitBlock{ @Override public void buildConfiguration(Table table){ - Seq units = Seq.with(plans).map(u -> u.unit); + Seq units = Seq.with(plans).map(u -> u.unit).filter(u -> u.unlockedNow()); - ItemSelection.buildTable(table, units, () -> currentPlan == -1 ? null : plans[currentPlan].unit, unit -> configure(units.indexOf(unit))); + if(units.any()){ + ItemSelection.buildTable(table, units, () -> currentPlan == -1 ? null : plans[currentPlan].unit, unit -> configure(units.indexOf(unit))); + }else{ + table.table(Styles.black3, t -> t.add("$none").color(Color.lightGray)); + } } @Override diff --git a/gradle.properties b/gradle.properties index ef9df1eb5f..cc97bde904 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=e3078d7782509f39e5b0ee6989c5f7eeea0ad1b7 +archash=7cc77789e24f6c78fc61922ab2025d1f2d0df7bf