Fix filters for previous versions

This commit is contained in:
Misode
2019-12-29 03:52:36 +01:00
parent 2b4a5e42bf
commit 69cee261db
4 changed files with 11 additions and 41 deletions

View File

@@ -55,6 +55,7 @@
"translate": "entry.type",
"translateValue": "entry.type",
"help": true,
"filter": true,
"default": "minecraft:item",
"values": [
"minecraft:empty",
@@ -106,6 +107,7 @@
{
"id": "function",
"type": "enum",
"filter": true,
"translate": "function.type",
"translateValue": "function.type",
"default": "minecraft:set_count",
@@ -216,6 +218,7 @@
{
"id": "condition",
"type": "enum",
"filter": true,
"translate": "condition.type",
"translateValue": "condition.type",
"default": "minecraft:random_chance",

View File

@@ -77,6 +77,7 @@
"translate": "entry.type",
"translateValue": "entry.type",
"help": true,
"filter": true,
"default": "minecraft:item",
"values": [
"minecraft:empty",
@@ -414,32 +415,14 @@
"color": "secondary",
"card": false,
"require": [
{
"function": "minecraft:apply_bonus",
"formula": "minecraft:uniform_bonus_count"
}
"minecraft:apply_bonus"
],
"fields": [
{
"id": "bonusMultiplier",
"type": "float",
"translate": "function.bonusMultiplier"
}
]
},
{
"id": "parameters",
"type": "object",
"translate": "function.parameters",
"color": "secondary",
"card": false,
"require": [
{
"function": "minecraft:apply_bonus",
"formula": "minecraft:binomial_with_bonus_count"
}
],
"fields": [
},
{
"id": "extra",
"type": "int",
@@ -479,6 +462,7 @@
{
"id": "condition",
"type": "enum",
"filter": true,
"translate": "condition.type",
"translateValue": "condition.type",
"default": "minecraft:random_chance",

View File

@@ -549,7 +549,6 @@
"type": "enum",
"translate": "function.formula",
"translateValue": "function.formula",
"filter": true,
"default": "minecraft:uniform_bonus_count",
"values": [
"minecraft:uniform_bonus_count",
@@ -567,32 +566,14 @@
"color": "secondary",
"card": false,
"require": [
{
"function": "minecraft:apply_bonus",
"formula": "minecraft:uniform_bonus_count"
}
"minecraft:apply_bonus"
],
"fields": [
{
"id": "bonusMultiplier",
"type": "float",
"translate": "function.bonusMultiplier"
}
]
},
{
"id": "parameters",
"type": "object",
"translate": "function.parameters",
"color": "secondary",
"card": false,
"require": [
{
"function": "minecraft:apply_bonus",
"formula": "minecraft:binomial_with_bonus_count"
}
],
"fields": [
},
{
"id": "extra",
"type": "int",

View File

@@ -407,12 +407,14 @@ function generateObject(data, struct, options) {
let child = components.find(e => e.id === struct.value);
return generateObject(data, child, options);
}
console.warn(struct.id);
let filter;
for (let field of struct.fields) {
if (filter === undefined) {
filterField = struct.fields.find(e => e.type === 'enum' && e.filter === true);
if (filterField) {
filter = data[filterField.id];
console.log(filter);
}
}
if (!luckBased && field.luckBased) {