diff --git a/cirnofarm.p64 b/cirnofarm.p64 index c53f397..542f3f0 100644 --- a/cirnofarm.p64 +++ b/cirnofarm.p64 @@ -6,18 +6,23 @@ version 2 :: sfx/ :: gfx/0.gfx b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w -NC0xNCAxOToxMzo0NSIscmV2aXNpb249OTldXWx6NABmAQAA9DEAAPMUe1swXT17Ym1wPXB4dQBD -IBAQBPDwLGZsYWdzPTAscGFuX3gIAMp5PTAsem9vbT03fSwxAPEIrxsj3gN_A94j3gP_CRNuA04T -biNOA34TAP8DjgM_A04DLiN_Iy4DngP_FAMuXQAc8AnwRU2ALSYtUB1mHQUgHYYNFQAdlh0VDaYE -AMMNFQANlh0FEL0F8BNXAB8xVwAU-xVQRIAUTx8UUA8Ujx8EQC8UTx8kQA8UHx9EHgRADxReDR4E -QA0GAA_fUBQ_DRSARPAVfgAOD2MBBQ8xAP--------------av9DUDWgBT8cFXAFbgVQBR48HgVg -FUwFgAUMBwwHHAVQJUwFUAU8BwwHFVAFTAcsBVAVTBVwBUwFcAUsBSwFYAUcBQAFHAVgBQwFIAUM -BXAFQAXwBbIAHg8xAP-----------------------------------------------4tQbT03fX0= +NC0xNCAyMjowNTo1NiIscmV2aXNpb249MTQzXV1sejQAVQIAAG8zAADzFHtbMF09e2JtcD1weHUA +QyAQEATw8CxmbGFncz0wLHBhbl94CADKeT0wLHpvb209N30sMQDxCK8bI94DfgPeI94D-gkTbgNO +E24jTgN_EwD-A44DPgNOAy4jfiMuA54D-hQDLl0AHPAJ8EVNgC0mLVAdZh0FIB2GDRUAHZYdFQ2m +BADDDRUADZYdBRC9BfATVwAfMVcAFP8VUESAFE8fFFAPFI8fBEAvFE8fJEAPFB8fRB4EQA8UXg0e +BEANBgAPn1AUPg0UgETwFX4ADg9jAQUPMQCn388TLxEPE18RDxM-EQ8MABRzfxM-ET8THxAAAAQA +H08MABB1LxEvEz8RjzgAP28RDwwAFC-fE9UAHNn0DA8fNB50HjQeJB4kBgDxAEQOJB7UHoQeJA6U +HoQONAQABh4AEIQEAD8O9AkIAiYPMQD-CvEUQF8UcB4PFT8fLkAeDxUOPx8PFQ4NDiAeDQ4NPx8O +DQ4NDhAGAGE8DQ4NHgALADENDhwHABE_BgAhHA4HABEeBgAnDhQaACUUDhoA4CwNDixeTA4NTA0O +AA48FgBSPA4QDixaAEEOIA4MCgBhDQ4cDkAuCgBPHnBeQPsAHg8xAP----------8v9DUDWgBT8c +FXAFbgVQBR48HgVgFUwFgAUMBwwHHAVQJUwFUAU8BwwHFVAFTAcsBVAVTBVwBUwFcAUsBSwFYAUc +BQAFHAVgBQwFIAUMBXAFQAXwBbIAHg8xAP------------------------------------------ +-----4tQbT03fX0= :: gfx/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixzdG9yZWQ9IjIwMjQtMDQt MDQgMDc6MTk6MzMiXV1sejQABAAAAAMAAAAwbmls :: main.lua ---[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-04-14 19:13:45",revision=163]] +--[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-04-14 22:05:56",revision=205]] --cd("/cirnofarm/src") include("/cirnofarm/src/cirno.lua") --function _init() @@ -48,31 +53,33 @@ include("/cirnofarm/src/cirno.lua") --end :: map/0.map b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0xNCAxOToxMzo0NSIscmV2aXNpb249MTA2XV1sejQAMgEAANYgAADwCHt7Ym1wPXVzZXJkYXRh -KCJpMTYiLDMyAwAiIjABAC8zMAEAfx8zkAD-aS8zMAEAry8yMNwABA-0ACAvMjABAHsPxAAHDwEA -kA_8AMAOMAIPFAHLHzL0AEgfMkQAMg-YAtcP7ABVHzJsAA0P9ALIHzMcABUPJAE4D0gAAS8yMAEA -aA_QANAP6AEJHzBcAC4PAQCvHzLcABEPFAKsHzK8AQIPAQDzD0wBDS8zMAEA-53xGCIpLGhpZGRl -bj1mYWxzZSxuYW1lPSJzb2xpZCIscGFuX3g9LTExNgsA8wB5PS0xNTYsdGlsZV9oPTEKABB3CgCP -em9vbT0xfSxqEAsfMQQA--------------------_A9qEAOVYmFja2dyb3VubxATMGwQHzBpEAdQ -MC41fX0= +NC0xNCAyMjowNTo1NiIscmV2aXNpb249MTQ5XV1sejQAowEAANggAADwCHt7Ym1wPXVzZXJkYXRh +KCJpMTYiLDMyAwAvIjABAP9-LzEwDAADDhAADwEA-w0vMjABAAMvMzBMACEPAQB7HzPcAAYPAQD- +dA8wAh4P0AGcHzL0AEgfMkQAdB8wxAFRD_wAmB8ybAAND-QCyB8zHAAVDyQBOA9IAAEvMjABAGgP +kADQD_gBCR8wXAAuDwEArx8y3AARDxQCrB8yvAECDwEA8w9MAQ0vMzABAP_d8RciKSxoaWRkZW49 +ZmFsc2UsbmFtZT0ic29saWQiLHBhbl94PS05MgoA8gF5PS0xNDQsdGlsZV9oPTE2CgAQdwoAj3pv +b209MX0saRALHzEEAPgfOQQAIB8xBAA4HzkEACAfMQQAOB85BAAgHzEEADgfOAQAHB8xBAA8HzgE +ABwfMQQAPB84BAAcHzEEADwfOAQAHB8xBAA8HzgEABwfMQQAPB84BAAcHzEEADwfOAQAHB8xBAA8 +HzgEABwfMQQAPB84BAAcHzEEADwfOAQAHB8xBAD----------7UPaRADn2JhY2tncm91bm4QHFBt +PTF9fQ== :: map/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixzdG9yZWQ9IjIwMjQtMDQt MDQgMDc6MTk6MzMiXV1sejQABAAAAAMAAAAwbmls :: sfx/0.sfx b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w -NC0xNCAxOToxMzo0NSIscmV2aXNpb249ODBdXWx6NABsAQAAkQgAAPAncHh1AAMoAAADAAQPQBAC -DgABoAEgAqAOAA8QAA3wygECAwQFBgcAD-_QCAkKCw8MDw0PDg8PEADwAA0PEQ8SDxMPFA8VDxYP -FxMA8QEPGA8ZDxoPGw8cDx0PHg8fFADxACAPIQ8iDyMPJA8lDyYPJxQA8QAoDykPKg8rDywPLQ8u -Dy8UAPEAMA8xDzIPMw80DzUPNg83FAD-BTgPOQ86DzsPPA89Dz4PPwAP--D-AQDr8idaARAGDyAQ -ASABIAHwAAIQAgwQASAPISABMA9A8MMPKA--8MYP_AoP-w_AD-cPDQHwCQEQBgwwAD8PD_AxABsv -8AAwAP--gh--AQDM8BHoD0AADUAPOR86DzwPNh9GDykPLw8wDz4PHQ9CDx8PIgsFYS8oDy0PMykF -8wIyDzEPPQ87DzkPOA81DzEPLEkF8QE9Dz7--wrxFv4K-Bb_CvBwVgBf-rDwcAMIAP-cH-8BAJdQ ------x8= +NC0xNCAyMjowNTo1NiIscmV2aXNpb249MTIwXV1sejQAbAEAAJEIAADwJ3B4dQADKAAAAwAED0AQ +Ag4AAaABIAKgDgAPEAAN8MoBAgMEBQYHAA--kAgJCgsPDA8NDw4PDxAA8AANDxEPEg8TDxQPFQ8W +DxcTAPEBDxgPGQ8aDxsPHA8dDx4PHxQA8QAgDyEPIg8jDyQPJQ8mDycUAPEAKA8pDyoPKw8sDy0P +Lg8vFADxADAPMQ8yDzMPNA81DzYPNxQA-wU4DzkPOg87DzwPPQ8_Dz8AD--w-wEA6-InWgEQBg8g +EAEgASAB8AACEAIMEAEgDyEgATAPQPDDDygP--DGD-gKD-8PgA-3Dw0B8AkBEAYMMAA-Dw-gMQAb +L-AAMAD--4If-wEAzPAR6A9AAA1ADzkfOg88DzYfRg8pDy8PMA8_Dx0PQg8fDyILBWEvKA8tDzMp +BfMCMg8xDz0POw85DzgPNQ8xDyxJBfEBPQ8_--8K8Rb_CvwW-grwcFYAX-6w8HADCAD-3B--AQCX +UP----8f :: sfx/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixzdG9yZWQ9IjIwMjQtMDQt MDQgMDc6MTk6MzMiXV1sejQABAAAAAMAAAAwbmls :: .info.pod -b64$LS1bW3BvZCxydW50aW1lPTUsc3RvcmVkPSIyMDI0LTA0LTE0IDE5OjEzOjQ1Iix3b3Jrc3Bh +b64$LS1bW3BvZCxydW50aW1lPTUsc3RvcmVkPSIyMDI0LTA0LTE0IDIyOjA1OjU3Iix3b3Jrc3Bh Y2VzPXt7bG9jYXRpb249Im1haW4ubHVhIzIiLHdvcmtzcGFjZV9pbmRleD0xfSx7bG9jYXRpb249 ImdmeC8wLmdmeCIsd29ya3NwYWNlX2luZGV4PTJ9LHtsb2NhdGlvbj0ibWFwLzAubWFwIix3b3Jr c3BhY2VfaW5kZXg9M30se2xvY2F0aW9uPSJzZngvMC5zZngiLHdvcmtzcGFjZV9pbmRleD00fX1d diff --git a/src/cirno.lua b/src/cirno.lua index 91b3ab3..1216d95 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-14 21:05:28",revision=66]] +--[[pod_format="raw",created="2024-04-14 14:05:11",modified="2024-04-14 22:05:51",revision=77]] mouse_debug = true w=480 h=300 @@ -7,12 +7,12 @@ function _init() add(player, { x=128, y=128, - speed=2, + speed=1.2, hflip=false, spriteIndex=64, move_x=0, move_y=0, - cm=true, -- Collide with map tiles + cm=false, -- Collide with map tiles cb=true, -- Collide with world bounds draw=function(self) spr(self.spriteIndex,self.x,self.y, self.hflip) @@ -20,11 +20,11 @@ function _init() if (mouse_debug == true) then local col = 8; if (checkCollision(self.move_x,self.move_y) == true) then col = 7 end - pset(self.move_x,self.move_y,col) + --pset(self.move_x,self.move_y,col) end end, - update=function(self) + update=function(self) self.move_x = self.x self.move_y = self.y if (btn(0)) self.move_x -= self.speed self.hflip = true