LegacyConsole/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-23 12:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

TU19: merge Minecraft.Client/Platform/Common/Tutorial

Browse Source
This commit is contained in:
Tropical
2026-03-22 03:51:48 -05:00
parent 86c3e12e7b
commit 58cdba39f3
17 changed files with 717 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
Minecraft.Client/Platform/Common/Tutorial/FullTutorial.cpp
View File

@@ -248,7 +248,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
IDS_TUTORIAL_TASK_CREATE_WOODEN_PICKAXE));
addTask(e_Tutorial_State_Gameplay,
new PickupTask(Tile::stoneBrick_Id, 8, -1, this,
new PickupTask(Tile::cobblestone_Id, 8, -1, this,
IDS_TUTORIAL_TASK_MINE_STONE));
addTask(e_Tutorial_State_Gameplay,
@@ -922,9 +922,9 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
if (app.getGameRuleDefinitions() != NULL) {
AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"tradingArea");
if (area != NULL) {
eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay};
eTutorial_State tradingStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint(new ChangeStateConstraint(
this, e_Tutorial_State_Trading, enchantingStates, 1, area->x0,
this, e_Tutorial_State_Trading, tradingStates, 1, area->x0,
area->y0, area->z0, area->x1, area->y1, area->z1));
addTask(
@@ -961,6 +961,133 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
}
}
/*
*
*
* FIREWORKS
*
*/
if (app.getGameRuleDefinitions() != NULL) {
AABB* area =
app.getGameRuleDefinitions()->getNamedArea(L"fireworksArea");
if (area != NULL) {
eTutorial_State fireworkStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint(new ChangeStateConstraint(
this, e_Tutorial_State_Fireworks, fireworkStates, 1, area->x0,
area->y0, area->z0, area->x1, area->y1, area->z1));
addTask(
e_Tutorial_State_Fireworks,
new ChoiceTask(
this, IDS_TUTORIAL_TASK_FIREWORK_OVERVIEW,
IDS_TUTORIAL_PROMPT_FIREWORK_OVERVIEW, true, ACTION_MENU_A,
ACTION_MENU_B,
e_Tutorial_Completion_Complete_State_Gameplay_Constraints,
eTelemetryTutorial_Trading));
addTask(e_Tutorial_State_Fireworks,
new InfoTask(this, IDS_TUTORIAL_TASK_FIREWORK_PURPOSE,
IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
ACTION_MENU_A));
addTask(e_Tutorial_State_Fireworks,
new InfoTask(this, IDS_TUTORIAL_TASK_FIREWORK_CUSTOMISE,
IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
ACTION_MENU_A)); //
addTask(e_Tutorial_State_Fireworks,
new InfoTask(this, IDS_TUTORIAL_TASK_FIREWORK_CRAFTING,
IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
ACTION_MENU_A));
}
}
/*
*
*
* BEACON
*
*/
if (app.getGameRuleDefinitions() != NULL) {
AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"beaconArea");
if (area != NULL) {
eTutorial_State beaconStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint(new ChangeStateConstraint(
this, e_Tutorial_State_Beacon, beaconStates, 1, area->x0,
area->y0, area->z0, area->x1, area->y1, area->z1));
addTask(
e_Tutorial_State_Beacon,
new ChoiceTask(
this, IDS_TUTORIAL_TASK_BEACON_OVERVIEW,
IDS_TUTORIAL_PROMPT_BEACON_OVERVIEW, true, ACTION_MENU_A,
ACTION_MENU_B,
e_Tutorial_Completion_Complete_State_Gameplay_Constraints,
eTelemetryTutorial_Beacon));
addTask(e_Tutorial_State_Beacon,
new InfoTask(this, IDS_TUTORIAL_TASK_BEACON_PURPOSE,
IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
ACTION_MENU_A));
addTask(e_Tutorial_State_Beacon,
new InfoTask(this, IDS_TUTORIAL_TASK_BEACON_DESIGN,
IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
ACTION_MENU_A));
addTask(e_Tutorial_State_Beacon,
new InfoTask(this, IDS_TUTORIAL_TASK_BEACON_CHOOSING_POWERS,
IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
ACTION_MENU_A));
}
}
/*
*
*
* HOPPER
*
*/
if (app.getGameRuleDefinitions() != NULL) {
AABB* area = app.getGameRuleDefinitions()->getNamedArea(L"hopperArea");
if (area != NULL) {
eTutorial_State hopperStates[] = {e_Tutorial_State_Gameplay};
AddGlobalConstraint(new ChangeStateConstraint(
this, e_Tutorial_State_Hopper, hopperStates, 1, area->x0,
area->y0, area->z0, area->x1, area->y1, area->z1));
addTask(
e_Tutorial_State_Hopper,
new ChoiceTask(
this, IDS_TUTORIAL_TASK_HOPPER_OVERVIEW,
IDS_TUTORIAL_PROMPT_HOPPER_OVERVIEW, true, ACTION_MENU_A,
ACTION_MENU_B,
e_Tutorial_Completion_Complete_State_Gameplay_Constraints,
eTelemetryTutorial_Hopper));
addTask(e_Tutorial_State_Hopper,
new InfoTask(this, IDS_TUTORIAL_TASK_HOPPER_PURPOSE,
IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
ACTION_MENU_A));
addTask(e_Tutorial_State_Hopper,
new InfoTask(this, IDS_TUTORIAL_TASK_HOPPER_CONTAINERS,
IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
ACTION_MENU_A));
addTask(e_Tutorial_State_Hopper,
new InfoTask(this, IDS_TUTORIAL_TASK_HOPPER_MECHANICS,
IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
ACTION_MENU_A));
addTask(e_Tutorial_State_Hopper,
new InfoTask(this, IDS_TUTORIAL_TASK_HOPPER_REDSTONE,
IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
ACTION_MENU_A));
addTask(e_Tutorial_State_Hopper,
new InfoTask(this, IDS_TUTORIAL_TASK_HOPPER_OUTPUT,
IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
ACTION_MENU_A));
addTask(e_Tutorial_State_Hopper,
new InfoTask(this, IDS_TUTORIAL_TASK_HOPPER_AREA,
IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true,
ACTION_MENU_A));
}
}
/*
*
*