From fde39c38e8a5308c82853852fd37a5808dda50e6 Mon Sep 17 00:00:00 2001 From: Curtis Yarvin Date: Sun, 20 May 2018 16:07:28 -0700 Subject: [PATCH] Now ignoring ash/elm in foot. --- jets/f/ut_find.c | 11 +++++++++++ jets/f/ut_mint.c | 4 ++-- jets/f/ut_mull.c | 5 +++-- jets/f/ut_play.c | 4 ++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/jets/f/ut_find.c b/jets/f/ut_find.c index 9bde4ef06..73d251db6 100644 --- a/jets/f/ut_find.c +++ b/jets/f/ut_find.c @@ -234,6 +234,17 @@ u3k(qq_sut), u3k(rq_sut))); +#if 1 + if ( qpq_sut == c3__wet ) { + if ( u3h(qqu_zem) != c3__elm ) { + return u3m_error("wet-elm-mismatch"); + } + } else if ( qpq_sut == c3__dry ) { + if ( u3h(qqu_zem) != c3__ash) { + return u3m_error("dry-ash-mismatch"); + } + } else u3m_bail(c3__fail); +#endif pro = u3nt (c3y, u3nc(u3nc(u3_nul, u3k(axe)), u3k(lon)), diff --git a/jets/f/ut_mint.c b/jets/f/ut_mint.c index 01dbc0f40..aad286523 100644 --- a/jets/f/ut_mint.c +++ b/jets/f/ut_mint.c @@ -635,12 +635,12 @@ return _mint_cnts(van, sut, gol, p_gen, q_gen); } - case c3__brcn: p_gen = u3t(gen); + case c3__brcn: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun ruf = u3nc(u3_nul, 1); - ret = _mint_grow(van, sut, gol, c3__gold, u3_nul, c3__dry, ruf, p_gen); + ret = _mint_grow(van, sut, gol, c3__gold, p_gen, c3__dry, ruf, q_gen); u3z(ruf); return ret; diff --git a/jets/f/ut_mull.c b/jets/f/ut_mull.c index aeed15bc5..abc8ca3d4 100644 --- a/jets/f/ut_mull.c +++ b/jets/f/ut_mull.c @@ -70,6 +70,7 @@ u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); u3_noun gat = u3j_hook(von, "mile"); + // fprintf(stderr, "mile\r\n"); return u3n_kick_on(u3i_molt(gat, u3x_sam_2, u3k(dox), @@ -620,13 +621,13 @@ return _mull_cnts(van, sut, gol, dox, p_gen, q_gen); } - case c3__brcn: p_gen = u3t(gen); + case c3__brcn: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { u3_noun ruf = u3nc(u3_nul, 1); ret = _mull_grow - (van, sut, gol, dox, c3__gold, u3_nul, c3__dry, ruf, p_gen); + (van, sut, gol, dox, c3__gold, p_gen, c3__dry, ruf, q_gen); u3z(ruf); return ret; diff --git a/jets/f/ut_play.c b/jets/f/ut_play.c index 362a5a87b..f7face986 100644 --- a/jets/f/ut_play.c +++ b/jets/f/ut_play.c @@ -454,12 +454,12 @@ return _play_cnts(van, sut, p_gen, q_gen); } - case c3__brcn: p_gen = u3t(gen); + case c3__brcn: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { u3_noun ruf = u3nc(u3_nul, 1); u3_noun ret = _play_grow - (van, sut, c3__gold, u3_nul, c3__dry, ruf, p_gen); + (van, sut, c3__gold, p_gen, c3__dry, ruf, q_gen); u3z(ruf); return ret;