From a3b9284e136c7b31a6a6d46633048f25880fcf1b Mon Sep 17 00:00:00 2001
From: "sigonasr2, Sig, Sigo" <sigonasr2@gmail.com>
Date: Thu, 16 Sep 2021 06:33:12 +0000
Subject: [PATCH] Setup base classes. Jar export script.

---
 Meteo_Engine.jar        | Bin 0 -> 1991 bytes
 run                     |   3 ++-
 src/sig/Block.java      |   4 ++--
 src/sig/BlockClump.java |   2 ++
 src/sig/BlockState.java |  12 ++++++++++++
 src/sig/Board.java      |  27 ++++++++++++++++++++++++---
 src/sig/Meteo.java      |   3 ++-
 7 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 Meteo_Engine.jar
 create mode 100644 src/sig/BlockState.java

diff --git a/Meteo_Engine.jar b/Meteo_Engine.jar
new file mode 100644
index 0000000000000000000000000000000000000000..645c57bcbca742bff6b5c8ccb25b5ae68d9a1bca
GIT binary patch
literal 1991
zcmWIWW@Zs#;Nak35Hv9eW<Ua*3@i-3t|5-Po_=on|4uP5Ff#;rvvYt{FhP|C;M6Pv
zQ~}rQ>*(j{<{BKL=j-;__snS@Z(Y5MyxzK6=gyqp9At3C_`%a6JuhD!Pv48Bt5~=g
zT)*)2ikQf(_9_->((d*SD()^7vH3jdt4Za~8e!wlC3A~~y1UnkbQxd%S`+LY^tp0p
z#ZIu(j>UU)MglF40%DNUxEL6K&V6Qx>MxKFii?u<i!;;p5gzz!gsMsiNtJJENou}c
zR$^JAZMPx!Ap?Qd?|-_aqb*cgxtt0M%ZsM)T~}#I@bMCQ9q{RX^`%G6j|*$w&-UDV
zLh8ghKBqJDPg=8{3O-k0e$*v`wSaE|x9B=mE8hH~g_TpDG}ZPwoP738;{PIL>9&JT
za_csDO^Il?-{<NjrKWbU=KK1c3D+0foHQ=G@p<FTcW$Dk%%C{vuxCBi40PZMs7E0Y
zm~V{R3r_ioMJZq}lm?&9Yc>$r^I6nRh;^Zt?If31k8jwo(Atu~en+AwXL7@;Kh?dw
z$5=M0>l^R3{=J~_4->27Br#8c3#%SFEsWpcbVuvdBXh+C{}%<RW}m6!n`M@4;%>>T
zdC{7^@nU?#7TzBZ=YIV2>ENwZmJ4$#>YJL5JlGQU!fm5g`gWBq8dJX-Uhm}8Vu@M#
zO8maWmeROoy!!<=GHAUBa#Zz9Z4N&mDN)U`uRh@1>Ym#%na5s-Mb+e-HW9H}IZ@rX
zYJx=W$?k1ST%$KB1($7l{;BM71$(gS)Qy5|egAZ1)23!!n7_u^{h?Hx&&`K*%Cok}
z?N0u6H}hE)KligMpH9T+9WxA{oBeBY>Q0IBq*>9ErHj75mQUJoIo-PT>;upD)3mtG
zR1{e^bIwaTAEQt#efOj4OTIG3yLIo^XB>QOy54?|+TU5p^^EK5cqH1JnI5;rUU|Rg
zQuE#BpHJr%&*zwIyu~N-c$x9yhl_5^_$ha%xgHc#o^w~lW-&4_2(dttBqXM?@x@e5
zesVTArnEhL&iVQHhiaVj+5YU2mWJ=ClRjY{=R9@v!U|5E^gp-mSr7x0f$<KNjVvn!
zT%wv?jX!&dXq9NK75(zHIjC63+vs$VsMjY^BkwNJNe)sC&!#*Rd(n8+$(K!f3FAc$
zC2dnt1+xZ*8G)xmxxx9z)>AJ&7nr1`pd_mvG{=eqWnuZp3FKJkoYLF^u!~dse7V5c
z!}4gfR)(#^)z(MnypPP<w)i6F%*?GF<>r4GS<{U_RM^LFIC?dV&nYyI=Pr}`(WBeU
zvZvIPsa#yr{_M$0hlgu9%I0;yzGuF@VY=h4dt2nL==%MgTyx?4oFu;UuG5pZUb=Pg
z^WmdQ%a=AOhnBEUzc4H1%+kgyvmRd9b;CC(K~Z%d_oB~XD@z09jBdX7P=9E%&Tmcp
zshjfg`e)RC{A=4bQD*k~)Hl_$xBmqDx~pHVek0INYQShhlm|>`<pGATgG&-iQt`yo
zS?#l-;ArC0^VIPST>*@&CWUZuS%bqT)vt&iD&j9H{n~7x99vuS=dfbVe+75@@)eUB
zE-YY>*RZ~G*qG(imy++yn__olLCQ9Tz*%gGKvy<_<A#w*gaNhGh84-6QX3V(i(yb1
z9^j3t6}iX+mDvbj3uMBzB9-7E6Sx>~7p({rZUC9Ego11@sHjCQ!9YbV0{jCqVY(0n
zFS346IftCDQ1u@KMk7o=qSQmy56XSWNgY*xHZzibcwR)-56Te8i3XH35I_PL{&4$I
nvj?&vp!9_tr>KVTv7#A*NNoY$tZX3LIDqgk(63v7N*NdcpAvQs

literal 0
HcmV?d00001

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<Block> blocks;
+    double x,y; //the lower-left origin of this block clump. Every block positions relative to this.
+    double yspd;
     public BlockClump(List<Block> 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<BlockClump> 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<BlockClump>();
+
+        List<Block> initialBlocks = new ArrayList<Block>();
+        for (int x=0;x<width;x++) {
+            for (int y=0;y<3;y++) {
+                initialBlocks.add(new Block(x,y));
+            }
+        }
+
+        BlockClump defaultClump = new BlockClump(initialBlocks);
     }
 }
diff --git a/src/sig/Meteo.java b/src/sig/Meteo.java
index 7dc604e..92ca017 100644
--- a/src/sig/Meteo.java
+++ b/src/sig/Meteo.java
@@ -2,6 +2,7 @@ package sig;
 
 public class Meteo {
     public static void main(String[] args) {
-        Board b = new Board(8,14);
+        double[] val = {0,0,};
+        Board b = new Board(8,14,0.05,1,4,1,val);
     }
 }
\ No newline at end of file