Changeset 1294

Timestamp:

2/2/2010 6:29:43 PM (6 weeks ago)

Author:

Sherkhan

Message:

1. Fix for bad tower fuel computation with certain configurations.
2. Fix for at least some Reaction time computations - probly needs more work but this gets one of em anyways.

Location:

trunk/EveHQ.PosManager

Files:

• Data Classes/FuelType.cs (modified) (1 diff)
• Forms/PoSManMainForm.cs (modified) (2 diffs)

trunk/EveHQ.PosManager/Data Classes/FuelType.cs

@@ -124 +124 @@
                 {
                     if (used > 0)
-                        ret = Math.Floor((pcMult * sov * pQty) + 1);
+                        ret = Math.Ceiling(pcMult * sov * pQty);
                     else
                         ret = Math.Floor(pcMult * sov * pQty);

trunk/EveHQ.PosManager/Forms/PoSManMainForm.cs

@@ -5069 +5069 @@
                             }
 
+                            if (xfIn <= 0)
+                                xfIn = 1;
+                            if (xfOut <= 0)
+                                xfOut = 1;
                             if ((fInp) && (!fOutp))
                             {
@@ -5744 +5748 @@
             {
                 // Plain mineral incomming
-                qty = SrcMod.selMineral.reactQty;
-                mult = SrcMod.selMineral.portionSize;
-                vol = SrcMod.selMineral.volume;
-                bPrice = SrcMod.selMineral.basePrice;
-
-                retV[0] = qty;
-                retV[1] = retV[0] * vol * mult;
+
+                // There are some cases, where the destination is a reaction, that the reaction
+                // should override on silo due to the selMineral.reactQty being just plain Wrong!
+                if ((DstMod.ModType == 5) || (DstMod.ModType == 6) || (DstMod.ModType == 7))
+                {
+                    foreach (InOutData iod in DstMod.selReact.inputs)
+                    {
+                        if (iod.typeID == SrcMod.selMineral.typeID)
+                        {
+                            qty = iod.qty;
+                            mult = SrcMod.selMineral.portionSize;
+                            vol = SrcMod.selMineral.volume;
+                            bPrice = SrcMod.selMineral.basePrice;
+                            rQty = SrcMod.selMineral.reactQty;
+
+                            retV[0] = qty * rQty;
+                            retV[1] = retV[0] * vol * mult;
+                        }
+                    }
+                }
+                else
+                {
+                    qty = SrcMod.selMineral.reactQty;
+                    mult = SrcMod.selMineral.portionSize;
+                    vol = SrcMod.selMineral.volume;
+                    bPrice = SrcMod.selMineral.basePrice;
+
+                    retV[0] = qty;
+                    retV[1] = retV[0] * vol * mult;
+                }
             }
             else if (SrcMod.Category == "Mobile Reactor")