Define comp 103 as Gate Rush Control comp

Fix typo in 115

.github/workflows/build-and-test.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main, automation ]
+    branches: [ main ]
   pull_request:
-    branches: [ main, automation ]
+    branches: [ main ]
 
 jobs:
   build-and-test:
@@ -36,16 +36,22 @@ jobs:
         testPreset: "ci-${{matrix.os}}"
     - name: artifacts
       uses: actions/upload-artifact@v3
+      if: ${{ github.ref == 'ref/head/main' }}
       with:
         name: build-${{matrix.os}}
         path: |
-          build/*Server*
-          build/*.ini
-          build/*.so
-          build/*.dll
-          build/vanity/
-          build/navmeshes/
-          build/migrations/
-          build/*.dcf
-          !build/*.pdb
-          !build/d*/
+          build
+          !build/tests
+          !build/Testing
+          !build/CMakeFiles
+          !build/DartConfiguration.tcl
+          !build/CTestTestfile.cmake
+          !build/CMakeCache.txt
+          !build/build.ninja
+          !build/_deps
+          !build/cmake_install.cmake
+          !build/*.a
+          !build/*.lib
+          !build/*.dir
+          !build/*.vcxproj
+          !build/*.vcxproj.filters

.github/workflows/publishing.yml

@@ -1,116 +0,0 @@
-name: CI
-
-on:
-  push:
-    paths:
-      - versions.txt
-
-jobs:
-  build-and-test:
-    name: Build & Test (${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
-    continue-on-error: true
-    strategy:
-      matrix:
-        os: [ windows-2022, ubuntu-20.04, macos-11 ]
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: true
-    - name: Add msbuild to PATH (Windows only)
-      if: ${{ matrix.os == 'windows-2022' }}
-      uses: microsoft/setup-msbuild@v1.1
-      with:
-        vs-version: '[17,18)'
-        msbuild-architecture: x64
-    - name: Install libssl (Mac Only)
-      if: ${{ matrix.os == 'macos-11' }}
-      run: brew install openssl@3
-    - name: cmake
-      uses: lukka/run-cmake@v10
-      with:
-        configurePreset: "ci-${{matrix.os}}"
-        buildPreset: "ci-${{matrix.os}}"
-        testPreset: "ci-${{matrix.os}}"
-    - name: artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: build-${{matrix.os}}
-        path: |
-          build/*Server*
-          build/*.ini
-          build/*.so
-          build/*.dll
-          build/vanity/
-          build/navmeshes/
-          build/migrations/
-          build/*.dcf
-          !build/*.pdb
-          !build/d*/
-          
-  draft-release:
-    needs: build-and-test
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      
-    - name: Get Previous Tag
-      id: previoustag
-      uses: "WyriHaximus/github-action-get-previous-tag@v1"
-      with:
-        fallback: v1.0
-    
-    - name: Generate Changelog
-      uses: Bullrich/generate-release-changelog@master
-      id: changelog
-      env:
-          REPO: ${{ github.repository }}
-      with:
-          from-tag: ${{ steps.previoustag.outputs.tag }}
-          to-tag: HEAD
-
-      
-    - name: Take a gander at versions.txt to get updated information
-      run: |
-        IFS=" - " read -ra PARTS <<< "$(head -n 1 versions.txt)"
-        echo "VERSION=${PARTS[0]}" >> $GITHUB_ENV
-        echo "DESCRIPTION=$(IFS=' '; echo "${PARTS[*]:1}")" >> $GITHUB_ENV
-    
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: v${{ env.VERSION }}
-        release_name: Release v${{ env.VERSION }}
-        body: "Draft release for version v${{ env.VERSION }} \n\n ${{ env.DESCRIPTION }} \n\n ${{ steps.changelog.outputs.changelog }}"
-        draft: true
-
-    - name: Download all workflow run artifacts
-      uses: actions/download-artifact@v3
-      with: 
-        path: artifacts
-
-    - name: Upload Release Assets
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        cd artifacts
-        for folder in */; do
-            zip -r "${folder%/}.zip" "$folder"
-        done
-        ls
-        for file in *.zip; do
-          echo "Uploading $file"
-          curl --progress-bar \
-            -X POST \
-            -H "Accept: application/vnd.github+json" \
-            -H "Authorization: token ${{ env.GITHUB_TOKEN }}" \
-            --upload-file "$file" \
-            -H "Content-Type: $(file --mime-type -b $file)" \
-            "https://uploads.github.com/repos/${{ github.repository }}/releases/${{ steps.create_release.outputs.id }}/assets?name=$(basename $file)"
-        done

dCommon/dEnums/eGameMessageType.h

