From aa0f21473654561445769335c0e29288139abe3e Mon Sep 17 00:00:00 2001 From: Tore Bergebakken Date: Sun, 6 Jul 2025 15:13:14 +0200 Subject: [PATCH] Reorder auctions to barrel, extension, body --- Assets/ScriptableObjects/Rules/CustomRulesTemplate.asset | 3 ++- Assets/ScriptableObjects/Rules/FirstTo30ChipsRules.asset | 4 ++-- Assets/ScriptableObjects/Rules/SixRoundsRules.asset | 4 ++-- Assets/ScriptableObjects/Rules/ThreeStrikesRules.asset | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Assets/ScriptableObjects/Rules/CustomRulesTemplate.asset b/Assets/ScriptableObjects/Rules/CustomRulesTemplate.asset index 6b6274768..194a2fc0a 100644 --- a/Assets/ScriptableObjects/Rules/CustomRulesTemplate.asset +++ b/Assets/ScriptableObjects/Rules/CustomRulesTemplate.asset @@ -17,6 +17,7 @@ MonoBehaviour: Customize objective, rewards and starting weapon to your liking.' + GameMode: 0 MatchWinCondition: WinCondition: 0 StopCondition: 0 @@ -47,6 +48,6 @@ MonoBehaviour: WeaponProgress: Type: 0 AuctionProgress: - - Type: 0 - Type: 1 - Type: 2 + - Type: 0 diff --git a/Assets/ScriptableObjects/Rules/FirstTo30ChipsRules.asset b/Assets/ScriptableObjects/Rules/FirstTo30ChipsRules.asset index 91bbdc356..3c5d89adb 100644 --- a/Assets/ScriptableObjects/Rules/FirstTo30ChipsRules.asset +++ b/Assets/ScriptableObjects/Rules/FirstTo30ChipsRules.asset @@ -16,7 +16,7 @@ MonoBehaviour: description: Be the first to win a round with 30 chips! Players carry up to 30 chips at a time and receive limited chip rewards. Spend your chips strategically and outsmart your opponents. - gameMode: 1 + GameMode: 1 MatchWinCondition: WinCondition: 2 StopCondition: 1 @@ -47,6 +47,6 @@ MonoBehaviour: WeaponProgress: Type: 0 AuctionProgress: - - Type: 0 - Type: 1 - Type: 2 + - Type: 0 diff --git a/Assets/ScriptableObjects/Rules/SixRoundsRules.asset b/Assets/ScriptableObjects/Rules/SixRoundsRules.asset index 41a0fe731..78f0752d6 100644 --- a/Assets/ScriptableObjects/Rules/SixRoundsRules.asset +++ b/Assets/ScriptableObjects/Rules/SixRoundsRules.asset @@ -17,7 +17,7 @@ MonoBehaviour: Matches always last for six rounds. Kills are rewarded.' - gameMode: 2 + GameMode: 2 MatchWinCondition: WinCondition: 0 StopCondition: 0 @@ -48,6 +48,6 @@ MonoBehaviour: WeaponProgress: Type: 0 AuctionProgress: - - Type: 0 - Type: 1 - Type: 2 + - Type: 0 diff --git a/Assets/ScriptableObjects/Rules/ThreeStrikesRules.asset b/Assets/ScriptableObjects/Rules/ThreeStrikesRules.asset index 9e6f56e70..e52614713 100644 --- a/Assets/ScriptableObjects/Rules/ThreeStrikesRules.asset +++ b/Assets/ScriptableObjects/Rules/ThreeStrikesRules.asset @@ -48,6 +48,6 @@ MonoBehaviour: WeaponProgress: Type: 0 AuctionProgress: - - Type: 0 - Type: 1 - Type: 2 + - Type: 0