fix mild display bugs

also improves the throbber
This commit is contained in:
Kistaro Windrider 2024-02-16 19:06:42 -08:00
parent 37d39dc6b8
commit f4459ded0d
Signed by: kistaro
SSH Key Fingerprint: SHA256:TBE2ynfmJqsAf0CP6gsflA0q5X5wD5fVKWPsZ7eVUg8

View File

@ -892,20 +892,14 @@ function zonk_mode:draw()
fadetbl(15, self.fd15, ffrac) fadetbl(15, self.fd15, ffrac)
end end
self.txt_frame:draw() self.txt_frame:draw()
-- TODO: draw throbber
if not self.playing_text and not self.confirmed and self.twt <= 0 then if not self.playing_text and not self.confirmed and self.twt <= 0 then
font_default() font_default()
print("➡️",121,121,12) print("➡️",121,121,12)
print("➡️",120,120,self:throbber_color()) print("➡️",120,120,self.brth:matches(self.bwt) and (hz(2) and 7 or 6) or 5)
end end
if(self.d) self.d:draw() if(self.d) self.d:draw()
end end
function zonk_mode:throbber_color()
if (not self.bwt or self.bwt==0) return ((t()<<1)&0x1 < 1) and 7 or 6
return self.brth:matches(self.bwt) and 7 or 6
end
-->8 -->8
-- awakener -- awakener
@ -1760,7 +1754,7 @@ function ggwp:draw()
end end
rectfill(0, 120, 128, 128, 0x1007) rectfill(0, 120, 128, 128, 0x1007)
font_special() font_special()
print("\^w\^tgreat job!",5,4,0) print("\^w\^tgreat job!",5,8,0)
print("fINAL SCORE:", 5, 26, 0) print("fINAL SCORE:", 5, 26, 0)
--0, 8, 9, 12 --0, 8, 9, 12
local xpos = 123-6*#self.score_str local xpos = 123-6*#self.score_str
@ -1769,15 +1763,15 @@ function ggwp:draw()
print(self.score_str, xpos+1, 33, 12) print(self.score_str, xpos+1, 33, 12)
print(self.score_str, xpos, 32, 0) print(self.score_str, xpos, 32, 0)
print(self.score_pct,64-3*#self.score_pct,55,self.col) print(self.score_pct,64-3*#self.score_pct,59,self.col)
font_default() font_default()
local xoff = print(self.final_text, 0, -999, 0) - 1 local xoff = print(self.final_text, 0, -999, 0) - 1
print(self.final_text, 64-xoff/2, 90, 0) print(self.final_text, 64-xoff/2, 90, 0)
if self.frem <= 0 and not self.d then if self.frem <= 0 and not self.d then
print("➡️", 117, 120, 12) print("➡️", 117, 120, 15)
print("➡️", 116, 119, hz(2) and 0 or 13) print("➡️", 116, 119, hz(2) and 0 or 9)
end end
if (self.d) self.d:draw() if (self.d) self.d:draw()
end end
@ -1933,7 +1927,7 @@ THINK !HYPNOSIS !WORKS
TEXT TOO CLOSELY. TEXT TOO CLOSELY.
----- -----
center:9:20 center:9:20
tHIS IS A #vACATION! >tHIS IS A #vACATION!
yOU DON'T HAVE TO DO yOU DON'T HAVE TO DO
>MUCH OF #ANYTHING. >MUCH OF #ANYTHING.
>yOU DON'T HAVE TO >yOU DON'T HAVE TO