Skip to content

Commit

Permalink
Adjust text, make unupped sun blade slower upped version, rework Skel…
Browse files Browse the repository at this point in the history
…eton Axe
  • Loading branch information
serprex committed Jul 15, 2024
1 parent 1cd1ed7 commit 8723cfd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 17 deletions.
4 changes: 2 additions & 2 deletions src/cards.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
19 changes: 6 additions & 13 deletions src/rs/src/skill.rs
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,6 @@ pub enum Skill {
mimic,
miracle,
mirage,
miragetax,
miragemill,
mist,
mitosis,
Expand Down Expand Up @@ -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"),
Expand Down Expand Up @@ -1401,7 +1399,7 @@ impl Skill {
}
}
Self::bolsterintodeck => Tgt::crea,
Self::bonesharpen => tgt!(and crea skele),
Self::bonesharpen => tgt!(and own crea),
Self::bubbleclear => tgt!(or crea perm),
Self::butterfly => Tgt::butterfly,
Self::catapult => tgt!(and crea own),
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/rs/src/text.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 your own 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" }))
}
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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 =>
Expand Down

0 comments on commit 8723cfd

Please sign in to comment.