EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 03:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Moving treasures to their own config file.

Browse Source 
BUILD IS BROKEN, DO NOT USE.
This commit is contained in:
GJ
2012-02-28 23:28:14 -05:00
parent 345fa122c5
commit ee986970fe
6 changed files with 427 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gmail/nossr50/skills/Excavation.java
View File

@ -31,6 +31,7 @@ import com.gmail.nossr50.spout.SpoutStuff;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.m;
import com.gmail.nossr50.config.LoadProperties;
import com.gmail.nossr50.config.LoadTreasures;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
@ -67,7 +68,7 @@ public class Excavation
switch(type)
{
case DIRT:
for(ExcavationTreasure treasure : LoadProperties.excavationFromDirt)
for(ExcavationTreasure treasure : LoadTreasures.excavationFromDirt)
{
if(skillLevel >= treasure.getDropLevel())
{
@ -80,7 +81,7 @@ public class Excavation
}
break;
case GRASS:
for(ExcavationTreasure treasure : LoadProperties.excavationFromGrass)
for(ExcavationTreasure treasure : LoadTreasures.excavationFromGrass)
{
if(skillLevel >= treasure.getDropLevel())
{
@ -93,7 +94,7 @@ public class Excavation
}
break;
case SAND:
for(ExcavationTreasure treasure : LoadProperties.excavationFromSand)
for(ExcavationTreasure treasure : LoadTreasures.excavationFromSand)
{
if(skillLevel >= treasure.getDropLevel())
{
@ -106,7 +107,7 @@ public class Excavation
}
break;
case GRAVEL:
for(ExcavationTreasure treasure : LoadProperties.excavationFromGravel)
for(ExcavationTreasure treasure : LoadTreasures.excavationFromGravel)
{
if(skillLevel >= treasure.getDropLevel())
{
@ -119,7 +120,7 @@ public class Excavation
}
break;
case CLAY:
for(ExcavationTreasure treasure : LoadProperties.excavationFromClay)
for(ExcavationTreasure treasure : LoadTreasures.excavationFromClay)
{
if(skillLevel >= treasure.getDropLevel())
{
@ -132,7 +133,7 @@ public class Excavation
}
break;
case MYCEL:
for(ExcavationTreasure treasure : LoadProperties.excavationFromMycel)
for(ExcavationTreasure treasure : LoadTreasures.excavationFromMycel)
{
if(skillLevel >= treasure.getDropLevel())
{
@ -145,7 +146,7 @@ public class Excavation
}
break;
case SOUL_SAND:
for(ExcavationTreasure treasure : LoadProperties.excavationFromSoulSand)
for(ExcavationTreasure treasure : LoadTreasures.excavationFromSoulSand)
{
if(skillLevel >= treasure.getDropLevel())
{

11
src/main/java/com/gmail/nossr50/skills/Fishing.java
View File

@ -30,6 +30,7 @@ import com.gmail.nossr50.Combat;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.m;
import com.gmail.nossr50.config.LoadProperties;
import com.gmail.nossr50.config.LoadTreasures;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
@ -94,7 +95,7 @@ public class Fishing {
Item theCatch = (Item)event.getCaught();
if(LoadProperties.fishingDrops)
{
List<FishingTreasure> rewards = LoadProperties.fishingRewardsTier1;
List<FishingTreasure> rewards = LoadTreasures.fishingRewardsTier1;
FishingTreasure treasure = rewards.get((int)(Math.random() * rewards.size()));
if(Math.random() * 100 > (100.00 - treasure.getDropChance()))
@ -116,7 +117,7 @@ public class Fishing {
Item theCatch = (Item)event.getCaught();
if(LoadProperties.fishingDrops)
{
List<FishingTreasure> rewards = LoadProperties.fishingRewardsTier2;
List<FishingTreasure> rewards = LoadTreasures.fishingRewardsTier2;
FishingTreasure treasure = rewards.get((int)(Math.random() * rewards.size()));
if(Math.random() * 100 > (100.00 - treasure.getDropChance()))
@ -138,7 +139,7 @@ public class Fishing {
Item theCatch = (Item)event.getCaught();
if(LoadProperties.fishingDrops)
{
List<FishingTreasure> rewards = LoadProperties.fishingRewardsTier3;
List<FishingTreasure> rewards = LoadTreasures.fishingRewardsTier3;
FishingTreasure treasure = rewards.get((int)(Math.random() * rewards.size()));
if(Math.random() * 100 > (100.00 - treasure.getDropChance()))
@ -160,7 +161,7 @@ public class Fishing {
Item theCatch = (Item)event.getCaught();
if(LoadProperties.fishingDrops)
{
List<FishingTreasure> rewards = LoadProperties.fishingRewardsTier4;
List<FishingTreasure> rewards = LoadTreasures.fishingRewardsTier4;
FishingTreasure treasure = rewards.get((int)(Math.random() * rewards.size()));
if(Math.random() * 100 > (100.00 - treasure.getDropChance()))
@ -182,7 +183,7 @@ public class Fishing {
Item theCatch = (Item)event.getCaught();
if(LoadProperties.fishingDrops)
{
List<FishingTreasure> rewards = LoadProperties.fishingRewardsTier5;
List<FishingTreasure> rewards = LoadTreasures.fishingRewardsTier5;
FishingTreasure treasure = rewards.get((int)(Math.random() * rewards.size()));
if(Math.random() * 100 > (100.00 - treasure.getDropChance()))