Merge pull request #48 from guidokessels/wave14-updates

New: Wave 14 updates
elistevens · Jun 22, 2018 · 8b94c11 · 8b94c11
2 parents 1598423 + cd863d1
commit 8b94c11
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 9 deletions.
diff --git a/README_NAMES.md b/README_NAMES.md
@@ -344,6 +344,7 @@ Ion Projector | ionprojector
 Lightweight Frame | lightweightframe
 Long-Range Scanners | longrangescanners
 Maneuvering Fins | maneuveringfins
+Multi-spectral Camouflage | multispectralcamouflage
 Munitions Failsafe | munitionsfailsafe
 Optimized Generators | optimizedgenerators
 Ordnance Tubes | ordnancetubes
@@ -388,6 +389,7 @@ Minefield Mapper | minefieldmapper
 Reinforced Deflectors | reinforceddeflectors
 Sensor Jammer | sensorjammer
 Targeting Scrambler | targetingscrambler
+Thrust Corrector | thrustcorrector
 Trajectory Simulator | trajectorysimulator
 
 ## Team Upgrades
@@ -926,6 +928,8 @@ Blue Squadron Pathfinder | bluesquadronpathfinder
 Bodhi Rook | bodhirook
 Cassian Andor | cassianandor
 Heff Tobber | hefftobber
+Magva Yarro | magvayarro
+Partisan Renegade | partisanrenegade
 Saw Gerrera | sawgerrera
 
 ## Rebel VCX-100 Pilots
@@ -943,6 +947,8 @@ Name | Canonical
 -----|----------
 "Hobbie" Klivian | hobbieklivian
 Biggs Darklighter | biggsdarklighter
+Cavern Angels Zealot | cavernangelszealot
+Edrio Two-Tubes | edriotwotubes
 Garven Dreis | garvendreis
 Jek Porkins | jekporkins
 Kullbee Sperado | kullbeesperado

diff --git a/dist/xws.js b/dist/xws.js
diff --git a/dist/xws.min.js b/dist/xws.min.js
diff --git a/dist/xws_pilots.json b/dist/xws_pilots.json
@@ -47,13 +47,21 @@
                         "name": "Tarn Mison",
                         "points": 23
                     },
+                    "edriotwotubes": {
+                        "name": "Edrio Two-Tubes",
+                        "points": 24
+                    },
                     "leevantenza": {
                         "name": "Leevan Tenza",
                         "points": 25
                     },
                     "kullbeesperado": {
                         "name": "Kullbee Sperado",
                         "points": 26
+                    },
+                    "cavernangelszealot": {
+                        "name": "Cavern Angels Zealot",
+                        "points": 22
                     }
                 }
             },
@@ -482,9 +490,17 @@
                         "name": "Saw Gerrera",
                         "points": 26
                     },
+                    "magvayarro": {
+                        "name": "Magva Yarro",
+                        "points": 25
+                    },
                     "benthictwotubes": {
                         "name": "Benthic Two-Tubes",
                         "points": 24
+                    },
+                    "partisanrenegade": {
+                        "name": "Partisan Renegade",
+                        "points": 22
                     }
                 }
             },

diff --git a/dist/xws_upgrades.json b/dist/xws_upgrades.json
@@ -881,6 +881,10 @@
             "targetingscrambler": {
                 "name": "Targeting Scrambler",
                 "points": 0
+            },
+            "thrustcorrector": {
+                "name": "Thrust Corrector",
+                "points": 1
             }
         }
     },
@@ -1276,6 +1280,10 @@
             "servomotorsfoils": {
                 "name": "Servomotor S-Foils",
                 "points": 0
+            },
+            "multispectralcamouflage": {
+                "name": "Multi-spectral Camouflage",
+                "points": 1
             }
         }
     },

diff --git a/src/cards-common.coffee b/src/cards-common.coffee
@@ -2,8 +2,6 @@
 exportObj = exports ? this
 
 exportObj.unreleasedExpansions = [
-    '''Saw's Renegades Expansion Pack'''
-    'TIE Reaper Expansion Pack'
 ]
 
 exportObj.isReleased = (data) ->
@@ -5196,7 +5194,7 @@ exportObj.basicCardData = ->
             points: 26
         }
         {
-            name: 'Unspoiled PS5 U-Wing Pilot'
+            name: 'Magva Yarro'
             id: 288
             unique: true
             faction: 'Rebel Alliance'
@@ -5208,20 +5206,21 @@ exportObj.basicCardData = ->
                 'Crew'
                 'Crew'
             ]
