v1.0.19

ricott1 · Oct 23, 2024 · 65446aa · 65446aa
1 parent 02d55ca
commit 65446aa
Show file tree

Hide file tree

Showing 135 changed files with 3,955 additions and 6,076 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rebels"
-version = "1.0.18"
+version = "1.0.19"
 edition = "2021"
 
 [profile.release]
@@ -16,16 +16,17 @@ opt-level = 1
 opt-level = 3
 
 [dependencies]
-anyhow = "1.0.89"
+anyhow = "1.0.91"
 async-trait = "0.1.83"
 chrono = "0.4.38"
-clap = { version = "4.5.19", features = ["derive"] }
+clap = { version = "4.5.20", features = ["derive"] }
 crossterm = "0.28.1"
 directories = "5.0.1"
 ed25519-dalek = "2.1.1"
 futures = "0.3.30"
 gif = "0.13.1"
-image = "0.25.2"
+glam = "0.29.0"
+image = "0.25.4"
 imageproc = "0.25.0"
 include_dir = "0.7.4"
 itertools = "0.13.0"
@@ -42,25 +43,25 @@ libp2p = { version = "0.52.4", features = [
 ] }
 log = "0.4.22"
 log4rs = { version = "1.3.0", features = ["file_appender", "pattern_encoder"] }
-once_cell = "1.20.1"
+once_cell = "1.20.2"
 rand = "0.8.5"
 rand_chacha = "0.3.1"
 rand_distr = "0.4.3"
-ratatui = { git = "https://github.com/ratatui/ratatui", features = ["unstable-backend-writer"] }
+ratatui = { version = "0.29.0", features = ["unstable-backend-writer"] }
 rodio = "0.19.0"
 russh = "0.45.0"
 russh-keys = "0.45.0"
-serde = { version = "1.0.210", features = ["derive", "default"] }
-serde_json = "1.0.128"
+serde = { version = "1.0.212", features = ["derive", "default"] }
+serde_json = "1.0.132"
 serde_repr = "0.1.19"
 sha2 = "0.10.8"
 stream-download = { version = "0.9.0", features = ["reqwest-rustls"] }
 strum = { version = "0.26.3", features = ["derive"] }
 strum_macros = "0.26.4"
-tokio = { version = "1.40.0", features = ["full"] }
+tokio = { version = "1.41.0", features = ["full"] }
 tokio-util = "0.7.12"
-tui-textarea = {git= "https://github.com/ricott1/tui-textarea" }
+tui-textarea = "0.7.0"
 unicode-width = "0.2.0"
 url = "2.5.2"
-uuid = { version = "1.10.0", features = ["v4", "serde"] }
+uuid = { version = "1.11.0", features = ["v4", "serde"] }
 void = "1.0.2"
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # Rebels in the Sky
 
-![Splash screen](demo/demo.gif)
+
+https://github.com/user-attachments/assets/aaa02f04-06db-4da5-8fa4-732b60083e66
+
 
 It's the year 2101. Corporations have taken over the world.
 The only way to be free is to join a pirate crew and start plundering the galaxy. The only mean of survival is to play basketball.

diff --git a/assets/body/mask_devil0.png b/assets/body/mask_devil0.png
diff --git a/assets/body/mask_devil10.png b/assets/body/mask_devil10.png
diff --git a/assets/body/mask_devil12.png b/assets/body/mask_devil12.png
diff --git a/assets/body/mask_devil3.png b/assets/body/mask_devil3.png
diff --git a/assets/body/mask_devil5.png b/assets/body/mask_devil5.png
diff --git a/assets/body/mask_devil7.png b/assets/body/mask_devil7.png
diff --git a/assets/body/mask_normal0.png b/assets/body/mask_normal0.png
diff --git a/assets/body/mask_normal10.png b/assets/body/mask_normal10.png
diff --git a/assets/body/mask_normal12.png b/assets/body/mask_normal12.png
diff --git a/assets/body/mask_normal3.png b/assets/body/mask_normal3.png
diff --git a/assets/body/mask_normal5.png b/assets/body/mask_normal5.png
diff --git a/assets/body/mask_normal7.png b/assets/body/mask_normal7.png
diff --git a/assets/data/planets_data.json b/assets/data/planets_data.json
@@ -72,7 +72,7 @@
             "4": 2
         },
         "filename": "weird",
