cheesecookie
Member
I've included here a patch for tracking the Nagamar quest that is started when losing to the third form of the NS. I assume the setting name I gave it us probably not inline with system used for quest preferences, I just don't quite know how it works. I assume it (questC01Nagamar) will be changed to fit the existing system. And yes, I'm aware of clovering for the wand.
A couple of other patches:
Daily Affirmation: Keep Free Hate in your Heart is a combat item:
Bonerdagon chest resets quest tracking to step1 (this always seems to be remedied very quickly):
Sweetbreads Flambe and Sacramental Wine have special characters:
Code:
//We must have hit choice adventure (1061) to make the Wand of Nagamar findable.
Index: src/net/sourceforge/kolmafia/persistence/QuestDatabase.java
===================================================================
--- src/net/sourceforge/kolmafia/persistence/QuestDatabase.java (revision 18668)
+++ src/net/sourceforge/kolmafia/persistence/QuestDatabase.java (working copy)
@@ -107,6 +107,7 @@
MEATSMITH( "questM23Meatsmith" ),
DOC( "questM24Doc" ),
ARMORER( "questM25Armorer" ),
+ NAGAMAR( "questC01Nagamar" ),
GENERATOR( "questF04Elves" ),
CLANCY( "questF05Clancy" ),
SEA_OLD_GUY( "questS01OldGuy" ),
Index: src/net/sourceforge/kolmafia/session/ChoiceManager.java
===================================================================
--- src/net/sourceforge/kolmafia/session/ChoiceManager.java (revision 18668)
+++ src/net/sourceforge/kolmafia/session/ChoiceManager.java (working copy)
@@ -9353,6 +9418,16 @@
QuestDatabase.setQuestProgress( Quest.FINAL, "step10" );
break;
+ case 1016:
+ // Frank Gets Earnest
+ QuestDatabase.setQuestProgress( Quest.NAGAMAR, QuestDatabase.STARTED );
+ break;
+
+ case 1017:
+ // Bear Verb Orgy
+ QuestDatabase.setQuestProgress( Quest.NAGAMAR, QuestDatabase.FINISHED );
+ break;
+
case 1022: // Meet Frank
// Frank bobs his head toward the hedge maze in front of you.
QuestDatabase.setQuestProgress( Quest.FINAL, "step4" );
Index: src/data/defaults.txt
===================================================================
--- src/data/defaults.txt (revision 18668)
+++ src/data/defaults.txt (working copy)
@@ -1026,6 +1031,7 @@
user questM23Meatsmith unstarted
user questM24Doc unstarted
user questM25Armorer unstarted
+user questC01Nagamar unstarted
user questM26Oracle unstarted
user questPAGhost unstarted
user questS01OldGuy unstarted
A couple of other patches:
Daily Affirmation: Keep Free Hate in your Heart is a combat item:
Code:
Index: src/data/items.txt
===================================================================
--- src/data/items.txt (revision 18668)
+++ src/data/items.txt (working copy)
@@ -9508,7 +9508,7 @@
9482 Daily Affirmation: Adapt to Change Eventually 631908932 newyoucard4.gif multiple, combat t,d 5 Daily Affirmations: Adapt to Change Eventually
9483 Daily Affirmation: Be a Mind Master 763042202 newyoucard5.gif multiple, combat t,d 5 Daily Affirmations: Be a Mind Master
9484 Daily Affirmation: Work For Hours a Week 594054996 newyoucard6.gif multiple, combat t,d 5 Daily Affirmations: Work For Hours a Day
-9485 Daily Affirmation: Keep Free Hate in your Heart 290338478 newyoucard7.gif multiple t,d 5 Daily Affirmations: Keep Free Hate in your Heart
+9485 Daily Affirmation: Keep Free Hate in your Heart 290338478 newyoucard7.gif multiple, combat t,d 5 Daily Affirmations: Keep Free Hate in your Heart
9486 Affirmation Cookie 861232060 cookie.gif food t,d 5
9487 License To Kill 666441939 licensetokill.gif usable t 0
9488 Thwaitgold bug statue 754030701 thwaitbug.gif none 0
Bonerdagon chest resets quest tracking to step1 (this always seems to be remedied very quickly):
Code:
Index: src/net/sourceforge/kolmafia/session/ResultProcessor.java
===================================================================
--- src/net/sourceforge/kolmafia/session/ResultProcessor.java (revision 18668)
+++ src/net/sourceforge/kolmafia/session/ResultProcessor.java (working copy)
@@ -1861,7 +1866,7 @@
break;
case ItemPool.BONERDAGON_CHEST:
- QuestDatabase.setQuestProgress( Quest.CYRPT, "step1" );
+ QuestDatabase.setQuestIfBetter( Quest.CYRPT, "step1" );
break;
case ItemPool.BONERDAGON_SKULL:
Sweetbreads Flambe and Sacramental Wine have special characters:
Code:
Index: src/data/inebriety.txt
===================================================================
--- src/data/inebriety.txt (revision 18668)
+++ src/data/inebriety.txt (working copy)
@@ -495,7 +494,7 @@
Rompedores de Fantasmas 3 1 good 8-10 13 0 0 13 Desenfantasmada (+3 Mus exp, +2 spooky res)
rum and cola 3 1 decent 5-6 0 0 10-12 14-16 MP
Russian Ice 1 2 good 2-3 30-60 0 -5-10
-Sacramento wine 1 1 EPIC 5-6 15-30 15-30 15-30 50 Sacré Mental (+50 Item drop)
+Sacramento wine 1 1 EPIC 5-6 15-30 15-30 15-30 50 Sacré Mental (+50 Item drop)
Saison du Lune 3 2 good 8-10 0 10-20 25-35
salacious lychee chuhai 4 8 good 11-14 0 0 60-115 30 Brined Liver
salacious screwdiver 4 8 good 11-14 60-115 0 0 30 Brined Liver
Index: src/data/modifiers.txt
===================================================================
--- src/data/modifiers.txt (revision 18668)
+++ src/data/modifiers.txt (working copy)
@@ -6187,7 +6186,7 @@
Effect Rushin' Hands Weapon Damage: +3
Effect Rushtacean' Initiative: +50
# Ruthlessly Efficient: Deleveling is 50% more effective
-Effect Sacré Mental Item Drop: +50
+Effect Sacré Mental Item Drop: +50
Effect Sagittarius Rising Ranged Damage: +30
Effect Salad Days Maximum HP: +50, Experience (Muscle): +2
Effect Salamander In Your Stomach Mysticality: +25
@@ -6532,7 +6531,7 @@
Effect Sweet Taste Candy Drop: +10
Effect Sweet Tooth Candy Drop: +40
Effect Sweet, Nuts Mysticality: +5
-Effect Sweetbreads Flambé Monster Level: +25, Experience: +10
+Effect Sweetbreads Flambé Monster Level: +25, Experience: +10
# Swimming Head: +25% Item Drops from Monsters (Underwater only)
Effect Swimming Head Item Drop: [25*env(underwater)]
# Swimming with Sharks: Makes you a better diver
@@ -7975,7 +7973,7 @@
Item reverse Tantalus Effect: "It Is So Hot In Your Guts, So So Hot", Effect Duration: 40
Item Rompedores de Fantasmas Effect: "Desenfantasmada", Effect Duration: 13
# Russian Ice: Weakens enemies somewhat when used as a combat item
-Item Sacramento wine Effect: "Sacré Mental", Effect Duration: 50
+Item Sacramento wine Effect: "Sacré Mental", Effect Duration: 50
Item salacious lychee chuhai Effect: "Brined Liver", Effect Duration: 30
Item salacious screwdiver Effect: "Brined Liver", Effect Duration: 30
Item salinated mint julep Effect: "Brined Liver", Effect Duration: 10
@@ -9146,7 +9144,7 @@
# Great Wolf's lice: Weakens enemies a lot
# Great Wolf's lice: (by 30% if they are beasts)
# Great Wolf's lice: (doesn't go away when used)
-Item Greek fire Effect: "Sweetbreads Flambé", Effect Duration: 25
+Item Greek fire Effect: "Sweetbreads Flambé", Effect Duration: 25
# green BRICKO brick: Deals a percentage of a monster's current Hit Points in Physical Damage
# green BRICKO brick: (more effective against BRICKO monsters)
Item green candy heart Effect: "Heart of Green", Effect Duration: 10
Index: src/data/statuseffects.txt
===================================================================
--- src/data/statuseffects.txt (revision 18668)
+++ src/data/statuseffects.txt (working copy)
@@ -2089,8 +2089,8 @@
2088 Patent Alacrity magicshell.gif 71bb908a3e113705d27377cc1b1f3441 use 1 patent alacrity tonic
2089 Rushtacean' armorprawn.gif 4c04ea5ac2b123c90db8778d1fb2ad87 chew 1 armored prawn
2090 Kicked in the Sinuses horseradish.gif a8b9e71de7ccf5a87e20ac8f29289238 eat 1 jumping horseradish
-2091 Sacré Mental wine2.gif 8b5af0a2980a1144c725e3410b5e53e2 drink 1 Sacramento wine
-2092 Sweetbreads Flambé potion4.gif b3f3d7e5c72a045fff556e01f287f42d use 1 Greek fire
+2091 Sacré Mental wine2.gif 8b5af0a2980a1144c725e3410b5e53e2 drink 1 Sacramento wine
+2092 Sweetbreads Flambé potion4.gif b3f3d7e5c72a045fff556e01f287f42d use 1 Greek fire
2093 Puzzle Champ chessset.gif c359f03413fa5582269a860f664cc7fe witchess
2094 Baited Hook wiggleworm.gif 8a79ad1edacc21eb9ba18a14df09ce2e use 1 wriggling worm
2095 A Real Head for Fish fishy5.gif cb3eac6d97f204102cd30ca4ee1419f9 drink 1 bottle of Fishhead 900-Day IPA