Skip to content

Commit

Permalink
Merge remote-tracking branch 'raithos/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Patschke committed Mar 20, 2019
2 parents f409d38 + 72d63a5 commit f3b8c60
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions coffeescripts/cards-common.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -8940,7 +8940,7 @@ exportObj.basicCardData = ->
slot: "Configuration"
ship: "Delta-7 Aethersprite"
points: "*"
pointsarray: [4,4,4,4,6,8,10]
pointsarray: [0,0,2,4,6,8,10]
variableinit: true
unequips_upgrades: [ "Modification" ]
also_occupies_upgrades: [ "Modification" ]
Expand Down Expand Up @@ -9105,7 +9105,6 @@ exportObj.basicCardData = ->
points: 14
modifier_func: (stats) ->
stats.force += 1
modifier_func: (stats) ->
stats.actions.push 'F-Coordinate' if 'F-Coordinate' not in stats.actions
restriction_func: (ship) ->
builder = ship.builder
Expand Down Expand Up @@ -13435,7 +13434,6 @@ exportObj.hyperspaceUpgradeExclusions = [
'Cloaking Device',
'Contraband Cybernetics',
'Feedback Array',
'Barrage Rockets',
'Ablative Plating',
'Advanced SLAM',
'Electronic Baffle',
Expand All @@ -13449,7 +13447,6 @@ exportObj.hyperspaceUpgradeExclusions = [
'"Chopper" (Astromech)',
'"Zeb" Orrelios'
'"Chopper" (Crew)',
'Baze Malbus',
'Cassian Andor',
'Hera Syndulla',
'Jyn Erso',
Expand All @@ -13461,8 +13458,6 @@ exportObj.hyperspaceUpgradeExclusions = [
# Galactic Empire
'Admiral Sloane'
'Agent Kallus'
'Ciena Ree',
'Darth Vader',
'Grand Inquisitor',
'Grand Moff Tarkin',
'Minister Tua',
Expand All @@ -13488,7 +13483,6 @@ exportObj.hyperspaceUpgradeExclusions = [
'Jabba the Hutt',
'Bossk',
'BT-1',
'Dengar',
'Greedo'

# FO
Expand Down

0 comments on commit f3b8c60

Please sign in to comment.