Refactor shop code to use generic Item (#536)
* Turned SpriteObject into a member of JokerObject and CardObject and expiremented with casting * Extracted shop code to use generic `SpriteObject` * Extracted shop joker generation to a function * Renamed object -> item * Added setters and getters for `SpriteObject` members and updated all accesses to use them with casting (AI used for tedious work and reviewed - model Raptor mini) * Added sprite_object_set_vx() because sprite_object_set_vy() exists and reordered the function order to have x,y parameters first, then targets * Added Item object to act as a purchasable interface for the shop - AI used (model Raptor mini) * Added -fms-extensions and switched to anonymous inheritance * Fixed anonymous inheritance for joker and added direct access for that too * fix build error from previous commit + clang-format * Fixed build errors + clang-format for real this time (I hope...) * clang-format one last time, I don't understand it anymore * clang-format is annoying * Added uses of CHECK_NULL_ARG macros * Merged item_defs.h into item.h and fixed build error from previous commit * clang-format...? * Changed sprite_object_new() into sprite_object_init() and made it accept a parameter instead of returning one to make it less awkward * Updated sprite_object_init() documentation * Updated sprite_object_destroy documentation * More clang-format * Renamed add_to_inventory to acquire and updated documentation * Added function documentations * Update documentation + swap order of consumable and playing card types * Added documentation for new files (+ small addition to button.h) * clang-format * Used typedef * A bit more documentation * Changed sho pcode to use generic Item instead of SpriteObject * clang-format + fixed NULL-check error * Revert weird clang-format...? * clang-format for real * Fixed errors from rebase on log_function_name * Fixed build errors from rebase on main * Added some more documentation about first member struct inheritance * typo fix * typo fix for real * Removed SpriteObject field getters/setters (AI used - model Raptor mini) * Renamed item_acquire -> item_on_acquired * Added item_can_acquire() * clang-format * Fixed some sprite issues but not all... * Fixed some more issues * Cleanup JokerObject some more JokerObjects in the shop * Added `item_destroy()` * Added item_set_available_to_shop, CHECK_ITEM_TYPE macros + small documentation updates * Another small JokerObject->Item replacement * Removed item_set_available_to_shop and replaced with item_roll_new() and item_dispose(), also changed "available_to_shop" semantics to "rollable" * Re-applied changes from game.c to round.c after rebase on main * Added partial implementations of item functions for playing cards * Line endings fix... * Macro renames, function documentations * Updated documentations * Apply fixes from Copilot review Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Fix card_object_get_buy_price type checking Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Avoid double pointer cast on dispose Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Apply suggestions from @ricfehr3's code review Co-authored-by: Rickey <ric@rf3.xyz> * Remove redundant comments * Moved error checking before joker_get_random_rarity Co-authored-by: Rickey <ric@rf3.xyz> * Fixed build error from rebase * clang-format * Added doxygen documentation for Item explaining inheritance * Removed unnecessary comment --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Rickey <ric@rf3.xyz>
This commit is contained in:
co-authored by
Copilot Autofix powered by AI
Rickey
parent
369c680cb7
commit
d24b0b5619
+11
-4
@@ -253,10 +253,10 @@ static inline void discarded_jokers_update_loop(void)
|
||||
|
||||
while ((joker_object = list_itr_next(&itr)))
|
||||
{
|
||||
if (joker_object->sprite_object->x == joker_object->sprite_object->tx &&
|
||||
joker_object->sprite_object->y == joker_object->sprite_object->ty)
|
||||
if (joker_object->x == joker_object->tx && joker_object->y == joker_object->ty)
|
||||
{
|
||||
list_itr_remove_current_node(&itr);
|
||||
// TODO: joker_object_dispose() instead?
|
||||
joker_object_destroy(&joker_object);
|
||||
}
|
||||
}
|
||||
@@ -282,11 +282,17 @@ static inline void held_jokers_update_loop(void)
|
||||
{
|
||||
// Let the Shop handle the position of this Joker
|
||||
if (joker != game_shop_get_description_card())
|
||||
joker->sprite_object->tx = hand_x - int2fx(spacing_lut[jokers_top][i]);
|
||||
joker->tx = hand_x - int2fx(spacing_lut[jokers_top][i]);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
bool joker_object_can_acquire(Item* joker_object)
|
||||
{
|
||||
GBAL_RETURN_IF_NULL_RET(joker_object, false);
|
||||
return (list_get_len(get_jokers_list()) < MAX_JOKERS_HELD_SIZE);
|
||||
}
|
||||
|
||||
static inline void expired_jokers_update_loop(void)
|
||||
{
|
||||
if (list_is_empty(&_expired_jokers_list))
|
||||
@@ -429,7 +435,8 @@ void remove_owned_joker(int owned_joker_idx)
|
||||
shortcut_joker_count--;
|
||||
}
|
||||
|
||||
game_shop_set_joker_avail(joker_object->joker->id, true);
|
||||
// TODO: Move to site of joker_destroy()?
|
||||
joker_set_rollable(joker_object->joker->id, true);
|
||||
list_remove_at_idx(&_owned_jokers_list, owned_joker_idx);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user