Merge branch 'main' into ball-queue

src/data/concoctions.txt

@@ -3238,10 +3238,10 @@ Boris's bread	COOK	Yeast of Boris	Yeast of Boris
 roasted vegetable of Jarlsberg	COOK	Vegetable of Jarlsberg	Vegetable of Jarlsberg
 Pete's rich ricotta	COOK	St. Sneaky Pete's Whey	St. Sneaky Pete's Whey
 
-baked veggie ricotta casserole	COOK	Boris's bread	roasted vegetable of Jarlsberg
+baked veggie ricotta casserole	COOK	roasted vegetable of Jarlsberg	Pete's rich ricotta
 plain calzone	COOK	Boris's bread	Pete's rich ricotta
-roasted vegetable focaccia	COOK	roasted vegetable of Jarlsberg	Pete's rich ricotta
+roasted vegetable focaccia	COOK	Boris's bread	roasted vegetable of Jarlsberg
 
-Pizza of Legend	COOK	baked veggie ricotta casserole	Boris's bread
-Calzone of Legend	COOK	plain calzone	roasted vegetable focaccia
-Deep Dish of Legend	COOK	roasted vegetable focaccia	Pete's rich ricotta
+Deep Dish of Legend	COOK	baked veggie ricotta casserole	Boris's bread
+Calzone of Legend	COOK	plain calzone	roasted vegetable of Jarlsberg
+Pizza of Legend	COOK	roasted vegetable focaccia	Pete's rich ricotta

src/data/fullness.txt

@@ -91,7 +91,7 @@ blunt cat claw	1	4	awesome	3-5	45-75	0	0	30 Feline Ferocity (+100% weapon dmg)
 bone broth	1	1	awesome	4-5	40-50	0	0	1-2 loose teeth, 3-4 skeleton bones
 bone meal	2	6	awesome	7-9	12-20	12-20	12-20
 boring spaghetti	4	5	good	10-14	0	20-25	0
-Boris's bread	1	1	EPIC	0	0	0	0	Unspaded, 30 Inspired Chef (+10 Muscle, +100% Muscle, +100% Meat Drop)
+Boris's bread	1	1	EPIC	6-8	0	0	0	Unspaded, 30 Inspired Chef (+10 Muscle, +100% Muscle, +100% Meat Drop)
 Boris's key lime pie	4	6	awesome	14-16	28-33	0	0	Boris's key
 boss brain	1	1	EPIC	6	9-12	9-12	9-12	Zombie Slayer
 Bouillabaise Coucher Avec Moi	5	1	decent	5-9	0	0	0
@@ -464,7 +464,7 @@ high-calorie sugar substitute	1	4	awesome	3-4	0	20-25	0
 hippy herbal tea	1	1	decent	2	0	4-7	0	5 Sleepy (-30% mus)
 holiday cheese log	3	1	good	8-10	10-20	10-20	10-20	Stands Alone (+10 Stench dmg)
 honey-dew	2	2	good	4-7	13-15	0	0	10 Mmmmmelon (+30% item drop)
-honey bun of Boris	1	1	EPIC	0	0	0	0	Unspaded, 30 Motherly Loved (+5 Muscle, +50% Muscle, +5 Cold Res)
+honey bun of Boris	1	1	EPIC	5-7	0	0	0	Unspaded, 30 Motherly Loved (+5 Muscle, +50% Muscle, +5 Cold Res)
 hot buttered roll	1	1	crappy	1	0	0	0
 hot date	2	7	good	4-5	0	0	20-30
 hot hi mein	5	12	EPIC	24-27	70-75	15-20	30-35	5 Hot Breath (combat skill), SAUCY
@@ -495,7 +495,7 @@ it came from beyond dessert	4	1	decent	6-12	7-8	7-8	7-8	10 Sugar Rush
 Jack LaLanne roll	3	1	sushi	9-14	28-46	20-30	20-30	45/55 Fishy
 jacked Santa roll	3	1	sushi	10-15	8-16	0	0	20 Dreaming of a Wet Crimbo (better diver, +50 (underwater) Item Drop) 45/55 Fishy
 Jarlsberg's key lime pie	4	6	awesome	14-16	0	28-33	0	Jarlsberg's key
