Fixing merge issues converting between json code bases
This commit is contained in:
@@ -76,7 +76,7 @@
|
||||
phase: Shadow
|
||||
cost: {
|
||||
type: exert
|
||||
filter: choose(or(self,and(unique,culture(moria),orc)))
|
||||
select: choose(or(self,and(unique,culture(moria),orc)))
|
||||
count: 1
|
||||
times: 1
|
||||
}
|
||||
|
||||
@@ -26,12 +26,12 @@
|
||||
phase: skirmish
|
||||
cost: {
|
||||
type: exert
|
||||
filter: choose(your,character,not(enduring))
|
||||
select: choose(your,character,not(enduring))
|
||||
memorize: exertedCharacter
|
||||
}
|
||||
effect: {
|
||||
type: modifyStrength
|
||||
filter: memory(exertedCharacter)
|
||||
select: memory(exertedCharacter)
|
||||
amount: 2
|
||||
}
|
||||
}
|
||||
|
||||
@@ -190,13 +190,16 @@
|
||||
twilight: 0
|
||||
type: Condition
|
||||
target: name(Sam)
|
||||
requires: [
|
||||
{
|
||||
type: canSpot
|
||||
filter: nazgul
|
||||
}
|
||||
]
|
||||
effects: [
|
||||
{
|
||||
type: toPlay
|
||||
requires: [
|
||||
{
|
||||
type: canSpot
|
||||
filter: nazgul
|
||||
}
|
||||
]
|
||||
}
|
||||
{
|
||||
type: modifier
|
||||
modifier: {
|
||||
|
||||
@@ -108,27 +108,34 @@
|
||||
culture: Isengard
|
||||
twilight: 0
|
||||
type: Event
|
||||
keyword: Maneuver
|
||||
requires: {
|
||||
type: canSpot
|
||||
filter: culture(isengard),minion
|
||||
}
|
||||
effects: {
|
||||
type: event
|
||||
effect: {
|
||||
type: preventable
|
||||
text: Would you like to add 2 burdens to prevent exhausting Aragorn?
|
||||
player: fp
|
||||
cost: {
|
||||
type: addBurdens
|
||||
amount: 2
|
||||
}
|
||||
timeword: Maneuver
|
||||
effects: [
|
||||
{
|
||||
type: toPlay
|
||||
requires: [
|
||||
{
|
||||
type: canSpot
|
||||
filter: culture(isengard),minion
|
||||
}
|
||||
]
|
||||
}
|
||||
{
|
||||
type: event
|
||||
effect: {
|
||||
type: exhaust
|
||||
filter: choose(name(Aragorn))
|
||||
type: preventable
|
||||
text: Would you like to add 2 burdens to prevent exhausting Aragorn?
|
||||
player: fp
|
||||
cost: {
|
||||
type: addBurdens
|
||||
amount: 2
|
||||
}
|
||||
effect: {
|
||||
type: exhaust
|
||||
select: choose(name(Aragorn))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
gametext: Spot an [isengard] minion to exhaust Aragorn. The Free Peoples player may add 2 burdens to prevent this.
|
||||
lore: “‘Where is the Ring?'”
|
||||
promotext: ""
|
||||
|
||||
@@ -181,7 +181,7 @@
|
||||
culture: Moria
|
||||
twilight: 0
|
||||
type: event
|
||||
keyword: maneuver
|
||||
timeword: maneuver
|
||||
effects: {
|
||||
type: event
|
||||
requires: {
|
||||
@@ -194,7 +194,7 @@
|
||||
player: fp
|
||||
cost: {
|
||||
type: discard
|
||||
filter: choose(side(free),possession)
|
||||
select: choose(side(free),possession)
|
||||
count: 2
|
||||
}
|
||||
effect:
|
||||
@@ -206,11 +206,11 @@
|
||||
}
|
||||
true: {
|
||||
type: Exhaust
|
||||
filter: choose(name(Boromir))
|
||||
select: choose(name(Boromir))
|
||||
}
|
||||
false: {
|
||||
type: wound
|
||||
filter: choose(name(Boromir))
|
||||
select: choose(name(Boromir))
|
||||
times: 3
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@
|
||||
culture: Ringwraith
|
||||
twilight: 0
|
||||
type: event
|
||||
keyword: maneuver
|
||||
timeword: maneuver
|
||||
effects: {
|
||||
type: event
|
||||
requires: {
|
||||
@@ -201,12 +201,12 @@
|
||||
forced: false
|
||||
hand: fp
|
||||
player: fp
|
||||
filter: choose(culture(gandalf))
|
||||
select: choose(culture(gandalf))
|
||||
count: 2
|
||||
}
|
||||
effect: {
|
||||
type: wound
|
||||
filter: choose(name(Gandalf))
|
||||
select: choose(name(Gandalf))
|
||||
times: 2
|
||||
}
|
||||
}
|
||||
|
||||
@@ -673,7 +673,7 @@
|
||||
culture: Sauron
|
||||
twilight: 0
|
||||
type: event
|
||||
keyword: maneuver
|
||||
timeword: maneuver
|
||||
effects: {
|
||||
type: event
|
||||
requires: {
|
||||
@@ -686,7 +686,7 @@
|
||||
player: fp
|
||||
cost: {
|
||||
type: discard
|
||||
filter: choose(elf)
|
||||
select: choose(elf)
|
||||
count: 2
|
||||
}
|
||||
effect: {
|
||||
@@ -697,11 +697,11 @@
|
||||
}
|
||||
true: {
|
||||
type: Exhaust
|
||||
filter: choose(name(Galadriel))
|
||||
select: choose(name(Galadriel))
|
||||
}
|
||||
false: {
|
||||
type: wound
|
||||
filter: choose(name(Galadriel))
|
||||
select: choose(name(Galadriel))
|
||||
times: 3
|
||||
}
|
||||
}
|
||||
@@ -873,7 +873,7 @@
|
||||
culture: Sauron
|
||||
twilight: 0
|
||||
type: event
|
||||
keyword: maneuver
|
||||
timeword: maneuver
|
||||
effects: {
|
||||
type: event
|
||||
requires: {
|
||||
@@ -886,12 +886,12 @@
|
||||
player: fp
|
||||
cost: {
|
||||
type: discard
|
||||
filter: choose(side(free),condition)
|
||||
select: choose(side(free),condition)
|
||||
count: 2
|
||||
}
|
||||
effect: {
|
||||
type: discard
|
||||
filter: choose(name(Bilbo))
|
||||
select: choose(name(Bilbo))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
}
|
||||
{
|
||||
type: Discard
|
||||
filter: memory(targetFort)
|
||||
select: memory(targetFort)
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user