Commit Graph

136 Commits

Author SHA1 Message Date
Pistonight 64122c55bf Rename PouchItem::CookData::getStaminaRecoverValue -> getEffectDurationFrames 2024-12-25 23:12:14 -08:00
ThePixelGamer de0fd08acc Update libraries and adjust code to match again 2024-07-26 18:00:57 -05:00
Braylon Mooney 726d8a2b31
Add reportGetitem (#128) 2024-04-23 00:40:30 +01:00
Léo Lam 4740104abd
PlayReport: implement getQuestId() 2024-04-22 05:38:55 +01:00
Braylon Mooney b4ac2f91d4
reportQuestStep (#126) 2024-04-22 01:59:51 +01:00
bomba1749 f62a726266
most of AirOctaFlyUp is done, some of AirOctaDataMgr is done (#121) 2024-03-18 01:44:47 +00:00
Pistonight dd506b160e rename CookData and WeaponData fields 2024-03-09 00:45:00 -08:00
Kinak338 fe9558b931
PauseMenuDataMgr: use better variable names (#123) 2023-09-03 15:45:37 +01:00
Martin Aguayo 78fd3c6e7a
Add uking::ai::ActorWaterDepthSelect functions (#117) 2023-05-14 15:01:16 +01:00
Briggs Baltzell 2340dc7bc0
Implement CookingMgr class (#113)
* Added CookingMgr fields and started on ctor

* Implemented CookItem::copy

* Implemented CookingMgr dtor

* Marked CookingMgr createInstance as matching

* Implemented CookingMgr::getCookItem

* Added CookingMgr::cook decl

* Added CookingMgr method decls

* Replaced part of CookingMgr with sead::FixedObjArray

* Added line separators in cookManager.h

* Defined structs Ingredient and BoostArg in CookingMgr

* Defined structs CookArg and CookIngredient

* Renamed some fields of CookingMgr

* Added struct CookingMgr::CookingEffectEntry

* Started implementing CookingMgr::init

* Set more entries in init

* Set field _548

* Set field default values in init

* Loaded string values from config

* Set mCookingEffectEntries in init

* Added conditional mConfig allocation

* Added FixedTreeMap class to sead

* Used FixedTreeMap in CookingMgr

* Set CookingMgr constructor to default and marked it as matching

* Removed field _31C from CookingMgr

* Updated sead

* Cleared _548 before filling

* Used name hash for _548 keys

* Fixed path setup

* Changed type of _548 to sead::FixedTreeMap<u32, u32, 13>

* Set mNMSSR to correct values

* Fixed field init order

* Rearranged variables

* Swapped entry_hash comparisons

* Changed CRC32 names and index values

* Cast i to u64

* Renamed static crc32 variables

* Renamed _548 to mCookingEffectNameIdMap

* Marked static vars as const and used decimal numbers

* Used sead::SafeArray for mNMMR and mNMSSR

* Rearranged mNMMR and mNMSSR conditions

* Removed size check from mNMMR and mNMSSR conditions

* Removed size check from CEI conditions

* Renamed mRes2 to mResHandle

* Renamed cook args

* Moved crc32 statics into Constants struct

* Marked CookingMgr::init as matching

* Renamed Constants to Crc32Constants

* Added cookFail and cookFailForMissingConfig

* Added NumIngredientsMax, NumEffects, and NumEffectSlots constants

* Renamed getCookItem to setCookItem

* Renamed x to getCookItem

* Implemented getCookItem

* Made setCookItem take a const ref

* Decompiled cookCalcItemPrice

* Marked cookCalcItemPrice as const

* Fixed both cookFail and cookFailForMissingConfig

* Added CookItem::reset

* Added CookingMgr::resetCookItem

* Moved ctor and dtor below static variables

* Changed cookFailForMissingConfig arg to sead::SafeString

* Started on cookCalcBoost

* Moved CookItem into cookManager.h

* Moved Cooking into Game

* Moved CookingMgr to uking namespace

* Inlined CookItem::reset

* Renamed CookItem members

* Fixed CookItem mangled names in uking_functions.csv

* Added enum class CookEffectId

* Moved CookingMgr ctor below disposer impl

* Updated sead

* Started on cookHandleBoostSuccessInner

* Made changes to cookCalcBoost and cookHandleBoostSuccessInner

* Extracted cookHandleBoostMonsterExtractInner

* Removed found_monster_extract in cookCalcBoost

* Marked cookCalcBoost as matching

* Got cookHandleBoostMonsterExtractInner matching

* Made changes to cookHandleBoostSuccessInner

* Renamed discriminator to bonus in cookHandleBoostSuccessInner

* Added CookingMgr::cookCalcSpiceBoost

* Made changes to CookingMgr::cookCalcSpiceBoost

* Added CookingMgr::cookCalcPotencyBoost

* Mostly matched CookingMgr::cookCalcPotencyBoost

* Added CookingMgr::getCookEffectId

* Used getCookEffectId in cookCalcPotencyBoost

* Set access modifiers in CookingMgr

* Made cookCalcPotencyBoost const-correct

* Marked global init as mismatching

* Renamed CookingMgr functions in uking_functions.csv

* Added CookingMgr::prepareCookArg

* Added IngredientArray type

* Added cookWithItems

* Added CookingMgr::prepareCookArg

* Fixed getCookEffectId

* Fixed cookCalcPotencyBoost

* Made changes to prepareCookArg

* Got cookWithItems matching

* Marked vars const

* Removed commented-out destructor and UnkItem

* Renamed CookIngredient._58 to count

* Started on CookingMgr::cook

* Extracted cookAdjustItem

* Fixed ingredient setup

* Extracted actor_info_data

* Fixed some control flow for single ingredients

* Fixed more control flow for single ingredients

* Handled no effect and empty actor name

* Renamed Ingredient::_10 to used_in_recipe

* Fixed recipe control flow

* Matched cookAdjustItem

* Fixed InfoData instance uses

* Removed BAD_RECIPE label

* Rearranged to remove goto

* Added cookCalcRecipeBoost

* Extracted getCookEffectId

* Extracted isCookFailure and isMedicine

* Extracted getCookEffectIdFromTreeMap

* Extracted findIngredientByName and findIngredientByTag

* Marked nonmatching functions

* Added resetArgCookData

* Matched resetArgCookData and prepareCookArg

* Added fields and handleMessage to CookPotRoot

* Started on CookPotRoot::init_

* Added hasMonsterExtract

* Added to CookPotRoot::handleMessage_

* Removed Ingredient::_4 field

* Renamed CookItem::_224 to is_crit

* Renamed CookingEffectEntry members

* Renamed CookingMgr fields

* Changed comparison in cook

* Renamed actor_tag_iter to hash_iter and added num checks

* Got cookCalcSpiceBoost closer to matching

* Removed int_val init from cookCalcSpiceBoost

* Inlined actor_data

* Added `using namespace ksys::act`

* Moved int_val outside loop

* Marked cookCalcSpiceBoost as matching

* Rearranged cookHandleBoostSuccessInner

* Renamed cookCalcPotencyBoost to cookCalcIngredientsBoost

* Renamed stamina_recover to vitality_boost

* Renamed CookItem args to cook_item

* Renamed cookFailForMissingConfig arg

* Used IngredientArray in findIngredient functions

* Renamed crit functions

* Renamed getCookEffectId arg

* Renamed getCookEffectId to getCookEffectIdByName

* Added SetCookItemInDemo::oneShot_

* Matched SetCookItemInDemo::oneShot_

* Added comment about CookArg constructor and formatted

* Removed TODO from CookingMgr

* Marked WIP functions as non-matching

* Fixed formatting

* Matched sead::SafeArray<uking::CookIngredient, 5>::SafeArray

* Added BoostArg default member initializers

* Used auto for cooking_mgr in CookPotRoot::handleMessage_

* Used designated initializers for boost_arg and added whitespace

* Used angle brackets for sead import

* Removed [[maybe_unused]] from declaration

* Used safeDelete

* Inverted condition in CookingMgr::cookCalcCritBoost

* Added getCookingEffectEntry getter and moved CookingEffectEntry up

* Cleaned up CookingMgr::cookCalcSpiceBoost

* Used loops to init ingredient num members

* Converted CookingMgr fields to s32

* Cleaned up CookingMgr::cookCalcItemPrice

* Renamed CookItem::item_price to sell_price

* Used min and max in CookingMgr::cookCalcItemPrice

* Inlined count vars in CookingMgr::cookCalcItemPrice

* Removed explicit casts in CookingMgr::cookCalcItemPrice

* Cleaned up and reformatted CookingMgr::cookCalcIngredientsBoost

* Added casts back into CookingMgr::cookCalcItemPrice to silence warnings
2023-01-27 18:30:24 +01:00
Tonycons-dev 50469a43fc
Add uking::PlayReport (#112) 2023-01-22 18:17:04 +01:00
oxixes a7c8d40275
Implement FadeProgress class (#110) 2023-01-08 00:49:25 +01:00
Léo Lam 2616802996
ksys/act: Clean up RootAiFlag/RootAiFlag2 definitions and usage 2022-12-22 14:35:08 +01:00
Léo Lam 7934e14ad6
ksys/phys: Use named bools in RigidBody to improve call site readability 2022-12-17 22:10:38 +01:00
notyourav 2f62d26424
Decompile some Action classes (#104)
* various action classes

* rename instanceset fns

* rename isFork -> isChangeable
2022-10-18 08:27:57 +02:00
louist103 0bdc0c7611
Decompile most of E3mgr (#101) 2022-10-09 11:21:08 +02:00
Léo Lam 5b40c220e5
Fix extra semicolons and enable -Wextra-semi warning 2022-06-24 14:54:21 +02:00
theo3 3d1cb480c2 auto placement work 2022-03-16 17:54:50 -07:00
theo3 20f0a07ab0 AddAutoPlacementCreator action 2022-03-15 22:59:38 -07:00
Léo Lam b3b97a93aa
UI/PauseMenuDataMgr: Use getItems() instead of mItemLists.list1 2022-02-27 23:34:55 +01:00
Léo Lam 63bf3d2fa4
Match PauseMenuDataMgr::removeGrabbedItem 2022-02-27 23:32:51 +01:00
Léo Lam a1fd80bd1c
Rename PauseMenuDataMgr addGrabbedItem to removeGrabbedItem
The previous name was completely wrong, whoops.
2022-02-27 22:50:55 +01:00
Léo Lam df36d65665
Revert "Add #ifdef declarations for NON_MATCHING code"
This reverts commit 42807160cf.

It makes searching for NON_MATCHING comment descriptions much less
convenient in most text editors or IDEs, and we want the function
CSV to be the single source of truth for function statuses. Having
a function marked as matching but not built because of a stray #ifdef
would be bad.
2022-02-27 12:50:52 +01:00
savage13 a564186002
Add PauseMenuDataMgr::grabbedItemStuff() (#88) 2022-02-26 22:42:09 +01:00
savage13 17750b5225
Add PauseMenuDataMgr::x_28 (#87) 2022-02-26 16:29:50 +01:00
savage13 9d35c385f9
Match two small functions in PauseMenuDataMgr (#86) 2022-02-26 15:01:44 +01:00
savage13 4e21ee7613
getDragonItemDropPosition (#84)
getDragonItemDropPosition - NON_MATCHING fadd arguments mismatch
2022-02-19 13:32:13 +01:00
Léo Lam 97f3d2943b
Game: Finish HardModeManager 2022-02-09 19:36:26 +01:00
Léo Lam d893fd5ead
Remove unnecessary usages of sead::StorageFor
Turns out they are just value-initialised aggregates.
2022-02-08 22:11:09 +01:00
Léo Lam 28515aceb5
ksys/act/AI: Take const ref for messages 2021-10-16 20:20:58 +02:00
Léo Lam 9b4af6eb00
ksys/act/AI: Rename AI handleMessage2_ and fix parameter type 2021-10-16 20:20:55 +02:00
AlexApps99 42807160cf
Add #ifdef declarations for NON_MATCHING code 2021-07-26 23:05:19 +12:00
Léo Lam c808135ef1
query: Fix matching issue in CheckRupee 2021-07-06 00:04:02 +02:00
theo3 60dd80779a match some ai::Query 2021-07-01 21:05:10 -07:00
MonsterDruide1 cd6716c3ed uking/query: Add queryCheckCurseRRetryEverOnce 2021-06-21 17:50:44 +02:00
MonsterDruide1 adcad916b7 uking/action: Add actionCurseRRematchCount 2021-06-21 17:50:00 +02:00
MonsterDruide1 0e4c71bfd8 Decompiled aoc3/ChampionBalladManager
Change getBlightRematchCount to s8

Fixing review messages

Decompiled aoc3/ChampionBalladManager
2021-06-21 14:20:32 +02:00
Léo Lam dd0cc52ce9
ksys: Move ActorParam classes into separate folder to declutter Resource/ 2021-06-15 18:04:39 +02:00
Léo Lam 66ae62d4d1
lib: Update EventFlow 2021-05-24 20:42:50 +02:00
Léo Lam c95a79bbc1
Rename aoc2 to HardModeManager
It seems to have been called HardModeManager according to a leftover
context name for loading Aoc/0010/Ecosystem/HardMode.byml
(which also doesn't exist anymore).
2021-04-20 12:08:07 +02:00
Léo Lam d253711d1b
Fix formatting issues 2021-04-11 16:10:22 +02:00
Léo Lam 9610122939
ai: Fix GameDataFlagSelector destructor 2021-04-07 21:27:14 +02:00
Léo Lam e3b3ebe165
ai: Implement GameDataFlagSelector 2021-04-07 21:25:38 +02:00
Léo Lam d0d5832c8d
ai: Implement Fork*AI* 2021-04-07 20:58:23 +02:00
Léo Lam 3dc1988b02
ai: Implement ForkAI 2021-04-07 20:54:25 +02:00
Léo Lam 88f69b04ec
action: Implement Fork 2021-04-07 19:25:02 +02:00
Léo Lam 2cf1e01137
ksys/gdt: Implement more TriggerParam functions and StageInfo 2021-04-07 18:46:55 +02:00
Léo Lam d3d474b969
ksys/res: Give better names to Handle flags and status enum values 2021-03-31 01:11:13 +02:00
Léo Lam a7868ad340
Implement aoc::Manager::setGameDataFlags 2021-03-28 21:55:46 +02:00
Léo Lam c3528b3911
Implement most of aocManager
And fix FileDevicePrefix's userdata param type
2021-03-28 21:19:55 +02:00