From d4045deef26a3ff1cd4d29ba083badd7d8fb7a54 Mon Sep 17 00:00:00 2001
From: mux <mux@muxi.at>
Date: Thu, 15 Aug 2024 23:07:53 +0200
Subject: [PATCH] removed unnecessary 'Card'  fields

---
 src/uno_logic.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/uno_logic.rs b/src/uno_logic.rs
index edca3a7..0f6ad2d 100644
--- a/src/uno_logic.rs
+++ b/src/uno_logic.rs
@@ -63,7 +63,6 @@ pub struct PlayerConnection<'a>{
 pub struct Card {
     value: CardValue,
     color: CardColors,
-    color_change : CardColors,
 }
 
 pub struct GameState<'a>{
@@ -111,7 +110,7 @@ impl PartialEq for Card{
 
 impl Clone for Card {
     fn clone(&self) -> Self {
-        Self {value: self.value.clone(), color: self.color.clone(), color_change: self.color_change.clone() }
+        Self {value: self.value.clone(), color: self.color.clone()}
     }
 }
 
@@ -271,7 +270,7 @@ impl GameState<'_>{
         }
 
         if [CardValue::CHANGE_COLOR, CardValue::PLUS_FOUR].contains(&card_to_be_played.value) {
-            self.current_color = card_to_be_played.color_change;
+            self.current_color = card_to_be_played.color;
         } else if [CardValue::EIGHT, CardValue::FIVE, CardValue::FOUR, CardValue::NINE, CardValue::ONE, CardValue::SEVEN, CardValue::SIX, CardValue::THREE, CardValue::TWO, CardValue::ZERO, CardValue::PLUS_TWO, CardValue::SKIP, CardValue::REVERSE, CardValue::PLUS_TWO].contains(&card_to_be_played.value) {
             if card_to_be_played.color != self.current_color{
                 self.current_color = card_to_be_played.color;
@@ -292,7 +291,7 @@ impl GameState<'_>{
             current_turn : 0,
             deck : GameState::base_deck(),
             trash : vec![],
-            current_card : Card{ value : CardValue::ZERO, color : CardColors::RED, color_change: CardColors::BLACK,},
+            current_card : Card{ value : CardValue::ZERO, color : CardColors::RED},
             player_states :  player_states.clone(),
             player_connections : player_connections,
             current_color : CardColors::RED,
@@ -329,14 +328,14 @@ impl GameState<'_>{
         for color in [CardColors::BLACK, CardColors::BLUE, CardColors::GREEN, CardColors::RED, CardColors::YELLOW]{
             for value in [CardValue::CHANGE_COLOR, CardValue::EIGHT, CardValue::FIVE, CardValue::FOUR, CardValue::NINE, CardValue::ONE, CardValue::PLUS_FOUR, CardValue::PLUS_TWO, CardValue::REVERSE, CardValue::SEVEN, CardValue::SIX, CardValue::SKIP, CardValue::THREE, CardValue::TWO, CardValue::ZERO]{
                 if  ![CardValue::CHANGE_COLOR, CardValue::PLUS_FOUR].contains(&value) {
-                    for _ in 0..1 {deck.push(Card{value : value.clone(), color : color.clone(), color_change : CardColors::BLACK})};
+                    for _ in 0..1 {deck.push(Card{value : value.clone(), color : color.clone()})};
                 }
                 else if value == CardValue::ZERO
                  {
-                    deck.push(Card{value : value, color : color.clone(), color_change : CardColors::BLACK});
+                    deck.push(Card{value : value, color : color.clone()});
                 }
                 else {
-                    for _ in 0..4 {deck.push(Card {value : value.clone(), color : color.clone(), color_change : CardColors::BLACK})};
+                    for _ in 0..4 {deck.push(Card {value : value.clone(), color : color.clone()})};
                 }
                 
             }