From ff117adf185cb8ff4b8f9154ae3836b11efc8b67 Mon Sep 17 00:00:00 2001 From: = Date: Mon, 13 Jan 2025 20:01:10 -0300 Subject: [PATCH] hints --- assets/bundles/bundle.properties | 8 +------ .../blocks/liquids/liquid-gauge-tiles.png | Bin 729 -> 724 bytes .../sprites/blocks/liquids/liquid-gauge.png | Bin 508 -> 502 bytes src/omaloon/ui/dialogs/EventHints.java | 20 +++--------------- .../blocks/liquid/PressureLiquidPump.java | 6 ++---- 5 files changed, 6 insertions(+), 28 deletions(-) diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 9e3c6209..51026329 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -61,13 +61,7 @@ omaloon.update.dialog.fullclean.confirm = Are you sure you want to reset your cu requirement.omaloon-at-wave = Reach Wave {0} in {1} ## Hints -hint.omaloon-pump_positive = To create higher pressure, place \uC353[accent] mechanical pumps[] in series, adding liquid pipes between them.\nTo increase pressure faster, place \uC353[accent] mechanical pumps[] in parallel. -hint.omaloon-pump_negative = To decrease pressure faster, add more \uC353[accent]mechanical pumps[]. -hint.omaloon-drill_positive_pressure = \uC351 [accent]Hammer drills[] require negative pressure to operate. Rotate the \uC353[accent] mechanical pumps[] away from the drills to create negative pressure. -hint.omaloon-press_or_shelter_negative_pressure = Some buildings require positive pressure. Rotate the \uC353[accent] mechanical pumps[] to these blocks to create positive pressure. -hint.omaloon-pump = The pumps only stop when there is a block in front of it or the front block has enough pressure. -hint.omaloon-low_pressure = Buildings will implode when it reaches -50 pressure units. To avoid this, use \uC354 [accent]Liquid Valve[], which will reduce the pressure, preventing it from reaching dangerous levels. -hint.omaloon-valve = One valve can handle up to three pumps. If you have more pumps, place more valves to avoid jamming. +hint.omaloon-pump_chaining = Pumps chained in series can reach a higher pressure gradient between the ends. If they're chained in parallel, they work faster. ## planets planet.omaloon-omaloon.name = Omaloon diff --git a/assets/sprites/blocks/liquids/liquid-gauge-tiles.png b/assets/sprites/blocks/liquids/liquid-gauge-tiles.png index 6f9ad340582862b2cca383c546db3f192bfcc1c8..1b10b2d84b9c4aa0607e29148af712e0573148c2 100644 GIT binary patch delta 679 zcmcb~dWCg@Wqq5ci(^Q|oVQWde$0jfwcSAh3WY33R5M;Icy`%=E690bu|i>^uEUgt z3{rNcFEe(y91)zL@nXTOggG-e-h5NFZAQ3dr|tWrkH0=&tL?I5?w*?C_qTRF%-GIl z|NrL&Q%m)vI1N|1?iE2#CjY*@w8PEaIn?E&)FbPvXqI^d#m^n^1S5gM}M4Z``}(HR-Z_-|0yKdTIlVj(!rpHig#_3i-uflpa8&SL z{Dqp2KR2HGH}6ej#i2~6bqDKhSUnj}FHu;YyS2RFRA1w=$^9&uRqyh-wuHXje<5k5 z?S;0E5S~)QTX$}-T&M|KQtA->>8PB-Cxd{VUF(jf+vW%#J0*0$w8ORK$VLvo4Jt_v z*>!$TchAl=lD+lmbYbV`hHaB`nKI{R?$>5xSSjA{wAx9zzHZN|XYR(nF5(q+^?QEV z&YCLb_=KCutApcYB;!*5lWPAMv=21Z=p8sE&mg3({GHumhrL5Vy@L2V{v}B>=l9%^ zH}G%#&HUFFNHqLrE^<(Mekvx`x8*nUx7|qx&dJZ<_UL>er1q~t+-(`eh+o;B?s!@~W+g_?gD<`$$ZT_u{knE?nqUHx3v IIVCg!06u;~`~Uy| delta 684 zcmcb@dXsg6Wqr4&i(^Q|oVQUM{iGcQYTIK16h3lJtZ!=5Tj?A$v8lu(;0LqPQuc%F zF^pWYA`1@%wD+~m-|&NFiO9X$+1ato#jbJ|1B0BL{Bxxn_ii!OGw|5+gbMby&Pfn; ze8S>;WY*L<+&PNVlLXnqiVnR!E6K1R_x8-!i!X986jaq5yk}lHYlE%fg%d@8e(cQ8 zTHJX;aoGYFzyB8Y&u(R9`1RF^%I~jaS~j67$<5*A&--_O?+~zj`0G{N-&o&+(I<5c zT^LU*Y(HYee<;*ZrbT-8e}?)J_aA!}{CxEOv(@kFjqIN|(*=uo-)U-aRd{phd^elF zUuHvc!?QoBiO*jvR`1=fIYC69Nq5>U=F}XxK<(swbK8=`kC9=ecs)aO ze!>apsi!d9MOQ?US%KIBN*kL1T)6{V+dH$ zb4dPyz&{4XKaARk87m<3O}=3G3{{)`3|D? z%@SU>VaT;u2GE)NV(~-4}<~OsM1&0L;VP6D`7z)rvYyfr|tq2S^S0 z==M96$Q@>rrTRRpN*?B!MXB5Gs3K?^mLX?rDZbPQq>?*4-ai-aTZgTv09u6m2VVe+ z6|Rv>h2{hRa(@c~N(vmpfs;zEi76$ZZbSuyLq>v|7aCX!%*ol6SOcuB%G7~hgv_pV z7ihEo=Jv9zJDvjVOQq;&<684YQ;^~~1sXXJ*^E*Ki3T@nS;5^3n5=BI)JIwUA^03>=M za)2!okq!!|@>4@clS^2+1szly*2}!v*(kAimF?K`J@5QD>yYU6`TaY+wn<%F9l7|t zak6c=WMXyD7CbfKa`1Xt0{}i3iz2{5w+jI1>~~ZX&H@jznturJAkD;%6)pv~z*(%I z$_fvfO@;sf?|tKXuh#YO78bER1vv$w6VLEWEaLr7Sfo&^mARRK2EFUSB0(X3RBh~Bz0NX1RH=Y0amj->q5OCIbAAfi_IUZ~*uLGN8se-p30?00000NkvXXu0mjf D^$FA0 diff --git a/src/omaloon/ui/dialogs/EventHints.java b/src/omaloon/ui/dialogs/EventHints.java index b560ed27..a475501c 100644 --- a/src/omaloon/ui/dialogs/EventHints.java +++ b/src/omaloon/ui/dialogs/EventHints.java @@ -6,26 +6,12 @@ import arc.util.*; import mindustry.*; import mindustry.ui.fragments.HintsFragment.*; -import omaloon.content.blocks.*; +import omaloon.world.blocks.liquid.*; public enum EventHints implements Hint { -// drill_positive_pressure( -// () -> false, -// () -> Vars.state.teams.get(Vars.state.rules.defaultTeam).getBuildings(OlProductionBlocks.hammerDrill).find(b -> ((HasPressure) b).getPressure() > 0f) != null -// ), -// press_or_shelter_negative_pressure( -// () -> false, -// () -> Vars.state.teams.get(Vars.state.rules.defaultTeam).getBuildings(OlCraftingBlocks.carborundumPress).find(b -> ((HasPressure) b).getPressure() < 0f) != null -// || Vars.state.teams.get(Vars.state.rules.defaultTeam).getBuildings(OlDefenceBlocks.smallShelter).find(b -> ((HasPressure) b).getPressure() < 0f) != null -// ), - pump( + pump_chaining( () -> false, - () -> !Vars.state.teams.get(Vars.state.rules.defaultTeam).getBuildings(OlDistributionBlocks.liquidPump).isEmpty() - ), - valve( - () -> false, - () -> !Vars.state.teams.get(Vars.state.rules.defaultTeam).getBuildings(OlDistributionBlocks.liquidValve).isEmpty(), - pump + () -> Vars.control.input.block instanceof PressureLiquidPump ); final Boolp complete; diff --git a/src/omaloon/world/blocks/liquid/PressureLiquidPump.java b/src/omaloon/world/blocks/liquid/PressureLiquidPump.java index 02f803c5..9bbae047 100644 --- a/src/omaloon/world/blocks/liquid/PressureLiquidPump.java +++ b/src/omaloon/world/blocks/liquid/PressureLiquidPump.java @@ -50,9 +50,7 @@ public PressureLiquidPump(String name) { destructible = true; update = true; saveConfig = copyConfig = true; - config(Liquid.class, (PressureLiquidPumpBuild build, Liquid liquid) -> { - build.filter = liquid.id; - }); + config(Liquid.class, (PressureLiquidPumpBuild build, Liquid liquid) -> build.filter = liquid.id); } @Override @@ -153,7 +151,7 @@ public int chainSize() { } @Override public boolean connects(HasPressure to) { - return HasPressure.super.connects(to) && (front() == to || back() == to); + return HasPressure.super.connects(to) && (front() == to || back() == to) && (!(to instanceof PressureLiquidPumpBuild) || to.rotation() == rotation); } @Override