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

Stat reactivity cleanup

Browse Source
This commit is contained in:
Anuken 2021-03-10 17:34:39 -05:00
parent 1a6843ef2c
commit 8e52d8a272
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -736,6 +736,7 @@ stat.healthmultiplier = Health Multiplier
stat.speedmultiplier = Speed Multiplier
stat.reloadmultiplier = Reload Multiplier
stat.buildspeedmultiplier = Build Speed Multiplier
stat.reactive = Reacts
ability.forcefield = Force Field
ability.repairfield = Repair Field

36
core/src/mindustry/type/StatusEffect.java
View File

@ -4,6 +4,7 @@ import arc.graphics.*;
import arc.math.*;
import arc.struct.*;
import arc.util.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.ctype.*;
import mindustry.entities.*;
@ -73,23 +74,32 @@ public class StatusEffect extends UnlockableContent{
if(reloadMultiplier != 1) stats.addPercent(Stat.reloadMultiplier, reloadMultiplier);
if(buildSpeedMultiplier != 1) stats.addPercent(Stat.buildSpeedMultiplier, buildSpeedMultiplier);
if(damage > 0) stats.add(Stat.damage, damage * 60f, StatUnit.perSecond);
var afseq = affinities.asArray().sort();
var opseq = opposites.asArray().sort();
for(int i = 0; i < afseq.size; i++){
var e = afseq.get(i);
stats.add(Stat.affinities, e.emoji() + "" + e.toString());
}
if(afseq.any() && transitionDamage != 0){
stats.add(Stat.affinities, "/ [accent]" + (int)transitionDamage + " " + Stat.damage.localized());
boolean reacts = false;
for(var e : opposites.asArray().sort()){
stats.add(Stat.opposites, e.emoji() + "" + e);
}
for(int i = 0; i < opseq.size; i++){
var e = opseq.get(i);
stats.add(Stat.opposites, e.emoji() + "" + e.toString());
if(reactive){
var other = Vars.content.statusEffects().find(f -> f.affinities.contains(this));
if(other != null && other.transitionDamage > 0){
stats.add(Stat.reactive, other.emoji() + other + " / [accent]" + (int)other.transitionDamage + "[lightgray] " + Stat.damage.localized());
reacts = true;
}
}
//don't list affinities *and* reactions, as that would be redundant
if(!reacts){
for(var e : affinities.asArray().sort()){
stats.add(Stat.affinities, e.emoji() + "" + e);
}
if(affinities.size > 0 && transitionDamage != 0){
stats.add(Stat.affinities, "/ [accent]" + (int)transitionDamage + " " + Stat.damage.localized());
}
}
}
@Override

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

@ -39,6 +39,7 @@ public enum Stat{
speedMultiplier,
reloadMultiplier,
buildSpeedMultiplier,
reactive,
itemCapacity(StatCat.items),
itemsMoved(StatCat.items),