Skip to content

Commit

Permalink
Merge branch 'main' into avalanchelogging
Browse files Browse the repository at this point in the history
  • Loading branch information
dsimich committed Jan 13, 2025
2 parents 9ce73fc + 1348247 commit 89c64e1
Showing 2 changed files with 14 additions and 4 deletions.
2 changes: 1 addition & 1 deletion RELEASE/scripts/autoscend/auto_equipment.ash
Original file line number Diff line number Diff line change
@@ -1254,5 +1254,5 @@ boolean auto_forceEquipSword() {
boolean is_watch(item it)
{
//watches are accessories that conflict with each other. you can only equip one watch total.
return $items[dead guy's memento, dead guy's watch, Counterclockwise Watch, glow-in-the-dark wristwatch, grandfather watch, imitation nice watch, wristwatch of the white knight, Crimbolex watch, Sasq™ watch] contains it;
return boolean_modifier(it, $modifier[Nonstackable Watch]);
}
16 changes: 13 additions & 3 deletions RELEASE/scripts/autoscend/iotms/mr2024.ash
Original file line number Diff line number Diff line change
@@ -482,8 +482,18 @@ void auto_checkTakerSpace()
create(1, $item[anchor bomb]);
}
// goldschlepper is EPIC booze
int creatableGold = creatable_amount($item[tankard of spiced Goldschlepper]);
if(creatableGold > 0) {
create(creatableGold, $item[tankard of spiced Goldschlepper]);
int createable = creatable_amount($item[tankard of spiced Goldschlepper]);
if(createable > 0) {
create(createable, $item[tankard of spiced Goldschlepper]);
}
// tankard of spiced rum is awesome booze
createable = creatable_amount($item[tankard of spiced rum]);
if(createable > 0) {
create(createable, $item[tankard of spiced rum]);
}
// cursed Aztec tamale is awesome food, and only uses spices
createable = creatable_amount($item[cursed Aztec tamale]);
if(createable > 0) {
create(createable, $item[cursed Aztec tamale]);
}
}

0 comments on commit 89c64e1

Please sign in to comment.