Merge branch 'feature/bullet_brogue_11' into tracking/bullet-brogue-v110

flend · Aug 30, 2024 · a246582 · a246582
2 parents 37afc05 + 37c4243
commit a246582
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/src/brogue/Architect.c b/src/brogue/Architect.c
@@ -1506,7 +1506,7 @@ boolean buildAMachine(enum machineTypes bp,
                             while ((theItem->flags & ITEM_CURSED)
                                    || ((feature->flags & MF_REQUIRE_GOOD_RUNIC) && (!(theItem->flags & ITEM_RUNIC))) // runic if requested
                                    || ((feature->flags & MF_NO_THROWING_WEAPONS) && theItem->category == WEAPON && theItem->quantity > 1) // no throwing weapons if prohibited
-                                   || ((feature->flags & MF_REQUIRE_HEAVY_WEAPON) && !itemIsHeavyWeapon(theItem)) // must be a heavy weapon
+                                   || ((feature->flags & MF_REQUIRE_HEAVY_WEAPON) && (!itemIsHeavyWeapon(theItem) || !itemIsPositivelyEnchanted(theItem))) // must be a positively enchanted heavy weapon
                                    || itemIsADuplicate(theItem, p->spawnedItems, itemCount)) { // don't want to duplicates of rings, staffs, etc.
                                 deleteItem(theItem);
                                 theItem = generateItem(feature->itemCategory, feature->itemKind);

diff --git a/src/brogue/Items.c b/src/brogue/Items.c
@@ -165,12 +165,16 @@ static boolean itemIsThrowingWeapon(const item *theItem) {
 
 boolean itemIsHeavyWeapon(const item *theItem) {
     if (theItem && theItem->category == WEAPON && !itemIsThrowingWeapon(theItem)
-        && weaponTable[theItem->kind].strengthRequired >= 15) {
+        && weaponTable[theItem->kind].strengthRequired > 15) {
         return true;
     }
     return false;
 }
 
+boolean itemIsPositivelyEnchanted(const item *theItem) {
+    return theItem->enchant1 > 0;
+}
+
 // Sets an item to the given type and category (or chooses randomly if -1) with all other stats
 item *makeItemInto(item *theItem, unsigned long itemCategory, short itemKind) {
     const itemTable *theEntry = NULL;

diff --git a/src/brogue/Rogue.h b/src/brogue/Rogue.h
@@ -3316,6 +3316,7 @@ extern "C" {
     short chooseKind(const itemTable *theTable, short numKinds);
     item *makeItemInto(item *theItem, unsigned long itemCategory, short itemKind);
     boolean itemIsHeavyWeapon(const item *theItem);
+    boolean itemIsPositivelyEnchanted(const item *theItem);
     void updateEncumbrance(void);
     short displayedArmorValue(void);
     short armorValueIfUnenchanted(item *theItem);