Skip to content

Commit

Permalink
-
Browse files Browse the repository at this point in the history
  • Loading branch information
CrazyVulcan committed Oct 14, 2018
1 parent 9376d74 commit f45e790
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions src/data/ships.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ module.exports = [{
hull: 4,
shields: 3,
cost: 21,
text: "<b>WHEN ATTACKING:</b> Place 2 [time] Tokens on this card. This game round, for each other friendly ship that attacked the defending ship this game round, this ship rolls +1 attack die and may convert 1 [blank] into 1 [battlestations].",
text: "<b>WHEN ATTACKING:</b> If this ship is Cloaked and not in the Primary Firing Arc of the defending ship.\n\nThis ship rolls +1 attack die and the defending ship rolls -1 defence die.",
unique: true,
factions: ["mirror-universe", "klingon"],
squadron: false
Expand Down Expand Up @@ -1711,7 +1711,7 @@ module.exports = [{
class: "Scorpion Class Attack Squadron",
actions: ["evade", "target-lock"],
upgrades: ["squadron", "squadron", "squadron"],
attack: 5,
attack: 4,
agility: 0,
hull: 1,
shields: 1,
Expand All @@ -1729,12 +1729,12 @@ module.exports = [{
class: "Scorpion Class Attack Squadron",
actions: ["evade", "target-lock"],
upgrades: ["squadron", "squadron"],
attack: 4,
attack: 3,
agility: 0,
hull: 1,
shields: 1,
cost: 20,
skill: 6,
skill: 5,
text: "Attack Squadron Tokens: 4",
unique: false,
factions: ["romulan"],
Expand Down
2 changes: 1 addition & 1 deletion src/data/upgrades.js
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ module.exports = [{
cost: 3,
text: "The Attack Value of this [weapon] is this ship’s Primary Weapon Value +1.\n-----------------------------------\n<b>ATTACK:</b> Spend this ship’s [target-lock] Token, place 2 [time] Tokens on this card, and target an opposing ship.\n\nIf the attack hits, every other ship within Range 1 of the opposing ship suffers 1 [hit].\n(<i>Constitution Class (Kelvin) Only</i>)",
attack: 0,
unique: true,
unique: false,
range: "2 - 3",
shipLimit: true,
factions: ["mirror-universe","federation"]
Expand Down
6 changes: 3 additions & 3 deletions src/js/common/utopia-card-rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -8323,7 +8323,7 @@ module.factory( "cardRules", [ "$filter", "$factions", function($filter, $factio
},
canEquipFaction: function(upgrade,ship,fleet) {
// TODO Tholians are Independent so can't easily tell their race
return ship.captain && ( ship.captain.name == "Telev" || ship.captain.name == "THY'LEK SHARAN" ||ship.captain.name.indexOf("Andorian") >= 0 );
return ship.captain && ( ship.captain.name == "Telev" || ship.captain.name == "Thy'Lek Sharan" ||ship.captain.name.indexOf("Andorian") >= 0 );
}},
//Vidiian Sodality
"talent:vidiian_sodality_75004":{
Expand Down Expand Up @@ -8422,13 +8422,13 @@ module.factory( "cardRules", [ "$filter", "$factions", function($filter, $factio
factionPenalty: function(upgrade, ship, fleet) {
return ship && $factions.hasFaction( ship, "bajoran", ship, fleet ) ? 0 : 1 && $factions.hasFaction( ship, "vulcan", ship, fleet ) ? 0 : 1;
},
upgradeSlots: [ { type: ["crew"] } ]
upgradeSlots: [ {}, { type: ["crew"] } ]
},
"admiral:christopher_pike_75005":{
factionPenalty: function(upgrade, ship, fleet) {
return ship && $factions.hasFaction( ship, "bajoran", ship, fleet ) ? 0 : 1 && $factions.hasFaction( ship, "vulcan", ship, fleet ) ? 0 : 1;
},
upgradeSlots: [ { type: ["crew"] } ]
upgradeSlots: [ {}, { type: ["crew"] } ]
},
"captain:james_t_kirk_cap_75005":{
factionPenalty: function(upgrade, ship, fleet) {
Expand Down
2 changes: 1 addition & 1 deletion staw-utopia/data/data.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion staw-utopia/js/utopia.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion staw-utopia/js/utopia.min.js.map

Large diffs are not rendered by default.

0 comments on commit f45e790

Please sign in to comment.