Skip to content

Open campaign window from finished campaign news#17677

Merged
Gymnasiast merged 3 commits into
OpenRCT2:developfrom
rik-smeets:start-new-campaign-from-news
Nov 18, 2022
Merged

Open campaign window from finished campaign news#17677
Gymnasiast merged 3 commits into
OpenRCT2:developfrom
rik-smeets:start-new-campaign-from-news

Conversation

@rik-smeets

@rik-smeets rik-smeets commented Aug 2, 2022

Copy link
Copy Markdown
Contributor

When a marketing campaign is finished, it is likely the player wants to renew it. This change allows the 'New campaign' window to be opened from the news item of the finished campaign, for the corresponding campaign type.

If that campaign has already been renewed, the finance window will open on the marketing tab (before, it was simply the finance window on the first tab).

Demo:
OpenRCT2 Open new campaign

Comment thread src/openrct2/management/NewsItem.h Outdated
@Gymnasiast Gymnasiast added the discussion Some input from team members is wanted. label Aug 2, 2022
@Gymnasiast

Copy link
Copy Markdown
Member

I think we should perhaps discuss if this is still within the spirit of RCT.

@IntelOrca

Copy link
Copy Markdown
Contributor

It would be handy if the default number of weeks retained the last campaign value.

@rik-smeets rik-smeets force-pushed the start-new-campaign-from-news branch from c9dc426 to f286915 Compare August 3, 2022 06:59
@rik-smeets

Copy link
Copy Markdown
Contributor Author

@Gymnasiast Sure! Just my two cents: for me personally, this is a change like many others in OpenRCT2 that increase usability and productivity. Like shops & stalls automatically facing the right direction when placing them next to path, or the way the guest window opens at a different tab and with a different view compared to vanilla RCT.

@IntelOrca I'll try to realize that whenever the discussion concludes that this is a welcome change.

@duncanspumpkin

Copy link
Copy Markdown
Contributor

I think this change is sensible and a good idea. Adding extra bits about repeating the length can be addressed in a different PR.

@rik-smeets rik-smeets force-pushed the start-new-campaign-from-news branch from f286915 to e1875cf Compare September 2, 2022 16:58
@rik-smeets

Copy link
Copy Markdown
Contributor Author

I made a minor update to the PR: I added a check that the campaign is not already running and if so, open the Finance window on the marketing tab. (Before, the Finance window was opened on the first tab.)

@rik-smeets rik-smeets force-pushed the start-new-campaign-from-news branch from e1875cf to 9fc44a8 Compare November 5, 2022 08:10
@rik-smeets rik-smeets changed the title Open new marketing campaign window from finished campaign news Open campaign window from finished campaign news Nov 5, 2022
@rik-smeets

rik-smeets commented Nov 5, 2022

Copy link
Copy Markdown
Contributor Author

I changed this so just the campaign window is opened. Before this PR, the summary tab of the Finance window was opened meaning you had to go to the campaign tab yourself.

Reasons for not immediately opening the detail window as stated in the OP:

  • More often than not, the player will have multiple campaigns running. Clicking on the button on the bottom toolbar for each one of them isn't very intuitive.
  • You'll also have to wait for the notification to clear or click it away yourself to get to the next one.
  • The new campaign window will most likely open far away from the bottom toolbar, unless the player just happens to have a lot of other windows open already, which is unlikely.
  • My earlier solution meant the button could do two things: open the detail window to start a new campaign of the type that was finished, or open the marketing tab on the finance window. This kind of inconsistent behavior can be confusing for users.

Well, long story short, this is now the result:
After

Simple, yet effective, I'd say.

@rik-smeets rik-smeets force-pushed the start-new-campaign-from-news branch from 9fc44a8 to 240dc9c Compare November 5, 2022 11:48
@IntelOrca

Copy link
Copy Markdown
Contributor

@rik-smeets rik-smeets force-pushed the start-new-campaign-from-news branch from 240dc9c to 10bc1df Compare November 5, 2022 15:12
@rik-smeets

Copy link
Copy Markdown
Contributor Author

You will also need to update plugin support:

Done! I've not touched plugin code before, but I believe this should be fine. Should the plugin version also be incremented though?

@IntelOrca

Copy link
Copy Markdown
Contributor

@rik-smeets As a practice yes, whether or not is needed for this - I don't know.

@rik-smeets rik-smeets force-pushed the start-new-campaign-from-news branch from 10bc1df to a259e73 Compare November 5, 2022 16:51
@rik-smeets

Copy link
Copy Markdown
Contributor Author

I updated the version @IntelOrca. Could you re-review, @Broxzier ?

Comment thread src/openrct2/interface/InteractiveConsole.cpp Outdated
Comment thread src/openrct2/management/Marketing.cpp Outdated
When a marketing campaign is finished, it is likely the player wants to renew it.
This change allows the 'New campaign' window to be opened from the news item of the finished campaign.
@rik-smeets rik-smeets force-pushed the start-new-campaign-from-news branch from a259e73 to e80ffe2 Compare November 5, 2022 17:02
@Gymnasiast Gymnasiast enabled auto-merge (squash) November 12, 2022 19:08
@Gymnasiast Gymnasiast added this to the v0.4.3 milestone Nov 12, 2022

@tupaschoal tupaschoal left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Seems like something broke on the rebase, can you take a look @rik-smeets ?

