Skip to content

Commit 57a22b7

Browse files
authored
Fix Batch Mode chance rolls (#3411)
1 parent 4d1aa4a commit 57a22b7

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockDisplayText.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ public Builder addOutputLines(GTRecipe recipe) {
357357
int count = stack.getCount();
358358
double countD = count;
359359
if (item.chance < item.maxChance) {
360-
countD = countD * recipe.parallels *
360+
countD = countD * recipe.parallels * recipe.batchParallels *
361361
function.getBoostedChance(item, recipeTier, chanceTier) / item.maxChance;
362362
count = countD < 1 ? 1 : (int) Math.round(countD);
363363
}
@@ -378,7 +378,7 @@ public Builder addOutputLines(GTRecipe recipe) {
378378
int amount = stack.getAmount();
379379
double amountD = amount;
380380
if (fluid.chance < fluid.maxChance) {
381-
amountD = amountD * recipe.parallels *
381+
amountD = amountD * recipe.parallels * recipe.batchParallels *
382382
function.getBoostedChance(fluid, recipeTier, chanceTier) / fluid.maxChance;
383383
amount = amountD < 1 ? 1 : (int) Math.round(amountD);
384384
}

src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipe.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ public GTRecipe copy(ContentModifier modifier, boolean modifyDuration) {
135135
}
136136
copied.ocLevel = ocLevel;
137137
copied.parallels = parallels;
138+
copied.batchParallels = batchParallels;
138139
return copied;
139140
}
140141

src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private void fillContentMatchList(Map<RecipeCapability<?>, List<Content>> entrie
103103
if (!chancedContents.isEmpty()) {
104104
var cache = this.chanceCaches.get(cap);
105105
chancedContents = logic.roll(chancedContents, function, recipeTier, chanceTier, cache,
106-
recipe.parallels);
106+
recipe.parallels * recipe.batchParallels);
107107

108108
for (Content cont : chancedContents) {
109109
contentList.add(cont.content);

0 commit comments

Comments
 (0)