Action cards (#182)

Author: zeitlinger

client/src/city_ui.rs

@@ -85,8 +85,8 @@ fn wonder_icons<'a>(rc: &'a RenderContext, city: &'a City) -> IconActionVec<'a>
     let game = rc.game;
 
     owner
-        .wonder_cards
-        .iter()
+        .wonder_cards()
+        .into_iter()
         .filter(|w| city.can_build_wonder(w, owner, game))
         .map(|w| {
             let a: IconAction<'a> = (

client/src/client_state.rs

@@ -550,6 +550,7 @@ impl State {
                         panic!("ExploreResolution expected");
                     }
                 }
+                CurrentEventRequest::SelectHandCards(_) => todo!(),
             };
         }
         match &game.state {

client/src/construct_ui.rs

@@ -106,7 +106,7 @@ impl ConstructionPayment {
         let cost = match &project {
             ConstructionProject::Building(b, _) => p.construct_cost(*b, city, None),
             ConstructionProject::Wonder(name) => p.wonder_cost(
-                p.wonder_cards.iter().find(|w| w.name == *name).unwrap(),
+                p.wonder_cards().iter().find(|w| w.name == *name).unwrap(),
                 city,
                 None,
             ),

client/src/event_ui.rs

@@ -1,9 +1,11 @@
 use crate::log_ui::break_text;
 use crate::payment_ui::Payment;
 use crate::render_context::RenderContext;
+use server::content::action_cards::get_action_card;
 use server::content::advances::get_advance;
 use server::content::builtin::get_builtin;
 use server::content::incidents::get_incident;
+use server::content::tactics_cards::get_tactics_card;
 use server::content::wonders::get_wonder;
 use server::events::EventOrigin;
 
@@ -14,6 +16,8 @@ pub fn event_help(rc: &RenderContext, origin: &EventOrigin, do_break: bool) -> V
         EventOrigin::Advance(a) => vec![get_advance(a).description],
         EventOrigin::Wonder(w) => vec![get_wonder(w).description],
         EventOrigin::Builtin(b) => vec![get_builtin(rc.game, b).description],
+        EventOrigin::ActionCard(id) => vec![get_action_card(*id).civil_card.description],
+        EventOrigin::TacticsCard(name) => vec![get_tactics_card(name).description],
         EventOrigin::Incident(id) => get_incident(*id).description(),
         EventOrigin::Leader(l) => vec![{
             let l = rc.shown_player.get_leader(l).unwrap();

client/src/local_client/bin/main.rs

@@ -13,6 +13,7 @@ use server::map::Terrain;
 use server::position::Position;
 use server::resource_pile::ResourcePile;
 use server::unit::UnitType;
+use server::utils::remove_element;
 use std::env;
 use std::fs::File;
 use std::io::BufReader;
@@ -150,13 +151,10 @@ pub fn setup_local_game() -> Game {
     //     .unwrap()
     //     .pieces
     //     .wonders = vec![game.wonders_left.pop().unwrap()];
-    let gardens = game.wonders_left.remove(
-        game.wonders_left
-            .iter()
-            .position(|w| w.name == "Great Gardens")
-            .unwrap(),
-    );
-    game.players[player_index1].wonder_cards.push(gardens);
+
+    game.players[player_index1]
+        .wonder_cards
+        .push(remove_element(&mut game.wonders_left, &"Great Gardens".to_string()).unwrap());
     game.players[player_index1]
         .get_city_mut(Position::from_offset("C2"))
         .increase_mood_state();

client/src/player_ui.rs

@@ -254,6 +254,7 @@ pub fn get_combat(game: &Game) -> Option<&Combat> {
         .last()
         .and_then(|e| match &e.event_type {
             CurrentEventType::CombatStart(c) => Some(c),
+            CurrentEventType::CombatRoundStart(s) => Some(&s.combat),
             CurrentEventType::CombatRoundEnd(e) => Some(&e.combat),
             CurrentEventType::CombatEnd(e) => Some(&e.combat),
             _ => None,