From 6eb855339b5484c6bd9993d789176cf1fd44b56a Mon Sep 17 00:00:00 2001 From: ujjwal mishra <49057926+ujjman@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:26:39 +0530 Subject: [PATCH 1/8] removed all weapons from starting inventory this PR removes all weapons from starting inventory therefore making weapons to be purchased --- assets/prefabs/inventory.prefab | 11 ----------- 1 file changed, 11 deletions(-) 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 } ] } } From feb219f0ad2a9ec1f40d0ae17c8b78e806026723 Mon Sep 17 00:00:00 2001 From: ujjwal mishra <49057926+ujjman@users.noreply.github.com> Date: Wed, 17 Nov 2021 22:35:41 +0530 Subject: [PATCH 2/8] made weapons purchasable this commit makes the weapons purchasable --- .../prefabs/items/arrows/bounceArrowItem.prefab | 7 +++++++ .../prefabs/items/arrows/explodeArrowItem.prefab | 7 +++++++ .../prefabs/items/arrows/stickArrowItem.prefab | 7 +++++++ deltas/CombatSystem/prefabs/items/bow.prefab | 7 +++++++ deltas/CombatSystem/prefabs/items/spearItem.prefab | 7 +++++++ deltas/CombatSystem/prefabs/items/staff.prefab | 7 +++++++ deltas/CombatSystem/prefabs/items/sword.prefab | 7 +++++++ deltas/CombatSystem/prefabs/items/waraxe.prefab | 7 +++++++ deltas/LightAndShadowResources/prefabs/magicStaff.prefab | 7 +++++++ 9 files changed, 63 insertions(+) create mode 100644 deltas/CombatSystem/prefabs/items/arrows/bounceArrowItem.prefab create mode 100644 deltas/CombatSystem/prefabs/items/arrows/explodeArrowItem.prefab create mode 100644 deltas/CombatSystem/prefabs/items/arrows/stickArrowItem.prefab create mode 100644 deltas/CombatSystem/prefabs/items/bow.prefab create mode 100644 deltas/CombatSystem/prefabs/items/spearItem.prefab create mode 100644 deltas/CombatSystem/prefabs/items/staff.prefab create mode 100644 deltas/CombatSystem/prefabs/items/sword.prefab create mode 100644 deltas/CombatSystem/prefabs/items/waraxe.prefab create mode 100644 deltas/LightAndShadowResources/prefabs/magicStaff.prefab 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..c97f9c56 --- /dev/null +++ b/deltas/CombatSystem/prefabs/items/bow.prefab @@ -0,0 +1,7 @@ +{ + "Purchasable": { + }, + "Value": { + "value": 5 + } +} diff --git a/deltas/CombatSystem/prefabs/items/spearItem.prefab b/deltas/CombatSystem/prefabs/items/spearItem.prefab new file mode 100644 index 00000000..c97f9c56 --- /dev/null +++ b/deltas/CombatSystem/prefabs/items/spearItem.prefab @@ -0,0 +1,7 @@ +{ + "Purchasable": { + }, + "Value": { + "value": 5 + } +} diff --git a/deltas/CombatSystem/prefabs/items/staff.prefab b/deltas/CombatSystem/prefabs/items/staff.prefab new file mode 100644 index 00000000..f1b7763a --- /dev/null +++ b/deltas/CombatSystem/prefabs/items/staff.prefab @@ -0,0 +1,7 @@ +{ + "Purchasable": { + }, + "Value": { + "value": 20 + } +} diff --git a/deltas/CombatSystem/prefabs/items/sword.prefab b/deltas/CombatSystem/prefabs/items/sword.prefab new file mode 100644 index 00000000..c97f9c56 --- /dev/null +++ b/deltas/CombatSystem/prefabs/items/sword.prefab @@ -0,0 +1,7 @@ +{ + "Purchasable": { + }, + "Value": { + "value": 5 + } +} diff --git a/deltas/CombatSystem/prefabs/items/waraxe.prefab b/deltas/CombatSystem/prefabs/items/waraxe.prefab new file mode 100644 index 00000000..bfd6b14b --- /dev/null +++ b/deltas/CombatSystem/prefabs/items/waraxe.prefab @@ -0,0 +1,7 @@ +{ + "Purchasable": { + }, + "Value": { + "value": 10 + } +} diff --git a/deltas/LightAndShadowResources/prefabs/magicStaff.prefab b/deltas/LightAndShadowResources/prefabs/magicStaff.prefab new file mode 100644 index 00000000..efc23b6a --- /dev/null +++ b/deltas/LightAndShadowResources/prefabs/magicStaff.prefab @@ -0,0 +1,7 @@ +{ + "Purchasable": { + }, + "Value": { + "value": 15 + } +} From 8852639f7e510608ddb4b1425597bd03f22c3634 Mon Sep 17 00:00:00 2001 From: Josephine Rueckert Date: Sat, 4 Dec 2021 20:22:50 +0100 Subject: [PATCH 3/8] feat: improve weapon balancing --- deltas/CombatSystem/prefabs/items/crossbow.prefab | 5 +++++ deltas/CombatSystem/prefabs/items/spearItem.prefab | 12 +++++++++--- deltas/CombatSystem/prefabs/items/staff.prefab | 5 ----- deltas/CombatSystem/prefabs/items/sword.prefab | 11 +++++------ deltas/CombatSystem/prefabs/items/waraxe.prefab | 13 ++++++------- .../CombatSystem/prefabs/projectiles/arrow.prefab | 5 +++++ .../prefabs/projectiles/spearThrow.prefab | 2 +- 7 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 deltas/CombatSystem/prefabs/items/crossbow.prefab create mode 100644 deltas/CombatSystem/prefabs/projectiles/arrow.prefab diff --git a/deltas/CombatSystem/prefabs/items/crossbow.prefab b/deltas/CombatSystem/prefabs/items/crossbow.prefab new file mode 100644 index 00000000..08e65f22 --- /dev/null +++ b/deltas/CombatSystem/prefabs/items/crossbow.prefab @@ -0,0 +1,5 @@ +{ + "Item": { + "cooldownTime": 200 + } +} diff --git a/deltas/CombatSystem/prefabs/items/spearItem.prefab b/deltas/CombatSystem/prefabs/items/spearItem.prefab index c97f9c56..2d5512cd 100644 --- a/deltas/CombatSystem/prefabs/items/spearItem.prefab +++ b/deltas/CombatSystem/prefabs/items/spearItem.prefab @@ -1,7 +1,13 @@ { - "Purchasable": { + "Item": { + "cooldownTime": 1000 }, - "Value": { - "value": 5 + "Melee": { + "primaryAttack": true, + "range": 4 + }, + "RandomDamage": { + "minDamage": 20, + "maxDamage": 30 } } diff --git a/deltas/CombatSystem/prefabs/items/staff.prefab b/deltas/CombatSystem/prefabs/items/staff.prefab index 22ae0337..f9e8e118 100644 --- a/deltas/CombatSystem/prefabs/items/staff.prefab +++ b/deltas/CombatSystem/prefabs/items/staff.prefab @@ -1,9 +1,4 @@ { - "Purchasable": { - }, - "Value": { - "value": 20 - }, "Item": { "cooldownTime": 300 } diff --git a/deltas/CombatSystem/prefabs/items/sword.prefab b/deltas/CombatSystem/prefabs/items/sword.prefab index 7fd9beb5..a2dc5bd7 100644 --- a/deltas/CombatSystem/prefabs/items/sword.prefab +++ b/deltas/CombatSystem/prefabs/items/sword.prefab @@ -1,14 +1,13 @@ { - "Purchasable": { - }, - "Value": { - "value": 5 - }, "Item": { "cooldownTime": 500 }, + "Melee": { + "primaryAttack": true, + "range": 2 + }, "RandomDamage": { "minDamage": 20, - "maxDamage": 25 + "maxDamage": 30 } } diff --git a/deltas/CombatSystem/prefabs/items/waraxe.prefab b/deltas/CombatSystem/prefabs/items/waraxe.prefab index bb570b44..6b7bbf94 100644 --- a/deltas/CombatSystem/prefabs/items/waraxe.prefab +++ b/deltas/CombatSystem/prefabs/items/waraxe.prefab @@ -1,14 +1,13 @@ { - "Purchasable": { - }, - "Value": { - "value": 10 - }, "Item": { "cooldownTime": 1000 }, + "Melee": { + "primaryAttack": true, + "range": 2 + }, "RandomDamage": { - "minDamage": 30, - "maxDamage": 40 + "minDamage": 40, + "maxDamage": 60 } } diff --git a/deltas/CombatSystem/prefabs/projectiles/arrow.prefab b/deltas/CombatSystem/prefabs/projectiles/arrow.prefab new file mode 100644 index 00000000..afdc8046 --- /dev/null +++ b/deltas/CombatSystem/prefabs/projectiles/arrow.prefab @@ -0,0 +1,5 @@ +{ + "Hurting": { + "amount": 20 + } +} \ No newline at end of file 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 } } From b66fef4ee3086dfbe447db63410025a1927c8170 Mon Sep 17 00:00:00 2001 From: Josephine Rueckert Date: Sat, 4 Dec 2021 20:47:03 +0100 Subject: [PATCH 4/8] feat: re-add Purchasable components --- deltas/CombatSystem/prefabs/items/bow.prefab | 7 ------- deltas/CombatSystem/prefabs/items/crossbow.prefab | 5 +++++ deltas/CombatSystem/prefabs/items/spearItem.prefab | 5 +++++ deltas/CombatSystem/prefabs/items/staff.prefab | 5 +++++ deltas/CombatSystem/prefabs/items/sword.prefab | 5 +++++ deltas/CombatSystem/prefabs/items/waraxe.prefab | 5 +++++ deltas/LightAndShadowResources/prefabs/magicStaff.prefab | 7 ------- 7 files changed, 25 insertions(+), 14 deletions(-) delete mode 100644 deltas/CombatSystem/prefabs/items/bow.prefab delete mode 100644 deltas/LightAndShadowResources/prefabs/magicStaff.prefab diff --git a/deltas/CombatSystem/prefabs/items/bow.prefab b/deltas/CombatSystem/prefabs/items/bow.prefab deleted file mode 100644 index c97f9c56..00000000 --- a/deltas/CombatSystem/prefabs/items/bow.prefab +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Purchasable": { - }, - "Value": { - "value": 5 - } -} diff --git a/deltas/CombatSystem/prefabs/items/crossbow.prefab b/deltas/CombatSystem/prefabs/items/crossbow.prefab index 08e65f22..788bf1eb 100644 --- a/deltas/CombatSystem/prefabs/items/crossbow.prefab +++ b/deltas/CombatSystem/prefabs/items/crossbow.prefab @@ -1,5 +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 index 2d5512cd..05caa196 100644 --- a/deltas/CombatSystem/prefabs/items/spearItem.prefab +++ b/deltas/CombatSystem/prefabs/items/spearItem.prefab @@ -9,5 +9,10 @@ "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 a2dc5bd7..772aac8b 100644 --- a/deltas/CombatSystem/prefabs/items/sword.prefab +++ b/deltas/CombatSystem/prefabs/items/sword.prefab @@ -9,5 +9,10 @@ "RandomDamage": { "minDamage": 20, "maxDamage": 30 + }, + "Purchasable": { + }, + "Value": { + "value": 50 } } diff --git a/deltas/CombatSystem/prefabs/items/waraxe.prefab b/deltas/CombatSystem/prefabs/items/waraxe.prefab index 6b7bbf94..a5984f9d 100644 --- a/deltas/CombatSystem/prefabs/items/waraxe.prefab +++ b/deltas/CombatSystem/prefabs/items/waraxe.prefab @@ -9,5 +9,10 @@ "RandomDamage": { "minDamage": 40, "maxDamage": 60 + }, + "Purchasable": { + }, + "Value": { + "value": 50 } } diff --git a/deltas/LightAndShadowResources/prefabs/magicStaff.prefab b/deltas/LightAndShadowResources/prefabs/magicStaff.prefab deleted file mode 100644 index efc23b6a..00000000 --- a/deltas/LightAndShadowResources/prefabs/magicStaff.prefab +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Purchasable": { - }, - "Value": { - "value": 15 - } -} From 6d205a57da7c1739a2063ad6e120d58fe26143bd Mon Sep 17 00:00:00 2001 From: Josephine Rueckert Date: Sat, 4 Dec 2021 20:53:50 +0100 Subject: [PATCH 5/8] chore: remove empty inventory prefab --- assets/prefabs/inventory.prefab | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 assets/prefabs/inventory.prefab diff --git a/assets/prefabs/inventory.prefab b/assets/prefabs/inventory.prefab deleted file mode 100644 index af7c682b..00000000 --- a/assets/prefabs/inventory.prefab +++ /dev/null @@ -1,6 +0,0 @@ -{ - "StartingInventory": { - "items": [ - ] - } -} From 742bc49f35a63af5695ba30136c08b512e145bed Mon Sep 17 00:00:00 2001 From: jdrueckert Date: Sat, 4 Dec 2021 20:54:59 +0100 Subject: [PATCH 6/8] chore: add missing newline at end of file --- deltas/CombatSystem/prefabs/projectiles/arrow.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deltas/CombatSystem/prefabs/projectiles/arrow.prefab b/deltas/CombatSystem/prefabs/projectiles/arrow.prefab index afdc8046..a7a7a569 100644 --- a/deltas/CombatSystem/prefabs/projectiles/arrow.prefab +++ b/deltas/CombatSystem/prefabs/projectiles/arrow.prefab @@ -2,4 +2,4 @@ "Hurting": { "amount": 20 } -} \ No newline at end of file +} From 35ee331a2326345c554551e7983c3f470a61abaa Mon Sep 17 00:00:00 2001 From: Josephine Rueckert Date: Sat, 4 Dec 2021 21:53:10 +0100 Subject: [PATCH 7/8] fix: re-add inventory prefab --- assets/prefabs/inventory.prefab | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 assets/prefabs/inventory.prefab diff --git a/assets/prefabs/inventory.prefab b/assets/prefabs/inventory.prefab new file mode 100644 index 00000000..af7c682b --- /dev/null +++ b/assets/prefabs/inventory.prefab @@ -0,0 +1,6 @@ +{ + "StartingInventory": { + "items": [ + ] + } +} From 3f7a5a51c7d5bc8fa5dec8cf2cd3cbd6ba637b61 Mon Sep 17 00:00:00 2001 From: jdrueckert Date: Sat, 4 Dec 2021 22:03:41 +0100 Subject: [PATCH 8/8] fix: use bow instead of crossbow --- deltas/CombatSystem/prefabs/items/{crossbow.prefab => bow.prefab} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename deltas/CombatSystem/prefabs/items/{crossbow.prefab => bow.prefab} (100%) diff --git a/deltas/CombatSystem/prefabs/items/crossbow.prefab b/deltas/CombatSystem/prefabs/items/bow.prefab similarity index 100% rename from deltas/CombatSystem/prefabs/items/crossbow.prefab rename to deltas/CombatSystem/prefabs/items/bow.prefab