Skip to content

Commit

Permalink
Fab instructions for Spinner and mini jump block.
Browse files Browse the repository at this point in the history
  • Loading branch information
Blackvoxel committed Aug 5, 2021
1 parent 1b2757a commit 69238cc
Showing 1 changed file with 23 additions and 6 deletions.
29 changes: 23 additions & 6 deletions src/ZVoxelTypeManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@
# include "ZVoxelType_LiftL.h"
#endif

#ifndef Z_ZVOXELTYPE_SPINNER_H
# include "ZVoxelType_Spinner.h"
#endif


ZVoxelTypeManager::ZVoxelTypeManager()
{
Expand Down Expand Up @@ -2096,12 +2100,6 @@ Bool ZVoxelTypeManager::LoadVoxelTypes()
VoxelType->FabInfos2 = new ZFabInfos2;
VoxelType->FabInfos2->SetValidator(1);

// Test
tr = VoxelType->FabInfos2->AddTransformation();
tr->AddCondition(2,8);
tr->AddCondition(1,1);
tr->AddResult(3,2);

// Lifts L0 (Validated)
tr = VoxelType->FabInfos2->AddTransformation();
tr->AddCondition(118,128); // 128 Stainless Steel Bar
Expand Down Expand Up @@ -2197,6 +2195,14 @@ Bool ZVoxelTypeManager::LoadVoxelTypes()
tr->AddCondition(1,1); // 1 Blackrock Blue (Validator)
tr->AddResult(268,20); // Jump Block

// Car Mini Jump Block
tr = VoxelType->FabInfos2->AddTransformation();
tr->AddCondition(117,5); // 5 Iron Bar
tr->AddCondition(119,1); // 1 Copper Bar
tr->AddCondition(3,3); // 3 Blackrock Green
tr->AddCondition(1,1); // 1 Blackrock Blue (Validator)
tr->AddResult(285,40); // Jump Block

// Train T0
tr = VoxelType->FabInfos2->AddTransformation();
tr->AddCondition(117,512); // 512 Iron Bar
Expand Down Expand Up @@ -2250,9 +2256,20 @@ Bool ZVoxelTypeManager::LoadVoxelTypes()
tr->AddCondition(1,1); // 1 Blackrock Blue (Validator)
tr->AddResult(283,1); // Heater plate

// Spinner
tr = VoxelType->FabInfos2->AddTransformation();
tr->AddCondition(117,2); // 2 Iron Bar
tr->AddCondition(119,2); // 1 Copper Bar
tr->AddCondition(3,7); // 7 Blackrock Green
tr->AddCondition(1,1); // 1 Blackrock Blue (Validator)
tr->AddResult(284,40); // Spinner

VoxelType->FabInfos2->UpdateAll();
break;

case 284: VoxelType = new ZVoxelType_Spinner(i);
break;

default: VoxelType = new ZVoxelType(i); break;
}

Expand Down

0 comments on commit 69238cc

Please sign in to comment.