branch into version

.gitignore

@@ -1,5 +1,5 @@
 .local
 .vscode
 .DS_Store
-bomberman.zip
+bombexpert.lua
-bomberman/*
+bombexpert/*

.woodpecker.yml

@@ -1,16 +1,16 @@
-environment:
-  GAME_NAME: bombexpert
-  GAME_LANG: lua
-
 steps:
+  - name: version
+    image: alpine
+    commands:
+      - 'apk add --no-cache make'
+      - 'make ci-version'
+
   - name: build
-    image: rastasi/tic80pro:latest
+    image: git.teletype.hu/internal/tic80pro:latest
     environment:
-      GAME_NAME: bombexpert
-      GAME_LANG: lua
       XDG_RUNTIME_DIR: /tmp
     commands:
-      - tic80 --cli --skip --fs=. --cmd="load $GAME_NAME.$GAME_LANG & save $GAME_NAME & exit"
+      - 'make ci-export'
 
   - name: artifact
     image: alpine
@@ -22,9 +22,8 @@ steps:
       DROPAREA_SSH_PASSWORD:
         from_secret: droparea_ssh_password
     commands:
-      - apk add --no-cache openssh-client sshpass
+      - 'apk add --no-cache make openssh-client sshpass'
-      - mkdir -p /root/.ssh
+      - 'make ci-upload'
-      - sshpass -p $DROPAREA_SSH_PASSWORD scp -o StrictHostKeyChecking=no -P $DROPAREA_PORT $GAME_NAME.$GAME_LANG $GAME_NAME.tic $DROPAREA_USER@$DROPAREA_HOST:$DROPAREA_TARGET_PATH
 
   - name: update
     image: alpine
@@ -33,5 +32,5 @@ steps:
       UPDATE_SECRET:
         from_secret: update_secret_key
     commands:
-      - apk add --no-cache curl
+      - 'apk add --no-cache make curl'
-      - curl "$UPDATE_SERVER/update?secret=$UPDATE_SECRET"
+      - 'make ci-update'

Makefile

@@ -0,0 +1,115 @@
+# -----------------------------------------
+# Makefile – TIC-80 project builder
+# -----------------------------------------
+
+PROJECT = bombexpert
+
+ORDER      = $(PROJECT).inc
+OUTPUT     = $(PROJECT).lua
+OUTPUT_ZIP = $(PROJECT).html.zip
+OUTPUT_TIC = $(PROJECT).tic
+
+SRC_DIR    = inc
+SRC        = $(shell sed 's|^|$(SRC_DIR)/|' $(ORDER))
+
+ASSETS_LUA = inc/meta/meta.assets.lua
+
+# CI/CD variables
+VERSION_FILE = .version
+GAME_LANG ?= lua
+DROPAREA_HOST ?= vps.teletype.hu
+DROPAREA_PORT ?= 2223
+DROPAREA_TARGET_PATH ?= /home/drop
+DROPAREA_USER ?= drop
+UPDATE_SERVER ?= https://games.vps.teletype.hu
+
+all: build
+
+build: $(OUTPUT)
+
+$(OUTPUT): $(SRC) $(ORDER)
+	@rm -f $(OUTPUT)
+	@while read f; do \
+		cat "$(SRC_DIR)/$$f" >> $(OUTPUT); \
+		echo "" >> $(OUTPUT); \
+	done < $(ORDER)
+
+export: build
+	@if [ -z "$(VERSION)" ]; then \
+		echo "ERROR: VERSION not set!"; \
+		exit 1; \
+	fi
+	@echo "==> Exporting HTML for version $(VERSION)"
+	@tic80 --cli --skip --fs=. \
+		--cmd="load $(OUTPUT) & save $(PROJECT)-$(VERSION) & export html $(PROJECT)-$(VERSION).html & exit"
+	@echo "==> Creating versioned files"
+	@if [ -f "$(PROJECT)-$(VERSION).tic" ]; then \
+		cp $(PROJECT)-$(VERSION).tic $(PROJECT).tic; \
+	fi
+	@if [ -f "$(PROJECT)-$(VERSION).html.zip" ]; then \
+		cp $(PROJECT)-$(VERSION).html.zip $(PROJECT).html.zip; \
+	fi
+	@echo "==> Generated files:"
+	@ls -lh $(PROJECT)-$(VERSION).* $(PROJECT).tic $(PROJECT).html.zip 2>/dev/null || true
+
+watch:
+	make build
+	fswatch -o $(SRC_DIR) $(ORDER) assets | while read; do make build; done
+
+import_assets:
+	@for t in $(ASSET_TYPES); do \
+		for f in $(ASSETS_DIR)/$$t/*.png; do \
+			[ -e "$$f" ] || continue; \
+			echo "==> Importing $$f as $$t..."; \
+			tic80 --cli --skip --fs=. --cmd="import $$t $$f & exit"; \
+		done; \
+	done
+
+export_assets: build
+	@echo "==> Exporting TIC-80 asset sections"
+	@mkdir -p inc/meta
+	@sed -n '/^-- <PALETTE>/,/^-- <\/PALETTE>/p;\
+	         /^-- <TILES>/,/^-- <\/TILES>/p;\
+	         /^-- <SPRITES>/,/^-- <\/SPRITES>/p;\
+	         /^-- <MAP>/,/^-- <\/MAP>/p;\
+	         /^-- <SFX>/,/^-- <\/SFX>/p;\
+	         /^-- <MUSIC>/,/^-- <\/MUSIC>/p' \
+		$(OUTPUT) > $(ASSETS_LUA)
+
+clean:
+	@rm -f $(PROJECT)-*.tic $(PROJECT)-*.html.zip $(OUTPUT)
+	@echo "==> Cleaned build artifacts"
+
+# CI/CD Targets
+ci-version:
+	@VERSION=$$(sed -n "s/^-- version: //p" inc/meta/meta.header.lua | head -n 1 | tr -d "[:space:]"); \
+	BRANCH=$${CI_COMMIT_BRANCH:-$${WOODPECKER_BRANCH}}; \
+	if [ "$$BRANCH" != "main" ] && [ "$$BRANCH" != "master" ] && [ -n "$$BRANCH" ]; then \
+		VERSION=dev-$$VERSION-$$BRANCH; \
+	fi; \
+	echo "VERSION is: $$VERSION"; \
+	echo $$VERSION > $(VERSION_FILE)
+
+ci-export:
+	@VERSION=$$(cat $(VERSION_FILE)); \
+	echo "==> Building and exporting version $$VERSION"; \
+	$(MAKE) export VERSION=$$VERSION
+
+ci-upload:
+	@VERSION=$$(cat $(VERSION_FILE)); \
+	echo "==> Uploading artifacts for version $$VERSION"; \
+	ls -lh $(PROJECT)-$$VERSION.* $(PROJECT).tic $(PROJECT).html.zip 2>/dev/null || true; \
+	cp $(PROJECT).lua $(PROJECT)-$$VERSION.lua; \
+	FILE_LUA=$(PROJECT)-$$VERSION.lua; \
+	FILE_TIC=$(PROJECT)-$$VERSION.tic; \
+	FILE_HTML_ZIP=$(PROJECT)-$$VERSION.html.zip; \
+	SCP_TARGET="$(DROPAREA_USER)@$(DROPAREA_HOST):$(DROPAREA_TARGET_PATH)/"; \
+	sshpass -p "$(DROPAREA_SSH_PASSWORD)" scp -o StrictHostKeyChecking=no -P $(DROPAREA_PORT) $$FILE_LUA $$FILE_TIC $$FILE_HTML_ZIP $$SCP_TARGET
+
+ci-update:
+	@VERSION=$$(cat $(VERSION_FILE)); \
+	echo "==> Triggering update for version $$VERSION"; \
+	curl "$(UPDATE_SERVER)/update?secret=$(UPDATE_SECRET)&name=$(PROJECT)&platform=tic80&version=$$VERSION"
+
+.PHONY: all build export watch import_assets export_assets clean ci-version ci-export ci-upload ci-update
+

README.md

@@ -1,6 +1,7 @@
+
 # BombExpert
 
-A classic BombExpert for [TIC-80](https://tic80.com/) fantasy console.
+A classic Bomberman clone for [TIC-80](https://tic80.com/) fantasy console.
 
 ## Features
 
@@ -64,15 +65,6 @@ Then open http://localhost:3333 in your browser.
 - [TIC-80](https://tic80.com/) fantasy console (free version works)
 - Or any modern web browser (for HTML export)
 
-## Project Structure
-
-```
-bomberman/
-├── bombexpert.lua    # Main game source code
-├── serve.py         # Simple HTTP server for browser testing
-└── README.md        # This file
-```
-
 ## Credits
 
 - **Author**: Zsolt Tasnadi

bombexpert.inc

@@ -0,0 +1,2 @@
+meta/meta.header.lua
+system/system.allin.lua

inc/meta/meta.header.lua

@@ -0,0 +1,11 @@
+-- title:   BombExpert
+-- name:    bombexpert
+-- author:  Zsolt Tasnadi
+-- desc:    Simple BombExpert for TIC-80
+-- site:    http://teletype.hu
+-- license: MIT License
+-- version: 0.2
+-- script:  lua
+
+-- luacheck: globals TIC btn btnp cls rect spr print exit sfx keyp key
+-- luacheck: max line length 150

inc/system/system.allin.lua

@@ -1,14 +1,3 @@
--- title:   BombExpert
--- author:  Zsolt Tasnadi
--- desc:    Simple BombExpert for TIC-80
--- site:    http://teletype.hu
--- license: MIT License
--- version: 0.2
--- script:  lua
-
--- luacheck: globals TIC btn btnp cls rect spr print exit sfx keyp key
--- luacheck: max line length 150
-
 --------------------------------------------------------------------------------
 -- Constants
 --------------------------------------------------------------------------------

serve.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python3
-"""Simple static file server for Bomberman HTML export."""
-
-import http.server
-import socketserver
-import os
-import webbrowser
-
-PORT = 3333
-DIRECTORY = "bombexpert"
-
-os.chdir(os.path.join(os.path.dirname(os.path.abspath(__file__)), DIRECTORY))
-
-Handler = http.server.SimpleHTTPRequestHandler
-
-with socketserver.TCPServer(("", PORT), Handler) as httpd:
-    url = f"http://localhost:{PORT}"
-    print(f"Serving at {url}")
-    webbrowser.open(url)
-    httpd.serve_forever()