Skip to content

Commit

Permalink
Merge pull request #24 from mayant15/trade
Browse files Browse the repository at this point in the history
Add trading with NPCs
  • Loading branch information
mayant15 authored Aug 9, 2019
2 parents 8ca63a0 + 2e96295 commit 95352cc
Show file tree
Hide file tree
Showing 19 changed files with 931 additions and 248 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"shader" : "engine:genericMeshMaterial",
"params" : {
"diffuse" : "MetalRenegades:traderGooey",
"diffuse" : "MetalRenegades:marketGooey",
"colorOffset" : [1.0, 1.0, 1.0],
"textured" : true
}
Expand Down
66 changes: 2 additions & 64 deletions assets/prefabs/characters/badCitizen.prefab
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"alwaysRelevant": true,
"parent": "baseCitizen",
"displayName": {
"name": "badCitizen"
},
"persisted": true,
"skeletalmesh": {
"mesh": "MetalRenegades:gooey",
"heightOffset": -2.0,
Expand Down Expand Up @@ -44,66 +43,5 @@
"Behavior": {
"tree": "MetalRenegades:citizen"
},
"Stand": {
"animationPool": [
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyLookRightLeft",
"gooeyLookRightLeft",
"gooeyLookRightUp"
]
},
"Walk": {
"animationPool": [
"gooeyIdleBreathing"
]
},
"Location": {},
"Character": {},
"AliveCharacter": {},
"CharacterMovement" : {
"groundFriction": 16,
"speedMultiplier": 0.3,
"distanceBetweenFootsteps": 0.2,
"distanceBetweenSwimStrokes": 2.5,
"height": 1.0,
"radius": 0.5,
"jumpSpeed": 12
},
"Network": {},
"MinionMove": {},
"Health": {},
"BoxShape": {
"extents": [
1.0,
1.0,
1.0
]
},
"Trigger": {
"detectGroups": [
"engine:debris",
"engine:sensor"
]
},
"Citizen": {}
"Trader": {}
}
76 changes: 76 additions & 0 deletions assets/prefabs/characters/baseCitizen.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"alwaysRelevant": true,
"persisted": true,
"Stand": {
"animationPool": [
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyLookRightLeft",
"gooeyLookRightLeft",
"gooeyLookRightUp"
]
},
"Walk": {
"animationPool": [
"gooeyIdleBreathing"
]
},
"Location": {},
"Character": {},
"AliveCharacter": {},
"CharacterMovement" : {
"groundFriction": 16,
"speedMultiplier": 0.3,
"distanceBetweenFootsteps": 0.2,
"distanceBetweenSwimStrokes": 2.5,
"height": 1.0,
"radius": 0.5,
"jumpSpeed": 12
},
"Network": {},
"MinionMove": {},
"Health": {},
"BoxShape": {
"extents": [
1.0,
1.0,
1.0
]
},
"Trigger": {
"detectGroups": [
"engine:debris",
"engine:sensor"
]
},
"Citizen": {},
"Inventory": {
"privateToOwner": false,
"itemSlots": [
0,
0,
0,
0,
0
]
}
}
66 changes: 2 additions & 64 deletions assets/prefabs/characters/goodCitizen.prefab
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"alwaysRelevant": true,
"parent": "baseCitizen",
"displayName": {
"name": "goodCitizen"
},
"persisted": true,
"skeletalmesh": {
"mesh": "MetalRenegades:gooey",
"heightOffset": -2.0,
Expand Down Expand Up @@ -44,66 +43,5 @@
"Behavior": {
"tree": "MetalRenegades:citizen"
},
"Stand": {
"animationPool": [
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyLookRightLeft",
"gooeyLookRightLeft",
"gooeyLookRightUp"
]
},
"Walk": {
"animationPool": [
"gooeyIdleBreathing"
]
},
"Location": {},
"Character": {},
"AliveCharacter": {},
"CharacterMovement" : {
"groundFriction": 16,
"speedMultiplier": 0.3,
"distanceBetweenFootsteps": 0.2,
"distanceBetweenSwimStrokes": 2.5,
"height": 1.0,
"radius": 0.5,
"jumpSpeed": 12
},
"Network": {},
"MinionMove": {},
"Health": {},
"BoxShape": {
"extents": [
1.0,
1.0,
1.0
]
},
"Trigger": {
"detectGroups": [
"engine:debris",
"engine:sensor"
]
},
"Citizen": {}
"Trader": {}
}
66 changes: 2 additions & 64 deletions assets/prefabs/characters/gooeyCitizen.prefab
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"alwaysRelevant": true,
"parent": "baseCitizen",
"displayName": {
"name": "gooeyCitizen"
},
"persisted": true,
"skeletalmesh": {
"mesh": "MetalRenegades:gooey",
"heightOffset": -2.0,
Expand Down Expand Up @@ -44,66 +43,5 @@
"Behavior": {
"tree": "MetalRenegades:citizen"
},
"Stand": {
"animationPool": [
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyLookRightLeft",
"gooeyLookRightLeft",
"gooeyLookRightUp"
]
},
"Walk": {
"animationPool": [
"gooeyIdleBreathing"
]
},
"Location": {},
"Character": {},
"AliveCharacter": {},
"CharacterMovement" : {
"groundFriction": 16,
"speedMultiplier": 0.3,
"distanceBetweenFootsteps": 0.2,
"distanceBetweenSwimStrokes": 2.5,
"height": 1.0,
"radius": 0.5,
"jumpSpeed": 12
},
"Network": {},
"MinionMove": {},
"Health": {},
"BoxShape": {
"extents": [
1.0,
1.0,
1.0
]
},
"Trigger": {
"detectGroups": [
"engine:debris",
"engine:sensor"
]
},
"Citizen": {}
"Trader": {}
}
47 changes: 47 additions & 0 deletions assets/prefabs/characters/marketCitizen.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"parent": "baseCitizen",
"displayName": {
"name": "shopkeeper"
},
"skeletalmesh": {
"mesh": "MetalRenegades:gooey",
"heightOffset": -2.0,
"material": "MetalRenegades:marketGooey",
"animationPool": [
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyIdleBreathing",
"gooeyLookRightLeft",
"gooeyLookRightLeft",
"gooeyLookRightUp"
],
"loop": true,
"scale": [
0.25,
0.25,
0.25
]
},
"Behavior" : {
"tree" : "Behaviors:stray"
},
"MarketCitizen": {}
}
Loading

0 comments on commit 95352cc

Please sign in to comment.