Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
sk7725 committed Dec 7, 2021
1 parent 8ef417e commit 74a1632
Show file tree
Hide file tree
Showing 77 changed files with 206 additions and 18 deletions.
13 changes: 10 additions & 3 deletions assets/bundles/bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@ block.betamindy-silicon-condenser.name = Silicondenser
block.betamindy-silicon-condenser.description = Condenses and refines silica gas produced by adjacent electrofilters. Needs graphite to function.
block.betamindy-silicon-condenser.details = Corporation is under no circumstances legally responsible for I-03's abhorrent naming skills, which may or may not pose a semantic threat.
block.betamindy-silicon-condenser.gas = Silica Gas
block.betamindy-colloid-mixer.name = Colloid Mixer
block.betamindy-colloid-mixer.description = Mixes siloxol and titanium powder to produce colloid, a liquid with high coolant capabilities.
block.betamindy-scalar-furnace.name = Scalar Furnace
block.betamindy-scalar-furnace.description = Fuses various metals and materials into a light and dense metal, scalar alloy. The reaction produces large amounts of heat, which is used to generate power. [scarlet]Failure to input colloid will result in a catastrophe...[]

# Power
block.betamindy-button.name = Button
Expand Down Expand Up @@ -459,11 +463,11 @@ item.betamindy-ore-tensor.name = Tensor Ore
item.betamindy-ore-tensor.description = A natural algebraic object describing a multilinear relationship between sets of algebraic objects related to a vector space, including vector and scalar.
item.betamindy-piece-code.name = Source Piece
item.betamindy-piece-code.description = A fragment of code containing binary language that can be pieced together forming a code algorithm.
item.betamindy-scalar.name = Scalar
item.betamindy-scalar.name = Scalar Alloy
item.betamindy-scalar.description = A refined material processed from scalar ore.
item.betamindy-vector.name = Vector
item.betamindy-vector.name = Vector Alloy
item.betamindy-vector.description = A refined material processed from vector ore.
item.betamindy-tensor.name = Tensor
item.betamindy-tensor.name = Tensor Compound
item.betamindy-tensor.description = A refined material processed from tensor ore.
item.betamindy-source.name = Source
item.betamindy-source.description = An algorithm formed by fragments of code storing an amount of information and/or an instruction to run.
Expand Down Expand Up @@ -498,6 +502,9 @@ liquid.betamindy-coffee.description = Somewhat edible programmer fuel.
liquid.betamindy-siloxol.name = Siloxol
liquid.betamindy-siloxol.description = A silicon compound rich in hydrogen. Used as fusion reactant, lubricant, or filtered to obtain water and silicon.
liquid.betamindy-siloxol.details = Twilight moss, a silicon-based organism, appears to secrete this liquid. This liquid has similar molecular structure to ethanol, suggesting that its metabolic process resembles fermentation.
liquid.betamindy-colloid.name = Colloid
liquid.betamindy-colloid.description = A high-density coolant with both solid and liquid properties. Used as turret coolant and crafter lubricant.
liquid.betamindy-colloid.details = This liquid was discovered by an accident when siloxol, instead of water, was inputted to a cryofluid mixer.

