diff --git a/assets/prefabs/inventory.prefab b/assets/prefabs/inventory.prefab index 8f6813d2..af7c682b 100644 --- a/assets/prefabs/inventory.prefab +++ b/assets/prefabs/inventory.prefab @@ -1,17 +1,6 @@ { "StartingInventory": { "items": [ - { "uri": "CombatSystem:bow", "quantity": 1 }, - { "uri": "CombatSystem:stickArrowItem", "quantity": 16 }, - { "uri": "CombatSystem:bounceArrowItem", "quantity": 16 }, - { "uri": "CombatSystem:explodeArrowItem", "quantity": 16 }, - { "uri": "CombatSystem:sword", "quantity": 1 }, - { "uri": "CombatSystem:waraxe", "quantity": 1 }, - { "uri": "CombatSystem:staff", "quantity": 1 }, - { "uri": "CombatSystem:spearItem", "quantity": 1 }, - { "uri": "CombatSystem:fireBallMine", "quantity": 1 }, - { "uri": "CombatSystem:explodeMine", "quantity": 1 }, - { "uri": "LightAndShadowResources:magicStaff", "quantity": 1 } ] } } diff --git a/deltas/CombatSystem/prefabs/items/arrows/bounceArrowItem.prefab b/deltas/CombatSystem/prefabs/items/arrows/bounceArrowItem.prefab new file mode 100644 index 00000000..07a4c49b --- /dev/null +++ b/deltas/CombatSystem/prefabs/items/arrows/bounceArrowItem.prefab @@ -0,0 +1,7 @@ +{ + "Purchasable": { + }, + "Value": { + "value": 1 + } +} diff --git a/deltas/CombatSystem/prefabs/items/arrows/explodeArrowItem.prefab b/deltas/CombatSystem/prefabs/items/arrows/explodeArrowItem.prefab new file mode 100644 index 00000000..07a4c49b --- /dev/null +++ b/deltas/CombatSystem/prefabs/items/arrows/explodeArrowItem.prefab @@ -0,0 +1,7 @@ +{ + "Purchasable": { + }, + "Value": { + "value": 1 + } +} diff --git a/deltas/CombatSystem/prefabs/items/arrows/stickArrowItem.prefab b/deltas/CombatSystem/prefabs/items/arrows/stickArrowItem.prefab new file mode 100644 index 00000000..07a4c49b --- /dev/null +++ b/deltas/CombatSystem/prefabs/items/arrows/stickArrowItem.prefab @@ -0,0 +1,7 @@ +{ + "Purchasable": { + }, + "Value": { + "value": 1 + } +} diff --git a/deltas/CombatSystem/prefabs/items/bow.prefab b/deltas/CombatSystem/prefabs/items/bow.prefab new file mode 100644 index 00000000..788bf1eb --- /dev/null +++ b/deltas/CombatSystem/prefabs/items/bow.prefab @@ -0,0 +1,10 @@ +{ + "Item": { + "cooldownTime": 200 + }, + "Purchasable": { + }, + "Value": { + "value": 30 + } +} diff --git a/deltas/CombatSystem/prefabs/items/spearItem.prefab b/deltas/CombatSystem/prefabs/items/spearItem.prefab new file mode 100644 index 00000000..05caa196 --- /dev/null +++ b/deltas/CombatSystem/prefabs/items/spearItem.prefab @@ -0,0 +1,18 @@ +{ + "Item": { + "cooldownTime": 1000 + }, + "Melee": { + "primaryAttack": true, + "range": 4 + }, + "RandomDamage": { + "minDamage": 20, + "maxDamage": 30 + }, + "Purchasable": { + }, + "Value": { + "value": 50 + } +} diff --git a/deltas/CombatSystem/prefabs/items/staff.prefab b/deltas/CombatSystem/prefabs/items/staff.prefab index f9e8e118..649b34ac 100644 --- a/deltas/CombatSystem/prefabs/items/staff.prefab +++ b/deltas/CombatSystem/prefabs/items/staff.prefab @@ -1,5 +1,10 @@ { "Item": { "cooldownTime": 300 + }, + "Purchasable": { + }, + "Value": { + "value": 50 } } diff --git a/deltas/CombatSystem/prefabs/items/sword.prefab b/deltas/CombatSystem/prefabs/items/sword.prefab index 95634817..772aac8b 100644 --- a/deltas/CombatSystem/prefabs/items/sword.prefab +++ b/deltas/CombatSystem/prefabs/items/sword.prefab @@ -2,8 +2,17 @@ "Item": { "cooldownTime": 500 }, + "Melee": { + "primaryAttack": true, + "range": 2 + }, "RandomDamage": { "minDamage": 20, - "maxDamage": 25 + "maxDamage": 30 + }, + "Purchasable": { + }, + "Value": { + "value": 50 } } diff --git a/deltas/CombatSystem/prefabs/items/waraxe.prefab b/deltas/CombatSystem/prefabs/items/waraxe.prefab index 4f966e86..a5984f9d 100644 --- a/deltas/CombatSystem/prefabs/items/waraxe.prefab +++ b/deltas/CombatSystem/prefabs/items/waraxe.prefab @@ -2,8 +2,17 @@ "Item": { "cooldownTime": 1000 }, + "Melee": { + "primaryAttack": true, + "range": 2 + }, "RandomDamage": { - "minDamage": 30, - "maxDamage": 40 + "minDamage": 40, + "maxDamage": 60 + }, + "Purchasable": { + }, + "Value": { + "value": 50 } } diff --git a/deltas/CombatSystem/prefabs/projectiles/arrow.prefab b/deltas/CombatSystem/prefabs/projectiles/arrow.prefab new file mode 100644 index 00000000..a7a7a569 --- /dev/null +++ b/deltas/CombatSystem/prefabs/projectiles/arrow.prefab @@ -0,0 +1,5 @@ +{ + "Hurting": { + "amount": 20 + } +} diff --git a/deltas/CombatSystem/prefabs/projectiles/spearThrow.prefab b/deltas/CombatSystem/prefabs/projectiles/spearThrow.prefab index 398002e4..c17482f3 100644 --- a/deltas/CombatSystem/prefabs/projectiles/spearThrow.prefab +++ b/deltas/CombatSystem/prefabs/projectiles/spearThrow.prefab @@ -1,5 +1,5 @@ { "Hurting": { - "amount": 90 + "amount": 100 } }