Skip to content

Global glaciation event#5974

Merged
hhyyrylainen merged 43 commits intomasterfrom
GlobalGlaciationEvent
Mar 26, 2025
Merged

Global glaciation event#5974
hhyyrylainen merged 43 commits intomasterfrom
GlobalGlaciationEvent

Conversation

@Patryk26g
Copy link
Contributor

@Patryk26g Patryk26g commented Mar 2, 2025

Brief Description of What This PR Does

Adds global glaciation event. Still needs the new icon and translation files

Progress Checklist

Note: before starting this checklist the PR should be marked as non-draft.

  • PR author has checked that this PR works as intended and doesn't
    break existing features:
    https://wiki.revolutionarygamesstudio.com/wiki/Testing_Checklist
    (this is important as to not waste the time of Thrive team
    members reviewing this PR)
  • Initial code review passed (this and further items should not be checked by the PR author)
  • Functionality is confirmed working by another person (see above checklist link)
  • Final code review is passed and code conforms to the
    styleguide.

Before merging all CI jobs should finish on this PR without errors, if
there are automatically detected style issues they should be fixed by
the PR author. Merging must follow our
styleguide.

@github-project-automation github-project-automation bot moved this to In progress in Thrive Planning Mar 2, 2025
@Patryk26g Patryk26g marked this pull request as draft March 2, 2025 21:09
@hhyyrylainen hhyyrylainen added this to the Release 0.8.2 milestone Mar 3, 2025
Copy link
Member

@hhyyrylainen hhyyrylainen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I started commenting and ended up doing an almost full review... though once I saw this major architecture problem I stopped as I think that needs to be the first thing to be actually fixed before it makes sense to polish the rest of the code.

@Patryk26g Patryk26g marked this pull request as ready for review March 8, 2025 20:51
# Conflicts:
#	locale/af.po
#	locale/ar.po
#	locale/be.po
#	locale/bg.po
#	locale/bn.po
#	locale/ca.po
#	locale/cs.po
#	locale/da.po
#	locale/de.po
#	locale/el.po
#	locale/en.po
#	locale/eo.po
#	locale/es.po
#	locale/es_AR.po
#	locale/et.po
#	locale/fi.po
#	locale/fr.po
#	locale/frm.po
#	locale/gsw.po
#	locale/he.po
#	locale/hr.po
#	locale/hu.po
#	locale/id.po
#	locale/it.po
#	locale/ja.po
#	locale/ka.po
#	locale/ko.po
#	locale/la.po
#	locale/lb_LU.po
#	locale/lt.po
#	locale/lv.po
#	locale/messages.pot
#	locale/mk.po
#	locale/nb_NO.po
#	locale/nl.po
#	locale/nl_BE.po
#	locale/pl.po
#	locale/pt_BR.po
#	locale/pt_PT.po
#	locale/ro.po
#	locale/ru.po
#	locale/si_LK.po
#	locale/sk.po
#	locale/sr_Cyrl.po
#	locale/sr_Latn.po
#	locale/sv.po
#	locale/th_TH.po
#	locale/tok.po
#	locale/tr.po
#	locale/tt.po
#	locale/uk.po
#	locale/vi.po
#	locale/zh_CN.po
#	locale/zh_TW.po
@Patryk26g Patryk26g mentioned this pull request Mar 18, 2025
4 tasks
@Patryk26g
Copy link
Contributor Author

@hhyyrylainen does this PR need any other work besides master merge? Or is it ready to be merged in your opinion?

@hhyyrylainen
Copy link
Member

Does this yet have the fix for multiple events being able to start and stop at different times and still be able to correctly restore the old state?

I was kind of waiting for that change to be done before reviewing the code again. Sorry if I missed it being added already.

@Patryk26g
Copy link
Contributor Author

I thought that we came to conclusion in previous comments that such system would come in another PRs with more events as now it is not needed. And I changed the glaciation event a little bit in my meteor event PR to be able to work properly with that one so that previous states would be restored properly

@hhyyrylainen
Copy link
Member

I got the opposite impression, that you wanted to prepare for the meteor event in this PR, oops.

I guess I can re-review this PR, but if there is still the problem here that it cannot restore stuff correctly, I'll ask for changes here.

@Patryk26g
Copy link
Contributor Author

It restores the state correctly and the PR is ready for review

@hhyyrylainen
Copy link
Member

Okay, I reviewed this again. I think I noticed one bug but other than that there's just some code cleanliness stuff I commented on.

Patryk26g and others added 4 commits March 21, 2025 19:49
# Conflicts:
#	locale/af.po
#	locale/ar.po
#	locale/be.po
#	locale/bg.po
#	locale/bn.po
#	locale/ca.po
#	locale/cs.po
#	locale/da.po
#	locale/de.po
#	locale/el.po
#	locale/en.po
#	locale/eo.po
#	locale/es.po
#	locale/es_AR.po
#	locale/et.po
#	locale/fi.po
#	locale/fr.po
#	locale/frm.po
#	locale/gsw.po
#	locale/he.po
#	locale/hr.po
#	locale/hu.po
#	locale/id.po
#	locale/it.po
#	locale/ja.po
#	locale/ka.po
#	locale/ko.po
#	locale/la.po
#	locale/lb_LU.po
#	locale/lt.po
#	locale/lv.po
#	locale/messages.pot
#	locale/mk.po
#	locale/nb_NO.po
#	locale/nl.po
#	locale/nl_BE.po
#	locale/pl.po
#	locale/pt_BR.po
#	locale/pt_PT.po
#	locale/ro.po
#	locale/ru.po
#	locale/si_LK.po
#	locale/sk.po
#	locale/sr_Cyrl.po
#	locale/sr_Latn.po
#	locale/sv.po
#	locale/th_TH.po
#	locale/tok.po
#	locale/tr.po
#	locale/tt.po
#	locale/uk.po
#	locale/vi.po
#	locale/zh_CN.po
#	locale/zh_TW.po
#	src/macroscopic_stage/editor/MacroscopicEditor.cs
#	src/microbe_stage/editor/MicrobeEditor.cs
#	src/multicellular_stage/editor/MulticellularEditor.cs
Copy link
Member

@hhyyrylainen hhyyrylainen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was doing final testing and I noticed a bug. The glaciation events per patch are put in the global timeline and not the patch local timelines. So this is incorrect:

2025-03-24_10 09 20 5378

The patch local timelines list "Global glaciation event" already so I think that is fine, just need to remove that huge spam of events from the global timeline.

Copy link
Member

@hhyyrylainen hhyyrylainen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the event log change this should be perfect now. I'll assume from the code change that it works without re-testing.

@hhyyrylainen hhyyrylainen merged commit b9cee2a into master Mar 26, 2025
4 checks passed
@hhyyrylainen hhyyrylainen deleted the GlobalGlaciationEvent branch March 26, 2025 08:37
@github-project-automation github-project-automation bot moved this from In progress to Done in Thrive Planning Mar 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants