fix formatting

.gitea/workflows/publish.yaml

@@ -22,5 +22,7 @@ jobs:
           ls -al target/debian
           UPLOAD_FILE=$(ls target/debian/*.deb)
           curl --user jlusiardi:${{ secrets.UPLOAD_TOKEN }} --upload-file ${UPLOAD_FILE} https://gitea.intern.haus-in-hirschaid.de/api/packages/jlusiardi/debian/pool/bionic/main/upload          
-          echo ${DEPLOY_PRIVATE_KEY} > /tmp/ssh_key
+          echo -e "${{ secrets.DEPLOY_PRIVATE_KEY }}" > /tmp/ssh_key
-          scp -i /tmp/ssh_key ${UPLOAD_FILE} jlusiardi@april2023.lusiardi.de:/var/www/p17.lusiardi.de/el_diabolo
+          chmod 0600 /tmp/ssh_key
+          scp -o StrictHostKeyChecking=no -i /tmp/ssh_key ${UPLOAD_FILE} jlusiardi@april2023.lusiardi.de:/var/www/p17.lusiardi.de/el_diabolo
+          ssh -o StrictHostKeyChecking=no -i /tmp/ssh_key jlusiardi@april2023.lusiardi.de /var/www/p17.lusiardi.de/el_diabolo/generate_index.sh

Cargo.lock

@@ -147,7 +147,7 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "el_diabolo"
-version = "0.2.1"
+version = "0.2.3"
 dependencies = [
  "crossterm",
  "macros",

Cargo.toml

@@ -3,7 +3,7 @@ members = ["macros"]
 
 [package]
 name = "el_diabolo"
-version = "0.2.1"
+version = "0.2.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

macros/src/lib.rs

@@ -24,6 +24,7 @@ pub fn create_monsters(input: TokenStream) -> TokenStream {
             experience_gain: usize,
             ticks_between_steps: u128,
             damage_range: RangeInclusive<usize>,
+            defense: usize,
         }
         impl Monster for #variant_name {
             fn get_name(&self) -> &str { &self.name }
@@ -35,7 +36,7 @@ pub fn create_monsters(input: TokenStream) -> TokenStream {
             }
             fn get_ticks_between_steps(&self) -> u128 { self.ticks_between_steps }
             fn damage(&self) -> usize { rand::thread_rng().gen_range(self.damage_range.clone()) }
-
+            fn defense(&self) -> usize { self.defense }
             #[cfg(test)]
             fn get_life(&self) -> usize { self.life }
         }

src/constants.rs

@@ -1,6 +1,6 @@
 use std::{collections::HashMap, ops::RangeInclusive};
 
-use crate::{monster::MonsterTypes, room::RoomType};
+use crate::{monsters::MonsterTypes, room::RoomType};
 
 /// the number of rooms in vertical direction
 pub const ROOMS_HORIZONTAL: usize = 8;

src/game.rs

@@ -164,7 +164,7 @@ impl Game {
         match m {
             None => {}
             Some(m) => {
-                let player_dmg = self.player.damage();
+                let player_dmg = self.player.damage().saturating_sub(m.defense());
                 m.decrease_life(player_dmg);
                 if m.is_dead() {
                     let level_up: bool = self.player.gain_experience(m.get_experience_gain());
@@ -192,8 +192,8 @@ impl Game {
                         0,
                         format!("you hit {} for {} damage.", m.get_name(), player_dmg).to_string(),
                     );
-                    let monster_dmg = m.damage() as i16;
+                    let monster_dmg = m.damage().saturating_sub(self.player.defense());
-                    self.player.change_life(-monster_dmg);
+                    self.player.change_life(-(monster_dmg as i16));
 
                     self.messages.insert(
                         0,

src/level.rs

@@ -8,9 +8,9 @@ use crate::artifacts::Artifact;
 use crate::artifacts::{Chest, Potion};
 use crate::constants::LEVEL_HEIGHT;
 use crate::constants::LEVEL_WIDTH;
-use crate::monster::Monster;
+use crate::monsters::Monster;
 #[cfg(test)]
-use crate::monster::{Orc, Rat};
+use crate::monsters::{Orc, Rat};
 use crate::player::Player;
 use crate::position::HasPosition;
 use crate::position::Position;
@@ -147,8 +147,10 @@ impl Level {
                     if player.get_immutable_position().get_x() == new_x
                         && player.get_immutable_position().get_y() == new_y
                     {
-                        let monster_dmg = self.monsters[index].damage() as i16;
+                        let monster_dmg = self.monsters[index]
-                        player.change_life(-monster_dmg);
+                            .damage()
+                            .saturating_sub(player.defense());
+                        player.change_life(-(monster_dmg as i16));
                         if player.is_dead() {
                             messages.insert(
                                 0,
@@ -172,7 +174,9 @@ impl Level {
                             // player not dead => monster can occupy new position
                             self.monsters[index].get_position().change(-dx, -dy);
                             // player fights back
-                            let player_dmg = player.damage();
+                            let player_dmg = player
+                                .damage()
+                                .saturating_sub(self.monsters[index].defense());
                             self.monsters[index].decrease_life(player_dmg);
                             if self.monsters[index].is_dead() {
                                 let level_up: bool = player

src/level_generator.rs

@@ -13,8 +13,8 @@ use crate::artifacts::Potion;
 use crate::constants::get_monsters_per_level;
 use crate::constants::ROOM_HEIGHT;
 use crate::constants::ROOM_WIDTH;
-use crate::monster::create_monster_by_type;
+use crate::monsters::create_monster_by_type;
-use crate::monster::Monster;
+use crate::monsters::Monster;
 use crate::position::Position;
 use crate::room::Connection;
 use crate::{

src/level_ladder.rs

@@ -10,7 +10,7 @@ impl Iterator for LevelLadder {
         let current = self.curr;
 
         self.curr = self.next;
-        self.next = current + self.next;
+        self.next += current;
 
         // Since there's no endpoint to a Fibonacci sequence, the `Iterator`
         // will never return `None`, and `Some` is always returned.

src/main.rs

@@ -14,7 +14,6 @@ use crossterm::{
     ExecutableCommand,
 };
 use ratatui::prelude::*;
-use ratatui::widgets::block::{Position, Title};
 use ratatui::widgets::{Block, BorderType, Borders, Wrap};
 use ratatui::{
     prelude::{CrosstermBackend, Terminal},
@@ -32,12 +31,15 @@ mod constants;
 mod game;
 mod level;
 mod level_generator;
+mod level_ladder;
 mod level_widget;
-mod monster;
+mod monsters;
 mod player;
 mod position;
 mod room;
-mod level_ladder;
+
+const BACKGROUND_COLOR: Color = Color::DarkGray;
+const PANEL_BACKGROUND_COLOR: Color = Color::Black;
 
 //
 fn main() -> Result<()> {
@@ -54,7 +56,7 @@ fn main() -> Result<()> {
         terminal.draw(|frame| {
             let mut area = frame.area();
             frame.render_widget(
-                Block::default().style(Style::default().bg(Color::Green)),
+                Block::default().style(Style::default().bg(BACKGROUND_COLOR)),
                 area,
             );
 
@@ -101,20 +103,19 @@ fn main() -> Result<()> {
                 height: map_area.height / 2 + 1,
             };
             let block = Block::default()
-                .title(
+                .title_top(
-                    Title::from(format!(" {} ", game.get_player().get_name()))
+                    Line::from(format!(" {} ", game.get_player().get_name())).centered()
-                        .alignment(Alignment::Center)
-                        .position(Position::Top),
                 )
                 .borders(Borders::TOP)
                 .border_style(Style::default().fg(Color::White))
                 .border_type(BorderType::Rounded)
-                .style(Style::default().bg(Color::Blue));
+                .style(Style::default().bg(PANEL_BACKGROUND_COLOR));
             frame.render_widget(
                 Paragraph::new(format!(
-                    "Health: {} of {}\nExp: {}\nGold: {}\nLevel: {} of {}\nInventory used: {} of {}",
+                    "Health: {} of {}\nDefense: {}\nExp: {}\nGold: {}\nLevel: {} of {}\nInventory used: {} of {}",
                     game.get_player().get_life(),
                     game.get_player().get_max_life(),
+                    game.get_player().defense(),
                     game.get_player().get_experience(),
                     game.get_player().get_gold(),
                     game.get_player().get_immutable_position().get_level() + 1,
@@ -134,15 +135,13 @@ fn main() -> Result<()> {
             };
             // Display the latest messages from the game to the user
             let block = Block::default()
-                .title(
+                .title_top(
-                    Title::from(" messages ")
+                    Line::from(" messages ").centered()
-                        .alignment(Alignment::Center)
-                        .position(Position::Top),
                 )
                 .borders(Borders::TOP)
                 .border_style(Style::default().fg(Color::White))
                 .border_type(BorderType::Rounded)
-                .style(Style::default().bg(Color::Blue));
+                .style(Style::default().bg(PANEL_BACKGROUND_COLOR));
 
             let paragraph1 = if game.messages.is_empty() {
                 "".to_string()
@@ -219,12 +218,8 @@ fn main() -> Result<()> {
             area.width = 40;
             area.height = 20;
             let block = Block::default()
-                .title(
+                .title_top(Line::from(" Game ended ").centered())
-                    Title::from(" Game ended ")
+                .title_bottom(Line::from("Press `q` to quit!"))
-                        .alignment(Alignment::Center)
-                        .position(Position::Top),
-                )
-                .title(Title::from("Press `q` to quit!").position(Position::Bottom))
                 .borders(Borders::ALL)
                 .border_style(Style::default().fg(Color::White))
                 .border_type(BorderType::Rounded)

src/monsters.rs

@@ -16,6 +16,7 @@ pub trait Monster: HasPosition {
     #[cfg(test)]
     fn get_life(&self) -> usize;
     fn damage(&self) -> usize;
+    fn defense(&self) -> usize;
 }
 
 #[derive(CreateMonsters, PartialEq, Eq, Hash, Clone, Copy)]
@@ -49,6 +50,7 @@ create_monster!(
     experience_gain: 5,
     ticks_between_steps: 5,
     damage_range: 1..=2,
+    defense: 0,
 );
 
 create_monster!(
@@ -60,6 +62,7 @@ create_monster!(
     experience_gain: 7,
     ticks_between_steps: 7,
     damage_range: 2..=3,
+    defense: 0,
 );
 
 create_monster!(
@@ -71,6 +74,7 @@ create_monster!(
     experience_gain: 10,
     ticks_between_steps: 10,
     damage_range: 2..=3,
+    defense: 0,
 );
 
 create_monster!(
@@ -82,6 +86,7 @@ create_monster!(
     experience_gain: 10,
     ticks_between_steps: 20,
     damage_range: 1..=4,
+    defense: 0,
 );
 
 create_monster!(
@@ -93,6 +98,7 @@ create_monster!(
     experience_gain: 20,
     ticks_between_steps: 10,
     damage_range: 1..=5,
+    defense: 0,
 );
 
 pub fn create_monster_by_type(monster_type: &MonsterTypes, position: Position) -> Box<dyn Monster> {

src/player.rs

@@ -15,6 +15,7 @@ pub struct Player {
     inventory: Vec<Potion>,
     inventory_slots: usize,
     level: usize,
+    defense: usize,
 }
 
 impl Player {
@@ -29,6 +30,7 @@ impl Player {
             inventory: vec![],
             inventory_slots: 2,
             level: 1,
+            defense: 0,
         }
     }
     pub fn get_name(&self) -> String {
@@ -67,7 +69,9 @@ impl Player {
         for (i, level_step) in get_level_ladder().enumerate() {
             if self.experience <= level_step && self.experience + amount > level_step {
                 self.level += 1;
+                // make life gain depend on level?
                 self.max_life += 5;
+                self.defense += 1;
                 self.life = self.max_life;
                 result = true;
                 break;
@@ -92,6 +96,10 @@ impl Player {
         rand::thread_rng().gen_range(1..4)
     }
 
+    pub fn defense(&self) -> usize {
+        self.defense
+    }
+    
     pub fn add_to_inventory(&mut self, potion: &Potion) -> bool {
         if self.inventory.len() < self.inventory_slots {
             self.inventory.push(*potion);
@@ -138,6 +146,7 @@ fn test_get_name() {
         inventory: vec![],
         inventory_slots: 1,
         level: 0,
+        defense: 0,
     };
     assert_eq!(p.get_name(), "Teddy Tester");
 }
@@ -164,6 +173,7 @@ fn test_change_life() {
         inventory: vec![],
         inventory_slots: 1,
         level: 0,
+        defense: 0,
     };
     assert_eq!(p.get_life(), 5);
     p.change_life(-2);
@@ -200,6 +210,7 @@ fn test_max_life() {
         inventory: vec![],
         inventory_slots: 1,
         level: 0,
+        defense: 0,
     };
     assert_eq!(p.get_max_life(), 10);
 }