Compare commits

...

4 Commits

Author SHA1 Message Date
649b73b3f8 UPDATE_SERVER url update
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-04 15:04:04 +01:00
cd41cb3312 Merge branch 'master' of https://git.teletype.hu/games/impostor
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-03 23:38:45 +01:00
ecd094e2d7 - makefile:
- added PATTERNS and TRACKS for music
- audio and configuration windows fixed
- there might be some rudimentary music in there
2026-03-03 23:36:51 +01:00
5b4f3052a6 Merge pull request 'well done splash' (#27) from feature/minigame-win-splash into master
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: http://git.teletype.hu/games/impostor/pulls/27
2026-03-03 19:58:42 +00:00
8 changed files with 31 additions and 310 deletions

8
.vscode/tasks.json vendored
View File

@@ -11,17 +11,19 @@
{
"label": "Build & Run TIC80",
"type": "shell",
"command": "make build && tic80 --fs=. impostor.lua"
"command": "make build && tic80 --fs=. impostor.lua",
"problemMatcher": []
},
{
"label": "Export assets",
"type": "shell",
"command": "make export_assets"
"command": "make export_assets",
"problemMatcher": []
},
{
"label": "Make build",
"type": "shell",
"command": "make build"
},
}
]
}

View File

@@ -53,7 +53,7 @@ steps:
- name: update
image: alpine
environment:
UPDATE_SERVER: https://games.vps.teletype.hu
UPDATE_SERVER: https://games.teletype.hu
UPDATE_SECRET:
from_secret: update_secret_key
commands:

View File

@@ -30,7 +30,7 @@ DROPAREA_HOST ?= vps.teletype.hu
DROPAREA_PORT ?= 2223
DROPAREA_TARGET_PATH ?= /home/drop
DROPAREA_USER ?= drop
UPDATE_SERVER ?= https://games.vps.teletype.hu
UPDATE_SERVER ?= https://games.teletype.hu
all: build
@@ -164,6 +164,8 @@ export_assets:
@$(call f_export_asset_awk,MAP,$(OUTPUT),$(ASSETS_LUA))
@$(call f_export_asset_awk,SFX,$(OUTPUT),$(ASSETS_LUA))
@$(call f_export_asset_awk,WAVES,$(OUTPUT),$(ASSETS_LUA))
@$(call f_export_asset_awk,PATTERNS,$(OUTPUT),$(ASSETS_LUA))
@$(call f_export_asset_awk,TRACKS,$(OUTPUT),$(ASSETS_LUA))
clean:
@rm -f $(PROJECT)-*.tic $(PROJECT)-*.html.zip $(PROJECT)-*-docs.zip $(PROJECT)-docs.zip $(OUTPUT) $(OUTPUT_ORIGINAL)

View File

@@ -23,7 +23,7 @@ function Audio.music_play_room_street_2() end
function Audio.music_play_room_() end
--- Plays room work music.
--- @within Audio
function Audio.music_play_room_work() end
function Audio.music_play_room_work() music(0) end
--- Plays select sound effect.
--- @within Audio

View File

@@ -305,13 +305,15 @@
-- 033:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d40000000004
-- 044:0600f6000620f6000600f6000610f600f600f6000600f600f600f600f6000600060006000600060006000600060006000600060006000600060006004600000f0f00
-- 045:0000f0000020f0000000f0000010f000f000f0000000f000f000f000f0000000000000000000000000000000000000000000000000000000000000004600000f0f00
-- 057:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d40000000004
-- 058:41004110410041104100411041004110c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100100000080800
-- 059:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000
-- 048:090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900090009000900400000000000
-- 056:4100510061406140717081709100b100c100d100e100e100e100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100f100580000000600
-- 057:000000010002000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c40000000004
-- 058:41004110410041104100411041004110c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100c100400000080800
-- 059:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000
-- 060:220022002200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200820082008200100000000000
-- 061:9f009f00bf00df00df00ef00ef00ef00ef00ef00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00400000000000
-- 062:00000100010001000100510081008100910091009100a100a100a100a100a100b100b100b100b100c100c100c100d100d100d100e100e100e100f100484000000000
-- 063:00b000100000000000000000100060009000b000c000d000d000e000e000e000f000f000f000f000f000f000f000f000f000f000f000f000f000f000405000000000
-- 063:00b000100000000000000000100060009000b000c000d000d000e000e000e000f000f000f000f000f000f000f000f000f000f000f000f000f000f000200000000000
-- </SFX>
-- <WAVES>
-- 000:bcceefceedddddc84333121268abaa99
@@ -325,3 +327,11 @@
-- 008:0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f
-- 009:fff000fff000fff000fff000fff000ff
-- </WAVES>
-- <PATTERNS>
-- 000:4008b50000000000000000001008c10000004008b50000001008c1000000000000000000e008b30000004008b50000001008c10000000008c10000000008c10000000000000000000000000000000000000000000000000000000000000000004008b50000000000000000001008c10000004008b50000001008c10000000008c1000000e008b30000004008b50000001008c10000000008c10000000008c10000000008c10000000008c10000000008c1000000000000000000000000000000
-- 001:4008b50000000000000000001008c10000004008b50000001008c1000000000000000000e008b30000004008b50000001008c10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007008b50000007008b50000001008c10000007008b50000001008c10000000008c10000007008b50000009008b50000001008c10000009008b50000001008c10000009008b50000009008b50000001008c10000009008b50000001008c1000000
-- 003:4008d30000000000000000000000000000000000000000004008d90000000000000000000000000000000000000000004008d30000000000000000000000000000004008d30000004008d90000000000000000000000000000000000000000004008d30000000000000000000000000000000000000000004008d90000000000000000000000000000000000000000004008d30000000000000000000000000000004008d30000004008d9000000000000000000000000000000000000000000
-- </PATTERNS>
-- <TRACKS>
-- 000:100001200001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-- </TRACKS>

