From 8f372625faa08f359cb8bc01f38e7b3ca169ccbe Mon Sep 17 00:00:00 2001 From: bensaine Date: Sat, 2 Oct 2021 01:41:49 -0400 Subject: [PATCH 1/3] fix: show correct status for zig in inventory --- .../src/interface_v3/interface_expr_user_fct_game.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp b/code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp index 30126c0d9..8a924724e 100644 --- a/code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp +++ b/code/ryzom/client/src/interface_v3/interface_expr_user_fct_game.cpp @@ -798,7 +798,11 @@ static DECLARE_INTERFACE_USER_FCT(getAnimalInventoryStateText) // According to server status, change the inventory text uint status= (uint)args[0].getInteger(); - if(ANIMAL_STATUS::isInStable((ANIMAL_STATUS::EAnimalStatus)status)) + if(ANIMAL_STATUS::isInBag((ANIMAL_STATUS::EAnimalStatus)status)) + { + result.setString("uiAnimalInBag"); + } + else if(ANIMAL_STATUS::isInStable((ANIMAL_STATUS::EAnimalStatus)status)) { result.setString("uiAnimalInStable"); } From f3b0cd53250785470b7e229f2711d2fed05e5a0a Mon Sep 17 00:00:00 2001 From: Ben Saine Date: Fri, 15 Oct 2021 01:26:19 +0000 Subject: [PATCH 2/3] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 22089c19f..07be83e98 100644 --- a/.gitignore +++ b/.gitignore @@ -90,6 +90,7 @@ ylwrap *.mk # Visual Studio garbage +.vscode/ *.opensdf UpgradeLog*.XML _UpgradeReport_Files @@ -159,6 +160,7 @@ code/build/* code/build-2010/* build/* install/* +win-build/ build_* code/nel/tools/build_gamedata/configuration/buildsite.py From 6eab9d9f9f3f6f7198eddba8448ecc7b9307e359 Mon Sep 17 00:00:00 2001 From: Meubli Date: Tue, 19 Oct 2021 23:33:28 +0200 Subject: [PATCH 3/3] pets inventory transactions - Enable Zig <-> Flat inventory transactions (move between) - Enable Zig <-> Guild inventory transactions (move between) --- code/ryzom/client/src/interface_v3/action_handler_item.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/action_handler_item.cpp b/code/ryzom/client/src/interface_v3/action_handler_item.cpp index 3d0981306..1698a0d78 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_item.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_item.cpp @@ -1956,16 +1956,15 @@ class CHandlerItemMenuCheck : public IActionHandler for(i=0;isetActive(invId!=INVENTORIES::guild && - (uint)invId!=INVENTORIES::pet_animal+i && + pMoveToPa[i]->setActive((uint)invId!=INVENTORIES::pet_animal+i && invMngr.isInventoryPresent((INVENTORIES::TInventory)(INVENTORIES::pet_animal+i)) ); } if (pMoveToGuild) - pMoveToGuild->setActive(invId==INVENTORIES::bag && invMngr.isInventoryPresent(INVENTORIES::guild)); + pMoveToGuild->setActive(invId!=INVENTORIES::guild && invMngr.isInventoryPresent(INVENTORIES::guild)); if (pMoveToRoom) - pMoveToRoom->setActive(invId==INVENTORIES::bag && invMngr.isInventoryPresent(INVENTORIES::player_room)); + pMoveToRoom->setActive(invId!=INVENTORIES::player_room && invMngr.isInventoryPresent(INVENTORIES::player_room)); // std case: can drop / destroy if(pDrop) pDrop->setActive(invId!=INVENTORIES::guild);