Skip to content

Commit fd8ec64

Browse files
ricott1ricott1
committed
v1.0.29
1 parent be3025b commit fd8ec64

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+919
-736
lines changed

‎Cargo.lock

+435-402
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+16-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rebels"
3-
version = "1.0.28"
3+
version = "1.0.29"
44
edition = "2021"
55
authors = ["Alessandro Ricottone <[email protected]>"]
66
license = "GPL-3.0-or-later"
@@ -25,17 +25,16 @@ opt-level = 1
2525
opt-level = 3
2626

2727
[dependencies]
28-
anyhow = "1.0.93"
29-
async-trait = "0.1.83"
28+
anyhow = "1.0.96"
3029
chrono = "0.4.39"
31-
clap = { version = "4.5.21", features = ["derive"] }
30+
clap = { version = "4.5.30", features = ["derive"] }
3231
crossterm = "0.28.1"
3332
directories = "6.0.0"
3433
ed25519-dalek = "2.1.1"
3534
flate2 = { version = "1.0.35", features = ["zlib-ng"], default-features = false }
3635
futures = "0.3.30"
3736
gif = "0.13.1"
38-
glam = "0.29.2"
37+
glam = "0.30.0"
3938
image = "0.25.5"
4039
imageproc = "0.25.0"
4140
include_dir = "0.7.4"
@@ -53,27 +52,26 @@ libp2p = { version = "0.55.0", features = [
5352
"yamux",
5453
] }
5554
libp2p-swarm-test = "0.5.0"
56-
log = "0.4.25"
55+
log = "0.4.26"
5756
log4rs = { version = "1.3.0", features = ["file_appender", "pattern_encoder"] }
58-
once_cell = "1.20.2"
59-
rand = "0.8.5"
60-
rand_chacha = "0.3.1"
61-
rand_distr = "0.4.3"
57+
once_cell = "1.20.3"
58+
rand = "0.9.0"
59+
rand_chacha = "0.9.0"
60+
rand_distr = "0.5.1"
6261
ratatui = { version = "0.29.0", features = ["unstable-backend-writer"] }
6362
rodio = "0.20.1"
64-
russh = "0.49.0"
65-
russh-keys = "0.49.0"
66-
serde = { version = "1.0.216", features = ["derive", "default"] }
67-
serde_json = "1.0.133"
63+
russh = "0.50.4"
64+
serde = { version = "1.0.218", features = ["derive", "default"] }
65+
serde_json = "1.0.139"
6866
serde_repr = "0.1.19"
6967
sha2 = "0.10.8"
70-
stream-download = { version = "0.14.0", features = ["reqwest-rustls"] }
71-
strum = { version = "0.26.3", features = ["derive"] }
72-
strum_macros = "0.26.4"
68+
stream-download = { version = "0.15.1", features = ["reqwest-rustls"] }
69+
strum = { version = "0.27.1", features = ["derive"] }
70+
strum_macros = "0.27.1"
7371
tokio = { version = "1.41.1", features = ["full"] }
7472
tokio-util = "0.7.12"
7573
tui-textarea = "0.7.0"
7674
unicode-width = "0.2.0"
7775
url = "2.5.4"
78-
uuid = { version = "1.12.0", features = ["v4", "serde"] }
76+
uuid = { version = "1.14.0", features = ["v4", "serde"] }
7977
void = "1.0.2"

‎assets/data/players_data.json

