Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/7.0-features' into 7.0-features

Browse Source
This commit is contained in:
Epowerj
2022-04-28 14:53:40 -04:00
parent 074442bfc2 293311087d
commit 798aa5ba7d
13 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -577,7 +577,7 @@ configure = Configure Loadout
objective.research = [accent]Research:\n[]{0}[lightgray]{1}
objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1}
objective.destroyblocks = [accent]Destroy: [lightgray]{0}[]/{1}\n{2}[lightgray]{3}
objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}

13
core/src/mindustry/content/SectorPresets.java
View File

@@ -1,7 +1,6 @@
package mindustry.content;
import arc.graphics.Color;
import arc.math.geom.Point2;
import arc.math.geom.*;
import mindustry.game.MapObjectives.*;
import mindustry.game.*;
import mindustry.graphics.*;
@@ -208,11 +207,11 @@ public class SectorPresets{
rules = r -> {
r.objectives.addAll(
new DestroyBlocksObjective(Blocks.coreBastion, Team.malis, Point2.pack(290,501), Point2.pack(158,496)),
new TimerObjective("Nuclear launch detected", 4 * 60 * 60).withMarkers(
new TextMarker("Evacuate base", 1, 1),
new MinimapMarker(338,378, Color.red)
).withFlags("nuke1")
new DestroyBlocksObjective(Blocks.coreBastion, Team.malis, Point2.pack(290,501), Point2.pack(158,496)),
new TimerObjective("[accent]⚠ Nuclear launch detected:\n[lightgray]{0}", 4 * 60 * 60).withMarkers(
new TextMarker("Evacuate base", 1, 1),
new MinimapMarker(338,378, Pal.remove)
).withFlags("nuke1")
);
};
}};

17
core/src/mindustry/entities/bullet/BulletType.java
View File

@@ -305,13 +305,7 @@ public class BulletType extends Content implements Cloneable{
Effect.shake(hitShake, hitShake, b);
createFrags(b, x, y);
if(puddleLiquid != null && puddles > 0){
for(int i = 0; i < puddles; i++){
Tile tile = world.tileWorld(x + Mathf.range(puddleRange), y + Mathf.range(puddleRange));
Puddles.deposit(tile, puddleLiquid, puddleAmount);
}
}
createPuddles(b, x, y);
if(incendChance > 0 && Mathf.chance(incendChance)){
Damage.createIncend(x, y, incendSpread, incendAmount);
@@ -329,6 +323,15 @@ public class BulletType extends Content implements Cloneable{
}
}
public void createPuddles(Bullet b, float x, float y){
if(puddleLiquid != null && puddles > 0){
for(int i = 0; i < puddles; i++){
Tile tile = world.tileWorld(x + Mathf.range(puddleRange), y + Mathf.range(puddleRange));
Puddles.deposit(tile, puddleLiquid, puddleAmount);
}
}
}
public void createSplashDamage(Bullet b, float x, float y){
if(splashDamageRadius > 0 && !b.absorbed){
Damage.damage(b.team, x, y, splashDamageRadius, splashDamage * b.damageMultiplier(), false, collidesAir, collidesGround, scaledSplashDamage, b);

2
core/src/mindustry/game/MapObjectives.java
View File

@@ -308,7 +308,7 @@ public class MapObjectives{
@Override
public String text(){
return Core.bundle.format("objective.destroyblocks", positions, positions.length, block.emoji(), block.localizedName);
return Core.bundle.format("objective.destroyblocks", progress(), positions.length, block.emoji(), block.localizedName);
}
}

1
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -44,6 +44,7 @@ public class Conveyor extends Block implements Autotiler{
itemCapacity = capacity;
priority = TargetPriority.transport;
conveyorPlacement = true;
underBullets = true;
ambientSound = Sounds.conveyor;
ambientSoundVolume = 0.0022f;

1
core/src/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -44,6 +44,7 @@ public class ItemBridge extends Block{
super(name);
update = true;
solid = true;
underBullets = true;
hasPower = true;
itemCapacity = 10;
configurable = true;

3
core/src/mindustry/world/blocks/distribution/Junction.java
View File

@@ -16,7 +16,8 @@ public class Junction extends Block{
public Junction(String name){
super(name);
update = true;
solid = true;
solid = false;
underBullets = true;
group = BlockGroup.transportation;
unloadable = false;
noUpdateDisabled = true;

2
core/src/mindustry/world/blocks/distribution/OverflowGate.java
View File

@@ -15,7 +15,7 @@ public class OverflowGate extends Block{
public OverflowGate(String name){
super(name);
hasItems = true;
solid = true;
underBullets = true;
update = false;
destructible = true;
group = BlockGroup.transportation;

2
core/src/mindustry/world/blocks/distribution/Router.java
View File

@@ -15,7 +15,7 @@ public class Router extends Block{
public Router(String name){
super(name);
solid = true;
update = true;
underBullets = true;
hasItems = true;
itemCapacity = 1;
group = BlockGroup.transportation;

2
core/src/mindustry/world/blocks/distribution/Sorter.java
View File

@@ -21,7 +21,7 @@ public class Sorter extends Block{
super(name);
update = false;
destructible = true;
solid = true;
underBullets = true;
instantTransfer = true;
group = BlockGroup.transportation;
configurable = true;

1
core/src/mindustry/world/blocks/distribution/StackConveyor.java
View File

@@ -52,6 +52,7 @@ public class StackConveyor extends Block implements Autotiler{
itemCapacity = 10;
conveyorPlacement = true;
highUnloadPriority = true;
underBullets = true;
priority = TargetPriority.transport;
ambientSound = Sounds.conveyor;

1
core/src/mindustry/world/blocks/liquid/Conduit.java
View File

@@ -46,6 +46,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
rotate = true;
solid = false;
floating = true;
underBullets = true;
conveyorPlacement = true;
noUpdateDisabled = true;
canOverdrive = false;

2
core/src/mindustry/world/blocks/liquid/LiquidRouter.java
View File

@@ -12,6 +12,8 @@ public class LiquidRouter extends LiquidBlock{
public LiquidRouter(String name){
super(name);
underBullets = true;
solid = false;
noUpdateDisabled = true;
canOverdrive = false;
}