-            points: 100
+            points: 25
         }
         {
-            name: 'Edrio ???'
+            name: 'Edrio Two-Tubes'
             id: 289
             unique: true
             faction: 'Rebel Alliance'
             ship: 'X-Wing'
             skill: 4
             slots: [
+                'Elite'
                 'Torpedo'
                 'Astromech'
             ]
-            points: 100
+            points: 24
         }
         {
             name: 'Leevan Tenza'
@@ -5306,6 +5305,7 @@ exportObj.basicCardData = ->
         }
         {
             name: 'Cavern Angels Zealot'
+            skip: true
             id: 296
             faction: 'Rebel Alliance'
             ship: 'X-Wing'
@@ -5314,7 +5314,7 @@ exportObj.basicCardData = ->
                 'Torpedo'
                 'Astromech'
             ]
-            points: 100
+            points: 0
         }
         {
             name: 'Benthic Two-Tubes'
@@ -5331,6 +5331,33 @@ exportObj.basicCardData = ->
             ]
             points: 24
         }
+        {
+            name: 'Cavern Angels Zealot'
+            id: 298
+            faction: 'Rebel Alliance'
+            ship: 'X-Wing'
+            skill: 1
+            slots: [
+                'Elite'
+                'Torpedo'
+                'Astromech'
+            ]
+            points: 22
+        }
+        {
+            name: 'Partisan Renegade'
+            id: 299
+            faction: 'Rebel Alliance'
+            ship: 'U-Wing'
+            skill: 1
+            slots: [
+                'System'
+                'Torpedo'
+                'Crew'
+                'Crew'
+            ]
+            points: 22
+        }
     ]
 
     upgradesById: [
@@ -7382,6 +7409,14 @@ exportObj.basicCardData = ->
             faction: "Galactic Empire"
             points: 2
         }
+        {
+            name: 'Thrust Corrector'
+            id: 267
+            slot: 'System'
+            points: 1
+            restriction_func: (ship) ->
+                ship.effectiveStats().hull <= 4
+        }
     ]
 
     modificationsById: [
@@ -7643,6 +7678,14 @@ exportObj.basicCardData = ->
             restriction_func: (ship) ->
                 ship.data.canonical_name == 'X-Wing'.canonicalize() && ship.data.canonical_name != 'T-70 X-Wing'.canonicalize()
         }
+        {
+            name: 'Multi-spectral Camouflage'
+            id: 35
+            unique: true,
+            points: 1
+            restriction_func: (ship) ->
+                not ((ship.data.large ? false) or (ship.data.huge ? false))
+        }
     ]
 
     titlesById: [

diff --git a/src/xws_data_pilots.coffee b/src/xws_data_pilots.coffee
@@ -51,13 +51,21 @@
                         "name": "Tarn Mison",
                         "points": 23
                     },
+                    "edriotwotubes": {
+                        "name": "Edrio Two-Tubes",
+                        "points": 24
+                    },
                     "leevantenza": {
                         "name": "Leevan Tenza",
                         "points": 25
                     },
                     "kullbeesperado": {
                         "name": "Kullbee Sperado",
                         "points": 26
+                    },
+                    "cavernangelszealot": {
+                        "name": "Cavern Angels Zealot",
+                        "points": 22
                     }
                 }
             },
@@ -486,9 +494,17 @@
                         "name": "Saw Gerrera",
                         "points": 26
                     },
+                    "magvayarro": {
+                        "name": "Magva Yarro",
+                        "points": 25
+                    },
                     "benthictwotubes": {
                         "name": "Benthic Two-Tubes",
                         "points": 24
+                    },
+                    "partisanrenegade": {
+                        "name": "Partisan Renegade",
+                        "points": 22
                     }
                 }
             },

diff --git a/src/xws_data_upgrades.coffee b/src/xws_data_upgrades.coffee
@@ -886,6 +886,10 @@
             "targetingscrambler": {
                 "name": "Targeting Scrambler",
                 "points": 0
+            },
+            "thrustcorrector": {
+                "name": "Thrust Corrector",
+                "points": 1
             }
         }
     },
@@ -1281,6 +1285,10 @@
             "servomotorsfoils": {
                 "name": "Servomotor S-Foils",
                 "points": 0
+            },
+            "multispectralcamouflage": {
+                "name": "Multi-spectral Camouflage",
+                "points": 1
             }
         }
     },