Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-01 18:50:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2026-07-02 15:41:02 -04:00
parent 03abf9dc0d 12509e6225
commit 1af06f58ce
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/ui/dialogs/ResearchDialog.java
+22 -4
View File
@@ -248,19 +248,24 @@ public class ResearchDialog extends BaseDialog{
public void add(Item item, int amount){
//only have custom removal logic for when the sequence gets items taken out of it (e.g. research)
if(amount < 0){
Sector curSector = state.isCampaign() ? state.rules.sector : null;
//remove items from each sector's storage, one by one
//negate amount since it's being *removed* - this makes it positive
amount = -amount;
//% that gets removed from each sector
double percentage = (double)amount / get(item);
//% that gets removed from each sector except the current one
double percentage = (double)amount / Math.max(get(item) - (curSector != null && cache.get(curSector) != null ? cache.get(curSector).get(item) : 0), 1);
int[] counter = {amount};
cache.each((sector, seq) -> {
if(counter[0] == 0) return;
if(counter[0] == 0 || sector == curSector) return;
int available = seq.get(item);
if(available <= 0) return;
//amount that will be removed
int toRemove = Math.min((int)Math.ceil(percentage * seq.get(item)), counter[0]);
int toRemove = Math.min(counter[0], Math.min((int)Math.ceil(percentage * available), available));
//actually remove it from the sector
sector.removeItem(item, toRemove);
@@ -269,6 +274,19 @@ public class ResearchDialog extends BaseDialog{
counter[0] -= toRemove;
});
//only consume from the active sector last
if(counter[0] > 0 && curSector != null){
var seq = cache.get(curSector);
if(seq != null){
int toRemove = Math.min(seq.get(item), counter[0]);
curSector.removeItem(item, toRemove);
seq.remove(item, toRemove);
counter[0] -= toRemove;
}
}
//negate again to display correct number
amount = -amount;
}