-Jarlsberg's vegetable soup	1	1	EPIC	0	0	0	0	Unspaded, 30 Souped Up (+5 Mysticality, +50% Mysticality, +50 DA)
+Jarlsberg's vegetable soup	1	1	EPIC	5-7	0	0	0	Unspaded, 30 Souped Up (+5 Mysticality, +50% Mysticality, +50 DA)
 java cookie	2	1	awesome	7-11	0	0	0	10 Updated (+20 all stats)
 jawbruiser	1	4	good	1-5	10-20	10-20	10-20	5 Sugar Rush, lose 35-45 HP
 jerky coins	1	1	EPIC	5-6	5-6	5-6	5-6
@@ -661,8 +661,8 @@ pear tart	3	7	awesome	8-14	0	25-45	0
 pecan pie	3	5	good	7-9	20-25	0	0	30 Pecan Pied Piper (+25 candy drop)
 Peche a la Frog	3	1	decent	3-4	0	0	0
 penguin focaccia bread	7	1	good	18-24	21-38	21-38	21-38
-Pete's rich ricotta	1	1	EPIC	0	0	0	0	Unspaded, 30 Rippin' Riccotta (+200 Initiative, +10 Moxie, +100% Moxie)
-Pete's wiley whey bar	1	1	EPIC	0	0	0	0	Unspaded, 30 Awfully Wily (+5 Moxie, +50% Moxie, +5 Sleaze Res)
+Pete's rich ricotta	1	1	EPIC	6-8	0	0	0	Unspaded, 30 Rippin' Riccotta (+200 Initiative, +10 Moxie, +100% Moxie)
+Pete's wiley whey bar	1	1	EPIC	5-7	0	0	0	Unspaded, 30 Awfully Wily (+5 Moxie, +50% Moxie, +5 Sleaze Res)
 Peppermint Nutrition Block	3	1	decent	3-6	0	0	0	10 Forbear, Warbears! (+40 WarBear Armor Penetration)
 peppermint patty	2	2	EPIC	9-12	10-20	10-20	10-20
 perfect breakfast	5	1	good	14-16	20-30	40-50	0
@@ -731,7 +731,7 @@ raspberry	1	2	decent	2	0	0	0
 rat appendix kabob	2	1	decent	2-5	0	0	6-9
 rat appendix stir-fry	3	4	awesome	8-12	0	0	27-31
 rat scrapple	2	2	decent	2-7	0	0	10-12
-ratatouille de Jarlsberg	1	1	EPIC	0	0	0	0	Unspaded, 30 parfum d'herbes (+5 Mysticality, +50% Mysticality, +5 Stench Res)
+ratatouille de Jarlsberg	1	1	EPIC	5-7	0	0	0	Unspaded, 30 parfum d'herbes (+5 Mysticality, +50% Mysticality, +5 Stench Res)
 ratini	4	4	good	10-14	0	20-30	0
 ravioli della hippy	3	3	good	4-12	0	19-23	0
 raw bread	1	1	decent	2	0	0	20-40	chance of 30 The Good Salmonella (+20% x Fullness all stats)
@@ -751,7 +751,7 @@ ridiculous sandwich	3	1	awesome	11	10-12	10-12	10-12
 roasted duck	2	4	decent	3-4	0	7-12	0
 roasted marshmallow	1	1	crappy	1	0	0	0	3 Mallowed Out (+all stats)
 roasted vegetable focaccia	2	1	EPIC	0	0	0	0	Unspaded, 50 Feeling Fancy (fam exp +10, +15 Muscle, +200% Mysticality)
-roasted vegetable of Jarlsberg	1	1	EPIC	0	0	0	0	Unspaded, 30 Wizard Sight (+10 Mysticality, +100% Mysticality, +100% item)
+roasted vegetable of Jarlsberg	1	1	EPIC	6-8	0	0	0	Unspaded, 30 Wizard Sight (+10 Mysticality, +100% Mysticality, +100% item)
 robin flan	2	1	awesome	7-9	10-20	10-20	10-20
 rocky road ice cream	2	7	awesome	7-10	12-14	12-14	12-14	40 A Contender (+200% all stats)
 rook cookie	1	13	EPIC	4-6	45-50	0	0	30 Towering Strength (+100..200% mus)
