Merge branch 'master' of https://gitea.pcornatcloud.fr/Pcornat/BillySheet-Rust

src/main.rs

@@ -9,7 +9,7 @@ fn main() {
         options,
         Box::new(|_ctx| {
             // ctx.egui_ctx.options().screen_reader = true;
-            Box::new(Gui::default())
+            Box::<Gui>::default()
         }),
     );
 }
@@ -41,13 +41,14 @@ impl eframe::App for Gui {
                     }
                 });
                 if ui.button(format!("Edit mode {}", self.edit_mode)).clicked() {
-                    self.edit_mode = !self.edit_mode.clone();
+                    self.edit_mode = !self.edit_mode;
                 }
             });
         });
         egui::CentralPanel::default().show(ctx, |ui| {
             ui.heading("My egui Application");
             ui.separator();
+            ui.label("Caractère");
             ui.vertical_centered_justified(|ui| {
                 let mut tmp_str = self.test.character().to_string();
                 ui.text_edit_multiline(&mut tmp_str);

src/sheet.rs

@@ -1,9 +1,13 @@
 use eframe::egui::widgets::DragValue;
 use eframe::egui::Ui;
+<<<<<<< HEAD
+=======
+use serde::{Deserialize, Serialize};
+>>>>>>> 281e4eb9f0a44494530a7bc3422fcd557a26088f
 
 use crate::gui::SheetGui;
 
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub enum Classe {
     Warrior,
     Cautious,
@@ -11,7 +15,7 @@ pub enum Classe {
     Resourceful,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 enum CharacteristicType {
     Address,
     Stamina,
@@ -19,7 +23,7 @@ enum CharacteristicType {
     Skill,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct CharacterSheet {
     character_class: Classe,
     /// Field to write the personality/
@@ -82,6 +86,7 @@ impl SheetGui for CharacterSheet {
         let mut carac = character_field.carac;
         let mut materiel = character_field.materiel;
         ui.heading(category);
+<<<<<<< HEAD
         ui.columns(2, |columns| {
             let mut ui_column = &mut columns[0];
             ui_column.label("Base");
@@ -137,10 +142,68 @@ impl SheetGui for CharacterSheet {
                 ui.add(DragValue::new(&mut armor));
             });
         });
+=======
+        ui.horizontal(|ui| {
+            ui.label("Base");
+            ui.add(DragValue::new(&mut base));
+        });
+        ui.horizontal(|ui| {
+            ui.label("Carac.");
+            ui.add(DragValue::new(&mut carac));
+        });
+        ui.horizontal(|ui| {
+            ui.label("Matériel");
+            ui.add(DragValue::new(&mut materiel));
+        });
+        (base, carac, materiel)
+    }
+
+    fn gui_address(&mut self, ui: &mut Ui) {
+        let workaround = self as &CharacterSheet;
+        (self.address.base, self.address.carac, self.address.materiel) =
+            self.shortcut(ui, "Adresse", workaround.address());
+        ui.label("Ne peut dépasser 5");
+    }
+
+    fn gui_stamina(&mut self, ui: &mut Ui) {
+        let workaround = self as &CharacterSheet;
+        (self.stamina.base, self.stamina.carac, self.stamina.materiel) =
+            self.shortcut(ui, "Endurance", workaround.stamina());
+    }
+
+    fn gui_luck(&mut self, ui: &mut Ui) {
+        let workaround = self as &CharacterSheet;
+        (self.luck.base, self.luck.carac, self.luck.materiel) =
+            self.shortcut(ui, "Chance", workaround.luck());
+    }
+
+    fn gui_skill(&mut self, ui: &mut Ui) {
+        let workaround = self as &CharacterSheet;
+        (self.skill.base, self.skill.carac, self.skill.materiel) =
+            self.shortcut(ui, "Habileté", workaround.skill());
+    }
+
+    fn secondary_stats(&mut self, ui: &mut Ui) {
+        let workaround = self as &CharacterSheet;
+        let mut damage = workaround.damage;
+        let mut armor = workaround.armor;
+
+        ui.heading("Stat. secondaires");
+        ui.horizontal(|ui| {
+            ui.label("Dégâts");
+            ui.add(DragValue::new(&mut damage));
+        });
+
+        ui.horizontal(|ui| {
+            ui.label("Armure");
+            ui.add(DragValue::new(&mut armor));
+        });
+        ui.label("Critique");
+>>>>>>> 281e4eb9f0a44494530a7bc3422fcd557a26088f
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct Characteristic {
     characteristic_type: CharacteristicType,
     pub base: u32,