Skip to content

Commit 2f340f6

Browse files
zeitlingerzeitlinger
authored
Tech (#157)
1 parent da78096 commit 2f340f6

25 files changed

+1907
-70
lines changed

‎client/assets/crown-svgrepo-com.png

7.08 KB
Loading

‎client/assets/justice-hammer-svgrepo-com.png

8.49 KB
Loading

‎client/src/action_buttons.rs

+7
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ fn generic_custom_action(
128128
))));
129129
}
130130
}
131+
return None;
131132
}
132133

133134
match custom_action_type {
@@ -142,6 +143,12 @@ fn generic_custom_action(
142143
CustomActionType::AbsolutePower => Some(StateUpdate::execute(Action::Playing(
143144
PlayingAction::Custom(CustomAction::AbsolutePower),
144145
))),
146+
CustomActionType::ForcedLabor => Some(StateUpdate::execute(Action::Playing(
147+
PlayingAction::Custom(CustomAction::ForcedLabor),
148+
))),
149+
CustomActionType::CivilRights => Some(StateUpdate::execute(Action::Playing(
150+
PlayingAction::Custom(CustomAction::CivilRights),
151+
))),
145152
CustomActionType::Taxes => Some(StateUpdate::OpenDialog(ActiveDialog::Taxes(
146153
Payment::new_gain(&tax_options(rc.shown_player), "Collect taxes"),
147154
))),

‎client/src/assets.rs

+8
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,16 @@ impl Assets {
219219
[
220220
(
221221
CustomActionType::AbsolutePower,
222+
load_png(include_bytes!("../assets/crown-svgrepo-com.png")),
223+
),
224+
(
225+
CustomActionType::ForcedLabor,
222226
load_png(include_bytes!("../assets/slavery-whip-svgrepo-com.png")),
223227
),
228+
(
229+
CustomActionType::CivilRights,
230+
load_png(include_bytes!("../assets/justice-hammer-svgrepo-com.png")),
231+
),
224232
(
225233
CustomActionType::Taxes,
226234
load_png(include_bytes!("../assets/tax-svgrepo-com.png")),

‎client/src/collect_ui.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ impl CollectResources {
6969

7070
pub fn extra_resources(&self, game: &Game) -> i8 {
7171
let city = game.get_city(self.player_index, self.city_position);
72-
city.mood_modified_size() as i8 - self.collections.len() as i8
72+
city.mood_modified_size(game.get_player(self.player_index)) as i8
73+
- self.collections.len() as i8
7374
}
7475

7576
pub fn collected(&self) -> ResourcePile {

‎server/src/city.rs

+9-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use std::ops::{Add, Sub};
33
use serde::{Deserialize, Serialize};
44

55
use crate::consts::MAX_CITY_SIZE;
6+
use crate::content::custom_actions::CustomActionType::ForcedLabor;
67
use crate::{
78
city_pieces::{Building, CityPieces, CityPiecesData},
89
game::Game,
@@ -187,11 +188,17 @@ impl City {
187188
}
188189

189190
#[must_use]
190-
pub fn mood_modified_size(&self) -> usize {
191+
pub fn mood_modified_size(&self, player: &Player) -> usize {
191192
match self.mood_state {
192193
Happy => self.size() + 1,
193194
Neutral => self.size(),
194-
Angry => 1,
195+
Angry => {
196+
if player.played_once_per_turn_actions.contains(&ForcedLabor) {
197+
self.size()
198+
} else {
199+
1
200+
}
201+
}
195202
}
196203
}
197204

‎server/src/collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub fn get_total_collection(
2323
) -> Option<(CollectOptionsInfo, ResourcePile)> {
2424
let player = &game.players[player_index];
2525
let city = player.get_city(city_position)?;
26-
if city.mood_modified_size() < collections.len() || city.player_index != player_index {
26+
if city.mood_modified_size(player) < collections.len() || city.player_index != player_index {
2727
return None;
2828
}
2929
let i = possible_resource_collections(

‎server/src/content/advances_autocracy.rs

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
use crate::ability_initializer::AbilityInitializerSetup;
22
use crate::advance::{Advance, AdvanceBuilder};
33
use crate::content::advances::{advance_group_builder, AdvanceGroup};
4-
use crate::content::custom_actions::CustomActionType::AbsolutePower;
4+
use crate::content::custom_actions::CustomActionType::{AbsolutePower, ForcedLabor};
55

66
pub(crate) fn autocracy() -> AdvanceGroup {
7-
advance_group_builder("Autocracy", vec![nationalism(), absolute_power()])
7+
advance_group_builder(
8+
"Autocracy",
9+
vec![nationalism(), absolute_power(), forced_labor()],
10+
)
811
}
912

1013
fn nationalism() -> AdvanceBuilder {
@@ -18,3 +21,11 @@ fn absolute_power() -> AdvanceBuilder {
1821
)
1922
.add_custom_action(AbsolutePower)
2023
}
24+
25+
fn forced_labor() -> AdvanceBuilder {
26+
Advance::builder(
27+
"Forced Labor",
28+
"Once per turn, as a free action, you may spend 1 mood token to treat your Angry cities as neutral for the rest of the turn",
29+
)
30+
.add_custom_action(ForcedLabor)
31+
}

‎server/src/content/advances_construction.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fn sanitation() -> AdvanceBuilder {
3838
.with_advance_bonus(MoodToken)
3939
.add_player_event_listener(
4040
|event| &mut event.recruit_cost,
41-
|cost, units, ()| {
41+
|cost, units, _| {
4242
if units.settlers > 0 {
4343
// insert at beginning so that it's preferred over gold
4444
cost.info
@@ -55,6 +55,6 @@ fn sanitation() -> AdvanceBuilder {
5555
);
5656
}
5757
},
58-
0,
58+
1,
5959
)
6060
}

‎server/src/content/advances_democracy.rs

+17-11
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,28 @@ use crate::ability_initializer::AbilityInitializerSetup;
22
use crate::advance::{Advance, AdvanceBuilder};
33
use crate::content::advances::{advance_group_builder, AdvanceGroup};
44
use crate::content::custom_actions::CustomActionType::{
5-
FreeEconomyCollect, VotingIncreaseHappiness,
5+
CivilRights, FreeEconomyCollect, VotingIncreaseHappiness,
66
};
77
use crate::playing_actions::PlayingActionType;
88

99
pub(crate) fn democracy() -> AdvanceGroup {
10-
advance_group_builder(
11-
"Democracy",
12-
vec![
13-
Advance::builder(
14-
"Voting",
15-
"As a free action, you may spend 1 mood token to gain an action 'Increase happiness'",
16-
)
17-
.add_custom_action(VotingIncreaseHappiness),
18-
free_economy()
19-
],
10+
advance_group_builder("Democracy", vec![voting(), civil_rights(), free_economy()])
11+
}
12+
13+
fn voting() -> AdvanceBuilder {
14+
Advance::builder(
15+
"Voting",
16+
"As a free action, you may spend 1 mood token to gain an action 'Increase happiness'",
17+
)
18+
.add_custom_action(VotingIncreaseHappiness)
19+
}
20+
21+
fn civil_rights() -> AdvanceBuilder {
22+
Advance::builder(
23+
"Civil Rights",
24+
"As a free action, you may gain 3 mood tokens. The cost of Draft is increased to 2 mood token",
2025
)
26+
.add_custom_action(CivilRights)
2127
}
2228

2329
fn free_economy() -> AdvanceBuilder {

‎server/src/content/advances_warfare.rs

+9-8
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,21 @@ fn draft() -> AdvanceBuilder {
4646
.with_advance_bonus(CultureToken)
4747
.add_player_event_listener(
4848
|event| &mut event.recruit_cost,
49-
|cost, units, ()| {
49+
|cost, units, player| {
5050
if units.infantry > 0 {
5151
// insert at beginning so that it's preferred over gold
52+
53+
let pile = ResourcePile::mood_tokens(if player.has_advance("Civil Rights") {
54+
2
55+
} else {
56+
1
57+
});
5258
cost.info
5359
.log
54-
.push("Draft reduced the cost of 1 Infantry to 1 mood token".to_string());
55-
60+
.push(format!("Draft reduced the cost of 1 Infantry to {pile}"));
5661
cost.cost.conversions.insert(
5762
0,
58-
PaymentConversion::limited(
59-
UnitType::cost(&UnitType::Infantry),
60-
ResourcePile::mood_tokens(1),
61-
1,
62-
),
63+
PaymentConversion::limited(UnitType::cost(&UnitType::Infantry), pile, 1),
6364
);
6465
}
6566
},

‎server/src/content/custom_actions.rs

+26-3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ pub enum CustomAction {
2828
payment: ResourcePile,
2929
},
3030
AbsolutePower,
31+
ForcedLabor,
32+
CivilRights,
3133
ArtsInfluenceCultureAttempt(InfluenceCultureAttempt),
3234
VotingIncreaseHappiness(IncreaseHappiness),
3335
FreeEconomyCollect(Collect),
@@ -43,6 +45,8 @@ pub enum CustomAction {
4345
pub enum CustomActionType {
4446
ConstructWonder,
4547
AbsolutePower,
48+
ForcedLabor,
49+
CivilRights,
4650
ArtsInfluenceCultureAttempt,
4751
VotingIncreaseHappiness,
4852
FreeEconomyCollect,
@@ -65,6 +69,12 @@ impl CustomAction {
6569
payment,
6670
} => construct_wonder(game, player_index, city_position, &wonder, payment),
6771
CustomAction::AbsolutePower => game.actions_left += 1,
72+
CustomAction::ForcedLabor => {
73+
// we check that the action was played
74+
}
75+
CustomAction::CivilRights => {
76+
game.players[player_index].gain_resources(ResourcePile::mood_tokens(3));
77+
}
6878
CustomAction::ArtsInfluenceCultureAttempt(c) => {
6979
influence_culture_attempt(game, player_index, &c);
7080
}
@@ -88,6 +98,8 @@ impl CustomAction {
8898
match self {
8999
CustomAction::ConstructWonder { .. } => CustomActionType::ConstructWonder,
90100
CustomAction::AbsolutePower => CustomActionType::AbsolutePower,
101+
CustomAction::ForcedLabor => CustomActionType::ForcedLabor,
102+
CustomAction::CivilRights => CustomActionType::CivilRights,
91103
CustomAction::ArtsInfluenceCultureAttempt(_) => {
92104
CustomActionType::ArtsInfluenceCultureAttempt
93105
}
@@ -117,6 +129,12 @@ impl CustomAction {
117129
game.players[player_index].wonder_cards.push(wonder);
118130
}
119131
CustomAction::AbsolutePower => game.actions_left -= 1,
132+
CustomAction::ForcedLabor => {
133+
// we check that the action was played
134+
}
135+
CustomAction::CivilRights => {
136+
game.players[player_index].lose_resources(ResourcePile::mood_tokens(3));
137+
}
120138
CustomAction::ArtsInfluenceCultureAttempt(_) => panic!("Action can't be undone"),
121139
CustomAction::VotingIncreaseHappiness(i) => {
122140
undo_increase_happiness(
@@ -149,6 +167,10 @@ impl CustomAction {
149167
format!("{player_name} paid {payment} to construct the {wonder} wonder in the city at {city_position}"),
150168
CustomAction::AbsolutePower =>
151169
format!("{player_name} paid 2 mood tokens to get an extra action using Forced Labor"),
170+
CustomAction::ForcedLabor =>
171+
format!("{player_name} paid 1 mood token to treat Angry cities as neutral"),
172+
CustomAction::CivilRights =>
173+
format!("{player_name} gained 3 mood tokens using Civil Rights"),
152174
CustomAction::ArtsInfluenceCultureAttempt(c) =>
153175
format!("{} using Arts", format_cultural_influence_attempt_log_item(game, player_name, c)),
154176
CustomAction::VotingIncreaseHappiness(i) =>
@@ -170,20 +192,21 @@ impl CustomActionType {
170192
#[must_use]
171193
pub fn action_type(&self) -> ActionType {
172194
match self {
173-
CustomActionType::ConstructWonder => ActionType::default(),
174195
CustomActionType::AbsolutePower => {
175196
ActionType::free_and_once_per_turn(ResourcePile::mood_tokens(2))
176197
}
198+
CustomActionType::CivilRights
199+
| CustomActionType::Sports
200+
| CustomActionType::ConstructWonder => ActionType::default(),
177201
CustomActionType::ArtsInfluenceCultureAttempt => {
178202
ActionType::free_and_once_per_turn(ResourcePile::culture_tokens(1))
179203
}
180204
CustomActionType::VotingIncreaseHappiness => {
181205
ActionType::free(ResourcePile::mood_tokens(1))
182206
}
183-
CustomActionType::FreeEconomyCollect => {
207+
CustomActionType::FreeEconomyCollect | CustomActionType::ForcedLabor => {
184208
ActionType::free_and_once_per_turn(ResourcePile::mood_tokens(1))
185209
}
186-
CustomActionType::Sports => ActionType::new(false, false, ResourcePile::empty()),
187210
CustomActionType::Taxes => ActionType::once_per_turn(ResourcePile::mood_tokens(1)),
188211
CustomActionType::Theaters => ActionType::free_and_once_per_turn(ResourcePile::empty()),
189212
}

‎server/src/game.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1472,8 +1472,8 @@ impl Game {
14721472
" and captured {}'s city at {position}",
14731473
self.players[old_player_index].get_name()
14741474
));
1475-
self.players[new_player_index]
1476-
.gain_resources(ResourcePile::gold(city.mood_modified_size() as u32));
1475+
let size = city.mood_modified_size(&self.players[new_player_index]);
1476+
self.players[new_player_index].gain_resources(ResourcePile::gold(size as u32));
14771477
let take_over = self.players[new_player_index].is_city_available();
14781478

14791479
if take_over {

‎server/src/player.rs

+13-7
Original file line numberDiff line numberDiff line change
@@ -794,13 +794,13 @@ impl Player {
794794
|e| &e.recruit_cost,
795795
&PaymentOptions::resources(vec.iter().map(UnitType::cost).sum()),
796796
units,
797-
&(),
797+
self,
798798
execute,
799799
);
800800
if !self.can_afford(&cost.cost) {
801801
return None;
802802
}
803-
if vec.len() > city.mood_modified_size() {
803+
if vec.len() > city.mood_modified_size(self) {
804804
return None;
805805
}
806806
if vec.iter().any(|unit| matches!(unit, Cavalry | Elephant)) && city.pieces.market.is_none()
@@ -1050,15 +1050,21 @@ impl Player {
10501050
details: &V,
10511051
execute: Option<&ResourcePile>,
10521052
) -> CostInfo {
1053-
get_event(&self.events)
1054-
.get()
1055-
.trigger_with_minimal_modifiers(
1056-
&CostInfo::new(self, value.clone()),
1053+
let event = get_event(&self.events).get();
1054+
let mut cost_info = CostInfo::new(self, value.clone());
1055+
if let Some(execute) = execute {
1056+
event.trigger_with_minimal_modifiers(
1057+
&cost_info,
10571058
info,
10581059
details,
1059-
|i| execute.as_ref().is_none_or(|r| i.cost.is_valid_payment(r)),
1060+
|i| i.cost.is_valid_payment(execute),
10601061
|i, m| i.cost.modifiers = m,
10611062
)
1063+
} else {
1064+
let m = event.trigger(&mut cost_info, info, details);
1065+
cost_info.cost.modifiers = m;
1066+
cost_info
1067+
}
10621068
}
10631069

10641070
pub(crate) fn trigger_player_event<U, V>(

‎server/src/player_events.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub(crate) struct PlayerEvents {
2828
pub wonder_cost: Event<CostInfo, City, Wonder>,
2929
pub advance_cost: Event<CostInfo, Advance>,
3030
pub happiness_cost: Event<CostInfo>,
31-
pub recruit_cost: Event<CostInfo, Units>,
31+
pub recruit_cost: Event<CostInfo, Units, Player>,
3232

3333
pub is_playing_action_available: Event<bool, PlayingActionType, Player>,
3434
pub terrain_collect_options: Event<HashMap<Terrain, HashSet<ResourcePile>>>,
@@ -46,6 +46,7 @@ impl PlayerEvents {
4646

4747
#[derive(Clone, PartialEq)]
4848
pub(crate) struct ActionInfo {
49+
pub(crate) player: usize,
4950
pub(crate) undo: CommandUndoInfo,
5051
pub(crate) info: HashMap<String, String>,
5152
pub(crate) log: Vec<String>,
@@ -54,6 +55,7 @@ pub(crate) struct ActionInfo {
5455
impl ActionInfo {
5556
pub(crate) fn new(player: &Player) -> ActionInfo {
5657
ActionInfo {
58+
player: player.index,
5759
undo: CommandUndoInfo::new(player),
5860
info: player.event_info.clone(),
5961
log: Vec::new(),

‎server/src/playing_actions.rs

+5
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,11 @@ impl ActionType {
346346
Self::new(true, true, cost)
347347
}
348348

349+
#[must_use]
350+
pub fn regular(cost: ResourcePile) -> Self {
351+
Self::new(false, false, cost)
352+
}
353+
349354
#[must_use]
350355
pub fn new(free: bool, once_per_turn: bool, cost: ResourcePile) -> Self {
351356
Self {

0 commit comments

Comments
 (0)