skywalker3200/MobArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow for reward grouping.

Browse Source 
This commit makes the MAUtils class responsible for parsing reward maps
use the new ThingPickerManager to parse the reward lists. As a result,
the new `all()` and `random()` pickers are available for use in the
rewards section.

This should allow for granting item sets and similar types of "bundles"
as rewards in the arena, e.g. a diamond sword and permission to join a
more difficult arena.

Closes #386
This commit is contained in:
Andreas Troelsen
2020-08-22 17:12:29 +02:00
parent bff1ab5694
commit 994ebaff81
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/garbagemule/MobArena/MAUtils.java
+6 -13
View File
@@ -4,9 +4,6 @@ import com.garbagemule.MobArena.framework.Arena;
import com.garbagemule.MobArena.framework.ArenaMaster;
import com.garbagemule.MobArena.region.ArenaRegion;
import com.garbagemule.MobArena.things.InvalidThingInputString;
import com.garbagemule.MobArena.things.RandomThingPicker;
import com.garbagemule.MobArena.things.SingleThingPicker;
import com.garbagemule.MobArena.things.Thing;
import com.garbagemule.MobArena.things.ThingPicker;
import com.garbagemule.MobArena.util.TextUtils;
import org.bukkit.Location;
@@ -64,17 +61,13 @@ public class MAUtils
String path = typePath + "." + wave;
String rewards = config.getString(path);
List<ThingPicker> pickers = new ArrayList<>();
for (String reward : rewards.split(",")) {
try {
Thing thing = plugin.getThingManager().parse(reward.trim());
ThingPicker picker = new SingleThingPicker(thing);
pickers.add(picker);
} catch (InvalidThingInputString e) {
throw new ConfigError("Failed to parse reward for wave " + wave + " in the '" + type + "' branch of arena " + arena + ": " + e.getInput());
}
try {
String wrapped = "random(" + rewards + ")";
ThingPicker picker = plugin.getThingPickerManager().parse(wrapped);
result.put(wave, picker);
} catch (InvalidThingInputString e) {
throw new ConfigError("Failed to parse reward for wave " + wave + " in the '" + type + "' branch of arena " + arena + ": " + e.getInput());
}
result.put(wave, new RandomThingPicker(pickers, MobArena.random));
}
return result;
}