From 4a2a2c17e79937fb48e3d0db0fcb00d4fea46e04 Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Fri, 20 Sep 2024 13:59:02 +0200 Subject: [PATCH 1/2] add picotron cartridge --- justfile | 2 ++ picotron/wolfenstein.p64 | 71 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 justfile create mode 100644 picotron/wolfenstein.p64 diff --git a/justfile b/justfile new file mode 100644 index 0000000..2e3ffeb --- /dev/null +++ b/justfile @@ -0,0 +1,2 @@ +picotron: + picotron& diff --git a/picotron/wolfenstein.p64 b/picotron/wolfenstein.p64 new file mode 100644 index 0000000..738c616 --- /dev/null +++ b/picotron/wolfenstein.p64 @@ -0,0 +1,71 @@ +picotron cartridge // www.picotron.net +version 2 + +:: gfx/ +:: gfx/0.gfx +b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTAzLTIwIDExOjU3OjQyIixtb2RpZmllZD0iMjAyNC0w +OC0xMiAxMjowNDoxMCIscmV2aXNpb249NDhdXWx6NACnAAAALDEAAPMUe1swXT17Ym1wPXB4dQBD +IBAQBPDwLGZsYWdzPTAscGFuX3gIAMp5PTAsem9vbT04fSwxAB-2MQAdH-cxAB0v-xkyAB4fEDIA +HdbwFGiAeHAYMChgGEAYBACRMBhwaIBYkBjQAgAv8ApWAB0f8DEA------------------------ +---------------------------------------hUG09OH19 +:: gfx/.info.pod +b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIixtb2RpZmllZD0iMjAyNC0w +OS0yMCAxMTo1ODozMiIsc3RvcmVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIl1d +:: map/ +:: map/0.map +b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTAzLTIwIDExOjU3OjQyIixtb2RpZmllZD0iMjAyNC0w +OC0xMiAxMjowNDoxMCIscmV2aXNpb249NTFdXWx6NAC2AAAAXBAAAPAIe3tibXA9dXNlcmRhdGEo +ImkxNiIsMzIDAJ8iMDAwMTAwMDIIAA4PAQBHD1wAES8xMAEARw9cAA4PAAFULzMwAAF3EzQEAA8A +AVkOgAAPAAFnDAEADwABXQwBAA8AAVEvNTAAAecfMggADg8BAP-------------O8QkiKSxoaWRk +ZW49ZmFsc2UscGFuX3g9MjAJAOJ5PS04LHRpbGVfaD0xNgoAEHcKAKB6b29tPTAuNX19 +:: map/.info.pod +b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIixtb2RpZmllZD0iMjAyNC0w +OS0yMCAxMTo1ODozMiIsc3RvcmVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIl1d +:: sfx/ +:: sfx/0.sfx +b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTAzLTIwIDExOjU3OjQyIixtb2RpZmllZD0iMjAyNC0w +OC0xMiAxMjowNDoxMCIscmV2aXNpb249MzZdXWx6NAARAQAAUggAAPAncHh1AAMoAAAEAAQPQBAC +DgABoAEgAqAOAA8QAA3wygECAwQFBgcAD-_QCAkKCw8MDw0PDg8PEADwAA0PEQ8SDxMPFA8VDxYP +FxMA8QEPGA8ZDxoPGw8cDx0PHg8fFADxACAPIQ8iDyMPJA8lDyYPJxQA8QAoDykPKg8rDywPLQ8u +Dy8UAPEAMA8xDzIPMw80DzUPNg83FAD-BTgPOQ86DzsPPA89Dz4PPwAP--D-AQDr-ydaARAGDyAQ +ASABIAHwAAIQAgwQASAPISABMA9A8MMPKA--8MYP_AoP-w_AD-cPDQHwCQEQBgwwAP85H-8BANy- +_A9AAA1A--_w8HAKAP--ZB--AQD-mVD-----IA== +:: sfx/.info.pod +b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIixtb2RpZmllZD0iMjAyNC0w +OS0yMCAxMTo1ODozMiIsc3RvcmVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIl1d +:: main.lua +--[[pod_format="raw",created="2024-03-20 11:57:42",modified="2024-08-12 12:04:10",revision=56]] +player = { + x = nil, + y = nil +} + +col_bg = 1 +col_ground = 6 + +function _init() + for i=0,31 do + for j=0,31 do + if mget(i,j) == 5 then -- player id + player.x = i + player.y = j + break + end + end + if (player.x) break + end +end + +function _draw() + cls(col_bg) + rectfill(0, 135, 480, 270, col_ground) + -- map() +end +:: .info.pod +b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA4LTEyIDExOjQ2OjM4Iixtb2RpZmllZD0iMjAyNC0w +OS0yMCAxMTo1ODozMiIscnVudGltZT04LHN0b3JlZD0iMjAyNC0wMy0yNSAxMjo1Nzo0MCIsd29y +a3NwYWNlcz17e2xvY2F0aW9uPSJtYWluLmx1YSMyNSIsd29ya3NwYWNlX2luZGV4PTF9LHtsb2Nh +dGlvbj0iZ2Z4LzAuZ2Z4Iix3b3Jrc3BhY2VfaW5kZXg9Mn0se2xvY2F0aW9uPSJtYXAvMC5tYXAi +LHdvcmtzcGFjZV9pbmRleD0zfSx7bG9jYXRpb249InNmeC8wLnNmeCIsd29ya3NwYWNlX2luZGV4 +PTR9fV1d +:: [eoc] From 0ba85c04db174511a26bc50828119de013cc4dee Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Mon, 23 Sep 2024 13:34:10 +0200 Subject: [PATCH 2/2] wolf: move script to dedicated file --- picotron/wolfenstein.p64 | 44 +++++++------------------------ picotron/wolfenstein_src/main.lua | 27 +++++++++++++++++++ 2 files changed, 37 insertions(+), 34 deletions(-) create mode 100644 picotron/wolfenstein_src/main.lua diff --git a/picotron/wolfenstein.p64 b/picotron/wolfenstein.p64 index 738c616..3d9a4db 100644 --- a/picotron/wolfenstein.p64 +++ b/picotron/wolfenstein.p64 @@ -4,27 +4,27 @@ version 2 :: gfx/ :: gfx/0.gfx b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTAzLTIwIDExOjU3OjQyIixtb2RpZmllZD0iMjAyNC0w -OC0xMiAxMjowNDoxMCIscmV2aXNpb249NDhdXWx6NACnAAAALDEAAPMUe1swXT17Ym1wPXB4dQBD +OS0yMyAxMTozMzoyNyIscmV2aXNpb249NjJdXWx6NACnAAAALDEAAPMUe1swXT17Ym1wPXB4dQBD IBAQBPDwLGZsYWdzPTAscGFuX3gIAMp5PTAsem9vbT04fSwxAB-2MQAdH-cxAB0v-xkyAB4fEDIA HdbwFGiAeHAYMChgGEAYBACRMBhwaIBYkBjQAgAv8ApWAB0f8DEA------------------------ ---------------------------------------hUG09OH19 :: gfx/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIixtb2RpZmllZD0iMjAyNC0w -OS0yMCAxMTo1ODozMiIsc3RvcmVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIl1d +OS0yMyAxMTozMzoyNyIsc3RvcmVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIl1d :: map/ :: map/0.map b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTAzLTIwIDExOjU3OjQyIixtb2RpZmllZD0iMjAyNC0w -OC0xMiAxMjowNDoxMCIscmV2aXNpb249NTFdXWx6NAC2AAAAXBAAAPAIe3tibXA9dXNlcmRhdGEo +OS0yMyAxMTozMzoyNyIscmV2aXNpb249NjddXWx6NAC2AAAAXBAAAPAIe3tibXA9dXNlcmRhdGEo ImkxNiIsMzIDAJ8iMDAwMTAwMDIIAA4PAQBHD1wAES8xMAEARw9cAA4PAAFULzMwAAF3EzQEAA8A AVkOgAAPAAFnDAEADwABXQwBAA8AAVEvNTAAAecfMggADg8BAP-------------O8QkiKSxoaWRk ZW49ZmFsc2UscGFuX3g9MjAJAOJ5PS04LHRpbGVfaD0xNgoAEHcKAKB6b29tPTAuNX19 :: map/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIixtb2RpZmllZD0iMjAyNC0w -OS0yMCAxMTo1ODozMiIsc3RvcmVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIl1d +OS0yMyAxMTozMzoyNyIsc3RvcmVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIl1d :: sfx/ :: sfx/0.sfx b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTAzLTIwIDExOjU3OjQyIixtb2RpZmllZD0iMjAyNC0w -OC0xMiAxMjowNDoxMCIscmV2aXNpb249MzZdXWx6NAARAQAAUggAAPAncHh1AAMoAAAEAAQPQBAC +OS0yMyAxMTozMzoyNyIscmV2aXNpb249NTBdXWx6NAARAQAAUggAAPAncHh1AAMoAAAEAAQPQBAC DgABoAEgAqAOAA8QAA3wygECAwQFBgcAD-_QCAkKCw8MDw0PDg8PEADwAA0PEQ8SDxMPFA8VDxYP FxMA8QEPGA8ZDxoPGw8cDx0PHg8fFADxACAPIQ8iDyMPJA8lDyYPJxQA8QAoDykPKg8rDywPLQ8u Dy8UAPEAMA8xDzIPMw80DzUPNg83FAD-BTgPOQ86DzsPPA89Dz4PPwAP--D-AQDr-ydaARAGDyAQ @@ -32,39 +32,15 @@ ASABIAHwAAIQAgwQASAPISABMA9A8MMPKA--8MYP_AoP-w_AD-cPDQHwCQEQBgwwAP85H-8BANy- _A9AAA1A--_w8HAKAP--ZB--AQD-mVD-----IA== :: sfx/.info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIixtb2RpZmllZD0iMjAyNC0w -OS0yMCAxMTo1ODozMiIsc3RvcmVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIl1d +OS0yMyAxMTozMzoyNyIsc3RvcmVkPSIyMDI0LTAzLTIwIDExOjU3OjQxIl1d :: main.lua ---[[pod_format="raw",created="2024-03-20 11:57:42",modified="2024-08-12 12:04:10",revision=56]] -player = { - x = nil, - y = nil -} +--[[pod_format="raw",created="2024-03-20 11:57:42",modified="2024-09-23 11:33:27",revision=74]] +include("/cartridges/wolfenstein_src/main.lua") -col_bg = 1 -col_ground = 6 - -function _init() - for i=0,31 do - for j=0,31 do - if mget(i,j) == 5 then -- player id - player.x = i - player.y = j - break - end - end - if (player.x) break - end -end - -function _draw() - cls(col_bg) - rectfill(0, 135, 480, 270, col_ground) - -- map() -end :: .info.pod b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA4LTEyIDExOjQ2OjM4Iixtb2RpZmllZD0iMjAyNC0w -OS0yMCAxMTo1ODozMiIscnVudGltZT04LHN0b3JlZD0iMjAyNC0wMy0yNSAxMjo1Nzo0MCIsd29y -a3NwYWNlcz17e2xvY2F0aW9uPSJtYWluLmx1YSMyNSIsd29ya3NwYWNlX2luZGV4PTF9LHtsb2Nh +OS0yMyAxMTozMzoyNyIscnVudGltZT0xMSxzdG9yZWQ9IjIwMjQtMDMtMjUgMTI6NTc6NDAiLHdv +cmtzcGFjZXM9e3tsb2NhdGlvbj0ibWFpbi5sdWEjMiIsd29ya3NwYWNlX2luZGV4PTF9LHtsb2Nh dGlvbj0iZ2Z4LzAuZ2Z4Iix3b3Jrc3BhY2VfaW5kZXg9Mn0se2xvY2F0aW9uPSJtYXAvMC5tYXAi LHdvcmtzcGFjZV9pbmRleD0zfSx7bG9jYXRpb249InNmeC8wLnNmeCIsd29ya3NwYWNlX2luZGV4 PTR9fV1d diff --git a/picotron/wolfenstein_src/main.lua b/picotron/wolfenstein_src/main.lua new file mode 100644 index 0000000..31a8f05 --- /dev/null +++ b/picotron/wolfenstein_src/main.lua @@ -0,0 +1,27 @@ +player = { + x = nil, + y = nil +} + +col_bg = 1 +col_ground = 6 + +function _init() + for i=0,31 do + for j=0,31 do + if mget(i,j) == 5 then -- player id + player.x = i + player.y = j + break + end + end + if (player.x) break + end + print("player: ("..player.x..", "..player.y..")") +end + +function _draw() + cls(col_bg) + rectfill(0, 135, 480, 270, col_ground) + -- map() +end