Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion assets/bundles/bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,10 @@ item.meld-tenbris.name = Tenbris
item.meld-tenbris.description = Raw material, valued for its ability to insulate aspect when refined.
item.meld-tenbris.details = Fume infused hematite, more malleable and less brittle but less hard than usual.

item.meld-motis.name = Motis
item.meld-motis.description = Raw material, valued for its natural magnetism.
item.meld-motis.details = Fume infused magnetite, more malleable and less brittle but less hard than usual.

item.meld-shadesteel.name = Shadesteel
item.meld-shadesteel.description = Not just some rock anymore.\nDurable building material.
item.meld-shadesteel.details = IT'S NOT IRON I SWEAR
Expand All @@ -596,6 +600,22 @@ item.meld-annealed-silver.name = Annealed Silver
item.meld-annealed-silver.description = Highly refined and attuned. Makes for a great aspect conductor.
item.meld-annealed-silver.details = An easily made aspect superconductor.

item.meld-iampsi.name = Iampsi
item.meld-iampsi.description = Hardy mineral found accumulating in deposits under dried riverbeds, or as spikes above surface.\n\nDecomposable for Silver and Quartz Strata, useful for grinding.
item.meld-iampsi.details = Radiance.

item.meld-sandy-particulate.name = Sandy Particulate
item.meld-sandy-particulate.description = Can't be mined by drill, crumbles too easily. Must be quarried.\n\nCan be filtered through for Quartz Strata.
item.meld-sandy-particulate.details = Him.

item.meld-quartz-strata.name = Quartz Strata
item.meld-quartz-strata.description = Silicon oxide grains and crystals of various sizes, ready for industrial or military use.\n\nToo disorderly to be used in electronics raw.
item.meld-quartz-strata.details = Me...

item.meld-likestone-sediments.name = Likestone Sediments
item.meld-likestone-sediments.description = Claystone deposited bessides old rivers. Acts as a great glass flux.
item.meld-likestone-sediments.details = Family.

