mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-23 16:48:52 -05:00
Code Issues Projects Releases Wiki Activity

[#1597] Remove Buy Bombchu (5) from pool, 3ds-only shop item (#1605)

Browse Source
This commit is contained in:
Garrett Cox 2022-09-26 17:23:49 -05:00 committed by GitHub
parent a927a881fc
commit 7a516c72c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
soh/soh/Enhancements/randomizer/3drando/item_list.cpp
View File

@ -228,7 +228,6 @@ void ItemTable_Init() { // RandomizerGet
itemTable[BUY_HEART] = Item(RG_BUY_HEART, Text{"Buy Heart", "Acheter: Coeur de Vie", "Comprar corazón"}, ITEMTYPE_SHOP, 0x10, false, &noVariable, RECOVERY_HEART, 10); itemTable[BUY_HEART] = Item(RG_BUY_HEART, Text{"Buy Heart", "Acheter: Coeur de Vie", "Comprar corazón"}, ITEMTYPE_SHOP, 0x10, false, &noVariable, RECOVERY_HEART, 10);
itemTable[BUY_BOMBCHU_10] = Item(RG_BUY_BOMBCHU_10, Text{"Buy Bombchu (10)", "Acheter: Missiles (10)", "Comprar bombchus (10)"}, ITEMTYPE_SHOP, 0x15, true, &BuyBombchus10, BOMBCHU_10, 99); itemTable[BUY_BOMBCHU_10] = Item(RG_BUY_BOMBCHU_10, Text{"Buy Bombchu (10)", "Acheter: Missiles (10)", "Comprar bombchus (10)"}, ITEMTYPE_SHOP, 0x15, true, &BuyBombchus10, BOMBCHU_10, 99);
itemTable[BUY_BOMBCHU_20] = Item(RG_BUY_BOMBCHU_20, Text{"Buy Bombchu (20)", "Acheter: Missiles (20)", "Comprar bombchus (20)"}, ITEMTYPE_SHOP, 0x16, true, &BuyBombchus20, BOMBCHU_20, 180); itemTable[BUY_BOMBCHU_20] = Item(RG_BUY_BOMBCHU_20, Text{"Buy Bombchu (20)", "Acheter: Missiles (20)", "Comprar bombchus (20)"}, ITEMTYPE_SHOP, 0x16, true, &BuyBombchus20, BOMBCHU_20, 180);
itemTable[BUY_BOMBCHU_5] = Item(RG_BUY_BOMBCHU_5, Text{"Buy Bombchu (5)", "Acheter: Missiles (5)", "Comprar bombchus (5)"}, ITEMTYPE_SHOP, 0x18, true, &BuyBombchus5, BOMBCHU_5, 60);
itemTable[BUY_DEKU_SEEDS_30] = Item(RG_BUY_DEKU_SEEDS_30, Text{"Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Comprar semillas deku (30)"}, ITEMTYPE_SHOP, 0x1D, true, &BuySeed, DEKU_SEEDS_30, 30); itemTable[BUY_DEKU_SEEDS_30] = Item(RG_BUY_DEKU_SEEDS_30, Text{"Buy Deku Seeds (30)", "Acheter: Graines Mojo (30)", "Comprar semillas deku (30)"}, ITEMTYPE_SHOP, 0x1D, true, &BuySeed, DEKU_SEEDS_30, 30);
itemTable[SOLD_OUT] = Item(RG_SOLD_OUT, Text{"Sold Out", "Rupture de stock", "Vendido"}, ITEMTYPE_SHOP, 0x26, false, &noVariable, NONE, 0); itemTable[SOLD_OUT] = Item(RG_SOLD_OUT, Text{"Sold Out", "Rupture de stock", "Vendido"}, ITEMTYPE_SHOP, 0x26, false, &noVariable, NONE, 0);
itemTable[BUY_BLUE_FIRE] = Item(RG_BUY_BLUE_FIRE, Text{"Buy Blue Fire", "Acheter: Flamme Bleue", "Comprar fuego azul"}, ITEMTYPE_SHOP, 0x27, true, &BlueFireAccess, BOTTLE_WITH_BLUE_FIRE, 300); itemTable[BUY_BLUE_FIRE] = Item(RG_BUY_BLUE_FIRE, Text{"Buy Blue Fire", "Acheter: Flamme Bleue", "Comprar fuego azul"}, ITEMTYPE_SHOP, 0x27, true, &BlueFireAccess, BOTTLE_WITH_BLUE_FIRE, 300);

2
soh/soh/Enhancements/randomizer/3drando/item_location.cpp
View File

@ -815,7 +815,7 @@ void LocationTable_Init() {
locationTable[KAK_POTION_SHOP_ITEM_7] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_7, 0x30, 0x36, "Kak Potion Shop Item 7", KAK_POTION_SHOP_ITEM_7, BUY_POE, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x30, 6), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); locationTable[KAK_POTION_SHOP_ITEM_7] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_7, 0x30, 0x36, "Kak Potion Shop Item 7", KAK_POTION_SHOP_ITEM_7, BUY_POE, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x30, 6), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
locationTable[KAK_POTION_SHOP_ITEM_8] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_8, 0x30, 0x37, "Kak Potion Shop Item 8", KAK_POTION_SHOP_ITEM_8, BUY_FAIRYS_SPIRIT, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x30, 7), SpoilerCollectionCheckGroup::GROUP_KAKARIKO); locationTable[KAK_POTION_SHOP_ITEM_8] = ItemLocation::Base(RC_KAK_POTION_SHOP_ITEM_8, 0x30, 0x37, "Kak Potion Shop Item 8", KAK_POTION_SHOP_ITEM_8, BUY_FAIRYS_SPIRIT, {Category::cKakarikoVillage, Category::cKakariko, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x30, 7), SpoilerCollectionCheckGroup::GROUP_KAKARIKO);
locationTable[MARKET_BOMBCHU_SHOP_ITEM_1] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1, 0x32, 0x30, "MK Bombchu Shop Item 1", MARKET_BOMBCHU_SHOP_ITEM_1, BUY_BOMBCHU_5, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); locationTable[MARKET_BOMBCHU_SHOP_ITEM_1] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_1, 0x32, 0x30, "MK Bombchu Shop Item 1", MARKET_BOMBCHU_SHOP_ITEM_1, BUY_BOMBCHU_10, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 0), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
locationTable[MARKET_BOMBCHU_SHOP_ITEM_2] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2, 0x32, 0x31, "MK Bombchu Shop Item 2", MARKET_BOMBCHU_SHOP_ITEM_2, BUY_BOMBCHU_10, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); locationTable[MARKET_BOMBCHU_SHOP_ITEM_2] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_2, 0x32, 0x31, "MK Bombchu Shop Item 2", MARKET_BOMBCHU_SHOP_ITEM_2, BUY_BOMBCHU_10, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 1), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
locationTable[MARKET_BOMBCHU_SHOP_ITEM_3] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3, 0x32, 0x32, "MK Bombchu Shop Item 3", MARKET_BOMBCHU_SHOP_ITEM_3, BUY_BOMBCHU_10, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); locationTable[MARKET_BOMBCHU_SHOP_ITEM_3] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_3, 0x32, 0x32, "MK Bombchu Shop Item 3", MARKET_BOMBCHU_SHOP_ITEM_3, BUY_BOMBCHU_10, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 2), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);
locationTable[MARKET_BOMBCHU_SHOP_ITEM_4] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4, 0x32, 0x33, "MK Bombchu Shop Item 4", MARKET_BOMBCHU_SHOP_ITEM_4, BUY_BOMBCHU_10, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); locationTable[MARKET_BOMBCHU_SHOP_ITEM_4] = ItemLocation::Base(RC_MARKET_BOMBCHU_SHOP_ITEM_4, 0x32, 0x33, "MK Bombchu Shop Item 4", MARKET_BOMBCHU_SHOP_ITEM_4, BUY_BOMBCHU_10, {Category::cInnerMarket, Category::cMarket, Category::cShop}, SpoilerCollectionCheck::ShopItem(0x32, 3), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE);

