Merge remote-tracking branch 'origin/master'

Author: AureusStratus

assets/bundles/bundle.properties

@@ -584,4 +584,6 @@ planet.exogenesis-axin.name = Axin
 planet.exogenesis-axin.description = sector.
 
 exo.damage-resistance = [red]{0}% Resistance[]
-exo.damage-weakness = [accent]{0}% Weakness[]
+exo.damage-weakness = [accent]{0}% Weakness[]
+exo.damage-resistance-unit = [accent]{0}% Resistance[]
+exo.damage-weakness-unit = [red]{0}% Weakness[]

assets/bundles/bundle_zh_CN.properties

@@ -36,4 +36,6 @@ planet.exogenesis-axin.name = 埃辛因
 planet.exogenesis-axin.description = sector.
 
 exo.damage-resistance = [red]{0}% 伤害抗性[]
-exo.damage-weakness = [accent]{0}% 伤害弱性[]
+exo.damage-weakness = [accent]{0}% 伤害弱性[]
+exo.damage-resistance-unit = [accent]{0}% 伤害抗性[]
+exo.damage-weakness-unit = [red]{0}% 伤害弱性[]

assets/sprites/damagetypes/cryogentic.png

@@ -1,16 +1,23 @@
 package exogenesis;
 
 import arc.Events;
+import arc.math.Mathf;
+import arc.util.Log;
 import exogenesis.entities.EntityRegister;
 import exogenesis.graphics.ExoShaders;
+import exogenesis.type.bullet.TypedBulletType;
+import exogenesis.util.func.DrawFunc;
 import exogenesis.world.ExoTeams;
+import mindustry.entities.Effect;
+import mindustry.entities.bullet.BulletType;
 import mindustry.game.EventType;
 import exogenesis.util.util.Utils;
 import exogenesis.content.ExoBlocks;
 import exogenesis.content.ExoVanstarBlocks;
 import exogenesis.content.ExoUnitTypes;
 import exogenesis.content.ExoStatusEffects;
 import exogenesis.content.*;
+import mindustry.gen.Unit;
 import mindustry.mod.Mod;
 import mindustry.mod.Mods;
 //import exogenesis.gen.*;
@@ -19,6 +26,7 @@
 
 public class ExogenesisMod extends Mod{
     public static Mods.LoadedMod MOD;
+    public static final boolean DEBUG = true;
 
     public ExogenesisMod(){
         Events.on(EventType.FileTreeInitEvent.class, e -> app.post(ExoShaders::load));
@@ -28,6 +36,18 @@ public ExogenesisMod(){
         Events.on(EventType.ContentInitEvent.class, e -> {
             ExoPostProcess.load();
         });
+
+        if (DEBUG){
+            Events.on(EventType.UnitDamageEvent.class, event -> {
+                BulletType type = event.bullet.type();
+                Unit unit = event.unit;
+                float damage = type.damage;
+                if (type instanceof TypedBulletType typedBulletType) damage = typedBulletType.getTotalDamageToUnit(type.damage, unit);
+                float finalDamage = Mathf.round(damage);
+                Effect effect = new Effect(30, e -> DrawFunc.drawText("<" + finalDamage + ">", unit.x, unit.y));
+                effect.at(unit);
+            });
+        }
     }
 
     @Override

assets/sprites/damagetypes/energy.png

@@ -693,13 +693,7 @@ Items.graphite, new MissileBulletType(3f, 12.5f){{
                     Items.copper, LightningStorm.bulletType,
                     Items.titanium, new ExoBasicBulletType(3, 100){{
                         addDamageMultiplier(
-                                ExoDamageTypes.kinetic, 1f,
-                                ExoDamageTypes.explosive, 2f,
-                                ExoDamageTypes.pierce, 2f,
-                                ExoDamageTypes.energy, 3f,
-                                ExoDamageTypes.thermal, 0.5f,
-                                ExoDamageTypes.cryogenic, 0.7f,
-                                ExoDamageTypes.radiation, 0.8f
+                                ExoDamageTypes.kinetic, 1f
                         );
                         lifetime = 100f;
                     }}