From e196afb366debda592ced480c7dd22b6b4dbdb18 Mon Sep 17 00:00:00 2001
From: ponkotate <ponkotate@users.sourceforge.jp>
Date: Mon, 11 Feb 2013 15:38:05 +0900
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=AD=A3=20=E3=83=BB=E9=89=B1=E7=9F=B3?=
 =?utf8?q?=E3=81=8C=E9=9B=86=E4=B8=AD=E3=81=97=E3=81=A6=E7=94=9F=E6=88=90?=
 =?utf8?q?=E3=81=95=E3=82=8C=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92?=
 =?utf8?q?=E4=BF=AE=E6=AD=A3=20=E3=83=BB=E7=A2=BA=E7=8E=87=E7=94=A8?=
 =?utf8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 common/pcc/chemicraft/ChemiCraft.java                  |  2 +-
 common/pcc/chemicraft/gen/WorldGenAtomsOre.java        |  2 +-
 .../pcc/chemicraft/item/ItemGasCollectingBottle.java   |  7 +------
 common/pcc/chemicraft/util/Auxiliary.java              | 18 ++++++++++++++----
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/common/pcc/chemicraft/ChemiCraft.java b/common/pcc/chemicraft/ChemiCraft.java
index c06acce..cfeb7ff 100644
--- a/common/pcc/chemicraft/ChemiCraft.java
+++ b/common/pcc/chemicraft/ChemiCraft.java
@@ -317,7 +317,7 @@ public class ChemiCraft {
 		});
 
 		//鉱石を追加します
-		api.addAtomsOre(Block.blockDiamond.blockID, 0, 5, 20, 20); //テスト用。ダイヤモンドブロックを生成します
+		api.addAtomsOre(Block.blockDiamond.blockID, 0, 5, 5, 20); //テスト用。ダイヤモンドブロックを生成します
 
 		//鉱石の生成
 		for (int i = 0; i < api.getAtomsOreIDList().size(); i++) {
diff --git a/common/pcc/chemicraft/gen/WorldGenAtomsOre.java b/common/pcc/chemicraft/gen/WorldGenAtomsOre.java
index fd190c6..ac66f54 100644
--- a/common/pcc/chemicraft/gen/WorldGenAtomsOre.java
+++ b/common/pcc/chemicraft/gen/WorldGenAtomsOre.java
@@ -33,7 +33,7 @@ public class WorldGenAtomsOre extends WorldGenMinable implements IWorldGenerator
 	public void generate(Random par1Random, int par2ChunkX, int par3ChunkZ, World par4World, IChunkProvider par5ChunkGenerator, IChunkProvider par6ChunkProvider)
 	{
 		for (int i = 0; i < this.frequency; i++) {
-			this.generate(par4World, par1Random, par2ChunkX << 4, par1Random.nextInt(this.posY), par3ChunkZ << 4);
+			this.generate(par4World, par1Random, par2ChunkX * 16 + par1Random.nextInt(16), par1Random.nextInt(this.posY), par3ChunkZ * 16 + par1Random.nextInt(16));
 		}
 	}
 
diff --git a/common/pcc/chemicraft/item/ItemGasCollectingBottle.java b/common/pcc/chemicraft/item/ItemGasCollectingBottle.java
index 08f39e5..2e3d061 100644
--- a/common/pcc/chemicraft/item/ItemGasCollectingBottle.java
+++ b/common/pcc/chemicraft/item/ItemGasCollectingBottle.java
@@ -55,11 +55,6 @@ public class ItemGasCollectingBottle extends ItemAtomInfoContainer
 			}
 		}
 
-		// デバッグ用
-		if (par2World.isRemote) {
-			par3EntityPlayer.addChatMessage("result1=" + result1 + " result2=" + result2 + " result3=" + result3);
-		}
-
 		return par1ItemStack;
 	}
 
@@ -98,7 +93,7 @@ public class ItemGasCollectingBottle extends ItemAtomInfoContainer
 	@Override
 	public String getTextureFile()
 	{
-		return "/chemicraft/items/items.png";
+		return ChemiCraft.instance.ITEMTEXTURE;
 	}
 
 }
diff --git a/common/pcc/chemicraft/util/Auxiliary.java b/common/pcc/chemicraft/util/Auxiliary.java
index 2f0946a..a34db96 100644
--- a/common/pcc/chemicraft/util/Auxiliary.java
+++ b/common/pcc/chemicraft/util/Auxiliary.java
@@ -203,11 +203,21 @@ public class Auxiliary {
 		}
 
 		public int getProbability(ArrayList<Double> par1){
+
+			double var1 = 0;
+
 			for (int i = 0; i < par1.size(); i++){
-				double var1 = par1.get(i) / 100;
-				double var2 = Math.random();
-				if (var1 <= var2){
-					return i;
+				var1 += par1.get(i);
+			}
+
+			double var2 = 0;
+			double var3 = Math.random();
+
+			for (int j = 0; j < par1.size(); j++){
+				double var4 = par1.get(j) / var1;
+				var2 += var4;
+				if (var2 >= var3){
+					return j;
 				}else{
 					continue;
 				}
-- 
2.11.0