Changeset 3345

Timestamp:

12/02/08 00:03:50 (5 weeks ago)

Author:

jk

Message:

• rounded groundflash a bit
• added overdrive info to mex's tooltip
• core mex has now an overdrive fx

Location:

trunk/mods/ca

Files:

• LuaRules/Gadgets/unit_mex_overdrive.lua (modified) (2 diffs)
• LuaUI/Configs/lupsFXs.lua (modified) (1 diff)
• LuaUI/Widgets/gfx_lups_manager.lua (modified) (7 diffs)
• bitmaps/GPL/groundflash.tga (modified) (previous)
• lups/ParticleClasses/StaticParticles.lua (modified) (1 diff)
• lups/headers/mathenv.lua (modified) (4 diffs)
• units/armmex.lua (modified) (1 diff)
• units/cormex.lua (modified) (1 diff)

trunk/mods/ca/LuaRules/Gadgets/unit_mex_overdrive.lua

@@ -57 +57 @@
 -- local functions
 
+
+local function round(num, idp)
+  return ("%." .. (((num==0) and 0) or idp or 0) .. "f"):format(num)
+end
 
 
@@ -124 +128 @@
           Spring.SetUnitResourcing(unitID, "cue", mexE * 2)
           local metalMult = energyToExtraM(mexE)
-                  Spring.SetUnitRulesParam(unitID, "overdrive", 1+mexE/5)
-                  Spring.SetUnitResourcing(unitID, "cmm", orgMetal * metalMult*2)
+          Spring.SetUnitRulesParam(unitID, "overdrive", 1+mexE/5)
+          Spring.SetUnitResourcing(unitID, "cmm", orgMetal * metalMult*2)
+          unitDef = UnitDefs[Spring.GetUnitDefID(unitID)]
+          Spring.SetUnitTooltip(unitID,
+            unitDef.humanName .. " - " .. unitDef.tooltip ..
+            " (Overdrive: " .. round(metalMult,2) .. "x)"
+          )
         end
       end

trunk/mods/ca/LuaUI/Configs/lupsFXs.lua

@@ -235 +235 @@
   count       = 1,
 }
+
+
+----------------------------------------------------------------------------
+-- OverDrive FXs -----------------------------------------------------------
+----------------------------------------------------------------------------
+
+armmexJet = {
+  color={0,0,0},
+  emitVector={0,-1,0},
+  width=7,
+  length=100,
+  animSpeed=0.5,
+  distortion=0.01,
+  jitterWidthScale=1.7,
+  jitterLengthScale=1.5,
+  piece="exhaust",
+  onActive=true
+}
+
+
+cormexGlow = {
+  layer       = -5,
+  delay       = 0,
+  pos         = {0,0,0},
+  piece       = "tamper",
+
+  partpos = "x,y,z|"..
+        "y=((i>3) and 59) or 50,"..
+        "local i=i%4,"..
+        "x=((i>1) and -5) or 5,"..
+        "z=(((i==0)or(i==3)) and -5) or 5",
+
+  life        = math.huge,
+  lifeSpread  = 0,
+  sizeGrowth  = 0,
+
+  size        = 15,
+  size1       = 15,
+  size2       = 25,
+
+  colormap    = { {0.001, 0.3, 0.3, 0.001}, },
+  color1      = {0.001, 0.3, 0.3, 0.001},
+  color2      = {0.05, 0.5, 0.7, 0.005},
+
+  texture     = 'bitmaps/GPL/groundflash.tga',
+  count       = 8,
+  repeatEffect= true,
+  onActive    = true,
+}
+
 
 ----------------------------------------------------------------------------

trunk/mods/ca/LuaUI/Widgets/gfx_lups_manager.lua

@@ -59 +59 @@
     c1[1]*mixInv + c2[1]*mix,
     c1[2]*mixInv + c2[2]*mix,
-    c1[3]*mixInv + c2[3]*mix
+    c1[3]*mixInv + c2[3]*mix,
+    (c1[4] or 1)*mixInv + (c2[4] or 1)*mix
   }
 end
@@ -296 +297 @@
 local armmexDefID = UnitDefNames["armmex"].id
 local armmexes    = {}
-local armmexFX    = {color={0,0,0}, emitVector={0,-1,0}, width=7, length=100, animSpeed=0.5, distortion=0.01, jitterWidthScale=1.7, jitterLengthScale=1.5, piece="exhaust", onActive=true}
+local armmexFX    = armmexJet
+
+--// cormex overdrive FX
+local cormexDefID = UnitDefNames["cormex"].id
+local cormexes    = {}
+local cormexFX    = cormexGlow
 
 --------------------------------------------------------------------------------
@@ -302 +308 @@
 
 local abs = math.abs
+local min = math.min
+local max = math.max
 local spGetSpectatingState = Spring.GetSpectatingState
 local spGetUnitDefID       = Spring.GetUnitDefID
