jlusiardi
/
el_diablo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fixes

This commit is contained in:
Joachim Lusiardi 2024-11-07 09:22:19 +01:00
parent 542616cb0b
commit ef3a6026f5
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/publish.yaml
View File

@ -23,4 +23,4 @@ jobs:
UPLOAD_FILE=$(ls target/debian/*.deb) 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 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 ${DEPLOY_PRIVATE_KEY} > /tmp/ssh_key
scp -i /tmp/ssh_key ${UPLOAD_FILE} jlusiardi@april2023.lusiardi.de:/var/www/p17.lusiardi.de/el_diabolo scp -o StrictHostKeyChecking=no -i /tmp/ssh_key ${UPLOAD_FILE} jlusiardi@april2023.lusiardi.de:/var/www/p17.lusiardi.de/el_diabolo

4
src/level_ladder.rs
View File

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

23
src/main.rs
View File

@ -14,7 +14,6 @@ use crossterm::{
ExecutableCommand, ExecutableCommand,
}; };
use ratatui::prelude::*; use ratatui::prelude::*;
use ratatui::widgets::block::{Position, Title};
use ratatui::widgets::{Block, BorderType, Borders, Wrap}; use ratatui::widgets::{Block, BorderType, Borders, Wrap};
use ratatui::{ use ratatui::{
prelude::{CrosstermBackend, Terminal}, prelude::{CrosstermBackend, Terminal},
@ -32,12 +31,12 @@ mod constants;
mod game; mod game;
mod level; mod level;
mod level_generator; mod level_generator;
mod level_ladder;
mod level_widget; mod level_widget;
mod monster; mod monster;
mod player; mod player;
mod position; mod position;
mod room; mod room;
mod level_ladder;
// //
fn main() -> Result<()> { fn main() -> Result<()> {
@ -101,10 +100,8 @@ fn main() -> Result<()> {
height: map_area.height / 2 + 1, height: map_area.height / 2 + 1,
}; };
let block = Block::default() 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) .borders(Borders::TOP)
.border_style(Style::default().fg(Color::White)) .border_style(Style::default().fg(Color::White))
@ -134,10 +131,8 @@ fn main() -> Result<()> {
}; };
// Display the latest messages from the game to the user // Display the latest messages from the game to the user
let block = Block::default() let block = Block::default()
.title( .title_top(
Title::from(" messages ") Line::from(" messages ").centered()
.alignment(Alignment::Center)
.position(Position::Top),
) )
.borders(Borders::TOP) .borders(Borders::TOP)
.border_style(Style::default().fg(Color::White)) .border_style(Style::default().fg(Color::White))
@ -219,12 +214,8 @@ fn main() -> Result<()> {
area.width = 40; area.width = 40;
area.height = 20; area.height = 20;
let block = Block::default() 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) .borders(Borders::ALL)
.border_style(Style::default().fg(Color::White)) .border_style(Style::default().fg(Color::White))
.border_type(BorderType::Rounded) .border_type(BorderType::Rounded)