|
@@ -30,13 +30,6 @@ function love.update(dt)
|
|
|
DtotalFloor = DtotalFloor + diff
|
|
DtotalFloor = DtotalFloor + diff
|
|
|
updateStocks(diff)
|
|
updateStocks(diff)
|
|
|
end
|
|
end
|
|
|
-
|
|
|
|
|
- for i=1, #crafter do
|
|
|
|
|
- local crft = crafter[i]
|
|
|
|
|
- local difpos = difpos(crft.ui.y + crft.ui.y, crft.ui.y)
|
|
|
|
|
- local cursec = crft.readyTime - crft.ready
|
|
|
|
|
- local curpos = progressbar(cursec, dt, maxsec, difpos)
|
|
|
|
|
- end
|
|
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
-- ==================================================================================
|
|
-- ==================================================================================
|
|
@@ -59,15 +52,18 @@ function love.draw()
|
|
|
love.graphics.setColor(colorWhite)
|
|
love.graphics.setColor(colorWhite)
|
|
|
love.graphics.print(crft.amount .. crft.title, crft.ui.x+5, crft.ui.y+5, 0, 1, 1)
|
|
love.graphics.print(crft.amount .. crft.title, crft.ui.x+5, crft.ui.y+5, 0, 1, 1)
|
|
|
|
|
|
|
|
- else if crft.own then
|
|
|
|
|
|
|
+ elseif crft.own then
|
|
|
|
|
+ if crft.own and not crft.active then
|
|
|
|
|
+ local curpos = progressbar(crft.ready, crft.readyTime, crft.ui.h)
|
|
|
|
|
+ end
|
|
|
|
|
+
|
|
|
love.graphics.setColor(colorBlue)
|
|
love.graphics.setColor(colorBlue)
|
|
|
love.graphics.rectangle(
|
|
love.graphics.rectangle(
|
|
|
"fill", crft.ui.x, crft.ui.y, crft.ui.w, crft.ui.h, 5, 5)
|
|
"fill", crft.ui.x, crft.ui.y, crft.ui.w, crft.ui.h, 5, 5)
|
|
|
|
|
|
|
|
-
|
|
|
|
|
love.graphics.setColor(colorOrange)
|
|
love.graphics.setColor(colorOrange)
|
|
|
love.graphics.rectangle(
|
|
love.graphics.rectangle(
|
|
|
- "fill", crft.ui.x, crft.ui.y, crft.ui.w, crft.ui.y, 5, 5)
|
|
|
|
|
|
|
+ "fill", crft.uiready.x, crft.uiready.y-curpos, crft.uiready.w, curpos, 5, 5)
|
|
|
|
|
|
|
|
else
|
|
else
|
|
|
love.graphics.setColor(colorGrey)
|
|
love.graphics.setColor(colorGrey)
|
|
@@ -111,20 +107,7 @@ function love.mousereleased(x, y, button)
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
-function difpos(min, max)
|
|
|
|
|
- return max - min
|
|
|
|
|
-end
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-function progressbar(cursec, dt, maxsec, difpos)
|
|
|
|
|
- local cursec = 0 -- de 100 à 150 en 10 sec
|
|
|
|
|
- local maxsec = 10
|
|
|
|
|
- local minpos = 100
|
|
|
|
|
- local maxpos = 150
|
|
|
|
|
- local difpos = maxpos - minpos
|
|
|
|
|
- local curpos = 0
|
|
|
|
|
-
|
|
|
|
|
- cursec = cursec + dt
|
|
|
|
|
|
|
+function progressbar(cursec, maxsec, difpos)
|
|
|
curpos = difpos / maxsec * cursec
|
|
curpos = difpos / maxsec * cursec
|
|
|
|
|
|
|
|
return curpos
|
|
return curpos
|