Skip to content

Commit 915f8a0

Browse files
committed
Correct team spawn zone bug + team colors
1 parent f8c0919 commit 915f8a0

3 files changed

Lines changed: 29 additions & 14 deletions

File tree

Assets/Scenes/Game Scene.unity

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7015,25 +7015,25 @@ MonoBehaviour:
70157015
OptionsManager: {fileID: 967962121}
70167016
PossibleColors:
70177017
- serializedVersion: 2
7018-
rgba: 4287730158
7018+
rgba: 4285295840
70197019
- serializedVersion: 2
7020-
rgba: 4293514386
7020+
rgba: 4293840488
70217021
- serializedVersion: 2
7022-
rgba: 4288268519
7022+
rgba: 4286561250
70237023
- serializedVersion: 2
7024-
rgba: 4288999871
7024+
rgba: 4284470408
70257025
- serializedVersion: 2
7026-
rgba: 4291940860
7026+
rgba: 4289103055
70277027
- serializedVersion: 2
7028-
rgba: 4292991150
7028+
rgba: 4292114775
70297029
- serializedVersion: 2
7030-
rgba: 4288210397
7030+
rgba: 4285715170
70317031
- serializedVersion: 2
7032-
rgba: 4293372371
7032+
rgba: 4293037767
70337033
- serializedVersion: 2
7034-
rgba: 4289295750
7034+
rgba: 4289748087
70357035
- serializedVersion: 2
7036-
rgba: 4290298272
7036+
rgba: 4288523633
70377037
LocalPlayer: {fileID: 0}
70387038
LastDrawingLayerOrder: 1
70397039
GameStarted:
@@ -7066,7 +7066,7 @@ MonoBehaviour:
70667066
m_InternalValue: 0
70677067
RoundTime:
70687068
m_InternalValue: 0
7069-
MaxTeamNumber: 0
7069+
MaxTeamNumber: 2
70707070
--- !u!114 &967962118
70717071
MonoBehaviour:
70727072
m_ObjectHideFlags: 0

Assets/Scripts/GameData.cs

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,20 @@ public void StartGameServerRpc()
177177
private void StartGameForRealServerRpc()
178178
{
179179

180-
//generate zones
180+
//initialise zones and players ink regen
181+
List<Color32> teamsCheck = new List<Color32>(Teams);
181182
foreach (GameObject player in Players)
182183
{
183-
RectDrawer playerDrawer = player.GetComponent<RectDrawer>();
184184
PlayerData playerData = player.GetComponent<PlayerData>();
185-
playerDrawer.GenerateTeamZone();
186185
playerData.StartUpdatingInk();
186+
187+
//generate team zone if not already done
188+
if (teamsCheck.Contains(playerData.TeamColor.Value))
189+
{
190+
RectDrawer playerDrawer = player.GetComponent<RectDrawer>();
191+
playerDrawer.GenerateTeamZone();
192+
teamsCheck.Remove(playerData.TeamColor.Value);
193+
}
187194
}
188195

189196
//setup timer
@@ -221,6 +228,13 @@ private void EndGame()
221228
}
222229
}
223230

231+
//stop ink regen
232+
foreach (GameObject player in Players)
233+
{
234+
PlayerData playerData = player.GetComponent<PlayerData>();
235+
playerData.StopUpdatingInk();
236+
}
237+
224238
Winner.Value = teamWinner;
225239
GameEnded.Value = true;
226240
GameStarted.Value = false;

Assets/roundOptions.dat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
<InkRegenPerTeamPixel>0.003</InkRegenPerTeamPixel>
1111
<InkToAreaPaintRatio>0.06</InkToAreaPaintRatio>
1212
<RoundTime>300</RoundTime>
13+
<MaxTeamNumber>2</MaxTeamNumber>
1314
</GameRoundOptions>

0 commit comments

Comments
 (0)