Skip to content

Free games for graphing calculators: NumWorks, TI-Nspire CX, Casio fx-CG50 and soon TI-84 Plus CE. Balatro, Celeste, Hollow Knight, Minecraft and more.

NumBlocks.nwa: data file headers and a comment reworded

Mason3632bce05d30bee
diff --git a/games/numblocks/src/data.h b/games/numblocks/src/data.h
index 7109cb02..6056eea8 100644
--- a/games/numblocks/src/data.h
+++ b/games/numblocks/src/data.h
@@ -1,4 +1,4 @@
-/* Generated by tools/pack.py: textures and block tables (see data.c; NumBlocks.nwa: data_dims.c). */
+/* Made by tools/pack.py: textures and block tables (see data.c; NumBlocks.nwa: data_dims.c). */
#ifndef NB_DATA_H
#define NB_DATA_H
#include <stdint.h>
diff --git a/games/numblocks/src/data_dims.c b/games/numblocks/src/data_dims.c
index b8c4ac7b..996f2b55 100644
--- a/games/numblocks/src/data_dims.c
+++ b/games/numblocks/src/data_dims.c
@@ -1,4 +1,4 @@
-/* Generated by tools/pack.py from Minecraft 1.8.8's client.jar: textures and block tables. */
+/* Made by tools/pack.py from Minecraft 1.8.8's client.jar: textures and block tables. */
#include "data.h"
/* NumBlocks.nwa's, the Nether and the End too (NB_DIMS): in English only, so no T() here */
#define T(s) (s)
diff --git a/games/numblocks/src/mob_dims.h b/games/numblocks/src/mob_dims.h
index 92e15338..636ede7f 100644
--- a/games/numblocks/src/mob_dims.h
+++ b/games/numblocks/src/mob_dims.h
@@ -658,7 +658,7 @@ static void ender_tick(Entity *e) {
}
/* the dimensions' creatures each tick: the ones that are all theirs (true), or what the others do before
- * the zombie's AI runs */
+ * they go on as zombies do */
void dragon_tick(Entity *e); /* (end.c) */
static bool dims_tick(Entity *e) {
if (e->type == E_FIREBALL) {
diff --git a/games/numblocks/tools/pack.py b/games/numblocks/tools/pack.py
index 5c6296a8..d4148897 100644
--- a/games/numblocks/tools/pack.py
+++ b/games/numblocks/tools/pack.py
@@ -510,7 +510,8 @@ def generate(jar, dims):
NB, NI = ('B_N', 'IT_N') if dims else ('B_COUNT', 'N_ITEMS')
real = [st for st in S if not st['name'].startswith('UNUSED_')]
names, px, pals, flags = pack_textures(jar, real, PORTAL_FRAMES + ['@end_sky'] if dims else ())
- out = ['/* Generated by tools/pack.py from Minecraft 1.8.8\'s client.jar: textures and block tables. */',
+ out = ['/* Generated by tools/pack.py from Minecraft 1.8.8\'s client.jar: textures and block tables. */'
+ if not dims else '/* Made by tools/pack.py from Minecraft 1.8.8\'s client.jar: textures and block tables. */',
'#include "data.h"']
if dims:
out += ['/* NumBlocks.nwa\'s, the Nether and the End too (NB_DIMS): in English only, so no T() here */',
@@ -894,7 +895,7 @@ def main():
open(os.path.join(ROOT, 'src', 'data_dims.c'), 'w').write('\n'.join(dout) + '\n')
names, extra, first_gui, gui_names = info['names'], info['extra'], info['first_gui'], info['gui_names']
- h = ['/* Generated by tools/pack.py: textures and block tables (see data.c; NumBlocks.nwa: data_dims.c). */',
+ h = ['/* Made by tools/pack.py: textures and block tables (see data.c; NumBlocks.nwa: data_dims.c). */',
'#ifndef NB_DATA_H', '#define NB_DATA_H', '#include <stdint.h>', '#include "blocks.h"', '',
'#if NB_DIMS', f'#define NTEX {len(dinfo["names"])}', '#else', f'#define NTEX {len(names)}', '#endif',
'/* tex_flags: bits 0-4, the first palette index tinted by the biome (16: none); 0x20: has see-through texels */',