From 1d620a159ca39d4674a8b0058e3c5f3e1108eace Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Wed, 1 May 2024 11:20:44 +0200 Subject: [PATCH] Explosions --- cirnofarm.p64 | 18 +++++++++--------- src/barrel.lua | 4 ++++ src/box.lua | 5 +++++ src/npc.lua | 5 +++++ 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/cirnofarm.p64 b/cirnofarm.p64 index e298e30..093c4d3 100644 --- a/cirnofarm.p64 +++ b/cirnofarm.p64 @@ -6,7 +6,7 @@ version 2 :: sfx/ :: gfx/0.gfx b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w -NS0wMSAwODoxMTo0MyIscmV2aXNpb249MTU1M11dbHo0ALYNAABERgAA8xR7WzBdPXtibXA9cHh1 +NS0wMSAwOToyMDozMSIscmV2aXNpb249MTU2M11dbHo0ALYNAABERgAA8xR7WzBdPXtibXA9cHh1 AEMgEBAE8PAsZmxhZ3M9MCxwYW5feAgA2nk9MCx6b29tPTExfSwyAPEIrxsj3gN_A94j3gP_CRNu A04TbiNOA34TAP8DjgM_A04DLiN_Iy4DngP_FAMuXgAd8AnwRU2ALSYtUB1mHQUgHYYNFQAdlh0V DaYEAMMNFQANlh0FEL0F8BNYAB8zWAAV8CpQRIAUTx8UUA8Ujx8EQC8UTx8kQA8UHx9EDg8ZBEAP @@ -71,11 +71,11 @@ CQopChkKBhkGEGoJKgkWIBYKFgoJAK8wNhlGUIaQJvAGQQEfDzIA------------------------ --------------9BUD0xMX19 :: gfx/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NS0wMSAwODoxMTo0MyIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA +NS0wMSAwOToyMDozMSIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA MG5pbA== :: map/0.map b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NS0wMSAwODoxMTo0MyIscmV2aXNpb249MTU5OF1dbHo0AMwFAAAMQgAA8Ah7e2JtcD11c2VyZGF0 +NS0wMSAwOToyMDozMSIscmV2aXNpb249MTYwOV1dbHo0AMwFAAAMQgAA8Ah7e2JtcD11c2VyZGF0 YSgiaTE2IiwzMgMALyIwAQD-gy4xMAwADwEAoiozMAEAHjQUAAwBADU1ODABAD80ODABACsvNDAz ACYfNnwABD8xMzCAAEoAAQA-MzYwXAATBAQADwEANQ9QACEvMzCAAG0PAQC6KjQ4CAEPBAMHDiAA DwEANgSAAB8zYAEABxAAPzQ1MAEAOx421AAO7AAOJAAPAQA-DmgADwEA-34OfAIPAQBsLzYwAQBr @@ -104,18 +104,18 @@ AQAFHziAAOsuMWJ4BA_AAAEEHAAJgAQfZQQAGA8BAAwvMWEEABMPAQACL2UwAQAuLzFhBAATD4AA -28fZQQAIA8BABAvMWEEABMvMGUEAB4PBCGSS2JhY2sEIQ_JMSlQbT0xfX0= :: map/1.map b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTI4IDIxOjA4OjM1Iixtb2RpZmllZD0iMjAyNC0w -NS0wMSAwODoxMTo0MyIscmV2aXNpb249MTIxXV1sejQAygAAAG5BAADwCHt7Ym1wPXVzZXJkYXRh +NS0wMSAwOToyMDozMSIscmV2aXNpb249MTMxXV1sejQAygAAAG5BAADwCHt7Ym1wPXVzZXJkYXRh KCJpMTYiLDMyAwAvIjABAP---5YvNzCMAf-8HzeAAHAOhAAPiABlDwEA------------MfEJIiks aGlkZGVuPWZhbHNlLHBhbl94PS02CQDieT0tNCx0aWxlX2g9MTYKABB3CgCPem9vbT0xfSxZEAkP AQD--------------------7D1kQBCQyNFoQPzE0MlwQ-------------------------------- -----------dUG09MX19 :: map/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NS0wMSAwODoxMTo0MyIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA +NS0wMSAwOToyMDozMSIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA MG5pbA== :: sfx/0.sfx b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w -NS0wMSAwODoxMTo0MyIscmV2aXNpb249MTIzNV1dbHo0AEYBAABmCAAA8CdweHUAAygAAAMABA9A +NS0wMSAwOToyMDozMSIscmV2aXNpb249MTI0NV1dbHo0AEYBAABmCAAA8CdweHUAAygAAAMABA9A EAIOAAGgASACoA4ADxAADfDKAQIDBAUGBwAP-5AICQoLDwwPDQ8ODw8QAPAADQ8RDxIPEw8UDxUP Fg8XEwDxAQ8YDxkPGg8bDxwPHQ8eDx8UAPEAIA8hDyIPIw8kDyUPJg8nFADxACgPKQ8qDysPLA8t Dy4PLxQA8QAwDzEPMg8zDzQPNQ82DzcUAP8FOA85DzoPOw88Dz0PPg8-AA--8P8BAOvyJ1oBEAYP @@ -124,14 +124,14 @@ Gy-wADAA--_CH-8BAMzxHegPQAANQA8XAAsaCAYIEAIDEAUABgAIAEkXACYICVD--wnxF-4J-Bf_ CfBwKwBf-rDwcAQIAP-cH-8BAJdQ-----x8= :: sfx/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NS0wMSAwODoxMTo0MyIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA +NS0wMSAwOToyMDozMSIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA MG5pbA== :: main.lua ---[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-05-01 08:11:43",revision=1564]] +--[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-05-01 09:20:31",revision=1574]] include("/cirnofarm/src/game.lua") :: .info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTE2IDE5OjQyOjIyIixtb2RpZmllZD0iMjAyNC0w -NS0wMSAwODoxMTo0MyIscnVudGltZT02LHN0b3JlZD0iMjAyNC0wNC0xNiAxOTo0MDowNSIsd29y +NS0wMSAwOToyMDozMSIscnVudGltZT02LHN0b3JlZD0iMjAyNC0wNC0xNiAxOTo0MDowNSIsd29y a3NwYWNlcz17e2xvY2F0aW9uPSJtYWluLmx1YSMxIix3b3Jrc3BhY2VfaW5kZXg9MX0se2xvY2F0 aW9uPSJnZngvMC5nZngiLHdvcmtzcGFjZV9pbmRleD0yfSx7bG9jYXRpb249Im1hcC8wLm1hcCIs d29ya3NwYWNlX2luZGV4PTN9LHtsb2NhdGlvbj0ibWFwLzEubWFwIix3b3Jrc3BhY2VfaW5kZXg9 diff --git a/src/barrel.lua b/src/barrel.lua index a48be88..197a5cf 100644 --- a/src/barrel.lua +++ b/src/barrel.lua @@ -1,4 +1,5 @@ local Actor = require(make_path("actor2")) +local Particle = require(make_path("particle")) -- barrel = setmetatable({}, {__index = actor}) -- function barrel:new(actor) @@ -17,6 +18,7 @@ function Barrel:new(x,y) b.life = 5 b.shootable = true b.spriteIndex = 3 + b.particle = particles_list.EXPLOSION return setmetatable(b, {__index=self}) end @@ -30,6 +32,8 @@ function Barrel:update() end function Barrel:destroy() + local p = Particle:create(self.x, self.y,self.particle) + add(particles, p) del(actors,self) end diff --git a/src/box.lua b/src/box.lua index 08094fb..d0fb7f8 100644 --- a/src/box.lua +++ b/src/box.lua @@ -1,4 +1,5 @@ local Actor = require(make_path("actor2")) +local Particle = require(make_path("particle")) local Box = Actor:new() @@ -9,6 +10,8 @@ function Box:new(x,y) b.shootable = true b.spriteIndex = 7 --4 + self.particle = particles_list.EXPLOSION + return setmetatable(b, {__index=self}) end @@ -19,6 +22,8 @@ function Box:update() end function Box:destroy() + local p = Particle:create(self.x, self.y,self.particle) + add(particles, p) del(actors,self) end diff --git a/src/npc.lua b/src/npc.lua index 16fa455..ca58af0 100644 --- a/src/npc.lua +++ b/src/npc.lua @@ -1,4 +1,5 @@ local Actor = require(make_path("actor2")) +local Particle = require(make_path("particle")) local NPC = Actor:new() @@ -26,6 +27,8 @@ function NPC:new(x,y) n.raycast_frames = 0 n.raycast_frames_to_wait = 120 + n.particle = particles_list.EXPLOSION + return setmetatable(n, {__index=self}) end @@ -56,6 +59,8 @@ function NPC:update() end function NPC:destroy() + local p = Particle:create(self.x, self.y,self.particle) + add(particles, p) del(actors,self) end