LegacyConsole/4jcraft
2
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-24 15:04:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

exclude unused GameMode implementations, format Platform/Common/Tutorial

Browse Source
This commit is contained in:
Tropical
2026-03-22 02:11:47 -05:00
parent 3fa28df4da
commit a30330f1d0
64 changed files with 5917 additions and 4813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

203
Minecraft.Client/Platform/Common/Tutorial/ChoiceTask.cpp
View File

@@ -8,130 +8,121 @@
#include "ChoiceTask.h"
#include "../../Minecraft.World/Blocks/Material.h"
ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,
eTutorial_CompletionAction cancelAction /*= e_Tutorial_Completion_None*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)
: TutorialTask( tutorial, descriptionId, false, NULL, true, false, false )
{
if(requiresUserInput == true)
{
constraints.push_back( new InputConstraint( iConfirmMapping ) );
constraints.push_back( new InputConstraint( iCancelMapping ) );
}
m_iConfirmMapping = iConfirmMapping;
m_iCancelMapping = iCancelMapping;
m_bConfirmMappingComplete = false;
m_bCancelMappingComplete = false;
ChoiceTask::ChoiceTask(
Tutorial* tutorial, int descriptionId, int promptId /*= -1*/,
bool requiresUserInput /*= false*/, int iConfirmMapping /*= 0*/,
int iCancelMapping /*= 0*/,
eTutorial_CompletionAction cancelAction /*= e_Tutorial_Completion_None*/,
ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)
: TutorialTask(tutorial, descriptionId, false, NULL, true, false, false) {
if (requiresUserInput == true) {
constraints.push_back(new InputConstraint(iConfirmMapping));
constraints.push_back(new InputConstraint(iCancelMapping));
}
m_iConfirmMapping = iConfirmMapping;
m_iCancelMapping = iCancelMapping;
m_bConfirmMappingComplete = false;
m_bCancelMappingComplete = false;
m_cancelAction = cancelAction;
m_cancelAction = cancelAction;
m_promptId = promptId;
tutorial->addMessage( m_promptId );
m_promptId = promptId;
tutorial->addMessage(m_promptId);
m_eTelemetryEvent = telemetryEvent;
m_eTelemetryEvent = telemetryEvent;
}
bool ChoiceTask::isCompleted()
{
Minecraft *pMinecraft = Minecraft::GetInstance();
bool ChoiceTask::isCompleted() {
Minecraft* pMinecraft = Minecraft::GetInstance();
if( m_bConfirmMappingComplete || m_bCancelMappingComplete )
{
sendTelemetry();
enableConstraints(false, true);
return true;
}
if(ui.GetMenuDisplayed(tutorial->getPad()))
{
// If a menu is displayed, then we use the handleUIInput to complete the task
}
else
{
// 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 (m_bConfirmMappingComplete || m_bCancelMappingComplete) {
sendTelemetry();
enableConstraints(false, true);
return true;
}
if(!m_bConfirmMappingComplete && InputManager.GetValue(pMinecraft->player->GetXboxPad(), m_iConfirmMapping) > 0 )
{
m_bConfirmMappingComplete = true;
}
if(!m_bCancelMappingComplete && InputManager.GetValue(pMinecraft->player->GetXboxPad(), m_iCancelMapping) > 0 )
{
m_bCancelMappingComplete = true;
}
}
if (ui.GetMenuDisplayed(tutorial->getPad())) {
// If a menu is displayed, then we use the handleUIInput to complete the
// task
} else {
// 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(m_bConfirmMappingComplete || m_bCancelMappingComplete)
{
sendTelemetry();
enableConstraints(false, true);
}
return m_bConfirmMappingComplete || m_bCancelMappingComplete;
if (!m_bConfirmMappingComplete &&
InputManager.GetValue(pMinecraft->player->GetXboxPad(),
m_iConfirmMapping) > 0) {
m_bConfirmMappingComplete = true;
}
if (!m_bCancelMappingComplete &&
InputManager.GetValue(pMinecraft->player->GetXboxPad(),
m_iCancelMapping) > 0) {
m_bCancelMappingComplete = true;
}
}
if (m_bConfirmMappingComplete || m_bCancelMappingComplete) {
sendTelemetry();
enableConstraints(false, true);
}
return m_bConfirmMappingComplete || m_bCancelMappingComplete;
}
eTutorial_CompletionAction ChoiceTask::getCompletionAction()
{
if(m_bCancelMappingComplete)
{
return m_cancelAction;
}
else
{
return e_Tutorial_Completion_None;
}
eTutorial_CompletionAction ChoiceTask::getCompletionAction() {
if (m_bCancelMappingComplete) {
return m_cancelAction;
} else {
return e_Tutorial_Completion_None;
}
}
int ChoiceTask::getPromptId()
{
if( m_bShownForMinimumTime )
return m_promptId;
else
return -1;
int ChoiceTask::getPromptId() {
if (m_bShownForMinimumTime)
return m_promptId;
else
return -1;
}
void ChoiceTask::setAsCurrentTask(bool active /*= true*/)
{
enableConstraints( active );
TutorialTask::setAsCurrentTask(active);
void ChoiceTask::setAsCurrentTask(bool active /*= true*/) {
enableConstraints(active);
TutorialTask::setAsCurrentTask(active);
}
void ChoiceTask::handleUIInput(int iAction)
{
if(bHasBeenActivated && m_bShownForMinimumTime)
{
if( iAction == m_iConfirmMapping )
{
m_bConfirmMappingComplete = true;
}
else if(iAction == m_iCancelMapping )
{
m_bCancelMappingComplete = true;
}
}
void ChoiceTask::handleUIInput(int iAction) {
if (bHasBeenActivated && m_bShownForMinimumTime) {
if (iAction == m_iConfirmMapping) {
m_bConfirmMappingComplete = true;
} else if (iAction == m_iCancelMapping) {
m_bCancelMappingComplete = true;
}
}
}
void ChoiceTask::sendTelemetry()
{
Minecraft *pMinecraft = Minecraft::GetInstance();
void ChoiceTask::sendTelemetry() {
Minecraft* pMinecraft = Minecraft::GetInstance();
if( m_eTelemetryEvent != eTelemetryChallenges_Unknown )
{
bool firstPlay = true;
// We only store first play for some of the events
switch(m_eTelemetryEvent)
{
case eTelemetryTutorial_TrialStart:
firstPlay = !tutorial->getCompleted( eTutorial_Telemetry_TrialStart );
tutorial->setCompleted( eTutorial_Telemetry_TrialStart );
break;
case eTelemetryTutorial_Halfway:
firstPlay = !tutorial->getCompleted( eTutorial_Telemetry_Halfway );
tutorial->setCompleted( eTutorial_Telemetry_Halfway );
break;
default:
break;
};
if (m_eTelemetryEvent != eTelemetryChallenges_Unknown) {
bool firstPlay = true;
// We only store first play for some of the events
switch (m_eTelemetryEvent) {
case eTelemetryTutorial_TrialStart:
firstPlay =
!tutorial->getCompleted(eTutorial_Telemetry_TrialStart);
tutorial->setCompleted(eTutorial_Telemetry_TrialStart);
break;
case eTelemetryTutorial_Halfway:
firstPlay =
!tutorial->getCompleted(eTutorial_Telemetry_Halfway);
tutorial->setCompleted(eTutorial_Telemetry_Halfway);
break;
default:
break;
};
TelemetryManager->RecordEnemyKilledOrOvercome(pMinecraft->player->GetXboxPad(), 0, 0, 0, 0, 0, 0, m_eTelemetryEvent);
}
TelemetryManager->RecordEnemyKilledOrOvercome(
pMinecraft->player->GetXboxPad(), 0, 0, 0, 0, 0, 0,
m_eTelemetryEvent);
}
}