redscript-mc 1.2.28 → 1.2.30

package/README.md

@@ -2,14 +2,14 @@
 
 <img src="./logo.png" alt="RedScript Logo" width="64" />
 
-<img src="https://img.shields.io/badge/RedScript-1.2.27-red?style=for-the-badge&logo=minecraft&logoColor=white" alt="RedScript" />
+<img src="https://img.shields.io/badge/RedScript-1.2.29-red?style=for-the-badge&logo=minecraft&logoColor=white" alt="RedScript" />
 
 **A typed scripting language that compiles to Minecraft datapacks.**
 
 Write clean game logic. RedScript handles the scoreboard spaghetti.
 
 [![CI](https://github.com/bkmashiro/redscript/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/bkmashiro/redscript/actions/workflows/ci.yml)
-[![Tests](https://img.shields.io/badge/tests-918%20passing-brightgreen)](https://github.com/bkmashiro/redscript)
+[![Tests](https://img.shields.io/badge/tests-920%20passing-brightgreen)](https://github.com/bkmashiro/redscript)
 [![npm](https://img.shields.io/npm/v/redscript-mc?color=cb3837)](https://www.npmjs.com/package/redscript-mc)
 [![npm downloads](https://img.shields.io/npm/dm/redscript-mc?color=cb3837)](https://www.npmjs.com/package/redscript-mc)
 [![VSCode](https://img.shields.io/badge/VSCode-Extension-007ACC?logo=visualstudiocode)](https://marketplace.visualstudio.com/items?itemName=bkmashiro.redscript-vscode)
@@ -20,9 +20,11 @@ Write clean game logic. RedScript handles the scoreboard spaghetti.
 
 ### 🚀 [Try it online — no install needed!](https://redscript-ide.pages.dev)
 
-<img src="./demo.gif" alt="RedScript Demo" width="400" />
+<img src="./demo.gif" alt="RedScript Demo — math curves drawn with particles in Minecraft" width="520" />
 
-*↑ Particles spawning at player position every tick — 100% vanilla, no mods! Just 30 lines of RedScript with full control flow: `if`, `foreach`, `@tick`, f-strings, and more.*
+*↑ Five mathematical curves rendered in real-time with particles — 100% vanilla, no mods!*
+*`y = x·sin(x)` · `y = sin(x) + ½sin(2x)` · `y = e⁻ˣsin(4x)` · `y = tanh(2x)` · `r = cos(2θ)` rose curve*
+*Each curve is computed tick-by-tick using RedScript's fixed-point math stdlib.*
 
 </div>
 
@@ -32,34 +34,33 @@ Write clean game logic. RedScript handles the scoreboard spaghetti.
 
 RedScript is a typed scripting language that compiles to vanilla Minecraft datapacks. Write clean code with variables, functions, loops, and events — RedScript handles the scoreboard commands and `.mcfunction` files for you.
 
-**The demo above?** Just 30 lines:
+**The demo above?** Five math curves drawn with 64 sample points each. The core logic:
 
 ```rs
-let counter: int = 0;
-let running: bool = false;
-
-@tick fn demo_tick() {
-    if (!running) { return; }
-    counter = counter + 1;
-    
-    foreach (p in @a) at @s {
-        particle("minecraft:end_rod", ~0, ~1, ~0, 0.5, 0.5, 0.5, 0.1, 5);
-    }
-    
-    if (counter % 20 == 0) {
-        say(f"Running for {counter} ticks");
-    }
-}
+import "stdlib/math.mcrs"
 
-fn start() {
-    running = true;
-    counter = 0;
-    say(f"Demo started!");
-}
+let phase: int = 0;
+let frame: int = 0;
+
+// 5 curves cycle every 128 ticks (~6.5 s each)
+@tick fn _wave_tick() {
+    phase = (phase + 4) % 360;
+    frame = frame + 1;
+
+    let curve_id: int = (frame / 128) % 5;
+
+    // Compute sin at 9 column offsets (40° apart = full sine wave span)
+    let s0: int = sin_fixed((phase +   0) % 360);
+    let s1: int = sin_fixed((phase +  40) % 360);
+    // ... s2 through s8 ...
+
+    // Draw bar chart: each column height = sin value
+    // (64 fixed particle positions per curve, all respawned each tick)
+    if (curve_id == 0) { _draw_xsinx(); }
+    if (curve_id == 1) { _draw_harmonic(); }
+    // ...
 
-fn stop() {
-    running = false;
-    say(f"Demo stopped at {counter} ticks.");
+    actionbar(@a, f"§e  y = x·sin(x)   phase: {phase}°  center: {s0}‰");
 }
 ```
 

package/README.zh.md

@@ -2,14 +2,14 @@
 
 <img src="./logo.png" alt="RedScript Logo" width="64" />
 
-<img src="https://img.shields.io/badge/RedScript-1.2.27-red?style=for-the-badge&logo=minecraft&logoColor=white" alt="RedScript" />
+<img src="https://img.shields.io/badge/RedScript-1.2.29-red?style=for-the-badge&logo=minecraft&logoColor=white" alt="RedScript" />
 
 **一个编译到 Minecraft Datapack 的类型化脚本语言。**
 
 写干净的游戏逻辑，把记分板的面条代码交给 RedScript 处理。
 
 [![CI](https://github.com/bkmashiro/redscript/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/bkmashiro/redscript/actions/workflows/ci.yml)
-[![Tests](https://img.shields.io/badge/tests-918%20passing-brightgreen)](https://github.com/bkmashiro/redscript)
+[![Tests](https://img.shields.io/badge/tests-920%20passing-brightgreen)](https://github.com/bkmashiro/redscript)
 [![npm](https://img.shields.io/npm/v/redscript-mc?color=cb3837)](https://www.npmjs.com/package/redscript-mc)
 [![npm downloads](https://img.shields.io/npm/dm/redscript-mc?color=cb3837)](https://www.npmjs.com/package/redscript-mc)
 [![VSCode](https://img.shields.io/badge/VSCode-插件-007ACC?logo=visualstudiocode)](https://marketplace.visualstudio.com/items?itemName=bkmashiro.redscript-vscode)
@@ -20,9 +20,11 @@
 
 ### 🚀 [在线试用 — 无需安装！](https://redscript-ide.pages.dev)
 
-<img src="./demo.gif" alt="RedScript Demo" width="400" />
+<img src="./demo.gif" alt="RedScript Demo — 用粒子在 Minecraft 中绘制数学曲线" width="520" />
 
-*↑ 每 tick 在玩家位置生成粒子 — 纯原版，无需 MOD！仅 30 行 RedScript，包含完整控制流：`if`、`foreach`、`@tick`、f-strings 等。*
+*↑ 五条数学函数图像实时粒子渲染 — 纯原版，无需 MOD！*
+*`y = x·sin(x)` · `y = sin(x) + ½sin(2x)` · `y = e⁻ˣsin(4x)` · `y = tanh(2x)` · 玫瑰曲线 `r = cos(2θ)`*
+*每条曲线由 RedScript 定点数学库逐 tick 计算，64 个采样点动态绘制。*
 
 </div>
 
@@ -32,34 +34,32 @@
 
 RedScript 是一门编译到原版 Minecraft 数据包的脚本语言。用变量、函数、循环、事件写代码，RedScript 帮你生成记分板命令和 `.mcfunction` 文件。
 
-**上面的演示？** 只有 30 行：
+**上面的演示？** 五条数学曲线，每条 64 个采样点，核心逻辑：
 
 ```rs
-let counter: int = 0;
-let running: bool = false;
-
-@tick fn demo_tick() {
-    if (!running) { return; }
-    counter = counter + 1;
-    
-    foreach (p in @a) at @s {
-        particle("minecraft:end_rod", ~0, ~1, ~0, 0.5, 0.5, 0.5, 0.1, 5);
-    }
-    
-    if (counter % 20 == 0) {
-        say(f"已运行 {counter} ticks");
-    }
-}
+import "stdlib/math.mcrs"
 
-@keep fn start() {
-    running = true;
-    counter = 0;
-    say(f"Demo 已启动！");
-}
+let phase: int = 0;
+let frame: int = 0;
+
+// 5 条曲线每 128 tick (~6.5 秒) 自动切换
+@tick fn _wave_tick() {
+    phase = (phase + 4) % 360;
+    frame = frame + 1;
+
+    let curve_id: int = (frame / 128) % 5;
+
+    // 计算 9 列的 sin 值（每列相差 40°，刚好覆盖完整周期）
+    let s0: int = sin_fixed((phase +   0) % 360);
+    let s1: int = sin_fixed((phase +  40) % 360);
+    // ... s2 到 s8 ...
+
+    // 绘制图像：每条曲线有 64 个固定坐标粒子，每 tick 全部重绘
+    if (curve_id == 0) { _draw_xsinx(); }
+    if (curve_id == 1) { _draw_harmonic(); }
+    // ...
 
-@keep fn stop() {
-    running = false;
-    say(f"Demo 已停止，共运行 {counter} ticks。");
+    actionbar(@a, f"§e  y = x·sin(x)   phase: {phase}°  center: {s0}‰");
 }
 ```
 

package/dist/__tests__/cli.test.js

@@ -77,7 +77,7 @@ describe('CLI API', () => {
             const source = fs.readFileSync(mainPath, 'utf-8');
             const result = (0, index_1.compile)(source, { namespace: 'mygame', filePath: mainPath });
             const tickTimer = result.files.find(file => file.path.endsWith('/tick_timer.mcfunction'));
-            expect(tickTimer?.content).toContain('scoreboard players set #rs mygame.timer_ticks 1');
+            expect(tickTimer?.content).toContain('scoreboard players set #rs __mygame.timer_ticks 1');
         });
         it('adds a call-site hash for stdlib internal scoreboard objectives', () => {
             const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'redscript-stdlib-hash-'));
@@ -125,8 +125,8 @@ describe('CLI API', () => {
             const result = (0, index_1.compile)(source, { namespace: 'timernew', filePath: mainPath });
             expect(result.typeErrors).toEqual([]);
             const newFn = result.files.find(file => file.path.endsWith('/Timer_new.mcfunction'));
-            expect(newFn?.content).toContain('scoreboard players set timer_ticks timernew 0');
-            expect(newFn?.content).toContain('scoreboard players set timer_active timernew 0');
+            expect(newFn?.content).toContain('scoreboard players set timer_ticks __timernew 0');
+            expect(newFn?.content).toContain('scoreboard players set timer_active __timernew 0');
         });
         it('Timer.start/pause/reset', () => {
             const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'redscript-timer-state-'));
@@ -149,9 +149,9 @@ describe('CLI API', () => {
             const startFn = result.files.find(file => file.path.endsWith('/Timer_start.mcfunction'));
             const pauseFn = result.files.find(file => file.path.endsWith('/Timer_pause.mcfunction'));
             const resetFn = result.files.find(file => file.path.endsWith('/Timer_reset.mcfunction'));
-            expect(startFn?.content).toContain('scoreboard players set timer_active timerstate 1');
-            expect(pauseFn?.content).toContain('scoreboard players set timer_active timerstate 0');
-            expect(resetFn?.content).toContain('scoreboard players set timer_ticks timerstate 0');
+            expect(startFn?.content).toContain('scoreboard players set timer_active __timerstate 1');
+            expect(pauseFn?.content).toContain('scoreboard players set timer_active __timerstate 0');
+            expect(resetFn?.content).toContain('scoreboard players set timer_ticks __timerstate 0');
         });
         it('Timer.done returns bool', () => {
             const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'redscript-timer-done-'));
@@ -174,9 +174,9 @@ describe('CLI API', () => {
             expect(result.typeErrors).toEqual([]);
             const doneFn = result.files.find(file => file.path.endsWith('/Timer_done.mcfunction'));
             const mainFn = result.files.find(file => file.path.endsWith('/main.mcfunction'));
-            expect(doneFn?.content).toContain('scoreboard players get timer_ticks timerdone');
+            expect(doneFn?.content).toContain('scoreboard players get timer_ticks __timerdone');
             expect(doneFn?.content).toContain('return run scoreboard players get');
-            expect(mainFn?.content).toContain('execute if score $main_finished timerdone matches 1..');
+            expect(mainFn?.content).toContain('execute if score $main_finished __timerdone matches 1..');
         });
         it('Timer.tick increments', () => {
             const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'redscript-timer-tick-'));
@@ -199,10 +199,10 @@ describe('CLI API', () => {
                 .filter(file => file.path.includes('/Timer_tick'))
                 .map(file => file.content)
                 .join('\n');
-            expect(tickOutput).toContain('scoreboard players get timer_active timertick');
-            expect(tickOutput).toContain('scoreboard players get timer_ticks timertick');
-            expect(tickOutput).toContain(' += $const_1 timertick');
-            expect(tickOutput).toContain('execute store result score timer_ticks timertick run scoreboard players get $_');
+            expect(tickOutput).toContain('scoreboard players get timer_active __timertick');
+            expect(tickOutput).toContain('scoreboard players get timer_ticks __timertick');
+            expect(tickOutput).toContain(' += $const_1 __timertick');
+            expect(tickOutput).toContain('execute store result score timer_ticks __timertick run scoreboard players get $_');
         });
     });
     describe('compile()', () => {

package/dist/__tests__/optimizer-advanced.test.js

@@ -26,7 +26,7 @@ fn turret_tick() {
         const result = (0, index_1.compile)(source, { namespace: 'test' });
         const parent = getFileContent(result.files, 'data/test/function/turret_tick.mcfunction');
         const loopBody = getFileContent(result.files, 'data/test/function/turret_tick/foreach_0.mcfunction');
-        const hoistedRead = 'execute store result score $_0 test run scoreboard players get config test.turret_range';
+        const hoistedRead = 'execute store result score $_0 __test run scoreboard players get config test.turret_range';
         const executeCall = 'execute as @e[tag=turret] run function test:turret_tick/foreach_0';
         expect(parent).toContain(hoistedRead);
         expect(parent.indexOf(hoistedRead)).toBeLessThan(parent.indexOf(executeCall));
@@ -48,7 +48,7 @@ fn read_twice() {
         const fn = getFileContent(result.files, 'data/test/function/read_twice.mcfunction');
         const readMatches = fn.match(/scoreboard players get @s test\.coins/g) ?? [];
         expect(readMatches).toHaveLength(1);
-        expect(fn).toContain('scoreboard players operation $_1 test = $_0 test');
+        expect(fn).toContain('scoreboard players operation $_1 __test = $_0 __test');
     });
     test('reuses duplicate arithmetic sequences', () => {
         const source = `
@@ -63,9 +63,9 @@ fn math() {
 `;
         const result = (0, index_1.compile)(source, { namespace: 'test' });
         const fn = getFileContent(result.files, 'data/test/function/math.mcfunction');
-        const addMatches = fn.match(/\+= \$const_2 test/g) ?? [];
+        const addMatches = fn.match(/\+= \$const_2 __test/g) ?? [];
         expect(addMatches).toHaveLength(1);
-        expect(fn).toContain('scoreboard players operation $_1 test = $_0 test');
+        expect(fn).toContain('scoreboard players operation $_1 __test = $_0 __test');
     });
 });
 describe('setblock batching', () => {

package/dist/compile.d.ts

@@ -14,8 +14,9 @@ export interface CompileOptions {
     dce?: boolean;
     mangle?: boolean;
     /** Scoreboard objective used for all variable slots.
-     *  Defaults to 'rs'. Set to a unique value (e.g. 'mypack_rs') when loading
-     *  multiple RedScript datapacks simultaneously to avoid variable collisions. */
+     *  Defaults to '__<namespace>' (e.g. '__mathshow') — the double-underscore
+     *  prefix signals compiler-internal and avoids occupying the user's namespace.
+     *  Each datapack gets a unique objective automatically; no manual setup needed. */
     scoreboardObjective?: string;
     /** Additional source files that should be treated as *library* code.
      *  Functions in these files are DCE-eligible: they are only compiled into

package/dist/compile.js

@@ -212,7 +212,7 @@ function compile(source, options = {}) {
         // Configure scoreboard objective for this compilation.
         // Default: use the datapack namespace so each datapack gets its own objective
         // automatically, preventing variable collisions when multiple datapacks coexist.
-        const scoreboardObj = options.scoreboardObjective ?? namespace;
+        const scoreboardObj = options.scoreboardObjective ?? `__${namespace}`;
         (0, lowering_1.setScoreboardObjective)(scoreboardObj);
         // Lowering
         const ir = new lowering_1.Lowering(namespace, preprocessed.ranges).lower(ast);

package/dist/index.d.ts

@@ -17,9 +17,10 @@ export interface CompileOptions {
     filePath?: string;
     dce?: boolean;
     mangle?: boolean;
-    /** Scoreboard objective used for all variable slots (default: 'rs').
-     *  Set a unique value per datapack to avoid collisions when multiple
-     *  RedScript datapacks are loaded simultaneously. */
+    /** Scoreboard objective used for all variable slots.
+     *  Defaults to '__<namespace>' (e.g. '__mathshow') to avoid collisions when
+     *  multiple RedScript datapacks are loaded simultaneously, without occupying
+     *  the user's own namespace. Override only if you need a specific name. */
     scoreboardObjective?: string;
 }
 export interface CompileResult {

package/dist/index.js

@@ -69,7 +69,7 @@ function compile(source, options = {}) {
     // Configure scoreboard objective for this compilation.
     // Default: use the datapack namespace so each datapack gets its own objective
     // automatically, preventing variable collisions when multiple datapacks coexist.
-    const scoreboardObj = options.scoreboardObjective ?? namespace;
+    const scoreboardObj = options.scoreboardObjective ?? `__${namespace}`;
     (0, lowering_1.setScoreboardObjective)(scoreboardObj);
     // Lowering to IR
     const lowering = new lowering_1.Lowering(namespace, preprocessed.ranges);

package/dist/lexer/index.js

@@ -236,9 +236,17 @@ class Lexer {
             this.addToken('rel_coord', value, startLine, startCol);
             return;
         }
-        // Local coordinate: ^ or ^5 or ^-3 or ^0.5
+        // Local coordinate: ^ or ^5 or ^-3 or ^0.5 or ^varname (macro variable)
         if (char === '^') {
             let value = '^';
+            // Check for identifier (variable name for macro substitution, e.g. ^px, ^height)
+            if (/[a-zA-Z_]/.test(this.peek())) {
+                while (/[a-zA-Z0-9_]/.test(this.peek())) {
+                    value += this.advance();
+                }
+                this.addToken('local_coord', value, startLine, startCol);
+                return;
+            }
             // Check for optional sign
             if (this.peek() === '-' || this.peek() === '+') {
                 value += this.advance();

package/dist/lowering/index.js

@@ -495,16 +495,31 @@ class Lowering {
             }
         }
         // Set up NBT storage for each macro param
+        // float-typed params are stored as `double 0.01` so that an integer value N
+        // becomes N/100.0 in the command (e.g. scoreboard value 975 → NBT 9.75d → ^9.75)
         for (const macroParam of macroParamNames) {
             const paramIdx = params.findIndex(p => p.name === macroParam);
             if (paramIdx < 0 || paramIdx >= loweredArgs.length)
                 continue;
             const operand = loweredArgs[paramIdx];
+            const paramType = params[paramIdx]?.type;
+            const isFloat = paramType?.kind === 'named' && paramType.name === 'float';
             if (operand.kind === 'const') {
-                this.builder.emitRaw(`data modify storage rs:macro_args ${macroParam} set value ${operand.value}`);
+                if (isFloat) {
+                    const floatVal = (operand.value / 100).toFixed(6);
+                    this.builder.emitRaw(`data modify storage rs:macro_args ${macroParam} set value ${floatVal}d`);
+                }
+                else {
+                    this.builder.emitRaw(`data modify storage rs:macro_args ${macroParam} set value ${operand.value}`);
+                }
             }
             else if (operand.kind === 'var') {
-                this.builder.emitRaw(`execute store result storage rs:macro_args ${macroParam} int 1 run scoreboard players get ${operand.name} ${exports.LOWERING_OBJ}`);
+                if (isFloat) {
+                    this.builder.emitRaw(`execute store result storage rs:macro_args ${macroParam} double 0.01 run scoreboard players get ${operand.name} ${exports.LOWERING_OBJ}`);
+                }
+                else {
+                    this.builder.emitRaw(`execute store result storage rs:macro_args ${macroParam} int 1 run scoreboard players get ${operand.name} ${exports.LOWERING_OBJ}`);
+                }
             }
         }
         // Call with macro storage