Compare commits
No commits in common. "main" and "new_level_generation" have entirely different histories.
main
...
new_level_
|
|
@ -22,7 +22,3 @@ 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 -e "${{ secrets.DEPLOY_PRIVATE_KEY }}" > /tmp/ssh_key
|
||||
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
|
||||
|
|
@ -147,7 +147,7 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
|
|||
|
||||
[[package]]
|
||||
name = "el_diabolo"
|
||||
version = "0.2.2"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"crossterm",
|
||||
"macros",
|
||||
|
|
@ -234,12 +234,6 @@ dependencies = [
|
|||
"hashbrown",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "indoc"
|
||||
version = "2.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
|
||||
|
||||
[[package]]
|
||||
name = "instability"
|
||||
version = "0.3.2"
|
||||
|
|
@ -435,23 +429,23 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "ratatui"
|
||||
version = "0.29.0"
|
||||
version = "0.28.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b"
|
||||
checksum = "fdef7f9be5c0122f890d58bdf4d964349ba6a6161f705907526d891efabba57d"
|
||||
dependencies = [
|
||||
"bitflags 2.4.1",
|
||||
"cassowary",
|
||||
"compact_str",
|
||||
"crossterm",
|
||||
"indoc",
|
||||
"instability",
|
||||
"itertools",
|
||||
"lru",
|
||||
"paste",
|
||||
"strum",
|
||||
"strum_macros",
|
||||
"unicode-segmentation",
|
||||
"unicode-truncate",
|
||||
"unicode-width 0.2.0",
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -604,7 +598,7 @@ checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf"
|
|||
dependencies = [
|
||||
"itertools",
|
||||
"unicode-segmentation",
|
||||
"unicode-width 0.1.14",
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -613,12 +607,6 @@ version = "0.1.14"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
version = "0.9.4"
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@ members = ["macros"]
|
|||
|
||||
[package]
|
||||
name = "el_diabolo"
|
||||
version = "0.2.2"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
ratatui = "0.29.0"
|
||||
ratatui = "0.28.1"
|
||||
crossterm = "0.28.1"
|
||||
rand = "0.8.5"
|
||||
petgraph = "0.6.5"
|
||||
|
|
|
|||
12
src/game.rs
12
src/game.rs
|
|
@ -167,7 +167,7 @@ impl Game {
|
|||
let player_dmg = self.player.damage();
|
||||
m.decrease_life(player_dmg);
|
||||
if m.is_dead() {
|
||||
let level_up: bool = self.player.gain_experience(m.get_experience_gain());
|
||||
self.player.gain_experience(m.get_experience_gain());
|
||||
self.messages.insert(
|
||||
0,
|
||||
format!(
|
||||
|
|
@ -177,16 +177,6 @@ impl Game {
|
|||
)
|
||||
.to_string(),
|
||||
);
|
||||
if level_up {
|
||||
self.messages.insert(
|
||||
0,
|
||||
format!(
|
||||
"you reach a new experience level, it's now {}",
|
||||
self.player.get_experience_level(),
|
||||
)
|
||||
.to_string(),
|
||||
);
|
||||
}
|
||||
} else {
|
||||
self.messages.insert(
|
||||
0,
|
||||
|
|
|
|||
63
src/level.rs
63
src/level.rs
|
|
@ -149,64 +149,41 @@ impl Level {
|
|||
{
|
||||
let monster_dmg = self.monsters[index].damage() as i16;
|
||||
player.change_life(-monster_dmg);
|
||||
if player.is_dead() {
|
||||
messages.insert(
|
||||
0,
|
||||
format!(
|
||||
"{} hits you for {} damage.",
|
||||
self.monsters[index].get_name(),
|
||||
monster_dmg
|
||||
)
|
||||
.to_string(),
|
||||
);
|
||||
|
||||
let player_dmg = player.damage();
|
||||
self.monsters[index].decrease_life(player_dmg);
|
||||
|
||||
// if the attack did not kill the opponent, back down
|
||||
if !player.is_dead() {
|
||||
messages.insert(
|
||||
0,
|
||||
format!(
|
||||
"{} hits you for {} damage and kills you.",
|
||||
"you hit {} for {} damage and kill it.",
|
||||
self.monsters[index].get_name(),
|
||||
monster_dmg
|
||||
player_dmg
|
||||
)
|
||||
.to_string(),
|
||||
);
|
||||
self.monsters[index].get_position().change(-dx, -dy);
|
||||
} else {
|
||||
messages.insert(
|
||||
0,
|
||||
format!(
|
||||
"{} hits you for {} damage.",
|
||||
"you hit {} for {} damage.",
|
||||
self.monsters[index].get_name(),
|
||||
monster_dmg
|
||||
player_dmg
|
||||
)
|
||||
.to_string(),
|
||||
);
|
||||
// player not dead => monster can occupy new position
|
||||
self.monsters[index].get_position().change(-dx, -dy);
|
||||
// player fights back
|
||||
let player_dmg = player.damage();
|
||||
self.monsters[index].decrease_life(player_dmg);
|
||||
if self.monsters[index].is_dead() {
|
||||
let level_up: bool = player
|
||||
.gain_experience(self.monsters[index].get_experience_gain());
|
||||
messages.insert(
|
||||
0,
|
||||
format!(
|
||||
"you hit {} for {} damage and kill it.",
|
||||
self.monsters[index].get_name(),
|
||||
player_dmg
|
||||
)
|
||||
.to_string(),
|
||||
);
|
||||
if level_up {
|
||||
messages.insert(
|
||||
0,
|
||||
format!(
|
||||
"you reach a new experience level, it's now {}",
|
||||
player.get_experience_level(),
|
||||
)
|
||||
.to_string(),
|
||||
);
|
||||
}
|
||||
} else {
|
||||
messages.insert(
|
||||
0,
|
||||
format!(
|
||||
"you hit {} for {} damage.",
|
||||
self.monsters[index].get_name(),
|
||||
player_dmg
|
||||
)
|
||||
.to_string(),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -540,12 +540,12 @@ fn test_create_mst() {
|
|||
rooms[3][3].kind = RoomType::BasicRoom;
|
||||
let res = LevelGenerator::create_mst(&rooms);
|
||||
assert_eq!(res.node_count(), 4);
|
||||
assert_eq!(res.edge_count(), 4);
|
||||
assert_eq!(res.edge_count(), 3);
|
||||
|
||||
rooms[3][5].kind = RoomType::BasicRoom;
|
||||
let res = LevelGenerator::create_mst(&rooms);
|
||||
assert_eq!(res.node_count(), 5);
|
||||
assert_eq!(res.edge_count(), 5);
|
||||
assert_eq!(res.edge_count(), 4);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
pub struct LevelLadder {
|
||||
curr: usize,
|
||||
next: usize,
|
||||
}
|
||||
|
||||
impl Iterator for LevelLadder {
|
||||
type Item = usize;
|
||||
|
||||
fn next(&mut self) -> Option<Self::Item> {
|
||||
let current = self.curr;
|
||||
|
||||
self.curr = 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.
|
||||
Some(current * 30)
|
||||
}
|
||||
}
|
||||
|
||||
// Returns a Fibonacci sequence generator
|
||||
pub fn get_level_ladder() -> LevelLadder {
|
||||
LevelLadder { curr: 1, next: 2 }
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_level_ladder() {
|
||||
let mut iter = get_level_ladder();
|
||||
assert_eq!(iter.next(), Some(30));
|
||||
}
|
||||
22
src/main.rs
22
src/main.rs
|
|
@ -14,6 +14,7 @@ use crossterm::{
|
|||
ExecutableCommand,
|
||||
};
|
||||
use ratatui::prelude::*;
|
||||
use ratatui::widgets::block::{Position, Title};
|
||||
use ratatui::widgets::{Block, BorderType, Borders, Wrap};
|
||||
use ratatui::{
|
||||
prelude::{CrosstermBackend, Terminal},
|
||||
|
|
@ -31,7 +32,6 @@ mod constants;
|
|||
mod game;
|
||||
mod level;
|
||||
mod level_generator;
|
||||
mod level_ladder;
|
||||
mod level_widget;
|
||||
mod monster;
|
||||
mod player;
|
||||
|
|
@ -100,8 +100,10 @@ fn main() -> Result<()> {
|
|||
height: map_area.height / 2 + 1,
|
||||
};
|
||||
let block = Block::default()
|
||||
.title_top(
|
||||
Line::from(format!(" {} ", game.get_player().get_name())).centered()
|
||||
.title(
|
||||
Title::from(format!(" {} ", game.get_player().get_name()))
|
||||
.alignment(Alignment::Center)
|
||||
.position(Position::Top),
|
||||
)
|
||||
.borders(Borders::TOP)
|
||||
.border_style(Style::default().fg(Color::White))
|
||||
|
|
@ -131,8 +133,10 @@ fn main() -> Result<()> {
|
|||
};
|
||||
// Display the latest messages from the game to the user
|
||||
let block = Block::default()
|
||||
.title_top(
|
||||
Line::from(" messages ").centered()
|
||||
.title(
|
||||
Title::from(" messages ")
|
||||
.alignment(Alignment::Center)
|
||||
.position(Position::Top),
|
||||
)
|
||||
.borders(Borders::TOP)
|
||||
.border_style(Style::default().fg(Color::White))
|
||||
|
|
@ -214,8 +218,12 @@ fn main() -> Result<()> {
|
|||
area.width = 40;
|
||||
area.height = 20;
|
||||
let block = Block::default()
|
||||
.title_top(Line::from(" Game ended ").centered())
|
||||
.title_bottom(Line::from("Press `q` to quit!"))
|
||||
.title(
|
||||
Title::from(" Game ended ")
|
||||
.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)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ use rand::Rng;
|
|||
use std::cmp::{max, min};
|
||||
|
||||
use crate::artifacts::Potion;
|
||||
use crate::level_ladder::get_level_ladder;
|
||||
use crate::position::{HasPosition, Position};
|
||||
|
||||
pub struct Player {
|
||||
|
|
@ -14,7 +13,6 @@ pub struct Player {
|
|||
experience: usize,
|
||||
inventory: Vec<Potion>,
|
||||
inventory_slots: usize,
|
||||
level: usize,
|
||||
}
|
||||
|
||||
impl Player {
|
||||
|
|
@ -28,7 +26,6 @@ impl Player {
|
|||
experience: 0,
|
||||
inventory: vec![],
|
||||
inventory_slots: 2,
|
||||
level: 1,
|
||||
}
|
||||
}
|
||||
pub fn get_name(&self) -> String {
|
||||
|
|
@ -62,26 +59,8 @@ impl Player {
|
|||
self.gold
|
||||
}
|
||||
|
||||
pub fn gain_experience(&mut self, amount: usize) -> bool {
|
||||
let mut result = false;
|
||||
for (i, level_step) in get_level_ladder().enumerate() {
|
||||
if self.experience <= level_step && self.experience + amount > level_step {
|
||||
self.level += 1;
|
||||
self.max_life += 5;
|
||||
self.life = self.max_life;
|
||||
result = true;
|
||||
break;
|
||||
}
|
||||
if i > self.level {
|
||||
break;
|
||||
}
|
||||
}
|
||||
self.experience += amount;
|
||||
result
|
||||
}
|
||||
|
||||
pub fn get_experience_level(&self) -> usize {
|
||||
self.level
|
||||
pub fn gain_experience(&mut self, amount: usize) {
|
||||
self.experience += amount
|
||||
}
|
||||
|
||||
pub fn get_experience(&self) -> usize {
|
||||
|
|
@ -137,7 +116,6 @@ fn test_get_name() {
|
|||
experience: 0,
|
||||
inventory: vec![],
|
||||
inventory_slots: 1,
|
||||
level: 0,
|
||||
};
|
||||
assert_eq!(p.get_name(), "Teddy Tester");
|
||||
}
|
||||
|
|
@ -163,7 +141,6 @@ fn test_change_life() {
|
|||
experience: 0,
|
||||
inventory: vec![],
|
||||
inventory_slots: 1,
|
||||
level: 0,
|
||||
};
|
||||
assert_eq!(p.get_life(), 5);
|
||||
p.change_life(-2);
|
||||
|
|
@ -199,7 +176,6 @@ fn test_max_life() {
|
|||
experience: 0,
|
||||
inventory: vec![],
|
||||
inventory_slots: 1,
|
||||
level: 0,
|
||||
};
|
||||
assert_eq!(p.get_max_life(), 10);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue