Fix mass of t3ds

Update gpl.txt

config.py

@@ -13,15 +13,15 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.10.0"
-tag = "Stable"
-expansionName = "Scylla"
-expansionVersion = "1.0"
+version = "1.10.1"
+tag = "preview"
+expansionName = "t3d_changes"
+expansionVersion = "1.1"
 evemonMinVersion = "4081"
 
 # Database version (int ONLY)
 # Increment every time we need to flag for user database upgrade/modification
-dbversion = 5
+dbversion = 6
 
 pyfaPath = None
 savePath = None

eos/db/migrations/upgrade6.py

@@ -0,0 +1,9 @@
+"""
+Migration 6
+
+Overwrites damage profile 0 to reset bad uniform values (bad values set with bug)
+"""
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ? OR ID LIKE ?', ("Uniform", "1"))
+    saveddata_engine.execute('INSERT INTO damagePatterns VALUES (?, ?, ?, ?, ?, ?, ?)', (1, "Uniform", 25, 25, 25, 25, None))

gpl.txt

@@ -549,14 +549,14 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU General Public License.
+  13. Use with the GNU Affero General Public License.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
+under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU General Public License,
+but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
 

gui/patternEditor.py

@@ -246,11 +246,15 @@ class DmgPatternEditorDlg(wx.Dialog):
 
     def newPattern(self, event):
         self.restrict()
+
+        self.block = True
         # reset values
         for type in self.DAMAGE_TYPES:
             editObj = getattr(self, "%sEdit"%type)
             editObj.SetValue(0)
 
+        self.block = False
+
         self.btnSave.SetLabel("Create")
         self.Refresh()
         self.renamePattern()

service/market.py

@@ -193,7 +193,9 @@ class Market():
             "InterBus Shuttle": self.les_grp,
             "Leopard": self.les_grp, # 2013 new year gift
             "Whiptail": self.les_grp, # AT12 prize
-            "Chameleon": self.les_grp } # AT12 prize
+            "Chameleon": self.les_grp, # AT12 prize
+            "Victorieux Luxury Yacht":  self.les_grp  # Worlds Collide prize \o/ chinese getting owned
+        }
 
         self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP)
         self.les_grp.addItems = list(self.getItem(itmn) for itmn in self.ITEMS_FORCEGROUP_R[self.les_grp])
@@ -272,18 +274,18 @@ class Market():
             "'Daemon' Data Analyzer I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners
             "'Libram' Data Analyzer I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners
             "Advanced Cerebral Accelerator": 977, # Implants & Boosters > Booster
-            "Civilian Damage Control": 760, # Ship Equipment > Civilian Modules
-            "Civilian EM Ward Field": 760, # Ship Equipment > Civilian Modules
-            "Civilian Explosive Deflection Field": 760, # Ship Equipment > Civilian Modules
+            "Civilian Damage Control": 615, # Ship Equipment > Hull & Armor > Damage Controls
+            "Civilian EM Ward Field": 1695, # Ship Equipment > Shield > Shield Hardeners > EM Shield Hardeners
+            "Civilian Explosive Deflection Field": 1694, # Ship Equipment > Shield > Shield Hardeners > Explosive Shield Hardeners
             "Civilian Hobgoblin": 837, # Drones > Combat Drones > Light Scout Drones
-            "Civilian Kinetic Deflection Field": 760, # Ship Equipment > Civilian Modules
-            "Civilian Light Missile Launcher": 760, # Ship Equipment > Civilian Modules
+            "Civilian Kinetic Deflection Field": 1693, # Ship Equipment > Shield > Shield Hardeners > Kinetic Shield Hardeners
+            "Civilian Light Missile Launcher": 640, # Ship Equipment > Turrets & Bays > Missile Launchers > Light Missile Launchers
             "Civilian Scourge Light Missile": 920, # Ammunition & Charges > Missiles > Light Missiles > Standard Light Missiles
-            "Civilian Small Remote Armor Repairer": 760, # Ship Equipment > Civilian Modules
-            "Civilian Small Remote Shield Booster": 760, # Ship Equipment > Civilian Modules
-            "Civilian Stasis Webifier": 760, # Ship Equipment > Civilian Modules
-            "Civilian Thermic Dissipation Field": 760, # Ship Equipment > Civilian Modules
-            "Civilian Warp Disruptor": 760, # Ship Equipment > Civilian Modules
+            "Civilian Small Remote Armor Repairer": 1059, # Ship Equipment > Hull & Armor > Remote Armor Repairers > Small
+            "Civilian Small Remote Shield Booster": 603, # Ship Equipment > Shield > Remote Shield Boosters > Small
+            "Civilian Stasis Webifier": 683, # Ship Equipment > Electronic Warfare > Stasis Webifiers
+            "Civilian Thermic Dissipation Field": 1692, # Ship Equipment > Shield > Shield Hardeners > Thermal Shield Hardeners
+            "Civilian Warp Disruptor": 1935, # Ship Equipment > Electronic Warfare > Warp Disruptors
             "Hardwiring - Zainou 'Sharpshooter' ZMX10": 1493, # Implants & Boosters > Implants > Skill Hardwiring > Missile Implants > Implant Slot 06
             "Hardwiring - Zainou 'Sharpshooter' ZMX100": 1493, # Implants & Boosters > Implants > Skill Hardwiring > Missile Implants > Implant Slot 06
             "Hardwiring - Zainou 'Sharpshooter' ZMX1000": 1493, # Implants & Boosters > Implants > Skill Hardwiring > Missile Implants > Implant Slot 06