diff --git a/Meteo_Engine.jar b/Meteo_Engine.jar new file mode 100644 index 0000000..645c57b Binary files /dev/null and b/Meteo_Engine.jar differ diff --git a/run b/run index d91253d..8917894 100755 --- a/run +++ b/run @@ -1,2 +1,3 @@ javac src/sig/*.java -d bin -java -cp bin sig/Meteo \ No newline at end of file +java -cp bin sig/Meteo +jar cfe Meteo_Engine.jar sig.Meteo src/sig \ No newline at end of file diff --git a/src/sig/Block.java b/src/sig/Block.java index f86a009..8ded849 100644 --- a/src/sig/Block.java +++ b/src/sig/Block.java @@ -2,8 +2,8 @@ package sig; public class Block{ BlockState state; - double x,y; - public Block() { + int x,y; //Relative to its block clump. + public Block(int x,int y) { } } \ No newline at end of file diff --git a/src/sig/BlockClump.java b/src/sig/BlockClump.java index f53bae7..4c7b4e9 100644 --- a/src/sig/BlockClump.java +++ b/src/sig/BlockClump.java @@ -4,6 +4,8 @@ import java.util.List; public class BlockClump { List blocks; + double x,y; //the lower-left origin of this block clump. Every block positions relative to this. + double yspd; public BlockClump(List blockList) { this.blocks = blockList; } diff --git a/src/sig/BlockState.java b/src/sig/BlockState.java new file mode 100644 index 0000000..e49e35e --- /dev/null +++ b/src/sig/BlockState.java @@ -0,0 +1,12 @@ +package sig; + +public enum BlockState { + RED, + BLUE, + GREEN, + YELLOW, + ORANGE, + PURPLE, + WHITE, + IGNITED +} diff --git a/src/sig/Board.java b/src/sig/Board.java index 72f207f..abcfa39 100644 --- a/src/sig/Board.java +++ b/src/sig/Board.java @@ -1,14 +1,35 @@ package sig; +import java.util.ArrayList; import java.util.List; public class Board { List blockData; int width; int height; - public Board(int width,int height) { - this.width=width; - this.height=height; + double gravity; + double launch_power; + double max_rise_spd; + double max_fall_spd; + double[] combo_power_bonus; + public Board(int width, int height, double gravity, double launch_power, double max_rise_spd, double max_fall_spd, + double[] combo_power_bonus) { + this.width = width; + this.height = height; + this.gravity = gravity; + this.launch_power = launch_power; + this.max_rise_spd = max_rise_spd; + this.max_fall_spd = max_fall_spd; + this.combo_power_bonus = combo_power_bonus; this.blockData = new ArrayList(); + + List initialBlocks = new ArrayList(); + for (int x=0;x