From 0d9117c1b8c82a45746bbd937435700dc563996c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Fri, 22 Jan 2021 16:13:01 +0100 Subject: [PATCH] ksys/act: Add remaining actInfoCommon functions --- data/uking_functions.csv | 146 +++--- src/KingSystem/ActorSystem/actInfoCommon.cpp | 503 +++++++++++++++++++ src/KingSystem/ActorSystem/actInfoCommon.h | 188 +++++++ src/KingSystem/ActorSystem/actInfoCommon.py | 73 +++ 4 files changed, 837 insertions(+), 73 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index d1e50a60..24780ae5 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -73281,83 +73281,83 @@ 0x0000007100d2d934,ActorInfoData::getMasterSwordSearchEvilDist,20,_ZN4ksys3act28getMasterSwordSearchEvilDistEPNS0_8InfoDataEPKc 0x0000007100d2d948,ActorInfoData::getMasterSwordSleepActorName,24,_ZN4ksys3act28getMasterSwordSleepActorNameEPNS0_8InfoDataEPKc 0x0000007100d2d960,ActorInfoData::getMasterSwordTrueFormActorName,24,_ZN4ksys3act31getMasterSwordTrueFormActorNameEPNS0_8InfoDataEPKc -0x0000007100d2d978,ActorInfoData::getArmorStarNum,20, -0x0000007100d2d98c,act::getArmorStarNum,20, -0x0000007100d2d9a0,ActorInfoData::getArmorDefenceAddLevel,20, -0x0000007100d2d9b4,act::getArmorDefenceAddLevel,20, -0x0000007100d2d9c8,ActorInfoData::getArmorNextRankName,24, -0x0000007100d2d9e0,act::getArmorNextRankName,24, -0x0000007100d2d9f8,sub_7100D2D9F8,72, -0x0000007100d2da40,act::getArmorEffectEffectType,72, -0x0000007100d2da88,ActorInfoData::getArmorEffectEffectLevel,20, -0x0000007100d2da9c,act::getArmorEffectEffectLevel,20, -0x0000007100d2dab0,sub_7100D2DAB0,20, -0x0000007100d2dac4,act::getArmorEffectAncientPowUp,20, -0x0000007100d2dad8,sub_7100D2DAD8,20, -0x0000007100d2daec,sub_7100D2DAEC,20, -0x0000007100d2db00,ActorInfoData::x_2,20, -0x0000007100d2db14,sub_7100D2DB14,20, -0x0000007100d2db28,sub_7100D2DB28,20, -0x0000007100d2db3c,sub_7100D2DB3C,24, -0x0000007100d2db68,sub_7100D2DB68,20, -0x0000007100d2db7c,ActorInfoData::getItemBuyingPrice,20, -0x0000007100d2db90,sub_7100D2DB90,20, +0x0000007100d2d978,ActorInfoData::getArmorStarNum,20,_ZN4ksys3act15getArmorStarNumEPNS0_8InfoDataEPKc +0x0000007100d2d98c,act::getArmorStarNum,20,_ZN4ksys3act15getArmorStarNumERKN2al9ByamlIterE +0x0000007100d2d9a0,ActorInfoData::getArmorDefenceAddLevel,20,_ZN4ksys3act23getArmorDefenceAddLevelEPNS0_8InfoDataEPKc +0x0000007100d2d9b4,act::getArmorDefenceAddLevel,20,_ZN4ksys3act23getArmorDefenceAddLevelERKN2al9ByamlIterE +0x0000007100d2d9c8,ActorInfoData::getArmorNextRankName,24,_ZN4ksys3act20getArmorNextRankNameEPNS0_8InfoDataEPKc +0x0000007100d2d9e0,act::getArmorNextRankName,24,_ZN4ksys3act20getArmorNextRankNameERKN2al9ByamlIterE +0x0000007100d2d9f8,sub_7100D2D9F8,72,_ZN4ksys3act24getArmorEffectEffectTypeEPNS0_8InfoDataEPKc +0x0000007100d2da40,act::getArmorEffectEffectType,72,_ZN4ksys3act24getArmorEffectEffectTypeERKN2al9ByamlIterE +0x0000007100d2da88,ActorInfoData::getArmorEffectEffectLevel,20,_ZN4ksys3act25getArmorEffectEffectLevelEPNS0_8InfoDataEPKc +0x0000007100d2da9c,act::getArmorEffectEffectLevel,20,_ZN4ksys3act25getArmorEffectEffectLevelERKN2al9ByamlIterE +0x0000007100d2dab0,sub_7100D2DAB0,20,_ZN4ksys3act26getArmorEffectAncientPowUpEPNS0_8InfoDataEPKc +0x0000007100d2dac4,act::getArmorEffectAncientPowUp,20,_ZN4ksys3act26getArmorEffectAncientPowUpERKN2al9ByamlIterE +0x0000007100d2dad8,sub_7100D2DAD8,20,_ZN4ksys3act34getArmorEffectEnableClimbWaterfallEPNS0_8InfoDataEPKc +0x0000007100d2daec,sub_7100D2DAEC,20,_ZN4ksys3act30getArmorEffectEnableSpinAttackEPNS0_8InfoDataEPKc +0x0000007100d2db00,ActorInfoData::x_2,20,_ZN4ksys3act22getArmorHeadMantleTypeEPNS0_8InfoDataEPKc +0x0000007100d2db14,sub_7100D2DB14,20,_ZN4ksys3act30getArmorUpperDisableSelfMantleEPNS0_8InfoDataEPKc +0x0000007100d2db28,sub_7100D2DB28,20,_ZN4ksys3act26getArmorUpperUseMantleTypeEPNS0_8InfoDataEPKc +0x0000007100d2db3c,sub_7100D2DB3C,24,_ZN4ksys3act24getSeriesArmorSeriesTypeEPNS0_8InfoDataEPKc +0x0000007100d2db68,sub_7100D2DB68,20,_ZN4ksys3act19getItemSellingPriceEPNS0_8InfoDataEPKc +0x0000007100d2db7c,ActorInfoData::getItemBuyingPrice,20,_ZN4ksys3act18getItemBuyingPriceEPNS0_8InfoDataEPKc +0x0000007100d2db90,sub_7100D2DB90,20,_ZN4ksys3act20getItemCreatingPriceEPNS0_8InfoDataEPKc 0x0000007100d2dba4,ActorInfoData::getItemStainColor,20,_ZN4ksys3act17getItemStainColorEPNS0_8InfoDataEPKc -0x0000007100d2dbb8,ActorInfoData::getItemSaleRevivalCount,20, -0x0000007100d2dbcc,sub_7100D2DBCC,24, -0x0000007100d2dbe4,sub_7100D2DBE4,20, -0x0000007100d2dbf8,sub_7100D2DBF8,20, -0x0000007100d2dc0c,sub_7100D2DC0C,20, -0x0000007100d2dc20,sub_7100D2DC20,20, +0x0000007100d2dbb8,ActorInfoData::getItemSaleRevivalCount,20,_ZN4ksys3act23getItemSaleRevivalCountEPNS0_8InfoDataEPKc +0x0000007100d2dbcc,sub_7100D2DBCC,24,_ZN4ksys3act23getItemUseIconActorNameEPNS0_8InfoDataEPKc +0x0000007100d2dbe4,sub_7100D2DBE4,20,_ZN4ksys3act18getRupeeRupeeValueEPNS0_8InfoDataEPKc +0x0000007100d2dbf8,sub_7100D2DBF8,20,_ZN4ksys3act16getArrowArrowNumEPNS0_8InfoDataEPKc +0x0000007100d2dc0c,sub_7100D2DC0C,20,_ZN4ksys3act30getArrowEnemyShootNumForDeleteEPNS0_8InfoDataEPKc +0x0000007100d2dc20,sub_7100D2DC20,20,_ZN4ksys3act22getArrowArrowDeletePerEPNS0_8InfoDataEPKc 0x0000007100d2dc34,ActorInfoData::getCureItemHitPointRecover,20,_ZN4ksys3act26getCureItemHitPointRecoverEPNS0_8InfoDataEPKc 0x0000007100d2dc48,act::getCureItemHitPointRecover,20,_ZN4ksys3act26getCureItemHitPointRecoverERKN2al9ByamlIterE -0x0000007100d2dc5c,act::getCureItemEffectiveTime,20, -0x0000007100d2dc70,sub_7100D2DC70,24, -0x0000007100d2dc88,sub_7100D2DC88,24, -0x0000007100d2dca0,sub_7100D2DCA0,24, -0x0000007100d2dcb8,sub_7100D2DCB8,24, -0x0000007100d2dcd0,sub_7100D2DCD0,24, -0x0000007100d2dce8,sub_7100D2DCE8,24, -0x0000007100d2dd00,sub_7100D2DD00,24, -0x0000007100d2dd18,sub_7100D2DD18,24, -0x0000007100d2dd30,sub_7100D2DD30,24, -0x0000007100d2dd48,sub_7100D2DD48,24, -0x0000007100d2dd60,sub_7100D2DD60,24, -0x0000007100d2dd78,sub_7100D2DD78,24, -0x0000007100d2dd90,sub_7100D2DD90,24, -0x0000007100d2dda8,sub_7100D2DDA8,24, -0x0000007100d2ddc0,sub_7100D2DDC0,24, -0x0000007100d2ddd8,sub_7100D2DDD8,24, -0x0000007100d2ddf0,sub_7100D2DDF0,24, -0x0000007100d2de08,sub_7100D2DE08,24, -0x0000007100d2de20,sub_7100D2DE20,24, -0x0000007100d2de38,sub_7100D2DE38,24, -0x0000007100d2de50,sub_7100D2DE50,24, -0x0000007100d2de68,sub_7100D2DE68,24, -0x0000007100d2de80,sub_7100D2DE80,24, -0x0000007100d2de98,sub_7100D2DE98,24, -0x0000007100d2deb0,sub_7100D2DEB0,24, -0x0000007100d2dec8,sub_7100D2DEC8,24, -0x0000007100d2dee0,sub_7100D2DEE0,24, -0x0000007100d2def8,sub_7100D2DEF8,24, -0x0000007100d2df10,sub_7100D2DF10,24, -0x0000007100d2df28,sub_7100D2DF28,24, -0x0000007100d2df40,sub_7100D2DF40,24, -0x0000007100d2df58,sub_7100D2DF58,24, -0x0000007100d2df70,sub_7100D2DF70,24, -0x0000007100d2df88,sub_7100D2DF88,24, -0x0000007100d2dfa0,ActorInfoData::getHorseASVariation,72, -0x0000007100d2dfe8,ActorInfoData::getHorseNature,20, -0x0000007100d2dffc,sub_7100D2DFFC,20, -0x0000007100d2e010,ActorInfoData::getHorseUnitRiddenAnimalType,20, -0x0000007100d2e024,ActorInfoData::getMonsterShopBuyMamo,20, -0x0000007100d2e038,sub_7100D2E038,20, +0x0000007100d2dc5c,act::getCureItemEffectiveTime,20,_ZN4ksys3act24getCureItemEffectiveTimeERKN2al9ByamlIterE +0x0000007100d2dc70,sub_7100D2DC70,24,_ZN4ksys3act29getTravelerAppearGameDataNameEPNS0_8InfoDataEPKc +0x0000007100d2dc88,sub_7100D2DC88,24,_ZN4ksys3act29getTravelerDeleteGameDataNameEPNS0_8InfoDataEPKc +0x0000007100d2dca0,sub_7100D2DCA0,24,_ZN4ksys3act20getTravelerRouteTypeERKN2al9ByamlIterE +0x0000007100d2dcb8,sub_7100D2DCB8,24,_ZN4ksys3act24getTravelerRideHorseNameEPNS0_8InfoDataEPKc +0x0000007100d2dcd0,sub_7100D2DCD0,24,_ZN4ksys3act26getTravelerRoutePoint0NameERKN2al9ByamlIterE +0x0000007100d2dce8,sub_7100D2DCE8,24,_ZN4ksys3act26getTravelerRoutePoint1NameERKN2al9ByamlIterE +0x0000007100d2dd00,sub_7100D2DD00,24,_ZN4ksys3act26getTravelerRoutePoint2NameERKN2al9ByamlIterE +0x0000007100d2dd18,sub_7100D2DD18,24,_ZN4ksys3act26getTravelerRoutePoint3NameERKN2al9ByamlIterE +0x0000007100d2dd30,sub_7100D2DD30,24,_ZN4ksys3act26getTravelerRoutePoint4NameERKN2al9ByamlIterE +0x0000007100d2dd48,sub_7100D2DD48,24,_ZN4ksys3act26getTravelerRoutePoint5NameERKN2al9ByamlIterE +0x0000007100d2dd60,sub_7100D2DD60,24,_ZN4ksys3act26getTravelerRoutePoint6NameERKN2al9ByamlIterE +0x0000007100d2dd78,sub_7100D2DD78,24,_ZN4ksys3act26getTravelerRoutePoint7NameERKN2al9ByamlIterE +0x0000007100d2dd90,sub_7100D2DD90,24,_ZN4ksys3act26getTravelerRoutePoint8NameERKN2al9ByamlIterE +0x0000007100d2dda8,sub_7100D2DDA8,24,_ZN4ksys3act26getTravelerRoutePoint9NameERKN2al9ByamlIterE +0x0000007100d2ddc0,sub_7100D2DDC0,24,_ZN4ksys3act27getTravelerRoutePoint10NameERKN2al9ByamlIterE +0x0000007100d2ddd8,sub_7100D2DDD8,24,_ZN4ksys3act27getTravelerRoutePoint11NameERKN2al9ByamlIterE +0x0000007100d2ddf0,sub_7100D2DDF0,24,_ZN4ksys3act27getTravelerRoutePoint12NameERKN2al9ByamlIterE +0x0000007100d2de08,sub_7100D2DE08,24,_ZN4ksys3act27getTravelerRoutePoint13NameERKN2al9ByamlIterE +0x0000007100d2de20,sub_7100D2DE20,24,_ZN4ksys3act27getTravelerRoutePoint14NameERKN2al9ByamlIterE +0x0000007100d2de38,sub_7100D2DE38,24,_ZN4ksys3act27getTravelerRoutePoint15NameERKN2al9ByamlIterE +0x0000007100d2de50,sub_7100D2DE50,24,_ZN4ksys3act27getTravelerRoutePoint16NameERKN2al9ByamlIterE +0x0000007100d2de68,sub_7100D2DE68,24,_ZN4ksys3act27getTravelerRoutePoint17NameERKN2al9ByamlIterE +0x0000007100d2de80,sub_7100D2DE80,24,_ZN4ksys3act27getTravelerRoutePoint18NameERKN2al9ByamlIterE +0x0000007100d2de98,sub_7100D2DE98,24,_ZN4ksys3act27getTravelerRoutePoint19NameERKN2al9ByamlIterE +0x0000007100d2deb0,sub_7100D2DEB0,24,_ZN4ksys3act27getTravelerRoutePoint20NameERKN2al9ByamlIterE +0x0000007100d2dec8,sub_7100D2DEC8,24,_ZN4ksys3act27getTravelerRoutePoint21NameERKN2al9ByamlIterE +0x0000007100d2dee0,sub_7100D2DEE0,24,_ZN4ksys3act27getTravelerRoutePoint22NameERKN2al9ByamlIterE +0x0000007100d2def8,sub_7100D2DEF8,24,_ZN4ksys3act27getTravelerRoutePoint23NameERKN2al9ByamlIterE +0x0000007100d2df10,sub_7100D2DF10,24,_ZN4ksys3act27getTravelerRoutePoint24NameERKN2al9ByamlIterE +0x0000007100d2df28,sub_7100D2DF28,24,_ZN4ksys3act27getTravelerRoutePoint25NameERKN2al9ByamlIterE +0x0000007100d2df40,sub_7100D2DF40,24,_ZN4ksys3act27getTravelerRoutePoint26NameERKN2al9ByamlIterE +0x0000007100d2df58,sub_7100D2DF58,24,_ZN4ksys3act27getTravelerRoutePoint27NameERKN2al9ByamlIterE +0x0000007100d2df70,sub_7100D2DF70,24,_ZN4ksys3act27getTravelerRoutePoint28NameERKN2al9ByamlIterE +0x0000007100d2df88,sub_7100D2DF88,24,_ZN4ksys3act27getTravelerRoutePoint29NameERKN2al9ByamlIterE +0x0000007100d2dfa0,ActorInfoData::getHorseASVariation,72,_ZN4ksys3act19getHorseASVariationEPNS0_8InfoDataEPKc +0x0000007100d2dfe8,ActorInfoData::getHorseNature,20,_ZN4ksys3act14getHorseNatureEPNS0_8InfoDataEPKc +0x0000007100d2dffc,sub_7100D2DFFC,20,_ZN4ksys3act24getHorseGearTopChargeNumEPNS0_8InfoDataEPKc +0x0000007100d2e010,ActorInfoData::getHorseUnitRiddenAnimalType,20,_ZN4ksys3act28getHorseUnitRiddenAnimalTypeEPNS0_8InfoDataEPKc +0x0000007100d2e024,ActorInfoData::getMonsterShopBuyMamo,20,_ZN4ksys3act21getMonsterShopBuyMamoEPNS0_8InfoDataEPKc +0x0000007100d2e038,sub_7100D2E038,20,_ZN4ksys3act22getMonsterShopSellMamoEPNS0_8InfoDataEPKc 0x0000007100d2e04c,act::getMonsterShopSellMamo,20,_ZN4ksys3act22getMonsterShopSellMamoERKN2al9ByamlIterE -0x0000007100d2e060,act::getPictureBookLiveSpot1,20, -0x0000007100d2e074,act::getPictureBookLiveSpot2,20, -0x0000007100d2e088,act::getPictureBookSpecialDrop,20, -0x0000007100d2e09c,sub_7100D2E09C,100, -0x0000007100d2e100,sub_7100D2E100,108, +0x0000007100d2e060,act::getPictureBookLiveSpot1,20,_ZN4ksys3act23getPictureBookLiveSpot1ERKN2al9ByamlIterE +0x0000007100d2e074,act::getPictureBookLiveSpot2,20,_ZN4ksys3act23getPictureBookLiveSpot2ERKN2al9ByamlIterE +0x0000007100d2e088,act::getPictureBookSpecialDrop,20,_ZN4ksys3act25getPictureBookSpecialDropERKN2al9ByamlIterE +0x0000007100d2e09c,sub_7100D2E09C,100,_ZN4ksys3act8InfoData18SingletonDisposer_D2Ev +0x0000007100d2e100,sub_7100D2E100,108,_ZN4ksys3act8InfoData18SingletonDisposer_D0Ev 0x0000007100d2e16c,ActorInfoData::createInstance,184,_ZN4ksys3act8InfoData14createInstanceEPN4sead4HeapE 0x0000007100d2e224,sub_7100D2E224,96,_ZN4ksys3act8InfoDataD1Ev 0x0000007100d2e284,sub_7100D2E284,84,_ZN4ksys3act8InfoDataD0Ev diff --git a/src/KingSystem/ActorSystem/actInfoCommon.cpp b/src/KingSystem/ActorSystem/actInfoCommon.cpp index 441cc5c9..879e4f95 100644 --- a/src/KingSystem/ActorSystem/actInfoCommon.cpp +++ b/src/KingSystem/ActorSystem/actInfoCommon.cpp @@ -285,6 +285,22 @@ const char* getMasterSwordTrueFormActorName(const al::ByamlIter& iter) { return InfoData::getStringByKey(iter, "masterSwordTrueFormActorName"); } +int getArmorStarNum(InfoData* data, const char* actor) { + return data->getInt(actor, "armorStarNum"); +} + +int getArmorStarNum(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "armorStarNum"); +} + +int getArmorDefenceAddLevel(InfoData* data, const char* actor) { + return data->getInt(actor, "armorDefenceAddLevel"); +} + +int getArmorDefenceAddLevel(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "armorDefenceAddLevel"); +} + const char* getArmorNextRankName(InfoData* data, const char* actor) { return data->getString(actor, "armorNextRankName"); } @@ -293,6 +309,102 @@ const char* getArmorNextRankName(const al::ByamlIter& iter) { return InfoData::getStringByKey(iter, "armorNextRankName"); } +const char* getArmorEffectEffectType(InfoData* data, const char* actor) { + return data->getString(actor, "armorEffectEffectType", "None"); +} + +const char* getArmorEffectEffectType(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "armorEffectEffectType", "None"); +} + +int getArmorEffectEffectLevel(InfoData* data, const char* actor) { + return data->getInt(actor, "armorEffectEffectLevel"); +} + +int getArmorEffectEffectLevel(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "armorEffectEffectLevel"); +} + +bool getArmorEffectAncientPowUp(InfoData* data, const char* actor) { + return data->getBool(actor, "armorEffectAncientPowUp"); +} + +bool getArmorEffectAncientPowUp(const al::ByamlIter& iter) { + return InfoData::getBoolByKey(iter, "armorEffectAncientPowUp"); +} + +bool getArmorEffectEnableClimbWaterfall(InfoData* data, const char* actor) { + return data->getBool(actor, "armorEffectEnableClimbWaterfall"); +} + +bool getArmorEffectEnableClimbWaterfall(const al::ByamlIter& iter) { + return InfoData::getBoolByKey(iter, "armorEffectEnableClimbWaterfall"); +} + +bool getArmorEffectEnableSpinAttack(InfoData* data, const char* actor) { + return data->getBool(actor, "armorEffectEnableSpinAttack"); +} + +bool getArmorEffectEnableSpinAttack(const al::ByamlIter& iter) { + return InfoData::getBoolByKey(iter, "armorEffectEnableSpinAttack"); +} + +int getArmorHeadMantleType(InfoData* data, const char* actor) { + return data->getInt(actor, "armorHeadMantleType"); +} + +int getArmorHeadMantleType(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "armorHeadMantleType"); +} + +bool getArmorUpperDisableSelfMantle(InfoData* data, const char* actor) { + return data->getBool(actor, "armorUpperDisableSelfMantle"); +} + +bool getArmorUpperDisableSelfMantle(const al::ByamlIter& iter) { + return InfoData::getBoolByKey(iter, "armorUpperDisableSelfMantle"); +} + +int getArmorUpperUseMantleType(InfoData* data, const char* actor) { + return data->getInt(actor, "armorUpperUseMantleType"); +} + +int getArmorUpperUseMantleType(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "armorUpperUseMantleType"); +} + +const char* getSeriesArmorSeriesType(InfoData* data, const char* actor) { + return data->getString(actor, "seriesArmorSeriesType"); +} + +const char* getSeriesArmorSeriesType(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "seriesArmorSeriesType"); +} + +int getItemSellingPrice(InfoData* data, const char* actor) { + return data->getInt(actor, "itemSellingPrice", -1); +} + +int getItemSellingPrice(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "itemSellingPrice", -1); +} + +int getItemBuyingPrice(InfoData* data, const char* actor) { + return data->getInt(actor, "itemBuyingPrice", -1); +} + +int getItemBuyingPrice(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "itemBuyingPrice", -1); +} + +int getItemCreatingPrice(InfoData* data, const char* actor) { + return data->getInt(actor, "itemCreatingPrice", -1); +} + +int getItemCreatingPrice(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "itemCreatingPrice", -1); +} + int getItemStainColor(InfoData* data, const char* actor) { return data->getInt(actor, "itemStainColor", -1); } @@ -301,6 +413,54 @@ int getItemStainColor(const al::ByamlIter& iter) { return InfoData::getIntByKey(iter, "itemStainColor", -1); } +int getItemSaleRevivalCount(InfoData* data, const char* actor) { + return data->getInt(actor, "itemSaleRevivalCount", -1); +} + +int getItemSaleRevivalCount(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "itemSaleRevivalCount", -1); +} + +const char* getItemUseIconActorName(InfoData* data, const char* actor) { + return data->getString(actor, "itemUseIconActorName"); +} + +const char* getItemUseIconActorName(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "itemUseIconActorName"); +} + +int getRupeeRupeeValue(InfoData* data, const char* actor) { + return data->getInt(actor, "rupeeRupeeValue", 1); +} + +int getRupeeRupeeValue(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "rupeeRupeeValue", 1); +} + +int getArrowArrowNum(InfoData* data, const char* actor) { + return data->getInt(actor, "arrowArrowNum"); +} + +int getArrowArrowNum(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "arrowArrowNum"); +} + +int getArrowEnemyShootNumForDelete(InfoData* data, const char* actor) { + return data->getInt(actor, "arrowEnemyShootNumForDelete"); +} + +int getArrowEnemyShootNumForDelete(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "arrowEnemyShootNumForDelete"); +} + +int getArrowArrowDeletePer(InfoData* data, const char* actor) { + return data->getInt(actor, "arrowArrowDeletePer"); +} + +int getArrowArrowDeletePer(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "arrowArrowDeletePer"); +} + int getCureItemHitPointRecover(InfoData* data, const char* actor) { return data->getInt(actor, "cureItemHitPointRecover"); } @@ -309,6 +469,326 @@ int getCureItemHitPointRecover(const al::ByamlIter& iter) { return InfoData::getIntByKey(iter, "cureItemHitPointRecover"); } +int getCureItemEffectiveTime(InfoData* data, const char* actor) { + return data->getInt(actor, "cureItemEffectiveTime"); +} + +int getCureItemEffectiveTime(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "cureItemEffectiveTime"); +} + +const char* getTravelerAppearGameDataName(InfoData* data, const char* actor) { + return data->getString(actor, "travelerAppearGameDataName"); +} + +const char* getTravelerAppearGameDataName(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerAppearGameDataName"); +} + +const char* getTravelerDeleteGameDataName(InfoData* data, const char* actor) { + return data->getString(actor, "travelerDeleteGameDataName"); +} + +const char* getTravelerDeleteGameDataName(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerDeleteGameDataName"); +} + +const char* getTravelerRouteType(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRouteType"); +} + +const char* getTravelerRouteType(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRouteType"); +} + +const char* getTravelerRideHorseName(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRideHorseName"); +} + +const char* getTravelerRideHorseName(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRideHorseName"); +} + +const char* getTravelerRoutePoint0Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint0Name"); +} + +const char* getTravelerRoutePoint0Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint0Name"); +} + +const char* getTravelerRoutePoint1Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint1Name"); +} + +const char* getTravelerRoutePoint1Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint1Name"); +} + +const char* getTravelerRoutePoint2Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint2Name"); +} + +const char* getTravelerRoutePoint2Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint2Name"); +} + +const char* getTravelerRoutePoint3Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint3Name"); +} + +const char* getTravelerRoutePoint3Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint3Name"); +} + +const char* getTravelerRoutePoint4Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint4Name"); +} + +const char* getTravelerRoutePoint4Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint4Name"); +} + +const char* getTravelerRoutePoint5Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint5Name"); +} + +const char* getTravelerRoutePoint5Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint5Name"); +} + +const char* getTravelerRoutePoint6Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint6Name"); +} + +const char* getTravelerRoutePoint6Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint6Name"); +} + +const char* getTravelerRoutePoint7Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint7Name"); +} + +const char* getTravelerRoutePoint7Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint7Name"); +} + +const char* getTravelerRoutePoint8Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint8Name"); +} + +const char* getTravelerRoutePoint8Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint8Name"); +} + +const char* getTravelerRoutePoint9Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint9Name"); +} + +const char* getTravelerRoutePoint9Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint9Name"); +} + +const char* getTravelerRoutePoint10Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint10Name"); +} + +const char* getTravelerRoutePoint10Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint10Name"); +} + +const char* getTravelerRoutePoint11Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint11Name"); +} + +const char* getTravelerRoutePoint11Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint11Name"); +} + +const char* getTravelerRoutePoint12Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint12Name"); +} + +const char* getTravelerRoutePoint12Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint12Name"); +} + +const char* getTravelerRoutePoint13Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint13Name"); +} + +const char* getTravelerRoutePoint13Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint13Name"); +} + +const char* getTravelerRoutePoint14Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint14Name"); +} + +const char* getTravelerRoutePoint14Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint14Name"); +} + +const char* getTravelerRoutePoint15Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint15Name"); +} + +const char* getTravelerRoutePoint15Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint15Name"); +} + +const char* getTravelerRoutePoint16Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint16Name"); +} + +const char* getTravelerRoutePoint16Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint16Name"); +} + +const char* getTravelerRoutePoint17Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint17Name"); +} + +const char* getTravelerRoutePoint17Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint17Name"); +} + +const char* getTravelerRoutePoint18Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint18Name"); +} + +const char* getTravelerRoutePoint18Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint18Name"); +} + +const char* getTravelerRoutePoint19Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint19Name"); +} + +const char* getTravelerRoutePoint19Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint19Name"); +} + +const char* getTravelerRoutePoint20Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint20Name"); +} + +const char* getTravelerRoutePoint20Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint20Name"); +} + +const char* getTravelerRoutePoint21Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint21Name"); +} + +const char* getTravelerRoutePoint21Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint21Name"); +} + +const char* getTravelerRoutePoint22Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint22Name"); +} + +const char* getTravelerRoutePoint22Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint22Name"); +} + +const char* getTravelerRoutePoint23Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint23Name"); +} + +const char* getTravelerRoutePoint23Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint23Name"); +} + +const char* getTravelerRoutePoint24Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint24Name"); +} + +const char* getTravelerRoutePoint24Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint24Name"); +} + +const char* getTravelerRoutePoint25Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint25Name"); +} + +const char* getTravelerRoutePoint25Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint25Name"); +} + +const char* getTravelerRoutePoint26Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint26Name"); +} + +const char* getTravelerRoutePoint26Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint26Name"); +} + +const char* getTravelerRoutePoint27Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint27Name"); +} + +const char* getTravelerRoutePoint27Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint27Name"); +} + +const char* getTravelerRoutePoint28Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint28Name"); +} + +const char* getTravelerRoutePoint28Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint28Name"); +} + +const char* getTravelerRoutePoint29Name(InfoData* data, const char* actor) { + return data->getString(actor, "travelerRoutePoint29Name"); +} + +const char* getTravelerRoutePoint29Name(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "travelerRoutePoint29Name"); +} + +const char* getHorseASVariation(InfoData* data, const char* actor) { + return data->getString(actor, "horseASVariation", "Normal"); +} + +const char* getHorseASVariation(const al::ByamlIter& iter) { + return InfoData::getStringByKey(iter, "horseASVariation", "Normal"); +} + +int getHorseNature(InfoData* data, const char* actor) { + return data->getInt(actor, "horseNature"); +} + +int getHorseNature(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "horseNature"); +} + +int getHorseGearTopChargeNum(InfoData* data, const char* actor) { + return data->getInt(actor, "horseGearTopChargeNum", 3); +} + +int getHorseGearTopChargeNum(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "horseGearTopChargeNum", 3); +} + +int getHorseUnitRiddenAnimalType(InfoData* data, const char* actor) { + return data->getInt(actor, "horseUnitRiddenAnimalType"); +} + +int getHorseUnitRiddenAnimalType(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "horseUnitRiddenAnimalType"); +} + +int getMonsterShopBuyMamo(InfoData* data, const char* actor) { + return data->getInt(actor, "monsterShopBuyMamo"); +} + +int getMonsterShopBuyMamo(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "monsterShopBuyMamo"); +} + int getMonsterShopSellMamo(InfoData* data, const char* actor) { return data->getInt(actor, "monsterShopSellMamo"); } @@ -317,5 +797,28 @@ int getMonsterShopSellMamo(const al::ByamlIter& iter) { return InfoData::getIntByKey(iter, "monsterShopSellMamo"); } +int getPictureBookLiveSpot1(InfoData* data, const char* actor) { + return data->getInt(actor, "pictureBookLiveSpot1", -1); +} + +int getPictureBookLiveSpot1(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "pictureBookLiveSpot1", -1); +} + +int getPictureBookLiveSpot2(InfoData* data, const char* actor) { + return data->getInt(actor, "pictureBookLiveSpot2", -1); +} + +int getPictureBookLiveSpot2(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "pictureBookLiveSpot2", -1); +} + +int getPictureBookSpecialDrop(InfoData* data, const char* actor) { + return data->getInt(actor, "pictureBookSpecialDrop", -1); +} + +int getPictureBookSpecialDrop(const al::ByamlIter& iter) { + return InfoData::getIntByKey(iter, "pictureBookSpecialDrop", -1); +} } // namespace ksys::act diff --git a/src/KingSystem/ActorSystem/actInfoCommon.h b/src/KingSystem/ActorSystem/actInfoCommon.h index aa269240..4ab016e0 100644 --- a/src/KingSystem/ActorSystem/actInfoCommon.h +++ b/src/KingSystem/ActorSystem/actInfoCommon.h @@ -115,17 +115,205 @@ const char* getMasterSwordSleepActorName(const al::ByamlIter& iter); const char* getMasterSwordTrueFormActorName(InfoData* data, const char* actor); const char* getMasterSwordTrueFormActorName(const al::ByamlIter& iter); +int getArmorStarNum(InfoData* data, const char* actor); +int getArmorStarNum(const al::ByamlIter& iter); + +int getArmorDefenceAddLevel(InfoData* data, const char* actor); +int getArmorDefenceAddLevel(const al::ByamlIter& iter); + const char* getArmorNextRankName(InfoData* data, const char* actor); const char* getArmorNextRankName(const al::ByamlIter& iter); +const char* getArmorEffectEffectType(InfoData* data, const char* actor); +const char* getArmorEffectEffectType(const al::ByamlIter& iter); + +int getArmorEffectEffectLevel(InfoData* data, const char* actor); +int getArmorEffectEffectLevel(const al::ByamlIter& iter); + +bool getArmorEffectAncientPowUp(InfoData* data, const char* actor); +bool getArmorEffectAncientPowUp(const al::ByamlIter& iter); + +bool getArmorEffectEnableClimbWaterfall(InfoData* data, const char* actor); +bool getArmorEffectEnableClimbWaterfall(const al::ByamlIter& iter); + +bool getArmorEffectEnableSpinAttack(InfoData* data, const char* actor); +bool getArmorEffectEnableSpinAttack(const al::ByamlIter& iter); + +int getArmorHeadMantleType(InfoData* data, const char* actor); +int getArmorHeadMantleType(const al::ByamlIter& iter); + +bool getArmorUpperDisableSelfMantle(InfoData* data, const char* actor); +bool getArmorUpperDisableSelfMantle(const al::ByamlIter& iter); + +int getArmorUpperUseMantleType(InfoData* data, const char* actor); +int getArmorUpperUseMantleType(const al::ByamlIter& iter); + +const char* getSeriesArmorSeriesType(InfoData* data, const char* actor); +const char* getSeriesArmorSeriesType(const al::ByamlIter& iter); + +int getItemSellingPrice(InfoData* data, const char* actor); +int getItemSellingPrice(const al::ByamlIter& iter); + +int getItemBuyingPrice(InfoData* data, const char* actor); +int getItemBuyingPrice(const al::ByamlIter& iter); + +int getItemCreatingPrice(InfoData* data, const char* actor); +int getItemCreatingPrice(const al::ByamlIter& iter); + int getItemStainColor(InfoData* data, const char* actor); int getItemStainColor(const al::ByamlIter& iter); +int getItemSaleRevivalCount(InfoData* data, const char* actor); +int getItemSaleRevivalCount(const al::ByamlIter& iter); + +const char* getItemUseIconActorName(InfoData* data, const char* actor); +const char* getItemUseIconActorName(const al::ByamlIter& iter); + +int getRupeeRupeeValue(InfoData* data, const char* actor); +int getRupeeRupeeValue(const al::ByamlIter& iter); + +int getArrowArrowNum(InfoData* data, const char* actor); +int getArrowArrowNum(const al::ByamlIter& iter); + +int getArrowEnemyShootNumForDelete(InfoData* data, const char* actor); +int getArrowEnemyShootNumForDelete(const al::ByamlIter& iter); + +int getArrowArrowDeletePer(InfoData* data, const char* actor); +int getArrowArrowDeletePer(const al::ByamlIter& iter); + int getCureItemHitPointRecover(InfoData* data, const char* actor); int getCureItemHitPointRecover(const al::ByamlIter& iter); +int getCureItemEffectiveTime(InfoData* data, const char* actor); +int getCureItemEffectiveTime(const al::ByamlIter& iter); + +const char* getTravelerAppearGameDataName(InfoData* data, const char* actor); +const char* getTravelerAppearGameDataName(const al::ByamlIter& iter); + +const char* getTravelerDeleteGameDataName(InfoData* data, const char* actor); +const char* getTravelerDeleteGameDataName(const al::ByamlIter& iter); + +const char* getTravelerRouteType(InfoData* data, const char* actor); +const char* getTravelerRouteType(const al::ByamlIter& iter); + +const char* getTravelerRideHorseName(InfoData* data, const char* actor); +const char* getTravelerRideHorseName(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint0Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint0Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint1Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint1Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint2Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint2Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint3Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint3Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint4Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint4Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint5Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint5Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint6Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint6Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint7Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint7Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint8Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint8Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint9Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint9Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint10Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint10Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint11Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint11Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint12Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint12Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint13Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint13Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint14Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint14Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint15Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint15Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint16Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint16Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint17Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint17Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint18Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint18Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint19Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint19Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint20Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint20Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint21Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint21Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint22Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint22Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint23Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint23Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint24Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint24Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint25Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint25Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint26Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint26Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint27Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint27Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint28Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint28Name(const al::ByamlIter& iter); + +const char* getTravelerRoutePoint29Name(InfoData* data, const char* actor); +const char* getTravelerRoutePoint29Name(const al::ByamlIter& iter); + +const char* getHorseASVariation(InfoData* data, const char* actor); +const char* getHorseASVariation(const al::ByamlIter& iter); + +int getHorseNature(InfoData* data, const char* actor); +int getHorseNature(const al::ByamlIter& iter); + +int getHorseGearTopChargeNum(InfoData* data, const char* actor); +int getHorseGearTopChargeNum(const al::ByamlIter& iter); + +int getHorseUnitRiddenAnimalType(InfoData* data, const char* actor); +int getHorseUnitRiddenAnimalType(const al::ByamlIter& iter); + +int getMonsterShopBuyMamo(InfoData* data, const char* actor); +int getMonsterShopBuyMamo(const al::ByamlIter& iter); + int getMonsterShopSellMamo(InfoData* data, const char* actor); int getMonsterShopSellMamo(const al::ByamlIter& iter); +int getPictureBookLiveSpot1(InfoData* data, const char* actor); +int getPictureBookLiveSpot1(const al::ByamlIter& iter); + +int getPictureBookLiveSpot2(InfoData* data, const char* actor); +int getPictureBookLiveSpot2(const al::ByamlIter& iter); + +int getPictureBookSpecialDrop(InfoData* data, const char* actor); +int getPictureBookSpecialDrop(const al::ByamlIter& iter); } // namespace ksys::act diff --git a/src/KingSystem/ActorSystem/actInfoCommon.py b/src/KingSystem/ActorSystem/actInfoCommon.py index d3fcdd81..73e50055 100755 --- a/src/KingSystem/ActorSystem/actInfoCommon.py +++ b/src/KingSystem/ActorSystem/actInfoCommon.py @@ -48,13 +48,86 @@ PROPERTIES: List[Tuple[str, str, str, Any]] = [ ("MasterSword", "SleepActorName", "const char*"), ("MasterSword", "TrueFormActorName", "const char*"), + ("Armor", "StarNum", "int"), + ("Armor", "DefenceAddLevel", "int"), ("Armor", "NextRankName", "const char*"), + ("ArmorEffect", "EffectType", "const char*", "None"), + ("ArmorEffect", "EffectLevel", "int"), + ("ArmorEffect", "AncientPowUp", "bool"), + ("ArmorEffect", "EnableClimbWaterfall", "bool"), + ("ArmorEffect", "EnableSpinAttack", "bool"), + + ("ArmorHead", "MantleType", "int"), + + ("ArmorUpper", "DisableSelfMantle", "bool"), + ("ArmorUpper", "UseMantleType", "int"), + + ("SeriesArmor", "SeriesType", "const char*"), + + ("Item", "SellingPrice", "int", -1), + ("Item", "BuyingPrice", "int", -1), + ("Item", "CreatingPrice", "int", -1), ("Item", "StainColor", "int", -1), + ("Item", "SaleRevivalCount", "int", -1), + ("Item", "UseIconActorName", "const char*"), + + ("Rupee", "RupeeValue", "int", 1), + + ("Arrow", "ArrowNum", "int"), + ("Arrow", "EnemyShootNumForDelete", "int"), + ("Arrow", "ArrowDeletePer", "int"), ("CureItem", "HitPointRecover", "int"), + ("CureItem", "EffectiveTime", "int"), + ("Traveler", "AppearGameDataName", "const char*"), + ("Traveler", "DeleteGameDataName", "const char*"), + ("Traveler", "RouteType", "const char*"), + ("Traveler", "RideHorseName", "const char*"), + ("Traveler", "RoutePoint0Name", "const char*"), + ("Traveler", "RoutePoint1Name", "const char*"), + ("Traveler", "RoutePoint2Name", "const char*"), + ("Traveler", "RoutePoint3Name", "const char*"), + ("Traveler", "RoutePoint4Name", "const char*"), + ("Traveler", "RoutePoint5Name", "const char*"), + ("Traveler", "RoutePoint6Name", "const char*"), + ("Traveler", "RoutePoint7Name", "const char*"), + ("Traveler", "RoutePoint8Name", "const char*"), + ("Traveler", "RoutePoint9Name", "const char*"), + ("Traveler", "RoutePoint10Name", "const char*"), + ("Traveler", "RoutePoint11Name", "const char*"), + ("Traveler", "RoutePoint12Name", "const char*"), + ("Traveler", "RoutePoint13Name", "const char*"), + ("Traveler", "RoutePoint14Name", "const char*"), + ("Traveler", "RoutePoint15Name", "const char*"), + ("Traveler", "RoutePoint16Name", "const char*"), + ("Traveler", "RoutePoint17Name", "const char*"), + ("Traveler", "RoutePoint18Name", "const char*"), + ("Traveler", "RoutePoint19Name", "const char*"), + ("Traveler", "RoutePoint20Name", "const char*"), + ("Traveler", "RoutePoint21Name", "const char*"), + ("Traveler", "RoutePoint22Name", "const char*"), + ("Traveler", "RoutePoint23Name", "const char*"), + ("Traveler", "RoutePoint24Name", "const char*"), + ("Traveler", "RoutePoint25Name", "const char*"), + ("Traveler", "RoutePoint26Name", "const char*"), + ("Traveler", "RoutePoint27Name", "const char*"), + ("Traveler", "RoutePoint28Name", "const char*"), + ("Traveler", "RoutePoint29Name", "const char*"), + + ("Horse", "ASVariation", "const char*", "Normal"), + ("Horse", "Nature", "int"), + ("Horse", "GearTopChargeNum", "int", 3), + + ("HorseUnit", "RiddenAnimalType", "int"), + + ("MonsterShop", "BuyMamo", "int"), ("MonsterShop", "SellMamo", "int"), + + ("PictureBook", "LiveSpot1", "int", -1), + ("PictureBook", "LiveSpot2", "int", -1), + ("PictureBook", "SpecialDrop", "int", -1), ]