View File

@@ -1,11 +1,9 @@
--- @section AudioTestWindow
AudioTestWindow = {
index_menu = 1,
index_func = 1,
list_func = {},
menuitems = {},
last_pressed = false
}
AudioTestWindow.index_menu = 1
AudioTestWindow.index_func = 1
AudioTestWindow.list_func = {}
AudioTestWindow.menuitems = {}
AudioTestWindow.last_pressed = false
--- Generates menu items for audio test.
--- @within AudioTestWindow

View File

@@ -1,8 +1,6 @@
--- @section ConfigurationWindow
ConfigurationWindow = {
controls = {},
selected_control = 1,
}
ConfigurationWindow.controls = {}
ConfigurationWindow.selected_control = 1
--- Initializes configuration window.
--- @within ConfigurationWindow

289
infra.md
View File

@@ -1,289 +0,0 @@
# Server
```mermaid
graph TD
Internet --> Nginx
Nginx --> Traefik
Traefik --> Gitea
Gitea --> GiteaDB[(Gitea data / SQLite)]
Traefik --> WoodpeckerServer
WoodpeckerServer --> WoodpeckerDB[(Woodpecker data / SQLite)]
WoodpeckerServer --> WoodpeckerAgent
WoodpeckerAgent --> DockerSocket[(Docker)]
Traefik --> WebApp
WebApp --> MySQL[(MySQL)]
WebApp --> Softwares[(Volume)]
Droparea --> Softwares
Nginx --> Discourse
Discourse --> ForumDB[(Postgres)]
Discourse --> Redis[(Redis)]
Nginx --> Wiki
Wiki --> WikiDB[(Postgres)]
```
# TIC-80 Pipeline
This document describes the Woodpecker CI pipeline used to build, export, upload, and publish a TIC-80 game project.
---
## Overview
The pipeline performs the following steps:
1. **Build** the TIC-80 project using a custom Docker image
2. **Export** the game to `.tic` and HTML formats
3. **Upload artifacts** to a remote server via SCP
4. **Notify an update server** to publish the new version
The pipeline is driven by environment variables so it can be reused across projects.
---
## Global Environment
```yaml
environment: &environment
GAME_NAME: mranderson
GAME_LANG: lua
```
- **GAME_NAME**: Project name (used for all outputs)
- **GAME_LANG**: Source language used by TIC-80 (Lua)
The anchor (`&environment`) allows reuse across steps.
---
## Step 1: Build & Export
```yaml
- name: build
image: git.teletype.hu/internal/tic80pro:latest
environment:
<<: *environment
XDG_RUNTIME_DIR: /tmp
commands:
- make build
- make export
```
**What it does:**
- Uses a custom TIC-80 Pro Docker image hosted in Gitea
- Runs the Makefile `build` target to assemble source files
- Runs the `export` target to generate:
- `.tic` cartridge
- `.html.zip` web build
---
## Step 2: Artifact Upload
```yaml
- name: artifact
image: alpine
environment:
<<: *environment
DROPAREA_HOST: vps.teletype.hu
DROPAREA_PORT: 2223
DROPAREA_TARGET_PATH: /home/drop
DROPAREA_USER: drop
DROPAREA_SSH_PASSWORD:
from_secret: droparea_ssh_password
commands:
- apk add --no-cache openssh-client sshpass
- mkdir -p /root/.ssh
- sshpass -p $DROPAREA_SSH_PASSWORD scp -o StrictHostKeyChecking=no -P $DROPAREA_PORT \
$GAME_NAME.$GAME_LANG \
$GAME_NAME.tic \
$GAME_NAME.html.zip \
$DROPAREA_USER@$DROPAREA_HOST:$DROPAREA_TARGET_PATH
```
**What it does:**
- Installs SCP tooling in a minimal Alpine container
- Uploads:
- Source file
- TIC-80 cartridge
- HTML export ZIP
- Uses secrets for SSH authentication
---
## Step 3: Update Notification
```yaml
- name: update
image: alpine
environment:
<<: *environment
UPDATE_SERVER: https://games.vps.teletype.hu
UPDATE_SECRET:
from_secret: update_secret_key
commands:
- apk add --no-cache curl
- curl "$UPDATE_SERVER/update?secret=$UPDATE_SECRET&name=$GAME_NAME&platform=tic80"
```
**What it does:**
- Sends an HTTP request to the update server
- Notifies that a new TIC-80 build is available
- Uses a secret key to authorize the update
---
## Result
After a successful run:
- The game is built and exported
- Artifacts are uploaded to the server
- The public game index is updated automatically
This pipeline enables **fully automated TIC-80 releases** using open tools and infrastructure.
# TIC-80 Makefile Project Builder
This Makefile provides a simple, reproducible workflow for building **TIC-80 Lua projects** from multiple source files. It is designed for small indie or experimental projects where the source code is split into logical parts and then merged into a single `.lua` cartridge.
---
## Overview
The workflow is based on four core ideas:
- Source code is split into multiple Lua files inside an `inc/` directory
- A project-specific `.inc` file defines the **build order**
- All source files are concatenated into one final `.lua` file
- TIC-80 is used in CLI mode to export runnable artifacts
This approach keeps the codebase modular while remaining compatible with TIC-80s single-file cartridge model.
---
## Project Structure
```text
project-root/
├── inc/
│ ├── core.lua
│ ├── player.lua
│ └── world.lua
├── mranderson.inc
├── Makefile
└── README.md
```
- `inc/` contains all Lua source fragments
- `<project>.inc` defines the order in which files are merged
- `<project>.lua` is generated automatically
---
## The `.inc` File
The `.inc` file is a **plain text file** listing Lua source files in build order:
```text
core.lua
player.lua
world.lua
```
The order matters. Files listed earlier are concatenated first and must define any globals used later.
---
## Usage
### Build (default)
```sh
make build
```
- Reads `mranderson.inc`
- Concatenates files from `inc/`
- Produces `mranderson.lua`
### Export (TIC-80)
```sh
make export
```
- Loads the generated Lua file into TIC-80 (CLI mode)
- Saves a `.tic` cartridge
- Exports an HTML build
### Export Assets
```sh
make export_assets
```
- **Purpose**: Extracts asset sections (PALETTE, TILES, SPRITES, MAP, SFX, MUSIC) from the compiled `<project>.lua` file.
- **Mechanism**: Uses `sed` to directly parse the generated `<project>.lua` and saves the extracted data into `inc/meta/meta.assets.lua`. This file can then be used to embed the asset data directly into other parts of the project or for version control of visual assets.
### Import Assets
The `import_assets` target was considered during development but is currently not part of the build workflow. Asset handling for TIC-80 projects within this Makefile relies solely on direct extraction (`export_assets`) from the built Lua cartridge, rather than importing external asset definitions. This target may be implemented in the future if a need for pre-build asset injection arises.
### Watch Mode
```sh
make watch
```
- Performs an initial build
- Watches the `inc/` directory and `.inc` file
- Rebuilds automatically on any change
Requires `fswatch` to be installed.
---
## Generated Artifacts
| File | Description |
|-----|-------------|
| `<project>.lua` | Merged Lua source (input for TIC-80) |
| `<project>.tic` | TIC-80 cartridge |
| `<project>.html` | Web export |
| `<project>.html.zip` | Packaged HTML build |
---
## Design Goals
- Keep TIC-80 projects modular
- Avoid manual copy-paste between files
- Enable fast iteration and experimentation
- Remain fully compatible with open-source tooling
This Makefile is intentionally minimal and transparent, favoring simplicity over abstraction.
---
## Requirements
- `make`
- `tic80` available in PATH
- `fswatch` (only for watch mode)
---
## License
MIT License — free to use, modify, and redistribute.