github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 22:33:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

added progressive items

Browse source
This commit is contained in:
MelonSpeedruns 2022-05-27 15:07:41 -04:00
commit 56cdaff0c8
1 changed files with 56 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

72
soh/soh/Enhancements/randomizer.cpp
View file

@ -1,6 +1,8 @@
#include "randomizer.h" #include "randomizer.h"
#include "json.hpp" #include "json.hpp"
#include <fstream> #include <fstream>
#include <variables.h>
#include <macros.h>
using json = nlohmann::json; using json = nlohmann::json;
@ -556,8 +558,12 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet) {
case BOOMERANG: case BOOMERANG:
return GI_BOOMERANG; return GI_BOOMERANG;
case PROGRESSIVE_HOOKSHOT: case PROGRESSIVE_HOOKSHOT:
// todo actually make it progressive switch (gSaveContext.inventory.items[SLOT_HOOKSHOT]) {
return GI_LONGSHOT; case ITEM_NONE:
return GI_HOOKSHOT;
case ITEM_HOOKSHOT:
return GI_LONGSHOT;
}
case LENS_OF_TRUTH: case LENS_OF_TRUTH:
return GI_LENS; return GI_LENS;
case ZELDAS_LETTER: case ZELDAS_LETTER:
@ -579,14 +585,30 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet) {
case HOVER_BOOTS: case HOVER_BOOTS:
return GI_BOOTS_HOVER; return GI_BOOTS_HOVER;
case BOMB_BAG: case BOMB_BAG:
// todo make it progressive switch (CUR_UPG_VALUE(1)) {
return GI_BOMB_BAG_40; case ITEM_NONE:
return GI_BOMB_BAG_20;
case ITEM_BOMB_BAG_20:
return GI_BOMB_BAG_30;
case ITEM_BOMB_BAG_30:
return GI_BOMB_BAG_40;
}
case PROGRESSIVE_STRENGTH_UPGRADE: case PROGRESSIVE_STRENGTH_UPGRADE:
// todo make it progressive switch (CUR_UPG_VALUE(3)) {
return GI_GAUNTLETS_GOLD; case 0:
return GI_BRACELET;
case 1:
return GI_GAUNTLETS_SILVER;
case 2:
return GI_GAUNTLETS_GOLD;
}
case PROGRESSIVE_SCALE: case PROGRESSIVE_SCALE:
// todo make it progressive switch (CUR_UPG_VALUE(2)) {
return GI_SCALE_GOLD; case 0:
return GI_SCALE_SILVER;
case 1:
return GI_SCALE_GOLD;
}
case STONE_OF_AGONY: case STONE_OF_AGONY:
return GI_STONE_OF_AGONY; return GI_STONE_OF_AGONY;
case GERUDO_MEMBERSHIP_CARD: case GERUDO_MEMBERSHIP_CARD:
@ -615,13 +637,23 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet) {
case SMALL_KEY_WATER_TEMPLE: case SMALL_KEY_WATER_TEMPLE:
return GI_KEY_SMALL; return GI_KEY_SMALL;
case MAGIC_METER: case MAGIC_METER:
// todo make it progressive switch (gSaveContext.magicLevel) {
return GI_MAGIC_LARGE; case 0:
return GI_MAGIC_SMALL;
case 1:
return GI_MAGIC_LARGE;
}
case PROGRESSIVE_WALLET: case PROGRESSIVE_WALLET:
// todo make it progressive switch (CUR_UPG_VALUE(4)) {
return GI_WALLET_GIANT; case 0:
return GI_WALLET_ADULT;
case 1:
return GI_WALLET_GIANT;
}
case RECOVERY_HEART: case RECOVERY_HEART:
return GI_HEART; return GI_HEART;
case RUPEE_1:
return GI_RUPEE_GREEN;
case RUPEES_5: case RUPEES_5:
return GI_RUPEE_BLUE; return GI_RUPEE_BLUE;
case RUPEES_20: case RUPEES_20:
@ -655,11 +687,19 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet) {
case PIECE_OF_HEART_TREASURE_CHEST_GAME: case PIECE_OF_HEART_TREASURE_CHEST_GAME:
return GI_HEART_PIECE_WIN; return GI_HEART_PIECE_WIN;
case DEKU_STICK_CAPACITY: case DEKU_STICK_CAPACITY:
// todo make it progressive switch (CUR_UPG_VALUE(6)) {
return GI_STICK_UPGRADE_30; case 0:
return GI_STICK_UPGRADE_20;
case 1:
return GI_STICK_UPGRADE_30;
}
case DEKU_NUT_CAPACITY: case DEKU_NUT_CAPACITY:
// todo make it progressive switch (CUR_UPG_VALUE(7)) {
return GI_NUT_UPGRADE_40; case 0:
return GI_NUT_UPGRADE_30;
case 1:
return GI_NUT_UPGRADE_40;
}
case RUTOS_LETTER: case RUTOS_LETTER:
return GI_LETTER_RUTO; return GI_LETTER_RUTO;
case ARROWS_5: case ARROWS_5: