diff --git a/cirnofarm.p64 b/cirnofarm.p64 index fb4c730..701679e 100644 --- a/cirnofarm.p64 +++ b/cirnofarm.p64 @@ -6,100 +6,101 @@ version 2 :: sfx/ :: gfx/0.gfx b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w -NC0yNyAyMTowNTowNCIscmV2aXNpb249MTE1NV1dbHo0AMELAAA4QwAA8xR7WzBdPXtibXA9cHh1 +NC0yOCAwOToxMTowNCIscmV2aXNpb249MTE2OF1dbHo0AP0LAABfQwAA8xR7WzBdPXtibXA9cHh1 AEMgEBAE8PAsZmxhZ3M9MCxwYW5feAgA2nk9MCx6b29tPTExfSwyAPEIrxsj3gN_A94j3gP_CRNu A04TbiNOA34TAP8DjgM_A04DLiN_Iy4DngP_FAMuXgAd8AnwRU2ALSYtUB1mHQUgHYYNFQAdlh0V DaYEAMMNFQANlh0FEL0F8BNYAB8zWAAV8CpQRIAUTx8UUA8Ujx8EQC8UTx8kQA8UHx9EDg8ZBEAP FD4aDQ8ZDgRADS4KAAoNDgwEQA0eGgAKCQwUAEAOSgkKEgBBDioACiUAEl4iAO9eDQwOBFAUPg0U -gETwFZMAHbbwEqEwAa8QASABrgQArg8RoQ0gDg8cDwwEAEQOEQAODAAEBADyECEOBQEADgweDwwO -CwwOEQwOAQUADgsOCwweCw4BDAEeABMLAgAgAQtDAMULHgweCwwLAQwOBRAcAGMhDgEgriDDAB8x -wwAW9wQGPxlQaS5ZThkOGV5ZHnlQHhmwAwAhwA4DAF8pwBnwF1sAHmMSrxMwDhMCABMgCAAPCgAE -8Q8PEa4NIAOvGwMeAAOsAwUOAANMDxRMAw4FAAM8KzwRAAAIABMeDwCPEAOsAw4goyCdAg8PLQMt --AHPEy8RDxNfEQ8TPxEPEwwfDQAoDE8OACMsLw4AtBwPEX8TDC8RPxMfIAAAGwAfTw0ADvEAPA4v -ES4MLY4dDgwtDm0OBwAnDF0IAH88Diw9Dh3eyAAd2fQMDx80HnQeNB4kHiQGAPEARA4kHtQehB4k -DpQehA40BAAGHgAQhAQAPw70CRwDHaP-FgAGBwYHDgcGAgD0BA4XBQcGDgUHBgcFFgcGDhYHBgUd -AIAFBw4XBgcGDgoAARIARA4G-gAKAAMGACQWBU8AEAUGABMXGAASBQYAJBYHHgACBgAR-n0AB0IA -ADAABEIAMgUGBzAABx4AEgUgAAFCAANOAAUeAB8H-AAe8gAVAwwPEAwOHA4MDgxvFQ4KAFEdDB0M -LQsAsR0ODB0MDi0OHA4tCgBSDC0cLQwKADQOXQ4KAD8MPQwMAAIFIgAFNgAFSgACXwAzLQxNcwAj -bQwJAD8M-QPFAB3xAR8ULxYfFIQeBh8WHkQPHyQJAGM0Hx8kHi8IAJIfFgYeFA8fBB0LACAEHQoA -UyweBB1UBgBgBhweBA1kBwBTVA0UHiwGAHAUDRQdFB4cMQAECQAwDSQdGgAALQA-LB6EqgAdVYQf -FAYfrABhBB8fVB4vCAAxJB0ECgAQHQkAJhwGCQAgFA0JADEsHlQGAFEEHSQNFK0AA7QAA8EAAiQA -BTUAE1QHAAHFAE_EHiweqAAd-yEGFxYXDxYNFh0WDxIWFxYHDxYdFh0GDxIHFhcWDxYGHRYdDxIX -FhcGDxYWHRYNDxIwABFAfxZ-EiIAEg4tAAAhABAOLAAQDB8AEA4qABAMTQAQDlgAFQwpAB8MKAAB -L358VAQ9Z3QPFA4NBAIAJhQNEAAACgD-Bf8bFB8RXxsfEZ8bHxFvGx8R-xsNZwYd8RRAXxRwHg8V -Px8uQB4PFQ4-Hw8VDg0OIB4NDg0-Hw4NDg0OEAYAYTwNDg0eAAsAMQ0OHAcAET4GACEcDgcAER4G -ACcOFBoAJRQOGgDgLA0OLF5MDg1MDQ4ADjwWAFI8DhAOLFoAQQ4gDgwKAGENDhwOQC4KAE8ecF5A -UAEdA8sAAD8AUS5ADg8fSQBjDg0uIA4sCwAxHA4QyQBgDg08AA5MCABRTC5MLkyiACAUTLYANxwU -HM4ALBwe5wA1DgAeGQAIGgESINQAbg0eQC48LrwAD1oHQODwE51QDX8QDVANDl8YDgcAQgw-HgwJ -AD8LHAsKABISOwgAEFwGAG9_DVCd8BOGADATN10APwccBwoAEh43hQAPPQFOYP8UAQAOIAIAET4G -ADIOAB4IAD8Q-gIZADYfDsgATwBfB1AfFgYHHgkAsQYHDhYeFh5mBwYeAwABAgBFFh6WHpEHEQcq -ADGmHhapBwUoAFJWHhYeVhwABkkAEqYcAB8GSAAAAigAPGYeFkkAXxYOJh6GxAAd9gD1Ad8YFd4V -3xUV3hXeFd0GAH-1At0V3fUBUAAdT-YADQYCAMov9gFjAR9HDxYNDgIAOBUNDgIAc-UBDxMvDC9E -CyAfDH4LGQ9-CxkPZgsPDgAJcT8MDxMvES8WADWPEx8gADdvEQ8OAD8PDF8QAAQBQAAhDD8OAB-f -CwQeof8bFh8RPxsfES8PBxAHBQAQBgUAEAUFABIKLwcBCQACMAcSBCoAET8NAB8LkwgdYf8bEA8R -f0AAPw8RP3IAARQCcgASEnIAF48EAD--GwhxAB0v8PBUBE9PHxSwPgIACg_6CR5--xQQ8LD_EDcA -Hz8S0B4CAAIPTAAhPxDQHgIAAi-_EoUBJw8yAKsPYAEHAAIAD2IBIC-w0JcBNwECAA9PAB2K8B0U -QA8fDxQEAEEEDg8UoAkCAgBhBA0OIJ4EsglgbQQdIA0eBgAODQCgDQQgDR49BA0kDRAAEU12C0EQ -xCAEFQAhBFAUAB8woQAeVBEUkBQAlQAjDg0CACEEHtILBqIApx4ErgQOHQStBC0EABsNAgBDHSQN -BAIAOTQNBAIAbwAUkBTwEZ4AIBvAnAARMDABBAIAgCAeBJ4gHQRtCwBaHQRtHg0NACIEDQ4AUg0k -DQQ9EAAwDQRNRgAxxEAEEwAhBFAQAB4gmgAP_ARxAnUCDxIDOD8SwC4CAAIf-psBHh7QngAPKwMr -ZiAvH18UYAUAUh8fbxRgMAP9A08UDx9gLk8UDmAODQ5dYA0eXQkAQT0EDWACA0dQlFAEDwAfMNkB -T2YwXxQvH2AFAHBvFB8fYA5PsQJgYA5NLmBdCQA7XR4NCQABfwIRYH4CP2CUUI0Cqw--Bh9f8ND- -FBB0AjkPNgcfFCBdAvIUBFAEDh8fPgQOBEDEMA0ODU4EDgQOBCAOHT4EDiQOIA0ODW4QADJuBB4O -ABoeDQAQnakFFA4CAEgEDg0w3AUfwPkEIZ9QGABoUPgQ8GA6AB1CMARPFNkA0VAEDxQEPh8fDgQg -xBDTAPACTg0ODSAOJA4EPh0OIAQOBG4QAEAeBG4dSAUODQBBHQSdIM8ABAIAGCB8BU9AFPAd1wAe -qgHTEAO-GwMQA74EAP8O0zAFcAVgFTAVkAUQBcAVwAUQBZAVMBVgBXAF8AMPA09hMDwPHCxgWRXw -CAcMDhwwHA4MRwwODDAMDgxnDA4wHhcOAgAyDEAOCQDwISAeIFcADjAeIDcwHkAsCBwQHkAHLAgc -B0AeAAdcBwAeAB4QfBAeIAcMBwwHTHAXAAgAnwxwFxAXkBgQGIoRHvAFIAEsPxwBUAEcbgFAAQwO -EQ4RBw4KACIHDgMAAQwAMhwHHAoA8A8PF0cNDgEwARwnDSceATAxDAcOMVABBwwHCAcOBwEKAP8l -DggOCB4HATABBxxuBwEQARcsXhcBAAEXfAEXARARBwEXAQcRBxFAAQABBwEHAZABHAEcAT8SIA8y -AP8Y-yiADxvQHoBPGA49QD0CbTC9MB0CbQIdIF0CXSDNMB0CTQItME0IXTA9Am1AXQItYH1wbZBN -sC1QmQAfDzIA-0f-AAQEBAAfHAAOFx4XDgAeADwAGv8GCAgEgAcwByAHEAfwBAcQByAHMAeAQgAd -kAgAOAAIAAgwCAYAgRAIABhQGFAYCgAEFgA-OAAINwEfDzIA5fAUEL8YIA60DgAO1B5EPEQeJBw- -HBwkHiQMXQwkHhQMDVwNDBQIADIMPQwKABEdAgAICgDRJAwdHB0MJB4kHD0cJEUAn9QOAA60DiC_ -EL8AHw8yAP9LtxOfEFAOHA4sDgwOCAAjLgwQAAAIAAgaACo8LhgAIgweCgAxYA4MIgCPcB5MDoBe -8BSIAB75DxVVgAVWBXAFXxAFcAVeBXAFBj4GBXAFFh4WBXAFVgQAT4BV8CVMAR8PMgD--------- --------------------------------SUD0xMX19 +gETwFZMAHfUV8BKhMAEMjxAMASABDxyPEA8cASABDo8QDgEgAa4BIMEgDQ4MAgAyDSANCQDhDA4h +DSANDh0MDQwODREYACANDA8ARwEOAQ0zACABDBsAhx0OHQwODAEOGgBTIQ0wrSCsAB8xrAAW9wQG +PxlQaS5ZThkOGV5ZHnlQHhmwAwAhwA4DAF8pwBnwF1sAHmMSrxMwDhMCABMgCAAPCgAE8Q8PEa4N +IAOvGwMeAAOsAwUOAANMDxRMAw4FAAM8KzwRAAAIABMeDwCPEAOsAw4goyCGAg8PFgMt-AHPEy8R +DxNfEQ8TPxEPEwwfDQAoDE8OACMsLw4AtBwPEX8TDC8RPxMfIAAAGwAfTw0ADvEAPA4vES4MLY4d +DgwtDm0OBwAnDF0IAH88Diw9Dh3eyAAd2fQMDx80HnQeNB4kHiQGAPEARA4kHtQehB4kDpQehA40 +BAAGHgAQhAQAPw70CQUDHaP-FgAGBwYHDgcGAgD0BA4XBQcGDgUHBgcFFgcGDhYHBgUdAIAFBw4X +BgcGDgoAARIARA4G-gAKAAMGACQWBU8AEAUGABMXGAASBQYAJBYHHgACBgAR-n0AB0IAADAABEIA +MgUGBzAABx4AEgUgAAFCAANOAAUeAB8H-AAegBUDDA8QDA4clwMybxUOCgBRHQwdDC0LALEdDgwd +DA4tDhwOLQoAUgwtHC0MCgA0Dl0OCgA-DD0MDAACBSIABTYABUoAAl8AMy0MTXMAI20MCQA-DP0D +xQAd8QEfFC8WHxSEHgYfFh5EDx8kCQBjNB8fJB4vCACSHxYGHhQPHwQdCwAgBB0KAFMsHgQdVAYA +YAYcHgQNZAcAU1QNFB4sBgBwFA0UHRQeHDEABAkAMA0kHRoAAC0APywehKoAHVWEHxQGH6wAYQQf +H1QeLwgAMSQdBAoAEB0JACYcBgkAIBQNCQAxLB5UBgBRBB0kDRStAAO0AAPBAAIkAAU1ABNUBwAB +xQBPhB4sHqgAHf8hBhcWFw8WDRYdFg8SFhcWBw8WHRYdBg8SBxYXFg8WBh0WHQ8SFxYXBg8WFh0W +DQ8SMAARQH8WfxIiABIOLQAAIQAQDiwAEAwfABAOKgAQDE0AEA5YABUMKQAfDCgAAS9_fFQEPWd0 +DxQODQQCACYUDRAAAAoA-wX-GxQfEV8bHxGfGx8RbxsfEf8bDWcGHfEUQF8UcB4PFT8fLkAeDxUO +Px8PFQ4NDiAeDQ4NPx8ODQ4NDhAGAGE8DQ4NHgALADENDhwHABE_BgAhHA4HABEeBgAnDhQaACUU +DhoA4CwNDixeTA4NTA0OAA48FgBSPA4QDixaAEEOIA4MCgBhDQ4cDkAuCgBPHnBeQFABHQPLAAA- +AFEuQA4PH0kAYw4NLiAOLAsAMRwOEMkAYA4NPAAOTAgAUUwuTC5MogAgFEy2ADccFBzOACwcHucA +NQ4AHhkACBoBEiDUAG4NHkAuPC68AA9aB0Dg8BOdUA1-EA1QDQ5fGA4HAEIMPx4MCQA-CxwLCgAS +EjsIABBcBgBvfg1QnfAThgAwEzddAD8HHAcKABIeN4UADz0BTmD-FAEADiACABE_BgAyDgAeCAA- +EP4CGQA2Hw7IAE8AXwdQHxYGBx4JALEGBw4WHhYeZgcGHgMAAQIARRYelh6RBxEHKgAxph4WqQcF +KABSVh4WHlYcAAZJABKmHAAfBkgAAAIoADxmHhZJAF8WDiYehsQAHfYA9QHfGBXeFd8VFd4V3hXd +BgB-9QLdFd31AVAAHU-2AA0GAgDKL-YBYwEfRw8WDQ4CADgVDQ4CAHP1AQ8TLwwvRAsgHwx_CxkP +fwsZD2YLDw4ACXE-DA8TLxEvFgA1jxMfIAA3bxEPDgA-DwxfEAAEAUAAIQw-DgAf3wsEHqH-GxYf +ET8bHxEvDwcQBwUAEAYFABAFBQASCi8HAQkAAjAHEgQqABE-DQAfC5MIHWH-GxAPEX9AAD8PET9y +AAEUAnIAEhJyABePBAA--xsIcQAdL-DwVARPTx8UsD4CAAoPugkef-8UEPCw-hA3AB8-EtAeAgAC +D0wAIT8Q0B4CAAIv-hKFAScPMgCrD2ABBwACAA9iASAv8NCXATcBAgAPTwAdivAdFEAPHw8UBABB +BA4PFKAJAgIAYQQNDiCeBLIJYG0EHSANHgYADg0AoA0EIA0ePQQNJA0QABFNdgtBEMQgBBUAIQRQ +FAAfMKEAHlQRFJAUAJUAIw4NAgAhBB7SCwaiAKceBK4EDh0ErQQtBAAbDQIAQx0kDQQCADk0DQQC +AG8AFJAU8BGeACAbwJwAETAwAQQCAIAgHgSeIB0EbQsAWh0EbR4NDQAiBA0OAFINJA0EPRAAMA0E +TUYAMcRABBMAIQRQEAAeIJoAD-gEcQJ1Ag8SAzg-EsAuAgACH-6bAR4e0J4ADysDK2YgLx9fFGAF +AFIfH28UYDAD-QNPFA8fYC5PFA5gDg0OXWANHl0JAEE9BA1gAgNHUJRQBA8AHzDZAU9mMF8ULx9g +BQBwbxQfH2AOT7ECYGAOTS5gXQkAO10eDQkAAX8CEWB_Aj9glFCNAqsP-wYfX-DQ-xQQdAI5DzYH +HxQgXQLyFARQBA4fHz4EDgRAxDANDg1OBA4EDgQgDh0_BA4kDiANDg1uEAAybgQeDgAaHg0AEJ2p +BRQOAgBIBA4NMNwFH8D5BCGfUBgAaFD4EPBgOgAdQjAETxTZANFQBA8UBD4fHw4EIMQQ0wDwAk4N +Dg0gDiQOBD4dDiAEDgRuEABAHgRuHUgFDg0AQR0EnSDPAAQCABggfAVPQBTwHdcAHqoB0xADvxsD +EAO_BAD-DtMwBXAFYBUwFZAFEAXAFcAFEAWQFTAVYAVwBfADDwNPYTA8DxwsYFkV8AgHDA4cMBwO +DEcMDgwwDA4MZwwOMB4XDgIAMgxADgkA8CEgHiBXAA4wHiA3MB5ALAgcEB5ABywIHAdAHgAHXAcA +HgAeEHwQHiAHDAcMB0xwFwAIAJ8McBcQF5AYEBiKER7wBSABLD8cAVABHG4BQAEMDhEOEQcOCgAi +Bw4DAAEMADIcBxwKAPAPDxdHDQ4BMAEcJw0nHgEwMQwHDjFQAQcMBwgHDgcBCgD-JQ4IDggeBwEw +AQccbgcBEAEXLF4XAQABF3wBFwEQEQcBFwEHEQcRQAEAAQcBBwGQARwBHAE-EiAPMgD-GP8ogA8b +0B6ATxgOPUA9Am0wvTAdAm0CHSBdAl0gzTAdAk0CLTBNCF0wPQJtQF0CLWB9cG2QTbAtUJkAHw8y +AP9H-wAEBAQAHxwADhceFw4AHgA8ABr-BggIBIAHMAcgBxAH8AQHEAcgBzAHgEIAHZAIADgACAAI +MAgGAIEQCAAYUBhQGAoABBYAPzgACDcBHw8yAOXwFBC-GCAOtA4ADtQeRDxEHiQcPxwcJB4kDF0M +JB4UDA1cDQwUCAAyDD0MCgARHQIACAoA0SQMHRwdDCQeJBw9HCRFAJ-UDgAOtA4gvhC-AB8PMgD- +S7cTnxBQDhwOLA4MDggAIy4MEAAACAAIGgAqPC4YACIMHgoAMWAODCIAj3AeTA6AXvAUiAAe_Q8V +VYAFVgVwBV8QBXAFXgVwBQY_BgVwBRYeFgVwBVYEAE_AVfAlTAEfDzIA-xnwCCHBEAGMDxEbDA8c +IQx-EBwPHAEQES8QhwnyBTE-EBGAAS4BoAEeDxwBkAEeDQGQDwAQDQUAXwGwMfAKogAfDzIA---- +----------------------------------9zUD0xMX19 :: gfx/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0yNyAyMTowNTowNSIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA +NC0yOCAwOToxMTowNCIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA MG5pbA== :: map/0.map b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0yNyAyMTowNTowNCIscmV2aXNpb249MTIxMl1dbHo0AL4FAAAKQgAA8Ah7e2JtcD11c2VyZGF0 +NC0yOCAwOToxMTowNCIscmV2aXNpb249MTIyM11dbHo0ALgFAAAUQgAA8Ah7e2JtcD11c2VyZGF0 YSgiaTE2IiwzMgMALyIwAQD-gy4xMAwADwEAoiozMAEAHjQUAAwBADU1ODABAD80ODABACsvNDAz -AD4-MTMwgABKD1wAGgQEAA8BADUPUAAhLzMwgABtDwEAuio0OAgBDwQDBw4gAA8BADYEgAAfM2AB -AC8zMAEATi80OBgADw4kAA8BADkOaAAPAQByHjOAAQ_AAGAPAQD-hAS0Aw4QAA8BAFMMcAAHEAAf -NsUIUC82MAEA7AdwAQ4QAA8BAFAMcAAMEAAPaAQdCAEACEgAD4AEGg_AAEIPAQD-Fw4sCw8BABQv -NDDQAT8fMyUEGC80MAEA1PQbIiksaGlkZGVuPWZhbHNlLG5hbWU9Im9iamVjdHMiLHBhbl94PTcz -LjE2AQARNxUAWXk9MTM4FgCSdGlsZV9oPTE2CgAQdwoAj3pvb209MX0sgRAJDwEA----mi9hMIAA -7Q8BAP--------------Sw_BEAOlZm9yZWdyb3VuZIQQHzGEEAAvNzSDEI8vMzkEAAMPAQAFLzM5 -BAADDwEAIW8zMjAwMGIEAAMvMzAwAAQTOQQAGmIMAC8zMIAAJB85BAABD4AAEBowDAAPgAAZBDQB -IzNhQAAiZDABABNjEAAAHAAWOCgADwABEgcwAA8EAAEPRAACL2QwAQAHB4wACTwADzAACQuUAAgI -AB8zgABZFzAMAA_AAD0XNQQACAEALzUwAQAKCYAAH2YEAAMmMTYEACcwZgQACDwADwEAJAmAAA8Q -FwUIgAAOAQAOPAAPAQAYD4AANh81BAAMBAEAGjUEAA8AAbYPgADsajJiMDAyYwQABAEALzJjBAAE -FmSAAAABAC8yOQQAAAs-EyYyOBwACIAAPzM1MAEAHhMzoAYvMzkEAAgLGAEIsAAPgAAtAAEAFDIj -FBNiCAAaYRAALzIwgACjIjJi4AEPgAASDwEACABABxMydQAeMi0AD4AABiozMywCD0wCAh9igAAP -JzBjkAYfYwABCB5kgAAfMygAAA2kAA_AADQP3AIFD4AALgsBAA_AABUvMDD8CAAeYaQAD4AASQks -CBc5SAEIBAIPgAA1FzUEAA_AABEDLAAPgAAVIzNlBAAfMAEAAw7gAg_MAwsEHAMMPAANNAMLBAAO -AQAPiAEPLjMzoAMPHAIFDRgABwQALzAwgAAPBFgGDQwDC6ADAZwBF2EEAB9kGAAAFmIIBS4wYnwB -D4AABQ1sAA4BAA_AAEYPAQBHD4AAjyYwMKgCDwQAQQ_DEBFfc29saWQCIVQvMTABAP_AHjkMAA8B -AKEvMTgEAAMPAQAFLzFhBAADDwEAIS8xOAQABw8BAAUvMWEEAAMvMDCQAR8vMTgEAAcPAQAFJzFi -BAAWOQQALzA4BAAMBwEALzFjBAADJjBmBAAmMWMEAAkBAB84BAAkBwEALzFjBAAbCQEAHzgEACQH -AQAvMWMEABsIAQAvMTgEACMIAQAvMWMEABsIAQAvMTgEACMIAQAvMWMEABsIAQAvMTgEACMIAQAv -MWMEABsIAQAvMTgEACMIAQAvMWMEABsIAQAvMTgEACMPAQASF2UEAA8BAAQvMWIEAAAECAQfYgQA -Bw8BABIXZQQADwEABR84BAAkDwEAERdlBAAPAQAFHzgEACQPAQARF2UEAA8BAAUfOAQAJBcwXAAP -BAABBAEAL2UwAQALHjgEAA1LDRZhHAAFBAAEXAAPBAAFBAEAL2UwAQALHjgEAB8znwsBGzgEAARc -AA8EAAUEAQAvZTABAAsfOIAARAwEAA8BAAUfOIAA6y4xYngED4AAAQQcAAmABB9lBAAYDwEADR84 -BAAUDwEAAS9lMAEALi8xOAQAEw_AAP9GLzA4BAAUH2UEACAPAQARHzgEABQfZQQAHg8CIZJKYmFj -awIhPzEzN4UQAHUtMTEyLjgzAQAPhhAFUG09MX19 +ACYfNnwABD8xMzCAAEoPXAAaBAQADwEANQ9QACEvMzCAAG0PAQC6KjQ4CAEPBAMHDiAADwEANgSA +AB8zYAEALzMwAQBOLzQ4GAAPDiQADwEAOQ5oAA8BAHIeM4ABD4AAYA8BAP_EBLQDDhAADwEAUwxw +AAcQAB82xQhQLzYwAQDsB3ABDhAADwEAUAxwAAwQAA9oBB0IAQAISAAPgAQaD4AAQg8BAP8XDiwL +DwEAFC80MNABPx8zJQQYLzQwAQDU9R0iKSxoaWRkZW49ZmFsc2UsbmFtZT0ib2JqZWN0cyIscGFu +X3g9LTExMS44MwEAARcAaXk9LTE2MBcAknRpbGVfaD0xNgoAEHcKAI96b29tPTF9LIQQCQ8BAP-- +-5ovYTCAAO0PAQD--------------0sPhBADr2ZvcmVncm91bmSHELIvMzkEAAMPAQAFLzM5BAAD +DwEAIW8zMjAwMGIEAAMvMzAwAAQTOQQAGmIMAC8zMIAAJB85BAABD4AAEBowDAAPgAAZBDQBIzNh +QAAiZDABABNjEAAAHAAWOCgADwABEgcwAA8EAAEPRAACL2QwAQAHB4wACTwADzAACQuUAAgIAB8z +gABZFzAMAA_AAD0XNQQACAEALzUwAQAKCYAAH2YEAAMmMTYEACcwZgQACDwADwEAJAmAAA8XFwUI +gAAOAQAOPAAPAQAYD4AANh81BAAMBAEAGjUEAA8AAbYPgADsajJiMDAyYwQABAEALzJjBAAEFmSA +AAABAC8yOQQAAAtDEyYyOBwACIAAPzM1MAEAHhMzoAYvMzkEAAgLGAEIsAAPgAAtAAEAFDInFBNi +CAAaYRAALzIwgACjIjJi4AEPgAASDwEACABABxMydQAeMi0AD4AABiozMywCD0wCAh9igAAPJzBj +kAYfYwABCB5kgAAfMygAAA2kAA_AADQP3AIFD4AALgsBAA_AABUvMDD8CAAeYaQAD4AASQksCBc5 +SAEIBAIPgAA1FzUEAA_AABEDLAAPgAAVIzNlBAAfMAEAAw7gAg_MAwsEHAMMPAANNAMLBAAOAQAP +iAEPLjMzoAMPHAIFDRgABwQALzAwgAAPBFgGDQwDC6ADAZwBF2EEAB9kGAAAFmIIBS4wYnwBD4AA +BQ1sAA4BAA_AAEYPAQBHD4AAjyYwMKgCDwQAQQ_HEBFPc29saYIQWC8xMAEA-4AeOQwADwEAoS8x +OAQAAw8BAAUvMWEEAAMPAQAhLzE4BAAHDwEABS8xYQQAAy8wMJABHy8xOAQABw8BAAUnMWIEABY5 +BAAvMDgEAAwHAQAvMWMEAAMmMGYEACYxYwQACQEAHzgEACQHAQAvMWMEABsJAQAfOAQAJAcBAC8x +YwQAGwgBAC8xOAQAIwgBAC8xYwQAGwgBAC8xOAQAIwgBAC8xYwQAGwgBAC8xOAQAIwgBAC8xYwQA +GwgBAC8xOAQAIwgBAC8xYwQAGwgBAC8xOAQAIw8BABIXZQQADwEABC8xYgQAAAQIBB9iBAAHDwEA +EhdlBAAPAQAFHzgEACQPAQARF2UEAA8BAAUfOAQAJA8BABEXZQQADwEABR84BAAkFzBcAA8EAAEE +AQAvZTABAAseOAQADU4NFmEcAAUEAARcAA8EAAUEAQAvZTABAAseOAQAHzOiCwEbOAQABFwADwQA +BQQBAC9lMAEACx84gABEDAQADwEABR84gADrLjFieAQPgAABBBwACYAEH2UEABgPAQANHzgEABQP +AQABL2UwAQAuLzE4BAATD4AA-0YvMDgEABQfZQQAIA8BABEfOAQAFB9lBAAeDwkhkkpiYWNrCSFk +MTM3LjE2AQAVN4YQLzEyhhARUG09MX19 :: map/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0yNyAyMTowNTowNSIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA +NC0yOCAwOToxMTowNCIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA MG5pbA== :: sfx/0.sfx b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w -NC0yNyAyMTowNTowNCIscmV2aXNpb249OTQxXV1sejQARgEAAGYIAADwJ3B4dQADKAAAAwAED0AQ +NC0yOCAwOToxMTowNCIscmV2aXNpb249OTQ3XV1sejQARgEAAGYIAADwJ3B4dQADKAAAAwAED0AQ Ag4AAaABIAKgDgAPEAAN8MoBAgMEBQYHAA--kAgJCgsPDA8NDw4PDxAA8AANDxEPEg8TDxQPFQ8W DxcTAPEBDxgPGQ8aDxsPHA8dDx4PHxQA8QAgDyEPIg8jDyQPJQ8mDycUAPEAKA8pDyoPKw8sDy0P Lg8vFADxADAPMQ8yDzMPNA81DzYPNxQA-wU4DzkPOg87DzwPPQ8_Dz8AD--w-wEA6-InWgEQBg8g @@ -108,14 +109,14 @@ L-AAMAD--4If-wEAzPEd6A9AAA1ADxcACxoIBggQAgMQBQAGAAgASRcAJggJUP--CfEX-gn8F-4J 8HArAF-_sPBwBAgA-9wf-wEAl1D-----Hw== :: sfx/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w -NC0yNyAyMTowNTowNSIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA +NC0yOCAwOToxMTowNCIsc3RvcmVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIl1dbHo0AAQAAAADAAAA MG5pbA== :: main.lua ---[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-04-27 21:05:04",revision=1228]] +--[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-04-28 09:11:04",revision=1234]] include("/cirnofarm/src/game.lua") :: .info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTE2IDE5OjQyOjIyIixtb2RpZmllZD0iMjAyNC0w -NC0yNyAyMTowNTowNSIscnVudGltZT02LHN0b3JlZD0iMjAyNC0wNC0xNiAxOTo0MDowNSIsd29y +NC0yOCAwOToxMTowNCIscnVudGltZT02LHN0b3JlZD0iMjAyNC0wNC0xNiAxOTo0MDowNSIsd29y a3NwYWNlcz17e2xvY2F0aW9uPSJtYWluLmx1YSMxIix3b3Jrc3BhY2VfaW5kZXg9MX0se2xvY2F0 aW9uPSJnZngvMC5nZngiLHdvcmtzcGFjZV9pbmRleD0yfSx7bG9jYXRpb249Im1hcC8wLm1hcCIs d29ya3NwYWNlX2luZGV4PTN9LHtsb2NhdGlvbj0ic2Z4LzAuc2Z4Iix3b3Jrc3BhY2VfaW5kZXg9 diff --git a/src/weapons.lua b/src/weapons.lua index 0063604..344db3f 100644 --- a/src/weapons.lua +++ b/src/weapons.lua @@ -5,11 +5,22 @@ local Actor = require(make_path("actor2")) M = {} -local weapons = { - { +local bullets_list = { + BASIC={ + spriteIndex=80, + damage=1, + speed=2, + life=100 + } +} + +local weapons_list = { + ICE_BLASTER={ name = "Ice Blaster", rate_of_fire = 0.2, - shoot=function(self) + bullet=bullets_list.BASIC, + spriteIndex=104, + shoot=function(self,x,y,dir_x,dir_y) end } @@ -38,14 +49,19 @@ Bullet = Actor:new() --end --Bullet.dx=0 --Bullet.dy=0 -Bullet.spriteIndex = 80 -Bullet.damage=1 +--Bullet.spriteIndex = 80 +--Bullet.damage=1 -function Bullet:new(x,y,dir_x,dir_y) +function Bullet:new(bullet_data,x,y,dir_x,dir_y) local obj = Actor:new(x,y) - obj.dx = dir_x - obj.dy = dir_y + obj.spriteIndex = bullet_data.spriteIndex + obj.damage = bullet_data.damage + obj.life = bullet_data.life + obj.speed = bullet_data.speed + + obj.dx = dir_x * obj.speed + obj.dy = dir_y * obj.speed -- 'obj' has 'Actor' as a prototype at the moment -- which isn't what we want so we just change it. @@ -86,7 +102,7 @@ function Bullet:draw() spr(self.spriteIndex,self.x,self.y) end -function M.create_bullet(new_x, new_y, dir_x, dir_y) +function create_bullet(new_x, new_y, dir_x, dir_y) -- Calculate the length of the direction vector local length = sqrt(dir_x^2 + dir_y^2) @@ -94,7 +110,7 @@ function M.create_bullet(new_x, new_y, dir_x, dir_y) local normalized_dir_x = dir_x / length local normalized_dir_y = dir_y / length - local b = Bullet:new(new_x, new_y, normalized_dir_x * 2, normalized_dir_y * 2) + local b = Bullet:new(bullets_list.BASIC, new_x, new_y, normalized_dir_x, normalized_dir_y) --b.dx = normalized_dir_x * 2 --b.dy = normalized_dir_y * 2 @@ -103,6 +119,18 @@ function M.create_bullet(new_x, new_y, dir_x, dir_y) end +function M.create_bullet(new_x, new_y, dir_x, dir_y) + return create_bullet(new_x,new_y,dir_x,dir_y) +end + +function M.get_weapons() + return weapons_list +end + +function M.get_bullets() + return bullets_list +end + function M.init() end