feat: now can skip the tutorial (#82)
* now possible to accept and decline tutorial hints that part when it asks if you want to do the tutorial (should work for when the games asks if you already know something like when opening inventories for the first time) * Update ChoiceTask.cpp --------- Co-authored-by: daoge <3523206925@qq.com>
This commit is contained in:
@@ -7,6 +7,7 @@
|
|||||||
#include "TutorialConstraints.h"
|
#include "TutorialConstraints.h"
|
||||||
#include "ChoiceTask.h"
|
#include "ChoiceTask.h"
|
||||||
#include "..\..\..\Minecraft.World\Material.h"
|
#include "..\..\..\Minecraft.World\Material.h"
|
||||||
|
#include "..\..\Windows64\KeyboardMouseInput.h"
|
||||||
|
|
||||||
ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
|
ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
|
||||||
int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,
|
int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,
|
||||||
@@ -51,11 +52,11 @@ bool ChoiceTask::isCompleted()
|
|||||||
// If the player is under water then allow all keypresses so they can jump out
|
// If the player is under water then allow all keypresses so they can jump out
|
||||||
if( pMinecraft->localplayers[tutorial->getPad()]->isUnderLiquid(Material::water) ) return false;
|
if( pMinecraft->localplayers[tutorial->getPad()]->isUnderLiquid(Material::water) ) return false;
|
||||||
|
|
||||||
if(!m_bConfirmMappingComplete && InputManager.GetValue(pMinecraft->player->GetXboxPad(), m_iConfirmMapping) > 0 )
|
if(!m_bConfirmMappingComplete && InputManager.GetValue(pMinecraft->player->GetXboxPad(), m_iConfirmMapping) > 0 || KMInput.IsKeyDown(VK_RETURN))
|
||||||
{
|
{
|
||||||
m_bConfirmMappingComplete = true;
|
m_bConfirmMappingComplete = true;
|
||||||
}
|
}
|
||||||
if(!m_bCancelMappingComplete && InputManager.GetValue(pMinecraft->player->GetXboxPad(), m_iCancelMapping) > 0 )
|
if(!m_bCancelMappingComplete && InputManager.GetValue(pMinecraft->player->GetXboxPad(), m_iCancelMapping) > 0 || KMInput.IsKeyDown('B'))
|
||||||
{
|
{
|
||||||
m_bCancelMappingComplete = true;
|
m_bCancelMappingComplete = true;
|
||||||
}
|
}
|
||||||
@@ -99,11 +100,11 @@ void ChoiceTask::handleUIInput(int iAction)
|
|||||||
{
|
{
|
||||||
if(bHasBeenActivated && m_bShownForMinimumTime)
|
if(bHasBeenActivated && m_bShownForMinimumTime)
|
||||||
{
|
{
|
||||||
if( iAction == m_iConfirmMapping )
|
if( iAction == m_iConfirmMapping)
|
||||||
{
|
{
|
||||||
m_bConfirmMappingComplete = true;
|
m_bConfirmMappingComplete = true;
|
||||||
}
|
}
|
||||||
else if(iAction == m_iCancelMapping )
|
else if(iAction == m_iCancelMapping)
|
||||||
{
|
{
|
||||||
m_bCancelMappingComplete = true;
|
m_bCancelMappingComplete = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ This project contains the source code of Minecraft Legacy Console Edition v1.3.0
|
|||||||
- **Attack / Destroy**: `Left Click`
|
- **Attack / Destroy**: `Left Click`
|
||||||
- **Use / Place**: `Right Click`
|
- **Use / Place**: `Right Click`
|
||||||
- **Select Item**: `Mouse Wheel` or keys `1` to `9`
|
- **Select Item**: `Mouse Wheel` or keys `1` to `9`
|
||||||
|
- **Accept or Decline Tutorial hints**: `Enter` to accept and `B` to decline
|
||||||
- **Host Options**: `TAB`
|
- **Host Options**: `TAB`
|
||||||
|
|
||||||
## Build & Run
|
## Build & Run
|
||||||
|
|||||||
Reference in New Issue
Block a user