@@ -760,7 +760,7 @@ rotting beefsteak	3	1	awesome	9-10	0	0	0	30 Cowrruption (+200% weapon dmg, +200%
 royal jelly	1	1	crappy	1	10-15	0	0
 royal jelly taco	1	1	decent	2	4-20	0	0
 S.T.L.T.	4	4	awesome	10-15	10-30	10-30	13-27
-St. Pete's sneaky smoothie	1	1	EPIC	0	0	0	0	Unspaded, 30 Gritty Soul (+5 Moxie, +50% Moxie, +5 Spooky Resistance)
+St. Pete's sneaky smoothie	1	1	EPIC	5-7	0	0	0	Unspaded, 30 Gritty Soul (+5 Moxie, +50% Moxie, +5 Spooky Resistance)
 s'more	1	1	crappy	1	0	0	0
 salacious crumbs	3	1	decent	5-7	0	0	15-20
 salt plum	2	1	good	6	0	0	0

src/data/inebriety.txt

@@ -70,7 +70,7 @@ Bone's Farm "wine"	1	6	awesome	3-4	5-10	5-10	5-10	30 Sticks and Stones
 boot flask	3	1	awesome	0	0	0	0	Unspaded
 booze-soaked cherry	1	3	decent	1-3	0	5-10	0
 Bordeaux Marteaux	1	3	awesome	3-5	60-75	0	0	20 Hammered (+50% weapon dmg), WINE
-Boris's beer	1	1	EPIC	0	0	0	0	Unspaded, 30 Beery Cool (+5 Muscle, +50% Muscle, +5 Hot Resistance)
+Boris's beer	1	1	EPIC	5-7	0	0	0	Unspaded, 30 Beery Cool (+5 Muscle, +50% Muscle, +5 Hot Resistance)
 bottle of Amontillado	4	5	good	11-13	5-15	0	5-15	100 Bricked-In (+50 HP)
 bottle of Bloodweiser	2	1	EPIC	12-13	30-50	30-50	30-50	50 Blood Porter
 bottle of Calcutta Emerald	3	2	decent	4-8	0	0	0

src/net/sourceforge/kolmafia/persistence/ScriptManager.java

@@ -87,11 +87,6 @@ private static JSONObject repoToJSONObject(SVNURL repo) throws JSONException, SV
       // this will change
       "https://raw.githubusercontent.com/kolmafia/kolmafia/main/data/SVN/svnrepo.json";
 
-  static {
-    ScriptManager.updateRepoScripts(false);
-    ScriptManager.updateInstalledScripts();
-  }
-
   public static void updateRepoScripts(boolean force) {
     File repoFile = KoLConstants.SVN_REPO_FILE;
     if (force || !repoFile.exists() || !Preferences.getBoolean("_svnRepoFileFetched")) {

src/net/sourceforge/kolmafia/session/EncounterManager.java

@@ -260,7 +260,7 @@ public static final boolean isSaberForceMonster(String monsterName) {
 
   public static final boolean isSaberForceZone(String monsterName, String zone) {
     MonsterData monster = MonsterDatabase.findMonster(monsterName);
-    return AdventureDatabase.getAreasWithMonster(monster).contains(zone);
+    return AdventureDatabase.getAreaCombatData(zone).hasMonster(monster);
   }
 
   public static final boolean isSaberForceZone(String zone) {

src/net/sourceforge/kolmafia/swingui/ScriptManageFrame.java

@@ -30,6 +30,12 @@
 import org.jdesktop.swingx.decorator.HighlighterFactory;
 
 public class ScriptManageFrame extends GenericPanelFrame {
+
+  static {
+    ScriptManager.updateRepoScripts(false);
+    ScriptManager.updateInstalledScripts();
+  }
+
   private class ScriptManageTable extends ShowDescriptionTable<Script> {
     public ScriptManageTable() {
       super(ScriptManager.getInstalledScripts(), 4, 4);