Sfoglia il codice sorgente

Treasure Hunter (Exc.) is now Archaelogy, retro mode now scales up treasure drop level requirements by 10, the default file has been edited to reflect this change, I recommend regenerating your treasures.yml by deleting it for now

nossr50 6 anni fa
parent
commit
97670f14d1

+ 1 - 0
Changelog.txt

@@ -72,6 +72,7 @@ Version 2.1.0
  ! (Experience) Skills now start at level 1 (configurable in advanced.yml)
  ! (Item) Improved some of the messages sent to the player regarding the Chimaera Wing
  ! (Party) Party member list will only include members of the party that you can see (aren't vanished)
+ ! (Skills) Excavation Treasure Hunter is renamed to Archaeology
  ! (Skills) Swords no longer require blocking with a shield to trigger counter attacks
  ! (Skills) Stripping wood and right clicking on stripped wood will no longer ready your Axe
  ! (Skills) Some skill level rank requirements have changed

+ 1 - 1
src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java

@@ -36,7 +36,7 @@ public class ExcavationCommand extends SkillCommand {
     @Override
     protected void permissionsCheck(Player player) {
         canGigaDrill = Permissions.gigaDrillBreaker(player) && RankUtils.hasUnlockedSubskill(player, SubSkillType.EXCAVATION_GIGA_DRILL_BREAKER);
-        canTreasureHunt = canUseSubskill(player, SubSkillType.EXCAVATION_TREASURE_HUNTER);
+        canTreasureHunt = canUseSubskill(player, SubSkillType.EXCAVATION_ARCHAEOLOGY);
     }
 
     @Override

+ 1 - 1
src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java

@@ -39,7 +39,7 @@ public enum PrimarySkillType {
     ALCHEMY(AlchemyManager.class, Color.FUCHSIA, ImmutableList.of(SubSkillType.ALCHEMY_CATALYSIS, SubSkillType.ALCHEMY_CONCOCTIONS)),
     ARCHERY(ArcheryManager.class, Color.MAROON, ImmutableList.of(SubSkillType.ARCHERY_DAZE, SubSkillType.ARCHERY_ARROW_RETRIEVAL, SubSkillType.ARCHERY_SKILL_SHOT)),
     AXES(AxesManager.class, Color.AQUA, SuperAbilityType.SKULL_SPLITTER, ToolType.AXE, ImmutableList.of(SubSkillType.AXES_SKULL_SPLITTER, SubSkillType.AXES_ARMOR_IMPACT, SubSkillType.AXES_AXE_MASTERY, SubSkillType.AXES_CRITICAL_STRIKES, SubSkillType.AXES_GREATER_IMPACT)),
-    EXCAVATION(ExcavationManager.class, Color.fromRGB(139, 69, 19), SuperAbilityType.GIGA_DRILL_BREAKER, ToolType.SHOVEL, ImmutableList.of(SubSkillType.EXCAVATION_GIGA_DRILL_BREAKER, SubSkillType.EXCAVATION_TREASURE_HUNTER)),
+    EXCAVATION(ExcavationManager.class, Color.fromRGB(139, 69, 19), SuperAbilityType.GIGA_DRILL_BREAKER, ToolType.SHOVEL, ImmutableList.of(SubSkillType.EXCAVATION_GIGA_DRILL_BREAKER, SubSkillType.EXCAVATION_ARCHAEOLOGY)),
     FISHING(FishingManager.class, Color.NAVY, ImmutableList.of(SubSkillType.FISHING_FISHERMANS_DIET, SubSkillType.FISHING_TREASURE_HUNTER, SubSkillType.FISHING_ICE_FISHING, SubSkillType.FISHING_MAGIC_HUNTER, SubSkillType.FISHING_MASTER_ANGLER, SubSkillType.FISHING_SHAKE)),
     HERBALISM(HerbalismManager.class, Color.GREEN, SuperAbilityType.GREEN_TERRA, ToolType.HOE, ImmutableList.of(SubSkillType.HERBALISM_GREEN_TERRA, SubSkillType.HERBALISM_FARMERS_DIET, SubSkillType.HERBALISM_GREEN_THUMB, SubSkillType.HERBALISM_DOUBLE_DROPS, SubSkillType.HERBALISM_HYLIAN_LUCK, SubSkillType.HERBALISM_SHROOM_THUMB)),
     MINING(MiningManager.class, Color.GRAY, SuperAbilityType.SUPER_BREAKER, ToolType.PICKAXE, ImmutableList.of(SubSkillType.MINING_SUPER_BREAKER, SubSkillType.MINING_DEMOLITIONS_EXPERTISE, SubSkillType.MINING_BIGGER_BOMBS, SubSkillType.MINING_BLAST_MINING, SubSkillType.MINING_DOUBLE_DROPS)),

+ 1 - 1
src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java

@@ -27,7 +27,7 @@ public enum SubSkillType {
     AXES_SKULL_SPLITTER(1),
 
     /* Excavation */
-    EXCAVATION_TREASURE_HUNTER(8),
+    EXCAVATION_ARCHAEOLOGY(8),
     EXCAVATION_GIGA_DRILL_BREAKER(1),
 
     /* Fishing */

+ 5 - 0
src/main/java/com/gmail/nossr50/datatypes/treasure/Treasure.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.datatypes.treasure;
 
+import com.gmail.nossr50.config.Config;
 import org.bukkit.inventory.ItemStack;
 
 public abstract class Treasure {
@@ -40,6 +41,10 @@ public abstract class Treasure {
     }
 
     public int getDropLevel() {
+        //If they are in retro mode all requirements are scaled up by 10
+        if(Config.getInstance().getIsRetroMode())
+            return dropLevel * 10;
+
         return dropLevel;
     }
 

+ 1 - 1
src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java

@@ -28,7 +28,7 @@ public class ExcavationManager extends SkillManager {
     public void excavationBlockCheck(BlockState blockState) {
         int xp = Excavation.getBlockXP(blockState);
 
-        if (Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.EXCAVATION_TREASURE_HUNTER)) {
+        if (Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.EXCAVATION_ARCHAEOLOGY)) {
             List<ExcavationTreasure> treasures = Excavation.getTreasures(blockState);
 
             if (!treasures.isEmpty()) {

+ 1 - 1
src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java

@@ -457,7 +457,7 @@ public class SkillUtils {
     }
 
     public static boolean treasureDropSuccessful(Player player, double dropChance, int activationChance) {
-        SubSkillWeightedActivationCheckEvent event = new SubSkillWeightedActivationCheckEvent(player, SubSkillType.EXCAVATION_TREASURE_HUNTER, dropChance / activationChance);
+        SubSkillWeightedActivationCheckEvent event = new SubSkillWeightedActivationCheckEvent(player, SubSkillType.EXCAVATION_ARCHAEOLOGY, dropChance / activationChance);
         mcMMO.p.getServer().getPluginManager().callEvent(event);
         return (event.getChance() * activationChance) > (Misc.getRandom().nextDouble() * activationChance) && !event.isCancelled();
     }

+ 3 - 3
src/main/resources/skillranks.yml

@@ -398,9 +398,9 @@ Excavation:
             Rank_1: 5
         RetroMode:
             Rank_1: 50
-    TreasureHunter:
+    Archaeology:
         Standard:
-            Rank_1: 10
+            Rank_1: 5
             Rank_2: 25
             Rank_3: 35
             Rank_4: 50
@@ -409,7 +409,7 @@ Excavation:
             Rank_7: 85
             Rank_8: 100
         RetroMode:
-            Rank_1: 100
+            Rank_1: 50
             Rank_2: 250
             Rank_3: 350
             Rank_4: 500

+ 22 - 22
src/main/resources/treasures.yml

@@ -442,134 +442,134 @@ Enchantment_Drop_Rates:
         EPIC: 1.50
         LEGENDARY: 0.75
 #
-#  Settings for Excavation
+#  Settings for Excavation's Archaeology
 ###
 Excavation:
     CAKE:
         Amount: 1
         XP: 3000
         Drop_Chance: 0.05
-        Drop_Level: 750
+        Drop_Level: 75
         Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
     GUNPOWDER:
         Amount: 1
         XP: 30
         Drop_Chance: 10.0
-        Drop_Level: 75
+        Drop_Level: 10
         Drops_From: [Gravel]
     BONE:
         Amount: 1
         XP: 30
         Drop_Chance: 10.0
-        Drop_Level: 175
+        Drop_Level: 20
         Drops_From: [Gravel]
     APPLE:
         Amount: 1
         XP: 100
         Drop_Chance: 0.1
-        Drop_Level: 250
+        Drop_Level: 25
         Drops_From: [Grass, Mycelium]
     SLIME_BALL:
         Amount: 1
         XP: 100
         Drop_Chance: 5.0
-        Drop_Level: 150
+        Drop_Level: 15
         Drops_From: [Clay]
     BUCKET:
         Amount: 1
         XP: 100
         Drop_Chance: 0.1
-        Drop_Level: 500
+        Drop_Level: 50
         Drops_From: [Clay]
     NETHERRACK:
         Amount: 1
         XP: 30
         Drop_Chance: 0.5
-        Drop_Level: 850
+        Drop_Level: 85
         Drops_From: [Gravel]
     RED_MUSHROOM:
         Amount: 1
         XP: 80
         Drop_Chance: 0.5
-        Drop_Level: 500
+        Drop_Level: 50
         Drops_From: [Dirt, Podzol, Grass, Mycelium]
     BROWN_MUSHROOM:
         Amount: 1
         XP: 80
         Drop_Chance: 0.5
-        Drop_Level: 500
+        Drop_Level: 50
         Drops_From: [Dirt, Podzol, Grass, Mycelium]
     EGG:
         Amount: 1
         XP: 100
         Drop_Chance: 1.0
-        Drop_Level: 250
+        Drop_Level: 25
         Drops_From: [Grass]
     SOUL_SAND:
         Amount: 1
         XP: 80
         Drop_Chance: 0.5
-        Drop_Level: 650
+        Drop_Level: 65
         Drops_From: [Sand, Red_Sand]
     CLOCK:
         Amount: 1
         XP: 100
         Drop_Chance: 0.1
-        Drop_Level: 500
+        Drop_Level: 50
         Drops_From: [Clay]
     COBWEB:
         Amount: 1
         XP: 150
         Drop_Chance: 5.0
-        Drop_Level: 750
+        Drop_Level: 75
         Drops_From: [Clay]
     STRING:
         Amount: 1
         XP: 200
         Drop_Chance: 5.0
-        Drop_Level: 250
+        Drop_Level: 25
         Drops_From: [Clay]
     GLOWSTONE_DUST:
         Amount: 1
         XP: 80
         Drop_Chance: 5.0
-        Drop_Level: 25
+        Drop_Level: 5
         Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Mycelium]
     MUSIC_DISC_13:
         Amount: 1
         XP: 3000
         Drop_Chance: 0.05
-        Drop_Level: 250
+        Drop_Level: 25
         Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
     MUSIC_DISC_CAT:
         Amount: 1
         XP: 3000
         Drop_Chance: 0.05
-        Drop_Level: 250
+        Drop_Level: 25
         Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
     DIAMOND:
         Amount: 1
         XP: 1000
         Drop_Chance: 0.13
-        Drop_Level: 350
+        Drop_Level: 35
         Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
     COCOA_BEANS:
         Amount: 1
         XP: 100
         Drop_Chance: 1.33
-        Drop_Level: 350
+        Drop_Level: 35
         Drops_From: [Dirt, Podzol, Grass, Mycelium]
     QUARTZ:
         Amount: 1
         XP: 100
         Drop_Chance: 0.5
-        Drop_Level: 850
+        Drop_Level: 85
         Drops_From: [Dirt, Podzol, Sand, Red_Sand, Gravel, Mycelium, Soul_Sand]
     NAME_TAG:
         Amount: 1
         XP: 3000
         Drop_Chance: 0.05
-        Drop_Level: 250
+        Drop_Level: 25
         Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
 #
 #  Settings for Hylian Luck