Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

removed all weapons from starting inventory and made weapons purchasable #249

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

removed all weapons from starting inventory and made weapons purchasable #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6eb8553
removed all weapons from starting inventory
ujjman Nov 16, 2021
feb219f
made weapons purchasable
ujjman Nov 17, 2021
3777635
Merge branch 'develop' into made-weapons-purchasable
jdrueckert Dec 4, 2021
8852639
feat: improve weapon balancing
jdrueckert Dec 4, 2021
b66fef4
feat: re-add Purchasable components
jdrueckert Dec 4, 2021
6d205a5
chore: remove empty inventory prefab
jdrueckert Dec 4, 2021
742bc49
chore: add missing newline at end of file
jdrueckert Dec 4, 2021
35ee331
fix: re-add inventory prefab
jdrueckert Dec 4, 2021
3f7a5a5
fix: use bow instead of crossbow
jdrueckert Dec 4, 2021
0cb160e
Merge branch 'develop' into made-weapons-purchasable
jdrueckert Dec 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions assets/prefabs/inventory.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }
]
}
}
7 changes: 7 additions & 0 deletions deltas/CombatSystem/prefabs/items/arrows/bounceArrowItem.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"Purchasable": {
},
"Value": {
"value": 1
}
}
7 changes: 7 additions & 0 deletions deltas/CombatSystem/prefabs/items/arrows/explodeArrowItem.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"Purchasable": {
},
"Value": {
"value": 1
}
}
7 changes: 7 additions & 0 deletions deltas/CombatSystem/prefabs/items/arrows/stickArrowItem.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"Purchasable": {
},
"Value": {
"value": 1
}
}
10 changes: 10 additions & 0 deletions deltas/CombatSystem/prefabs/items/bow.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"Item": {
"cooldownTime": 200
},
"Purchasable": {
},
"Value": {
"value": 30
}
}
18 changes: 18 additions & 0 deletions deltas/CombatSystem/prefabs/items/spearItem.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"Item": {
"cooldownTime": 1000
},
"Melee": {
"primaryAttack": true,
"range": 4
},
"RandomDamage": {
"minDamage": 20,
"maxDamage": 30
},
"Purchasable": {
},
"Value": {
"value": 50
}
}
5 changes: 5 additions & 0 deletions deltas/CombatSystem/prefabs/items/staff.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"Item": {
"cooldownTime": 300
},
"Purchasable": {
},
"Value": {
"value": 50
}
}
11 changes: 10 additions & 1 deletion deltas/CombatSystem/prefabs/items/sword.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@
"Item": {
"cooldownTime": 500
},
"Melee": {
"primaryAttack": true,
"range": 2
},
"RandomDamage": {
"minDamage": 20,
"maxDamage": 25
"maxDamage": 30
},
"Purchasable": {
},
"Value": {
"value": 50
}
}
13 changes: 11 additions & 2 deletions deltas/CombatSystem/prefabs/items/waraxe.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
5 changes: 5 additions & 0 deletions deltas/CombatSystem/prefabs/projectiles/arrow.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Hurting": {
"amount": 20
}
}
2 changes: 1 addition & 1 deletion deltas/CombatSystem/prefabs/projectiles/spearThrow.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Hurting": {
"amount": 90
"amount": 100
}
}