fix rituals

Author: zeitlinger

server/src/log.rs

@@ -164,7 +164,7 @@ pub fn format_happiness_increase(
         })
         .collect::<Vec<String>>();
     format!(
-        "{player_name} paid {} increased happiness in {}",
+        "{player_name} paid {} to increase happiness in {}",
         i.payment,
         utils::format_list(&happiness_increases, "no city")
     )

server/src/playing_actions.rs

@@ -522,17 +522,14 @@ pub(crate) fn increase_happiness(game: &mut Game, player_index: usize, i: Increa
 }
 
 pub(crate) fn undo_increase_happiness(game: &mut Game, player_index: usize, i: IncreaseHappiness) {
-    let mut cost = 0;
     let player = &mut game.players[player_index];
     for (city_position, steps) in i.happiness_increases {
-        let city = player.get_city(city_position).expect("Illegal action");
-        cost += city.size() as u32 * steps;
         let city = player.get_city_mut(city_position).expect("Illegal action");
         for _ in 0..steps {
             city.decrease_mood_state();
         }
     }
-    player.gain_resources(ResourcePile::mood_tokens(cost));
+    player.gain_resources(i.payment);
 
     if let Some(UndoContext::IncreaseHappiness { angry_activations }) =
         game.undo_context_stack.pop()

server/tests/game_api_tests.rs

@@ -715,7 +715,6 @@ fn test_increase_happiness_voting() {
     );
 }
 
-
 #[test]
 fn test_increase_happiness_voting_rituals() {
     test_action(
@@ -726,7 +725,7 @@ fn test_increase_happiness_voting_rituals() {
                     (Position::from_offset("C2"), 1),
                     (Position::from_offset("B3"), 2),
                 ],
-                payment: ResourcePile::new(1,0,1,1,1,1,0),
+                payment: ResourcePile::new(1, 0, 1, 1, 1, 1, 0),
             },
         ))),
         0,

server/tests/test_games/increase_happiness.outcome.json

@@ -369,7 +369,7 @@
     "The game has started",
     "Age 1 has started",
     "Round 1/3",
-    "Player1 increased happiness in the city at C2 by 1 steps, making it Neutral and the city at B3 by 2 steps, making it Happy"
+    "Player1 paid 5 mood tokens to increase happiness in the city at C2 by 1 steps, making it Neutral and the city at B3 by 2 steps, making it Happy"
   ],
   "undo_limit": 0,
   "actions_left": 2,
@@ -444,4 +444,4 @@
       }
     }
   ]
-}
+}

server/tests/test_games/increase_happiness_voting.outcome.json

@@ -348,30 +348,30 @@
       "Playing": {
         "Custom": {
           "VotingIncreaseHappiness": {
-          "happiness_increases": [
-            [
-              "C2",
-              1
+            "happiness_increases": [
+              [
+                "C2",
+                1
+              ],
+              [
+                "B3",
+                2
+              ]
             ],
-            [
-              "B3",
-              2
-            ]
-          ],
-          "payment": {
-            "mood_tokens": 5
+            "payment": {
+              "mood_tokens": 5
+            }
           }
         }
       }
     }
-    }
   ],
   "action_log_index": 1,
   "log": [
     "The game has started",
     "Age 1 has started",
     "Round 1/3",
-    "Player1 increased happiness in the city at C2 by 1 steps, making it Neutral and the city at B3 by 2 steps, making it Happy using Voting"
+    "Player1 paid 5 mood tokens to increase happiness in the city at C2 by 1 steps, making it Neutral and the city at B3 by 2 steps, making it Happy using Voting"
   ],
   "undo_limit": 0,
   "actions_left": 3,
@@ -446,4 +446,4 @@
       }
     }
   ]
-}
+}

server/tests/test_games/increase_happiness_voting_rituals.json

@@ -139,8 +139,8 @@
         "Farming",
         "Free Economy",
         "Mining",
-        "Voting",
-        "Rituals"
+        "Rituals",
+        "Voting"
       ],
       "unlocked_special_advance": [],
       "wonders_build": [],

server/tests/test_games/increase_happiness_voting_rituals.outcome.json

@@ -349,34 +349,34 @@
       "Playing": {
         "Custom": {
           "VotingIncreaseHappiness": {
-          "happiness_increases": [
-            [
-              "C2",
-              1
+            "happiness_increases": [
+              [
+                "C2",
+                1
+              ],
+              [
+                "B3",
+                2
+              ]
             ],
-            [
-              "B3",
-              2
-            ]
-          ],
-          "payment": {
+            "payment": {
               "food": 1,
               "ore": 1,
               "ideas": 1,
               "gold": 1,
               "mood_tokens": 1
+            }
           }
         }
       }
     }
-    }
   ],
   "action_log_index": 1,
   "log": [
     "The game has started",
     "Age 1 has started",
     "Round 1/3",
-    "Player1 increased happiness in the city at C2 by 1 steps, making it Neutral and the city at B3 by 2 steps, making it Happy using Voting"
+    "Player1 paid 1 food, 1 ore, 1 idea, 1 gold and 1 mood token to increase happiness in the city at C2 by 1 steps, making it Neutral and the city at B3 by 2 steps, making it Happy using Voting"
   ],
   "undo_limit": 0,
   "actions_left": 3,