diff --git a/2006Redone Client/src/SoundPlayer.java b/2006Redone Client/src/SoundPlayer.java index 59e0ad80..0b1f5673 100644 --- a/2006Redone Client/src/SoundPlayer.java +++ b/2006Redone Client/src/SoundPlayer.java @@ -88,28 +88,18 @@ public class SoundPlayer implements Runnable { */ public float getDecibels(int level) { switch (level) { - case 1: - return (float) -80.0; - case 2: - return (float) -70.0; - case 3: - return (float) -60.0; - case 4: - return (float) -50.0; - case 5: - return (float) -40.0; - case 6: - return (float) -30.0; - case 7: - return (float) -20.0; - case 8: - return (float) -10.0; - case 9: - return (float) -0.0; - case 10: - return (float) 6.0; + case 0: // 4 in player options + return (float) -1.0f; + case 1: // 3 + return (float) -5.0f; + case 2: // 2 + return (float) -10.0f; + case 3: // 1 + return (float) -15.0f; + case 4: // off + return (float) -100.0f; default: - return (float) 0.0; + return (float) 0.0f; } } } \ No newline at end of file diff --git a/2006Redone Server/data/characters/irdb.txt b/2006Redone Server/data/characters/irdb.txt index 3eb0bd35..d43ba87b 100644 --- a/2006Redone Server/data/characters/irdb.txt +++ b/2006Redone Server/data/characters/irdb.txt @@ -3,9 +3,9 @@ character-username = irdb character-password = pwjojo [CHARACTER] -character-height = 0 -character-posx = 3237 -character-posy = 3217 +character-height = 2 +character-posx = 3209 +character-posy = 3220 character-rights = 0 hasStarter = false bankPin1 = 0 @@ -37,7 +37,7 @@ village = false lastThieve = 0 homeTele = 0 strongHold = false -character-energy = 55 +character-energy = 100 crystal-bow-shots = 0 splitChat = false canSpeak = true @@ -55,9 +55,9 @@ blackMarks = 0 tutorial-progress = 36 skull-timer = 0 recoilHits = 0 -lastX = 3235 -lastY = 3219 -lastH = 0 +lastX = 3209 +lastY = 3220 +lastH = 2 removedTask0 = -1 removedTask1 = -1 removedTask2 = -1 @@ -70,7 +70,7 @@ membership = false questPoints = 0 bananas = 0 magic-book = 0 -special-amount = 2.5 +special-amount = 10.0 musicOn = false needsNewTask = false luthas = false @@ -176,16 +176,15 @@ character-item = 6 2310 1 character-item = 7 1266 1 character-item = 8 1206 1 character-item = 9 1278 1 -character-item = 10 1172 1 character-item = 12 883 25 character-item = 13 557 25 -character-item = 15 556 6 character-item = 16 558 4 character-item = 17 560 2 [BANK] [FRIENDS] +character-friend = 0 211559 [IGNORES] diff --git a/2006Redone Server/src/redone/net/ActionSender.java b/2006Redone Server/src/redone/net/ActionSender.java index 0eee438a..f152fd98 100644 --- a/2006Redone Server/src/redone/net/ActionSender.java +++ b/2006Redone Server/src/redone/net/ActionSender.java @@ -2,6 +2,7 @@ package redone.net; import java.text.DecimalFormat; +import redone.Server; import redone.game.items.GroundItem; import redone.game.items.ItemAssistant; import redone.game.players.Client; @@ -9,10 +10,8 @@ import redone.game.players.Player; import redone.game.players.PlayerHandler; import redone.util.GameLogger; import redone.util.Misc; -import redone.world.ItemHandler; import redone.world.clip.Region; -import static redone.Server.itemHandler; import static redone.world.ItemHandler.HIDE_TICKS; public class ActionSender { @@ -588,19 +587,27 @@ public class ActionSender { } public void createGroundItem(Client player, int itemId, int itemX, int itemY, int itemAmount, int playerId) { + System.out.println("Here"); if (itemId > 0) { if (itemId >= 2412 && itemId <= 2414) { player.getActionSender().sendMessage("The cape vanishes as it touches the ground."); return; } - + if (itemId > 4705 && itemId < 4760) { + for (int[] brokenBarrow : Server.itemHandler.brokenBarrows) { + if (brokenBarrow[0] == itemId) { + itemId = brokenBarrow[1]; + break; + } + } + } if (!redone.game.items.Item.itemStackable[itemId] && itemAmount > 0) { for (int j = 0; j < itemAmount; j++) { player.getActionSender().createGroundItem(itemId, itemX, itemY, 1); GroundItem item = new GroundItem(itemId, itemX, itemY, player.getH(), 1, player.playerId, HIDE_TICKS, PlayerHandler.players[playerId].playerName); - itemHandler.addItem(item); + Server.itemHandler.addItem(item); String itemName = ItemAssistant.getItemName(itemId).toLowerCase(); - if (!player.isDead && itemId != 526) { + if (player.isDead == false && itemId != 526) { if (player.getPlayerAssistant().isPlayer()) { GameLogger.writeLog(player.playerName, "dropitem", player.playerName + " dropped " + itemAmount + " " + itemName + " absX: " + player.absX + " absY: " + player.absY + ""); } @@ -609,9 +616,9 @@ public class ActionSender { } else { player.getActionSender().createGroundItem(itemId, itemX, itemY, itemAmount); GroundItem item = new GroundItem(itemId, itemX, itemY, player.getH(), itemAmount, player.playerId, HIDE_TICKS, PlayerHandler.players[playerId].playerName); - itemHandler.addItem(item); + Server.itemHandler.addItem(item); String itemName = ItemAssistant.getItemName(itemId).toLowerCase(); - if (!player.isDead && itemId != 526) { + if (player.isDead == false && itemId != 526) { if (player.getPlayerAssistant().isPlayer()) { GameLogger.writeLog(player.playerName, "dropitem", player.playerName + " dropped " + itemAmount + " " + itemName + " absX: " + player.absX + " absY: " + player.absY + ""); } @@ -621,6 +628,8 @@ public class ActionSender { } public ActionSender createGroundItem(int itemID, int itemX, int itemY, int itemAmount) { + System.out.println("Wtf fucks sake"); + createGroundItem(this.player, itemID, itemX, itemY, itemAmount, this.player.getId()); player.getOutStream().createFrame(85); player.getOutStream().writeByteC(itemY - 8 * player.mapRegionY); player.getOutStream().writeByteC(itemX - 8 * player.mapRegionX); diff --git a/2006Redone Server/src/redone/net/packets/impl/PickupItem.java b/2006Redone Server/src/redone/net/packets/impl/PickupItem.java index 1e29416e..ddd33621 100644 --- a/2006Redone Server/src/redone/net/packets/impl/PickupItem.java +++ b/2006Redone Server/src/redone/net/packets/impl/PickupItem.java @@ -31,10 +31,6 @@ public class PickupItem implements PacketType { player.resetWalkingQueue(); return; } - if(!Server.itemHandler.itemExists(player.pItemId, player.pItemX, player.pItemY)) { - player.stopMovement(); - return; - } player.getCombatAssistant().resetPlayerAttack(); if (player.stopPlayerPacket) { return; diff --git a/2006Redone Server/src/redone/world/ItemHandler.java b/2006Redone Server/src/redone/world/ItemHandler.java index 969dcd1e..6e206e7b 100644 --- a/2006Redone Server/src/redone/world/ItemHandler.java +++ b/2006Redone Server/src/redone/world/ItemHandler.java @@ -170,9 +170,6 @@ public int itemAmount(String name, int itemId, int itemX, int itemY) { } } } - if (player.isDead == false) { - return; - } if (!redone.game.items.Item.itemStackable[itemId] && itemAmount > 0) { for (int j = 0; j < itemAmount; j++) { player.getActionSender().createGroundItem(itemId, itemX, itemY, 1); diff --git a/2006Redone_Server/redone/net/ActionSender.class b/2006Redone_Server/redone/net/ActionSender.class index 6b1a7024..21f3e35e 100644 Binary files a/2006Redone_Server/redone/net/ActionSender.class and b/2006Redone_Server/redone/net/ActionSender.class differ diff --git a/2006Redone_Server/redone/net/packets/impl/PickupItem$1.class b/2006Redone_Server/redone/net/packets/impl/PickupItem$1.class index 49f12a73..01d7fb40 100644 Binary files a/2006Redone_Server/redone/net/packets/impl/PickupItem$1.class and b/2006Redone_Server/redone/net/packets/impl/PickupItem$1.class differ diff --git a/2006Redone_Server/redone/net/packets/impl/PickupItem.class b/2006Redone_Server/redone/net/packets/impl/PickupItem.class index 0643b704..72e1a9d8 100644 Binary files a/2006Redone_Server/redone/net/packets/impl/PickupItem.class and b/2006Redone_Server/redone/net/packets/impl/PickupItem.class differ diff --git a/production/2006Redone_Client/SoundPlayer.class b/production/2006Redone_Client/SoundPlayer.class index e4753b79..58f256bd 100644 Binary files a/production/2006Redone_Client/SoundPlayer.class and b/production/2006Redone_Client/SoundPlayer.class differ