Merge pull request #8 from Unprotesting/WIP/Shop-Overhaul

WIP/Shop-Overhaul

Auto-Tune/dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>unprotesting.com.github</groupId>
   <artifactId>Auto-Tune</artifactId>
   <name>Auto-Tune</name>
-  <version>0.11.1</version>
+  <version>0.12.0-pre-release-1</version>
   <description>The automatic pricing plugin for minecraft</description>
   <url>https://github.com/Unprotesting/Auto-Tune</url>
   <issueManagement>
@@ -26,6 +26,7 @@
           <include>plugin.yml</include>
           <include>config.yml</include>
           <include>shops.yml</include>
+          <include>enchantments.yml</include>
           <include>web/trade.html</include>
           <include>web/trade-short.html</include>
         </includes>

Auto-Tune/pom.xml

@@ -9,7 +9,7 @@
   <!-- Project information -->
   <groupId>unprotesting.com.github</groupId>
   <artifactId>Auto-Tune</artifactId>
-  <version>0.11.1</version>
+  <version>0.12.0-pre-release-1</version>
  <!-- Info -->
   <name>Auto-Tune</name>
   <url>https://github.com/Unprotesting/Auto-Tune</url>
@@ -104,6 +104,7 @@
           <include>plugin.yml</include>
           <include>config.yml</include>
           <include>shops.yml</include>
+          <include>enchantments.yml</include>
           <include>web/trade.html</include>
           <include>web/trade-short.html</include>
         </includes>

Auto-Tune/src/resources/config.yml

@@ -133,6 +133,15 @@ intrest-rate-update-period: 1200
 ##  Example: -10.00
 max-debt-value: -10000.00
 
+##  The percentage value to decrease items sold with enchantments
+##  Info: Stacked enchantments etc. can become very expensive so a number between 5% - 15% is usually fine
+##  Info: This doesn't affect buys
+enchantment-limiter: 7.50
+
+##  The percentage value to decrease items sold with a loss in durability
+##  Info: This is applied ON TOP of the durability algorithm to limit the exploitability of selling tools
+durability-limiter: 5.00
+
 ##  -- Other Settings --
 
 ##  Enable debug mode for more info on price calculations

Auto-Tune/src/resources/enchantments.yml

