custom actions

Author: zeitlinger

client/assets/stadium-svgrepo-com.png

@@ -1,11 +1,18 @@
+use crate::city_ui::{IconAction, IconActionVec};
 use crate::client_state::{ActiveDialog, StateUpdate};
 use crate::dialog_ui::{BaseOrCustomAction, BaseOrCustomDialog};
-use crate::happiness_ui::{can_play_increase_happiness, open_increase_happiness_dialog};
+use crate::event_ui::event_help;
+use crate::happiness_ui::{
+    can_play_increase_happiness, can_play_influence_culture, open_increase_happiness_dialog,
+};
 use crate::layout_ui::{bottom_left_texture, icon_pos};
 use crate::move_ui::MoveIntent;
+use crate::payment_ui::Payment;
 use crate::render_context::RenderContext;
 use server::action::Action;
-use server::content::advances::get_advance;
+use server::city::City;
+use server::content::advances_culture::{sports_options, theaters_options};
+use server::content::advances_economy::tax_options;
 use server::content::custom_actions::{CustomAction, CustomActionType};
 use server::game::GameState;
 use server::playing_actions::{PlayingAction, PlayingActionType};
@@ -36,35 +43,64 @@ pub fn action_buttons(rc: &RenderContext) -> StateUpdate {
     {
         return StateUpdate::OpenDialog(ActiveDialog::AdvanceMenu);
     }
-    if rc.can_play_action(PlayingActionType::InfluenceCultureAttempt)
+    if can_play_influence_culture(rc)
         && bottom_left_texture(
             rc,
             &assets.resources[&ResourceType::CultureTokens],
             icon_pos(1, -2),
             "Cultural Influence",
         )
     {
-        return StateUpdate::OpenDialog(ActiveDialog::CulturalInfluence);
+        return base_or_custom_action(
+            rc,
+            PlayingActionType::InfluenceCultureAttempt,
+            "Influence culture",
+            &[("Arts", CustomActionType::ArtsInfluenceCultureAttempt)],
+            ActiveDialog::CulturalInfluence,
+        );
     }
-    for (i, a) in game
-        .get_available_custom_actions(rc.shown_player.index)
-        .iter()
-        .enumerate()
-    {
-        if let Some(action) = generic_custom_action(a) {
+    let mut i = 0;
+    for (a, origin) in &game.get_available_custom_actions(rc.shown_player.index) {
+        if let Some(action) = generic_custom_action(rc, a, None) {
             if bottom_left_texture(
                 rc,
                 &assets.custom_actions[a],
                 icon_pos(i as i8, -1),
-                &custom_action_tooltip(a),
+                &event_help(rc, origin, false)[0],
             ) {
-                return StateUpdate::execute(Action::Playing(PlayingAction::Custom(action)));
+                return action;
             }
+            i += 1;
+        }
+    }
+    for (i, (icon, tooltip, action)) in custom_action_buttons(rc, None).iter().enumerate() {
+        if bottom_left_texture(rc, icon, icon_pos(i as i8, -1), tooltip) {
+            return action();
         }
     }
     StateUpdate::None
 }
 
+pub fn custom_action_buttons<'a>(
+    rc: &'a RenderContext,
+    city: Option<&'a City>,
+) -> IconActionVec<'a> {
+    rc.game
+        .get_available_custom_actions(rc.shown_player.index)
+        .into_iter()
+        .filter_map(|(a, origin)| {
+            generic_custom_action(rc, &a, city).map(|action| {
+                let a: IconAction<'a> = (
+                    &rc.assets().custom_actions[&a],
+                    event_help(rc, &origin, false)[0].clone(),
+                    Box::new(move || action.clone()),
+                );
+                a
+            })
+        })
+        .collect()
+}
+
 fn global_move(rc: &RenderContext) -> StateUpdate {
     let pos = rc.state.focused_tile;
     StateUpdate::move_units(
@@ -78,24 +114,39 @@ fn global_move(rc: &RenderContext) -> StateUpdate {
     )
 }
 
-fn custom_action_tooltip(custom_action_type: &CustomActionType) -> String {
-    match custom_action_type {
-        CustomActionType::ConstructWonder => "Construct a wonder".to_string(),
-        CustomActionType::AbsolutePower => get_advance("Absolute Power").description,
-        CustomActionType::VotingIncreaseHappiness => get_advance("Voting").description,
-        CustomActionType::FreeEconomyCollect => get_advance("Free Economy").description,
+fn generic_custom_action(
+    rc: &RenderContext,
+    custom_action_type: &CustomActionType,
+    city: Option<&City>,
+) -> Option<StateUpdate> {
+    if let Some(city) = city {
+        if matches!(custom_action_type, CustomActionType::Sports) {
+            if let Some(options) = sports_options(city) {
+                return Some(StateUpdate::OpenDialog(ActiveDialog::Sports(
+                    (Payment::new_gain(&options, "Increase happiness using sports"), city.position),
+                )));
+            }
+        }
     }
-}
 
-fn generic_custom_action(custom_action_type: &CustomActionType) -> Option<CustomAction> {
     match custom_action_type {
         CustomActionType::ConstructWonder
+        | CustomActionType::ArtsInfluenceCultureAttempt
         | CustomActionType::VotingIncreaseHappiness
-        | CustomActionType::FreeEconomyCollect => {
+        | CustomActionType::FreeEconomyCollect
+        | CustomActionType::Sports => {
             // handled explicitly
             None
         }
-        CustomActionType::AbsolutePower => Some(CustomAction::ForcedLabor),
+        CustomActionType::AbsolutePower => Some(StateUpdate::execute(Action::Playing(
+            PlayingAction::Custom(CustomAction::AbsolutePower),
+        ))),
+        CustomActionType::Taxes => Some(StateUpdate::OpenDialog(ActiveDialog::Taxes(
+            Payment::new_gain(&tax_options(rc.shown_player), "Collect taxes"),
+        ))),
+        CustomActionType::Theaters => Some(StateUpdate::OpenDialog(ActiveDialog::Theaters(
+            Payment::new_gain(&theaters_options(), "Convert Resources"),
+        ))),
     }
 }
 
@@ -108,8 +159,7 @@ pub fn base_or_custom_available(
         || (rc.game.state == GameState::Playing
             && rc
                 .game
-                .get_available_custom_actions(rc.shown_player.index)
-                .contains(custom))
+        .is_custom_action_available(rc.shown_player.index, custom))
 }
 
 pub fn base_or_custom_action(
@@ -128,13 +178,9 @@ pub fn base_or_custom_action(
         None
     };
 
-    let special = rc
-        .game
-        .get_available_custom_actions(rc.shown_player.index)
-        .iter()
-        .find(|a| custom.iter().any(|(_, b)| **a == *b))
-        .map(|a| {
-            let advance = custom.iter().find(|(_, b)| *b == *a).unwrap().0;
+    let special = 
+        custom.iter().find(|(_, a)| rc.game.is_custom_action_available(rc.shown_player.index, a))
+        .map(|(advance, a)| {
             let dialog = execute(BaseOrCustomDialog {
                 custom: BaseOrCustomAction::Custom {
                     custom: a.clone(),

client/assets/tax-svgrepo-com.png

@@ -216,10 +216,26 @@ impl Assets {
     }
 
     fn custom_actions() -> HashMap<CustomActionType, Texture2D> {
-        [(
-            CustomActionType::AbsolutePower,
-            load_png(include_bytes!("../assets/slavery-whip-svgrepo-com.png")),
-        )]
+        [
+            (
+                CustomActionType::AbsolutePower,
+                load_png(include_bytes!("../assets/slavery-whip-svgrepo-com.png")),
+            ),
+            (
+                CustomActionType::Taxes,
+                load_png(include_bytes!("../assets/tax-svgrepo-com.png")),
+            ),
+            (
+                CustomActionType::Theaters,
+                load_png(include_bytes!(
+                    "../assets/temple-building-with-columns-svgrepo-com.png"
+                )),
+            ),
+            (
+                CustomActionType::Sports,
+                load_png(include_bytes!("../assets/stadium-svgrepo-com.png")),
+            ),
+        ]
         .iter()
         .cloned()
         .collect()

client/src/action_buttons.rs

@@ -1,4 +1,6 @@
-use crate::action_buttons::{base_or_custom_action, base_or_custom_available};
+use crate::action_buttons::{
+    base_or_custom_action, base_or_custom_available, custom_action_buttons,
+};
 use crate::client_state::{ActiveDialog, StateUpdate};
 use crate::collect_ui::CollectResources;
 use crate::construct_ui::{new_building_positions, ConstructionPayment, ConstructionProject};
@@ -42,6 +44,7 @@ pub fn show_city_menu<'a>(rc: &'a RenderContext, city: &'a City) -> StateUpdate
         move_units_buttons(rc, city.position),
         building_icons(rc, city),
         wonder_icons(rc, city),
+        custom_action_buttons(rc, Some(city)),
     ]
     .into_iter()
     .flatten()
@@ -70,7 +73,7 @@ fn increase_happiness_button<'a>(rc: &'a RenderContext, city: &'a City) -> Optio
 }
 
 fn wonder_icons<'a>(rc: &'a RenderContext, city: &'a City) -> IconActionVec<'a> {
-    if !rc.can_play_action(PlayingActionType::Construct) {
+    if !city.can_activate() || !rc.can_play_action(PlayingActionType::Construct) {
         // is this the right thing to check?
         return vec![];
     }
@@ -102,7 +105,7 @@ fn wonder_icons<'a>(rc: &'a RenderContext, city: &'a City) -> IconActionVec<'a>
 }
 
 fn building_icons<'a>(rc: &'a RenderContext, city: &'a City) -> IconActionVec<'a> {
-    if !rc.can_play_action(PlayingActionType::Construct) {
+    if !city.can_activate() || !rc.can_play_action(PlayingActionType::Construct) {
         return vec![];
     }
     let owner = rc.shown_player;
@@ -144,7 +147,7 @@ fn building_icons<'a>(rc: &'a RenderContext, city: &'a City) -> IconActionVec<'a
 }
 
 fn recruit_button<'a>(rc: &'a RenderContext, city: &'a City) -> Option<IconAction<'a>> {
-    if !rc.can_play_action(PlayingActionType::Recruit) {
+    if !city.can_activate() || !rc.can_play_action(PlayingActionType::Recruit) {
         return None;
     }
     Some((
@@ -164,7 +167,7 @@ fn recruit_button<'a>(rc: &'a RenderContext, city: &'a City) -> Option<IconActio
 }
 
 fn collect_resources_button<'a>(rc: &'a RenderContext, city: &'a City) -> Option<IconAction<'a>> {
-    if !base_or_custom_available(
+    if !city.can_activate() || !base_or_custom_available(
         rc,
         PlayingActionType::Collect,
         &CustomActionType::FreeEconomyCollect,
@@ -291,7 +294,7 @@ pub fn draw_city(rc: &RenderContext, city: &City) {
                 BUILDING_SIZE,
                 player_ui::player_color(player_index),
             );
-            let tooltip = if matches!(state.active_dialog, ActiveDialog::CulturalInfluence) {
+            let tooltip = if matches!(state.active_dialog, ActiveDialog::CulturalInfluence(_)) {
                 ""
             } else {
                 b.name()

client/src/assets.rs

@@ -129,7 +129,7 @@ fn render_active_dialog(rc: &RenderContext) -> StateUpdate {
     match &state.active_dialog {
         ActiveDialog::None
         | ActiveDialog::WaitingForUpdate
-        | ActiveDialog::CulturalInfluence
+        | ActiveDialog::CulturalInfluence(_)
         | ActiveDialog::PlaceSettler => StateUpdate::None,
         ActiveDialog::DialogChooser(d) => dialog_chooser(rc, d),
         ActiveDialog::Log => show_log(rc),
@@ -163,6 +163,10 @@ fn render_active_dialog(rc: &RenderContext) -> StateUpdate {
         ActiveDialog::Retreat => combat_ui::retreat_dialog(rc),
         ActiveDialog::RemoveCasualties(s) => combat_ui::remove_casualties_dialog(rc, s),
 
+        ActiveDialog::Sports((p, pos)) => custom_actions_ui::sports(rc, p, *pos),
+        ActiveDialog::Taxes(p) => custom_actions_ui::taxes(rc, p),
+        ActiveDialog::Theaters(p) => custom_actions_ui::theaters(rc, p),
+
         ActiveDialog::CustomPhasePaymentRequest(c) => {
             custom_actions_ui::custom_phase_payment_dialog(rc, c)
         }
@@ -193,8 +197,8 @@ pub fn try_click(rc: &RenderContext) -> StateUpdate {
     let pos = Position::from_coordinate(pixel_to_coordinate(mouse_pos));
 
     if rc.can_control() {
-        if let ActiveDialog::CulturalInfluence = state.active_dialog {
-            return influence_ui::hover(rc, mouse_pos);
+        if let ActiveDialog::CulturalInfluence(b) = &state.active_dialog {
+            return influence_ui::hover(rc, mouse_pos, b);
         }
     }