payment options

Author: zeitlinger

server/src/content/advances.rs

@@ -8,7 +8,7 @@ use crate::combat::{Combat, CombatModifier, CombatStrength};
 use crate::content::custom_phase_actions::{CustomPhasePaymentRequest, CustomPhaseRewardRequest};
 use crate::content::trade_routes::{gain_trade_route_reward, trade_route_reward};
 use crate::game::GameState;
-use crate::payment::PaymentOptions;
+use crate::payment::{PaymentConversion, PaymentOptions};
 use crate::playing_actions::{PlayingAction, PlayingActionType};
 use crate::position::Position;
 use crate::resource::ResourceType;
@@ -27,7 +27,6 @@ pub const NAVIGATION: &str = "Navigation";
 pub const ROADS: &str = "Roads";
 pub const STEEL_WEAPONS: &str = "Steel Weapons";
 pub const METALLURGY: &str = "Metallurgy";
-pub const RITUALS: &str = "Rituals";
 pub const TACTICS: &str = "Tactics";
 pub const BARTERING: &str = "Bartering";
 pub const CURRENCY: &str = "Currency";
@@ -464,8 +463,23 @@ fn spirituality() -> Vec<Advance> {
             Advance::builder("Myths", "not implemented")
                 .with_advance_bonus(MoodToken)
                 .with_unlocked_building(Temple),
-            Advance::builder(RITUALS, "When you perform the Increase Happiness Action you may spend any Resources as a substitute for mood tokens. This is done at a 1:1 ratio")
-                .with_advance_bonus(CultureToken),
+            Advance::builder("Rituals", "When you perform the Increase Happiness Action you may spend any Resources as a substitute for mood tokens. This is done at a 1:1 ratio")
+                .with_advance_bonus(CultureToken)
+                .add_player_event_listener(
+                    |event| &mut event.happiness_cost,
+                    |cost, (), ()| {
+                        for r in &[
+                            ResourceType::Food,
+                            ResourceType::Wood,
+                            ResourceType::Ore,
+                            ResourceType::Ideas,
+                            ResourceType::Gold,
+                        ] {
+                            cost.conversions.push(PaymentConversion::unlimited(vec![ResourcePile::mood_tokens(1)],ResourcePile::of(*r, 1)));
+                        }
+                    },
+                    0,
+                ),
         ],
     )
 }

server/src/payment.rs

@@ -13,6 +13,17 @@ pub struct PaymentConversion {
     pub limit: Option<u32>,
 }
 
+impl PaymentConversion {
+    #[must_use]
+    pub fn unlimited(from: Vec<ResourcePile>, to: ResourcePile) -> Self {
+        PaymentConversion {
+            from,
+            to,
+            limit: None,
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
 pub struct PaymentOptions {
     pub default: ResourcePile,
@@ -55,11 +66,10 @@ impl PaymentOptions {
     pub fn sum(cost: u32, types_by_preference: &[ResourceType]) -> Self {
         let mut conversions = vec![];
         types_by_preference.windows(2).for_each(|pair| {
-            conversions.push(PaymentConversion {
-                from: vec![ResourcePile::of(pair[0], 1)],
-                to: ResourcePile::of(pair[1], 1),
-                limit: None,
-            });
+            conversions.push(PaymentConversion::unlimited(
+                vec![ResourcePile::of(pair[0], 1)],
+                ResourcePile::of(pair[1], 1),
+            ));
         });
         PaymentOptions {
             default: ResourcePile::of(types_by_preference[0], cost),
@@ -160,7 +170,9 @@ pub fn can_convert(
 
     let upper_limit = conversion.limit.unwrap_or(u32::MAX);
     for amount in 1..=upper_limit {
-        if !current.has_at_least(from, amount) || (conversion.to.is_empty() && amount > discount_left) {
+        if !current.has_at_least(from, amount)
+            || (conversion.to.is_empty() && amount > discount_left)
+        {
             return can_convert(
                 available,
                 current,

server/src/player.rs

@@ -1,5 +1,5 @@
 use crate::advance::Advance;
-use crate::content::advances::{get_advance_by_name, RITUALS};
+use crate::content::advances::get_advance_by_name;
 use crate::game::CurrentMove;
 use crate::game::GameState::Movement;
 use crate::movement::move_routes;
@@ -604,21 +604,12 @@ impl Player {
         let cost = city.size() as u32 * steps;
         if steps > max_steps {
             None
-        } else if self.has_advance(RITUALS) {
-            // todo can call event to add conversions
-            Some(PaymentOptions::sum(
-                cost,
-                &[
-                    ResourceType::Food,
-                    ResourceType::Wood,
-                    ResourceType::Ore,
-                    ResourceType::Ideas,
-                    ResourceType::MoodTokens,
-                    ResourceType::Gold,
-                ],
-            ))
         } else {
-            Some(PaymentOptions::sum(cost, &[ResourceType::MoodTokens]))
+            let mut options = PaymentOptions::sum(cost, &[ResourceType::MoodTokens]);
+            self.get_events()
+                .happiness_cost
+                .trigger(&mut options, &(), &());
+            Some(options)
         }
     }
 

server/src/player_events.rs

@@ -29,6 +29,7 @@ pub(crate) struct PlayerEvents {
     pub after_execute_action: EventMut<Player, Action, ()>,
     pub before_undo_action: EventMut<Player, Action, ()>,
     pub advance_cost: EventMut<u32, String>,
+    pub happiness_cost: EventMut<PaymentOptions, (), ()>,
     pub is_playing_action_available: EventMut<bool, PlayingActionType, Player>,
     pub terrain_collect_options: EventMut<HashMap<Terrain, HashSet<ResourcePile>>, (), ()>,
     pub collect_options: EventMut<HashMap<Position, HashSet<ResourcePile>>, CollectContext, Game>,