Changeset 1271

Show
Ignore:
Timestamp:
1/27/2010 3:35:53 PM (7 weeks ago)
Author:
vessper
Message:

27/01/2010 (1.14.0.1271)

- HQF: Added Fighter Bombers into damage calculations

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/EveHQ.HQF/Classes/Engine.vb

    r1243 r1271  
    23892389                        dgmMod = CDbl(cModule.Attributes("64")) 
    23902390                    Else 
    2391                         dgmMod = 0 
    2392                         ROF = 1 
     2391                        If cModule.Attributes.Contains("506") = True Then 
     2392                            ROF = CDbl(cModule.Attributes("506")) 
     2393                            dgmMod = CDbl(cModule.Attributes("212")) 
     2394                        Else 
     2395                            dgmMod = 0 
     2396                            ROF = 1 
     2397                        End If 
    23932398                    End If 
    2394                     cModule.Attributes("10051") = CDbl(cModule.Attributes("114")) * dgmMod 
    2395                     cModule.Attributes("10052") = CDbl(cModule.Attributes("116")) * dgmMod 
    2396                     cModule.Attributes("10053") = CDbl(cModule.Attributes("117")) * dgmMod 
    2397                     cModule.Attributes("10054") = CDbl(cModule.Attributes("118")) * dgmMod 
    2398                     newShip.Attributes("10006") = CInt(newShip.Attributes("10006")) + DBI.Quantity 
    2399                     cModule.Attributes("10018") = dgmMod * CDbl(cModule.Attributes("10017")) 
    2400                     cModule.Attributes("10019") = CDbl(cModule.Attributes("10018")) / ROF 
     2399                    If cModule.LoadedCharge IsNot Nothing Then 
     2400                        cModule.Attributes("10017") = CDbl(cModule.LoadedCharge.Attributes("114")) + CDbl(cModule.LoadedCharge.Attributes("116")) + CDbl(cModule.LoadedCharge.Attributes("117")) + CDbl(cModule.LoadedCharge.Attributes("118")) 
     2401                        cModule.Attributes("10051") = CDbl(cModule.LoadedCharge.Attributes("114")) * dgmMod 
     2402                        cModule.Attributes("10052") = CDbl(cModule.LoadedCharge.Attributes("116")) * dgmMod 
     2403                        cModule.Attributes("10053") = CDbl(cModule.LoadedCharge.Attributes("117")) * dgmMod 
     2404                        cModule.Attributes("10054") = CDbl(cModule.LoadedCharge.Attributes("118")) * dgmMod 
     2405                        newShip.Attributes("10006") = CInt(newShip.Attributes("10006")) + DBI.Quantity 
     2406                        cModule.Attributes("10018") = dgmMod * CDbl(cModule.Attributes("10017")) 
     2407                        cModule.Attributes("10019") = CDbl(cModule.Attributes("10018")) / ROF 
     2408                    Else 
     2409                        cModule.Attributes("10051") = CDbl(cModule.Attributes("114")) * dgmMod 
     2410                        cModule.Attributes("10052") = CDbl(cModule.Attributes("116")) * dgmMod 
     2411                        cModule.Attributes("10053") = CDbl(cModule.Attributes("117")) * dgmMod 
     2412                        cModule.Attributes("10054") = CDbl(cModule.Attributes("118")) * dgmMod 
     2413                        newShip.Attributes("10006") = CInt(newShip.Attributes("10006")) + DBI.Quantity 
     2414                        cModule.Attributes("10018") = dgmMod * CDbl(cModule.Attributes("10017")) 
     2415                        cModule.Attributes("10019") = CDbl(cModule.Attributes("10018")) / ROF 
     2416                    End If 
    24012417                    newShip.Attributes("10023") = CDbl(newShip.Attributes("10023")) + CDbl(cModule.Attributes("10018")) * DBI.Quantity 
    24022418                    newShip.Attributes("10027") = CDbl(newShip.Attributes("10027")) + CDbl(cModule.Attributes("10019")) * DBI.Quantity 

  • trunk/EveHQ.HQF/Classes/PlugInData.vb

    r1252 r1271  
    671671            strSQL &= "SELECT invCategories.categoryID, invGroups.groupID, invTypes.typeID, invTypes.description, invTypes.typeName, invTypes.radius, invTypes.mass, invTypes.volume, invTypes.capacity, invTypes.basePrice, invTypes.published, invTypes.raceID, invTypes.marketGroupID, eveGraphics.icon" 
    672672            strSQL &= " FROM eveGraphics INNER JOIN (invCategories INNER JOIN (invGroups INNER JOIN invTypes ON invGroups.groupID = invTypes.groupID) ON invCategories.categoryID = invGroups.categoryID) ON (eveGraphics.graphicID = invTypes.graphicID)" 
    673             strSQL &= " WHERE ((invCategories.categoryID In (7,8,18,20,32)) or (invTypes.marketGroupID=379) or (invTypes.groupID=920)) AND (invTypes.published=1)" 
     673            strSQL &= " WHERE (((invCategories.categoryID In (7,8,18,20,32)) or (invTypes.marketGroupID=379) or (invTypes.groupID=920)) AND (invTypes.published=1)) OR invTypes.groupID=1010" 
    674674            strSQL &= " ORDER BY invTypes.typeName;" 
    675675            PlugInData.moduleData = EveHQ.Core.DataFunctions.GetData(strSQL) 
    … …  
    695695            strSQL &= "SELECT invCategories.categoryID, invGroups.groupID, invTypes.typeID, invTypes.description, invTypes.typeName, invTypes.radius, invTypes.mass, invTypes.volume, invTypes.capacity, invTypes.basePrice, invTypes.published, invTypes.marketGroupID, dgmTypeEffects.effectID" 
    696696            strSQL &= " FROM ((invCategories INNER JOIN invGroups ON invCategories.categoryID=invGroups.categoryID) INNER JOIN invTypes ON invGroups.groupID=invTypes.groupID) INNER JOIN dgmTypeEffects ON invTypes.typeID=dgmTypeEffects.typeID" 
    697             strSQL &= " WHERE ((invCategories.categoryID In (7,8,18,20,32)) or (invTypes.marketGroupID=379) or (invTypes.groupID=920)) AND (invTypes.published=1)" 
     697            strSQL &= " WHERE (((invCategories.categoryID In (7,8,18,20,32)) or (invTypes.marketGroupID=379) or (invTypes.groupID=920)) AND (invTypes.published=1)) OR invTypes.groupID=1010" 
    698698            strSQL &= " ORDER BY typeName, effectID;" 
    699699            PlugInData.moduleEffectData = EveHQ.Core.DataFunctions.GetData(strSQL) 
    … …  
    719719            strSQL &= "SELECT invCategories.categoryID, invGroups.groupID, invTypes.typeID, invTypes.description, invTypes.typeName, invTypes.radius, invTypes.mass, invTypes.volume, invTypes.capacity, invTypes.basePrice, invTypes.published, invTypes.marketGroupID, dgmTypeAttributes.attributeID, dgmTypeAttributes.valueInt, dgmTypeAttributes.valueFloat, dgmAttributeTypes.attributeName, dgmAttributeTypes.displayName, dgmAttributeTypes.unitID, eveUnits.unitName, eveUnits.displayName" 
    720720            strSQL &= " FROM invCategories INNER JOIN ((invGroups INNER JOIN invTypes ON invGroups.groupID = invTypes.groupID) INNER JOIN (eveUnits INNER JOIN (dgmAttributeTypes INNER JOIN dgmTypeAttributes ON dgmAttributeTypes.attributeID = dgmTypeAttributes.attributeID) ON eveUnits.unitID = dgmAttributeTypes.unitID) ON invTypes.typeID = dgmTypeAttributes.typeID) ON invCategories.categoryID = invGroups.categoryID" 
    721             strSQL &= " WHERE ((invCategories.categoryID In (7,8,18,20,32)) or (invTypes.marketGroupID=379) or (invTypes.groupID=920)) AND (invTypes.published=1)" 
     721            strSQL &= " WHERE (((invCategories.categoryID In (7,8,18,20,32)) or (invTypes.marketGroupID=379) or (invTypes.groupID=920)) AND (invTypes.published=1)) OR invTypes.groupID=1010" 
    722722            strSQL &= " ORDER BY invTypes.typeName, dgmTypeAttributes.attributeID;" 
    723723 
    … …  
    11541154                End If 
    11551155            Next 
     1156            ' Check for drone missiles 
     1157            For Each cMod As ShipModule In ModuleLists.moduleList.Values 
     1158                If cMod.IsDrone = True And cMod.Attributes.ContainsKey("507") = True Then 
     1159                    Dim chg As ShipModule = CType(ModuleLists.moduleList(CStr(cMod.Attributes("507"))), ShipModule) 
     1160                    cMod.LoadedCharge = chg 
     1161                End If 
     1162            Next 
    11561163            ' Build the implant data 
    11571164            If Me.BuildImplantData = True Then 

  • trunk/EveHQ/Resources/History.txt

    r1267 r1271  
    55----------- 
    66Fixes & Improvements: 
     7- Core: Updated database to Dominion 1.1.1 
    78- Core: Fixed skill cost reports showing training time instead of cost 
    89- Core: Correctly handled errors within Widget update in Settings 
    … …  
    7172- HQF: Skills in the pilot manager are now ordered alphabetically 
    7273- HQF: Enabled multiple module status changing via the MMB 
    73 - HQF: Removed charges from the Eve Exports causing issues when attempting to import into Eve 
     74- HQF: Removed charges from the Eve Exports that cause issues when attempting to import into Eve 
     75- HQF: Updated supercarrier bonuses 
     76- HQF: Added fighter bombers into drones 
    7477- Item Browser: The old recycling tab has now been renamed to Duplicating 
    7578- Killmail Viewer: Columns in killmail list now sortable