@rik-smeets rik-smeets force-pushed the start-new-campaign-from-news branch from 669afe0 to 3634890 Compare November 18, 2022 08:21
@rik-smeets rik-smeets added squash merge A PR that should be squashed on merge. and removed discussion Some input from team members is wanted. labels Nov 18, 2022
@Gymnasiast Gymnasiast merged commit 9688d93 into OpenRCT2:develop Nov 18, 2022
@rik-smeets rik-smeets deleted the start-new-campaign-from-news branch November 18, 2022 12:43
Gymnasiast added a commit that referenced this pull request Dec 14, 2022
- Feature: [#17782] The Flying Coaster now has access to boosters and can draw outside loops.
- Feature: [#17997] The Log Flume can now draw steep pieces down (if vehicle allows it).
- Feature: [#18312, objects#220, OpenSFX#13] New sound effects for the Hybrid and Single Rail roller coasters.
- Feature: [#18675] [Plugin] Plugins can refer to g2 image icons by name.
- Feature: [objects#173] Add alpine coaster vehicle.
- Feature: [objects#221] Add two extra jungle walls.
- Feature: [objects#225] Add log cabin roofs.
- Feature: [OpenMusic#14, OpenMusic#15, OpenMusic#18] Added Galaxy, Acid and Dodgems ride music styles.
- Improved: [#18013, #18016, #18018, #18019, #18514, objects#224] Added colour presets to Spiral Slide, Dodgems, Boat Hire, Flying Saucers, and Car Ride.
- Improved: [#18024] Clearer error messages when loading incompatible .park files.
- Improved: [#18192] Tycoon Park has been added to the Extras tab.
- Improved: [#18214] Competition scenarios have received their own section.
- Improved: [#18250] Added modern style file and folder pickers on Windows.
- Improved: [#18332] Allow Inverted Roller Coaster to draw boosters.
- Improved: [#18350] Changed ride vehicle list to have less padding.
- Improved: [#18422] Allow adding images to music objects.
- Improved: [#18428] [Plugin] Add widget description interfaces to documentation.
- Improved: [#18487] Mini Helicopters track can now draw spinning tunnels.
- Improved: [#18591] Order RollerCoaster Tycoon 2 scenarios by difficulty.
- Improved: [#18607] A new tab for all UCES Scenarios, if it’s installed.
- Improved: [#18621] OpenGL performance.
- Change: [#17677] Open campaign window from finished campaign news.
- Change: [#17998] Show cursor when using inverted mouse dragging.
- Change: [#18230] Make the large flat to steep pieces available on the corkscrew roller coaster without cheats.
- Change: [#18381] Convert custom invisible paths to the built-in ones.
- Change: [OpenSFX#11, OpenMusic#19] First implementation of official replacement asset packs for sound effects & music.
- Fix: [#1491] Clearance of the Cash Machine is too low (original bug).
- Fix: [#1519] “See-through rides” doesn't affect all rides (original bug).
- Fix: [#6341] “Unlock vehicle limits” does not allow setting fewer vehicles than the vehicle type requires.
- Fix: [#14312] Research ride type message incorrect.
- Fix: [#14425] Ride ratings do not skip unallocated ride ids.
- Fix: [#15969] Guests heading for ride use vanilla behaviour
- Fix: [#17067] Random Staff Patrol Area clicks.
- Fix: [#17316] Sides of River Rapids’ corners overlay other parts of the track.
- Fix: [#17657] When switching from buying land rights to buying construction rights, grid disables and won't re-enable afterwards.
- Fix: [#17763] Missing validation on invalid characters in file name.
- Fix: [#17853] Invention name tears while being dragged.
- Fix: [#18064] Unable to dismiss notification messages.
- Fix: [#18070] Underground entrance/exit shows through terrain walls (original bug).
- Fix: [#18094] Underground shops & facilities don't show when adjacent to non-underground path (original bug).
- Fix: [#18122] Ghosts count towards “Great scenery!” guest thought.
- Fix: [#18134] Underground on-ride photo section partially clips through adjacent terrain edge.
- Fix: [#18244] Invention DragWindow's starting position is inconsistent.
- Fix: [#18245] Guests stopping dead in their tracks at railway crossings.
- Fix: [#18257] Guests ‘waiting’ on extended railway crossings.
- Fix: [#18354] Overwrite alert does not show when save name has different casing on Windows.
- Fix: [#18379] Tunnel entrances for underground Mini Golf Hole E are not rendered correctly.
- Fix: [#18442] About window background is clickable.
- Fix: [#18449] [Plugin] Change type of listview widgets from 'scroll_view' to 'listview'.
- Fix: [#18453] Slow walking guests don't get across level crossings in time.
- Fix: [#18469] Land rights window buttons incorrectly disabled and markers remain visible indefinitely.
- Fix: [#18459] ‘Highlight path issues’ hides fences for paths with additions.
- Fix: [#18552] Trains clipping through helixes.
- Fix: [#18576] Cannot open parks with certain types of corrupt tile elements.
- Fix: [#18606] JSON objects do not take priority over the DAT files they supersede.
- Fix: [#18620] [Plugin] Crash when reading widget properties from windows that have both static and tab widgets.
- Fix: [#18653] Negative ratings multipliers do not appear in Vehicle tab.
- Fix: [#18696] Construction rights cannot be viewed after all are purchased.
- Fix: [#18720] Upwards helix is enabled for the Alpine Coaster, even when cheats are off.
- Fix: [#18755] Ferris Wheel and Circus ghosts not coloured correctly.
- Fix: [#18802] Game could crash when determining if a mechanic is heading to fix the ride blocking the path.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

squash merge A PR that should be squashed on merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants