From d737aa398bb19d21e640c82b7a9fad53effa8a40 Mon Sep 17 00:00:00 2001 From: dginovker Date: Fri, 4 Oct 2019 16:56:36 -0400 Subject: [PATCH] Fixed shops.. again --- .../data/logs/shopselling/irdb.txt | 21 ++++++++++++++++++ .../src/redone/game/shops/ShopAssistant.java | 1 + .../skills/fletching/LogCutting$1.class | Bin 2274 -> 2292 bytes .../skills/fletching/LogCutting$2.class | Bin 1237 -> 1237 bytes .../content/skills/fletching/LogCutting.class | Bin 7304 -> 7304 bytes .../redone/game/shops/ShopAssistant.class | Bin 12726 -> 12748 bytes 6 files changed, 22 insertions(+) diff --git a/2006Redone Server/data/logs/shopselling/irdb.txt b/2006Redone Server/data/logs/shopselling/irdb.txt index 6cfe3800..724da0a0 100644 --- a/2006Redone Server/data/logs/shopselling/irdb.txt +++ b/2006Redone Server/data/logs/shopselling/irdb.txt @@ -1,2 +1,23 @@ [2019/10/04] 10:46 irdb sold thread to store id: 24 for 2 coins [2019/10/04] 10:47 irdb sold bronze dagger to store id: 88 for 8 coins +[2019/10/04] 16:54 irdb sold bronze dagger to store id: 88 for 8 coins +[2019/10/04] 16:54 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:54 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:54 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:54 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:54 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:54 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:54 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:54 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:54 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:54 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:55 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:55 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:55 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:55 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:55 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:55 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:55 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:55 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:55 irdb sold bucket to store id: 88 for 0 coins +[2019/10/04] 16:55 irdb sold bucket to store id: 88 for 0 coins diff --git a/2006Redone Server/src/redone/game/shops/ShopAssistant.java b/2006Redone Server/src/redone/game/shops/ShopAssistant.java index 5f1dbda1..91d03225 100644 --- a/2006Redone Server/src/redone/game/shops/ShopAssistant.java +++ b/2006Redone Server/src/redone/game/shops/ShopAssistant.java @@ -113,6 +113,7 @@ public class ShopAssistant { for (int i = 0; i < Constants.ITEM_LIMIT; i++) { if (ItemDefinitions.getDef()[i] != null) { ShopValue = ItemDefinitions.getDef()[ItemID].highAlch/3.0 *5.0 * sellingRatio; + ShopValue = ShopValue <= 0 ? 1 : ShopValue; //Don't let the value be 0 } } diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/LogCutting$1.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/LogCutting$1.class index 58b1f1285990686e38d6aba0cb9489948b96184c..fb62855fd1cf7a4efa4802f96c1acceb9746a111 100644 GIT binary patch delta 306 zcmYL@%`O9B7=@piPUib&GO0`=w#0&{7VXGr#b1B4m6Fh%SYgo%&`5W^1@UdTgDz~e z^bWdUZNZiWVr!)v-ypF$?|a_!Cg*wfKmD_*q{BKJE_n)(6eB6QtgbFgN*&+kRYj@24kKD4AOe{u!qz}hU|~V8QL3?O=FppI9m~U(U>27aI%s2yd`PIKkLpgnLQ< zUk}ix>Nb@&XKu&V;+a>s)GIK-BGVLEV2Olfwpihmm_B8$sBkOk?pWnsLO)XDi8{|T zd7;G{ZQkV~C*Y|+JRy-N2|}I%O1^`SlZ^kcKbg(SrYIyOJZPA6o%6QQ>=3YP9(3s! D7c@5S diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/LogCutting$2.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/LogCutting$2.class index c88b3eb4ba215a3ea81ed9226bbcb94c987494f2..6c37c31b99bab0523f40a3dd0996acb8d7d7560a 100644 GIT binary patch delta 53 zcmcc0d6jd+A!f$V$%mPfL?aov7@`>X7@`^Y8Dbd}7~&YT7!oF1vBYquFmN!WG6*uH JO`gwU1^{b{3)}zz delta 53 zcmcc0d6jd+A!f#q$%mPfL?alu7$OX8Dba|7-AW;7~&^evBYpDGjK4ZFbFcF JPM*(V1^{Z53(^1p diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/LogCutting.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/fletching/LogCutting.class index d9b68c5819719afbf2ea0ec2ce96b659ff265018..e95a2de83d151599cf0141314669a6e65b2f3ffa 100644 GIT binary patch delta 1001 zcmWNPYfKkZ7>A$VIp^P?flelELJ<^;#h1x}hFPT5dS+X#NK<2hsF`PJUcIXi{(Hj@iBi$Cpb{;~!9ZHpMP zLH@OGa>qENrea*4#<_frcXM@xE7kNc+%uxDNhAEwB zWe}%3Nzz^1rn{N0Y22?Yay6ZYbq|m0UWzn>7jz$`%4UORQma}1R@weW4^$+LO=&8P z3RC_=ge#XQ%_c^VFjjdaD4%3KMw*^rs-7fWbI8_HJgNfb`8X`nJYLd#mZ{L^s)+Sk zzz2HTpMN2pdWL>q59&33(h5%Mji!sE5=^knV^(@hxyP*XmrH>>P3Qa% D3|0dB delta 1001 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