raise mirage cost to 3, remove target redirection from mirage

serprex · Aug 27, 2024 · 069a1ea · 069a1ea
1 parent 1dece56
commit 069a1ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 33 deletions.
diff --git a/src/cards.csv b/src/cards.csv
@@ -434,8 +434,8 @@
 7626|Wicked Shield|6|1|2|3||4|1:11=wicked+turnstart=halvedr|
 5627|Sun Blade|6|0|3|3|5|3|1:10=heatstroke+hit=heatstroke+death=miragemill|
 7627|Sun Blade|6|0|3|3|8|4|1:10=heatstroke+hit=heatstroke+death=miragemill|
-5628|Mirage|6|4|1|0|3|6|prespell=mirage+blocked=healblocked|token
-7628|Mirage|6|4|1|0|3|6|prespell=mirage+blocked=healblocked|token
+5628|Mirage|6|4|3|0|3|6|blocked=healblocked|token
+7628|Mirage|6|4|3|0|3|6|blocked=healblocked|token
 5630|Shard of Bravery|6|3|3|2|||bravery|
 7630|Shard of Bravery|6|3|3|1|||bravery|
 5650|Fire Pendulum|6|2|0|0|||pend|pillar+stackable+additive+charges=1

diff --git a/src/rs/src/skill.rs b/src/rs/src/skill.rs
@@ -437,7 +437,6 @@ pub enum Skill {
 	millpillar,
 	mimic,
 	miracle,
-	mirage,
 	miragemill,
 	mist,
 	mitosis,
@@ -1120,7 +1119,6 @@ impl<'a> Display for SkillName<'a> {
 			Skill::millpillar => f.write_str("millpillar"),
 			Skill::mimic => f.write_str("mimic"),
 			Skill::miracle => Ok(()),
-			Skill::mirage => f.write_str("mirage"),
 			Skill::miragemill => Ok(()),
 			Skill::mist => f.write_str("mist"),
 			Skill::mitosis => f.write_str("mitosis"),
@@ -3637,35 +3635,6 @@ impl Skill {
 					ctx.set(owner, Stat::hp, 1);
 				}
 			}
-			Self::mirage => {
-				let tgt = data.tgt;
-				let owner = ctx.get_owner(c);
-				if tgt != 0
-					&& owner == ctx.get_owner(t)
-					&& owner == ctx.get_owner(tgt)
-					&& ctx.get(c, Stat::frozen) == 0
-					&& ctx.get(c, Stat::delayed) == 0
-					&& data
-						.active
-						.and_then(|sk| sk.targeting(ctx.cardset()))
-						.map(|tgt| tgt.check(ctx, t, c))
-						.unwrap_or(false)
-				{
-					if !ctx.hasskill(tgt, Event::Prespell, Skill::mirage) {
-						data.tgt = c;
-					} else {
-						let totaldw = ctx
-							.get_player(owner)
-							.creatures
-							.into_iter()
-							.map(|cr| (cr != 0 && ctx.hasskill(cr, Event::Prespell, Skill::mirage)) as u32)
-							.sum::<u32>();
-						if totaldw > 0 && ctx.upto(totaldw) == 0 {
-							data.tgt = c;
-						}
-					}
-				}
-			}
 			Self::miragemill => {
 				if card::IsOf(ctx.get(t, Stat::card), card::Mirage) {
 					ctx.mill(ctx.get_owner(t), 1)