mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-25 10:52:19 -05:00
Code Issues Projects Releases Wiki Activity

Update to RCObjects (#3193)

Browse Source 
* Add `vanillaCheck` to `RandomizerCheckObjects` and update the `RCObjects` table and macro.

Update `ogItemId` for many checks.

* Rename `vanillaCheck` to `vanillaHundoCheck`.

* baguette

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

* Bean Salesman should be true for `vanillaHundoCheck`

* One more rename to `vanillaCompletion` to avoid possible confusion with 100% speedrun conditions.

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
This commit is contained in:
Malkierian 2023-09-16 13:59:03 -07:00 committed by GitHub
parent c11a6a17e9
commit 533f29bce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 737 additions and 752 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1484
soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
View File

File diff suppressed because it is too large Load Diff

5
soh/soh/Enhancements/randomizer/randomizer_check_objects.h
View File

@ -9,8 +9,8 @@ enum SceneID : int;
#define TWO_ACTOR_PARAMS(a, b) (abs(a) << 16) | abs(b) #define TWO_ACTOR_PARAMS(a, b) (abs(a) << 16) | abs(b)
#define RC_OBJECT(rc, rc_v_or_mq, rc_type, rc_area, actor_id, scene_id, actor_params, og_item_id, rc_shortname, rc_spoilername) \ #define RC_OBJECT(rc, rc_v_or_mq, rc_type, rc_area, actor_id, scene_id, actor_params, og_item_id, rc_shortname, rc_spoilername, vanillaCompletion) \
{ rc, {rc, rc_v_or_mq, rc_type, rc_area, actor_id, scene_id, actor_params, og_item_id, false, rc_shortname, rc_spoilername} } { rc, {rc, rc_v_or_mq, rc_type, rc_area, actor_id, scene_id, actor_params, og_item_id, false, rc_shortname, rc_spoilername, vanillaCompletion} }
typedef struct { typedef struct {
RandomizerCheck rc; RandomizerCheck rc;
@ -24,6 +24,7 @@ typedef struct {
bool visibleInImgui; bool visibleInImgui;
std::string rcShortName; std::string rcShortName;
std::string rcSpoilerName; std::string rcSpoilerName;
bool vanillaCompletion;
} RandomizerCheckObject; } RandomizerCheckObject;
namespace RandomizerCheckObjects { namespace RandomizerCheckObjects {