New hinting system.

This commit is contained in:
Curtis Yarvin 2018-05-02 15:11:06 -07:00
parent 63ea041ecf
commit 2857861fd8
6 changed files with 13 additions and 21 deletions

View File

@ -301,7 +301,7 @@ J_F_OFILES=\
jets/f/flip.o \ jets/f/flip.o \
jets/f/flor.o \ jets/f/flor.o \
jets/f/fork.o \ jets/f/fork.o \
jets/f/help.o \ jets/f/hint.o \
jets/f/hike.o \ jets/f/hike.o \
jets/f/look.o \ jets/f/look.o \
jets/f/loot.o jets/f/loot.o

View File

@ -542,25 +542,13 @@
case c3__note: u3x_cell(u3t(gen), &p_gen, &q_gen); case c3__note: u3x_cell(u3t(gen), &p_gen, &q_gen);
_mint_used(); _mint_used();
{ {
u3_noun hit = u3nc(u3k(sut), u3k(p_gen));
u3_noun hum = _mint_in(van, sut, gol, q_gen); u3_noun hum = _mint_in(van, sut, gol, q_gen);
u3_noun ret = u3nc(u3qf_hint(p_gen, u3h(hum)), u3_noun ret = u3nc(u3qf_hint(hit, u3h(hum)),
u3k(u3t(hum))); u3k(u3t(hum)));
u3z(hum); u3z(hum);
return ret; u3z(hit);
}
case c3__docs: u3x_cell(u3t(gen), &p_gen, &q_gen);
_mint_used();
{
u3_noun hep = u3nc(c3__docs, u3k(p_gen));
u3_noun hum = _mint_in(van, sut, gol, q_gen);
u3_noun ret = u3nc(u3qf_hint(hep, u3h(hum)),
u3k(u3t(hum)));
u3z(hep);
u3z(hum);
return ret; return ret;
} }

View File

@ -525,9 +525,13 @@
_mull_used(); _mull_used();
{ {
u3_noun vat = _mull_in(van, sut, gol, dox, q_gen); u3_noun vat = _mull_in(van, sut, gol, dox, q_gen);
u3_noun ret = u3nc(u3qf_hint(p_gen, u3h(vat)), u3_noun hit = u3nc(u3k(sut), u3k(p_gen));
u3qf_hint(p_gen, u3t(vat))); u3_noun hix = u3nc(u3k(dox), u3k(p_gen));
u3_noun ret = u3nc(u3qf_hint(hit, u3h(vat)),
u3qf_hint(hix, u3t(vat)));
u3z(hix);
u3z(hit);
u3z(vat); u3z(vat);
return ret; return ret;
} }

View File

@ -382,8 +382,10 @@
_play_used(); _play_used();
{ {
u3_noun boc = _play_x(van, sut, q_gen); u3_noun boc = _play_x(van, sut, q_gen);
u3_noun ret = u3qf_hint(p_gen, boc); u3_noun hit = u3nc(u3k(sut), u3k(p_gen));
u3_noun ret = u3qf_hint(hit, boc);
u3z(hit);
u3z(boc); u3z(boc);
return ret; return ret;
} }

View File

@ -105,7 +105,6 @@ static u3j_core _143_hex_d[] =
static u3j_harm _143_pen_comb_a[] = {{".2", u3wf_comb}, {}}; static u3j_harm _143_pen_comb_a[] = {{".2", u3wf_comb}, {}};
static u3j_harm _143_pen_cons_a[] = {{".2", u3wf_cons}, {}}; static u3j_harm _143_pen_cons_a[] = {{".2", u3wf_cons}, {}};
static u3j_harm _143_pen_core_a[] = {{".2", u3wf_core}, {}}; static u3j_harm _143_pen_core_a[] = {{".2", u3wf_core}, {}};
static u3j_harm _143_pen_hint_a[] = {{".2", u3wf_hint}, {}};
static u3j_harm _143_pen_face_a[] = {{".2", u3wf_face}, {}}; static u3j_harm _143_pen_face_a[] = {{".2", u3wf_face}, {}};
static u3j_harm _143_pen_fitz_a[] = {{".2", u3wf_fitz}, {}}; static u3j_harm _143_pen_fitz_a[] = {{".2", u3wf_fitz}, {}};
static u3j_harm _143_pen_flan_a[] = {{".2", u3wf_flan}, {}}; static u3j_harm _143_pen_flan_a[] = {{".2", u3wf_flan}, {}};
@ -179,7 +178,6 @@ static u3j_core _143_pen_d[] =
{ "flip", _143_pen_flip_a }, { "flip", _143_pen_flip_a },
{ "flor", _143_pen_flor_a }, { "flor", _143_pen_flor_a },
{ "fork", _143_pen_fork_a }, { "fork", _143_pen_fork_a },
{ "hint", _143_pen_hint_a },
{ "hike", _143_pen_hike_a }, { "hike", _143_pen_hike_a },
{ "look", _143_pen_look_a }, { "look", _143_pen_look_a },
{ "loot", _143_pen_loot_a }, { "loot", _143_pen_loot_a },