-        "rotation_period": 12,
+        "rotation_period": 6,
         "revolution_period": 180,
         "gravity": 2,
         "asteroid_probability": 0.3,
@@ -97,7 +97,7 @@
             "3": 5,
             "4": 1},
         "filename": "redgreen",
-        "rotation_period": 12,
+        "rotation_period": 9,
         "revolution_period": 360,
         "gravity": 3,
         "asteroid_probability": 0.1,
@@ -220,7 +220,7 @@
             "3": 16
         },
         "filename": "gas",
-        "rotation_period": 12,
+        "rotation_period": 9,
         "revolution_period": 360,
         "gravity": 25,
         "asteroid_probability": 0.95,
@@ -235,9 +235,9 @@
         "version": 0,
         "name": "Saturn",
         "populations": {
-            "1": 6,
-            "3": 3,
-            "102": 2,
+            "1": 2,
+            "3": 6,
+            "102": 1,
             "104": 2
         },
         "resources": {
@@ -246,7 +246,7 @@
             "3": 8
         },
         "filename": "ring",
-        "rotation_period": 12,
+        "rotation_period": 6,
         "revolution_period": 360,
         "gravity": 20,
         "asteroid_probability": 0.86,
@@ -267,7 +267,7 @@
             "3": 4
         },
         "filename": "ice",
-        "rotation_period": 12,
+        "rotation_period": 9,
         "revolution_period": 360,
         "gravity": 16,
         "asteroid_probability": 0.7,
@@ -295,7 +295,7 @@
             "4": 3
         },
         "filename": "rocky",
-        "rotation_period": 18,
+        "rotation_period": 9,
         "revolution_period": 120,
         "gravity": 2,
         "asteroid_probability": 0.0,
@@ -322,7 +322,7 @@
             "4": 2
         },
         "filename": "phobos",
-        "rotation_period": 12,
+        "rotation_period": 6,
         "revolution_period": 120,
         "gravity": 2,
         "asteroid_probability": 0.0,

diff --git a/assets/data/players_data.json b/assets/data/players_data.json
@@ -565,6 +565,7 @@
             "Rûbar",
             "Cegerxwîn",
             "Nûrî",
+            "Sardasht",
             "Berxwedan",
             "Berxwed"
         ],
@@ -858,6 +859,12 @@
             "Hatlar",
             "Sapanca",
             "Damla",
+            "Sapanka",
+            "Korolenko",
+            "Ocyan",
+            "Ozil",
+            "Mesut",
+            "Yildiz",
             "Dogal",
             "Suyu",
             "Adriyatik",

diff --git a/assets/data/playlist_data.json b/assets/data/playlist_data.json
diff --git a/assets/data/stream_data.json b/assets/data/stream_data.json
@@ -11,8 +11,20 @@
         "name": "LPAS Frittura",
         "url_string": "https://radio.frittura.org/lpas.ogg"
     },
+    {
+        "name": "Cumbia Frittura",
+        "url_string": "https://radio.frittura.org/pipa.ogg"
+    },
     {
         "name": "Matt Johnson radio",
         "url_string": "https://us2.internet-radio.com/proxy/mattjohnsonradio?mp=/stream"
+    },
+    {
+        "name" : "Lofi 24/7",
+        "url_string": "http://usa9.fastcast4u.com/proxy/jamz?mp=/1"
+    },
+    {
+        "name" : "Radio Sarajevo",
+        "url_string": "https://cast2.asurahosting.com/proxy/balkanhi/stream"
     }
 ]
