Merge branch 'long'

fixes to main. idk
This commit is contained in:
iceyrazor 2025-02-11 22:48:58 -06:00
commit 6586da02a2
1 changed files with 79 additions and 85 deletions

View File

@ -1,9 +1,6 @@
#![allow(unused)] //#![allow(unused)]
use toml::{value::Array, Table};
//use std::io; //use std::io;
use std::fs; use std::fs;
use std::option;
use std::any::{Any, TypeId};
use serde::Deserialize; use serde::Deserialize;
use struct_iterable::Iterable; use struct_iterable::Iterable;
@ -111,18 +108,18 @@ fn main() {
} }
} }
let mut i=0; let mut i=0;
for (name) in &toml_data.prof_throws { for name in &toml_data.prof_throws {
dnd_data.prof_throws[i]=name.to_string(); dnd_data.prof_throws[i]=name.to_string();
i=i+1; i=i+1;
} }
i=0; i=0;
for (name) in &toml_data.skill_prof_bonuses{ for name in &toml_data.skill_prof_bonuses{
dnd_data.skill_prof_bonuses[i][0]=name[0].to_string(); dnd_data.skill_prof_bonuses[i][0]=name[0].to_string();
dnd_data.skill_prof_bonuses[i][1]=name[1].to_string(); dnd_data.skill_prof_bonuses[i][1]=name[1].to_string();
i=i+1; i=i+1;
} }
i=0; i=0;
for (name) in &toml_data.prof_throws { for name in &toml_data.prof_throws {
match name.as_str(){ match name.as_str(){
"str" => dnd_data.prof_throws_vec[0]=dnd_data.profiency as i64, "str" => dnd_data.prof_throws_vec[0]=dnd_data.profiency as i64,
"dex" => dnd_data.prof_throws_vec[1]=dnd_data.profiency as i64, "dex" => dnd_data.prof_throws_vec[1]=dnd_data.profiency as i64,
@ -135,12 +132,12 @@ fn main() {
i=i+1; i=i+1;
} }
i=0; i=0;
for (name) in &toml_data.prof_skills { for name in &toml_data.prof_skills {
dnd_data.prof_skills[i]=name.to_string(); dnd_data.prof_skills[i]=name.to_string();
i=i+1; i=i+1;
} }
i=0; i=0;
for (name) in &toml_data.list.skills { for name in &toml_data.list.skills {
dnd_data.skills_names[i][0]=name[0].to_string(); dnd_data.skills_names[i][0]=name[0].to_string();
dnd_data.skills_names[i][1]=name[1].to_string(); dnd_data.skills_names[i][1]=name[1].to_string();
i=i+1; i=i+1;
@ -199,7 +196,6 @@ fn main() {
dnd_data.throws[i]=dnd_data.prof_throws_vec[i] + val; dnd_data.throws[i]=dnd_data.prof_throws_vec[i] + val;
i=i+1 i=i+1
} }
i=0;
fn base_to_num(str: String) -> usize{ fn base_to_num(str: String) -> usize{
match str.as_str(){ match str.as_str(){
"str" => return 0, "str" => return 0,
@ -210,7 +206,8 @@ fn main() {
"charis" => return 5, "charis" => return 5,
_ => return 0, _ => return 0,
} }
}; }
i=0; i=0;
for name in &dnd_data.skills_names{ for name in &dnd_data.skills_names{
let mut modi=0; let mut modi=0;
@ -229,7 +226,6 @@ fn main() {
dnd_data.skills[i].modi=modi as i64; dnd_data.skills[i].modi=modi as i64;
i=i+1; i=i+1;
modi=0;
} }
println!("profiency: {}",dnd_data.profiency); println!("profiency: {}",dnd_data.profiency);
@ -263,13 +259,11 @@ fn main() {
i=i+1 i=i+1
} }
println!("---------"); println!("---------");
i=0;
for val in &dnd_data.skills{ for val in &dnd_data.skills{
if val.name!=""{ if val.name!=""{
println!("{} : {}",val.name,val.modi); println!("{} : {}",val.name,val.modi);
} }
} }
i=0;
} }