Merge branch 'main' into concurrency-fix-forward

src/data/dailylimits.txt

@@ -281,6 +281,11 @@ Use	[glitch season reward name]	_glitchItemImplemented
 Use	alien animal milk	_alienAnimalMilkUsed
 Use	alien plant pod	_alienPlantPodUsed
 Use	all-year sucker	_allYearSucker
+Use	Apriling band piccolo	_aprilBandPiccoloUses	3
+Use	Apriling band quad tom	_aprilBandTomUses	3
+Use	Apriling band saxophone	_aprilBandSaxophoneUses	3
+Use	Apriling band staff	_aprilBandStaffUses	3
+Use	Apriling band tuba	_aprilBandTubaUses	3
 Use	ball-in-a-cup	_ballInACupUsed
 Use	ballast turtle	_ballastTurtleUsed
 Use	bass clarinet	_floundryItemUsed

src/data/defaults.txt

@@ -1137,6 +1137,7 @@ user	munchiesPillsUsed	0
 user	mushroomGardenCropLevel	1
 user	neverendingPartyAlways	false
 user	nextAdventure
+user	nextAprilBandTurn	0
 user	nextDistillateMods
 user	nextParanormalActivity	1
 user	nextSpookyravenElizabethRoom	The Haunted Storage Room
@@ -1697,6 +1698,12 @@ user	_allYearSucker	false
 user	_ancestralRecallCasts	0
 user	_antihangoverBonus	5
 user	_aprilShower	false
+user	_aprilBandInstruments	0
+user	_aprilBandSaxophoneUses	0
+user	_aprilBandTomUses	0
+user	_aprilBandTubaUses	0
+user	_aprilBandStaffUses	0
+user	_aprilBandPiccoloUses	0
 user	_armyToddlerCast	false
 user	_astralDrops	0
 user	_aug1Cast	false

src/data/equipment.txt

@@ -14,6 +14,7 @@ ancient turtle shell helmet	35	Mox: 2
 anniversary concrete fedora	10	none
 antique helmet	150	Mus: 60
 antique nutcracker hat	150	Mox: 30
+Apriling band helmet	100	none
 asbestos helmet turtle	80	Mox: 25
 asshat	30	none
 astral chapeau	50	none
@@ -952,6 +953,9 @@ antique accordion	10	Mox: 0	2-handed accordion
 antique machete	155	Mus: 62	1-handed sword
 antique nutcracker sword	150	Mus: 30	1-handed sword
 antique spear	150	Mus: 60	1-handed polearm
+Apriling band quad tom	200	Mus: 0	2-handed drum
+Apriling band saxophone	100	Mox: 0	1-handed woodwind
+Apriling band tuba	200	Mus: 0	2-handed brass
 archaeologing shovel	10	Mus: 0	2-handed polearm
 armgun	140	Mox: 55	2-handed machine gun
 arse-shooting crossbow	160	Mox: 65	2-handed crossbow
@@ -1826,6 +1830,7 @@ antique candy bucket	0	none
 antique nutcracker drumstick	150	Mys: 30
 antique shield	180	Mus: 60	shield
 antique spyglass	225	Mys: 200
+Apriling band staff	0	none
 arm buzzer	100	Mus: 25	shield
 arrow'd heart balloon	10	none
 astral shield	50	none	shield

src/data/items.txt

@@ -11589,3 +11589,10 @@
 11561	Everfull Dart Holster	129400771	dartholster.gif	accessory		0
 11562	research fragment	981562994	blueprint.gif	usable	t	0
 11563	Thwaitgold wolf spider statuette	455599612	thwaitwolf.gif	none		0
+11564	boxed Apriling band helmet	244348744	aprilinghat_box.gif	usable	t	0	Apriling band helmets in a boxes
+11565	Apriling band helmet	861863392	aprilinghat.gif	hat		0
+11566	Apriling band saxophone	410507605	saxophone.gif	weapon	q	0
+11567	Apriling band quad tom	726993691	drums_april.gif	weapon	q	0
+11568	Apriling band tuba	360234564	tuba.gif	weapon	q	0
+11569	Apriling band staff	295593615	staff_april.gif	offhand	q	0
+11570	Apriling band piccolo	760923456	piccolo.gif	familiar	q	0

src/data/modifiers.txt

@@ -87,6 +87,8 @@ Item	ancient turtle shell helmet	Meat Drop: +10, Familiar Effect: "hot atk, cap
 Item	anniversary concrete fedora	Muscle: +1, Mysticality: +1, Moxie: +1, Familiar Effect: "5xVolley, 5xLep, cap 2"
 Item	antique helmet	Initiative: -10, Spooky Resistance: +2, Breakable, Familiar Effect: "0.5xPotato, 0.5xFairy"
 Item	antique nutcracker hat	Initiative: +15, Moxie Percent: +15