+69-15
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"Gianfranco",
2424
"Franco",
2525
"Francesco",
26+
"Dante",
2627
"Fabio",
2728
"Melchiorre",
2829
"Vitaliano",
@@ -48,6 +49,7 @@
4849
"Valentina",
4950
"Emma",
5051
"Francesca",
52+
"Ines",
5153
"Chiara",
5254
"Aria",
5355
"Elena",
@@ -69,11 +71,20 @@
6971
"Indovina",
7072
"Gattolo",
7173
"Pappagallo",
74+
"Tomino",
7275
"Pappalardo",
7376
"Pizzaiolo",
77+
"Tomba",
78+
"Ovunque",
79+
"Altrove",
80+
"Rana",
7481
"Immordino",
7582
"Basile",
7683
"Poretto",
84+
"Oltraggio",
85+
"Sacco",
86+
"Pistacchio",
87+
"Vanzetti",
7788
"Confalonieri",
7889
"Turturro",
7990
"Aquilani",
@@ -88,7 +99,8 @@
8899
"Boniperti",
89100
"Salmastro",
90101
"Salamone",
91-
"Gramsci"
102+
"Gramsci",
103+
"Mascara"
92104
]
93105
},
94106
"101": {
@@ -163,7 +175,18 @@
163175
"Jimenez",
164176
"Lopez",
165177
"Zorro",
166-
"Martinez"
178+
"Martinez",
179+
"Mendoza",
180+
"Munoz",
181+
"Ortega",
182+
"Perez",
183+
"Ramirez",
184+
"Rodriguez",
185+
"Romero",
186+
"Salazar",
187+
"Santos",
188+
"Soto",
189+
"Torres"
167190
]
168191
},
169192
"102": {
@@ -187,6 +210,7 @@
187210
"Karl",
188211
"Fritz",
189212
"Friedhelm",
213+
"Wilhelm",
190214
"Frieder",
191215
"Wilhelm III",
192216
"August",
@@ -206,6 +230,8 @@
206230
"Mia",
207231
"Hannah",
208232
"Lea",
233+
"Lena",
234+
"Sophia",
209235
"Emilia",
210236
"Marie",
211237
"Lina",
@@ -218,6 +244,7 @@
218244
"Frieda",
219245
"Zoe",
220246
"Alina",
247+
"Lara",
221248
"Maja"
222249
],
223250
"last_names": [
@@ -244,7 +271,8 @@
244271
"Krecik",
245272
"Finow",
246273
"Kreuzberg",
247-
"Grundig"
274+
"Grundig",
275+
"Kreuzer"
248276
]
249277
},
250278
"103": {
@@ -268,7 +296,8 @@
268296
"Achilleas",
269297
"Aristotelis",
270298
"Aristides",
271-
"Aristarchus"
299+
"Aristarchus",
300+
"Aristo"
272301
],
273302
"first_names_she": [
274303
"Eleni",
@@ -291,7 +320,8 @@
291320
"Cassandra",
292321
"Persephon",
293322
"Aphrodite",
294-
"Hera"
323+
"Hera",
324+
"Artemis"
295325
],
296326
"last_names": [
297327
"Xenakis",
@@ -312,7 +342,10 @@
312342
"Tsakalotos",
313343
"Zografakis",
314344
"Xydakis",
315-
"Nikolaidis"
345+
"Nikolaidis",
346+
"Katsaros",
347+
"Katsarou",
348+
"Katsaroula"
316349
]
317350
},
318351
"104": {
@@ -334,7 +367,9 @@
334367
"Timilehin",
335368
"Uvo",
336369
"Georgia",
337-
"Marimba"
370+
"Marimba",
371+
"Ngozi",
372+
"Ogechi"
338373
],
339374
"first_names_she": [
340375
"Amina",
@@ -382,7 +417,9 @@
382417
"Oteh",
383418
"Igbinoghene",
384419
"Babayaro",
385-
"Ogbu"
420+
"Ogbu",
421+
"Ogbeide",
422+
"Ogbeifun"
386423
]
387424
},
388425
"105": {
@@ -406,7 +443,12 @@
406443
"Vishi",
407444
"Gukesh",
408445
"Vidit",
409-
"Praanandha"
446+
"Praanandha",
447+
"Srikanth",
448+
"Srinivas",
449+
"Srinath",
450+
"Srinidhi",
451+
"Srinivasan"
410452
],
411453
"first_names_she": [
412454
"Anika",
@@ -452,6 +494,8 @@
452494
"Nambiar",
453495
"Walia",
454496
"Tiwari",
497+
"Sethi",
498+
"Seth",
455499
"Bose",
456500
"Bhattacharya",
457501
"Chatterjee",
@@ -463,7 +507,9 @@
463507
"Dasgupta",
464508
"Sumar",
465509
"Shrivastava",
466-
"Shiva"
510+
"Shiva",
511+
"Shukla",
512+
"Sharma"
467513
]
468514
},
469515
"106": {
@@ -547,7 +593,8 @@
547593
"Zubiaurre",
548594
"Bengoetxea",
549595
"Landa",
550-
"Sarasola"
596+
"Sarasola",
597+
"Zubizarreta"
551598
]
552599
},
553600
"107": {
@@ -685,7 +732,10 @@
685732
"Abu Ghazaleh",
686733
"Tamimi",
687734
"Haddad",
688-
"Khreis"
735+
"Khreis",
736+
"Alami",
737+
"Khoury",
738+
"Khalil"
689739
]
690740
},
691741
"109": {
@@ -879,7 +929,9 @@
879929
"Taksim",
880930
"Guzel",
881931
"Sabalama",
882-
"Urca"
932+
"Urca",
933+
"Korolenko",
934+
"Ocyan"
883935
]
884936
},
885937
"2": {
@@ -900,7 +952,8 @@
900952
"Pan In",
901953
"Piz Zett",
902954
"Sfogliatell",
903-
"Riccett"
955+
"Riccett",
956+
"Pro Sciutt"
904957
],
905958
"first_names_she": [
906959
"Umidin",
@@ -942,7 +995,8 @@
942995
"Leessat",
943996
"Crud",
944997
"Pizzat",
945-
"Be'n'Cott"
998+
"Be'n'Cott",
999+
"Su-Shi"
9461000
]
9471001
},
9481002
"3": {

‎assets/data/stream_data.json

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
[
22
{
33
"name": "Radio Frittura",
4-
"url_string": "https://radio.frittura.org/rebels.ogg"
5-
},
6-
{
7-
"name": "Party Frittura",
8-
"url_string": "https://radio.frittura.org/party.ogg"
9-
},
10-
{
11-
"name": "LPAS Frittura",
12-
"url_string": "https://radio.frittura.org/lpas.ogg"
13-
},
14-
{
15-
"name": "Cumbia Frittura",
16-
"url_string": "https://radio.frittura.org/pipa.ogg"
4+
"url_string": "https://radio.frittura.org/frittura.ogg"
175
},
186
{
197
"name": "Matt Johnson radio",

‎src/app.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ impl App {
8787
while self.world.is_simulating() {
8888
// Give a visual feedback by drawing.
8989
let now = Tick::now();
90+
9091
if now.saturating_sub(last_tui_update) > tui.simulation_update_interval() {
9192
last_tui_update = now;
9293
if let Err(e) = self.ui.update(&self.world, self.audio_player.as_ref()) {
@@ -172,7 +173,7 @@ impl App {
172173
.expect("There should be at elast one planet")
173174
.clone();
174175
app.world.own_team_id = app.world.generate_random_team(
175-
&mut ChaCha8Rng::from_entropy(),
176+
&mut ChaCha8Rng::from_os_rng(),
176177
home_planet_id,
177178
"own team".into(),
178179
"ship_name".into(),
@@ -192,7 +193,7 @@ impl App {
192193
.expect("There should be at elast one planet")
193194
.clone();
194195
app.world.own_team_id = app.world.generate_random_team(
195-
&mut ChaCha8Rng::from_entropy(),
196+
&mut ChaCha8Rng::from_os_rng(),
196197
home_planet_id,
197198
"own team".into(),
198199
"ship_name".into(),
@@ -282,7 +283,7 @@ impl App {
282283
app_event = tui.events.next() => {
283284
match app_event{
284285
TerminalEvent::Tick {tick} => {
285-
self.handle_tick_events(tick)?;
286+
self.handle_tick_events(tick)?;
286287
if let Err(e) = tui.draw(&mut self.ui, &self.world, self.audio_player.as_ref()).await {
287288
error!("Drawing error: {e}");
288289
}

0 commit comments

Comments
 (0)