Skip to content

Commit 85813f8

Browse files
committed
scythe: haunting does not stack
maul: cost 6
1 parent ca53198 commit 85813f8

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/cards.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,8 @@
312312
7429|Stonewall|4|1|2|9||1|owndr=stonewall|
313313
5430|Shard of Integrity|4|3|3|2|||integrity|
314314
7430|Shard of Integrity|4|3|3|1|||integrity|
315-
5431|Great Maul|4|0|3|7|7|60|0=grab2h+attack=maul+ownbuff=novaval+turnstart=nova0+destroy=attack|
316-
7431|Great Maul|4|0|3|7|8|70|0=grab2h+attack=maul+ownbuff=novaval+turnstart=nova0+destroy=attack|
315+
5431|Great Maul|4|0|3|6|7|60|0=grab2h+attack=maul+ownbuff=novaval+turnstart=nova0+destroy=attack|
316+
7431|Great Maul|4|0|3|6|8|70|0=grab2h+attack=maul+ownbuff=novaval+turnstart=nova0+destroy=attack|
317317
5450|Earth Pendulum|4|2|0|0|||pend|pillar+stackable+additive+charges=1
318318
7450|Earth Pendulum|4|2|0|0|||pend+ownplay=pillar1|pillar+stackable+additive+charges=1
319319
5500|Emerald Pillar|5|2|0|0|||pillar|pillar+stackable+additive+charges=1

src/rs/src/skill.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3019,7 +3019,9 @@ impl Skill {
30193019
let own = ctx.get_owner(c);
30203020
let thing = ctx.get_thing_mut(t);
30213021
if let Some(smap) = thing.skill.get_mut(Event::OwnDeath) {
3022-
smap.extend(&[Skill::haunted(own)]);
3022+
if smap.iter().all(|&s| s != Skill::haunted(own)) {
3023+
smap.push(Skill::haunted(own));
3024+
}
30233025
} else {
30243026
thing.skill.insert(Event::OwnDeath, Cow::from(Vec::from(&[Skill::haunted(own)])));
30253027
}

0 commit comments

Comments
 (0)