diff --git a/cirnofarm.p64 b/cirnofarm.p64 index fa9bb10..e544898 100644 --- a/cirnofarm.p64 +++ b/cirnofarm.p64 @@ -6,7 +6,7 @@ version 2 :: sfx/ :: gfx/0.gfx b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w -NC0yOSAyMTo0MDoyNCIscmV2aXNpb249MTUxNF1dbHo0AGkNAAA9RQAA8xR7WzBdPXtibXA9cHh1 +NC0zMCAxNTo0OTo1MSIscmV2aXNpb249MTUyMl1dbHo0AGkNAAA9RQAA8xR7WzBdPXtibXA9cHh1 AEMgEBAE8PAsZmxhZ3M9MCxwYW5feAgA2nk9MCx6b29tPTExfSwyAPEIrxsj3gN_A94j3gP_CRNu A04TbiNOA34TAP8DjgM_A04DLiN_Iy4DngP_FAMuXgAd8AnwRU2ALSYtUB1mHQUgHYYNFQAdlh0V DaYEAMMNFQANlh0FEL0F8BNYAB8zWAAV8CpQRIAUTx8UUA8Ujx8EQC8UTx8kQA8UHx9EDg8ZBEAP @@ -69,50 +69,50 @@ XwGwMfAKcAAe8B82KcAaGRAqUCoZAAoZUEo5QAYZChYJBhoWMAkKKQoZCgYZBhBqCSoJFiAWChYK CQCvMDYZRlCGkCbwBkEBHw8yAP--------------------------------------QVA9MTF9fQ== :: gfx/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0yOSAyMTo0MDoyNCIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA +NC0zMCAxNTo0OTo1MSIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA MG5pbA== :: map/0.map b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0yOSAyMTo0MDoyNCIscmV2aXNpb249MTU1Ml1dbHo0AMwFAAALQgAA8Ah7e2JtcD11c2VyZGF0 +NC0zMCAxNTo0OTo1MSIscmV2aXNpb249MTU2Ml1dbHo0AMoFAAAKQgAA8Ah7e2JtcD11c2VyZGF0 YSgiaTE2IiwzMgMALyIwAQD-gy4xMAwADwEAoiozMAEAHjQUAAwBADU1ODABAD80ODABACsvNDAz ACYfNnwABD8xMzCAAEoAAQA-MzYwXAATBAQADwEANQ9QACEvMzCAAG0PAQC6KjQ4CAEPBAMHDiAA DwEANgSAAB8zYAEABxAAPzQ1MAEAOx421AAO7AAOJAAPAQA-DmgADwEA-34OfAIPAQBsLzYwAQBr BLQDDhAADwEAUwxwAAcQAC82MdwBTy82MAEAsB82EAoHBAQADzUBBwMEAA4QAA8BAFMMcAAMEAAP -AQAZDHQGHjQcAA8BABMPgABCDwEA-xcOLAsPAQAULzQw0AE-HzMlBBgvNDABANT2HCIpLGhpZGRl -bj1mYWxzZSxuYW1lPSJvYmplY3RzIixwYW5feD0tMTA3LjMBAAEXAHR5PTMwLjE2AQCyNyx0aWxl -X2g9MTYKABB3CgCPem9vbT0xfSyCEP9sUzkwMDBiCAAPAQD------------------4wPghADpWZv -cmVncm91bmSFEC83NIQQAC85OYQQjy8zOQQAAw8BAAUvMzkEAAMPAQAhIzMy-A8PBAAALzMwMAAE -EzkEABpiDAAvMzCAACQERAAXMAwAHzmAABAaMAwAD4AAGQQ0ASMzYUAAImQwAQATYxAAABwAFjgo -AA8AARIHMAAPBAABD0QAAi9kMAEABweMAAk8AA8wAAkLlAAICAAfM4AAWRcwDAAPgAA9FzUEAAgB -AC81MAEACgmAAB9mBAADJjE2BAAnMGYEAAg8AAMBAD8zZTABABoJgAAPEhcFCIAADgEADjwADwEA -GA_AADYfNQQADAQBABo1BAAPAAG2D4AA7GoyYjAwMmMEAAQBAC8yYwQABBZkgAAAAQAvMjkEAAAW -YXwAAAQAJjI4HAAIgAA-MzUwAQAeEzOgBi8zOQQACAsYAQiwAA_AAC0AAQABXwATYRAFF2EEAAMQ -AC8yMIAAoyIyYuABD4AAEg8BAAgAQAcTMnUAHjItAA_AAAYqMzMsAgRMAg2kAA_AAAwnMGOQBh9j -AAEIHmSAAB8zKAAADaQAD4AANA-cAgUPgAAuCwEAD4AAFS8wMPwIAB5hpAAPgABJCSwIFzlIAQgE -Ag_AADUXNQQAD4AAEQMsAA_AABUjM2UEAB8wAQADDuACDwEACwQcAww8AA00AwsEAA4BAA_IAQ0P -HAIbDRgABwQALzAwgAAPBFgGDwEADhNj6AQEBAAfZBgAABZiCAUuMGJ8AQ_AAAUMDAQPgABZDwEA -Rw_AAI8mMDCoAg8EAEEPhBART3NvbGl-EFUvMTABAP_AHjkMAA8BAKEvMTgEAAMPAQAFLzFhBAAD -DwEAIS8xOAQABw8BAAUvMWEEAAMvMDCQAR8vMTgEAAcPAQAFJzFiBAAWOQQALzA4BAAMBwEALzFj -BAADJjBmBAAmMWMEAAkBAB84BAAkBwEALzFjBAAbCQEAHzgEACQHAQAvMWMEABsIAQAvMTgEACMI -AQAvMWMEABsIAQAvMTgEACMIAQAvMWMEABsIAQAvMTgEACMIAQAvMWMEABsIAQAvMTgEACMIAQAv -MWMEABsIAQAvMTgEACMPAQARJjFjBAAPAQAFLzFiBAAABAgEH2IEAAcPAQARJjFhBAAPAQAGHzgE -ACQPAQAQJjFhBAAPAQAGHzgEACQPAQAQJjFhBAAPAQAGHzgEACQAAQAfZQQACAMBAA58AAsBAB44 -BAANSw0WYRwABQQAFzBsAA8EAAEPgAAoHzOfCwEbOAQAFzBsAA8EAAEPgABtDAQADwEABR84gADr -LjFieAQPgAABBBwACYAEH2UEABgPAQAMLzFhBAATDwEAAi9lMAEALi8xYQQAEw_AAP9vH2UEACAP -AQAQLzFhBAATLzBlBAAeDwMhkkxiYWNrAyEfOIQQAD8xNTaFEBFQbT0xfX0= +AQAZDHQGHjQcAA8BABMPgABCDwEA-xcOLAsPAQAULzQw0AE-HzMlBBgvNDABANT2GyIpLGhpZGRl +bj1mYWxzZSxuYW1lPSJvYmplY3RzIixwYW5feD0tNTguMwEAARYAdHk9NjguMTYBALI3LHRpbGVf +aD0xNgoAEHcKAI96b29tPTF9LIEQ-2xTOTAwMGIIAA8BAP------------------jA_BEAOlZm9y +ZWdyb3VuZIQQLzc0hBAALzk5hBCPLzM5BAADDwEABS8zOQQAAw8BACEjMzL8Dw8EAAAvMzAwAAQT +OQQAGmIMAC8zMIAAJAREABcwDAAfOYAAEBowDAAPgAAZBDQBIzNhQAAiZDABABNjEAAAHAAWOCgA +DwABEgcwAA8EAAEPRAACL2QwAQAHB4wACTwADzAACQuUAAgIAB8zgABZFzAMAA_AAD0XNQQACAEA +LzUwAQAKCYAAH2YEAAMmMTYEACcwZgQACDwAAwEAPzNlMAEAGgmAAA8RFwUIgAAOAQAOPAAPAQAY +D4AANh81BAAMBAEAGjUEAA8AAbYPgADsajJiMDAyYwQABAEALzJjBAAEFmSAAAABAC8yOQQAABZh +fAAABAAmMjgcAAiAAD8zNTABAB4TM6AGLzM5BAAICxgBCLAAD4AALQABAAFfABNhEAUXYQQAAxAA +LzIwgACjIjJi4AEPgAASDwEACABABxMydQAeMi0AD4AABiozMywCBEwCDaQAD4AADCcwY5AGH2MA +AQgeZIAAHzMoAAANpAAPgAA0D9wCBQ_AAC4LAQAPgAAVLzAw-AgAHmGkAA_AAEkJLAgXOUgBCAQC +D4AANRc1BAAPgAARAywAD4AAFSMzZQQAHzABAAMO4AIPAQALBBwDDDwADTQDCwQADgEAD4gBDQ8c +AhsNGAAHBAAvMDCAAA8EWAYPAQAOE2PoBAQEAB9kGAAAFmIIBS4wYnwBD4AABQwMBA_AAFkPAQBH +D4AAjyYwMKgCDwQAQQ_EEBFPc29saX8QVS8xMAEA-4AeOQwADwEAoS8xOAQAAw8BAAUvMWEEAAMP +AQAhLzE4BAAHDwEABS8xYQQAAy8wMJABHy8xOAQABw8BAAUnMWIEABY5BAAvMDgEAAwHAQAvMWME +AAMmMGYEACYxYwQACQEAHzgEACQHAQAvMWMEABsJAQAfOAQAJAcBAC8xYwQAGwgBAC8xOAQAIwgB +AC8xYwQAGwgBAC8xOAQAIwgBAC8xYwQAGwgBAC8xOAQAIwgBAC8xYwQAGwgBAC8xOAQAIwgBAC8x +YwQAGwgBAC8xOAQAIw8BABEmMWMEAA8BAAUvMWIEAAAECAQfYgQABw8BABEmMWEEAA8BAAYfOAQA +JA8BABAmMWEEAA8BAAYfOAQAJA8BABAmMWEEAA8BAAYfOAQAJAABAB9lBAAIAwEADnwACwEAHjgE +AA1LDRZhHAAFBAAXMGwADwQAAQ_AACgfM58LARs4BAAXMGwADwQAAQ_AAG0MBAAPAQAFHziAAOsu +MWJ4BA_AAAEEHAAJgAQfZQQAGA8BAAwvMWEEABMPAQACL2UwAQAuLzFhBAATD4AA-28fZQQAIA8B +ABAvMWEEABMvMGUEAB4PAyGSTGJhY2sDIQ_HMQE-MTU2hRARUG09MX19 :: map/1.map b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTI4IDIxOjA4OjM1Iixtb2RpZmllZD0iMjAyNC0w -NC0yOSAyMTo0MDoyNCIscmV2aXNpb249ODddXWx6NACoAAAAcUEAAPAIe3tibXA9dXNlcmRhdGEo +NC0zMCAxNTo0OTo1MSIscmV2aXNpb249OTVdXWx6NACoAAAAcUEAAPAIe3tibXA9dXNlcmRhdGEo ImkxNiIsMzIDAC8iMAEA--------------------_-EKIiksaGlkZGVuPWZhbHNlLHBhbl94PS0y NAoA8gF5PS0xNDIsdGlsZV9oPTE2CgAQdwoAj3pvb209MX0sXBD------------------------- ----------------------------------------LVBtPTF9fQ== :: map/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0yOSAyMTo0MDoyNCIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA +NC0zMCAxNTo0OTo1MSIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA MG5pbA== :: sfx/0.sfx b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w -NC0yOSAyMTo0MDoyNCIscmV2aXNpb249MTIwNV1dbHo0AEYBAABmCAAA8CdweHUAAygAAAMABA9A +NC0zMCAxNTo0OTo1MSIscmV2aXNpb249MTIxMl1dbHo0AEYBAABmCAAA8CdweHUAAygAAAMABA9A EAIOAAGgASACoA4ADxAADfDKAQIDBAUGBwAP-5AICQoLDwwPDQ8ODw8QAPAADQ8RDxIPEw8UDxUP Fg8XEwDxAQ8YDxkPGg8bDxwPHQ8eDx8UAPEAIA8hDyIPIw8kDyUPJg8nFADxACgPKQ8qDysPLA8t Dy4PLxQA8QAwDzEPMg8zDzQPNQ82DzcUAP8FOA85DzoPOw88Dz0PPg8-AA--8P8BAOvyJ1oBEAYP @@ -121,14 +121,14 @@ Gy-wADAA--_CH-8BAMzxHegPQAANQA8XAAsaCAYIEAIDEAUABgAIAEkXACYICVD--wnxF-4J-Bf_ CfBwKwBf-rDwcAQIAP-cH-8BAJdQ-----x8= :: sfx/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0yOSAyMTo0MDoyNCIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA +NC0zMCAxNTo0OTo1MSIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA MG5pbA== :: main.lua ---[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-04-29 21:40:24",revision=1528]] +--[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-04-30 15:49:51",revision=1537]] include("/cirnofarm/src/game.lua") :: .info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTE2IDE5OjQyOjIyIixtb2RpZmllZD0iMjAyNC0w -NC0yOSAyMTo0MDoyNCIscnVudGltZT02LHN0b3JlZD0iMjAyNC0wNC0xNiAxOTo0MDowNSIsd29y +NC0zMCAxNTo0OTo1MSIscnVudGltZT02LHN0b3JlZD0iMjAyNC0wNC0xNiAxOTo0MDowNSIsd29y a3NwYWNlcz17e2xvY2F0aW9uPSJtYWluLmx1YSMxIix3b3Jrc3BhY2VfaW5kZXg9MX0se2xvY2F0 aW9uPSJnZngvMC5nZngiLHdvcmtzcGFjZV9pbmRleD0yfSx7bG9jYXRpb249Im1hcC8wLm1hcCIs d29ya3NwYWNlX2luZGV4PTN9LHtsb2NhdGlvbj0ibWFwLzEubWFwIix3b3Jrc3BhY2VfaW5kZXg9 diff --git a/src/npc.lua b/src/npc.lua index 5f650fa..f28ea36 100644 --- a/src/npc.lua +++ b/src/npc.lua @@ -10,6 +10,8 @@ function NPC:new(x,y) n.found = false + n.raycast_enabled = false + n.enemy_x_debug = 0 n.enemy_x_debug = 0 @@ -39,7 +41,7 @@ function NPC:update() self.raycast_frames += 1 - if (self.raycast_frames % self.raycast_frames_to_wait == 0) then + if (self.raycast_enabled and self.raycast_frames % self.raycast_frames_to_wait == 0) then local hit_x, hit_y, hit_status = raycast(self.x, self.y, enemy_x, enemy_y, self.range, 2) --if (raycast_hit) then @@ -56,13 +58,14 @@ function NPC:draw() --circfill(self.x,self.y,self.range,18) local col = 30 spr(self.spriteIndex,self.x,self.y) + if self.raycast_enabled then print(string.format("Found: %s", tostring(self.found)),self.x,self.y-16,col) --print(string.format("dir_x: %.2f dir_y: %.2f",self.dir_vec_debug_x, self.dir_vec_debug_y),self.x,self.y-8,28) --print(string.format("hit_x: %.2f dir_y: %.2f", self.hit_x, self.hit_y),self.x, self.y,28) --line(self.x,self.y, self.enemy_x_debug, self.enemy_y_debug, 14) line(self.x,self.y, self.hit_x, self.hit_y, col) - + end end