Turn in the Mini Project 4 #6
Conversation
…ort.py can implement the function inside it.
Country.py
Outdated
| other.infected_pop = 1 | ||
|
|
||
|
|
||
| background_color = (255,255,255) |
There was a problem hiding this comment.
Usually, global variables are defined before any other code is written - but this doesn't affect the rest of your code in any way.
There was a problem hiding this comment.
By convention, global variables are capitalized e.g. BACKGROUND_COLOR.
|
|
||
| intro = True | ||
|
|
||
| while intro: |
There was a problem hiding this comment.
It would be nice to put the game intro, main loop, and ending is separate functions that you can call at the appropriate times. This helps with code organization.
Country.py
Outdated
|
|
||
| upgrades = 0 | ||
|
|
||
| """ Pressing C will officially start the game running our |
There was a problem hiding this comment.
The main game loop should be inside its own function.
Country.py
Outdated
| time = 0 | ||
| Upgrade_Point = 0 | ||
| infectionindex = 1 | ||
| """ This is the counter to allow you to |
There was a problem hiding this comment.
You don't need multiline comments here - inline comments will suffice.
Country.py
Outdated
| pygame.init() | ||
| font = pygame.font.SysFont('Consolas', 20) | ||
|
|
||
| class Country: |
There was a problem hiding this comment.
This class could be put into its own file and imported.
|
|
||
| pygame.display.update() | ||
|
|
||
| screen = pygame.display.set_mode((640, 480)) |
There was a problem hiding this comment.
All of this setup code could go into a setup() function.
| country.infected_pop = country.infected_pop + 1 | ||
| infectionindex = infectionindex - 1 | ||
| country_pop_index = country | ||
| """now our pathogen embarks on infection!""" |
There was a problem hiding this comment.
Use inline comments (like this: # this is a comment) instead of multiline comments in this case .
| print (country.infected_rate) | ||
|
|
||
| #increase kill rate | ||
| if event.key == pygame.K_k: |
There was a problem hiding this comment.
A lot of this code could be refactored so it's easier to read.
There was a problem hiding this comment.
One guideline is the number of lines of a section of code, and how many different things it's doing. When you find yourself labeling a subsection as to what it does, this is a sign that this section of code could be pulled out into a separate function. Doing this gives you something to name, and document, and potentially test.
| Subeen Kim | ||
| """ | ||
|
|
||
| class country: |
There was a problem hiding this comment.
By convention, class names are capitalized (Country).
| """return integer part of infected population""" | ||
| # return int(self.infected_pop) | ||
|
|
||
| """return probability""" |
There was a problem hiding this comment.
For comments that are inside a function and describe the inside view how some lines of code work (as opposed to docstrings, that are at the top and describe the outside view of what the whole function does), use # comments instead of """doc strings""".
Country.py
Outdated
|
|
||
| Time = 0 | ||
| time = 0 | ||
| Upgrade_Point = 0 |
There was a problem hiding this comment.
By convention, variables whose values change (variables that are not constants) are all lowercase.
Country.py
Outdated
| Then the infected population and maximum population will be reduced as many as the number of people death. | ||
| """ | ||
| death_pop = 0 | ||
| alive_pop = self.max_pop | ||
| if self.infected_ratio() > 0.10: | ||
| if self.infected_pop > 10: | ||
| if self.infected_ratio() > 0.10: #ratios are arbitrarily selected |
There was a problem hiding this comment.
It's recommended that you give constants a name and capitalize them. self.infected_ratio() > THRESHOLD.
Also, it's common practice to make a config class that contains all these arbitrary values
Country.py
Outdated
| @@ -208,12 +226,23 @@ def propagation(self, other): | |||
| """Modify Time + XXXX to modify the speed of the game.""" | |||
| if pygame.time.get_ticks() > (Time + 1000): | |||
| Time = pygame.time.get_ticks() | |||
| """ If population == 0 then game is over""" | |||
| if all(country.max_pop == 0 for country in countries) == True: | |||
| running = False | |||
| endscreen = True | |||
| #print ('For each country: (infected ratio, total population)', (country1.infected_ratio(),country1.max_pop), (country2.infected_ratio(),country2.max_pop), (country3.infected_ratio(),country3.max_pop)) | |||
There was a problem hiding this comment.
I suggest removing print statements and logs before submitting pull requests (in the future)
Country.py
Outdated
| @@ -208,12 +226,23 @@ def propagation(self, other): | |||
| """Modify Time + XXXX to modify the speed of the game.""" | |||
| if pygame.time.get_ticks() > (Time + 1000): | |||
| Time = pygame.time.get_ticks() | |||
| """ If population == 0 then game is over""" | |||
There was a problem hiding this comment.
I suggest using inline comments # if the population is zero, then game is over if the comments can be kept brief.
Sorry for late pull request
Please review our country.py file.