jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

kbm-gamepad-config #86

Closed
andy wants to merge 37 commits from kbm-gamepad-config into master
pull from: kbm-gamepad-config
merge into: jake:master
Conversation 2 Commits 37 Files Changed 1203 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f716c7a857 - Show all commits

2
data/item_stats/weapon_stats.toml
View File

@ -832,7 +832,7 @@ atp_min = 210
atp_max = 220
shop_multiplier = 0.7
[PArmssBlade]
[PArmsBlade]
grind = 25
atp_min = 250
atp_max = 270

6
src/entity/item/weapon.rs
View File

@ -375,7 +375,7 @@ pub enum WeaponType {
AkikosFryingPan,
SorcerersCane,
SBeatsBlade,
PArmssBlade,
PArmsBlade,
DelsabersBuster,
BringersRifle,
EggBlaster,
@ -771,7 +771,7 @@ impl WeaponType {
WeaponType::AkikosFryingPan => [0x00, 0x16, 0x00],
WeaponType::SorcerersCane => [0x00, 0x17, 0x00],
WeaponType::SBeatsBlade => [0x00, 0x18, 0x00],
WeaponType::PArmssBlade => [0x00, 0x19, 0x00],
WeaponType::PArmsBlade => [0x00, 0x19, 0x00],
WeaponType::DelsabersBuster => [0x00, 0x1A, 0x00],
WeaponType::BringersRifle => [0x00, 0x1B, 0x00],
WeaponType::EggBlaster => [0x00, 0x1C, 0x00],
@ -1167,7 +1167,7 @@ impl WeaponType {
[0x00, 0x16, 0x00] => Ok(WeaponType::AkikosFryingPan),
[0x00, 0x17, 0x00] => Ok(WeaponType::SorcerersCane),
[0x00, 0x18, 0x00] => Ok(WeaponType::SBeatsBlade),
[0x00, 0x19, 0x00] => Ok(WeaponType::PArmssBlade),
[0x00, 0x19, 0x00] => Ok(WeaponType::PArmsBlade),
[0x00, 0x1A, 0x00] => Ok(WeaponType::DelsabersBuster),
[0x00, 0x1B, 0x00] => Ok(WeaponType::BringersRifle),
[0x00, 0x1C, 0x00] => Ok(WeaponType::EggBlaster),