1398 Commits

Author SHA1 Message Date
Aaron Suen
800301df84 Merge branch 'adobe' into dev 2020-04-05 16:07:45 -04:00
Aaron Suen
683d1b82ca Stylus etching, full cycle curing 2020-04-05 16:07:18 -04:00
Aaron Suen
babf5094b9 Rework wet concrete recipes 2020-04-05 15:31:16 -04:00
Aaron Suen
a3f03e16ad Fix adobe kneeding 2020-04-05 14:51:28 -04:00
Aaron Suen
734f4c8170 Less whimsical name for adobe mix 2020-04-05 14:50:03 -04:00
Aaron Suen
c7c31e27b0 Tarstone as single word like Sandstone 2020-04-05 14:49:21 -04:00
Aaron Suen
8082d4cd9c Fix some more pattern issues.
Left to do:
- Adjust wet->pliant curing recipe (maybe use soaking
  with ambient heat instead of cook/cool)
- Pliant->cured recipes/soaking.
- Stylus, pattern cycling recipes.
2020-04-05 14:45:52 -04:00
Aaron Suen
2ed399c379 More node appearance fixes. 2020-04-05 14:20:31 -04:00
Aaron Suen
a8bf644c95 More progress on patterns. 2020-04-05 12:50:02 -04:00
Aaron Suen
643885f070 Start work on importing Avicennia's nc_stucco
nc_concrete_pattern_* textures are derived from
Avicennia's original artwork.  Code is new, and processes
for stucco-working will be different.
2020-04-05 11:16:06 -04:00
Aaron Suen
2f8ffa4619 Darken bituminous stone more 2020-04-05 08:43:39 -04:00
Aaron Suen
4c7024adc2 Added 3 new artificial stone types
- Sandstone (from sand)
- Adobe (from dirt)
- Bituminous stone (from stone + coal)
2020-04-05 08:42:17 -04:00
Aaron Suen
13339b570a Restructure concrete, add multiple types. 2020-04-04 20:45:05 -04:00
Aaron Suen
6758904185 Switch from picking to chiseling for stone brick
Any chisel shape/temper is acceptable (bar/rod,
anneled/tempered)
2020-03-29 21:37:36 -04:00
Aaron Suen
5e4df4b1f0 No, wait, still need that dependency 2020-03-29 21:34:59 -04:00
Aaron Suen
e7d4d54b1c Genericize chisels, fix recipe digging
- Register groups for chiseling doors.
- Make recipe digging not use player inventory, but drop
  as an item unconditionally.  N.B. the old "replace with air
  then drop item" method only worked with explicit item
  names and not group detection.
2020-03-29 21:32:15 -04:00
Aaron Suen
7bc24b773f Drop rod chisel as an item instead
Instead of instantly digging the rod, which makes it look like
it disappeared, try just "loosening" it into an item so it can be
scooped up without the pick.

It was always also possible to place the rod as an item and
pound that in, making it easier to pick up, but this may not
have been obvious to most players.
2020-03-29 21:23:45 -04:00
Aaron Suen
98b7e21533 After chiseling a door, automatically dig rod
Also adds the ability to register recipes to automatically
attempt to dig a node upon completion.
2020-03-29 21:18:40 -04:00
Aaron Suen
7107d29768 Register metal groups for modding 2020-03-29 21:11:41 -04:00
Aaron Suen
c6cabca0e9 Stone bricks by WintersKnight94
- Original texture by WintersKnight94.
- Node definitions and recipes adapted from original.
- Added some hooks in a few other places to make new
  recipes work.

- Chip smooth stone with a lode pick or better to make brick.
- Bricks fall but don't repose.
- Apply mortar (wet aggregate) to bond stone bricks
- Bonded bricks can be moved but don't fall anymore.
2020-03-29 20:55:55 -04:00
Aaron Suen
48473ea34c A little tighter "airlike" detection. 2020-03-29 20:05:11 -04:00
Aaron Suen
0012c2673b More scaling time definitions
Also, scaling_time completely overrides
group-based scaling time logic.
2020-03-29 08:13:41 -04:00
Aaron Suen
1c612ee1f7 Cobbley group, generic scaling factors by group 2020-03-29 08:05:13 -04:00
Aaron Suen
f37a918f0f Scaling and touch-hurt reforms
- Storeboxes are now scalable.
- Standardize touch-hurt operation.
- Touch-hurt damage on scaling.
- Now possible to alter scaling time via scaling_time
  group (percent of original scaling time)