@@ -357 +365 @@
 local function UnitFinished(_,unitID,unitDefID)
   if (unitDefID == armmexDefID) then
-    armmexes[unitID] = 1
+    armmexes[unitID] = 0
     armmexFX.unit    = unitID
     particleIDs[unitID] = {}
     AddFxs( unitID, LupsAddFX("airjet",armmexFX) )
+  end
+
+  if (unitDefID == cormexDefID) then
+    cormexes[unitID] = 0
+    cormexFX.unit    = unitID
+    particleIDs[unitID] = {}
+    AddFxs( unitID, LupsAddFX("StaticParticles",cormexFX) )
   end
 
@@ -394 +409 @@
     particleIDs[unitID] = {}
     AddFxs( unitID, LupsAddFX("airjet",armmexFX) )
+  end
+
+  if (unitDefID == cormexDefID) then
+    cormexes[unitID] = 1
+    cormexFX.unit    = unitID
+    particleIDs[unitID] = {}
+    AddFxs( unitID, LupsAddFX("StaticParticles",cormexFX) )
   end
 
@@ -428 +450 @@
 
 local function GameFrame(_,n)
-  if (((n+48)%60)<1 and next(armmexes)) then
+  if (((n+48)%60)<1 and (next(armmexes) or next(cormexes))) then
+    --//Update Overdrive Fx
     for unitID,strength in pairs(armmexes) do
       local cur_strength = spGetUnitRulesParam(unitID,"overdrive") or 1
@@ -446 +469 @@
     armmexFX.color  = color1
     armmexFX.length = 140
+
+    for unitID,strength in pairs(cormexes) do
+      local cur_strength = spGetUnitRulesParam(unitID,"overdrive") or 1
+      local diff         = abs(cur_strength - strength)
+      if (diff>0.1) then
+        -- limit the maximum change per update (else the fx would jump like hell)
+        cur_strength = (strength) + ((cur_strength>strength and 1) or -1)*0.3
+
+        local a = min(1,max(0,(cur_strength-1)*0.35));
+        ClearFxs(unitID)
+        cormexFX.unit     = unitID
+        cormexFX.colormap = {blendColor(cormexFX.color1,cormexFX.color2, a)}
+
+        cormexFX.size     = blend(cormexFX.size1,cormexFX.size2, a)
+        AddFxs( unitID, LupsAddFX("StaticParticles",cormexFX) )
+        cormexes[unitID]  = cur_strength
+      end
+    end
+    cormexFX.colormap = {cormexFX.color1}
+    cormexFX.size   = cormexFX.size1
   end
 end

trunk/mods/ca/lups/ParticleClasses/StaticParticles.lua

@@ -95 +95 @@
   life   = self.life + rand()*self.lifeSpread
 
-  local part = {size=size,life=life,i=n}
+  local part = {size=self.size+size,life=life,i=n}
   pos   = { ProcessParamCode(partpos, part) }
 

trunk/mods/ca/lups/headers/mathenv.lua

@@ -16 +16 @@
 
 local MathG = {math = math, rand = math.random, random = math.random, sin = math.sin, cos = math.cos, pi = math.pi, 
-               deg = math.deg, loadstring = loadstring, assert = assert};
+               deg = math.deg, loadstring = loadstring, assert = assert, echo = Spring.Echo};
 
 --local cachedParsedFunctions = {}
@@ -54 +54 @@
   --end
 
-  local luaCode = ""
+  local luaCode = "return function() "
   local vec_defs,math_defs  = {},{}
 
@@ -79 +79 @@
     luaCode = luaCode .. " __" .. char(64+i) .. ","
   end
-  luaCode = luaCode .. "nil"
+  luaCode = luaCode .. "nil end"
 
-  local luaFunc = loadstring(luaCode)
+  local status, luaFunc = pcall(loadstring(luaCode))
+
+  if (not status) then
+    print(PRIO_MAJOR,'LUPS: Failed to parse custom param code: ' .. luaFunc);
+    return function() return 1,2,3,4 end
+  end;
 
   --cachedParsedFunctions[strfunc] = luaFunc
@@ -97 +102 @@
   meta.__index = locals
   setmetatable( MathG, meta );
+
   setfenv(func, MathG);
 

trunk/mods/ca/units/armmex.lua

@@ -3 +3 @@
   unitname          = "armmex",
   name              = "Metal Extractor",
-  description       = "Extracts Metal (Excess Energy Increases Extraction)",
+  description       = "Extracts Metal",
   acceleration      = 0,
   activateWhenBuilt = true,

trunk/mods/ca/units/cormex.lua

@@ -3 +3 @@
   unitname          = "cormex",
   name              = "Metal Extractor",
-  description       = "Extracts Metal (Excess Energy Increases Extraction)",
+  description       = "Extracts Metal",
   acceleration      = 0,
   activateWhenBuilt = true,