Add AT13 prize ships

DarkFenX · DarkFenX · commit 31b1c94c0fa4 · 2015-09-01T01:26:30.000+03:00
diff --git a/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py b/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py
@@ -1,7 +1,7 @@
 # eliteBonusHeavyInterdictorsWarpDisruptFieldGeneratorWarpScrambleRange2
 #
 # Used by:
-# Ships from group: Heavy Interdiction Cruiser (4 of 5)
+# Ships from group: Heavy Interdiction Cruiser (5 of 5)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Disrupt Field Generator",
diff --git a/eos/effects/interceptor2warpscramblerange.py b/eos/effects/interceptor2warpscramblerange.py
@@ -1,7 +1,7 @@
 # Interceptor2WarpScrambleRange
 #
 # Used by:
-# Ships from group: Interceptor (5 of 10)
+# Ships from group: Interceptor (6 of 10)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
diff --git a/eos/effects/interceptormwdsignatureradiusbonus.py b/eos/effects/interceptormwdsignatureradiusbonus.py
@@ -1,7 +1,7 @@
 # interceptorMWDSignatureRadiusBonus
 #
 # Used by:
-# Ships from group: Interceptor (9 of 10)
+# Ships from group: Interceptor (10 of 10)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
diff --git a/eos/effects/shipbonuswdfgnullspeedeffects.py b/eos/effects/shipbonuswdfgnullspeedeffects.py
@@ -0,0 +1,13 @@
+# shipBonusWDFGnullSpeedEffects
+#
+# Used by:
+# Ship: Fiend
+runTime = "early"
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
+                                  "speedFactorBonus", ship.getModifiedItemAttr("shipBonusAT"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
+                                  "speedBoostFactorBonus", ship.getModifiedItemAttr("shipBonusAT"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
+                                  "massBonusPercentage", ship.getModifiedItemAttr("shipBonusAT"))
diff --git a/eos/effects/shipcappropulsionjamming.py b/eos/effects/shipcappropulsionjamming.py
@@ -1,7 +1,7 @@
 # shipCapPropulsionJamming
 #
 # Used by:
-# Ships from group: Interceptor (9 of 10)
+# Ships from group: Interceptor (10 of 10)
 # Ship: Atron
 # Ship: Condor
 # Ship: Executioner
diff --git a/eos/effects/shipshieldemresistancerookie.py b/eos/effects/shipshieldemresistancerookie.py
@@ -1,9 +1,8 @@
 # shipShieldEMResistanceRookie
 #
 # Used by:
-# Ship: Broadsword
+# Ships from group: Heavy Interdiction Cruiser (3 of 5)
 # Ship: Ibis
-# Ship: Onyx
 # Ship: Taipan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipshieldexplosiveresistancerookie.py b/eos/effects/shipshieldexplosiveresistancerookie.py
@@ -1,9 +1,8 @@
 # shipShieldExplosiveResistanceRookie
 #
 # Used by:
-# Ship: Broadsword
+# Ships from group: Heavy Interdiction Cruiser (3 of 5)
 # Ship: Ibis
-# Ship: Onyx
 # Ship: Taipan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipshieldkineticresistancerookie.py b/eos/effects/shipshieldkineticresistancerookie.py
@@ -1,9 +1,8 @@
 # shipShieldKineticResistanceRookie
 #
 # Used by:
-# Ship: Broadsword
+# Ships from group: Heavy Interdiction Cruiser (3 of 5)
 # Ship: Ibis
-# Ship: Onyx
 # Ship: Taipan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipshieldthermalresistancerookie.py b/eos/effects/shipshieldthermalresistancerookie.py
@@ -1,9 +1,8 @@
 # shipShieldThermalResistanceRookie
 #
 # Used by:
-# Ship: Broadsword
+# Ships from group: Heavy Interdiction Cruiser (3 of 5)
 # Ship: Ibis
-# Ship: Onyx
 # Ship: Taipan
 type = "passive"
 def handler(fit, ship, context):
diff --git a/service/market.py b/service/market.py
@@ -233,8 +233,6 @@ def __init__(self):
             "Mobile Decoy Unit": False,  # Seems to be left over test mod for deployables
             "Tournament Micro Jump Unit": False,  # Normally seen only on tournament arenas
             "Council Diplomatic Shuttle": False,  # CSM X celebration]
-            "Imp": False,  # AT13 prize
-            "Fiend": False,  # AT13 prize
         }
 
         # do not publish ships that we convert
diff --git a/staticdata/eve.db b/staticdata/eve.db

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# eliteBonusHeavyInterdictorsWarpDisruptFieldGeneratorWarpScrambleRange2`
`2`	`2`	`#`
`3`	`3`	`# Used by:`
`4`		`-# Ships from group: Heavy Interdiction Cruiser (4 of 5)`
	`4`	`+# Ships from group: Heavy Interdiction Cruiser (5 of 5)`
`5`	`5`	`type = "passive"`
`6`	`6`	`def handler(fit, ship, context):`
`7`	`7`	`fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Disrupt Field Generator",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# Interceptor2WarpScrambleRange`
`2`	`2`	`#`
`3`	`3`	`# Used by:`
`4`		`-# Ships from group: Interceptor (5 of 10)`
	`4`	`+# Ships from group: Interceptor (6 of 10)`
`5`	`5`	`type = "passive"`
`6`	`6`	`def handler(fit, ship, context):`
`7`	`7`	`fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# interceptorMWDSignatureRadiusBonus`
`2`	`2`	`#`
`3`	`3`	`# Used by:`
`4`		`-# Ships from group: Interceptor (9 of 10)`
	`4`	`+# Ships from group: Interceptor (10 of 10)`
`5`	`5`	`type = "passive"`
`6`	`6`	`def handler(fit, ship, context):`
`7`	`7`	`fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# shipCapPropulsionJamming`
`2`	`2`	`#`
`3`	`3`	`# Used by:`
`4`		`-# Ships from group: Interceptor (9 of 10)`
	`4`	`+# Ships from group: Interceptor (10 of 10)`
`5`	`5`	`# Ship: Atron`
`6`	`6`	`# Ship: Condor`
`7`	`7`	`# Ship: Executioner`
Original file line number	Diff line number	Diff line change
`@@ -233,8 +233,6 @@ def __init__(self):`
`233`	`233`	`"Mobile Decoy Unit": False, # Seems to be left over test mod for deployables`
`234`	`234`	`"Tournament Micro Jump Unit": False, # Normally seen only on tournament arenas`
`235`	`235`	`"Council Diplomatic Shuttle": False, # CSM X celebration]`
`236`		`- "Imp": False, # AT13 prize`
`237`		`- "Fiend": False, # AT13 prize`
`238`	`236`	`}`
`239`	`237`
`240`	`238`	`# do not publish ships that we convert`