2 Commits

Author SHA1 Message Date
3151db5430 fix precedence error 2025-05-31 22:27:03 -07:00
2964159858 fix offset, try but fail to fix variants 2025-05-31 22:19:35 -07:00

View File

@ -1487,24 +1487,24 @@ end
-- full docs. -- full docs.
flotilla = mknew{ flotilla = mknew{
use_var = 0x0001, use_var = 0x1111,
opt_odds = split"0.5,0.5,0.5,0.5", opt_odds = split"0.5,0.5,0.5,0.5",
init=function(this) init=function(this)
this.ship_bases={ this.ship_bases={
[0]=mknew(ship_mook.new{ship_t=0}), [0]=mknew(ship_mook.new{ship_t=0}),
[1]=mknew(ship_mook.new{ship_t=1}), [1]=mknew(ship_mook.new{ship_t=1, sprite=104}),
[4]=mknew(ship_defender.new{ship_t=4}), [4]=mknew(ship_defender.new{ship_t=4}),
[5]=mknew(ship_defender.new{ship_t=5}), [5]=mknew(ship_defender.new{ship_t=5, sprite=10}),
[8]=mknew(ship_turret.new{ship_t=8}), [8]=mknew(ship_turret.new{ship_t=8}),
[9]=mknew(ship_turret.new{ship_t=9}), [9]=mknew(ship_turret.new{ship_t=9, sprite=4}),
[12]=mknew(ship_skirmisher.new{ship_t=12}), [12]=mknew(ship_skirmisher.new{ship_t=12}),
[13]=mknew(ship_skirmisher.new{ship_t=13}), [13]=mknew(ship_skirmisher.new{ship_t=13, sprite=26}),
} }
end, end,
} }
function flotilla:load(ulc_cx, ulc_cy, lvl) function flotilla:load(ulc_cx, ulc_cy, lvl)
local rows,cy,uv,counts={},ulc_cy,self.use_var+0xc840,{ local rows,cy,uv,counts={},ulc_cy,self.use_var,{
[0]=0, [0]=0,
[1]=0, [1]=0,
[4]=0, [4]=0,
@ -1533,7 +1533,7 @@ function flotilla:load(ulc_cx, ulc_cy, lvl)
-- alternate is requested -- alternate is requested
-- and we allow alternates -- and we allow alternates
-- for this type of ship -- for this type of ship
ship_t+=(uv>>ship_t&0x1)&(f&0x10>>4) ship_t+=(uv>>ship_t&0x1)&((f&0x10)>>4)
add(row, self.ship_bases[ship_t].new{col=cx-ulc_cx}) add(row, self.ship_bases[ship_t].new{col=cx-ulc_cx})
end end
end end
@ -1602,7 +1602,7 @@ function flotilla:update()
local y_interval,y_offset=0,40 local y_interval,y_offset=0,40
if live_rows > 1 then if live_rows > 1 then
y_interval=56/(live_rows-1) y_interval=52/(live_rows-1)
y_offset=4-y_interval y_offset=4-y_interval
end end