diff --git a/assets/hat/maskoctopulp1.png b/assets/hat/maskoctopulp1.png
diff --git a/assets/hat/maskoctopulp2.png b/assets/hat/maskoctopulp2.png
diff --git a/assets/hull/mask_jester_standard.png b/assets/hull/mask_jester_standard.png
diff --git a/assets/hull/mask_pincher_large.png b/assets/hull/mask_pincher_large.png
diff --git a/assets/hull/mask_pincher_standard.png b/assets/hull/mask_pincher_standard.png
diff --git a/assets/hull/mask_shuttle_large.png b/assets/hull/mask_shuttle_large.png
diff --git a/assets/hull/mask_shuttle_small.png b/assets/hull/mask_shuttle_small.png
diff --git a/assets/hull/mask_shuttle_standard.png b/assets/hull/mask_shuttle_standard.png
diff --git a/assets/hull/pincher_standard.png b/assets/hull/pincher_standard.png
diff --git a/assets/pitch/away_close_shot_mask.png b/assets/pitch/away_close_shot_mask.png
diff --git a/assets/pitch/away_impossible_shot_mask.png b/assets/pitch/away_impossible_shot_mask.png
diff --git a/assets/pitch/away_long_shot_mask.png b/assets/pitch/away_long_shot_mask.png
diff --git a/assets/pitch/away_medium_shot_mask.png b/assets/pitch/away_medium_shot_mask.png
diff --git a/assets/pitch/home_close_shot_mask.png b/assets/pitch/home_close_shot_mask.png
diff --git a/assets/pitch/home_impossible_shot_mask.png b/assets/pitch/home_impossible_shot_mask.png
diff --git a/assets/pitch/home_long_shot_mask.png b/assets/pitch/home_long_shot_mask.png
diff --git a/assets/pitch/home_medium_shot_mask.png b/assets/pitch/home_medium_shot_mask.png
diff --git a/assets/pitch/pitch_ball.png b/assets/pitch/pitch_ball.png
diff --git a/assets/pitch/pitch_classic.png b/assets/pitch/pitch_classic.png
diff --git a/assets/planets/.DS_Store b/assets/planets/.DS_Store
diff --git a/assets/planets/ring_zoomout.gif b/assets/planets/ring_zoomout.gif
diff --git a/assets/space_adventure/asteroid_big3.png b/assets/space_adventure/asteroid_big3.png
diff --git a/assets/space_adventure/asteroid_fragment1.png b/assets/space_adventure/asteroid_fragment1.png
diff --git a/assets/space_adventure/asteroid_fragment2.png b/assets/space_adventure/asteroid_fragment2.png
diff --git a/assets/space_adventure/asteroid_fragment3.png b/assets/space_adventure/asteroid_fragment3.png
diff --git a/assets/space_adventure/asteroid_huge1.png b/assets/space_adventure/asteroid_huge1.png
diff --git a/assets/space_adventure/asteroid_huge2.png b/assets/space_adventure/asteroid_huge2.png
diff --git a/assets/space_adventure/asteroid_huge3.png b/assets/space_adventure/asteroid_huge3.png
diff --git a/assets/treasure/Group-4.png b/assets/treasure/Group-4.png
diff --git a/assets/treasure/Group-5.png b/assets/treasure/Group-5.png
diff --git a/assets/treasure/Group-6.png b/assets/treasure/Group-6.png
diff --git a/assets/treasure/Group-7.png b/assets/treasure/Group-7.png
diff --git a/assets/treasure/treasure0.png b/assets/treasure/treasure0.png
diff --git a/assets/treasure/treasure1.png b/assets/treasure/treasure1.png
diff --git a/assets/treasure/treasure2.png b/assets/treasure/treasure2.png
diff --git a/assets/treasure/treasure3.png b/assets/treasure/treasure3.png
diff --git a/demo/demo.gif b/demo/demo.gif
diff --git a/demo/demo_v1.0.18.mp4 b/demo/demo_v1.0.18.mp4