Skip to content
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

Installing gunmods takes time #37361

Merged
merged 1 commit into from Jan 30, 2020
Merged

Installing gunmods takes time #37361

merged 1 commit into from Jan 30, 2020

Conversation

snipercup
Copy link
Contributor

@snipercup snipercup commented Jan 24, 2020

Summary

SUMMARY: Content "Installing gunmods takes time"

Purpose of change

There was an unused JSON property noted as //install_time. It lost its function after some PR required it to be commented out. This PR brings that functionality back.

Describe the solution

Read the install_time property from the gunmod json and apply the stated time when entering the GUNMOD_ADD player activity.
Uncomment the properties in json.
There was no uninstall time prior to this PR because no install_time was loaded in. This PR removes some code that enables the passing of time when uninstalling a mod. This means no time passes when a gunmod is uninstalled. This should be added later in another PR. The reason this was removed is because uninstalling froze up the game. This is because it makes the game count down each turn and should be fixed by adding a proper player_activity.

Describe alternatives you've considered

Removing install_time from json.

Testing

image
Installing takes time, uninstalling does not
image
I tested mods that had their install_time noted as a string and also gunmods that have their install_time noted as an int.

Additional context

This is my first C++ contibution made possible by everyone in the dev-help channel and especially ralreegorganon!

@I-am-Erk I-am-Erk added [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON Items / Item Actions / Item Qualities Items and how they work and interact labels Jan 25, 2020
@Rivet-the-Zombie Rivet-the-Zombie merged commit b937983 into CleverRaven:master Jan 30, 2020
@snipercup snipercup deleted the Installing-gunmods-takes-time branch January 31, 2020 22:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants