mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 09:17:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes & Onset items

Browse Source
This commit is contained in:
Anuken 2022-01-23 17:15:23 -05:00
parent d66c386881
commit bfe893adfb
5 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/onset.msav
View File

Binary file not shown.

4
core/src/mindustry/content/UnitTypes.java
View File

@ -2710,7 +2710,7 @@ public class UnitTypes{
speed = 2.9f;
rotateSpeed = 9f;
accel = 0.1f;
itemCapacity = 40;
itemCapacity = 60;
health = 300f;
armor = 1f;
hitSize = 9f;
@ -2770,7 +2770,7 @@ public class UnitTypes{
speed = 2.8f;
rotateSpeed = 5f;
accel = 0.11f;
itemCapacity = 70;
itemCapacity = 90;
health = 600f;
armor = 2f;
hitSize = 18f;

25
core/src/mindustry/world/blocks/environment/StaticCoralWall.java
View File

@ -1,25 +0,0 @@
package mindustry.world.blocks.environment;
import arc.graphics.g2d.*;
import arc.math.*;
import mindustry.annotations.Annotations.*;
import mindustry.world.*;
public class StaticCoralWall extends StaticWall{
public @Load(value = "@-cluster#", length = 1) TextureRegion[] clusters;
public StaticCoralWall(String name){
super(name);
variants = 1;
}
@Override
public void drawBase(Tile tile){
super.drawBase(tile);
if(Mathf.randomSeed(tile.pos(), 10) < 2){
Draw.rect(clusters[0], tile.worldx(), tile.worldy(), Mathf.randomSeedRange(tile.pos() + 1, 180f));
}
}
}

2
core/src/mindustry/world/blocks/power/ThermalGenerator.java
View File

@ -100,7 +100,7 @@ public class ThermalGenerator extends PowerGenerator{
super.draw();
if(spinners){
Drawf.spinSprite(blurRegion.found() ? blurRegion : rotatorRegion, x, y, spinRotation);
Drawf.spinSprite(blurRegion.found() && enabled && productionEfficiency > 0 ? blurRegion : rotatorRegion, x, y, spinRotation);
}
}

18
core/src/mindustry/world/modules/ItemModule.java
View File

@ -348,4 +348,22 @@ public class ItemModule extends BlockModule{
public interface ItemCalculator{
float get(Item item, int amount);
}
@Override
public String toString(){
var res = new StringBuilder();
res.append("ItemModule{");
boolean any = false;
for(int i = 0; i < items.length; i++){
if(items[i] != 0){
res.append(content.items().get(i).name).append(":").append(items[i]).append(",");
any = true;
}
}
if(any){
res.setLength(res.length() - 1);
}
res.append("}");
return res.toString();
}
}