Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upAdd water source long actions #9793
Conversation
This comment has been minimized.
This comment has been minimized.
|
Okay this looks like an excellent solution. |
Rivet-the-Zombie
self-assigned this
Nov 2, 2014
This comment has been minimized.
This comment has been minimized.
|
Yeah, this was the ideal solution. |
This comment has been minimized.
This comment has been minimized.
|
Takes almost a half an hour to fill a 55 gallon drum. |
This comment has been minimized.
This comment has been minimized.
|
It's an easy switch if you want me to change the rate (like, 4 lines). I was just basing the rate on KA101's earlier comments about how approximately 750 mL was the most he could get into a container in 6 seconds. |
This comment has been minimized.
This comment has been minimized.
|
You can go up to 10-12 and I won't complain too hard. I was operating on the presumption that we're still going through an opening that's about an inch and a half--when I've seen caps on drums, jerrycans, etc, they're not much larger than that. If you can take the entire top off the unit (I know you can with a 30-gal plastic drum, at least the ones I see on my commute) I'd agree that it would fill MUCH faster. I'll waive the argument about "pick it back up out of the water". ;-) |
This comment has been minimized.
This comment has been minimized.
|
There, fills at a rate of 10 per turn now, so a 55 gallon drum only takes 2 minutes. |
This comment has been minimized.
This comment has been minimized.
|
Does this really need two (nearly) identical functions? You can store any value (e.g. the liquid type) in |
This comment has been minimized.
This comment has been minimized.
|
Ah, I was unaware of str_values, if we've got something like that I can easily roll these together than. |
i2amroy
added some commits
Nov 2, 2014
Rivet-the-Zombie
added a commit
that referenced
this pull request
Nov 2, 2014
Rivet-the-Zombie
merged commit f142459
into
CleverRaven:master
Nov 2, 2014
1 check passed
This comment has been minimized.
This comment has been minimized.
|
Thanks for stepping up and making this i2amroy. I would adapt it for unloading and moving liquids in AIM later, but I am not sure what properties I have to pass for all possible liquids. |
kevingranade
reviewed
Nov 2, 2014
| @@ -1598,6 +1598,9 @@ void game::process_activity() | |||
| activity_on_finish(); | |||
| } | |||
| } while( u.moves > 0 && u.activity.type != ACT_NULL ); | |||
| // Cleanup | |||
| u.activity.values.clear(); | |||
This comment has been minimized.
This comment has been minimized.
kevingranade
Nov 2, 2014
Member
What are you trying to do here? This broke other activities very badly.
This comment has been minimized.
This comment has been minimized.
i2amroy
Nov 3, 2014
Author
Member
Breaking everything apparently. : /
This was originally just a quick fix that I cooked up while rather tired. I noticed some of the other activities cleared the various activity values, and some didn't, which seemed horribly inconsistent. Being as tired as I was I probably assumed that this was a good place to ensure that activity values from one activity didn't interfere with others. Wipe these lines if they are causing problems, but I'm a little busy with something else now that the weekend is done so I can't PR it up right now.
i2amroy commentedNov 2, 2014
Supplants #9760.
This adds two new long actions, one for filling containers from normal water sources and one from salt water sources. Water is added at a rate of 3 charges per turn and is cancelable just like any other long action.