# SE
status.betamindy-booster.name = Boosting
Expand Down
15 changes: 12 additions & 3 deletions assets/bundles/bundle_ko.properties
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ block.betamindy-pressure-container.description = \uC790\uC6D0\uC744 \uBCF4\uAD00
block.betamindy-pressure-container.details = \uCC28\uC138\uB300 \uC555\uB825\uBC25\uC1A5
block.betamindy-arc-kiln.name = \uC544\uD06C \uAC00\uB9C8
block.betamindy-arc-kiln.description = \uD1A0\uC9C0\uC758 \uC911\uAE08\uC18D\uC744 \uD65C\uC6A9\uD558\uC5EC \uBAA8\uB798\uB97C \uAC15\uD654 \uC720\uB9AC\uB85C \uD569\uC131\uD569\uB2C8\uB2E4.
block.betamindy-lancer-kiln.name = \uB79C\uC11C \uAC00\uB9C8
block.betamindy-lancer-kiln.description = \uD1A0\uC9C0\uC758 \uC911\uAE08\uC18D\uC744 \uD65C\uC6A9\uD558\uC5EC \uBAA8\uB798\uB97C \uAC15\uD654 \uC720\uB9AC\uB85C \uD569\uC131\uD569\uB2C8\uB2E4. \uD1A0\uC9C0\uC5D0 \uCDA9\uBD84\uD55C \uC591\uC758 \uB0A9\uC774 \uC5C6\uB2E4\uBA74 \uC9C1\uC811 \uB0A9\uC744 \uACF5\uAE09\uD560 \uC218\uB3C4 \uC788\uC2B5\uB2C8\uB2E4.
block.betamindy-electro-refiner.name = \uBB3C\uBD84\uD574 \uD544\uD130
block.betamindy-electro-refiner.description = \uC2E4\uB85C\uC62C\uC744 \uBB3C\uACFC \uC2E4\uB9AC\uCF58 \uAE30\uCCB4 \uD654\uD569\uBB3C\uB85C \uC804\uAE30\uBD84\uD574\uD569\uB2C8\uB2E4. \uC2E4\uB9AC\uCE74 \uAC00\uC2A4\uB294 \uC778\uC811\uD55C \uC751\uACB0\uAE30\uB97C \uD1B5\uD574 \uC2E4\uB9AC\uCF58\uC73C\uB85C \uBC14\uAFC0 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
block.betamindy-fusion-chamber.name = \uBBF8\uB2C8 \uD575\uC735\uD569\uB85C
Expand All @@ -154,6 +156,10 @@ block.betamindy-fusion-chamber.details = \uBE44\uB85D \uD0C4\uC18C\uBCF4\uB2E4 \
block.betamindy-silicon-condenser.name = \uC2E4\uB9AC\uCF58 \uC751\uACB0\uAE30
block.betamindy-silicon-condenser.description = \uBB3C\uBD84\uD574 \uD544\uD130\uC5D0\uC11C \uC0DD\uC0B0\uB41C \uC2E4\uB9AC\uCE74 \uAC00\uC2A4\uB97C \uC2E4\uB9AC\uCF58\uC73C\uB85C \uC815\uCCB4 \uBC0F \uC751\uACB0\uD569\uB2C8\uB2E4. \uD751\uC5F0\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.
block.betamindy-silicon-condenser.gas = \uC2E4\uB9AC\uCE74 \uAC00\uC2A4
block.betamindy-colloid-mixer.name = \uCF5C\uB85C\uC774\uB4DC \uC81C\uC870\uAE30
block.betamindy-colloid-mixer.description = \uC2E4\uB85C\uC62C\uACFC \uBBF8\uC138 \uD2F0\uD0C0\uB284 \uBD84\uB9D0\uC744 \uB192\uC740 \uB0C9\uAC01\uC131\uC744 \uB748 \uCF5C\uB85C\uC774\uB4DC\uB85C \uD63C\uD569\uD569\uB2C8\uB2E4.
block.betamindy-scalar-furnace.name = \uC2A4\uCE7C\uB77C \uD654\uB85C
block.betamindy-scalar-furnace.description = \uAC01\uC885 \uAE08\uC18D\uACFC \uC790\uC6D0\uC73C\uB85C\uBD80\uD130 \uAC00\uBCCD\uACE0 \uBC00\uB3C4\uAC00 \uB192\uC740 \uC2A4\uCE7C\uB77C \uD569\uAE08\uC744 \uC7AC\uB828\uD569\uB2C8\uB2E4. \uC7AC\uB828 \uC2DC \uBC1C\uC0DD\uB418\uB294 \uC5F4\uC73C\uB85C \uC0C1\uB2F9\uD55C \uC591\uC758 \uC804\uB825\uC744 \uC0DD\uC0B0\uD569\uB2C8\uB2E4. [scarlet]\uC9C0\uC18D\uC801\uC778 \uB0C9\uAC01\uC774 \uD544\uC694\uD558\uBA70, \uCDA9\uBD84\uD55C \uC591\uC758 \uCF5C\uB85C\uC774\uB4DC\uAC00 \uACF5\uAE09\uB418\uC9C0 \uC54A\uC73C\uBA74 \uC7AC\uC559\uC744 \uBD88\uB7EC\uC62C \uC218 \uC788\uC2B5\uB2C8\uB2E4...[]

