urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-03 10:02:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'curt/retrofit-release'

Browse Source
This commit is contained in:
Anton Dyudin 2017-12-07 12:47:21 -08:00
commit cc9d8e3ebf
4 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/c/motes.h
View File

@ -85,6 +85,7 @@
# define c3__blog c3_s4('b','l','o','g')
# define c3__bloq c3_s4('b','l','o','q')
# define c3__blot c3_s4('b','l','o','t')
# define c3__blow c3_s4('b','l','o','w')
# define c3__blue c3_s4('b','l','u','e')
# define c3__blur c3_s4('b','l','u','r')
# define c3__bndl c3_s4('b','n','d','l')
@ -1235,8 +1236,10 @@
# define c3__zphs c3_s4('z','p','h','x')
# define c3__zphx c3_s4('z','p','h','x')
# define c3__zplc c3_s4('z','p','l','c')
# define c3__zpmc c3_s4('z','p','m','c')
# define c3__zpmt c3_s4('z','p','m','t')
# define c3__zpsg c3_s4('z','p','s','g')
# define c3__zpsk c3_s4('z','p','s','k')
# define c3__zpsm c3_s4('z','p','s','m')
# define c3__zptc c3_s4('z','p','t','c')
# define c3__zptm c3_s4('z','p','t','m')

35
jets/f/ut_mint.c
View File

@ -376,6 +376,7 @@
if ( (c3n == _mint_vet(van))
|| ((c3y == u3du(gen)) &&
((c3__zpfs == u3h(gen)) ||
(c3__zpsk == u3h(gen)) ||
(c3__lost == u3h(gen)) ||
(c3__fail == u3h(gen)) ||
(c3__zpzp == u3h(gen)))) )
@ -828,17 +829,28 @@
case c3__cold: p_gen = u3t(gen);
_mint_used();
{
u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0);
u3_noun gat = u3j_hook(von, "blow");
u3_noun pro;
pro = u3n_kick_on(u3i_molt(gat,
u3x_sam_2,
u3k(gol),
u3x_sam_3,
u3k(p_gen),
0));
return pro;
c3_m fun_m = 144 + c3__blow;
u3_noun vrf = u3r_at(u3qfu_van_vrf, van);
u3_noun pro = u3z_find_4(fun_m, vrf, sut, gol, p_gen);
if ( u3_none != pro ) {
return pro;
}
else {
u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0);
u3_noun gat = u3j_hook(von, "blow");
u3_noun pro;
pro = u3n_kick_on(u3i_molt(gat,
u3x_sam_2,
u3k(gol),
u3x_sam_3,
u3k(p_gen),
0));
return u3z_save_4(fun_m, vrf, sut, gol, p_gen, pro);
}
}
case c3__zpcm: u3x_cell(u3t(gen), &p_gen, &q_gen);
@ -864,7 +876,8 @@
return ret;
}
case c3__zpsm: u3x_cell(u3t(gen), &p_gen, &q_gen);
case c3__zpsm:
case c3__zpmc: u3x_cell(u3t(gen), &p_gen, &q_gen);
_mint_used();
{
u3_noun vos = _mint_in(van, sut, c3__noun, q_gen);

1
jets/f/ut_mull.c
View File

@ -777,6 +777,7 @@
return ret;
}
case c3__zpmc:
case c3__zpsm: u3x_cell(u3t(gen), &p_gen, &q_gen);
_mull_used();
{

1
jets/f/ut_play.c
View File

@ -525,6 +525,7 @@
return ret;
}
case c3__zpmc:
case c3__zpsm: u3x_cell(u3t(gen), &p_gen, &q_gen);
_play_used();
{