Apply paintjob each frame in combat.

Author: wispborne

CHANGELOGS.md

@@ -3,6 +3,7 @@ Version 1.5.2
 - Added `fleet_attitude` to MagicBounty, allowing you to make a fleet neutral or hostile.
 - If a bounty has no spawn locations, try again without Tags.THEME_HIDDEN.
   - For bounties that *only* spawn in hidden systems.
+
 **MagicPaintjobs**
   - Added template files for MagicPaintjobs 2.0.
   - Fixed ships not showing up in new paintjob selector if they have a D-mod.
@@ -21,18 +22,18 @@ by Starficz
   - The file is in JSON, all attributes optional, with the format being:
   ```json
   {
-    "engineSpec":{
-      "color":[0,0,0,0], 
-      "contrailColor":[0,0,0,0], 
-      "spawnDistMult":1, 
-      "contrailWidthMultiplier":1, 
-      "glowAlternateColor":[0,0,0,0], 
-      "glowSizeMult": 1
+    "engines":{
+      "color":[0,0,0,0],
+      "glowAlternateColor":[0,0,0,0],
+      "glowSizeMult": 1,
+      "contrailColor":[0,0,0,0],
+      "contrailSpawnDistMult":1,
+      "contrailWidthMultiplier":1
     }, 
     "shield":{
-      "innerColor":[0,0,0,0], 
-      "ringColor":[0,0,0,0], 
-      "innerRotationRate":1, 
+      "innerColor":[0,0,0,0],
+      "ringColor":[0,0,0,0],
+      "innerRotationRate":1,
       "ringRotationRate":1
     }
   }

data/config/paintjobs/magic_paintjobs.csv

@@ -14,7 +14,7 @@ id,hullIds,name,paintjobFamily,spriteId,unlockedAutomatically,tags,unlockConditi
 # More info: https://starsector.wiki.gg/wiki/MagicLib#Ship_Sprite
 ,,,,,,,
 # Example,,,,,,,
-magiclib_hullid_examplePaintjob,onslaught,Hegslaught,Hegemony,graphics/ships/onslaught/onslaught_hegemony.png,false,,Complete the 'Slayer' achievement to unlock.,Hegemony Onslaught sprite.
+# magiclib_hullid_examplePaintjob,fury,Whitefox,Whitefox,graphics/ships/magicPaintjob_example_ship.png,false,,Complete the 'Slayer' achievement to unlock.,Whitefox Fury sprite by Nes.
 
 # Modules Example,,,,,,,
 # SCY_bluesky_nemeanlion,SCY_nemeanlion,Bluesky,Bluesky,graphics/bluesky/ships/SCY_nemeanLion.png,true,,,,

data/config/paintjobs/magiclib_hullid_examplePaintjob.paintjob

@@ -4,11 +4,12 @@
 {
   "engines":{
     "color":[0,0,0,0],
+    "glowAlternateColor":[0,0,0,0],
+    "glowSizeMult": 1
+    # Not sure if contrails do anything on ships, except maybe Manuv. Jets
     "contrailColor":[0,0,0,0],
-    "spawnDistMult":1,
+    "contrailSpawnDistMult":1,
     "contrailWidthMultiplier":1,
-    "glowAlternateColor":[0,0,0,0],
-    "glowSizeMult": 5
   },
   "shield":{
     "innerColor":[0,0,0,0],

graphics/ships/magicPaintjob_example_ship.png

@@ -8,6 +8,6 @@
     {
       "major": "1",
       "minor": "5",
-      "patch": "2-dev01"
+      "patch": "2"
     }
 }

jars/MagicLib.jar

@@ -1,11 +1,9 @@
 package org.magiclib.paintjobs
 
-import com.fs.starfarer.api.Global
 import com.fs.starfarer.api.campaign.CampaignUIAPI
 import com.fs.starfarer.api.campaign.econ.MarketAPI
 import com.fs.starfarer.api.combat.BaseHullMod
 import com.fs.starfarer.api.combat.ShipAPI
-import com.fs.starfarer.api.combat.WeaponAPI
 import com.fs.starfarer.api.ui.TooltipMakerAPI
 import com.fs.starfarer.api.util.Misc
 import org.magiclib.util.MagicTxt
@@ -37,8 +35,8 @@ class MagicPaintjobHullMod : BaseHullMod() {
         val paintjob = MagicPaintjobManager.getCurrentShipPaintjob(ship.variant) ?: return
 
         // fighter wing paintjobs
-        for(wing in ship.allWings){
-            for(fighter in wing.wingMembers){
+        for (wing in ship.allWings) {
+            for (fighter in wing.wingMembers) {
                 if ("MagicPaintjobApplied" in fighter.customData) continue
 
                 MagicPaintjobManager.getPaintjobsForHull(fighter.hullSpec.baseHullId).firstOrNull {
@@ -50,13 +48,11 @@ class MagicPaintjobHullMod : BaseHullMod() {
         }
 
 
-        if ("MagicPaintjobApplied" in ship.customData) return
-        // if the paintjob sets engines, delay until the engines exist
-        if (ship.engineController.shipEngines.isEmpty() && paintjob.engineSpec != null) return
-
-        MagicPaintjobManager.applyPaintjob(ship, paintjob)
-
-        ship.setCustomData("MagicPaintjobApplied", true)
+        // If the paintjob sets engines, delay until the engines exist
+        if (ship.engineController.shipEngines.isNotEmpty() || paintjob.engineSpec == null) {
+            // Apply each frame because of shields.
+            MagicPaintjobManager.applyPaintjob(ship, paintjob)
+        }
     }
 
     override fun canBeAddedOrRemovedNow(

magiclib.version

@@ -177,7 +177,7 @@ object MagicPaintjobManager {
                             MagicPaintjobSpec.PaintjobEngineSpec(
                                 engineJson.optColor("color", null),
                                 engineJson.optColor("contrailColor", null),
-                                engineJson.optFloat("spawnDistMult").takeIf { !it.isNaN() },
+                                engineJson.optFloat("contrailSpawnDistMult").takeIf { !it.isNaN() },
                                 engineJson.optFloat("contrailWidthMultiplier").takeIf { !it.isNaN() },
                                 engineJson.optColor("glowAlternateColor", null),
                                 engineJson.optFloat("glowSizeMult").takeIf { !it.isNaN() }