Skip to content

/Cataclysm-DDA

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Facility items 001 - making cement #9130

Merged
merged 9 commits into from Sep 22, 2014

Conversation

Reviewers
No reviews
Assignees

@KA101 KA101

Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@Aenye @KA101 @kevingranade
@Aenye
Copy link
Contributor

commented Sep 19, 2014

Adds all the items necessary for making cement,
Adds recipes for making quicklime and cement,
Makes limestone shards drop in mine storage and sand drop in fields,
Adds recipe for deconstruction of limestone shards to limestone.

Aenye added some commits Sep 19, 2014

@Aenye
Adds items for making cement 
Adds limestone shard, limestone, quicklime, sand and cement.
3d79ffd
@Aenye
Adds recipes for cement making 
Adds recipes for making quicklime out of limestone and cement out of quicklime and sand.
7848dcd
@Aenye
Adds limestone shard deconstruction 
Adds the recipe for deconstructing limestone shard into limestone.
eb61984
@Aenye
Adds drops for limestone shard and sand 
Makes sand drop in field (rare than rocks) and limestone shards drop in mine storage (equally often as rocks).
Loading status checks…
cb7fe93
data/json/items/melee.json Outdated
"name_plural" : "cement",
"symbol" : "=",
"color" : "dark_gray",
"description" : "Portland is most likely long gone, but it's memory persists in cement. This ubiquitous binder can be used for all kinds of advanced masonry. Just add water.",

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Sep 20, 2014

Contributor

its
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Sep 20, 2014

Betting MShock's reformat conflicted with this one*. Sorry, but I'll make sure this gets in. Concrete's the family business and we need it in DDA.

*And was wrong. Actually the canvas bags & sleeping stuff. Oops.

(Chiko had a mod for it a while back, but never pushed it to Git. :-( )

@KA101 KA101 added the (S2 - Confirmed) label Sep 20, 2014

data/json/items/melee.json Outdated
"type" : "AMMO",
"id" : "material_sand",
"category" : "spare_parts",
"price" : 5000,

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Sep 20, 2014

Contributor

Prices are in cents. You're asking $50 for that sand. ???
data/json/items/melee.json Outdated
"symbol" : "=",
"color" : "dark_gray",
"description" : "The product of burning limestone, this white powder is a crucial ingredient in making cement. That said, it is also extremely caustic and will cause severe burns to any tissue it comes in contact with. Could also be used to neutralise acid spills…",
"material" : "ceramic",

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Sep 20, 2014

Contributor

I'm seeing a lot of nonintuitive material selections here. Quicklime seems like a "powder".
data/json/items/melee.json Outdated
"category": "spare_parts",
"description": "A small shard of limestone. Pretty flimsy and not much of a weapon, but could be used to neutralise acid spills.",
"price": 1000,
"material": "steel",

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Sep 20, 2014

Contributor

Um. "stone" perhaps? (We'd probably want to strike that part about the acid, unless there's code to have it actually delete acids on its tile. Otherwise folks will complain.)

Aenye added some commits Sep 20, 2014

@Aenye
Updates facility items 
Updated prices and materials of new facility items (limestone/quicklime/sand/cement)
8bb4e3d
@Aenye
Update melee.json
Loading status checks…
6dcb553
@Aenye

This comment has been minimized.

Sign in to view
Copy link
Owner Author

commented on 6dcb553 Sep 20, 2014

Fixed the prices/materials and changed the descriptions to reflect the fact that there is no code (yet) for removal of acid.

Can't help but agree - there are no reasonable (cost-efficiency and performance wise) alternatives to cement/concrete. Wow ! I hope my cement works facility wasn't too bad of a representation of the actual place, then. I have some basics (worked on reinforcing concrete with fibers a few years back), but that's not much in comparison with your experience.

@Aenye Aenye changed the title Facility items 001 - making cement [CR] Facility items 001 - making cement Sep 20, 2014

@Aenye
Typo fix 
Fixes typo in material_cement description
Loading status checks…
24ca543

@Aenye Aenye referenced this pull request Sep 20, 2014

Merged

Facility buildings 001 - warehouse #9146

@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Sep 20, 2014

Family makes concrete batch plants. I'm not in the firm, though--grandfather split off from his brother. You probably know more than me.

@KA101 KA101 self-assigned this Sep 20, 2014

data/json/recipes/recipe_deconstruction.json Outdated
"id_suffix": "uncraft",
"category": "CC_NONCRAFT",
"subcategory": "CSC_NONCRAFT",
"time": 10000,

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Sep 21, 2014

Contributor

Was missing a difficulty line. Fixed in the merge.
data/json/recipes/recipe_deconstruction.json Outdated
},
{
"type" : "recipe",
"result": " material_shrd_limestone ",

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Sep 21, 2014

Contributor

No spaces please, it's a waste of good bytes. /Pinhead

(Yeah, the parser gets all kerflufflized about spaces. I missed the leading one on the first pass. If you're in something that actually gets parsed, don't use the space bar. For future reference: "//": "comment here", is the DDA method of writing parser-ignored comments into a JSON file.)
data/json/recipes/recipe_others.json Outdated
"components": [
[
[ "material_quicklime", 50 ],
[ "material_sand", 50 ]

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Sep 21, 2014

Contributor

Syntax issue here. These need to be separated out into each being their own bracket; currently, the parser thinks cement is either quicklime OR sand. Needs to be
[
[quicklime]
],
[
[sand]
]
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Sep 21, 2014

OK, for some reason the first handful of sand says (50) when you find it, but if you drop it you drop a sand (0). Not sure why. May have to put this back on hold (at which point I'll ask you to implement the fixes I've made in the merge process, sorry).
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Sep 21, 2014

Yeah. Sand wasn't fixable tonight. Sorry.

@KA101 KA101 removed their assignment Sep 21, 2014

@Aenye

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Sep 21, 2014

Ok, I'm on fixing the things you mentioned.

Aenye added some commits Sep 21, 2014

@Aenye
Fixes difficulty and spaces 
Implemented postulated fixes - added a deconstruction difficulty of 0 and removed the spaces in result id.
5b68338
@Aenye
Fixes cement recipe syntax 
Separates quicklime and sand to be (properly) different components in the cement recipe.
Loading status checks…
4d8105e
@Aenye

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Sep 21, 2014

Fixed. Will proofread sand code - I've probably missed something obvious.

Update: Couldn't find anything, so I cloned the branch with the last few fixes and tested (sorry for not doing this earlier !) - picking up and dropping work fine. Is ok.

@KA101 KA101 self-assigned this Sep 22, 2014

@KA101 KA101 merged commit 4d8105e into CleverRaven:master Sep 22, 2014
1 check failed

1 check failed

default Unmergeable pull request.

@kevingranade kevingranade removed the (S2 - Confirmed) label Sep 22, 2014

@Aenye Aenye deleted the Aenye:facility_items_001 branch Sep 22, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.