From a49096e15cb50d0ae02a293e7d048192b06d1a82 Mon Sep 17 00:00:00 2001 From: dginovker Date: Wed, 19 Jun 2019 16:28:34 -0400 Subject: [PATCH] Sound fix --- 2006Redone Client/src/SoundPlayer.java | 32 ++++++------------ 2006Redone Server/data/characters/irdb.txt | 19 +++++------ .../src/redone/net/ActionSender.java | 23 +++++++++---- .../redone/net/packets/impl/PickupItem.java | 4 --- .../src/redone/world/ItemHandler.java | 3 -- .../redone/net/ActionSender.class | Bin 15079 -> 15459 bytes .../net/packets/impl/PickupItem$1.class | Bin 1453 -> 1453 bytes .../redone/net/packets/impl/PickupItem.class | Bin 4607 -> 4511 bytes .../2006Redone_Client/SoundPlayer.class | Bin 3188 -> 3103 bytes 9 files changed, 36 insertions(+), 45 deletions(-) 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 6b1a702436f63a95096f39da19be81c0f2342fd8..21f3e35e9dce5cbb5856ec70d62202cd48331ca1 100644 GIT binary patch literal 15459 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 z z@!^f_#QX7zcdWcS){!gPmVb2vmv?O+F7M_;_cbr#mb}nWw|R?Z6^|{8N~{8^uzWPw zDx|TNpU$-cRAU8cp%tR#_zx$mtzMo;7B^Cen|K^ou~(9FT)qF15EZ9ydg3w4&DG%a zTc-Wl1b*cP)r0~eifYa8AnB^zcT&*{yXDg}J>I7>x)q~7Rv#K-^#$@Wg;Hm9ZxbqS z8Cg{{=r_iK{0~#l+~dU48IDj7(?pHJG?DHO2_Qnso_fq7y#iH1)fxXPA0t27MbKO;DW%kl!(>>kV9xti8g3T&zLXi>UIiUEEC+4b_vq z+;rfkX-qi9UW9t>VpTz?<7udM4vn)W(0SHGnqy6(#nxnMw5EDYVTIvjh2dm{*^gLZ z_9J9_IiH$g3XO_CcRMJBa3oc6|550kx@c0PaA#WI=SaU8)tgXS>laYannh8on)+F@ z6(C*P_BVj~8$kWl;$mw3&F0Qg({Q#xw$gA8H?ke5WvhB#2&#mR8WZ&DS_8rUpEZvL zT6J`mb)f>HJI>(_5U1lj3v1v*OB~}UNDI(!qT}S(_R-|hDP1(RVkdv8q9l~uMKS!O z9-(4XujiJY*G1DB_g0jY#vi4b__=pCP2ES+_tT7NfwI60Q-TFkLa|URxSJ}=08b`Ve~1@9m@WD-b=Nj}_uw4L+8L1!9G}=?Pgwx>a8n&1^hG z7p#yI49@b6-cQxhX7s}`|AhTC`vBEU3u56iyn32baggSAQSG!4Ce6E_R#%i*#ShVP z+&8|9>h7b37_TqA@DN?J;sDK;lP+3Nx)2BHiWikG233alRtrim#sSwWWps(A2MfIv zbQd)oq-FR#c+dL{duWdfRUXkDYpf8DI1y|>z~Y^m0UN}me;6#d{(Hd6*F3r^+<;wr zvKGQd7g5AoO#Q8kX_&PHCena#u#7IYE}<1xBVBGSr#Q}AtxG9qT}D@0m(zA@H9cvq zq5W2zp10Q0D^?S|X*F}Dbs3Me5gD}FsKOoX?H!Hc z`=^NGn51=%{1P+g=($sw8Yv$msz(`!nzG+d^>Hm?odL| zFoE2U@uIw1`X@zFLJ#B( z0~X*^|B~#T4C;;gx@5YK0@nQ$vL2wA^&pM5c2YGG@j~lixb-e-wsylP9`P7LyOBY= dkwLqWLA#MbJKhMnc@muCKhDxGz^g^?{5O+zL7D&n literal 15079 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 JAT9dg-vN4*#XJB2 diff --git a/2006Redone_Server/redone/net/packets/impl/PickupItem$1.class b/2006Redone_Server/redone/net/packets/impl/PickupItem$1.class index 49f12a733ae4ee95417df7824435c248db8e0e70..01d7fb40fe919e4f93969a4198e7219513adf2aa 100644 GIT binary patch delta 49 zcmZ3>y_S1J8Vh6ay_S1J8Vh6ixm4DmoRak30+7;7p62SeKAa#k|{ DDS!(1 diff --git a/2006Redone_Server/redone/net/packets/impl/PickupItem.class b/2006Redone_Server/redone/net/packets/impl/PickupItem.class index 0643b7046ef334ee27853ab35145fc5e3106f0d1..72e1a9d8f31f5a6c32778f81d6bc898d57bd1554 100644 GIT binary patch delta 1427 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 delta 1152 zcmX|=*>e;OTL z=ObQ-S;&j|Ge;qRX53)JpwnQ!;PmeXmOX95{RrBAgou|S4&)*ZPX0C?Gphp{2J3t4%|rF!9nHN1ySLT*9UY82+GuwirWWzC z4PJ5FY8wypYQ$@f*GU~KxGv(2fJ@VhiZj#hU|Kqno45E)$6LH@GVeHAXmz~H`;HsA z$?*XnMttNr%EyjR_$-~uEx3Fmn;e_j;`p2i#}|C*_=;nWug&yvY5_CS$#6!&@eQ?; z>+@4V@NL>w{IxI{(0)bwM{!oVsuZQ2(P;iez&!8fm#7k)l>8i@DwWzdFV`m#a4ls* zbFS8fX3w+Cc~)~gt9s9Bk!SVGvw9#dTPMW@>2=U4ye*w5bp_S*&r(y*T4ffI7q-&H zIL+`DbZeR{_I&N>Et5f1LW^v*%D_tQ({*jt zN8PXM*iMxJwS7