# Power
block.betamindy-button.name = \uBC84\uD2BC
Expand Down Expand Up @@ -325,11 +331,11 @@ item.betamindy-ore-tensor.name = \uD150\uC11C \uAD11\uC11D
item.betamindy-ore-tensor.description = \uC120\uD615\uB300\uC218\uD559\uC5D0\uC11C, \uB2E4\uC911\uC120\uD615\uC0AC\uC0C1 \uB610\uB294 \uD150\uC11C\uB294 \uC120\uD615 \uAD00\uACC4\uB97C \uB098\uD0C0\uB0B4\uB294 \uB2E4\uC911\uC120\uD615\uB300\uC218\uC758 \uB300\uC0C1\uC785\uB2C8\uB2E4.
item.betamindy-piece-code.name = \uC18C\uC2A4 \uC870\uAC01
item.betamindy-piece-code.description = \uBAA8\uC774\uBA74 \uD558\uB098\uC758 \uC54C\uACE0\uB9AC\uC998\uC774 \uB418\uB294 \uCF54\uB4DC\uC758 \uC870\uAC01\uC785\uB2C8\uB2E4.
item.betamindy-scalar.name = \uC2A4\uCE7C\uB77C
item.betamindy-scalar.name = \uC2A4\uCE7C\uB77C \uD569\uAE08
item.betamindy-scalar.description = \uC815\uC81C\uB41C \uC2A4\uCE7C\uB77C \uAD11\uC11D\uC785\uB2C8\uB2E4.
item.betamindy-vector.name = \uBCA1\uD130
item.betamindy-vector.name = \uBCA1\uD130 \uD569\uAE08
item.betamindy-vector.description = \uC815\uC81C\uB41C \uBCA1\uD130 \uAD11\uC11D\uC785\uB2C8\uB2E4.
item.betamindy-tensor.name = \uD150\uC11C
item.betamindy-tensor.name = \uD150\uC11C \uD654\uD569\uBB3C
item.betamindy-tensor.description = \uC815\uC81C\uB41C \uD150\uC11C \uAD11\uC11D\uC785\uB2C8\uB2E4.
item.betamindy-source.name = \uC18C\uC2A4
item.betamindy-source.description = \uCF54\uB4DC\uAC00 \uBAA8\uC778 \uC54C\uACE0\uB9AC\uC998\uC73C\uB85C, \uD2B9\uC815\uD55C \uBA85\uB839\uB4E4\uC774\uB098 \uAC12\uC744 \uB2F4\uACE0 \uC788\uC2B5\uB2C8\uB2E4.
Expand All @@ -342,6 +348,9 @@ liquid.betamindy-coffee.description = \uB9C8\uC2E4 \uC218 \uC788\uAC8C \uC0DD\uA
liquid.betamindy-siloxol.name = \uC2E4\uB85C\uC62C
liquid.betamindy-siloxol.description = \uC218\uC18C\uAC00 \uD48D\uBD80\uD55C \uADDC\uC18C \uD63C\uD569\uBB3C. \uD575\uC735\uD569 \uC5F0\uB85C\uB098 \uC724\uD65C\uC81C\uB85C \uC0AC\uC6A9 \uAC00\uB2A5\uD569\uB2C8\uB2E4. \uC815\uC81C\uD574\uC11C \uBB3C\uACFC \uC2E4\uB9AC\uCF58\uC744 \uCD94\uCD9C\uD560 \uC218\uB3C4 \uC788\uC2B5\uB2C8\uB2E4.
liquid.betamindy-siloxol.details = \uADDC\uC18C \uC0DD\uBA85\uCCB4\uC778 \uD669\uD63C\uC774\uB07C\uC758 \uBD80\uC0B0\uBB3C\uC774\uB2E4. \uC5D0\uD0C4\uC62C\uACFC \uBE44\uC2B7\uD55C \uBD84\uC790 \uAD6C\uC870\uB97C \uC9C0\uB2C8\uBBC0\uB85C, \uBC1C\uD6A8\uC640 \uBE44\uC2B7\uD55C \uACBD\uB85C\uC758 \uC774\uD654 \uC791\uC6A9\uC744 \uAC70\uCE58\uB294 \uAC83\uC73C\uB85C \uBCF4\uC778\uB2E4.
liquid.betamindy-colloid.name = \uCF5C\uB85C\uC774\uB4DC
liquid.betamindy-colloid.description = \uACE0\uCCB4\uC640 \uC561\uCCB4\uC758 \uD1A1\uC131\uC744 \uBAA8\uB450 \uB744\uB294 \uACE0\uBC00\uB3C4 \uB0C9\uAC01\uC131 \uC561\uCCB4. \uD3EC\uD0D1\uC758 \uB0C9\uAC01\uC81C\uC640 \uD2B9\uC815 \uACF5\uC7A5\uC758 \uC724\uD65C\uC81C\uB85C \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
liquid.betamindy-colloid.details = \uC774 \uC561\uCCB4\uB294 \uC2E4\uC218\uB85C \uB0C9\uAC01\uC218 \uC81C\uC870\uAE30\uC5D0 \uBB3C \uB300\uC2E0 \uC2E4\uB85C\uC62C\uC744 \uD22C\uC785\uD588\uC744 \uB54C \uBC1C\uACAC\uB418\uC5C8\uB2E4.

