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

New weather #8218

Merged
merged 57 commits into from Jul 17, 2014

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
7 participants
@Efimero @Headjack @BevapDin @kevingranade @Zireael07 @KA101 @wito
@Efimero
Copy link
Contributor

commented Jul 12, 2014

Makes weather behave in a reasonable manner and be saved in just a single int.
Removes acid rain because there's no good way to implement it.
Removes the weather debug menu because it needs to change a lot, but is not really that necessary.
Old savefiles may experience a sudden weather change after loading due to the old weather stuff just being ignored completely and replaced by this.
Things that will need some testing:
Right now the weather is checked for every turn. In my machine this works fine, but lower end may experience slowness when waiting/crafting.
Large arrays of funnels left working in an unloaded chunk may cause lag when loaded again the longer they were left unloaded.
The radio station code that makes weather reports is completely untested. It is also totally accurate currently. No randomness added.

Efimero and others added some commits Jul 2, 2014

@Efimero
[WIP] New weather generator. 
Provides the essentials for a new weather generator that would give continuous, static pseudo-random procedural weather from a seed. First commit adds the main class that calculates the variables required (temperature, humidity, pressure) and a test function that outputs a csv file for plotting.
It is not yet plugged into the game, but the groundwork is there to replace the update_weather() function in game.cpp.
This is as of now not concerned with the gameplay aspects of weather or adding new weather types. Yet.
f0cef5d
@wito
Some cleanup
a89b12d
@wito
Updated Code::Blocks file
86a0fb9
@Efimero
Code cleanup
4967fe9
@wito
Eliminate redundant trigonometry
2bca1e3
@wito
return value cleanup
f4d2b3c
@wito
consting of the variabulls
6fbdc77
@wito
Struck invalid character
4dc39d5
@wito
initializer fix
2aa350b
@Efimero
Merge remote-tracking branch 'origin/pr/1' into new-weather 
Conflicts:
	src/weather_gen.cpp
783a9e8
@wito
Calendar extensions
40dbac3
@wito
further calendar extensions
3ebb006
@Efimero
Added weather condition function 
Added first draft of function to resolve a weather object to an in-game weather condition such as rain. Using the old weather enum for now.
d1c8e3f
@wito
Initializer fix
1a5806f
@Efimero
Merge remote-tracking branch 'origin/pr/1' into new-weather 
Conflicts:
	src/weather_gen.cpp
d07e423
@wito
Merge remote-tracking branch 'effin/new-weather' into new-weather-rework
caaadd6
@wito
Minor consistency fixes
748a0db
@Efimero
Merge pull request #1 from wito/new-weather-rework 
[WIP] Some cleanup
94a204a
@wito
clarifications
72bc78a
@wito
clarifications
521e26e
@Efimero
Merge pull request #2 from wito/new-weather-rework 
clarifications
b71ee9a
@Efimero
Swap Perlin for simplex 
Changes the noise generator library.
96c12b7
@Efimero
Remove unnecessary arithmetic.
60d00b9
@Efimero
Revert "Remove unnecessary arithmetic." 
This reverts commit 60d00b9.
694a023
@Efimero
Add simplex widening factors.
fb50377
@Efimero
Begin to modify game.cpp to include the new generator.
cae34a7
@Efimero
add weather initialization on new games
509713d
@Efimero
Changed the way things rot to be location aware.
8f4fe60
@Efimero
fix arguments order in get_rot_since
16cd5d0
@Efimero
Replace the weather forecast for something that uses the new weather … 
…generator. Needs to be refined.
5373782
@Headjack

This comment has been minimized.

Sign in to view
Copy link

commented Jul 12, 2014

We should probably keep acid rain. It's flavorful, appropriately dangerous, threatening, and useful.

Also, wasn't someone working on some kind of humidity map that was supposed to simulate appropriate weather?
@BevapDin

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 12, 2014

Impressive.

And this resolves all the acid rain related bugs (-;

I just recognized that this is at least the 3. place where the turns are normalized based on the season length. The other two are: plants that grow to the next stage when the submap gets loaded (map::loadn), and brewing / yeast producing.
@Efimero

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 12, 2014

Headjack: This is the thing that simulates appropriate weather. Since it simulates appropriate weather, acid rain is unappropriate always. I also like acid rain, but we discussed this and came to the conclusion that it will have to be a special weather caused by something else than the regular global weather. So that's why I left it out. It's not removed, just left asidefor now.

BevapDin: Thanks. I noticed the same thing. Also thought that rotting should also be somehow tied to season length, but I didn't include it here because it went way out of scope. =3
src/weather.cpp Outdated
@@ -520,73 +488,33 @@ std::string weather_forecast(radio_tower tower)
// Accumulate percentages for each period of various weather statistics, and report that
// (with fuzz) as the weather chances.
int weather_proportions[NUM_WEATHER_TYPES] = {0};

This comment has been minimized.

Sign in to view
Copy link
@kevingranade

kevingranade Jul 12, 2014

Member

unused now.
@kevingranade

This comment has been minimized.

Sign in to view
Copy link
Member

commented Jul 12, 2014

Longer term I want there to be a master time dilation factor that scales everything. If it's 1.0, things proceed at the speed they do in the real world, or our best approximation. Probably by default it'd be set to 0.2 or so, so things proceed much faster.

Efimero added some commits Jul 12, 2014

@Efimero
weather radio adjustments 
fired John; he was giving too precise weather reports
hired a blind weasel to make the weather reports; now they are appropriately innaccurate
Loading status checks…
df081ac
@Efimero
CB automatically re-sorted the new entries in the project file 
so we had a party
Loading status checks…
7968cb3
@Efimero
fixed rotting calculations 
things won't instantly rot anymore
some say this is a good thing
Loading status checks…
e1b6dd0
@Zireael07

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 13, 2014

I seem to recall there was a PR which implemented snow, but can't find it right now (poor connection). Do we have snow here?

@kevingranade : +infinity for master time factor.

Efimero added some commits Jul 13, 2014

@Efimero
don't forget newly created items 
we had a bad day the last time that happened
Loading status checks…
272d1e3
@Efimero
make food items active unless they're rotten 
this will ensure food actually rots each turn
food that never rots is bad for our business
4468053
@Efimero
properly fix the rotting stuff 
again
the first time wasn't good enough
it will need another fix to be sure
there are never enough fixes to be sure
Loading status checks…
946f873
@Efimero

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 13, 2014

Zireael07: I haven't touched anything related to the actual effects of weather besides funnels and food rotting. There's snow, but I don't think there's snow piles.

@KA101 KA101 merged commit e1f611c into CleverRaven:master Jul 17, 2014
1 check passed

1 check passed

default
Details

@Efimero Efimero deleted the Efimero:new-weather-funnels branch Jul 17, 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.