item.meld-electrum-sheet.name = Electrum Sheet
item.meld-electrum-sheet.description = Refined material used in power transmission and advanced unit production.
item.meld-electrum-sheet.details = Also functions as a capsule for [#cbdbfc]Aspect[].
Expand Down Expand Up @@ -839,7 +859,7 @@ unit.meld-iguana.description = Commander of the Bunker core. Launches out sap vo
unit.meld-iguana.details = One hell of an alien.

unit.meld-shark.name = Shark
unit.meld-shark.description = Launches missiles which sap target's health. Hovers over deep bodies of liquid. An [accent]excellent[] scout.\n[red]Struggles against force fields.[]
unit.meld-shark.description = Launches salvos of missiles which sap target's health. Can hover on land at a reduced speed. An [accent]excellent[] scout.\n[red]Struggles against force fields.[]
unit.meld-shark.details = Enables the other mechanized fish, especially Remora and Narwhal.

unit.meld-narwhal.name = Narwhal
Expand Down
Binary file modified assets/sprites/blocks/environment/badlands/aspect-soil1.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/badlands/aspect-soil2.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/badlands/aspect-soil3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/badlands/sand-meld1.png
Binary file modified assets/sprites/blocks/environment/badlands/sand-meld2.png
Binary file modified assets/sprites/blocks/environment/badlands/sand-meld3.png
Binary file modified assets/sprites/blocks/environment/badlands/soft-sand1.png
Binary file modified assets/sprites/blocks/environment/badlands/soft-sand2.png
Binary file modified assets/sprites/blocks/environment/badlands/soft-sand3.png
Binary file added assets/sprites/blocks/environment/metal-pebbles1.png
Binary file added assets/sprites/blocks/environment/metal-pebbles2.png
Binary file added assets/sprites/blocks/environment/metal-pebbles3.png
Binary file added assets/sprites/blocks/props/iampsi-gemstone1.png
Binary file added assets/sprites/blocks/props/iampsi-gemstone2.png
Binary file added assets/sprites/blocks/props/iampsi-gemstone3.png
Binary file added assets/sprites/blocks/props/iampsi-gemstone4.png
Binary file added assets/sprites/blocks/props/meld-crystal1.png
Binary file added assets/sprites/blocks/props/meld-crystal2.png
Binary file added assets/sprites/blocks/props/meld-crystal3.png
Binary file added assets/sprites/blocks/props/meld-metal-stick1.png
Binary file added assets/sprites/blocks/props/meld-metal-stick2.png
Binary file added assets/sprites/blocks/props/meld-metal-stick3.png
Binary file added assets/sprites/blocks/props/meld-pools1.png
Binary file added assets/sprites/blocks/props/meld-pools2.png
Binary file added assets/sprites/blocks/props/meld-pools3.png
Binary file added assets/sprites/blocks/props/meld-protrusion1.png
Binary file added assets/sprites/blocks/props/meld-protrusion2.png
Binary file added assets/sprites/blocks/props/quartz-spikes-shadow2.png
Binary file added assets/sprites/blocks/props/quartz-spikes1.png
Binary file added assets/sprites/blocks/props/quartz-spikes2.png
Binary file added assets/sprites/blocks/props/quartz-spikes3.png
Binary file added assets/sprites/blocks/props/quartz-spikes4.png
Binary file added assets/sprites/blocks/props/quartz-spikes5.png
Binary file added assets/sprites/items/dissonitre.png
Binary file added assets/sprites/items/electrum-sheet.png
Binary file added assets/sprites/items/heavy ind/iampsi.png
Binary file added assets/sprites/items/quartz-strata.png
Binary file added assets/sprites/items/vitric-mesh.png
2 changes: 1 addition & 1 deletion mod.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ main: "meld.Meld"
description: "Meld Java.\n\n[[]accent]Only has custom game content! (play the info map to understand)[[]]\n\nIncompatable with hjson meld"

#the mod version
version: gameplay expirimental v4
version: gameplay test v3

#the minimum game build required to run this mod
minGameVersion: 154
Expand Down
55 changes: 34 additions & 21 deletions src/meld/content/MeldBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public static Item item(String name){

public static void load(){

int channelHealth = 120;
int channelHealth = 100;

channelFace = new FlexibleSizeJunction("channel-face"){{
requirements(Category.liquid, with(
Expand Down Expand Up @@ -172,6 +172,9 @@ public static void load(){
new DrawLiquidTile(){{
drawLiquid = MeldLiquids.boundAspect;
}},
new DrawLiquidTile(){{
drawLiquid = MeldLiquids.stormingAspect;
}},
new DrawRegion(),
new DrawSideRegion()
);
Expand All @@ -187,31 +190,31 @@ public static void load(){
recipes.addAll(
new TimedRecipe(){{
craftTime = 10;
float multi = MeldLiquids.aetherEfficiencies.get(MeldLiquids.aether, 1);
float density = MeldLiquids.aetherDensities.get(MeldLiquids.aether, 1);
float multi = AspectGroup.aether.getEfficiency(MeldLiquids.aether);
float density = AspectGroup.aether.getDensity(MeldLiquids.aether);
inputLiquids = LiquidStack.with(MeldLiquids.aether, outletRate/density);
outputLiquids = LiquidStack.with(MeldLiquids.aspect, outletRate * multi * 10);
outputLiquids = LiquidStack.with(MeldLiquids.aspect, outletRate * multi * 10 * density);
}},
new TimedRecipe(){{
craftTime = 10;
float multi = MeldLiquids.aetherEfficiencies.get(MeldLiquids.pollutantMixture, 1);
float density = MeldLiquids.aetherDensities.get(MeldLiquids.pollutantMixture, 1);
inputLiquids = LiquidStack.with(MeldLiquids.pollutantMixture, outletRate/density);
outputLiquids = LiquidStack.with(MeldLiquids.boundAspect, outletRate * multi * 10);
float multi = AspectGroup.aether.getEfficiency(MeldLiquids.pollutantMixture);
float density = AspectGroup.aether.getDensity(MeldLiquids.pollutantMixture);
inputLiquids = LiquidStack.with(MeldLiquids.pollutantMixture, outletRate);
outputLiquids = LiquidStack.with(MeldLiquids.boundAspect, outletRate * multi * 10 * density);
}},
new TimedRecipe(){{
craftTime = 10;
float multi = MeldLiquids.aetherEfficiencies.get(MeldLiquids.thunderingAether, 1);
float density = MeldLiquids.aetherDensities.get(MeldLiquids.thunderingAether, 1);
float multi = AspectGroup.aether.getEfficiency(MeldLiquids.thunderingAether);
float density = AspectGroup.aether.getDensity(MeldLiquids.thunderingAether);
inputLiquids = LiquidStack.with(MeldLiquids.thunderingAether, outletRate/density);
outputLiquids = LiquidStack.with(MeldLiquids.stormingAspect, outletRate * multi * 10);
outputLiquids = LiquidStack.with(MeldLiquids.stormingAspect, outletRate * multi * 10 * density);
}}
);
}};

aspectChannel = new VisualAspectPipe("aspect-channel"){{
requirements(Category.liquid, with(
MeldItems.annealedSilver, 5, MeldItems.glassMallows, 2
MeldItems.annealedSilver, 5, MeldItems.aspectPipe, 2
));
underBullets = false;
leaks = false;
Expand Down Expand Up @@ -408,7 +411,7 @@ public static void load(){
shotDelay = 0;
shots = 7;

float[] spreadCone = new float[]{0, 3, 6, 15};
float[] spreadCone = new float[]{0, 3, 12, 25};
barrels = new float[]{
0, 0, spreadCone[0],
0, 0, -spreadCone[2],
Expand Down Expand Up @@ -636,7 +639,7 @@ public static void load(){
);

consume(
new ConsumeAspects(outletRate, MeldLiquids.aspectEfficiencies, MeldLiquids.aspectDensities)
new StupidConsumeAspects(outletRate, AspectGroup.aspect)
);
}};

Expand Down Expand Up @@ -669,7 +672,7 @@ public static void load(){
firstShotDelay = 60;
}};

consume(new ConsumeAspects(outletRate * 3, MeldLiquids.aspectEfficiencies, MeldLiquids.aspectDensities));
consume(new StupidConsumeAspects(outletRate * 3, AspectGroup.aspect));

drawer = new DrawTurret(){{

Expand Down Expand Up @@ -1005,7 +1008,7 @@ public void update(Bullet b){
new DrawDefault()
);

consume(new ConsumeAspects(outletRate/2, MeldLiquids.aspectEfficiencies, MeldLiquids.aspectDensities));
consume(new StupidConsumeAspects(outletRate/2, AspectGroup.aspect));
}};

coreRaft = new CoreRaft("core-raft"){{
Expand Down Expand Up @@ -1105,12 +1108,22 @@ public void update(Bullet b){

optionalBoostIntensity = 2;

sparkColor = Color.valueOf("8cc7ee");
boostHeatColor = Color.valueOf("ecb6eb");

sparks = 24;
sparkLife = 15;
sparkSpread = 25;

drillMultipliers.put(
MeldItems.clayMallows, 0.5f
);
drillMultipliers.put(
MeldItems.resonarum, 0.5f
);
drillMultipliers.put(
MeldItems.electrumSheets, 2
);

consume(new StupidConsumeAspects(
outletRate, AspectGroup.aspect
Expand Down Expand Up @@ -1250,7 +1263,7 @@ public void update(Bullet b){
b.setPin(ModOUT.FIVE, a);
};
}},
new ConsumeAspectModule(outletRate * 2, MeldLiquids.aspectEfficiencies, MeldLiquids.aspectDensities, ModIN.FIVE, ModOUT.SIX),
new ConsumeAspectModule(outletRate * 2, AspectGroup.aspect, ModIN.FIVE, ModOUT.SIX),
new RecipeCraftingModule(){{
recipe = shadesteel;
efficiencyPins = new int[]{ModIN.SIX, ModIN.ZERO};
Expand Down Expand Up @@ -1311,7 +1324,7 @@ public void update(Bullet b){

modules.addAll(
//Set the base rate based on aspect intake
new ConsumeAspectModule(outletRate * 8, MeldLiquids.aspectEfficiencies, MeldLiquids.aspectDensities, 0, 1),
new ConsumeAspectModule(outletRate * 8, AspectGroup.aspect, 0, 1),
//Setup the flags for possible recipies
new GateModule(
ModOUT.TWO,
Expand Down Expand Up @@ -1456,9 +1469,9 @@ public void update(Bullet b){
size = 5;
health = 2500;

consume(new ConsumeLiquid(MeldLiquids.aspect, outletRate * 12));
consume(new StupidConsumeAspects(outletRate * 12, AspectGroup.aspect));
plans.addAll(
new UnitPlan(MeldUnits.shark, 60 * 5, with(MeldItems.silver, 80, MeldItems.carbolith, 60))
new UnitPlan(MeldUnits.shark, 60 * 5, with(MeldItems.annealedSilver, 120, MeldItems.carbolith, 60))
);
}};

Expand Down Expand Up @@ -1493,7 +1506,7 @@ public void update(Bullet b){
health = 1200;
range = 22 * Vars.tilesize;

consume(new ConsumeAspects(outletRate * 3, MeldLiquids.aspectEfficiencies, MeldLiquids.aspectDensities));
consume(new StupidConsumeAspects(outletRate * 3, AspectGroup.aspect));
}};

nullifier = new Nullifier("nullifier"){{
Expand Down
8 changes: 3 additions & 5 deletions src/meld/content/MeldBullets.java
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,14 @@ public static void load(){
fragRandomSpread = 5;
fragBullets = 3;

fragBullet = new BasicBulletType(12, 1, Meld.prefix("clump")){{
fragBullet = new BasicBulletType(12, 6, Meld.prefix("clump")){{
lifetime = 21;
drag = 0.01f;
width = 6;
height = 12;
shrinkX = 0.7f;
shrinkY = 0.2f;

splashDamage = 1;
splashDamageRadius = 20;
knockback = 0.25f;
impact = true;

Expand All @@ -244,7 +242,7 @@ public static void load(){

bulletInterval = 2;

fragBullet = new BasicBulletType(9, 2, Meld.prefix("clump")){{
fragBullet = new BasicBulletType(9, 4, Meld.prefix("clump")){{
speed = 9;
damage = 0.5f;
lifetime = 8;
Expand All @@ -261,7 +259,7 @@ public static void load(){
despawnHit = false;

sticky = true;
stickyExtraLifetime = 60;
stickyExtraLifetime = 120;

status = MeldStatusEffects.impaled;
statusDuration = 5;
Expand Down
Loading
Loading