Skip to content

Commit

Permalink
Fixed bugs in 150+ files
Browse files Browse the repository at this point in the history
  • Loading branch information
Frustrated-Programmer committed Jan 7, 2025
1 parent 93e39af commit 6b9b792
Show file tree
Hide file tree
Showing 171 changed files with 4,804 additions and 3,804 deletions.
5 changes: 5 additions & 0 deletions Brilliance Datapack/TODO.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# Other TODO:
- automate filling in the extra criteria from
- visible/submit_50_tomes & 100
- visible/win_X_times
- visible/win_X_streak
- visible/lifetime_X_crowns/embers
- Issue with advancement run_too_long
- Only allow ONE ravager to be in the first 5 markers at L1
- custom advancement datapack for lobby
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
]
},
"player": {

"team": "do2.players"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
]
},
"player": {

"team": "do2.players"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,20 @@
}
}
]
},
{
"condition": "minecraft:value_check",
"value": {
"type": "minecraft:score",
"target": {
"type": "minecraft:fixed",
"name": "$dungeon"
},
"score": "do2.run.ticks"
},
"range": {
"max": 200
}
}
]
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,70 +1,84 @@
{
"display": {
"icon": {
"item": "minecraft:redstone",
"nbt": "{CustomModelData:1111127}"
},
"title":"§bDungeon Locksmith",
"description": "§7Enter the dungeon with all three level keys.",
"frame": "goal",
"show_toast": true,
"announce_to_chat": true,
"hidden": false
"icon": {
"item": "minecraft:redstone",
"nbt": "{CustomModelData:1111127}"
},
"title": "§bDungeon Locksmith",
"description": "§7Enter the dungeon with all three level keys.",
"frame": "goal",
"show_toast": true,
"announce_to_chat": true,
"hidden": false
},
"criteria": {
"have_3_unique_floor_keys": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "all_of",
"terms": [
{
"condition": "minecraft:location_check",
"predicate": {
"position": {
"x": {
"min": -627,
"max": -617
},
"y": {
"min": 47,
"max": 49
},
"z": {
"min": 1937,
"max": 1955
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "minecraft:player",
"nbt": "{Inventory:[{id:\"minecraft:iron_nugget\",tag:{CustomModelData:201}}]}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"nbt": "{Inventory:[{id:\"minecraft:iron_nugget\",tag:{CustomModelData:203}}]}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"nbt": "{Inventory:[{id:\"minecraft:iron_nugget\",tag:{CustomModelData:209}}]}"
}
}
]
"have_3_unique_floor_keys": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "all_of",
"terms": [
{
"condition": "minecraft:location_check",
"predicate": {
"position": {
"x": {
"min": -627,
"max": -617
},
"y": {
"min": 47,
"max": 49
},
"z": {
"min": 1937,
"max": 1955
}
}
]
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "minecraft:player",
"nbt": "{Inventory:[{id:\"minecraft:iron_nugget\",tag:{CustomModelData:201}}]}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"nbt": "{Inventory:[{id:\"minecraft:iron_nugget\",tag:{CustomModelData:203}}]}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"nbt": "{Inventory:[{id:\"minecraft:iron_nugget\",tag:{CustomModelData:209}}]}"
}
},
{
"condition": "minecraft:value_check",
"value": {
"type": "minecraft:score",
"target": {
"type": "minecraft:fixed",
"name": "$dungeon"
},
"score": "do2.run.ticks"
},
"range": {
"max": 200
}
}
]
}
]
}
}
},
"parent": "do2:hidden/adventuring/enter_with_1_unique_keys"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,29 @@
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"team": "do2.players",
"scores": {
"do2.eggs.total": {
"min": 17
"condition": "minecraft:all_of",
"terms": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 17
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"team": "do2.players"
}
}
}
]
}
]
}
}
},
"parent": "do2:hidden/adventuring/find_a_egg"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,78 +12,88 @@
"hidden": false
},
"criteria": {
"find_all_egg": {
"find_all_eggs": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",

"team": "do2.players",
"scores": {
"do2.eggs.bdubs": {
"min": 1
},
"do2.eggs.grian": {
"min": 1
},
"do2.eggs.cub": {
"min": 1
},
"do2.eggs.gold": {
"min": 1
},
"do2.eggs.jevin": {
"min": 1
},
"do2.eggs.zedaph": {
"min": 1
},
"do2.eggs.beef": {
"min": 1
},
"do2.eggs.xisuma": {
"min": 1
},
"do2.eggs.xb": {
"min": 1
},
"do2.eggs.hypno": {
"min": 1
},
"do2.eggs.joe": {
"min": 1
},
"do2.eggs.cleo": {
"min": 1
},
"do2.eggs.iskall": {
"min": 1
},
"do2.eggs.pearl": {
"min": 1
},
"do2.eggs.scar": {
"min": 1
},
"do2.eggs.wels": {
"min": 1
},
"do2.eggs.stress": {
"min": 1
},
"do2.eggs.impulse": {
"min": 1
},
"do2.eggs.false": {
"min": 1
"condition": "minecraft:all_of",
"terms": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.bdubs": {
"min": 1
},
"do2.eggs.grian": {
"min": 1
},
"do2.eggs.cub": {
"min": 1
},
"do2.eggs.gold": {
"min": 1
},
"do2.eggs.jevin": {
"min": 1
},
"do2.eggs.zedaph": {
"min": 1
},
"do2.eggs.beef": {
"min": 1
},
"do2.eggs.xisuma": {
"min": 1
},
"do2.eggs.xb": {
"min": 1
},
"do2.eggs.hypno": {
"min": 1
},
"do2.eggs.joe": {
"min": 1
},
"do2.eggs.cleo": {
"min": 1
},
"do2.eggs.iskall": {
"min": 1
},
"do2.eggs.pearl": {
"min": 1
},
"do2.eggs.scar": {
"min": 1
},
"do2.eggs.wels": {
"min": 1
},
"do2.eggs.stress": {
"min": 1
},
"do2.eggs.impulse": {
"min": 1
},
"do2.eggs.false": {
"min": 1
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"team": "do2.players"
}
}
}
]
}
]
}
}
},
"parent": "do2:hidden/adventuring/find_a_egg"
}
}
Loading

0 comments on commit 6b9b792

Please sign in to comment.