diff --git a/cirnofarm.p64 b/cirnofarm.p64 index eedd489..ff78d6b 100644 --- a/cirnofarm.p64 +++ b/cirnofarm.p64 @@ -6,40 +6,43 @@ version 2 :: sfx/ :: gfx/0.gfx b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w -NC0xNiAyMjowODowMyIscmV2aXNpb249MjY2XV1sejQAgwIAAKwzAADzFHtbMF09e2JtcD1weHUA +NC0xNyAwOTo1NDozNyIscmV2aXNpb249Mjg4XV1sejQAwQIAAPAzAADzFHtbMF09e2JtcD1weHUA QyAQEATw8CxmbGFncz0wLHBhbl94CADKeT0wLHpvb209N30sMQDxCK8bI94DfgPeI94D-gkTbgNO E24jTgN_EwD-A44DPgNOAy4jfiMuA54D-hQDLl0AHPAJ8EVNgC0mLVAdZh0FIB2GDRUAHZYdFQ2m BADDDRUADZYdBRC9BfATVwAfMVcAFP8VUESAFE8fFFAPFI8fBEAvFE8fJEAPFB8fRB4EQA8UXg0e BEANBgAPn1AUPg0UgETwFX4AHPAI8BWcQAx-EBwwDH4MDgwgnB4MIAx-HAwHAB99BgAGrw4MMAx9 -HECc8BRuAA4P0QEFDzEAdt-PEy8RDxNfEQ8TPxEPDAAUc38TPxE-Ex8QAAAEAB9PDAAQdS8RLxM- -EY84AD9vEQ8MABQv3xPVABzZ9AwPHzQedB40HiQeJAYA8QBEDiQe1B6EHiQOlB6EDjQEAAYeABCE -BAA-DvQJ1wEmDzEA-wrxFEBfFHAeDxU-Hy5AHg8VDj8fDxUODQ4gHg0ODT8fDg0ODQ4QBgBhPA0O -DR4ACwAxDQ4cBwARPgYAIRwOBwARHgYAJw4UGgAlFA4aAOAsDQ4sXkwODUwNDgAOPBYAUjwOEA4s -WgBBDiAODAoAYQ0OHA5ALgoATx5wXkD7AB4PMQD-----------L-Q1A1oAU-HBVwBW4FUAUePB4F -YBVMBYAFDAcMBxwFUCVMBVAFPAcMBxVQBUwHLAVQFUwVcAVMBXAFLAUsBWAFHAUABRwFYAUMBSAF -DAVwBUAF8AWyAB4PMQD-----------------------------------------------_LUG09N319 +HECc8BRuAB33BAY-GaAZLgmQGQ4pkAkeKaAeGbADACHADgMAXynAGfAXWgAODysCBQ8xAEXfzxMv +EQ8TXxEPEz8RDwwAFHN-Ez8RPxMfEAAABAAfTwwAEHUvES8TPxGPOAA-bxEPDAAUL98T1QAc2fQM +Dx80HnQeNB4kHiQGAPEARA4kHtQehB4kDpQehA40BAAGHgAQhAQAPw70CaYBJg8xAP8K8RRAXxRw +Hg8VPx8uQB4PFQ4-Hw8VDg0OIB4NDg0-Hw4NDg0OEAYAYTwNDg0eAAsAMQ0OHAcAET4GACEcDgcA +ER4GACcOFBoAJRQOGgDgLA0OLF5MDg1MDQ4ADjwWAFI8DhAOLFoAQQ4gDgwKAGENDhwOQC4KAE8e +cF5A_wAeDzEA-----------y8QUwPA8cLGAcDgwODAcMDhwwHA4MRz0NkA4MZwwOMB4XDgIAMgxA +DgkA8CEgHiBXAA4wHiA3MB5ALAgcEB5ABywIHAdAHgAHXAcAHgAeEHwQHiAHDAcMB0xwFwAIAJ8M +cBcQF5AYEBibCQwfNs0AHg8xAP-----------------------------------------------2xQ +bT03fX0= :: gfx/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0xNiAyMjowODowMyIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA +NC0xNyAwOTo1NDozNyIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA MG5pbA== :: map/0.map b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0xNiAyMjowODowMyIscmV2aXNpb249Mjc5XV1sejQAzgEAANggAADwCHt7Ym1wPXVzZXJkYXRh -KCJpMTYiLDMyAwAvIjABAPsfOQQAHg8BADsDVAAfMQwABA8QAAEPAQA6HzkEAB4PAQCHLzIwAQAD -LzMwTAAhDwEAYx8zsAAEDhQADhgADwEAIRM0BAAPAQAmD4AAMg8BAK8PMAI1LzMw4ACXHzJcAEQP -BAEhD4wAMg-EAZQP7ABVHjJsAA8wAaIPlAA9DBwADyQBNQ9IAAEvMjABAGgPkADQD_gBCR8wXAAu -DwEArx8y3AARDxQCrB8yvAECDwEA8w9MAQ0vMzABAP_d8RciKSxoaWRkZW49ZmFsc2UsbmFtZT0i -c29saWQiLHBhbl94PS05MAoA8gF5PS0xMzksdGlsZV9oPTE2CgAQdwoAj3pvb209MX0saRALHzEE -APgPAQAhHzEEADgEAQAfOQwABA8QAAEfMQQAOA8BACEfMQQAOB84BAAcHzEEADwfOAQAHBc5PAAP -BAAxHziAAJwfMQQAPB84BAAcHzEEADwfOAQAHB8xBAA8HzgEABwfMQQAPB84BAAcHzEEADwfOAQA -HB8xBAA8HzgEABwfMQQA----------_1D2kQA59iYWNrZ3JvdW5uEBxQbT0xfX0= +NC0xNyAwOTo1NDozNyIscmV2aXNpb249MzAyXV1sejQA3AEAANggAADwCHt7Ym1wPXVzZXJkYXRh +KCJpMTYiLDMyAwAvIjABAPsfOQQAIg8BADcDUAAfMQwABA8QAAEBBAAPAQA1HzkEACIPAQCDLzIw +AQADLzMwTAAhDwEAYx8zsAAEDhQADhgADwEAIRM0BAAPAQAmD4AArBs1BAAOAQAPMAJbLzMwAQCD +HzL0AEgfMgQBMA_MADIPxAGUD_wAVR4ybAAPMAGiD5QAPQwcAA8kATUPSAABLzIwAQBoD5AA0A-o +AQkfMFwALg8BAK8fMtwAEQ8UAqwfMrwBAg8BAPMPTAENLzMwAQD-nfEXIiksaGlkZGVuPWZhbHNl +LG5hbWU9InNvbGlkIixwYW5feD0tOTAKAPIBeT0tMTM5LHRpbGVfaD0xNgoAEHcKAI96b29tPTF9 +LGkQCx8xBAD4DwEAIR8xBAA4BAEAHzkMAAQPEAABHzEEADgPAQAhHzEEADgfOAQAJB8xBAA0HzgE +ACQfMQQANB84BAAkHzEEADQfOAQAJB8xBAA0HzgEACQfMQQANB84BAAkHzEEADQfOAQAJB8xBAA0 +HzgEACQfMQQANB84BAAkHzEEADQfOAQAJB8xBAD----------60PaRADn2JhY2tncm91bm4QHFBt +PTF9fQ== :: map/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0xNiAyMjowODowMyIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA +NC0xNyAwOTo1NDozNyIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA MG5pbA== :: sfx/0.sfx b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w -NC0xNiAyMjowODowMyIscmV2aXNpb249MjM2XV1sejQARgEAAGYIAADwJ3B4dQADKAAAAwAED0AQ +NC0xNyAwOTo1NDozNyIscmV2aXNpb249MjU1XV1sejQARgEAAGYIAADwJ3B4dQADKAAAAwAED0AQ Ag4AAaABIAKgDgAPEAAN8MoBAgMEBQYHAA--kAgJCgsPDA8NDw4PDxAA8AANDxEPEg8TDxQPFQ8W DxcTAPEBDxgPGQ8aDxsPHA8dDx4PHxQA8QAgDyEPIg8jDyQPJQ8mDycUAPEAKA8pDyoPKw8sDy0P Lg8vFADxADAPMQ8yDzMPNA81DzYPNxQA-wU4DzkPOg87DzwPPQ8_Dz8AD--w-wEA6-InWgEQBg8g @@ -48,10 +51,10 @@ L-AAMAD--4If-wEAzPEd6A9AAA1ADxcACxoIBggQAgMQBQAGAAgASRcAJggJUP--CfEX-gn8F-4J 8HArAF-_sPBwBAgA-9wf-wEAl1D-----Hw== :: sfx/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0xNiAyMjowODowMyIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA +NC0xNyAwOTo1NDozNyIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA MG5pbA== :: main.lua ---[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-04-16 22:08:03",revision=334]] +--[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-04-17 09:54:37",revision=355]] --cd("/cirnofarm/src") include("/cirnofarm/src/cirno.lua") --function _init() @@ -82,7 +85,7 @@ include("/cirnofarm/src/cirno.lua") --end :: .info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTE2IDE5OjQyOjIyIixtb2RpZmllZD0iMjAyNC0w -NC0xNiAyMjowODowMyIscnVudGltZT02LHN0b3JlZD0iMjAyNC0wNC0xNiAxOTo0MDowNSIsd29y +NC0xNyAwOTo1NDozNyIscnVudGltZT02LHN0b3JlZD0iMjAyNC0wNC0xNiAxOTo0MDowNSIsd29y a3NwYWNlcz17e2xvY2F0aW9uPSJtYWluLmx1YSMyIix3b3Jrc3BhY2VfaW5kZXg9MX0se2xvY2F0 aW9uPSJnZngvMC5nZngiLHdvcmtzcGFjZV9pbmRleD0yfSx7bG9jYXRpb249Im1hcC8wLm1hcCIs d29ya3NwYWNlX2luZGV4PTN9LHtsb2NhdGlvbj0ic2Z4LzAuc2Z4Iix3b3Jrc3BhY2VfaW5kZXg9 diff --git a/src/cirno.lua b/src/cirno.lua index 8d01f78..4a6697d 100644 --- a/src/cirno.lua +++ b/src/cirno.lua @@ -1,4 +1,4 @@ ---[[pod_format="raw",created="2024-04-14 14:05:11",modified="2024-04-17 09:28:52",revision=219]] +--[[pod_format="raw",created="2024-04-14 14:05:11",modified="2024-04-17 09:54:34",revision=228]] --include("/cirnofarm/src/actor.lua") last_coll=0 mouse_debug = true @@ -29,18 +29,30 @@ function _init() self.move_x,self.move_y,last_coll),0,0,1) end, update=function(self) + + local hitbox_x = 4 + local hitbox_y = 8 + local hitbox_w = 6 + local hitbox_h = 8 + --self.move_x = self.x --self.move_y = self.y if (btn(0)) self.move_x -= self.speed self.hflip = true if (btn(1)) self.move_x += self.speed self.hflip = false if (btn(2)) self.move_y -= self.speed if (btn(3)) self.move_y += self.speed - - if (check_collision(self.x+self.move_x,self.y,self.w-1,self.h-1)) then + + if (check_collision(self.x+self.move_x+hitbox_x, + self.y+hitbox_y, + hitbox_w, + hitbox_h)) then if (not self.noclip) then self.move_x = 0 end end - if (check_collision(self.x,self.y+self.move_y,self.w-1,self.h-1)) then + if (check_collision(self.x+hitbox_x, + self.y+self.move_y+hitbox_y, + hitbox_w, + hitbox_h)) then if (not self.noclip) then self.move_y = 0 end end