1
soh/soh/Enhancements/randomizer/3drando/keys.hpp
View File

@ -220,7 +220,6 @@ typedef enum {
BUY_HEART, BUY_HEART,
BUY_BOMBCHU_10, BUY_BOMBCHU_10,
BUY_BOMBCHU_20, BUY_BOMBCHU_20,
BUY_BOMBCHU_5,
BUY_DEKU_SEEDS_30, BUY_DEKU_SEEDS_30,
SOLD_OUT, SOLD_OUT,
BUY_BLUE_FIRE, BUY_BLUE_FIRE,

2
soh/soh/Enhancements/randomizer/3drando/location_access.cpp
View File

@ -77,7 +77,7 @@ bool LocationAccess::CanBuy() const {
OtherCondition = HasBottle; OtherCondition = HasBottle;
} }
//If bombchus in logic, need to have found chus to buy; if not just need bomb bag //If bombchus in logic, need to have found chus to buy; if not just need bomb bag
else if (placed == BUY_BOMBCHU_5 || placed == BUY_BOMBCHU_10 || placed == BUY_BOMBCHU_20) { else if (placed == BUY_BOMBCHU_10 || placed == BUY_BOMBCHU_20) {
OtherCondition = (!BombchusInLogic && Bombs) || (BombchusInLogic && FoundBombchus); OtherCondition = (!BombchusInLogic && Bombs) || (BombchusInLogic && FoundBombchus);
} }

4
soh/soh/Enhancements/randomizer/3drando/logic.cpp
View File

