mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-07-24 14:47:58 +07:00
Bugfixes / unfinished new zones
This commit is contained in:
@ -350,6 +350,8 @@ zone.nuclearComplex.name = Nuclear Production Complex
|
|||||||
zone.overgrowth.name = Overgrowth
|
zone.overgrowth.name = Overgrowth
|
||||||
zone.tarFields.name = Tar Fields
|
zone.tarFields.name = Tar Fields
|
||||||
zone.saltFlats.name = Salt Flats [scarlet][[WIP]
|
zone.saltFlats.name = Salt Flats [scarlet][[WIP]
|
||||||
|
zone.impact0078.name = Impact 0078
|
||||||
|
zone.crags.name = Crags
|
||||||
|
|
||||||
settings.language = Language
|
settings.language = Language
|
||||||
settings.reset = Reset to Defaults
|
settings.reset = Reset to Defaults
|
||||||
|
@ -115,6 +115,7 @@ public class Bullets implements ContentList{
|
|||||||
lifetime = 70f;
|
lifetime = 70f;
|
||||||
bulletWidth = bulletHeight = 14f;
|
bulletWidth = bulletHeight = 14f;
|
||||||
collidesTiles = false;
|
collidesTiles = false;
|
||||||
|
ammoMultiplier = 2f;
|
||||||
splashDamageRadius = 45f;
|
splashDamageRadius = 45f;
|
||||||
splashDamage = 50f;
|
splashDamage = 50f;
|
||||||
backColor = Pal.missileYellowBack;
|
backColor = Pal.missileYellowBack;
|
||||||
@ -170,6 +171,7 @@ public class Bullets implements ContentList{
|
|||||||
flakExplosive = new FlakBulletType(4f, 5){{
|
flakExplosive = new FlakBulletType(4f, 5){{
|
||||||
//default bullet type, no changes
|
//default bullet type, no changes
|
||||||
shootEffect = Fx.shootBig;
|
shootEffect = Fx.shootBig;
|
||||||
|
ammoMultiplier = 2f;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
flakSurge = new FlakBulletType(4f, 7){{
|
flakSurge = new FlakBulletType(4f, 7){{
|
||||||
@ -186,6 +188,7 @@ public class Bullets implements ContentList{
|
|||||||
drag = -0.01f;
|
drag = -0.01f;
|
||||||
splashDamageRadius = 30f;
|
splashDamageRadius = 30f;
|
||||||
splashDamage = 30f;
|
splashDamage = 30f;
|
||||||
|
ammoMultiplier = 2f;
|
||||||
lifetime = 150f;
|
lifetime = 150f;
|
||||||
hitEffect = Fx.blastExplosion;
|
hitEffect = Fx.blastExplosion;
|
||||||
despawnEffect = Fx.blastExplosion;
|
despawnEffect = Fx.blastExplosion;
|
||||||
|
@ -168,7 +168,7 @@ public class Zones implements ContentList{
|
|||||||
startingItems = ItemStack.list(Items.copper, 2000, Items.lead, 2000, Items.graphite, 500, Items.titanium, 500, Items.silicon, 500);
|
startingItems = ItemStack.list(Items.copper, 2000, Items.lead, 2000, Items.graphite, 500, Items.titanium, 500, Items.silicon, 500);
|
||||||
conditionWave = 3;
|
conditionWave = 3;
|
||||||
launchPeriod = 2;
|
launchPeriod = 2;
|
||||||
zoneRequirements = ZoneRequirement.with(frozenForest, 40);
|
zoneRequirements = ZoneRequirement.with(nuclearComplex, 40);
|
||||||
blockRequirements = new Block[]{Blocks.thermalGenerator};
|
blockRequirements = new Block[]{Blocks.thermalGenerator};
|
||||||
resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.sand, Items.thorium};
|
resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.sand, Items.thorium};
|
||||||
}};
|
}};
|
||||||
|
@ -116,7 +116,7 @@ public class Control implements ApplicationListener{
|
|||||||
Effects.shake(5, 6, Core.camera.position.x, Core.camera.position.y);
|
Effects.shake(5, 6, Core.camera.position.x, Core.camera.position.y);
|
||||||
//the restart dialog can show info for any number of scenarios
|
//the restart dialog can show info for any number of scenarios
|
||||||
Call.onGameOver(event.winner);
|
Call.onGameOver(event.winner);
|
||||||
if(state.rules.zone != null){
|
if(state.rules.zone != null && !Net.client()){
|
||||||
//remove zone save on game over
|
//remove zone save on game over
|
||||||
if(saves.getZoneSlot() != null){
|
if(saves.getZoneSlot() != null){
|
||||||
saves.getZoneSlot().delete();
|
saves.getZoneSlot().delete();
|
||||||
|
@ -130,7 +130,7 @@ public enum EditorTool{
|
|||||||
Block dest = tile.block();
|
Block dest = tile.block();
|
||||||
if(dest == editor.drawBlock) return;
|
if(dest == editor.drawBlock) return;
|
||||||
tester = t -> t.block() == dest;
|
tester = t -> t.block() == dest;
|
||||||
setter = t -> t.setBlock(editor.drawBlock);
|
setter = t -> t.setBlock(editor.drawBlock, editor.drawTeam);
|
||||||
}
|
}
|
||||||
|
|
||||||
//replace only when the mode is 0 using the specified functions
|
//replace only when the mode is 0 using the specified functions
|
||||||
|
@ -79,7 +79,7 @@ public class ImpactReactor extends PowerGenerator{
|
|||||||
entity.warmup = 1f;
|
entity.warmup = 1f;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(entity.timer.get(timerUse, itemDuration)){
|
if(entity.timer.get(timerUse, itemDuration / entity.timeScale)){
|
||||||
entity.cons.trigger();
|
entity.cons.trigger();
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
|
@ -85,7 +85,7 @@ public class NuclearReactor extends PowerGenerator{
|
|||||||
if(fuel > 0){
|
if(fuel > 0){
|
||||||
entity.heat += fullness * heating * Math.min(entity.delta(), 4f);
|
entity.heat += fullness * heating * Math.min(entity.delta(), 4f);
|
||||||
|
|
||||||
if(entity.timer.get(timerFuel, itemDuration)){
|
if(entity.timer.get(timerFuel, itemDuration / entity.timeScale)){
|
||||||
entity.cons.trigger();
|
entity.cons.trigger();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user