Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-11-27 04:55:25 +01:00
Code Issues Projects Releases Wiki Activity

Swap amplifier and duration parameters in effect parser.

Browse Source 
This changes the format from:

  <effect>:<duration>:<amplifier>

to a (pressumably) more user-friendly format of:

  <effect>:<amplifier>:<duration>

The reason for this swap is that the duration is more likely to be
wanted left at default than the amplifier. From previous user input
on the matter, it sounds like users generally want the bosses to have
"permanent" or "infinite duration" effects, and this change makes it
a little easier on them, not having to specify a duration.
This commit is contained in:
garbagemule 2014-12-08 16:38:33 +01:00
parent 47f22f75ab
commit 409c3f6c14
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/garbagemule/MobArena/util/PotionEffectParser.java
View File

@ -11,8 +11,8 @@ import com.garbagemule.MobArena.Messenger;
public class PotionEffectParser public class PotionEffectParser
{ {
private static final int TICKS_PER_SECOND = 20; private static final int TICKS_PER_SECOND = 20;
private static final int DEFAULT_POTION_DURATION = Integer.MAX_VALUE;
private static final int DEFAULT_POTION_AMPLIFIER = 0; private static final int DEFAULT_POTION_AMPLIFIER = 0;
private static final int DEFAULT_POTION_DURATION = Integer.MAX_VALUE;
public static List<PotionEffect> parsePotionEffects(String s) { public static List<PotionEffect> parsePotionEffects(String s) {
if (s == null || s.isEmpty()) if (s == null || s.isEmpty())
@ -41,10 +41,10 @@ public class PotionEffectParser
result = parseSingle(parts[0]); result = parseSingle(parts[0]);
break; break;
case 2: case 2:
result = withDuration(parts[0], parts[1]); result = withAmplifier(parts[0], parts[1]);
break; break;
case 3: case 3:
result = withDurationAndAmplifier(parts[0], parts[1], parts[2]); result = withAmplifierAndDuration(parts[0], parts[1], parts[2]);
break; break;
} }
@ -66,21 +66,21 @@ public class PotionEffectParser
} }
} }
private static PotionEffect withDuration(String type, String duration) { private static PotionEffect withAmplifier(String type, String amplifier) {
PotionEffectType effect = getType(type); PotionEffectType effect = getType(type);
int dur = getDuration(duration); int amp = getAmplification(amplifier);
if (effect == null || dur == -1) { if (effect == null || amp == -1) {
return null; return null;
} else { } else {
return new PotionEffect(effect, dur * TICKS_PER_SECOND, DEFAULT_POTION_AMPLIFIER); return new PotionEffect(effect, DEFAULT_POTION_DURATION, amp);
} }
} }
private static PotionEffect withDurationAndAmplifier(String type, String duration, String amplifier) { private static PotionEffect withAmplifierAndDuration(String type, String amplifier, String duration) {
PotionEffectType effect = getType(type); PotionEffectType effect = getType(type);
int dur = getDuration(duration);
int amp = getAmplification(amplifier); int amp = getAmplification(amplifier);
int dur = getDuration(duration);
if (effect == null || dur == -1 || amp == -1) { if (effect == null || dur == -1 || amp == -1) {
return null; return null;