Converted particles to actors

src/game.lua

@@ -69,6 +69,10 @@ function _update()
 	cirno.update()
 
   weapons_manager.update()
+
+  for b in all(actors) do
+    b:update()
+  end
 end
 
 LAYERS = {

src/weapons.lua

@@ -1,12 +1,13 @@
 --[[pod_format="raw",created="2024-04-24 07:17:14",modified="2024-04-24 20:33:05",revision=11]]
 local map_manager = require(make_path("map"))
+local Actor = require(make_path("actor2"))
 --local actor = require("actor2")
 
 M = {}
 
 local weapons = {}
 local bullets = {}
-local particles = {}
+-- local particles = {}
 
 weapon = {
 	name = "Ice Blaster",
@@ -17,30 +18,34 @@ weapon = {
 	
 }
 
-particle = {
+Particle = Actor:new()
-	x=0,
+Particle.life=4
-	y=0,
+Particle.spriteIndex=81
-	life=4,
-	spriteIndex=81
-}
-particle.__index = particle
-function particle:new(x,y)
-	local o = setmetatable({}, particle)
-	o.x=x
-	o.y=y
-	return o
-end
 
-function particle:update()
+-- particle = {
+-- 	x=0,
+-- 	y=0,
+-- 	life=4,
+-- 	spriteIndex=81
+-- }
+--particle.__index = particle
+-- function Particle:new(x,y)
+-- 	local o = setmetatable({}, particle)
+-- 	o.x=x
+-- 	o.y=y
+-- 	return o
+-- end
+
+function Particle:update()
 	self.life-=1
-	if self.life<0 then
+	if self.life<=0 then
-		del(particles,self)
+		del(actors,self)
 	end
 end
 
-function particle:draw()
+-- function Particle:draw()
-	spr(self.spriteIndex,self.x,self.y)
+-- 	spr(self.spriteIndex,self.x,self.y)
-end
+-- end
 
 bullet = {
 	x=0,
@@ -65,9 +70,9 @@ end
 function bullet:destroy()
 	
 	-- Create particle
-	local p = particle:new(self.x, self.y)
+	local p = Particle:new(self.x, self.y)
 
-  	add(particles, p)
+  	add(actors, p)
 
 	del(bullets,self)
 end
@@ -150,9 +155,9 @@ function M.draw()
 		b:draw()
 	end
 
-	for p in all(particles) do
+	-- for p in all(particles) do
-		p:draw()
+	-- 	p:draw()
-	end
+	-- end
 end
 
 function M.update()
@@ -160,13 +165,13 @@ function M.update()
 		b:update()
 	end
 
-	for p in all(particles) do
+	-- for p in all(particles) do
-		p:update()
+	-- 	p:update()
-	end
+	-- end
 end
 
 function M.debug_draw()
-	print(string.format("Bullets: %d Particles: %d", count(bullets), count(particles)), 0,32,1)
+	print(string.format("Bullets: %d", count(bullets)), 0,32,1)
 end
 
 return M