Skip to content

Commit

Permalink
feat: add Harrison Blackwood NPC and update fuel station name (#36)
Browse files Browse the repository at this point in the history
- Added a new NPC named Harrison Blackwood
- Updated the name of the Sawley Marina Fueling Station to Sawley Fueling Station
  • Loading branch information
blairjordan committed Aug 13, 2023
1 parent 5a13bc3 commit a4d0683
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 2 deletions.
Binary file modified assets/models/characters.blend
Binary file not shown.
Binary file not shown.
Binary file added client/public/img/npcs/harrison_blackwood.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/public/models/characters.glb
Binary file not shown.
2 changes: 1 addition & 1 deletion client/src/components/dom/PopupManager.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function PopupManager(props) {
// 💰 Sell item mutation
const [sellItem] = useMutation(SELL, {
onCompleted: (data) => console.log('Item sold:', data),
onError: (error) => console.log('Error purchasing item:', error),
onError: (error) => console.log('Error selling item:', error),
})

// ⛽ Refuel mutation
Expand Down
2 changes: 1 addition & 1 deletion server/db/deploy/fuel.sql
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ EXECUTE FUNCTION fuel_is_zero();
INSERT INTO markers (position, type, props)
VALUES
('{"x": -30, "y": 0, "z": 50}', 'fuel_station', '{ "name": "Bridge 61 Marina Fueling Station" }'),
('{"x": 135, "y": 0, "z": -78}', 'fuel_station', ' {"name": "Sawley Marina Fueling Station" }')
('{"x": 135, "y": 0, "z": -78}', 'fuel_station', ' {"name": "Sawley Fueling Station" }')
ON CONFLICT DO NOTHING;

-- ⛽ Refuel
Expand Down
35 changes: 35 additions & 0 deletions server/db/deploy/npcs.sql
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,39 @@ VALUES (
)
ON CONFLICT DO NOTHING;

-- 🎩 Harrison Blackwood
INSERT INTO markers (position, type, props)
VALUES (
'{"x": 185, "y": 0, "z": -89, "r": 1.6}',
'npc',
'{
"key": "harrison_blackwood",
"name": "Harrison Blackwood",
"dialog": [
{
"text": "One must always look the part. First impressions are the only impressions.",
"order": 0
},
{
"text": "Why waste time with small endeavors when the world is ripe with bigger opportunities?",
"order": 0
},
{
"text": "Your boat, while not the most sophisticated, certainly has... character. A reflection of its captain, I presume?",
"order": 0,
"key": "harrison_reflection"
},
{
"text": "Your enthusiasm for the canals is palpable. It reminds me of a younger version of myself, full of dreams and aspirations.",
"order": 0
},
{
"text": "Your passion for the canals is commendable. Not many of your age would invest so much in such a... quaint pastime.",
"order": 0
}
]
}'
)
ON CONFLICT DO NOTHING;

COMMIT;

0 comments on commit a4d0683

Please sign in to comment.