From 162a7ed9a61df2c35413af0a52a98feaee4a1ceb Mon Sep 17 00:00:00 2001 From: Demur Rumed Date: Mon, 15 Jul 2024 00:10:42 +0000 Subject: [PATCH] Adjust text, make unupped sun blade slower upped version, rework Skeleton Axe --- src/cards.csv | 4 ++-- src/rs/src/skill.rs | 17 +++++------------ src/rs/src/text.rs | 4 ++-- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/cards.csv b/src/cards.csv index 8abc8ddb..ab52e1e7 100644 --- a/src/cards.csv +++ b/src/cards.csv @@ -432,8 +432,8 @@ 7625|Ferro Golem|6|4|2|6|7|4|1:10=drawequip|golem 5626|Wicked Shield|6|1|2|2||4|1:11=wicked+turnstart=resetdr| 7626|Wicked Shield|6|1|2|3||4|1:11=wicked+turnstart=halvedr| -5627|Sun Blade|6|0|3|2|3|2|1:10=heatstroke+hit=heatstroke+death=miragetax| -7627|Sun Blade|6|0|3|3|5|4|1:10=heatstroke+hit=heatstroke+death=miragemill| +5627|Sun Blade|6|0|3|2|4|4|1:10=heatstroke+death=miragemill| +7627|Sun Blade|6|0|3|2|4|4|1:10=heatstroke+hit=heatstroke+death=miragemill| 5628|Mirage|6|4|1|0|2|8|prespell=mirage|token 7628|Mirage|6|4|1|0|2|8|prespell=mirage|token 5630|Shard of Bravery|6|3|3|2|||bravery| diff --git a/src/rs/src/skill.rs b/src/rs/src/skill.rs index 766ae17f..717f3079 100644 --- a/src/rs/src/skill.rs +++ b/src/rs/src/skill.rs @@ -438,7 +438,6 @@ pub enum Skill { mimic, miracle, mirage, - miragetax, miragemill, mist, mitosis, @@ -1123,7 +1122,6 @@ impl<'a> Display for SkillName<'a> { Skill::mimic => f.write_str("mimic"), Skill::miracle => Ok(()), Skill::mirage => f.write_str("mirage"), - Skill::miragetax => Ok(()), Skill::miragemill => Ok(()), Skill::mist => f.write_str("mist"), Skill::mitosis => f.write_str("mitosis"), @@ -1623,7 +1621,11 @@ impl Skill { pub fn proc(self, ctx: &mut Game, c: i16, t: i16, data: &mut ProcData) { match self { Skill::bonesharpen => { - ctx.incrAtk(t, ctx.get(c, Stat::atk)); + ctx.setSkill(t, Event::Cast, &[Skill::reinforce]); + ctx.set(t, Stat::cast, 0); + if card::IsOf(ctx.get(t, Stat::card), card::Skeleton) { + ctx.set(c, Stat::casts, 1); + } } Skill::burstout => { let owner = ctx.get_owner(c); @@ -3683,15 +3685,6 @@ impl Skill { } } } - Self::miragetax => { - if card::IsOf(ctx.get(t, Stat::card), card::Mirage) { - for q in ctx.get_player_mut(ctx.get_owner(t)).quanta.iter_mut() { - if *q > 1 { - *q -= 1; - } - } - } - } Self::miragemill => { if card::IsOf(ctx.get(t, Stat::card), card::Mirage) { ctx.mill(ctx.get_owner(t), 1) diff --git a/src/rs/src/text.rs b/src/rs/src/text.rs index d97e8f71..04ee1496 100644 --- a/src/rs/src/text.rs +++ b/src/rs/src/text.rs @@ -194,7 +194,7 @@ impl<'a> SkillThing<'a> { } Skill::bloodmoon => Cow::from("Aquatic creatures gain \"Gain 1:8 when it attacks.\"\nGolems gain \"Damage dealt by this card also reduces the defender's maxHP.\"\nNocturnal creatures gain \"Heal yourself equal to the damage dealt by this card.\""), Skill::bolsterintodeck => Cow::from("Add 3 copies of target creature on top of your deck"), - Skill::bonesharpen => Cow::from("Increase target skeleton's attack by attack of this"), + Skill::bonesharpen => Cow::from("Replace target creature's skills with \"0: Combine with target creature, causing it to gain strength & HP equal to this creature's strength & HP.\"\nIf target is skeleton caster is reactivated"), Skill::boneyard => { Cow::from(format!("Whenever a creature which isn't a Skeleton dies, summon a {} Skeleton", if self.upped() { "2|2" } else { "1|1" })) } @@ -419,6 +419,7 @@ impl<'a> SkillThing<'a> { } else { "When your opponent plays a creature from their hand, summon a Spark" }), + Skill::heatstroke if ev == Event::Hit => Cow::from("Opponent summons mirage on hit"), Skill::heatstroke => Cow::from("Opponent summons mirage"), Skill::hitownertwice => Cow::from("When this creature attacks, it also attacks its owner twice"), Skill::holylight => Cow::from(if self.upped() { @@ -493,7 +494,6 @@ impl<'a> SkillThing<'a> { Cow::from("If top card of target player's deck is a pillar, pendulum, or tower, destroy that card"), Skill::mimic => Cow::from("When another creature enters play, transform this card into a fresh copy of that creature. This creature retains this ability"), - Skill::miragetax => Cow::from("When a mirage dies, their owner loses 1 quanta of each type"), Skill::miragemill => Cow::from("When a mirage dies, their owner destroys top card of their deck"), Skill::mist => Cow::from("Each stack has a 5% chance to evade attacks"), Skill::miracle =>