mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-25 05:51:47 -08:00
Code Issues Projects Releases Wiki Activity

Minor bugfixes

Browse source
This commit is contained in:
Anuken 2022-06-03 21:06:14 -04:00
parent 29e086f23b
commit 152a5b5c94
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/mindustry/mod/ContentParser.java
View file

@ -188,7 +188,7 @@ public class ContentParser{
case "delay" -> base.delay(data.getFloat("amount"));
case "sustain" -> base.sustain(data.getFloat("offset", 0f), data.getFloat("grow", 0f), data.getFloat("sustain"));
case "shorten" -> base.shorten(data.getFloat("amount"));
case "add" -> base.add(data.getFloat("amount"));
case "add" -> data.has("amount") ? base.add(data.getFloat("amount")) : base.add(parser.readValue(PartProgress.class, data.get("other")));
case "blend" -> base.blend(parser.readValue(PartProgress.class, data.get("other")), data.getFloat("amount"));
case "mul" -> base.mul(parser.readValue(PartProgress.class, data.get("other")));
case "min" -> base.min(parser.readValue(PartProgress.class, data.get("other")));

2
core/src/mindustry/type/Weapon.java
View file

@ -204,7 +204,7 @@ public class Weapon implements Cloneable{
DrawPart.params.sideMultiplier = flipSprite ? -1 : 1;
for(int i = 0; i < parts.size; i++){
var part = parts.items[i];
var part = parts.get(i);
if(part.under){
part.draw(DrawPart.params);
}

3
core/src/mindustry/type/weapons/BuildWeapon.java
View file

@ -1,5 +1,6 @@
package mindustry.type.weapons;
import arc.graphics.g2d.*;
import arc.math.*;
import mindustry.entities.bullet.*;
import mindustry.entities.units.*;
@ -54,6 +55,7 @@ public class BuildWeapon extends Weapon{
if(unit.activelyBuilding()){
float
z = Draw.z(),
rotation = unit.rotation - 90,
weaponRotation = rotation + (rotate ? mount.rotation : 0),
wx = unit.x + Angles.trnsx(rotation, x, y) + Angles.trnsx(weaponRotation, 0, -mount.recoil),
@ -62,6 +64,7 @@ public class BuildWeapon extends Weapon{
py = wy + Angles.trnsy(weaponRotation, this.shootX, this.shootY);
unit.drawBuildingBeam(px, py);
Draw.z(z);
}
}
}

2
gradle.properties
View file

@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000
archash=a02840762b
archash=c4505eb469