diff --git a/assets/common/items/weapons/sceptre/fork0.ron b/assets/common/items/weapons/sceptre/fork0.ron index 48aaf66f89..91d4fa94c6 100644 --- a/assets/common/items/weapons/sceptre/fork0.ron +++ b/assets/common/items/weapons/sceptre/fork0.ron @@ -6,7 +6,7 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.4, - power: 2.0, + power: 1.7, poise_strength: 1.5, speed: 0.8, crit_chance: 0.11666667, diff --git a/assets/common/items/weapons/sceptre/loops0.ron b/assets/common/items/weapons/sceptre/loops0.ron index ff708bd16f..ff0c26e0c6 100644 --- a/assets/common/items/weapons/sceptre/loops0.ron +++ b/assets/common/items/weapons/sceptre/loops0.ron @@ -8,7 +8,7 @@ ItemDef( equip_time_secs: 0.4, power: 1.2, poise_strength: 1.5, - speed: 1.5, + speed: 1.3, crit_chance: 0.1925, crit_mult: 1.4329004, )), diff --git a/assets/common/items/weapons/sceptre/moon0.ron b/assets/common/items/weapons/sceptre/moon0.ron index 9d4f3698f5..971b68103e 100644 --- a/assets/common/items/weapons/sceptre/moon0.ron +++ b/assets/common/items/weapons/sceptre/moon0.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.4, - power: 1.6, + power: 1.3, poise_strength: 1.5, - speed: 0.5, + speed: 0.9, crit_chance: 0.0609375, crit_mult: 1.7326007, )), diff --git a/assets/common/items/weapons/sceptre/root_green0.ron b/assets/common/items/weapons/sceptre/root_green0.ron index 317a90aa9d..b252876c11 100644 --- a/assets/common/items/weapons/sceptre/root_green0.ron +++ b/assets/common/items/weapons/sceptre/root_green0.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.4, - power: 3.5, + power: 0.7, poise_strength: 1.5, - speed: 0.4, + speed: 1.1, crit_chance: 0.055102043, crit_mult: 1.4444444, )), diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index c0bc0e4725..9dfbc9e842 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.4, - power: 1.2, + power: 1.8, poise_strength: 1.5, - speed: 1.6, + speed: 1.2, crit_chance: 0.21153846, crit_mult: 1.4502164, )), diff --git a/assets/common/items/weapons/staff/aurora.ron b/assets/common/items/weapons/staff/aurora.ron index 1d6be7db9f..4f67f8737f 100644 --- a/assets/common/items/weapons/staff/aurora.ron +++ b/assets/common/items/weapons/staff/aurora.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 0.8, + power: 0.6, poise_strength: 1.0, - speed: 2.0, + speed: 1.2, crit_chance: 0.2625, crit_mult: 1.4761904, )), diff --git a/assets/common/items/weapons/staff/bent_fuse.ron b/assets/common/items/weapons/staff/bent_fuse.ron index 5ea0391ccb..dbed28cf3b 100644 --- a/assets/common/items/weapons/staff/bent_fuse.ron +++ b/assets/common/items/weapons/staff/bent_fuse.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 1.5, + power: 1.1, poise_strength: 1.0, - speed: 1.2, + speed: 0.7, crit_chance: 0.17045455, crit_mult: 1.4469842, )), diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron index 26a20cc4ad..2ae02e9855 100644 --- a/assets/common/items/weapons/staff/bone_staff.ron +++ b/assets/common/items/weapons/staff/bone_staff.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 1.0, + power: 0.5, poise_strength: 1.0, - speed: 1.0, + speed: 1.2, crit_chance: 0.1125, crit_mult: 1.6349206, )), diff --git a/assets/common/items/weapons/staff/crimson_eye.ron b/assets/common/items/weapons/staff/crimson_eye.ron index 46a26b28dd..f4f54e2323 100644 --- a/assets/common/items/weapons/staff/crimson_eye.ron +++ b/assets/common/items/weapons/staff/crimson_eye.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 1.3, + power: 0.5, poise_strength: 1.0, - speed: 1.0, + speed: 1.1, crit_chance: 0.125, crit_mult: 1.4571428, )), diff --git a/assets/common/items/weapons/staff/fiery_wishing_rod.ron b/assets/common/items/weapons/staff/fiery_wishing_rod.ron index f390f98f9e..5d9301cb01 100644 --- a/assets/common/items/weapons/staff/fiery_wishing_rod.ron +++ b/assets/common/items/weapons/staff/fiery_wishing_rod.ron @@ -6,7 +6,7 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 1.5, + power: 0.95, poise_strength: 1.0, speed: 0.8, crit_chance: 0.11111111, diff --git a/assets/common/items/weapons/staff/flamethrower_0.ron b/assets/common/items/weapons/staff/flamethrower_0.ron index 77d92c2951..c558e2f005 100644 --- a/assets/common/items/weapons/staff/flamethrower_0.ron +++ b/assets/common/items/weapons/staff/flamethrower_0.ron @@ -6,7 +6,7 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 2.2, + power: 1.5, poise_strength: 1.0, speed: 0.8, crit_chance: 0.113131315, diff --git a/assets/common/items/weapons/staff/frostwood_torch.ron b/assets/common/items/weapons/staff/frostwood_torch.ron index dedd5926a7..ca3280d0c7 100644 --- a/assets/common/items/weapons/staff/frostwood_torch.ron +++ b/assets/common/items/weapons/staff/frostwood_torch.ron @@ -6,7 +6,7 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 1.6, + power: 1.3, poise_strength: 1.0, speed: 1.2, crit_chance: 0.134379086, diff --git a/assets/common/items/weapons/staff/golden_khakkara.ron b/assets/common/items/weapons/staff/golden_khakkara.ron index 7b67add944..677abccdc9 100644 --- a/assets/common/items/weapons/staff/golden_khakkara.ron +++ b/assets/common/items/weapons/staff/golden_khakkara.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 1.2, + power: 1.1, poise_strength: 1.0, - speed: 1.2, + speed: 1.1, crit_chance: 0.115, crit_mult: 1.4571428, )), diff --git a/assets/common/items/weapons/staff/heated_arm.ron b/assets/common/items/weapons/staff/heated_arm.ron index 21c061996b..d7bd74282e 100644 --- a/assets/common/items/weapons/staff/heated_arm.ron +++ b/assets/common/items/weapons/staff/heated_arm.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.1, - power: 1.2, + power: 1.0, poise_strength: 1.0, - speed: 1.2, + speed: 1.0, crit_chance: 0.15, crit_mult: 1.4761904, )), diff --git a/assets/common/items/weapons/staff/infused_tower.ron b/assets/common/items/weapons/staff/infused_tower.ron index 217ec3dfe5..193e78cbeb 100644 --- a/assets/common/items/weapons/staff/infused_tower.ron +++ b/assets/common/items/weapons/staff/infused_tower.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 1.2, + power: 1.1, poise_strength: 1.0, - speed: 1.4, + speed: 0.9, crit_chance: 0.18715277, crit_mult: 1.445269, )), diff --git a/assets/common/items/weapons/staff/lava_rod.ron b/assets/common/items/weapons/staff/lava_rod.ron index d84459eb79..dd396aacd1 100644 --- a/assets/common/items/weapons/staff/lava_rod.ron +++ b/assets/common/items/weapons/staff/lava_rod.ron @@ -6,7 +6,7 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 2.125, + power: 0.7, poise_strength: 1.0, speed: 0.8, crit_chance: 0.114379086, diff --git a/assets/common/items/weapons/staff/ley_seeker.ron b/assets/common/items/weapons/staff/ley_seeker.ron index f77d1c4ede..f8a7d9a7fb 100644 --- a/assets/common/items/weapons/staff/ley_seeker.ron +++ b/assets/common/items/weapons/staff/ley_seeker.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 1.0, + power: 1.6, poise_strength: 1.0, - speed: 1.0, + speed: 0.9, crit_chance: 0.1125, crit_mult: 1.6349206, )), diff --git a/assets/common/items/weapons/staff/orc_iron.ron b/assets/common/items/weapons/staff/orc_iron.ron index 855908ae85..ff680c147e 100644 --- a/assets/common/items/weapons/staff/orc_iron.ron +++ b/assets/common/items/weapons/staff/orc_iron.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 0.9, + power: 0.5, poise_strength: 1.0, - speed: 2.0, + speed: 0.8, crit_chance: 0.2638889, crit_mult: 1.481203, )), diff --git a/assets/common/items/weapons/staff/ruby_rod.ron b/assets/common/items/weapons/staff/ruby_rod.ron index 9e0942dcbc..d83f85db9a 100644 --- a/assets/common/items/weapons/staff/ruby_rod.ron +++ b/assets/common/items/weapons/staff/ruby_rod.ron @@ -8,7 +8,7 @@ ItemDef( equip_time_secs: 0.3, power: 1.6, poise_strength: 1.0, - speed: 1.0, + speed: 1.1, crit_chance: 0.2625, crit_mult: 1.4761904, )), diff --git a/assets/common/items/weapons/staff/solar.ron b/assets/common/items/weapons/staff/solar.ron index 9aea3b7f1f..bb76c9a306 100644 --- a/assets/common/items/weapons/staff/solar.ron +++ b/assets/common/items/weapons/staff/solar.ron @@ -6,9 +6,9 @@ ItemDef( hands: Two, stats: Direct(( equip_time_secs: 0.3, - power: 1.2, + power: 0.9, poise_strength: 1.0, - speed: 0.9, + speed: 1.1, crit_chance: 0.125, crit_mult: 1.4571428, )), diff --git a/assets/common/loot_tables/weapons/cave.ron b/assets/common/loot_tables/weapons/cave.ron new file mode 100644 index 0000000000..6270e72836 --- /dev/null +++ b/assets/common/loot_tables/weapons/cave.ron @@ -0,0 +1,5 @@ +[ + (1.0, Item("common.items.weapons.sceptre.sceptre_velorite_0")), + (1.0, Item("common.items.weapons.bow.velorite")), + (1.0, Item("common.items.weapons.axe.malachite_axe-0")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/sceptre/bamboo.ron b/assets/common/loot_tables/weapons/sceptre/bamboo.ron new file mode 100644 index 0000000000..73c42b180b --- /dev/null +++ b/assets/common/loot_tables/weapons/sceptre/bamboo.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.weapons.sceptre.divine_gohei")), + (1.0, Item("common.items.weapons.sceptre.root_green0")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/sceptre/eldwood.ron b/assets/common/loot_tables/weapons/sceptre/eldwood.ron new file mode 100644 index 0000000000..0166b47695 --- /dev/null +++ b/assets/common/loot_tables/weapons/sceptre/eldwood.ron @@ -0,0 +1,3 @@ +[ + (1.0, Item("common.items.weapons.sceptre.emerald")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/sceptre/frostwood.ron b/assets/common/loot_tables/weapons/sceptre/frostwood.ron new file mode 100644 index 0000000000..60faff5c1d --- /dev/null +++ b/assets/common/loot_tables/weapons/sceptre/frostwood.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.weapons.sceptre.fork0")), + (1.0, Item("common.items.weapons.sceptre.loops0")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/sceptre/hardwood.ron b/assets/common/loot_tables/weapons/sceptre/hardwood.ron new file mode 100644 index 0000000000..bc31a7cb01 --- /dev/null +++ b/assets/common/loot_tables/weapons/sceptre/hardwood.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.weapons.sceptre.druids_arbor")), + (1.0, Item("common.items.weapons.sceptre.staff_nature")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/sceptre/ironwood.ron b/assets/common/loot_tables/weapons/sceptre/ironwood.ron new file mode 100644 index 0000000000..d8f78f38be --- /dev/null +++ b/assets/common/loot_tables/weapons/sceptre/ironwood.ron @@ -0,0 +1,5 @@ +[ + (1.0, Item("common.items.weapons.sceptre.coralline_cane")), + (1.0, Item("common.items.weapons.sceptre.moon0")), + (1.0, Item("common.items.weapons.sceptre.totem_green")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/staff/bamboo.ron b/assets/common/loot_tables/weapons/staff/bamboo.ron new file mode 100644 index 0000000000..9c01806911 --- /dev/null +++ b/assets/common/loot_tables/weapons/staff/bamboo.ron @@ -0,0 +1,5 @@ +[ + (1.0, Item("common.items.weapons.staff.bent_fuse")), + (1.0, Item("common.items.weapons.staff.bone_staff")), + (1.0, Item("common.items.weapons.staff.fiery_wishing_rod")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/staff/eldwood.ron b/assets/common/loot_tables/weapons/staff/eldwood.ron new file mode 100644 index 0000000000..22dd7dabbd --- /dev/null +++ b/assets/common/loot_tables/weapons/staff/eldwood.ron @@ -0,0 +1,5 @@ +[ + (1.0, Item("common.items.weapons.staff.aurora")), + (1.0, Item("common.items.weapons.staff.dragon_tongue")), + (1.0, Item("common.items.weapons.staff.ruby_rod")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/staff/frostwood.ron b/assets/common/loot_tables/weapons/staff/frostwood.ron new file mode 100644 index 0000000000..abbb3c5aa5 --- /dev/null +++ b/assets/common/loot_tables/weapons/staff/frostwood.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.weapons.staff.frostwood_torch")), + (1.0, Item("common.items.weapons.staff.ley_seeker")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/staff/hardwood.ron b/assets/common/loot_tables/weapons/staff/hardwood.ron new file mode 100644 index 0000000000..08eff4323b --- /dev/null +++ b/assets/common/loot_tables/weapons/staff/hardwood.ron @@ -0,0 +1,5 @@ +[ + (1.0, Item("common.items.weapons.staff.heated_arm")), + (1.0, Item("common.items.weapons.staff.infused_tower")), + (1.0, Item("common.items.weapons.staff.solar")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/staff/ironwood.ron b/assets/common/loot_tables/weapons/staff/ironwood.ron new file mode 100644 index 0000000000..5d031c451c --- /dev/null +++ b/assets/common/loot_tables/weapons/staff/ironwood.ron @@ -0,0 +1,5 @@ +[ + (1.0, Item("common.items.weapons.staff.flamethrower_0")), + (1.0, Item("common.items.weapons.staff.golden_khakkara")), + (1.0, Item("common.items.weapons.staff.orc_iron")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/weapons/staff/wood.ron b/assets/common/loot_tables/weapons/staff/wood.ron new file mode 100644 index 0000000000..4f24808e16 --- /dev/null +++ b/assets/common/loot_tables/weapons/staff/wood.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.weapons.staff.crimson_eye")), + (1.0, Item("common.items.weapons.staff.lava_rod")), +] \ No newline at end of file