+# Apriling band helmet: Conduct the Band!
+Item	Apriling band helmet	Maximum HP: +25, Maximum MP: +25, Never Fumble, Negative Status Resist, Meat Drop: +40, Muscle Percent: +10, Mysticality Percent: +10, Moxie Percent: +10
 Item	asbestos helmet turtle	Hot Resistance: +2, Familiar Effect: "hot atk, 1xFairy, cap 20"
 Item	asshat	Stench Resistance: +1, Sleaze Damage: +1, Familiar Effect: "stench atk, 1xVolley, cap 7"
 Item	astral chapeau	Mysticality Percent: +25, Spell Damage: +20, MP Regen Min: 3, MP Regen Max: 5, Familiar Effect: "1xVolley, 1xLep, cap 12"
@@ -1135,6 +1137,9 @@ Item	antique accordion	Song Duration: 10
 Item	antique machete	Muscle Percent: +5
 Item	antique nutcracker sword	Weapon Damage Percent: +30, Muscle Percent: +15, Single Equip
 Item	antique spear	Initiative: -30, Weakens Monster, Breakable
+Item	Apriling band quad tom	Spooky Damage: +5, Stench Damage: +5, Hot Damage: +5, Cold Damage: +5, Sleaze Damage: +5, Muscle Percent: +20, Mysticality Percent: +20, Moxie Percent: +20, Muscle: +5, Mysticality: +5, Moxie: +5, Damage Reduction: 10, Lasts Until Rollover
+Item	Apriling band saxophone	Sleaze Damage: +20, Sleaze Spell Damage: +20, Stench Resistance: +2, Hot Resistance: +2, Lasts Until Rollover
+Item	Apriling band tuba	Maximum HP: +30, Muscle: +10, Muscle Percent: +20, Cold Resistance: +2, Sleaze Resistance: +2, Lasts Until Rollover
 # archaeologing shovel
 Item	armgun	Weapon Damage: +10, Critical Hit Percent: +5
 Item	arse-shooting crossbow	Muscle: +15, Mysticality: +15, Moxie: +15
@@ -2132,6 +2137,7 @@ Item	antique candy bucket	Candy Drop: +50, Lasts Until Rollover
 Item	antique nutcracker drumstick	MP Regen Min: 4, MP Regen Max: 8, Mysticality Percent: +15
 Item	antique shield	Initiative: -10, Damage Reduction: 11, Breakable
 Item	antique spyglass	Reduce Enemy Defense: 15, Muscle Percent: +10, Mysticality Percent: +10, Moxie Percent: +10
+Item	Apriling band staff	Mysticality: +10, Mysticality Percent: +10, Spell Damage: +20, Spooky Resistance: +2, Sleaze Resistance: +2, Spell Damage Percent: +10, Lasts Until Rollover
 Item	arm buzzer	Maximum MP: +25, Damage Reduction: 6
 # arrow'd heart balloon
 Item	astral shield	Muscle Percent: +25, HP Regen Min: 5, HP Regen Max: 10, Damage Reduction: 15
@@ -5280,6 +5286,9 @@ Effect	Anytwo Five Elevenis?	Muscle: +10
 Effect	Apathy	Muscle Percent: -30, Mysticality Percent: -30, Moxie Percent: -30
 Effect	Apoplectic with Rage	Mysticality Percent: -10, Damage Aura: 1
 Effect	Appeteyes	Food Drop: +50
+Effect	Apriling Band Battle Cadence	Combat Rate: +10
+Effect	Apriling Band Celebration Bop	Booze Drop: +25, Food Drop: +50, Candy Drop: +100
+Effect	Apriling Band Patrol Beat	Combat Rate: -10
 Effect	Aquarius Rising	Spell Damage: +30
 Effect	Arabian Knighthood	Muscle Percent: +5
 Effect	Arcane in the Brain	Mana Cost (stackable): -3
@@ -11091,6 +11100,7 @@ Item	antique hand mirror	Effect: "Bad Luck", Effect Duration: 7
 # antique tacklebox: (having more than one doesn't help)
 Item	antique tacklebox	Fishing Skill: +5
 Item	Apathargic Bandersnatch	Free Pull
+Item	Apriling band piccolo	Familiar Weight: +10, Lasts Until Rollover, Generic
 Item	arrest warrant	Lasts Until Rollover
 Item	arrowgram	Free Pull
 # artificial skylight: +3 Adventures Per Day
@@ -11200,6 +11210,7 @@ Item	bottled Vampire Vintner	Free Pull
 # box of hammers: (way more effective against constructs)
 # box of old Crimbo decorations: Lets you give your Crimbo Shrub new decorations each day
 Item	box of sunshine	Free Pull
+Item	boxed Apriling band helmet	Free Pull
 Item	boxed august scepter	Free Pull
 Item	boxed autumn-aton	Free Pull
 Item	Boxing Day care package	Free Pull