brammie15/Reeks2Missie6
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stupid minecraft

Browse Source
This commit is contained in:
Bram Verhulst
2024-08-05 13:31:08 +02:00
parent 7259b53176
commit cd5f473460
24 changed files with 7208 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/levels/level1/mission1.ts
View File

@@ -6,6 +6,7 @@ import { startLevel } from "../../Commandeer/utils/levelUtils";
import { vector3, Vector3Add, Vector3ToCommandString } from "../../Commandeer/utils/vectorUtils";
import { level1Conditions } from "../../levelConditions/level1";
import { mindKeeper, CURRENT_LEVEL } from "../../main";
import { MinecraftBlockTypes } from "../../vanilla-data/mojang-block";
const Level1CommandBlockPos: Vector3 = vector3(2439, 0, 36);
const level1StartPosition: Vector3 = vector3(2451, -2, 57);
@@ -41,9 +42,9 @@ const level1: Level = new Level(
if (
blockLava &&
blockLava.type === MinecraftBlockTypes.lava &&
blockLava.type.id === MinecraftBlockTypes.Lava &&
blockAir &&
blockAir.type === MinecraftBlockTypes.air
blockAir.type.id === MinecraftBlockTypes.Air
) {
isOutOfBounds = true;
}

7
scripts/levels/level1/mission2.ts
View File

@@ -1,10 +1,11 @@
import { MinecraftBlockTypes, Vector3, world } from "@minecraft/server";
import { Vector3, world } from "@minecraft/server";
import Level from "../../Commandeer/level/level";
import pupeteer from "../../Commandeer/pupeteer";
import { teleportAgent, isAgentAt, getAgentLocation, getAgent } from "../../Commandeer/utils/agentUtils";
import { startLevel } from "../../Commandeer/utils/levelUtils";
import { vector3, Vector3Add, Vector3ToCommandString } from "../../Commandeer/utils/vectorUtils";
import { mindKeeper, CURRENT_LEVEL } from "../../main";
import { MinecraftBlockTypes } from "../../vanilla-data/mojang-block";
const Level2CommandBlockPos: Vector3 = vector3(2439, 0, 35);
const level2StartPosition: Vector3 = vector3(2446, -2, 40);
@@ -40,9 +41,9 @@ const level2: Level = new Level(
if (
blockLava &&
blockLava.type === MinecraftBlockTypes.lava &&
blockLava.type.id === MinecraftBlockTypes.Lava &&
blockAir &&
blockAir.type === MinecraftBlockTypes.air
blockAir.type.id === MinecraftBlockTypes.Air
) {
isOutOfBounds = true;
}

7
scripts/levels/level1/mission3.ts
View File

@@ -1,10 +1,11 @@
import { MinecraftBlockTypes, Vector3, world } from "@minecraft/server";
import { Vector3, world } from "@minecraft/server";
import Level from "../../Commandeer/level/level";
import pupeteer from "../../Commandeer/pupeteer";
import { teleportAgent, isAgentAt, getAgentLocation, getAgent } from "../../Commandeer/utils/agentUtils";
import { startLevel } from "../../Commandeer/utils/levelUtils";
import { vector3, Vector3Add, Vector3ToCommandString } from "../../Commandeer/utils/vectorUtils";
import { mindKeeper, CURRENT_LEVEL } from "../../main";
import { MinecraftBlockTypes } from "../../vanilla-data/mojang-block";
const Level3CommandBlockPos: Vector3 = vector3(2439, 0, 34);
const level3StartPosition: Vector3 = vector3(2447, -2, 30);
const level3EndPosition: Vector3 = vector3(2451, -2, 18);
@@ -39,9 +40,9 @@ const level3: Level = new Level(
if (
blockLava &&
blockLava.type === MinecraftBlockTypes.lava &&
blockLava.type.id === MinecraftBlockTypes.Lava &&
blockAir &&
blockAir.type === MinecraftBlockTypes.air
blockAir.type.id === MinecraftBlockTypes.Air
) {
isOutOfBounds = true;
}

7
scripts/levels/level2/mission1.ts
View File

@@ -1,4 +1,4 @@
import { MinecraftBlockTypes, Vector3, world } from "@minecraft/server";
import { Vector3, world } from "@minecraft/server";
import Level from "../../Commandeer/level/level";
import pupeteer from "../../Commandeer/pupeteer";
import { teleportAgent, isAgentAt, getAgentLocation, getAgent } from "../../Commandeer/utils/agentUtils";
@@ -6,6 +6,7 @@ import { startLevel } from "../../Commandeer/utils/levelUtils";
import { vector3, Vector3Add, Vector3ToCommandString } from "../../Commandeer/utils/vectorUtils";
// import { level4Conditions } from "../../levelConditions/level4";
import { mindKeeper, CURRENT_LEVEL } from "../../main";
import { MinecraftBlockTypes } from "../../vanilla-data/mojang-block";
const level4CommandBlockPos: Vector3 = vector3(2439, 0, 36);
const level4StartPosition: Vector3 = vector3(2451, -2, 57);
@@ -41,9 +42,9 @@ const level4: Level = new Level(
if (
blockLava &&
blockLava.type === MinecraftBlockTypes.lava &&
blockLava.type.id === MinecraftBlockTypes.Lava &&
blockAir &&
blockAir.type === MinecraftBlockTypes.air
blockAir.type.id === MinecraftBlockTypes.Air
) {
isOutOfBounds = true;
}

21
scripts/levels/levelIntro.ts
View File

@@ -1,4 +1,4 @@
import { BlockType, MinecraftBlockTypes, Vector3, world } from "@minecraft/server";
import { BlockType, Vector3, world } from "@minecraft/server";
import Level from "../Commandeer/level/level";
import { leverOn } from "../Commandeer/level/levelTypes";
import { teleportAgent, isAgentAt } from "../Commandeer/utils/agentUtils";
@@ -7,6 +7,7 @@ import { vector3 } from "../Commandeer/utils/vectorUtils";
import { levelIntroConditions } from "../levelConditions/levelIntro";
import { CURRENT_LEVEL, mindKeeper } from "../main";
import Pupeteer from "../Commandeer/pupeteer";
import { MinecraftBlockTypes } from "../vanilla-data/mojang-block";
// const levelIntroCommandBlockPos: Vector3 = vector3(58, 66, 276);
// const levelIntroStartPosition: Vector3 = vector3(28, 70, 269);
@@ -25,15 +26,15 @@ const blockPositions: Vector3[] = [
vector3(2464, 12, 108),
];
let currentBlockSequence: BlockType[] = [];
let currentBlockSequence: string[] = [];
let currentBlockSeuqenceIndex: number[] = [];
const blockCycle: BlockType[] = [
MinecraftBlockTypes.redstoneBlock,
MinecraftBlockTypes.goldBlock,
MinecraftBlockTypes.diamondBlock,
MinecraftBlockTypes.emeraldBlock,
MinecraftBlockTypes.lapisBlock,
const blockCycle: string[] = [
MinecraftBlockTypes.RedstoneBlock,
MinecraftBlockTypes.GoldBlock,
MinecraftBlockTypes.DiamondBlock,
MinecraftBlockTypes.EmeraldBlock,
MinecraftBlockTypes.LapisBlock,
];
let buttonPressed: boolean[] = buttonPositions.map(() => false);
@@ -48,7 +49,7 @@ const levelIntro: Level = new Level(
let block = world.getDimension("overworld").getBlock(pos);
let index = blockPositions.indexOf(pos);
let blockType = block!.type;
currentBlockSequence[index] = blockType;
currentBlockSequence[index] = blockType.id;
});
},
() => {
@@ -90,7 +91,7 @@ const levelIntro: Level = new Level(
let isComplete = true;
levelIntroConditions.conditions.forEach((condition) => {
let blockInworld = world.getDimension("overworld").getBlock(condition.position);
if (blockInworld?.type !== condition.block) {
if (blockInworld?.type.id !== condition.block) {
isComplete = false;
counter++;
}