# SE
status.betamindy-booster.name = \uB2C8\uD2B8\uB85C
Expand Down
Binary file added assets/sounds/pewretro.ogg
Binary file not shown.
Binary file modified assets/sprites/blocks/distribution/payload-rail-edge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/payload-rail-full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/payload-rail-roomba.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/payload-rail-top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/payload-rail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/rail-sorter-edge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/rail-sorter-full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/rail-sorter-over.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/rail-sorter-sort-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/rail-sorter-sort-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/rail-sorter-sort-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/rail-sorter-sort-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/rail-sorter-sort-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/rail-sorter-top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/distribution/rail-sorter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/environment/gamer-bricks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/environment/milky-coffee.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/power/fusion-chamber-bottom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/power/fusion-chamber-plasma-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/power/fusion-chamber-plasma-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/power/fusion-chamber-plasma-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/power/fusion-chamber-plasma-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/power/fusion-chamber.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/power/isotope-reactor-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/power/isotope-reactor-top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sprites/blocks/power/isotope-reactor.png
Binary file modified assets/sprites/blocks/power/mega-capacitor.png
Binary file added assets/sprites/blocks/power/scalar-furnace-top.png
Binary file added assets/sprites/blocks/power/scalar-furnace.png
Binary file modified assets/sprites/blocks/production/arc-kiln-heat.png
Binary file modified assets/sprites/blocks/production/arc-kiln-light.png
Binary file modified assets/sprites/blocks/production/arc-kiln-top.png
Binary file modified assets/sprites/blocks/production/arc-kiln.png
Binary file modified assets/sprites/blocks/production/electro-refiner-joint.png
Binary file modified assets/sprites/blocks/production/electro-refiner-middle.png
Binary file modified assets/sprites/blocks/production/electro-refiner-top.png
Binary file modified assets/sprites/blocks/production/electro-refiner.png
Binary file modified assets/sprites/blocks/production/lancer-kiln-heat.png
Binary file modified assets/sprites/blocks/production/lancer-kiln-light.png
Binary file modified assets/sprites/blocks/production/lancer-kiln-top.png
Binary file modified assets/sprites/blocks/production/lancer-kiln.png
Binary file modified assets/sprites/blocks/production/silicon-condenser-middle.png
Binary file modified assets/sprites/blocks/production/silicon-condenser-top.png
Binary file modified assets/sprites/blocks/production/silicon-condenser.png
Binary file modified assets/sprites/blocks/turrets/osteoporosis-blaster.png
Binary file modified assets/sprites/blocks/turrets/sequence.png
Binary file modified assets/sprites/effects/gas.png
Binary file modified assets/sprites/effects/sadnuke.png
Binary file added assets/sprites/liquids/colloid.png
Binary file added assets/sprites/liquids/colloid0.png
Binary file added assets/sprites/liquids/colloid1.png
Binary file added assets/sprites/liquids/colloid2.png
Binary file added assets/sprites/liquids/colloid3.png
Binary file added assets/sprites/liquids/colloid4.png
Binary file added assets/sprites/liquids/colloid5.png
Binary file modified assets/sprites/liquids/siloxol.png
Binary file modified assets/sprites/liquids/siloxol0.png
Binary file modified assets/sprites/liquids/siloxol1.png
Binary file modified assets/sprites/weathers/block-rain.png
Binary file modified assets/sprites/weathers/ion-wind.png
Binary file modified assets/sprites/weathers/router-rain.png
40 changes: 37 additions & 3 deletions src/betamindy/content/MindyBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public class MindyBlocks implements ContentList {
//crafting
blockFurnace, heavyFurnace, gateSwitch, coffeeMachine,
//campaign - shar
arcKiln, electroRefiner, siliconCondenser, fusionChamber, lancerKiln,
arcKiln, electroRefiner, siliconCondenser, fusionChamber, lancerKiln, colloidMixer, scalarFurnace,
//catalysts (pushreact & spinreact & boost)
discharger, fireCan, campfire,
//floorpapers
Expand Down Expand Up @@ -625,6 +625,7 @@ MindyItems.starStone, new ItemTrailBulletType(42, 17f, range, Pal.surge){{
reloadTime = 15f;
inaccuracy = 1.5f;
shootCone = 30f;
//shootSound = MindySounds.pewRetro; //this breaks the audio bus for some reason
}};

sequence = new LiquidTurret("sequence"){{
Expand Down Expand Up @@ -787,7 +788,7 @@ MindyItems.starStone, new ItemTrailBulletType(42, 17f, range, Pal.surge){{

consumes.power(2f);
crafts(Blocks.siliconSmelter, 2, Blocks.kiln, 1, Blocks.surgeSmelter, 2);
crafts(MindyItems.scalar, 1, 4).using(with(MindyItems.scalarRaw, 5, Items.plastanium, 3, Items.thorium, 10));
crafts(MindyItems.scalar, 1, 4).using(with(MindyItems.scalarRaw, 3, Items.graphite, 1, Items.thorium, 1, Items.metaglass, 1));
requirements(Category.crafting, with(Items.copper, 410, Items.titanium, 230, Items.graphite, 60, Items.silicon, 115, Items.metaglass, 65, Items.plastanium, 30));
}};

Expand Down Expand Up @@ -930,7 +931,7 @@ MindyItems.starStone, new ItemTrailBulletType(42, 17f, range, Pal.surge){{

size = 2;
health = 300;
powerProduction = 8.2f;
powerProduction = 8.5f;
ambientSound = Sounds.pulse;
ambientSoundVolume = 0.05f;
consumes.power(2.5f);
Expand Down Expand Up @@ -958,6 +959,39 @@ MindyItems.starStone, new ItemTrailBulletType(42, 17f, range, Pal.surge){{
gasUse = 27f;
}};

colloidMixer = new LiquidConverter("colloid-mixer"){{
requirements(Category.crafting, with(MindyItems.scalarRaw, 65, Items.silicon, 40, Items.titanium, 60));
outputLiquid = new LiquidStack(MindyLiquids.colloid, 0.2f);
craftTime = 120f;
size = 2;
hasPower = true;
hasItems = true;
hasLiquids = true;
rotate = false;
solid = true;
outputsLiquid = true;
drawer = new DrawMixer(true);

consumes.power(1.5f);
consumes.item(Items.titanium);
consumes.liquid(MindyLiquids.siloxol, 0.2f);
}};

scalarFurnace = new NuclearCrafter("scalar-furnace"){{
requirements(Category.crafting, with(Items.copper, 400, Items.silicon, 100, Items.graphite, 100, Items.thorium, 150, MindyItems.scalarRaw, 450));
ambientSound = Sounds.hum;
ambientSoundVolume = 0.24f;
size = 4;
health = 1200;
itemDuration = 120f;
itemCapacity = 24;
powerProduction = 17f;
consumes.items(with(MindyItems.scalarRaw, 3, Items.graphite, 1, Items.thorium, 1, Items.metaglass, 1));
outputItem = new ItemStack(MindyItems.scalar, 1);
heating = 0.01f;
consumes.liquid(MindyLiquids.colloid, heating * 2f / coolantPower).update(false);
}};

isotopeReactor = new IsotopeReactor("isotope-reactor"){{
requirements(Category.power, with(Items.copper, 30, MindyItems.scalarRaw, 30));
size = 1;
Expand Down
16 changes: 16 additions & 0 deletions src/betamindy/content/MindyFx.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import static arc.graphics.g2d.Draw.*;
//I do not want my fills and lines fighting, so no wildcad imports
import static arc.graphics.g2d.Lines.*;
import static arc.math.Angles.angle;
import static arc.math.Angles.randLenVectors;
import static betamindy.BetaMindy.hardmode;
import static betamindy.graphics.Drawm.shard;
Expand Down Expand Up @@ -465,6 +466,21 @@ public class MindyFx {
});
}),

sparkleHit = new Effect(55f, e -> {
color(e.color);
vgld[0] = 0;
Angles.randLenVectors(e.id, e.id % 2 + 1, 6f * e.fin() + 2f, (x, y) -> {
vgld[0]++;
spark(e.x+x, e.y+y, e.fout()*2.5f, 0.5f+e.fout(), e.id * vgld[0]);
});
e.scaled(18f, s -> {
stroke(0.8f, e.color);
Angles.randLenVectors(e.id, 3, 15f * s.fin() + 0.1f, (x, y) -> {
lineAngle(e.x+x, e.y+y, angle(x, y), 5.4f * s.fout() + 0.01f);
});
});
}),

starSparkle = new Effect(35f, e -> {
color(Color.white, Color.yellow, Mathf.randomSeed(e.id));
vgld[0] = 0;
Expand Down
15 changes: 14 additions & 1 deletion src/betamindy/content/MindyLiquids.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import mindustry.type.*;

public class MindyLiquids implements ContentList {
public static Liquid coffee, siloxol, tensorflow;
public static Liquid coffee, siloxol, colloid, tensorflow;

@Override
public void load(){
Expand All @@ -32,6 +32,19 @@ public void load(){
barColor = Pal2.siloxol;
}};

colloid = new AnimatedLiquid("colloid", Color.valueOf("ff96df")){{
effect = MindyStatusEffects.starDrunk;
temperature = 0.3f;
viscosity = 0.2f;
heatCapacity = 1.3f;
explosiveness = 0.5f;
lightColor = Color.valueOf("ff96df").a(0.8f);

animDelay = 4f;
sprites = 6;
transition = 4;
}};

if(!Vars.headless){
for(Liquid i : Vars.content.liquids()){
if(i instanceof AnimatedLiquid al){
Expand Down
5 changes: 3 additions & 2 deletions src/betamindy/content/MindySounds.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import mindustry.*;

public class MindySounds {
public static Sound pistonPush, pistonPull, presentBells, boost, tntfuse, boing, freeze, coolingFan, pipePop, pipeSqueeze, pipeIn, easterEgg1, easterEgg2, portalOpen, portalLoop, portalClose, lightningStrike, shatter, boxOpen, astroCharge, astroShoot, drink, pianoSample, squareSample, synthSample;
public static Sound pistonPush, pistonPull, presentBells, boost, tntfuse, boing, freeze, coolingFan, pipePop, pipeSqueeze, pipeIn, easterEgg1, easterEgg2, portalOpen, portalLoop, portalClose, lightningStrike, shatter, boxOpen, astroCharge, astroShoot, drink, pianoSample, squareSample, synthSample, pewRetro;
public static Sound[] piano, bells, squareWave, sawWave, bass, organ, chimes, violin, harp, drums;
public static final String[] soundFiles = {"pistonpush", "pistonpull", "presentbells", "boostsound", "tntfuse", "boing", "freeze", "coolingfan", "pipepop", "pipesqueeze", "pipein", "strawberrydeath", "strawberrypredeath", "portalopen", "portalloop", "portalclose", "lstrike", "shatter", "boxopen", "astroCharge", "astroShoot", "drink", "pianoS", "squareS", "synthS"};
public static final String[] soundFiles = {"pistonpush", "pistonpull", "presentbells", "boostsound", "tntfuse", "boing", "freeze", "coolingfan", "pipepop", "pipesqueeze", "pipein", "strawberrydeath", "strawberrypredeath", "portalopen", "portalloop", "portalclose", "lstrike", "shatter", "boxopen", "astroCharge", "astroShoot", "drink", "pianoS", "squareS", "synthS", "pewretro"};
private static int num = 0;

public static void load() {
Expand Down Expand Up @@ -40,6 +40,7 @@ public static void load() {
pianoSample = l();
squareSample = l();
synthSample = l();
pewRetro = l();

//credits to farmerthanos
piano = loadNotes("piano");
Expand Down
42 changes: 39 additions & 3 deletions src/betamindy/content/MindyTechTree.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,34 @@ public class MindyTechTree implements ContentList{

@Override
public void load(){
//Shar branch
margeNode(mechanicalDrill, () -> {
node(isotopeReactor, () -> {
node(arcKiln, () -> {
node(lancerKiln);
node(fusionChamber, () -> {
node(scalarFurnace);
});
node(electroRefiner, () -> {
node(siliconCondenser, () -> {

});
});
});
});
});
margeNode(duo, () -> {
node(spectrum, () -> {
node(ray, () -> {
node(astro);
});
});
node(nebula, () -> {
node(sequence);
});
});
//end region

margeNode(payloadConveyor, () -> {
//todo re-add payload forge blocks when Anuke does so
});
Expand Down Expand Up @@ -97,15 +125,16 @@ public void load(){
});
});
margeNode(tsunami, () -> {
node(propaganda, () -> {
node(astro);
});
node(propaganda);
});

margeNode(vault, () -> {
node(silo, () -> {
node(warehouse);
});
node(chest, () -> {
node(largeChest);
});
});
margeNode(container, () -> {
node(anucoinNode, () -> {
Expand Down Expand Up @@ -188,10 +217,17 @@ public void load(){
node(armoredCog);
});
});

node(payloadRail, () -> {
node(railSorter);
});
});

margeNode(battery, () -> {
node(discharger);
node(capacitor, () -> {
node(megaCapacitor);
});
});

margeNode(incinerator, () -> {
Expand Down
4 changes: 2 additions & 2 deletions src/betamindy/entities/bullet/ItemTrailBulletType.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public ItemTrailBulletType(float damage, float speed, float range, Color trailCo
trailWidth = 1.2f;
trailLength = 6;
pierce = true;
hitEffect = MindyFx.sparkle;
despawnEffect = MindyFx.sparkle;
hitEffect = MindyFx.sparkleHit;
despawnEffect = MindyFx.sparkleHit;
}
}
5 changes: 4 additions & 1 deletion src/betamindy/world/blocks/environment/FallenUnit.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import mindustry.ctype.*;
import mindustry.entities.*;
import mindustry.game.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.world.*;
Expand All @@ -28,7 +29,9 @@ public class FallenUnit extends Prop {

public FallenUnit(String name){
super(name);
variants = 0;//todo breakEffect
variants = 0;
destroyEffect = breakEffect = Fx.explosion;
destroySound = breakSound = Sounds.explosion;
}

public void initUnit(){
Expand Down
Loading

0 comments on commit 74a1632

Please sign in to comment.