Merge remote-tracking branch 'upstream/main' into EagleCMC

loathers · Oct 14, 2023 · 7b9d8a8 · 7b9d8a8
2 parents 535e308 + 6083332
commit 7b9d8a8
Show file tree

Hide file tree

Showing 12 changed files with 303 additions and 186 deletions.
diff --git a/BUILD/familiars/boss.dat b/BUILD/familiars/boss.dat
@@ -3,4 +3,6 @@ Fist Turkey
 Shorter-Order Cook
 Mu
 Warbear Drone
+Vampire Vintner
+Jill-of-All-Trades
 Mosquito
diff --git a/BUILD/familiars/drop.dat b/BUILD/familiars/drop.dat
@@ -4,6 +4,8 @@
 #
 # every 2 cookbookbat ingredients generate a size 1 density 7 food. prioritize having enough to craft 1.
 Cookbookbat	item:Vegetable of Jarlsberg<2;item:Yeast of Boris<2;item:St. Sneaky Pete's Whey<2
+# jill will drop her fam equip and a halloween map. Only consider map though
+Jill-of-All-Trades	item:Map to a candy-rich block<1
 # 5 turkey booze drops a day. each is size 1 and density of either 5, 5.5, or 6
 Fist Turkey	prop:_turkeyBooze<5
 # every 10 yellow pixels make a size 2 density 5 food or drink. unlimited drops per day. prioritize having enough to craft 2.

diff --git a/BUILD/familiars/item.dat b/BUILD/familiars/item.dat
@@ -4,6 +4,8 @@
 # exempt from 10 lbs restriction in KOLHS path
 Steam-Powered Cheerleader	path:KOLHS
 # Fairies with a multiplier
+# 1.5x multiplier fairy
+Jill-of-All-Trades	item:LED candle>1
 # 1.4x multiplier fairy
 Steam-Powered Cheerleader	prop:_cheerleaderSteam>150
 # 1.3x multiplier fairy
@@ -22,6 +24,8 @@ Reagnimated Gnome	!path:Heavy Rains
 XO Skeleton
 # Fairy that drops bacon with no limit. 1 per combat
 Intergnat
+# Fairyeverything
+Jill-of-All-Trades
 # Fairyballs
 Elf Operative
 Optimistic Candle

diff --git a/BUILD/familiars/meat.dat b/BUILD/familiars/meat.dat
@@ -16,9 +16,13 @@ Adventurous Spelunker	prop:_spelunkingTalesDrops<1
 # Might as well get devilish folios
 Blavious Kloop	prop:_kloopDrops<3
 # Leprechauns with a >1 multiplier
+# 1.5x multiplier leprechaun
+Jill-of-All-Trades	item:LED candle>1
 #Mutant Cactus Bud	grimdark:0
 Hobo Monkey
 #Mutant Cactus Bud	grimdark:1
+# Does everything
+Jill-of-All-Trades
 # Volleychauns
 Golden Monkey
 Bloovian Groose

diff --git a/BUILD/familiars/regen.dat b/BUILD/familiars/regen.dat
@@ -8,6 +8,8 @@
 Galloping Grill	prop:_hotAshesDrops<5
 # starfish that drops 5 tokens a day that can be exchanged for a spleen consumable that gives adv
 Rogue Program	prop:_tokenDrops<5
+# Fairyeverything
+Jill-of-All-Trades
 # Fairywhelps. Weight is better used on these and 2 of them drop useful items.
 Pocket Professor
 Garbage Fire

diff --git a/BUILD/familiars/stat.dat b/BUILD/familiars/stat.dat
@@ -7,8 +7,11 @@ Hovering Sombrero	ML:>=120
 # Can be tuned to give pure mainstat, so it's better than other volleyballs
 Crimbo Shrub
 # Volleyballs with a multiplier
+Jill-of-All-Trades	item:LED candle>1
 #Baby Mutant Rattlesnake	grimdark:0
 #Baby Mutant Rattlesnake	grimdark:1
+# Fairyeverything
+Jill-of-All-Trades
 # Fairyballs
 Elf Operative
 Optimistic Candle