Skip to content

Commit 28631ef

Browse files
committed
🐛 fix some continents and regions
1 parent 41ec926 commit 28631ef

File tree

1 file changed

+33
-13
lines changed

1 file changed

+33
-13
lines changed

src/data/v01.cairo

+33-13
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,15 @@ fn ids(faction: felt252) -> Option<Span<u8>> {
119119
} else if faction == FACTION_03 {
120120
return Option::Some(array![15, 16, 17, 18, 19].span());
121121
} else if faction == FACTION_04 {
122-
return Option::Some(array![20, 21, 22, 23, 24, 25, 26].span());
122+
return Option::Some(array![20, 22, 23, 24, 25, 26].span());
123123
} else if faction == FACTION_05 {
124-
return Option::Some(array![27, 28, 29, 30, 31, 32].span());
124+
return Option::Some(array![21, 27, 28, 29, 30, 31, 32].span());
125125
} else if faction == FACTION_06 {
126126
return Option::Some(array![33, 34, 35, 36].span());
127127
} else if faction == FACTION_07 {
128128
return Option::Some(array![37, 38, 39, 40, 41].span());
129129
} else if faction == FACTION_08 {
130-
return Option::Some(array![42, 43, 44, 45, 46, 47, 48, 49,].span());
130+
return Option::Some(array![42, 43, 44, 45, 46, 47, 48, 49, 50].span());
131131
} else {
132132
return Option::None;
133133
}
@@ -141,8 +141,12 @@ fn ids(faction: felt252) -> Option<Span<u8>> {
141141
#[inline(always)]
142142
fn score(faction: felt252) -> Option<u32> {
143143
match ids(faction) {
144-
Option::Some(_ids) => { Option::Some((_ids.len() - 1) / 2) },
145-
Option::None => { Option::None },
144+
Option::Some(_ids) => {
145+
Option::Some((_ids.len() / 2) + 1)
146+
},
147+
Option::None => {
148+
Option::None
149+
},
146150
}
147151
}
148152

@@ -267,13 +271,29 @@ fn neighbors(id: u8) -> Option<Span<u8>> {
267271
fn start_supply(player_count: u8) -> u32 {
268272
let felt: felt252 = player_count.into();
269273
match felt {
270-
0 => { 0 },
271-
1 => { 0 },
272-
2 => { 40 },
273-
3 => { 35 },
274-
4 => { 30 },
275-
5 => { 25 },
276-
6 => { 20 },
277-
_ => { 0 },
274+
0 => {
275+
0
276+
},
277+
1 => {
278+
0
279+
},
280+
2 => {
281+
40
282+
},
283+
3 => {
284+
35
285+
},
286+
4 => {
287+
30
288+
},
289+
5 => {
290+
25
291+
},
292+
6 => {
293+
20
294+
},
295+
_ => {
296+
0
297+
},
278298
}
279299
}

0 commit comments

Comments
 (0)