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

Misc minor fixes

Browse Source
This commit is contained in:
Anuken
2022-05-28 07:48:43 -04:00
parent 0e4903910b
commit 55a219fc03
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+1 -1
View File
@@ -364,7 +364,7 @@ project(":core"){
dependencies{ dependencies{
compileJava.dependsOn(preGen) compileJava.dependsOn(preGen)
api "org.lz4:lz4-java:1.7.1" api "org.lz4:lz4-java:1.8.0"
api arcModule("arc-core") api arcModule("arc-core")
api arcModule("extensions:flabel") api arcModule("extensions:flabel")
api arcModule("extensions:freetype") api arcModule("extensions:freetype")
core/src/mindustry/type/Weapon.java
+7 -1
View File
@@ -253,7 +253,7 @@ public class Weapon implements Cloneable{
float lastReload = mount.reload; float lastReload = mount.reload;
mount.reload = Math.max(mount.reload - Time.delta * unit.reloadMultiplier, 0); mount.reload = Math.max(mount.reload - Time.delta * unit.reloadMultiplier, 0);
mount.recoil = Mathf.approachDelta(mount.recoil, 0, unit.reloadMultiplier / recoilTime); mount.recoil = Mathf.approachDelta(mount.recoil, 0, unit.reloadMultiplier / recoilTime);
mount.warmup = Mathf.lerpDelta(mount.warmup, can && mount.shoot ? 1f : 0f, shootWarmupSpeed); mount.warmup = Mathf.lerpDelta(mount.warmup, (can && mount.shoot) || (continuous && mount.bullet != null) ? 1f : 0f, shootWarmupSpeed);
mount.smoothReload = Mathf.lerpDelta(mount.smoothReload, mount.reload / reload, smoothReloadSpeed); mount.smoothReload = Mathf.lerpDelta(mount.smoothReload, mount.reload / reload, smoothReloadSpeed);
//rotate if applicable //rotate if applicable
@@ -328,6 +328,12 @@ public class Weapon implements Cloneable{
if(mount.sound == null) mount.sound = new SoundLoop(shootSound, 1f); if(mount.sound == null) mount.sound = new SoundLoop(shootSound, 1f);
mount.sound.update(bulletX, bulletY, true); mount.sound.update(bulletX, bulletY, true);
} }
//TODO: how do continuous flame bullets work here? a new system is needed
if(mount.bullet.type.optimalLifeFract > 0){
// mount.bullet.time = mount.bullet.lifetime * mount.bullet.type.optimalLifeFract * mount.warmup;
// mount.bullet.keepAlive = true;
}
} }
}else{ }else{
//heat decreases when not firing //heat decreases when not firing
core/src/mindustry/world/Block.java
+1 -1
View File
@@ -538,7 +538,7 @@ public class Block extends UnlockableContent implements Senseable{
} }
public void addLiquidBar(Liquid liq){ public void addLiquidBar(Liquid liq){
addBar("liquid-" + liq.name, entity -> !liq.unlocked() ? null : new Bar( addBar("liquid-" + liq.name, entity -> !liq.unlockedNow() ? null : new Bar(
() -> liq.localizedName, () -> liq.localizedName,
liq::barColor, liq::barColor,
() -> entity.liquids.get(liq) / liquidCapacity () -> entity.liquids.get(liq) / liquidCapacity
desktop/src/mindustry/desktop/steam/SNet.java
+2 -2
View File
@@ -144,7 +144,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
int length = writeBuffer.position(); int length = writeBuffer.position();
writeBuffer.flip(); writeBuffer.flip();
snet.sendP2PPacket(currentServer, writeBuffer, reliable || length >= 1200 ? P2PSend.Reliable : P2PSend.UnreliableNoDelay, 0); snet.sendP2PPacket(currentServer, writeBuffer, reliable || length >= 1000 ? P2PSend.Reliable : P2PSend.UnreliableNoDelay, 0);
}catch(Exception e){ }catch(Exception e){
net.showError(e); net.showError(e);
} }
@@ -419,7 +419,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
int length = writeBuffer.position(); int length = writeBuffer.position();
writeBuffer.flip(); writeBuffer.flip();
snet.sendP2PPacket(sid, writeBuffer, reliable || length >= 1200 ? object instanceof StreamChunk ? P2PSend.ReliableWithBuffering : P2PSend.Reliable : P2PSend.UnreliableNoDelay, 0); snet.sendP2PPacket(sid, writeBuffer, reliable || length >= 1000 ? object instanceof StreamChunk ? P2PSend.ReliableWithBuffering : P2PSend.Reliable : P2PSend.UnreliableNoDelay, 0);
}catch(Exception e){ }catch(Exception e){
Log.err(e); Log.err(e);
Log.info("Error sending packet. Disconnecting invalid client!"); Log.info("Error sending packet. Disconnecting invalid client!");