From 67986ee72c1035edbf0ca57d5a2799e8588825f2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 24 Dec 2021 12:52:32 -0500 Subject: [PATCH] Requirement balancing --- .../blocks/walls/tungsten-wall-large.png | Bin 791 -> 762 bytes core/src/mindustry/content/Blocks.java | 8 +-- core/src/mindustry/content/UnitTypes.java | 52 +++++++++++------- .../maps/planet/ErekirPlanetGenerator.java | 2 +- core/src/mindustry/ui/dialogs/ModsDialog.java | 2 +- ...awCrucible.java => DrawCrucibleFlame.java} | 2 +- 6 files changed, 38 insertions(+), 28 deletions(-) rename core/src/mindustry/world/draw/{DrawCrucible.java => DrawCrucibleFlame.java} (97%) diff --git a/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png b/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png index d5a14f7432ad99ede4cb906bcb45d7f428d02944..92c9c839a5e918c6afc9d50195d60d738f14ee28 100644 GIT binary patch delta 725 zcmbQv_KS6bVf_|Q7srr_Id5m3%{^?u(>im(VheHR$R)OA{fm@Kjx+2#vU`iV_`2-C z_kl~Ea8xc|v{B{L<~og8%lpr-&-cubX}{us_r;pO7QV&0*0VfW6)xGg=rBy&r|7`o z@~f4BS>UDcA@17^jSot@79>X30i8^vv@~uJNsU)z=UJ# zfw^(_@BMdaI{cK&JZ`;ZNiZccVKDWaJ_PEaFe7pd*XMAGrH{|%T3?$ zy}7Y-y3gZ>?q!U{_YqIsZ(dLM37n!;H-LoQc1ExSGP7 zj_Rsg#H>3ixg=(Gs{e;Qvbz`s4k|{7TwP!P^7D>u*457#C7!EkSTF1&*8uvTi>*&G)6P9b0VS43_8XOnTbqg$a@Ce|}cQ<+EOxzh% zvii!->L*==#cK<^bXul`Chgo9y#IYzSKid9!#OK;q|R=fx=K~`j{w6J4c{CMY01EK ziY;~0I)0hatE=W(v1VBZF*C_>ObzRE={ue^E3JmVLS$pLd-;9V8!8B_kUiR9-Zj}12aFjQ7#KWV{an^LB{Ts5_?Ab| delta 754 zcmeyxI-PBTVf{r<7srr_Id5mZ^<_5XX^ZF5xv(m!@lgNd2o@EAB>p2DIV}mIDlChH z8%m@_ew2n*KRH~Mv)rZj|H0U#`;al z*7*bz!>u+4CWbBCjXVq)!iNO6GqN{@i7mV}<;H9s`?wpuD=yVb7|yX%`KHFOVYPrt z?#|q6h6&ddDjIKdHSK0PSo}&RCg$Eh%~tW{&zBsV?RebUIUx5rQ?dbXklUdh$>&R% zkC(k`PrS-#*(@iZvMpHP21Aj2Cg;IJW~&7jNxj&0RID_!;BJp=&~3}kWeisZ7wBx} z$<=kAD#_rWzBX!E+JOSY`Y(UJoG5c!tY4_QBGcjXW6RpE>r63Ac_PJJG&zEHKavnI zzER3uq^cRn;lx?;t?s~$0u86-Mh<*@sxNHqZ6Ce*mG;)Tlh6PBuJ#Mf`~Dv(DVy~6 z!Ryt>YwZ4h{{OS4>*{yIU;m2#+MhZx>2t4Y{P z+s!i8UGaX}FLr?>hf^F&9VQ-Q;pGtd@8P&%iG=3N#i|FVMA=T-+`!W0<~7CP!IX1p zOE;w1Cd>@;z0UOCv6^A4?25Iv4Y&BNT$6LiWzRZY;~(HW?RHWM!!^-JpKGEToDJ^2 za+8irscv-XVK9@t0)0&TYFCG{_Ieqmj@69qU zr;GCzlw^3{<}pmX!7no}^rpzyeQvugb)C+~Y(JWPSMl6id#@#RHgUm=vWu>%-E?c) z(e!4q?89@kI^W)~J~(?(a;B_L!1V3Y*cBgJB-NQ|ygdB*+@_Z|6Fj5!Io9Yr_^T)< za3k|VwMMkF0_(y5DtQdK?_wIPlV&k9d{8jqWLV&wA;#d)e8Gf4f&Za+jCS*bf2aSv RWME)m@O1TaS?83{1ONm&SZ4qL diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index aab855be8c..5fae9c8e86 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1125,7 +1125,7 @@ public class Blocks{ size = 3; itemCapacity = 20; hasPower = hasItems = true; - drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawCrucible(), new DrawBlock(), new DrawHeatInput()); + drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawCrucibleFlame(), new DrawBlock(), new DrawHeatInput()); drawer.iconOverride = new String[]{"-bottom", ""}; ambientSound = Sounds.smelter; ambientSoundVolume = 0.07f; @@ -1677,17 +1677,17 @@ public class Blocks{ //erekir transport blocks duct = new Duct("duct"){{ - requirements(Category.distribution, with(Items.graphite, 2)); + requirements(Category.distribution, with(Items.graphite, 1)); speed = 4f; }}; ductRouter = new DuctRouter("duct-router"){{ - requirements(Category.distribution, with(Items.graphite, 10)); + requirements(Category.distribution, with(Items.graphite, 8)); speed = 4f; }}; overflowDuct = new OverflowDuct("overflow-duct"){{ - requirements(Category.distribution, with(Items.graphite, 10)); + requirements(Category.distribution, with(Items.graphite, 8)); speed = 4f; }}; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index dd2cbbbe43..662faa746b 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2494,6 +2494,37 @@ public class UnitTypes{ } }}; + //endregion + //region erekir - mech + + //TODO + + //endregion + //region erekir - flying + + //TODO + + //endregion + //region erekir - neoplasm + + if(false) + scuttler = new NeoplasmUnitType("scuttler"){{ + health = 20000; + armor = 17; + hitSize = 48f; + omniMovement = false; + rotateSpeed = 1.7f; + drownTimeMultiplier = 4f; + drawCell = false; + segments = 4; + drawBody = false; + crawlDamage = 2f; + + segmentScl = 4f; + segmentPhase = 5f; + speed = 1f; + }}; + //endregion //region erekir - core @@ -2748,27 +2779,6 @@ public class UnitTypes{ //}}; - //endregion - //region neoplasm - - if(false) - scuttler = new NeoplasmUnitType("scuttler"){{ - health = 20000; - armor = 17; - hitSize = 48f; - omniMovement = false; - rotateSpeed = 1.7f; - drownTimeMultiplier = 4f; - drawCell = false; - segments = 4; - drawBody = false; - crawlDamage = 2f; - - segmentScl = 4f; - segmentPhase = 5f; - speed = 1f; - }}; - //endregion } } diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 261ed2b7b5..8d4040724b 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -249,7 +249,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ Schematics.placeLaunchLoadout(spawnX, spawnY); //TODO this is only for testing - state.rules.defaultTeam.items().add(Seq.with(ItemStack.with(Items.beryllium, 300, Items.graphite, 300))); + state.rules.defaultTeam.items().add(Seq.with(ItemStack.with(Items.beryllium, 1000, Items.graphite, 1000))); //TODO proper waves state.rules.waves = true; diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 5a7bf4d692..1377dc3abe 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -101,7 +101,7 @@ public class ModsDialog extends BaseDialog{ void modError(Throwable error){ ui.loadfrag.hide(); - if(Strings.getCauses(error).contains(t -> t.getMessage() != null && (t.getMessage().contains("trust anchor") || t.getMessage().contains("SSL") || t.getMessage().contains("protocol")))){ + if(error instanceof NoSuchMethodError || Strings.getCauses(error).contains(t -> t.getMessage() != null && (t.getMessage().contains("trust anchor") || t.getMessage().contains("SSL") || t.getMessage().contains("protocol")))){ ui.showErrorMessage("@feature.unsupported"); }else if(error instanceof HttpStatusException st){ ui.showErrorMessage(Core.bundle.format("connectfail", Strings.capitalize(st.status.toString().toLowerCase()))); diff --git a/core/src/mindustry/world/draw/DrawCrucible.java b/core/src/mindustry/world/draw/DrawCrucibleFlame.java similarity index 97% rename from core/src/mindustry/world/draw/DrawCrucible.java rename to core/src/mindustry/world/draw/DrawCrucibleFlame.java index 70ce737095..5b56341706 100644 --- a/core/src/mindustry/world/draw/DrawCrucible.java +++ b/core/src/mindustry/world/draw/DrawCrucibleFlame.java @@ -7,7 +7,7 @@ import arc.math.Interp.*; import arc.util.*; import mindustry.gen.*; -public class DrawCrucible extends DrawPartial{ +public class DrawCrucibleFlame extends DrawPartial{ public Color flameColor = Color.valueOf("f58349"), midColor = Color.valueOf("f2d585"); public float flameRad = 1f, circleSpace = 2f, flameRadiusScl = 10f, flameRadiusMag = 0.6f, circleStroke = 1.5f;