@@ -0,0 +1,162 @@
+
+# ░█████╗░██╗░░░██╗████████╗░█████╗░░░░░░░████████╗██╗░░░██╗███╗░░██╗███████╗
+# ██╔══██╗██║░░░██║╚══██╔══╝██╔══██╗░░░░░░╚══██╔══╝██║░░░██║████╗░██║██╔════╝
+# ███████║██║░░░██║░░░██║░░░██║░░██║█████╗░░░██║░░░██║░░░██║██╔██╗██║█████╗░░
+# ██╔══██║██║░░░██║░░░██║░░░██║░░██║╚════╝░░░██║░░░██║░░░██║██║╚████║██╔══╝░░
+# ██║░░██║╚██████╔╝░░░██║░░░╚█████╔╝░░░░░░░░░██║░░░╚██████╔╝██║░╚███║███████╗
+# ╚═╝░░╚═╝░╚═════╝░░░░╚═╝░░░░╚════╝░░░░░░░░░░╚═╝░░░░╚═════╝░╚═╝░░╚══╝╚══════╝
+
+enchantments:
+  ARROW_DAMAGE:
+    price: 600.00 ##  <- An added price for buying/selling an item with this enchantment
+    ratio: 0.6  ##   <- Another added percentage of the item bought/sold with this enchantment
+    ##  Info: An item worth usually 100 will cost (100*1.6)+600=760
+    ##  Provides extra damage when shooting arrows from bows
+  ARROW_FIRE:
+    price:  750.00
+    ratio: 0.8
+    ##  Sets entities on fire when hit by arrows shot from a bow
+  ARROW_INFINITE:
+    price: 1500.00
+    ratio: 1.2
+    ##  Provides infinite arrows when shooting a bow
+  ARROW_KNOCKBACK:
+    price: 900.00
+    ratio: 0.75
+    ##  Provides a knockback when an entity is hit by an arrow from a bow
+  BINDING_CURSE:
+    price: 80.00
+    ratio: 0.1
+    ##  Item cannot be removed
+  CHANNELING:
+    price: 600.00
+    ratio: 1.0
+    ##  Strikes lightning when a mob is hit with a trident if conditions are stormy
+  DAMAGE_ALL:
+    price: 750.00
+    ratio: 0.8
+    ##  Increases damage against all targets
+  DAMAGE_ARTHROPODS:
+    price: 700.00
+    ratio: 0.85
+    ##  Increases damage against arthropod targets
+  DAMAGE_UNDEAD:
+    price: 700.00
+    ratio: 0.85
+    ##  Increases damage against undead targets
+  DEPTH_STRIDER:
+    price: 900.00
+    ratio: 0.8
+    ##  Increases walking speed while in water
+  DIG_SPEED:
+    price: 850.00
+    ratio: 0.75
+    ##  Increases the rate at which you mine/dig
+  DURABILITY:
+    price: 850.00
+    ratio: 0.85
+    ##  Decreases the rate at which a tool looses durability
+  FIRE_ASPECT:
+    price: 1000.00
+    ratio: 0.9
+    ##  When attacking a target, has a chance to set them on fire
+  FROST_WALKER:
+    price: 1100.00
+    ratio: 1.0
+    ##  Freezes any still water adjacent to ice / frost which player is walking on
+  IMPALING:
+    price: 650.00
+    ratio: 0.8
+    ##  Deals more damage to mobs that live in the ocean
+  KNOCKBACK:
+    price: 975.00
+    ratio: 0.8
+    ##  All damage to other targets will knock them back when hit
+  LOOT_BONUS_BLOCKS:
+    price: 1250.00
+    ratio: 1.45
+    ##  Provides a chance of gaining extra loot when destroying blocks
+  LOOT_BONUS_MOBS:
+    price: 1200.00
+    ratio: 1.35
+    ##  Provides a chance of gaining extra loot when killing monsters
+  LOYALTY:
+    price: 1100.00
+    ratio: 0.8
+    ##  Causes a thrown trident to return to the player who threw it
+  LUCK:
+    price: 750.00
+    ratio: 1.2
+    ##  Decreases odds of catching worthless junk
+  LURE:
+    price: 550.00
+    ratio: 0.5
+    ##  Increases rate of fish biting your hook
+  MENDING:
+    price: 4000.00
+    ratio: 2.25
+    ##  Allows mending the item using experience orbs
+  MULTISHOT:
+    price: 800.00
+    ratio: 0.8 
+    ##  Shoot multiple arrows from crossbows
+  OXYGEN:
+    price: 600.00
+    ratio: 0.7
+    ##  Decreases the rate of air loss whilst underwater
+  PIERCING:
+    price: 750.00
+    ratio: 0.8
+    ##  Crossbow projectiles pierce entities
+  PROTECTION_ENVIRONMENTAL:
+    price: 900.00
+    ratio: 0.8
+    ##  Provides protection against environmental damage
+  PROTECTION_EXPLOSIONS:
+    price: 950.00
+    ratio: 0.85
+    ##  Provides protection against explosive damage
+  PROTECTION_FALL:
+    price: 950.00
+    ratio: 0.85
+    ##  Provides protection against fall damage
+  PROTECTION_FIRE:
+    price: 950.00
+    ratio: 0.8
+    ##  Provides protection against fire damage
+  PROTECTION_PROJECTILE:
+    price: 950.00
+    ratio: 0.85
+    ##  Provides protection against projectile damage
+  QUICK_CHARGE:
+    price: 800.00
+    ratio: 0.85
+    ##  Charges crossbows quickly
+  RIPTIDE:
+    price: 1050.00
+    ratio: 0.8
+    ##  When it is rainy, launches the player in the direction their trident is thrown
+  SILK_TOUCH:
+    price: 1300.00
+    ratio: 1.2
+    ##  Allows blocks to drop themselves instead of fragments (for example, stone instead of cobblestone)
+  SOUL_SPEED:
+    price: 1450.00
+    ratio: 1.5
+    ##  Walk quicker on soul blocks
+  SWEEPING_EDGE:
+    price: 1900.00
+    ratio: 0.9
+    ##  Increases damage against targets when using a sweep attack
+  THORNS:
+    price: 1600.00
+    ratio: 1.25
+    ##  Damages the attacker
+  VANISHING_CURSE:
+    price: 50.00
+    ratio: 0.3
+    ##  Item disappears instead of dropping
+  WATER_WORKER:
+    price: 800.00
+    ratio: 0.85
+    ##  Increases the speed at which a player may mine underwater

Auto-Tune/src/resources/plugin.yml

@@ -30,9 +30,6 @@ commands:
     sell:
       description: Sell items quickly to the shop.
       usage: /<sell>
-    atadmin:
-      description: Auto-Tune Admin Command.
-      usage: /<atadmin> <skip>
     autosell:
       description: Auto-Tune Auto Sell Command
       usage: /<autosell>
@@ -50,6 +47,8 @@ commands:
       usage: <GDP>
     atconfig:
       description: View and change plugin config settings
+    buy:
+      description: Buy items not available in the shop
 permssions:
   at.help:
     description: Displays Auto-Tune help information
@@ -84,6 +83,9 @@ permssions:
   at.tutorial:
     description: Allow players to view tutorial messages
     default: true
+  at.buy:
+    description: Allow players to purchase custom items
+    default: true