@@ -273,7 +273,7 @@ enum class eGameMessageType : uint16_t {
 	TEAM_SET_LEADER = 1557,
 	TEAM_INVITE_CONFIRM = 1558,
 	TEAM_GET_STATUS_RESPONSE = 1559,
-	TEAM_ADD_PLAYER = 1562,
+	TEAM_ADD_PLAYER = 1526,
 	TEAM_REMOVE_PLAYER = 1563,
 	START_CELEBRATION_EFFECT = 1618,
 	ADD_BUFF = 1647,

dCommon/dEnums/eReplicaComponentType.h

@@ -107,7 +107,7 @@ enum class eReplicaComponentType : uint32_t {
 	DONATION_VENDOR,
 	COMBAT_MEDIATOR,
 	COMMENDATION_VENDOR,
-	UNKNOWN_103,
+	GATE_RUSH_CONTROL,
 	RAIL_ACTIVATOR,
 	ROLLER,
 	PLAYER_FORCED_MOVEMENT,
@@ -119,7 +119,7 @@ enum class eReplicaComponentType : uint32_t {
 	UNKNOWN_112,
 	PROPERTY_PLAQUE,
 	BUILD_BORDER,
-	UNKOWN_115,
+	UNKNOWN_115,
 	CULLING_PLANE,
 	DESTROYABLE = 1000 // Actually 7
 };

dGame/dComponents/RacingControlComponent.cpp

@@ -362,7 +362,8 @@ void RacingControlComponent::OnRacingPlayerInfoResetFinished(Entity* player) {
 	}
 }
 
-void RacingControlComponent::HandleMessageBoxResponse(Entity* player, int32_t button, const std::string& id) {
+void RacingControlComponent::HandleMessageBoxResponse(Entity* player,
+	const std::string& id) {
 	auto* data = GetPlayerData(player->GetObjectID());
 
 	if (data == nullptr) {
@@ -404,7 +405,7 @@ void RacingControlComponent::HandleMessageBoxResponse(Entity* player, int32_t bu
 				missionComponent->Progress(eMissionTaskType::RACING, dZoneManager::Instance()->GetZone()->GetWorldID(), (LWOOBJID)eRacingTaskParam::LAST_PLACE_FINISH); // Finished first place in specific world.
 			}
 		}
-	} else if (id == "ACT_RACE_EXIT_THE_RACE?" && button == m_ActivityExitConfirm) {
+	} else if (id == "ACT_RACE_EXIT_THE_RACE?" || id == "Exit") {
 		auto* vehicle = EntityManager::Instance()->GetEntity(data->vehicleID);
 
 		if (vehicle == nullptr) {

dGame/dComponents/RacingControlComponent.h

@@ -144,7 +144,7 @@ public:
 	/**
 	 * Invoked when the player responds to the GUI.
 	 */
-	void HandleMessageBoxResponse(Entity* player, int32_t button, const std::string& id);
+	void HandleMessageBoxResponse(Entity* player, const std::string& id);
 
 	/**
 	 * Get the racing data from a player's LWOOBJID.
@@ -246,9 +246,4 @@ private:
 	float m_EmptyTimer;
 
 	bool m_SoloRacing;
-
-	/**
-	 * Value for message box response to know if we are exiting the race via the activity dialogue
-	 */
-	const int32_t m_ActivityExitConfirm = 1;
 };

dGame/dGameMessages/GameMessages.cpp

@@ -3891,7 +3891,7 @@ void GameMessages::HandleMessageBoxResponse(RakNet::BitStream* inStream, Entity*
 	auto* racingControlComponent = entity->GetComponent<RacingControlComponent>();
 
 	if (racingControlComponent != nullptr) {
-		racingControlComponent->HandleMessageBoxResponse(userEntity, iButton, GeneralUtils::UTF16ToWTF8(identifier));
+		racingControlComponent->HandleMessageBoxResponse(userEntity, GeneralUtils::UTF16ToWTF8(identifier));
 	}
 
 	for (auto* shootingGallery : EntityManager::Instance()->GetEntitiesByComponent(eReplicaComponentType::SHOOTING_GALLERY)) {

versions.txt

@@ -1,4 +1,3 @@
-1.2 - I genuinely have run out of bad among us jokes, what test text do I use now?
 1.0 - Final cleanup and bug fixing for public release
 0.9 - Includes BBB without the need for a UGC server, cannon cove minigame, and bug fixes.
 0.8 - Added Ninjago! and it's various features + frakjaw minigame. AG survival now works.
@@ -8,4 +7,4 @@
 0.4 - Added Havok to replace Bullet, Instancing, Quickbuilds, rockets, and a ton more fixes and additions.
 0.3 - FrostBurgh, Snowdrift and Snowman's Land testing version. Includes bodged systems.
 0.2 - Transfer to VS2019 & Bullet
-0.1 - Initial transfer from NixLU, up until BehaviorManager inclusion
+0.1 - Initial transfer from NixLU, up until BehaviorManager inclusion