Soften Rustler nerf, nerf Snowflake, fix Tidal to remove neuro/afla

Author: serprex

src/rs/src/game.rs

@@ -402,7 +402,7 @@ impl Status {
 		}
 	}
 
-	pub fn entry(&mut self, stat: Stat) -> StatusEntry {
+	pub fn entry<'a>(&'a mut self, stat: Stat) -> StatusEntry<'a> {
 		match self.0.binary_search_by_key(&stat, |kv| kv.0) {
 			Err(idx) => StatusEntry::Vacant(StatusVacant { status: self, idx, stat }),
 			Ok(idx) => StatusEntry::Occupied(StatusOccupied { status: self, idx }),
@@ -1022,7 +1022,7 @@ impl Game {
 
 	pub fn getIndex(&self, id: i16) -> i32 {
 		if !self.has_id(id) {
-			return -1
+			return -1;
 		}
 		let owner = self.get_owner(id);
 		match self.get_kind(id) {
@@ -1400,7 +1400,7 @@ impl Game {
 		self.cards.random_card(&self.rng, upped, |c| ffilt(self, c))
 	}
 
-	pub fn skill_text(&self, id: i16, ev: Event) -> Option<SkillsName> {
+	pub fn skill_text<'a>(&'a self, id: i16, ev: Event) -> Option<SkillsName<'a>> {
 		if let Some(sk) = self.get_thing(id).skill.get(ev) {
 			if !sk.is_empty() {
 				return Some(SkillsName { ctx: self, sk, id });

src/rs/src/skill.rs

@@ -2073,15 +2073,17 @@ impl Skill {
 			}
 			Self::coldsnap => {
 				let charges = ctx.get_mut(c, Stat::charges);
-				let count = (core::mem::replace(charges, 0) + 1) as u32;
-				let owner = ctx.get_owner(t);
-				if !ctx.sanctified(owner) {
-					ctx.remove(t);
-					let decklen = ctx.get_player(owner).deck.len() as u32;
-					for n in 1..=count {
-						let idx = ctx.upto(decklen + n) as usize;
-						let inst = if n == count { t } else { ctx.cloneinst(t) };
-						ctx.get_player_mut(owner).deck_mut().insert(idx, inst);
+				let count = core::mem::replace(charges, 0);
+				if count > 0 {
+					let owner = ctx.get_owner(t);
+					if !ctx.sanctified(owner) {
+						ctx.remove(t);
+						let decklen = ctx.get_player(owner).deck.len() as u32;
+						for n in 0..count {
+							let idx = ctx.upto(decklen + n as u32) as usize;
+							let inst = if n == 0 { t } else { ctx.cloneinst(t) };
+							ctx.get_player_mut(owner).deck_mut().insert(idx, inst);
+						}
 					}
 				}
 			}
@@ -4099,7 +4101,7 @@ impl Skill {
 			Self::photosynthesis => {
 				ctx.fx(c, Fx::Quanta(2, etg::Life as i8));
 				ctx.spend(ctx.get_owner(c), etg::Life, -2);
-				if ctx.get(c, Stat::poison) <= 0
+				if !ctx.get(c, Flag::neuro)
 					&& ctx.get(c, Stat::cast) > if ctx.get(c, Stat::castele) == etg::Chroma { 1 } else { 0 }
 				{
 					ctx.set(c, Stat::casts, 1);
@@ -4900,10 +4902,29 @@ impl Skill {
 			Self::tidalhealing => {
 				for cr in ctx.get_player(ctx.get_owner(c)).creatures {
 					if cr != 0 {
-						ctx.set(cr, Stat::poison, 0);
-						ctx.set(cr, Stat::frozen, 0);
-						if ctx.get(cr, Flag::aquatic) && !ctx.hasskill(cr, Event::Hit, Skill::regen) {
-							ctx.addskills(cr, Event::Hit, &[Skill::regen]);
+						let thing = ctx.get_thing_mut(cr);
+						if let Some(val) = thing.status.get_mut(Stat::poison) {
+							*val = 0
+						}
+						if let Some(val) = thing.status.get_mut(Stat::frozen) {
+							*val = 0
+						}
+						thing.flag.0 &= !(Flag::aflatoxin | Flag::neuro);
+						if thing.flag.get(Flag::aquatic) {
+							match thing.skill.entry(Event::Hit) {
+								SkillsEntry::Vacant(hole) => {
+									hole.insert(Cow::from(&[Skill::regen]));
+								}
+								SkillsEntry::Occupied(spot) => {
+									for (k, v) in spot.skills.iter_mut() {
+										if k == Event::Hit {
+											if v.iter().all(|sk| !matches!(sk, Skill::regen)) {
+												v.to_mut().push(Skill::regen)
+											}
+										}
+									}
+								}
+							}
 						}
 					}
 				}

src/rs/src/text.rs

@@ -213,7 +213,9 @@ 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 exact copies of target creature or weapon on top of your deck"),
+			Skill::bolsterintodeck => {
+				Cow::from("Add 3 exact copies of target creature or weapon on top of your deck")
+			}
 			Skill::bonesharpen => Cow::from(
 				"Replace your own target creature's skills with \"0: Combine with target creature, giving strength, HP, & poison counters\"\nIf not poisoned & target is skeleton, reactivated",
 			),
@@ -286,7 +288,7 @@ impl<'a> SkillThing<'a> {
 			),
 			Skill::cold => Cow::from("\u{2153} chance to freeze non-ranged attackers for 3 turns"),
 			Skill::coldsnap => Cow::from(
-				"Shuffle target card into owner's deck. Expend charges to shuffle that many more copies",
+				"Expend charges to shuffle as many copies of target card into its owner's deck. Ineffective without charges",
 			),
 			Skill::corpseexplosion => Cow::from(if self.upped() {
 				"Sacrifice one of your creatures to deal 1 spell damage to all enemy creatures. Increase damage by 1 for every 5HP of the sacrifice. Poisonous or poisoned sacrifices inflict 1 poison. Also affect opponent"
@@ -761,9 +763,9 @@ impl<'a> SkillThing<'a> {
 			} else {
 				"When this creature dies, transform it into an Ash"
 			}),
-			Skill::photosynthesis => {
-				Cow::from("Gain 2:5. Unless poisoned or cost was 0 or 1:0, caster reactivated")
-			}
+			Skill::photosynthesis => Cow::from(
+				"Gain 2:5. Unless afflicted with neurotoxin or cost was 0 or 1:0, caster reactivated",
+			),
 			Skill::pillar => Cow::from(format!(
 				"Gain {}:{} every turn",
 				if self.card().element == 0 { '3' } else { '1' },