@ -189,7 +189,6 @@ namespace Logic {
bool BombchuDrop = false; bool BombchuDrop = false;
bool AmmoCanDrop = false; bool AmmoCanDrop = false;
bool BuyBombchus5 = false;
bool BuyBombchus10 = false; bool BuyBombchus10 = false;
bool BuyBombchus20 = false; bool BuyBombchus20 = false;
bool BuySeed = false; bool BuySeed = false;
@ -708,7 +707,7 @@ namespace Logic {
FoundBombchus = (BombchuDrop || Bombchus || Bombchus5 || Bombchus10 || Bombchus20); FoundBombchus = (BombchuDrop || Bombchus || Bombchus5 || Bombchus10 || Bombchus20);
CanPlayBowling = (BombchusInLogic && FoundBombchus) || (!BombchusInLogic && BombBag); CanPlayBowling = (BombchusInLogic && FoundBombchus) || (!BombchusInLogic && BombBag);
HasBombchus = (BuyBombchus5 || BuyBombchus10 || BuyBombchus20 || (AmmoDrops.Is(AMMODROPS_BOMBCHU) && FoundBombchus)); HasBombchus = (BuyBombchus10 || BuyBombchus20 || (AmmoDrops.Is(AMMODROPS_BOMBCHU) && FoundBombchus));
HasExplosives = Bombs || (BombchusInLogic && HasBombchus); HasExplosives = Bombs || (BombchusInLogic && HasBombchus);
@ -1067,7 +1066,6 @@ namespace Logic {
FairyPond = false; FairyPond = false;
BombchuDrop = false; BombchuDrop = false;
BuyBombchus5 = false;
BuyBombchus10 = false; BuyBombchus10 = false;
BuyBombchus20 = false; BuyBombchus20 = false;
BuySeed = false; BuySeed = false;

1
soh/soh/Enhancements/randomizer/3drando/logic.hpp
View File

@ -181,7 +181,6 @@ extern bool FreeFairies;
extern bool FairyPond; extern bool FairyPond;
extern bool BombchuDrop; extern bool BombchuDrop;
extern bool BuyBombchus5;
extern bool BuyBombchus10; extern bool BuyBombchus10;
extern bool BuyBombchus20; extern bool BuyBombchus20;
extern bool BuyArrow; extern bool BuyArrow;

1
soh/soh/Enhancements/randomizer/3drando/shops.cpp
View File

@ -48,7 +48,6 @@ std::vector<uint32_t> GetMinVanillaShopItems(int total_replaced) {
BUY_ARROWS_10, BUY_ARROWS_10,
BUY_ARROWS_30, BUY_ARROWS_30,
BUY_ARROWS_50, BUY_ARROWS_50,
BUY_BOMBCHU_5,
BUY_BOMBCHU_10, BUY_BOMBCHU_10,
BUY_BOMBCHU_10, BUY_BOMBCHU_10,
BUY_BOMBCHU_20, BUY_BOMBCHU_20,

3
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -1137,7 +1137,6 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
return CAN_OBTAIN; return CAN_OBTAIN;
case RG_BUY_BOMBCHU_10: case RG_BUY_BOMBCHU_10:
case RG_BUY_BOMBCHU_20: case RG_BUY_BOMBCHU_20:
case RG_BUY_BOMBCHU_5:
case RG_BOMBCHU_DROP: case RG_BOMBCHU_DROP:
// If Bombchus aren't in logic, you need a bomb bag to purchase them // If Bombchus aren't in logic, you need a bomb bag to purchase them
// If they are in logic, you need to have already obtained them somewhere else // If they are in logic, you need to have already obtained them somewhere else
@ -1513,7 +1512,6 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
} }
return GI_BOMBCHUS_5; return GI_BOMBCHUS_5;
case RG_BOMBCHU_5: case RG_BOMBCHU_5:
case RG_BUY_BOMBCHU_5:
case RG_BOMBCHU_DROP: case RG_BOMBCHU_DROP:
return GI_BOMBCHUS_5; return GI_BOMBCHUS_5;
case RG_BOMBCHU_10: case RG_BOMBCHU_10:
@ -1857,7 +1855,6 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
case RG_BUY_HEART: case RG_BUY_HEART:
case RG_BUY_BOMBCHU_10: case RG_BUY_BOMBCHU_10:
case RG_BUY_BOMBCHU_20: case RG_BUY_BOMBCHU_20:
case RG_BUY_BOMBCHU_5:
case RG_BUY_DEKU_SEEDS_30: case RG_BUY_DEKU_SEEDS_30:
case RG_SOLD_OUT: case RG_SOLD_OUT:
case RG_BUY_BLUE_FIRE: case RG_BUY_BLUE_FIRE:

1
soh/soh/Enhancements/randomizer/randomizerTypes.h
View File

@ -946,7 +946,6 @@ typedef enum {
RG_BUY_HEART, RG_BUY_HEART,
RG_BUY_BOMBCHU_10, RG_BUY_BOMBCHU_10,
RG_BUY_BOMBCHU_20, RG_BUY_BOMBCHU_20,
RG_BUY_BOMBCHU_5,
RG_BUY_DEKU_SEEDS_30, RG_BUY_DEKU_SEEDS_30,
RG_SOLD_OUT, RG_SOLD_OUT,
RG_BUY_BLUE_FIRE, RG_BUY_BLUE_FIRE,