Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

+ Rebase and fixes (kill me)

Browse Source
This commit is contained in:
UncomfySilence 2021-11-18 19:50:32 +01:00
commit f88a3df040
16 changed files with 21 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
View File

@ -6,15 +6,7 @@ ItemDef(
stats: (
protection: Normal(14.0),
poise_resilience: Normal(2.0),
<<<<<<< HEAD
<<<<<<< HEAD
energy_max: 4.4,
=======
energy_max: 5.4,
>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
=======
energy_max: 4.4,
>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
energy_reward: 0.054,
crit_power: 0.05,
stealth: 0.0,

8
assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
View File

@ -6,15 +6,7 @@ ItemDef(
stats: (
protection: Normal(38.0),
poise_resilience: Normal(5.0),
<<<<<<< HEAD
<<<<<<< HEAD
energy_max: 5.0,
=======
energy_max: 10.8,
>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
=======
energy_max: 5.0,
>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
energy_reward: 0.108,
crit_power: 0.1,
stealth: 0.0,

8
assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
View File

@ -6,15 +6,7 @@ ItemDef(
stats: (
protection: Normal(10.0),
poise_resilience: Normal(5.0),
<<<<<<< HEAD
<<<<<<< HEAD
energy_max: 5.0,
=======
energy_max: 3.6,
>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
=======
energy_max: 5.0,
>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
energy_reward: 0.036,
crit_power: 0.032,
stealth: 0.0,

8
assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
View File

@ -6,15 +6,7 @@ ItemDef(
stats: (
protection: Normal(10.0),
poise_resilience: Normal(5.0),
<<<<<<< HEAD
<<<<<<< HEAD
energy_max: 5.0,
=======
energy_max: 3.6,
>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
=======
energy_max: 5.0,
>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
energy_reward: 0.036,
crit_power: 0.032,
stealth: 0.0,

8
assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
View File

@ -6,15 +6,7 @@ ItemDef(
stats: (
protection: Normal(19.0),
poise_resilience: Normal(5.0),
<<<<<<< HEAD
<<<<<<< HEAD
energy_max: 5.0,
=======
energy_max: 7.2,
>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
=======
energy_max: 5.0,
>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
energy_reward: 0.08,
crit_power: 0.064,
stealth: 0.0,

8
assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
View File

@ -6,15 +6,7 @@ ItemDef(
stats: (
protection: Normal(19.0),
poise_resilience: Normal(5.0),
<<<<<<< HEAD
<<<<<<< HEAD
energy_max: 5.0,
=======
energy_max: 7.2,
>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
=======
energy_max: 5.0,
>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
energy_reward: 0.08,
crit_power: 0.064,
stealth: 0.0,

8
assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
View File

@ -6,15 +6,7 @@ ItemDef(
stats: (
protection: Normal(26.0),
poise_resilience: Normal(4.0),
<<<<<<< HEAD
<<<<<<< HEAD
energy_max: 3.4,
=======
energy_max: 8.1,
>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
=======
energy_max: 3.4,
>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
energy_reward: 0.81,
crit_power: 0.075,
stealth: 0.0,

8
assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
View File

@ -6,15 +6,7 @@ ItemDef(
stats: (
protection: Normal(7.0),
poise_resilience: Normal(4.0),
<<<<<<< HEAD
<<<<<<< HEAD
energy_max: 3.4,
=======
energy_max: 2.7,
>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
=======
energy_max: 3.4,
>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
energy_reward: 0.027,
crit_power: 0.024,
stealth: 0.0,

8
assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
View File

@ -6,15 +6,7 @@ ItemDef(
stats: (
protection: Normal(7.0),
poise_resilience: Normal(4.0),
<<<<<<< HEAD
<<<<<<< HEAD
energy_max: 3.4,
=======
energy_max: 2.7,
>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
=======
energy_max: 3.4,
>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
energy_reward: 0.027,
crit_power: 0.024,
stealth: 0.0,

8
assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
View File

@ -6,15 +6,7 @@ ItemDef(
stats: (
protection: Normal(13.0),
poise_resilience: Normal(4.0),
<<<<<<< HEAD
<<<<<<< HEAD
energy_max: 3.4,
=======
energy_max: 5.4,
>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
=======
energy_max: 3.4,
>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
energy_reward: 0.06,
crit_power: 0.048,
stealth: 0.0,

8
assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
View File

@ -6,15 +6,7 @@ ItemDef(
stats: (
protection: Normal(13.0),
poise_resilience: Normal(4.0),
<<<<<<< HEAD
<<<<<<< HEAD
energy_max: 3.4,
=======
energy_max: 5.4,
>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
=======
energy_max: 3.4,
>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
energy_reward: 0.06,
crit_power: 0.048,
stealth: 0.0,

8
assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
View File

@ -6,15 +6,7 @@ ItemDef(
stats: (
protection: Normal(5.0),
poise_resilience: Normal(4.0),
<<<<<<< HEAD
<<<<<<< HEAD
energy_max: 3.4,
=======
energy_max: 1.2,
>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
=======
energy_max: 3.4,
>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
energy_reward: 0.015,
crit_power: 0.012,
stealth: 0.0,

16
assets/common/loot_tables/dungeon/tier-0/chest.ron
View File

@ -1,15 +1,13 @@
[
// Gear
(2.0, LootTable("common.loot_tables.weapons.tier-0")),
(2.0, LootTable("common.loot_tables.armor.tier-0")),
(1.0, LootTable("common.loot_tables.weapons.tier-1")),
(1.0, LootTable("common.loot_tables.armor.tier-1")),
(1.0, LootTable("common.loot_tables.weapons.tier-0")),
(1.0, LootTable("common.loot_tables.armor.tier-0")),
// Currency
(6.0, ItemQuantity("common.items.utility.coins", 10, 20)),
(3.0, ItemQuantity("common.items.utility.coins", 10, 20)),
// Materials
(2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
(2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
(2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
(1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
(1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
(1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
// Consumables
(4.0, LootTable("common.loot_tables.consumable.poor")),
(2.0, LootTable("common.loot_tables.consumable.poor")),
]

16
assets/common/loot_tables/dungeon/tier-2/chest.ron
View File

@ -1,15 +1,13 @@
[
// Gear
(2.0, LootTable("common.loot_tables.weapons.tier-2")),
(2.0, LootTable("common.loot_tables.armor.tier-2")),
(1.0, LootTable("common.loot_tables.weapons.tier-3")),
(1.0, LootTable("common.loot_tables.armor.tier-3")),
(1.0, LootTable("common.loot_tables.weapons.tier-2")),
(1.0, LootTable("common.loot_tables.armor.tier-2")),
// Currency
(6.0, ItemQuantity("common.items.utility.coins", 50, 100)),
(3.0, ItemQuantity("common.items.utility.coins", 50, 100)),
// Materials
(2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
(2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
(2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
(1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
(1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
(1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
// Consumables
(4.0, LootTable("common.loot_tables.consumable.moderate")),
(2.0, LootTable("common.loot_tables.consumable.moderate")),
]

16
assets/common/loot_tables/dungeon/tier-3/chest.ron
View File

@ -1,15 +1,13 @@
[
// Gear
(2.0, LootTable("common.loot_tables.weapons.tier-3")),
(2.0, LootTable("common.loot_tables.armor.tier-3")),
(1.0, LootTable("common.loot_tables.weapons.tier-4")),
(1.0, LootTable("common.loot_tables.armor.tier-4")),
(1.0, LootTable("common.loot_tables.weapons.tier-3")),
(1.0, LootTable("common.loot_tables.armor.tier-3")),
// Currency
(6.0, ItemQuantity("common.items.utility.coins", 100, 200)),
(3.0, ItemQuantity("common.items.utility.coins", 100, 200)),
// Materials
(2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
(2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
(2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
(1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
(1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
(1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
// Consumables
(4.0, LootTable("common.loot_tables.consumable.moderate")),
(2.0, LootTable("common.loot_tables.consumable.moderate")),
]

2
assets/common/loot_tables/dungeon/tier-4/chest.ron
View File

@ -2,8 +2,6 @@
// Gear
(1.0, LootTable("common.loot_tables.weapons.tier-4")),
(1.0, LootTable("common.loot_tables.armor.tier-4")),
(0.5, LootTable("common.loot_tables.weapons.tier-5")),
(0.5, LootTable("common.loot_tables.armor.tier-5")),
(3.0, Item("common.items.armor.misc.head.spikeguard")),
// Currency
(3.0, ItemQuantity("common.items.utility.coins", 200, 500)),