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

Merge pull request #2395 from genNAowl/ready-to-merge-force-projectors

Browse Source 
F O R C E P R O J E C T O R S
This commit is contained in:
Anuken 2020-09-19 21:15:45 -04:00 committed by GitHub
commit b4d83f33e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -615,6 +615,8 @@ blocks.inaccuracy = Inaccuracy
blocks.shots = Shots
blocks.reload = Shots/Second
blocks.ammo = Ammo
blocks.shieldhealth = Shield Health
blocks.cooldowntime = Cooldown Time
bar.drilltierreq = Better Drill Required
bar.noresources = Missing Resources
@ -662,6 +664,7 @@ unit.persecond = /sec
unit.perminute = /min
unit.timesspeed = x speed
unit.percent = %
unit.shieldhealth = shield health
unit.items = items
unit.thousands = k
unit.millions = mil

7
core/src/mindustry/world/blocks/defense/ForceProjector.java
View File

@ -23,6 +23,7 @@ public class ForceProjector extends Block{
public float phaseUseTime = 350f;
public float phaseRadiusBoost = 80f;
public float phaseShieldBoost = 400f;
public float radius = 101.7f;
public float breakage = 550f;
public float cooldownNormal = 1.75f;
@ -59,9 +60,11 @@ public class ForceProjector extends Block{
@Override
public void setStats(){
super.setStats();
stats.add(BlockStat.shieldHealth, breakage, StatUnit.none);
stats.add(BlockStat.cooldownTime, (int) (breakage / cooldownBrokenBase / 60f), StatUnit.seconds);
stats.add(BlockStat.powerUse, basePowerDraw * 60f, StatUnit.powerSecond);
stats.add(BlockStat.boostEffect, phaseRadiusBoost / tilesize, StatUnit.blocks);
stats.add(BlockStat.boostEffect, phaseShieldBoost, StatUnit.shieldHealth);
}
@Override
@ -130,7 +133,7 @@ public class ForceProjector extends Block{
broken = false;
}
if(buildup >= breakage && !broken){
if(buildup >= breakage + phaseShieldBoost && !broken){
broken = true;
buildup = breakage;
Fx.shieldBreak.at(x, y, realRadius(), team.color);

2
core/src/mindustry/world/meta/BlockStat.java
View File

@ -48,6 +48,8 @@ public enum BlockStat{
targetsGround(StatCategory.shooting),
damage(StatCategory.shooting),
ammo(StatCategory.shooting),
shieldHealth(StatCategory.shooting),
cooldownTime(StatCategory.shooting),
booster(StatCategory.optional),
boostEffect(StatCategory.optional),

1
core/src/mindustry/world/meta/StatUnit.java
View File

@ -21,6 +21,7 @@ public enum StatUnit{
perMinute,
timesSpeed(false),
percent(false),
shieldHealth,
none,
items;