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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-09-28 11:28:58 -04:00
parent d226ffe633 182dfc5f38
commit c6c374f672
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/shaders/cryofluid.frag
View File

@@ -14,8 +14,6 @@ uniform float u_time;
varying vec2 v_texCoords; varying vec2 v_texCoords;
const float shakeScl = 20.0;
void main(){ void main(){
vec2 c = v_texCoords.xy; vec2 c = v_texCoords.xy;
vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y); vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y);

2
core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
View File

@@ -67,7 +67,7 @@ public class LaserTurret extends PowerTurret{
Liquid liquid = liquids.current(); Liquid liquid = liquids.current();
float maxUsed = consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount; float maxUsed = consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount;
float used = (cheating() ? maxUsed * Time.delta : Math.min(liquids.get(liquid), maxUsed * Time.delta)); float used = (cheating() ? maxUsed : Math.min(liquids.get(liquid), maxUsed)) * Time.delta;
reload -= used * liquid.heatCapacity * coolantMultiplier; reload -= used * liquid.heatCapacity * coolantMultiplier;
liquids.remove(liquid, used); liquids.remove(liquid, used);