diff --git a/assets/models/characters.blend b/assets/models/characters.blend index fd8afe6..5573ad6 100644 Binary files a/assets/models/characters.blend and b/assets/models/characters.blend differ diff --git a/client/public/audio/dialog/harrison_reflection.wav b/client/public/audio/dialog/harrison_reflection.wav new file mode 100644 index 0000000..c6a504f Binary files /dev/null and b/client/public/audio/dialog/harrison_reflection.wav differ diff --git a/client/public/img/npcs/harrison_blackwood.png b/client/public/img/npcs/harrison_blackwood.png new file mode 100644 index 0000000..4aae7ed Binary files /dev/null and b/client/public/img/npcs/harrison_blackwood.png differ diff --git a/client/public/models/characters.glb b/client/public/models/characters.glb index bf2ac62..4aa728a 100644 Binary files a/client/public/models/characters.glb and b/client/public/models/characters.glb differ diff --git a/client/src/components/dom/PopupManager.jsx b/client/src/components/dom/PopupManager.jsx index a66d380..36e7e50 100644 --- a/client/src/components/dom/PopupManager.jsx +++ b/client/src/components/dom/PopupManager.jsx @@ -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 diff --git a/server/db/deploy/fuel.sql b/server/db/deploy/fuel.sql index 1b2e822..5193ac9 100644 --- a/server/db/deploy/fuel.sql +++ b/server/db/deploy/fuel.sql @@ -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 diff --git a/server/db/deploy/npcs.sql b/server/db/deploy/npcs.sql index 508884a..237a6ce 100644 --- a/server/db/deploy/npcs.sql +++ b/server/db/deploy/npcs.sql @@ -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;