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

[v2.0] Operator Interactions, Lights, & Sounds Update #2

Merged
merged 43 commits into from
Mar 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
b4f3620
General Cleanup
lilkingjr1 Jul 26, 2023
de3cf4d
[Hotfix] Use default versions for CI
lilkingjr1 Jul 27, 2023
f467e13
[Hotfix] Use latest versions for CI
lilkingjr1 Jul 27, 2023
e37d59c
[Hotfix] Use master branches for CI
lilkingjr1 Jul 27, 2023
8c4015a
Reorganize Materials/Textures
lilkingjr1 Jul 27, 2023
228384d
Merge branch 'reorginize-materials-textures' into dev
lilkingjr1 Jul 27, 2023
966cf51
Update Labels to use User Textures
lilkingjr1 Jul 27, 2023
dd29c98
Update Placards to use User Textures
lilkingjr1 Jul 28, 2023
fd3e97d
Enumerate Texture Options
lilkingjr1 Jul 29, 2023
7e32563
Fix Scripts' Formatting
lilkingjr1 Jan 4, 2024
3357895
Add Button Interactions (Sprint 1)
lilkingjr1 Jan 13, 2024
aeb20a8
Add Button Interactions (Sprint 2)
lilkingjr1 Mar 3, 2024
1e69e9b
"Mode" -> "Function" for Buttons
lilkingjr1 Mar 3, 2024
1b947e0
Push Button (Mushroom) Update
lilkingjr1 Mar 3, 2024
d61c115
Update Push Button (Shielded).nl2sco
lilkingjr1 Mar 3, 2024
6e84794
Update Push Button (Flat)
lilkingjr1 Mar 3, 2024
534652e
Fix Script Parameter Typos
lilkingjr1 Mar 3, 2024
c944c06
Add PushButtonMushroom.nlvm
lilkingjr1 Mar 3, 2024
37c6594
Update all E-Stop Buttons
lilkingjr1 Mar 3, 2024
e63dad5
Reorganize Object Scripts
lilkingjr1 Mar 3, 2024
c87e54a
Add Switch Interactions & Refactor
lilkingjr1 Mar 6, 2024
f188acd
Add Key Switch Interactions
lilkingjr1 Mar 6, 2024
5c2d014
Update .gitignore
lilkingjr1 Mar 6, 2024
44ad927
Merge branch 'add-operator-interactions' into dev
lilkingjr1 Mar 6, 2024
008bd0d
util.SceneObjectTools Refactor
lilkingjr1 Mar 6, 2024
50bc88e
Update Pilot Light & Small Fixes
lilkingjr1 Mar 6, 2024
e136da7
Update Pilot Light (4-Way)
lilkingjr1 Mar 7, 2024
d6d84b5
Fix static Function bug for extended classes
lilkingjr1 Mar 7, 2024
a040f77
Add Pilot light sources & update Pilot Light (Stack)
lilkingjr1 Mar 8, 2024
498b404
Add Push Button light sources
lilkingjr1 Mar 9, 2024
1983e7f
Update build-dev-release.yml
lilkingjr1 Mar 9, 2024
3fc5288
Update build-dev-release.yml
lilkingjr1 Mar 9, 2024
e0a6a36
Update build-dev-release.yml
lilkingjr1 Mar 9, 2024
81f8d93
Improve key holes on models
lilkingjr1 Mar 11, 2024
695f743
Minor SCO script parameter improvements
lilkingjr1 Mar 11, 2024
3073a97
Add operator sound effects & small improvements
lilkingjr1 Mar 12, 2024
b83d5c3
Quality Check #1
lilkingjr1 Mar 15, 2024
5eaed98
Quality Check 2
lilkingjr1 Mar 16, 2024
800d3e9
Updated README.html & LICENSE
lilkingjr1 Mar 16, 2024
03ac759
Update Steam Description.txt
lilkingjr1 Mar 16, 2024
ae9f8af
Update to support Scripted Operation Mode
lilkingjr1 Mar 17, 2024
5dd5a74
Update Overview image & hotfix PilotLightStack
lilkingjr1 Mar 17, 2024
0c13cf7
Quality Check 3
lilkingjr1 Mar 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 6 additions & 10 deletions .github/workflows/build-dev-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,17 @@ jobs:
name: Build Development Pre-Release
runs-on: ubuntu-latest
steps:
- name: Check out branch
uses: actions/checkout@v3
- name: Delete existing tag and release
uses: dev-drprasad/delete-tag-and-release@v0.2.0
uses: dev-drprasad/delete-tag-and-release@v1.0
with:
delete_release: true # default: false
tag_name: v.${{ github.ref_name }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
github_token: ${{ secrets.GITHUB_TOKEN }}
delete_release: true
continue-on-error: true
- name: Create release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: softprops/action-gh-release@master
with:
tag_name: v.${{ github.ref_name }} # Tag name CANNOT equal branch name
release_name: Development Build (Unpackaged)
name: Development Build (Unpackaged)
target_commitish: "dev"
prerelease: true
18 changes: 18 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Unneeded NL2 files
*.nl2park_backup
*.nl2pkg

# Display shell files
scenery/display_shell

# Zip files
*.zip

# TODO file
TODO.txt

# Generated by MacOS
.DS_Store

# Generated by Windows
Thumbs.db
95 changes: 95 additions & 0 deletions .nl2pkg_include.nl2script
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
<root>
<script>
<classpath>Copy the folder in scenery to your park to use</classpath>
<class>WelcomeScript</class>
<sharedvm>true</sharedvm>
<resource id="README">scenery/reds_panels_and_operators/README.html</resource>
<resource id="resource1">scenery/reds_panels_and_operators/[ Placards ]/Acknowledge.png</resource>
<resource id="resource2">scenery/reds_panels_and_operators/[ Placards ]/Advance.png</resource>
<resource id="resource3">scenery/reds_panels_and_operators/[ Placards ]/Automatic Dispatch.png</resource>
<resource id="resource4">scenery/reds_panels_and_operators/[ Placards ]/Automatic Mode.png</resource>
<resource id="resource5">scenery/reds_panels_and_operators/[ Placards ]/Block Reset.png</resource>
<resource id="resource6">scenery/reds_panels_and_operators/[ Placards ]/Clear Block.png</resource>
<resource id="resource7">scenery/reds_panels_and_operators/[ Placards ]/Control Lockout (Large).png</resource>
<resource id="resource8">scenery/reds_panels_and_operators/[ Placards ]/Control Power (Off-On).png</resource>
<resource id="resource9">scenery/reds_panels_and_operators/[ Placards ]/Default.png</resource>
<resource id="resource10">scenery/reds_panels_and_operators/[ Placards ]/Dispatch Mode (Manual-Auto).png</resource>
<resource id="resource11">scenery/reds_panels_and_operators/[ Placards ]/Dispatch-Advance.png</resource>
<resource id="resource12">scenery/reds_panels_and_operators/[ Placards ]/E-Stop Reset.png</resource>
<resource id="resource13">scenery/reds_panels_and_operators/[ Placards ]/Emergency Stop (Circle).png</resource>
<resource id="resource14">scenery/reds_panels_and_operators/[ Placards ]/Emergency Stop.png</resource>
<resource id="resource15">scenery/reds_panels_and_operators/[ Placards ]/Floor (Raise-Lower).png</resource>
<resource id="resource16">scenery/reds_panels_and_operators/[ Placards ]/Full Manual Mode.png</resource>
<resource id="resource17">scenery/reds_panels_and_operators/[ Placards ]/Gates (Open-Close).png</resource>
<resource id="resource18">scenery/reds_panels_and_operators/[ Placards ]/Gates Closing Announcement.png</resource>
<resource id="resource19">scenery/reds_panels_and_operators/[ Placards ]/Harness (Open-Lock).png</resource>
<resource id="resource20">scenery/reds_panels_and_operators/[ Placards ]/Harness Lock.png</resource>
<resource id="resource21">scenery/reds_panels_and_operators/[ Placards ]/Harness Open.png</resource>
<resource id="resource22">scenery/reds_panels_and_operators/[ Placards ]/HMI Enable.png</resource>
<resource id="resource23">scenery/reds_panels_and_operators/[ Placards ]/Horn.png</resource>
<resource id="resource24">scenery/reds_panels_and_operators/[ Placards ]/Jog Lift (BWD-N-FWD).png</resource>
<resource id="resource25">scenery/reds_panels_and_operators/[ Placards ]/Jog Lift.png</resource>
<resource id="resource26">scenery/reds_panels_and_operators/[ Placards ]/Lamp Test.png</resource>
<resource id="resource27">scenery/reds_panels_and_operators/[ Placards ]/Launch Boost Enable.png</resource>
<resource id="resource28">scenery/reds_panels_and_operators/[ Placards ]/Launch.png</resource>
<resource id="resource29">scenery/reds_panels_and_operators/[ Placards ]/Lift Block (4-Way).png</resource>
<resource id="resource30">scenery/reds_panels_and_operators/[ Placards ]/Lift Block.png</resource>
<resource id="resource31">scenery/reds_panels_and_operators/[ Placards ]/Lift Start.png</resource>
<resource id="resource32">scenery/reds_panels_and_operators/[ Placards ]/Lift Stop.png</resource>
<resource id="resource33">scenery/reds_panels_and_operators/[ Placards ]/Load (4-Way).png</resource>
<resource id="resource34">scenery/reds_panels_and_operators/[ Placards ]/Load.png</resource>
<resource id="resource35">scenery/reds_panels_and_operators/[ Placards ]/Maintenance (Bypass-Off-Enable).png</resource>
<resource id="resource36">scenery/reds_panels_and_operators/[ Placards ]/Manual Block Mode.png</resource>
<resource id="resource37">scenery/reds_panels_and_operators/[ Placards ]/Manual Brake Release.png</resource>
<resource id="resource38">scenery/reds_panels_and_operators/[ Placards ]/Manual Dispatch.png</resource>
<resource id="resource39">scenery/reds_panels_and_operators/[ Placards ]/MCBR (4-Way).png</resource>
<resource id="resource40">scenery/reds_panels_and_operators/[ Placards ]/Mic Zone (Station-Lift-Brakes).png</resource>
<resource id="resource41">scenery/reds_panels_and_operators/[ Placards ]/Microphone Enable.png</resource>
<resource id="resource42">scenery/reds_panels_and_operators/[ Placards ]/Midcourse Brake Run.png</resource>
<resource id="resource43">scenery/reds_panels_and_operators/[ Placards ]/Operation Mode (Auto-Block-Maint).png</resource>
<resource id="resource44">scenery/reds_panels_and_operators/[ Placards ]/Operation Mode (Auto-Xfer-Maint).png</resource>
<resource id="resource45">scenery/reds_panels_and_operators/[ Placards ]/Platform (Raise-Lower).png</resource>
<resource id="resource46">scenery/reds_panels_and_operators/[ Placards ]/Power Lockout (Large).png</resource>
<resource id="resource47">scenery/reds_panels_and_operators/[ Placards ]/Power On.png</resource>
<resource id="resource48">scenery/reds_panels_and_operators/[ Placards ]/Ready Brakes (4-Way).png</resource>
<resource id="resource49">scenery/reds_panels_and_operators/[ Placards ]/Ready Brakes.png</resource>
<resource id="resource50">scenery/reds_panels_and_operators/[ Placards ]/Reset.png</resource>
<resource id="resource51">scenery/reds_panels_and_operators/[ Placards ]/Restraints (Open-Lock).png</resource>
<resource id="resource52">scenery/reds_panels_and_operators/[ Placards ]/Restraints Announcement.png</resource>
<resource id="resource53">scenery/reds_panels_and_operators/[ Placards ]/Restraints Lock.png</resource>
<resource id="resource54">scenery/reds_panels_and_operators/[ Placards ]/Restraints Open.png</resource>
<resource id="resource55">scenery/reds_panels_and_operators/[ Placards ]/Reverse.png</resource>
<resource id="resource56">scenery/reds_panels_and_operators/[ Placards ]/Ride Start.png</resource>
<resource id="resource57">scenery/reds_panels_and_operators/[ Placards ]/Ride Stop.png</resource>
<resource id="resource58">scenery/reds_panels_and_operators/[ Placards ]/Running Lights (Off-On-Emrg).png</resource>
<resource id="resource59">scenery/reds_panels_and_operators/[ Placards ]/Switch Track (Left-Right).png</resource>
<resource id="resource60">scenery/reds_panels_and_operators/[ Placards ]/System Status.png</resource>
<resource id="resource61">scenery/reds_panels_and_operators/[ Placards ]/Technical Difficulties.png</resource>
<resource id="resource62">scenery/reds_panels_and_operators/[ Placards ]/Temp Delay Announcement.png</resource>
<resource id="resource63">scenery/reds_panels_and_operators/[ Placards ]/Trains In Service (1-2-3).png</resource>
<resource id="resource64">scenery/reds_panels_and_operators/[ Placards ]/Transfer Table (1-2-3).png</resource>
<resource id="resource65">scenery/reds_panels_and_operators/[ Placards ]/Transfer Table (Left-N-Right).png</resource>
<resource id="resource66">scenery/reds_panels_and_operators/[ Placards ]/Transfer Track (4-Way).png</resource>
<resource id="resource67">scenery/reds_panels_and_operators/[ Placards ]/Transfer Track.png</resource>
<resource id="resource68">scenery/reds_panels_and_operators/[ Placards ]/Transports (Bwd-N-Fwd).png</resource>
<resource id="resource69">scenery/reds_panels_and_operators/[ Placards ]/Trouble.png</resource>
<resource id="resource70">scenery/reds_panels_and_operators/[ Placards ]/Unload (4-Way).png</resource>
<resource id="resource71">scenery/reds_panels_and_operators/[ Placards ]/Unload.png</resource>
<resource id="resource72">scenery/reds_panels_and_operators/[ Placards ]/Unloading Announcement.png</resource>
<resource id="resource73">scenery/reds_panels_and_operators/[ Placards ]/Warning.png</resource>
<resource id="resource74">scenery/reds_panels_and_operators/[ Placards ]/Winch (-_N_+).png</resource>
<resource id="resource75">scenery/reds_panels_and_operators/[ Labels ]/Brake.png</resource>
<resource id="resource76">scenery/reds_panels_and_operators/[ Labels ]/Communication.png</resource>
<resource id="resource77">scenery/reds_panels_and_operators/[ Labels ]/Dispatch Enable.png</resource>
<resource id="resource78">scenery/reds_panels_and_operators/[ Labels ]/Electrical.png</resource>
<resource id="resource79">scenery/reds_panels_and_operators/[ Labels ]/Lift.png</resource>
<resource id="resource80">scenery/reds_panels_and_operators/[ Labels ]/Midcourse Brake Run.png</resource>
<resource id="resource81">scenery/reds_panels_and_operators/[ Labels ]/Operator 1.png</resource>
<resource id="resource82">scenery/reds_panels_and_operators/[ Labels ]/Operator 2.png</resource>
<resource id="resource83">scenery/reds_panels_and_operators/[ Labels ]/Operator 3.png</resource>
<resource id="resource84">scenery/reds_panels_and_operators/[ Labels ]/Operator 4.png</resource>
<resource id="resource85">scenery/reds_panels_and_operators/[ Labels ]/Operator 5.png</resource>
<resource id="resource86">scenery/reds_panels_and_operators/[ Labels ]/Transfer.png</resource>
</script>
</root>
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Red's Panels & Operators is a No Limits 2 Roller Coaster Simulator (NL2)
custom scenery object (SCO) package of various panels, operators, etc for use in the NL2 software.
Copyright (c) 2021 David Wolfe (Red-Thirten)
Copyright (c) 2024 David Wolfe (Red-Thirten)


GNU GENERAL PUBLIC LICENSE
Expand Down Expand Up @@ -638,7 +638,7 @@ the "copyright" line and a pointer to where the full notice is found.

Red's Panels & Operators is a No Limits 2 Roller Coaster Simulator (NL2)
custom scenery object (SCO) package of various panels, operators, etc for use in the NL2 software.
Copyright (c) 2021 David Wolfe (Red-Thirten)
Copyright (c) 2024 David Wolfe (Red-Thirten)

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -659,7 +659,7 @@ Also add information on how to contact you by electronic and paper mail.
notice like this when it starts in an interactive mode:

Red's Panels & Operators
Copyright (c) 2021 David Wolfe (Red-Thirten)
Copyright (c) 2024 David Wolfe (Red-Thirten)
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![Red's Panels and Operators](https://steamuserimages-a.akamaihd.net/ugc/1658978787080214701/889239368B7EA292E6C8EF572961640E4D9BD51F/?imw=637&imh=358&ima=fit&impolicy=Letterbox&imcolor=%23000000&letterbox=true)
![Red's Panels and Operators](scenery/reds_panels_and_operators/materials/previews/overview.png)

___

Expand Down
Binary file modified Reds-Panels-and-Operators.nl2park
Binary file not shown.
Binary file removed Reds-Panels-and-Operators.nl2park_backup
Binary file not shown.
Binary file removed Reds-Panels-and-Operators.nl2pkg
Binary file not shown.
12 changes: 7 additions & 5 deletions Steam Description.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[h1][u]Red's Panels and Operators[/u][/h1]
[quote][b]Do you like buttons? Do you like switches? Do you like flashing lights? Do you have an unhealthy obsession with control panels like I do? Then this is the pack for you! 😃[/b][/quote]
[i]Like what you see? Appreciate the months of hard work that went into making it?
Then please consider giving this park a thumbs up! 👍
Want to be even more awesome!? Supporting the project by [url=https://www.paypal.com/donate?hosted_button_id=LT9DY39634NGL]donating at this link[/url] helps me make more content like this in the future![/i]
[img]https://i.imgur.com/ZpAhItL.gif[/img]
Want to be even more awesome!? Supporting the project by donating helps me make more content like this in the future![/i]
[url=https://www.paypal.com/donate?hosted_button_id=LT9DY39634NGL][img]https://i.imgur.com/aQKXQzV.png[/img][/url]
[hr][/hr]
[h1]Description:[/h1]
Red's Panels and Operators is a custom SCO package of various animated buttons, switches, lights, etc. to dress up your ride with custom-built control panels. Numerous different panel sizes and shapes, paired with 12 different types of highly detailed & scripted operators, each with countless configuration possibilities, means you can virtually build any panel you can think of. That, along with various extras like electrical panels, cable runners, etc; this pack is sure to add that extra level of realism to your park!
Expand All @@ -12,17 +13,19 @@ Red's Panels and Operators is a custom SCO package of various animated buttons,
[list]
[*][b]5 Main Panels[/b] of different sizes /w 4 button-layouts each & 3 different texture options
[*][b]13 "Operator" Panels[/b] of different sizes /w 3 different texture options & customizable mounts
[*][b]12 Different Operators[/b], each with easily customizable colors, placard, and scripted operation modes
[*][b]12 Different Operators & Indicators[/b], each with easily customizable colors, placard, and scripted functions
These include...
[list]
[*]Push Button
[*]E-Stop Button
[*]Switch
[*]Key Switch
[*]Pilot Light
[*]and MORE!
[/list]
[*]PanelView Plus 1000 Block Display
[*]3 Electrical Boxes, with customizable colors, textures, and mounts
[*]Large PLC Electrical Cabnet
[*]Air Tank
[*]Labels
[*]Cable Runners
Expand All @@ -37,8 +40,7 @@ These include...
[list]
[*]I tried my best to make the pack super user friendly, and it's entirely possible to pick it up without any prior instruction.
[*]However, to learn how to use the pack as efficiently as possible, please watch the [url=https://www.youtube.com/watch?v=Iw8XG1mUMP0]tutorial video above[/url], or open the README.html in the pack for best practices.
[*][b]Note[/b]: Operators currently cannot be interacted with (they are not "clickable"); they will only animate based on what the ride is doing or what is being done on the in-game control panel GUI. They also will not animate if the coaster is in Scripted Operation mode. Unfortunately, there is no easy way around these limitations due to limitations with NL2's scripting API and the infinite configuration possibilities of scripted rides. I may release a "manual" version of this pack sometime in the future that will have it's own API for programmers to integrate the operators into their scripted rides.
[*]If you have any issues with the pack, please make sure your question or issue isn't already answered by these resources first before posting a comment.
[*]If you have any issues with the pack, please make sure your question or issue isn't already answered by these resources first before posting a comment.
[/list]

[hr][/hr]
Expand Down
34 changes: 34 additions & 0 deletions build_nl2pkg_include.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
@echo off
setlocal enabledelayedexpansion

rem build_nl2pkg_include.bat "scenery\reds_panels_and_operators\[ Placards ]" "scenery\reds_panels_and_operators\[ Labels ]"

set OUTPUT_FILE=%~dp0.nl2pkg_include.nl2script
set COUNT=1

(
echo ^<?xml version="1.0" encoding="UTF-8"?^>
echo ^<root^>
echo ^<script^>
echo ^<classpath^>Copy the folder in scenery to your park to use^</classpath^>
echo ^<class^>WelcomeScript^</class^>
echo ^<sharedvm^>true^</sharedvm^>
echo ^<resource id="README"^>scenery/reds_panels_and_operators/README.html^</resource^>
) > "%OUTPUT_FILE%"

for %%i in (%*) do (
for %%j in (%%i\*.png) do (
set "CUR_PATH=%%j"
set "CUR_PATH=!CUR_PATH:\=/!"
echo !CUR_PATH!
echo ^<resource id="resource!COUNT!"^>!CUR_PATH!^</resource^>>> "%OUTPUT_FILE%"
set /a COUNT+=1
)
)

(
echo ^</script^>
echo ^</root^>
) >> "%OUTPUT_FILE%"

echo Output written to "%OUTPUT_FILE%"
Loading
Loading