From d9e3d08ff845b5439c8d62e6efd9f162ece0e6af Mon Sep 17 00:00:00 2001 From: MitchvanWijngaarden Date: Tue, 8 Oct 2019 19:37:44 +0200 Subject: [PATCH] Added in randomToggle check to burying bones (#35) * bandaid fix fletching * local * Removed prayer random if user has randoms toggled off. --- .idea/2006rebotted.iml | 72 +++++++++++++++++++ .idea/misc.xml | 2 +- 2006Redone Server/data/logs/dropitem/test.txt | 1 + .../data/logs/pickupitem/test.txt | 9 +++ .../game/content/skills/core/Prayer.java | 10 +-- 5 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 2006Redone Server/data/logs/dropitem/test.txt create mode 100644 2006Redone Server/data/logs/pickupitem/test.txt diff --git a/.idea/2006rebotted.iml b/.idea/2006rebotted.iml index f908678b..76d4d5dd 100644 --- a/.idea/2006rebotted.iml +++ b/.idea/2006rebotted.iml @@ -99,5 +99,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index dc3ff854..048d263d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/2006Redone Server/data/logs/dropitem/test.txt b/2006Redone Server/data/logs/dropitem/test.txt new file mode 100644 index 00000000..d238c5ee --- /dev/null +++ b/2006Redone Server/data/logs/dropitem/test.txt @@ -0,0 +1 @@ +[2019/10/04] 22:10 test dropped 3 coins absX: 3224 absY: 3202 diff --git a/2006Redone Server/data/logs/pickupitem/test.txt b/2006Redone Server/data/logs/pickupitem/test.txt new file mode 100644 index 00000000..285a2d06 --- /dev/null +++ b/2006Redone Server/data/logs/pickupitem/test.txt @@ -0,0 +1,9 @@ +[2019/10/04] 22:06 test picked up knife itemX: 3224, itemY: 3202 +[2019/10/04] 22:10 test picked up knife itemX: 3224, itemY: 3202 +[2019/10/04] 22:10 test picked up knife itemX: 3224, itemY: 3202 +[2019/10/04] 22:11 test picked up coins itemX: 3224, itemY: 3202 +[2019/10/04] 22:16 test picked up knife itemX: 3224, itemY: 3202 +[2019/10/04] 22:16 test picked up knife itemX: 3224, itemY: 3202 +[2019/10/04] 22:16 test picked up knife itemX: 3224, itemY: 3202 +[2019/10/04] 22:23 test picked up knife itemX: 3224, itemY: 3202 +[2019/10/04] 22:24 test picked up knife itemX: 3224, itemY: 3202 diff --git a/2006Redone Server/src/redone/game/content/skills/core/Prayer.java b/2006Redone Server/src/redone/game/content/skills/core/Prayer.java index ffef00b6..5ca71df5 100644 --- a/2006Redone Server/src/redone/game/content/skills/core/Prayer.java +++ b/2006Redone Server/src/redone/game/content/skills/core/Prayer.java @@ -55,10 +55,12 @@ public class Prayer { } private static void handleBones(final Client c, int i, int slot) { - if (Misc.random(300) == 4 && c.shadeSpawned == false) { - Zombie.spawnZombie(c); - } else if (Misc.random(300) == 2 && c.zombieSpawned == false) { - Shade.spawnShade(c); + if(!c.randomToggle) { + if (Misc.random(300) == 4 && c.shadeSpawned == false) { + Zombie.spawnZombie(c); + } else if (Misc.random(300) == 2 && c.zombieSpawned == false) { + Shade.spawnShade(c); + } } for (final int[] element : data) { if (i == element[0]) {