exituser/Brewery
1
0
Fork 0
mirror of https://github.com/exituser/Brewery.git synced 2026-09-17 07:49:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented Commands and Random Wakeups

Browse Source
This commit is contained in:
Sn0wStorm
2013-07-28 23:53:35 +02:00
parent 8e11062f56
commit da0b1ddf54
9 changed files with 681 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/dre/brewery/BPlayer.java
+32 -10
View File
@@ -93,14 +93,7 @@ public class BPlayer {
}
} else {
if (P.p.getConfig().getBoolean("enableKickOnOverdrink", false)) {
bPlayer.passOut(player);
} else {
bPlayer.quality = bPlayer.getQuality() * 100;
bPlayer.drunkeness = 100;
addPuke(player, 60 + (int) (Math.random() * 60));
P.p.msg(player, "Du kannst nicht mehr trinken");
}
bPlayer.drinkCap(player);
}
P.p.msg(player, "Du bist nun " + bPlayer.drunkeness + "% betrunken, mit einer Qualität von " + bPlayer.getQuality());
return true;
@@ -108,6 +101,18 @@ public class BPlayer {
return false;
}
// Player has drunken too much
public void drinkCap(Player player) {
if (P.p.getConfig().getBoolean("enableKickOnOverdrink", false)) {
passOut(player);
} else {
quality = getQuality() * 100;
drunkeness = 100;
addPuke(player, 60 + (int) (Math.random() * 60.0));
P.p.msg(player, "Du kannst nicht mehr trinken");
}
}
// push the player around if he moves
public static void playerMove(PlayerMoveEvent event) {
BPlayer bPlayer = get(event.getPlayer().getName());
@@ -217,8 +222,12 @@ public class BPlayer {
// wird der spieler noch gebraucht?
players.remove(player.getName());
} else if (offlineDrunk - drunkeness >= 20) {
// TODO some random teleport later
} else if (offlineDrunk - drunkeness >= 30) {
Location randomLoc = Wakeup.getRandom(player.getLocation());
if (randomLoc != null) {
player.teleport(randomLoc);
P.p.msg(player, P.p.getConfig().getString("wakeString", "Ohh nein! Ich kann mich nicht erinnern, wie ich hier hergekommen bin..."));
}
}
offlineDrunk = 0;
@@ -421,6 +430,19 @@ public class BPlayer {
return drunkeness;
}
public void setData(int drunkeness, int quality) {
if (quality > 0) {
this.quality = quality * drunkeness;
} else {
if (this.quality == 0) {
this.quality = 5 * drunkeness;
} else {
this.quality = getQuality() * drunkeness;
}
}
this.drunkeness = drunkeness;
}
public int getQuality() {
if (drunkeness == 0) {
P.p.errorLog("drunkeness should not be 0!");