From fb1246e38e08fda9dccb19a3bcedea9997aa5a2a Mon Sep 17 00:00:00 2001
From: sillysagiri <sillysagiri@privacyrequired.com>
Date: Wed, 16 Oct 2024 22:27:53 +0700
Subject: [PATCH] initial silly image implementation

---
 assets/silly/bmf/nds12_0.png      | Bin 1192 -> 1124 bytes
 assets/silly/bmf/nds12_0.silly    | Bin 0 -> 16388 bytes
 assets/silly/bmf/nds12_0.silly.gz | Bin 0 -> 763 bytes
 src/dothack/DotHack.java          |   8 ++--
 src/sillysagiri/BMF.java          |  66 +++++++++++++++++++++++++++---
 src/sillysagiri/Input.java        |  10 ++---
 src/sillysagiri/scene/Intro.java  |   7 ++--
 7 files changed, 70 insertions(+), 21 deletions(-)
 create mode 100644 assets/silly/bmf/nds12_0.silly
 create mode 100644 assets/silly/bmf/nds12_0.silly.gz

diff --git a/assets/silly/bmf/nds12_0.png b/assets/silly/bmf/nds12_0.png
index 284a5510e20885405ac660f36d3d82a0525be2d0..a6a93e7698258e049f6d0556daf25d4232b644ea 100644
GIT binary patch
delta 1104
zcmV-W1h4z33FHWnBYyx1a7bBm000XT000XT0n*)m`~Uz17D+@wRCt{2oa>I`APj|>
zD)0Zu-Tjr3>-utRNHS^9Cyk~9#uzZz(AEAtpU;0I;qiF<j4_6k-OF~eI$5Uw*5y_`
zQr3}?eOhDIW83RI`KtboJ<(V#{ZYT$0Es3Nsq+@S(sxzIK7V+$owpEPTg0i)lK0ji
zbDT$H0D@j@&x50Z?Cti?^7jh6EPH14d&s`fMXow3GRLsJs32<8TL-|-l?%21?w%G|
zALJD{1kB)tic0%x+s@9a;^jS29<xF|vq_&0k)CBI0BV>vsM1!4hrP@SA$z@)TQwG`
zfB!*~=_oE+34fdC6xMj7B-lGumpK5s<E+I*2W9OPJ-E!tq>iIbhNFoVw4!5-h66-b
zqRhiXLl(#XGeW=$vSc+Xx8y4Qj#0<~q6tOrty&f}R_m^`ul9w859^e<+QF=O+CN8Y
z)AB62<7bQ}*VDQMMDbnAL`Pcmcx37E9%?H3SCyl7dVfSoadvW9C!%GCrBlj`QE-6j
zglmH=<D-7Ozdik(INw>UuAQ?sMDm^;o}84~DzVu5{7GalY@f&$B?zmN9PdhZMV8)4
zL}!voT|T2HlCRF=+X;ZgzK+4w%pD&BW)EVEcFJzQXfEN|Y8~P7LC1>am6t?mPb&$G
z6h{W3%zx|}L{I0`IXW~%NpmEN<VTv99H48crR+|4PH@MujM2Ay8v}a)Ibve2ivL~y
za)Q{M$88KeW@X3CDu+4CA!i&AeR=cjNAy_C$U+Zz^10V5mp_pK<c4GpfVM~5N=MR;
z6=m^Ay(Mq;r`tqj)p2$<l2>Py>oQc|uMFBy4}UCGoJ<T_9!-4JDI?pe4v^V{oTRJE
zk^VK|OJEjbR$bRtvpTWVlPPnDEML0%!7JmD#dPmf&}E%hGRQ!Yyy$+AtbE0!%f*Zy
zkXH3~CU3WZh}pr(_II182))BSM@3%h(A&Z)o2UO#XeACKlX5q#F`#4f>XGkb(0R8U
zM}MAVrLTkKZ|?~>Go-rUUOYwgp5b8GB3kp+!CFME7x}DlUjj8NcI=&ZJ@Sy^<p-#2
zB!|d*p(AQj$^onny`6^`peGecF0&n<_36nV&gt!{XyU!tulw_E5|)hDUuzwaEZURJ
zZV;bB^&LakcYk|&mNMf29sM&89+ty-PJgKDWw|FCjWd$*Y|C{12|Q!H`#!1%U1&=#
z^LWILs{M%Ep*!*JWIH4)Ll-M^Sj2g<y6!1)N8DS0ckS@x&mc;uEZZ!i<Sa|bwCr7P
zG%u`-(TLuzPV_`TkLhpN-3V_dz}3iIWnF`$to$+t)h*lV{&d|}FuSv&Z1@O!$w^w4
z{s$3XwR1j%&HJ*zYoO)1=!6hL2qA<JLI@#*5JCtcgb+dqA%qY@2qA<JLI@#*T)=-2
WZ=C3pea<KV0000<MNUMnLSTX`ASpQj

delta 1173
zcmb`&{X5eM008h=JCsN%$+Mf6HOWxfnX5Hgv2x>TOe~%-v$4FttQpzx@Wf3|!)Z=l
zBDHLnx0SAQS={E`3}wW(L|a``=4G9i&fOnzpI<)n#=`A4;T%Y!uQ!gwy1fv#kT7?2
zC!yfk7E+Tv-LM#Y*LyOda@_uCS}K*?5_>IPl@0A_k*T(>!6M=;Y8HkSOei*3&ZbVe
zhlU*3;Pug0zo_!mWQ?-n>!mL(9~RL88FDjh8}nk1GRtXMg=_w8$Ai}h#jq4Hd_IB;
z&Q$T94~}q{fT1T{m9IVULNW5N0hUrO?1vEqI4+Y&?MO+zx;XjKrOthasheE{#F<1@
z(>3~Ov2zG8_wE>K9$qQFTFa)fxyESH%HX5fS?C$N`7EG+NDgE@=#%WfMeLHF%K;_`
zxp#uAd_k-7JKd!49W#43Qg-)U`nG9lXOkfZJ977iE0~2K{+YzMzIHp=@w2f3${ZmA
zzAqUNSN0opm<IiI5h=31l1^9CCjz>SmfUI_tfuZ;ti<W5@Ls3Q6~cZ)W#~67-Aq5r
zb?6Gr4l5>>D!s0RJt}=pD1s~UPujO``w$l$0O?J5;x2qqFYeB!t!KW?Qbe}20GyL>
z%&tBZMlc<y=7&tnHxs?bBR5W*M0;gaR?Rn;e6k?3&)c6U@te}^##U!BZ1_eOC^d9x
zq2FN@MQuuDmpxv+Zpv_tjBj1$!>k5!vhOW#{-b(4owzMXR*iGQCluG+@A=qq;yada
z+ab~XS<9_=Ao2>J73J{X-1yweiLYYTKrUF@HmL;XWm}iSj^ngbJ*A+@_5G0!k$_L{
zZg69j2d%TtDAHRW{HZw)Ups0Qn|$k4C`iEH7UJk{v7sFoIWUN8!kZI-@vDlcC;$^}
zjc2UQcrHK9wB$dd?~_^vhK&h5nk%EiCGF54)Er*`i+)SS)Tbzs95~-aiO9HUfQ^Q*
zvm54Pn3N2Gf*A!bnF6{RPOBCA388)f?Cv}wSf`NdB<*`Mc;{a8{1bPT&N$HK8gd#z
zyXuc<WaF4_APG+@vyr&{Dwb*YqzNrz_Vt;dy~0NkOs;z=KILb}m#=g&rez{*Drldh
znSHnY8T=j@XK<l4H9Y^lxiWiIN_fe48C_#lo%-p3hkm#nh7REJ+|<RW<382-W<_yk
zTuWYmx3E9r8t9(aQ=Re`KfK+c--7^o<{t(P3h56R$>nvZqH{YBJ%}2$))l`uJ?4Cz
z<W*4}YlYx~SEI|4P0HWYW}qG5WLoOM`X>OPz>`xBX>^?)E<_V6dJ@263-J<0AiB^8
zja)ur^m04YKTLaDY%)O8iw{zgVc0hIP0eB>KeS5(?)V#+v!k6#AA)rxmFuA4xZLGi
zxT4Hrio{5bMy*Ma9+=Xv$hmfdB~VR)hCx1y94n5~Os#6$ntEbvYJJkoFF%|`kT}kh
zf$3j(E_st%wv-P;9q?f%+p&?BrS$h6hU=BmuG1_{=k>#3=002*5fTFZ-_jY`E{+_e
U7MrC7gZ|^|^P~5}(-FD<0*iS)1poj5

diff --git a/assets/silly/bmf/nds12_0.silly b/assets/silly/bmf/nds12_0.silly
new file mode 100644
index 0000000000000000000000000000000000000000..98338baf6e2da04439a300de4ed2c2ee8e13dddb
GIT binary patch
literal 16388
zcmeH_fsPzE3`6hJ`f2_1v;^@$%JxpS*Gt+29$-fjMNzb8|NQvl<J<Op{QVeIrf01{
z9nBDnde2@X>R<s~_BD>e%72C9sx^(FZpZ9M%t@@>8<?5ujqZ7K=WaT^ft(%@T=AWp
zxl;tQR!)w)U0<D?j9fZG^SGW4!S;D{_I;XJRbYP>mrLuSZN<2EHuc#`q<hk`dYEvD
zYlj*wYFsvM4I`h!zv}$l9xmHiZeV6{j0++CLlvfLzR0Tf4vzY|C$na_&fEO<gA(2x
zsiGg3OsL1RcVVGKZRYfWpN>-zzSY=jO)xk;8K$#v;)hPpnb*_p%^S@}5xvz7T>5j0
z={-(2^rMa+c}$Kv(|rOn@sX*X3A$$N=*Si#UhFms%ou_F9GM|9tN6V<GyC~99iLRK
z$TX3jYtK$h9X&ynx$-tTsgliEn5`EztHN=#lKD~f3^mcad}{LFH*)I4(^=hBr+KgM
z*c$VG`P%#UX`Rm5=DpVJx4AfqKHJrq8s-{n78*=2mAdyTw=x>8PdL~b@xJ5fIGek~
z=V=eZ;IBD#_a|G7`82n4Si-=ca`Br-ZH%`S^7f3oGiU$QF$$mF6Bk!}c@+G`>4LVB
zayHrV8JVmTCo0xKts`?MpYX)d(;W5kxH@5QTB~#QTi5k@%Dks@M@iYL!rqSTgH5mT
z^WJR8EKF|(Z>{9v!ds(H3K~t2r>I`{sg2qD+K;#MuI7g^_ZUZMR{Q)s;ocVlnvEb&
z(Y=26uCF~mr^HX3D$94Cd05P?(bMMf7H8$1YGeKG^Z)xi?sq@kd-AOw4*f;;NzNu_
zIGv+0BXf$c^47FsnAy--`~_`&P(^cj?>^wd_`TzL{`IuEuVmu*Cb_HbwW68UG@d!W
zPxz=1VVqT9*@LU(WZq{5V^*b)xA1l@97p%pJZ{!LOfg{L0WR+0!VJ!&;`{kNpAFy7
zdRMmMnfdHU2ZurW#Gsk<rv5(Rqh$`W#J!tIJZDl<e&+Xwso09a$=rn_EpkQjJ#%OF
zgC(1aabv}uhoa)1hfmL^4|mqh%B(r6S8Tea-zeBRIn`!2RamV#zg<_!qhSZG*OR!8
zc39l}j)WaGux7ja+4Ebe-zX)rf$h|q>Pd3nj#<W-Fh94)d?Ji}8uhiq2F1?9%VaWj
zVbAP@T8o+XpUyd3xzj;5uUl6hOn5|aM^Iv;!ocM!)!F$!K{+M*nOzarphS7`gDW~h
z>C&@$814%V<~a~+P{o~RyxFrTm^(34==I#xOcgz2tD-f+|M6Kn>Rg*uKmD5Xp3~C?
z?>NuH$HltQcy2x!&aIGpZAI^#2nwK2?#`Z{&{ox^>0nmsHiOz2729A&<CT6GJv-;=
z{1*`?j(X2*_Se(!{g|T9lxjH9HEQmUeS5d}CC5|yh`X6_5@MeeOp%=P%$kbWo0<6f
z$Tr1y^6Bb4g-&yu$tlc(O{DvCV*m4Sp!h29Gnr-P<fCdf|0+0|(=)Yx&Ux1@@$__N
z`)%&3^Q+c<CUV8jf7P?S=R4nap4s?&8kco%;NHN!fqMh@2JQ{q8@M-cZ{Xg*y@7iJ
i_Xh3_+#9$zaBtw=z`cQc1NR2*4cr^JH}HSCfxiIWZw^iX

literal 0
HcmV?d00001

diff --git a/assets/silly/bmf/nds12_0.silly.gz b/assets/silly/bmf/nds12_0.silly.gz
new file mode 100644
index 0000000000000000000000000000000000000000..d63833d48e7e502079faf977a3bfea9cec164f2a
GIT binary patch
literal 763
zcmV<X0tEdZiwFq)at~(!18!t<F*08;E^}#YY<U3fl?!eIAq)j`v>vTDZ!1+1_VXA_
zmZWOrC$+l}10H|a&)diCE9my4@kS&6yuU{avelX2mG*=&@*c5$zK=iElZ~~+?|qCT
zKd=082m55dDT-^G`l%X^VZY)ZQL}4eY&EKMGVM|2r^xTk+sfGE_kPZ^U*V^{{|~>?
z=YFs1f6dSRT$}g&zLxF$KEGA~=ii<dz1q)zd=e*}OP#sHZ(|l2V)wI;)JJj6IeyPb
z`};U~{^%XEWSv3$K8|PjX>H}*#zy&LzSZx!*S?Cp$J8~tzpY!XyGQta&ugBE|89AE
zd*%Gm%G=LkJmxd|{k)M^)}z>Swu;nJt1YjK{OlUTtYd0-RmBI55#3sRC$VOG&HQ_e
ze~`bL-&Z}?TRb}>+2gmTj{o%g?2fcvW&M)RQG90m`jtvS_d>Mr9T=IJKY!2fBR-!Z
zFpGD_lU3Dz{&g<$?7sU*MBa+uE1s+TdGDO%pO3izYy7(BDgNv4_U&r^H7?Ab$1&$$
zG1wmD`_J3heP;cyStdVXExfa`{M+B@*AY*>3urv%Z5~GUvU=rOTGfQLA-il3Pp4#A
z_ml5gB>ip~zwYz+oe<aW=nOx3Nc<Y}G0#-j__fb%B`}HZxaOO!tJHt=@FYKt^Sowt
z`aFKkzs7||R6~(JkB2=go8dT}=BHKqjQ-EoYt-U;A4%e%)ie8iU8Vjj(a-!}iTj_u
zj~372zf;x-D$;MDdR?KQjvAguk3Dx>MV-kRrFvZVOU}H*U$3N7q8Qro?9bZlpEkz%
z`mCBY+oK|U?)(j{JH|68k0<k?6;3D2n7My>kNnovxwGAWRho~iYnfhejxp;;vx<18
z?76-M*q;jj{PvGl@f5OnhHCwsdB~ReSAfobZMIeZt{R@~@@MxS*FSyF{zj`@QD?l9
tYW(jku7CeMY_(dgR;$%&wOXxKtJP|?TCG;A)oT40eFJggKaT`J002bAv-ki2

literal 0
HcmV?d00001

diff --git a/src/dothack/DotHack.java b/src/dothack/DotHack.java
index 80c63a7..3e62ee7 100644
--- a/src/dothack/DotHack.java
+++ b/src/dothack/DotHack.java
@@ -23,7 +23,7 @@ public class DotHack extends MIDlet implements Runnable {
     _display.setCurrent(game);
 
     thread = new Thread(this);
-    // thread.setPriority(Thread.MAX_PRIORITY);
+    thread.setPriority(Thread.MAX_PRIORITY);
     thread.start();
 
     sagiri.Set_Scene(new Intro());
@@ -37,13 +37,13 @@ public class DotHack extends MIDlet implements Runnable {
     while (true) {
       sagiri.time_begin = System.currentTimeMillis();
       
-      try { Thread.sleep(1000/sagiri.fps); }
-      catch (Exception e) {}
-      
       game.repaint();
       game.serviceRepaints();
 
       sagiri.input.Update();
+
+      try { Thread.sleep(1000/sagiri.fps); }
+      catch (Exception e) {}
       
       sagiri.time_delta = System.currentTimeMillis() - sagiri.time_begin;
     } 
diff --git a/src/sillysagiri/BMF.java b/src/sillysagiri/BMF.java
index 43eda4f..c88f19e 100644
--- a/src/sillysagiri/BMF.java
+++ b/src/sillysagiri/BMF.java
@@ -1,11 +1,14 @@
 package sillysagiri;
 
+import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 
 import javax.microedition.lcdui.Graphics;
 import javax.microedition.lcdui.Image;
 import javax.microedition.lcdui.game.Sprite;
 
+import sillysagiri.scene.DeathError;
+
 public class BMF {
   public static final byte ID = 0;
   public static final byte X = 1;
@@ -156,13 +159,64 @@ public class BMF {
    */
   public void SetColor(int rgb)
   {
-    int[] buffer = new int[img.getWidth()*img.getHeight()];
-    img.getRGB(buffer, 0, img.getWidth(), 0, 0, img.getWidth(), img.getHeight());
-
-    for (int i=0; i<buffer.length; i++)
-      if (buffer[i] == 0xFFFFFFFF) buffer[i] = rgb;
+    // int[] buffer = new int[img.getWidth()*img.getHeight()];
+    // img.getRGB(buffer, 0, img.getWidth(), 0, 0, img.getWidth(), img.getHeight());
     
-    img = Image.createRGBImage(buffer, img.getWidth(), img.getHeight(), true);
+    // for (int i=0; i<buffer.length; i++)
+    // {
+      //   if (buffer[i] == 0xFF000000) buffer[i] = rgb;
+      //   else buffer[i] = 0x00000000;
+      // }
+
+    try 
+    {
+      // ByteArrayOutputStream out = new ByteArrayOutputStream(128*64);
+      // Gzip.gunzip(this.getClass().getResourceAsStream("/silly/bmf/nds12_0.silly.gz"), out);
+
+      // GZIPInputStream in = new GZIPInputStream(this.getClass().getResourceAsStream("/silly/bmf/nds12_0.silly.gz"));
+
+      InputStream in = this.getClass().getResourceAsStream("/silly/bmf/nds12_0.silly");
+      int[] buffer = new int[128*64];
+      
+      // read header
+      byte[] size = new byte[4];
+      in.read(size, 0, 4);
+      int pointer = 0;
+      while(true)
+      {
+        byte[] temp = new byte[2];
+        int res = in.read(temp, 0, 2);
+        if (res == -1) break;
+
+        char i = (char)((temp[1] << 8) | temp[0]);
+
+        // Extract 5-bit ABGR;
+        char alpha = (char)((i >> 15) & 0x01);
+        char blue = (char)((i >> 10) & 0x1F);
+        char green = (char)((i >> 5) & 0x1F);
+        char red = (char)(i & 0x1F);
+
+        // Scale the 5-bit values to 8-bit
+        if (alpha == 1) alpha = 255;
+        else alpha = 0;
+
+        red = (char)((red << 3) | 0x07);
+        blue = (char)((green << 3) | 0x07);
+        green = (char)((blue << 3) | 0x07);
+
+        // Combine into 24-bit value AARRGGBB
+        buffer[pointer] = (alpha << 24) | (red << 16) | (green << 8) | blue;
+        pointer++;
+      }
+      
+      // img = Image.createRGBImage(buffer, img.getWidth(), img.getHeight(), true);
+      img = Image.createRGBImage(buffer, 128, 64, true);
+    }
+    catch(Exception e)
+    {
+      e.printStackTrace();
+      Sagiri._instance.Set_Scene(new DeathError(e));
+    }
   }
   
   // TODO: handle multiline
diff --git a/src/sillysagiri/Input.java b/src/sillysagiri/Input.java
index 3276b5a..d6992d7 100644
--- a/src/sillysagiri/Input.java
+++ b/src/sillysagiri/Input.java
@@ -1,21 +1,17 @@
 package sillysagiri;
 
 public final class Input {
-  public int state_keycode = KeyCode.NONE;
+  public int state_keycode = Sagiri.KEY_NONE;
   public int state_keyphase = 0;
   public int state_touchState = Sagiri.TOUCH_NONE;
 
   public int touchX = 0;
   public int touchY = 0;
-
-  public Input()
-  {
-  }
   
   public final void Update()
   {
-    if (state_keyphase == 0) state_keyphase = KeyCode.NONE;
-    if (state_keyphase != 0 && state_keyphase != KeyCode.NONE) state_keyphase++;
+    if (state_keyphase == 0) state_keyphase = Sagiri.KEY_NONE;
+    if (state_keyphase != 0 && state_keyphase != Sagiri.KEY_NONE) state_keyphase++;
     state_touchState = Sagiri.TOUCH_NONE;
   }
   
diff --git a/src/sillysagiri/scene/Intro.java b/src/sillysagiri/scene/Intro.java
index d48c4a9..026469a 100644
--- a/src/sillysagiri/scene/Intro.java
+++ b/src/sillysagiri/scene/Intro.java
@@ -1,6 +1,5 @@
 package sillysagiri.scene;
 import java.io.IOException;
-import java.util.Enumeration;
 
 import javax.microedition.lcdui.Graphics;
 import javax.microedition.lcdui.Image;
@@ -8,8 +7,6 @@ import javax.microedition.lcdui.game.Sprite;
 
 import sillysagiri.BMF;
 import sillysagiri.Easing;
-import sillysagiri.Input;
-import sillysagiri.KeyCode;
 import sillysagiri.Scene;
 import sillysagiri.Utils;
 
@@ -29,7 +26,7 @@ public class Intro extends Scene {
       bmf_normal = BMF.Create("/silly/bmf/nds12_0.png", "/silly/bmf/nds12.fnt");
       bmf_outline = BMF.Create("/silly/bmf/onds12_0.png", "/silly/bmf/onds12.fnt");
       bmf_black = BMF.Create("/silly/bmf/nds12_0.png", "/silly/bmf/nds12.fnt");
-      bmf_black.SetColor(0xFF000000);
+      bmf_black.SetColor(0xFFFF0000);
       img_logo = Image.createImage("/t_1.png");
     }
     catch(Exception e)
@@ -131,6 +128,8 @@ public class Intro extends Scene {
               Utils.GetScreenWidth()/2, (int)(Utils.GetScreenHeight()*0.7),
               Graphics.VCENTER | Graphics.HCENTER);
 
+          g.drawImage(bmf_black.img, 0, 0, 20);
+
           if (sagiri.input.IsKeyDownAny())
             sagiri.Set_Scene(new MainMenu());
         }