2020-03-29 07:55:54 -04:00
Aaron Suen
f0523881e9 Include CDB screenshots in repo
Hopefully CDB screenshot uploading will be coming
soon to cdbrelease...
2020-03-28 10:24:33 -04:00
Aaron Suen
c149f97614 Merge branch 'master' into dev 2020-03-28 08:53:46 -04:00
Aaron Suen
b029658a9d More registration fixes 2020-03-28 08:53:35 -04:00
Aaron Suen
089e09b717 Fix missing alpha title, update meta api 2020-03-28 08:46:54 -04:00
Aaron Suen
51977d5a0d Fix missing alpha title. 2020-03-28 08:15:34 -04:00
Aaron Suen
c1d7de2af9 Exclude more things from export
New CDB will do a checkout before overwriting it
with an export so it can see all files, including
excluded ones, for pulling CDB config.
2020-03-28 07:08:56 -04:00
Aaron Suen
5283972cf8 Merge branch 'master' into dev 2020-03-28 06:49:42 -04:00
Aaron Suen
4466d18810 Backport new CDB metadata from dev 2020-03-28 06:48:57 -04:00
Aaron Suen
248a4e4cf7 Metadata file lexical proximity 2020-03-28 06:46:31 -04:00
Aaron Suen
f4425c7e4e New cdbrelease metadata format. 2020-03-27 23:46:40 -04:00
Aaron Suen
9babd8a5f4 Update chat links in CDB metadata 2020-03-27 20:56:43 -04:00
Aaron Suen
9483078eee More metadata updates... 2020-03-27 19:16:12 -04:00
Aaron Suen
5c68013dc6 Include metadata for alpha too. 2020-03-27 19:03:04 -04:00
Aaron Suen
c2d8ae405a Embed cdb metadata. 2020-03-27 18:37:40 -04:00
Aaron Suen
f203f4a01d Replace discord invite link.
New link points to the #rules channel for new users.
2020-03-27 18:37:16 -04:00
Aaron Suen
397e9f5072 Translation updates. 2020-03-27 07:11:56 -04:00
Aaron Suen
d4a2c74425 Add message about misleading debug info. 2020-03-27 07:07:27 -04:00
Aaron Suen
afa36f1236 Standardize obj property setting.
This should more reliably minimize network traffic
incurred by excess property setting.

We could probably standardize a few more things,
like set attach, anim, yaw, pos...
2020-03-25 09:20:37 -04:00
Aaron Suen
dfa8615200 Revert "Remove descritption from injury/burn."
This reverts commit 4a13733e68903904e088fe21d86dec6d927ee7d8.

While I'm still not happy with the desciptions, we probably need
some sensible way to talk about these in chat, wikis, etc.
2020-03-25 08:58:31 -04:00
Aaron Suen
c62dc70194 Move hint completion from chat to HUD 2020-03-25 08:49:55 -04:00
Aaron Suen
e7846c9348 Refac HUD api, reduce chat_send usage 2020-03-25 08:49:34 -04:00
Aaron Suen
4a13733e68 Remove descritption from injury/burn.
This always felt kinda redundant and the names
themselves never seemed all that great.

For Lux Burns in particular, I'd rather the radiation
symbol speak for itself.
2020-03-24 00:06:38 -04:00
Aaron Suen
b581769965 Fix unoptimized textures 2020-03-22 21:39:05 -04:00
Aaron Suen
7c623da9cc Another bandolier visual update
Show the sel slot after all, since it balances
out an empty bandolier.
2020-03-22 21:38:43 -04:00
Aaron Suen
8864d30556 Fix bandolier slot visuals.
Alpha blending is apparently broken for
upright_sprite as of the latest v5.2-dev.

Use a simpler, more solid texture for
empty bandolier slots that looks a bit
more reminiscent of a stitched-on pocket
but still abstract.

Just hide selected slot altogether instead
of showing an alternate "selected slot"
texture.
2020-03-22 21:33:54 -04:00
Aaron Suen
f2455c28f2 Stop entities falling of the bottom of the map. 2020-03-22 14:06:23 -04:00