Переглянути джерело

micro update

too phucked to do more than this
voltcitron 1 рік тому
батько
коміт
320e089f40
4 змінених файлів з 26 додано та 19 видалено
  1. 8 5
      data.lua
  2. 5 2
      main.lua
  3. 12 9
      progress.lua
  4. 1 3
      ui.lua

+ 8 - 5
data.lua

@@ -3,9 +3,11 @@
 Stones = 30.0  -- Current Stone Stock
 StonesSec = 0
 
+currentTier = 0
+
 crafter = {}
 
-for i=0, 50 do
+for i=0, 49 do
   local dig = {}
   dig.title = "D"
   dig.own = false -- is it bought ?
@@ -15,10 +17,11 @@ for i=0, 50 do
   dig.speed = 0.3 -- Speed in Sec
   dig.amount = 0.1 -- Amount by Sec
   dig.cost = 10
-  local xg = (i%20)*50
-  local yg = 50 + math.floor(i/20)*50
-  dig.ui = {color = colorBlue, x = xg, y = yg, w = 50, h = 50}
-  dig.uiready = {color = colorOrange, x = xg, y = yg+50, w = 50, h = 0}
+  dig.tier = math.floor(i/8)
+  local xg = (i%10)*100
+  local yg = 50 + math.floor(i/10)*100
+  dig.ui = {color = colorBlue, x = xg, y = yg, w = 100, h = 100}
+  dig.uiready = {color = colorOrange, x = xg, y = yg+100, w = 100, h = 0}
   table.insert(crafter, dig)
 end
 

+ 5 - 2
main.lua

@@ -13,6 +13,7 @@ print("Haloa!")
 -- ==================================================================================
 
 function love.load()
+  success = love.window.setMode(800, 600, {resizable=false})
   Lume = require("lume")
   loadGame()
   require("ui")
@@ -72,8 +73,10 @@ function love.draw()
       "fill", crft.uiready.x, crft.uiready.y-curpos, crft.uiready.w, curpos, 5, 5)
       
     else
-      love.graphics.setColor(colorGrey)
-      love.graphics.rectangle("line", crft.ui.x, crft.ui.y, crft.ui.w, crft.ui.h, 5, 5)
+      if currentTier >= crft.tier then
+        love.graphics.setColor(colorGrey)
+        love.graphics.rectangle("line", crft.ui.x, crft.ui.y, crft.ui.w, crft.ui.h, 5, 5)
+      end
     end
   end
 

+ 12 - 9
progress.lua

@@ -1,24 +1,27 @@
 -- COMES BEFORE DATA.LUA
 
 
-Types = {}
+TypesZero = {
+	-- reqtier, name, rarity
+	{0, "Dirt", 5}
+	{0, "Stone", 8}
+	--{0, "Clay", 0.6}
+	{0, "Sand", 2}
+}
 
 
 function doType()
-	-- -- -- reqlvl, name, rarity
-	local dirt = {0, "Dirt", 1}
-	local ston = {0, "Stone", 0.8}
-	local clay = {0, "Clay", 0.6}
-	local sand = {0, "Sand", 0.4}
+	
+	
 end
 
 function grade(type)
 	local grade = math.random(100)
-	if grade < 70 then
+	if grade < 68 then
 		g = "common"
-	elseif grade < 88 then
+	elseif grade < 86 then
 		g = "uncommon"
-	elseif grade < 98 then
+	elseif grade < 97 then
 		g = "rare"
 	else
 		g = "unique"

+ 1 - 3
ui.lua

@@ -8,6 +8,4 @@
 
 buylist = {}
 table.insert(buylist, {title = "Mine", active = true, x = 0, y = 0, w = 100, h = 50})
-table.insert(buylist, {title = "Forest", active = false, x = 100, y = 0, w = 100, h = 50})
-
-  
+table.insert(buylist, {title = "Forest", active = false, x = 100, y = 0, w = 100, h = 50})