From 110d3907551cf117b246be038e2e274da5c380cb Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Fri, 1 Aug 2025 16:10:31 -0400 Subject: [PATCH] More art assets and implemented names and jobs. --- active_scene.tscn | 22 +- adventurer.gd | 11 +- adventurer_data.gd | 10 +- ai/tasks/decorators/busy.gd | 7 +- ai/trees/adventurer.tres | 4 + data/jobs/farmer.tres | 8 + data/jobs/job_data.gd | 10 + data/jobs/job_data.gd.uid | 1 + data/jobs/rookie.tres | 9 + data/names/femme_names.txt | 260 ++++ data/names/masc_names.txt | 331 +++++ data/names/surnames.txt | 2278 +++++++++++++++++++++++++++++++++++ guild.gd | 52 +- guild_employee.gd | 1 - guildhall.tscn | 24 +- profile_popup.gd | 9 +- profile_popup.tscn | 2 +- reception-table.png | Bin 0 -> 1809 bytes reception-table.png.import | 40 + receptionist.png | Bin 0 -> 2311 bytes receptionist.png.import | 40 + receptionist.tscn | 7 +- 22 files changed, 3105 insertions(+), 21 deletions(-) create mode 100644 data/jobs/farmer.tres create mode 100644 data/jobs/job_data.gd create mode 100644 data/jobs/job_data.gd.uid create mode 100644 data/jobs/rookie.tres create mode 100644 data/names/femme_names.txt create mode 100644 data/names/masc_names.txt create mode 100644 data/names/surnames.txt create mode 100644 reception-table.png create mode 100644 reception-table.png.import create mode 100644 receptionist.png create mode 100644 receptionist.png.import diff --git a/active_scene.tscn b/active_scene.tscn index 945f48c..76b514a 100644 --- a/active_scene.tscn +++ b/active_scene.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=3 uid="uid://dfa6ep4o53s08"] +[gd_scene load_steps=8 format=3 uid="uid://dfa6ep4o53s08"] [ext_resource type="Script" uid="uid://cci652umkym1f" path="res://test_scene.gd" id="1_8p2cu"] [ext_resource type="PackedScene" uid="uid://cd08dp16bixfv" path="res://guildhall.tscn" id="1_fcxuj"] @@ -6,6 +6,14 @@ [ext_resource type="PackedScene" uid="uid://dly7in8ql1fn4" path="res://quest_log.tscn" id="4_tro8a"] [ext_resource type="Script" uid="uid://bnbljf6u2d3kh" path="res://visitor_spawner.gd" id="6_d0hfk"] +[sub_resource type="NavigationPolygon" id="NavigationPolygon_eenn6"] +vertices = PackedVector2Array(682, 166.14844, 682, 71, 1053, 71, 1053, 605, 639.85156, 165.96875, 35, 605, 341.6875, 164.90625, 35, 35, 339.0625, 35, 339.67188, 64.71875, 340.96875, 128.71094, 575.8672, 165.72656, 639.85156, 165.96094, 447.8672, 165.27344, 383.85938, 165.02344, 383.85938, 165.00781) +polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Array(4, 0, 3, 5, 6), PackedInt32Array(5, 7, 8, 9, 10, 6), PackedInt32Array(11, 12, 4, 6, 13), PackedInt32Array(14, 13, 6), PackedInt32Array(14, 6, 15)]) +outlines = Array[PackedVector2Array]([PackedVector2Array(373, -17, 376, 130, 647, 131, 647, 36, 1079, 36, 1074, -10)]) +cell_size = 50.0 +border_size = 250.0 +agent_radius = 35.0 + [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_d0hfk"] radius = 15.0 height = 54.0 @@ -16,6 +24,15 @@ script = ExtResource("1_8p2cu") [node name="Guildhall" parent="." instance=ExtResource("1_fcxuj")] position = Vector2(421, 161) +[node name="RoomRegion" parent="Guildhall" index="0"] +navigation_polygon = SubResource("NavigationPolygon_eenn6") + +[node name="Receptionist" parent="Guildhall/Sprites" index="1"] +position = Vector2(512, 19) + +[node name="Queue" parent="Guildhall/Sprites/Receptionist" index="3"] +position = Vector2(0, 172) + [node name="CollisionShape2D" parent="Guildhall/Sprites/CharacterBody2D" index="0"] shape = SubResource("CapsuleShape2D_d0hfk") @@ -25,6 +42,9 @@ position = Vector2(927, 33) [node name="CollisionShape2D" parent="Guildhall/Quest Board" index="1"] position = Vector2(0, -14) +[node name="Queue" parent="Guildhall/Quest Board" index="2"] +position = Vector2(2, 44) + [node name="VisitorSpawner" type="Node2D" parent="Guildhall"] position = Vector2(505, 870) script = ExtResource("6_d0hfk") diff --git a/adventurer.gd b/adventurer.gd index c33feae..7ef52eb 100644 --- a/adventurer.gd +++ b/adventurer.gd @@ -13,6 +13,15 @@ var interaction_target = null var last_position : Vector2 = Vector2.ZERO var stuck : bool = false var stuck_time_remaining : float = 0 +var busy : bool = false +var _activity : String = "" +var activity : String : + get: + return _activity + set(value): + _activity = value + if profile_popup: + profile_popup.change_activity(_activity) @onready var bubble : SpeechBubble = $SpeechBubble @export var interaction_range : float = 75 @export var stop_range : float = 25 @@ -85,7 +94,7 @@ func _on_nav_agent_finished() -> void: func _on_mouse_entered() -> void: profile_popup = popup_template.instantiate() add_child(profile_popup) - profile_popup.setup(data.name, data.level, data.job, "Nothing") + profile_popup.setup(data.name, data.level, data.job.name, activity) func _on_mouse_exited() -> void: diff --git a/adventurer_data.gd b/adventurer_data.gd index bf6091e..2ed0fa1 100644 --- a/adventurer_data.gd +++ b/adventurer_data.gd @@ -1,11 +1,19 @@ class_name AdventurerData extends Node +enum Gender{ + MASC, + FEMME, + NONBINARY +} +var given_name : String = "Test" +var surname : String = "Testing" +var gender : Gender = Gender.MASC var life : int = 1 var max_life : int = 1 var energy : int = 1 var max_energy : int = 1 var level : int = 1 -var job : String = "Adventurer" +var job : JobData var quest : Quest diff --git a/ai/tasks/decorators/busy.gd b/ai/tasks/decorators/busy.gd index 810acf0..b4e0436 100644 --- a/ai/tasks/decorators/busy.gd +++ b/ai/tasks/decorators/busy.gd @@ -1,8 +1,9 @@ @tool extends BTDecorator - +@export var activity : String = "" var prev_busy : bool +var prev_activity : String func _get_task_icon(): return load("res://ai/icons/stopwatch.png") @@ -11,11 +12,15 @@ func _get_task_icon(): func _enter() -> void: if agent.get("busy") != null: prev_busy = agent.busy + prev_activity = agent.activity agent.busy = true + if activity != "": + agent.activity = activity func _exit() -> void: if agent.get("busy") != null: agent.busy = prev_busy + agent.activity = prev_activity # Called to generate a display name for the task (requires @tool). func _generate_name() -> String: diff --git a/ai/trees/adventurer.tres b/ai/trees/adventurer.tres index 1f83901..55236f4 100644 --- a/ai/trees/adventurer.tres +++ b/ai/trees/adventurer.tres @@ -47,6 +47,7 @@ children = [SubResource("BTSetVar_mtixs"), SubResource("BTAction_0kac8"), SubRes [sub_resource type="BTDecorator" id="BTDecorator_nqy1p"] children = [SubResource("BTSequence_s3kkm")] script = ExtResource("2_mtixs") +activity = "Arriving" [sub_resource type="BTRunLimit" id="BTRunLimit_1441p"] children = [SubResource("BTDecorator_nqy1p")] @@ -72,6 +73,7 @@ children = [SubResource("BTCondition_s18yy"), SubResource("BTAction_700su"), Sub [sub_resource type="BTDecorator" id="BTDecorator_700su"] children = [SubResource("BTSequence_1441p")] script = ExtResource("2_mtixs") +activity = "Registering as an adventurer" [sub_resource type="BTCondition" id="BTCondition_mtixs"] script = ExtResource("4_1441p") @@ -91,6 +93,7 @@ children = [SubResource("BTCondition_mtixs"), SubResource("BTAction_fe6jf"), Sub [sub_resource type="BTDecorator" id="BTDecorator_s18yy"] children = [SubResource("BTSequence_nqy1p")] script = ExtResource("2_mtixs") +activity = "Getting a quest" [sub_resource type="BTProbability" id="BTProbability_s3kkm"] children = [SubResource("BTDecorator_s18yy")] @@ -101,6 +104,7 @@ custom_name = "TODO: Make them talk to a random other adventurer" [sub_resource type="BTDecorator" id="BTDecorator_jq6fo"] children = [SubResource("BTComment_mwsop")] script = ExtResource("2_mtixs") +activity = null [sub_resource type="BTCooldown" id="BTCooldown_mtixs"] duration = 5.0 diff --git a/data/jobs/farmer.tres b/data/jobs/farmer.tres new file mode 100644 index 0000000..8c68616 --- /dev/null +++ b/data/jobs/farmer.tres @@ -0,0 +1,8 @@ +[gd_resource type="Resource" script_class="JobData" load_steps=2 format=3 uid="uid://db4xces0v3het"] + +[ext_resource type="Script" uid="uid://byr5ai03cpa5s" path="res://data/jobs/job_data.gd" id="1_clwor"] + +[resource] +script = ExtResource("1_clwor") +name = "Farmer" +metadata/_custom_type_script = "uid://byr5ai03cpa5s" diff --git a/data/jobs/job_data.gd b/data/jobs/job_data.gd new file mode 100644 index 0000000..3a7e53e --- /dev/null +++ b/data/jobs/job_data.gd @@ -0,0 +1,10 @@ +class_name JobData extends Resource + +enum Type { + CIVILIAN, + ADVENTURER, + EMPLOYEE, + CRAFTER +} +@export var name : String +@export var type : Type diff --git a/data/jobs/job_data.gd.uid b/data/jobs/job_data.gd.uid new file mode 100644 index 0000000..4e8c9a3 --- /dev/null +++ b/data/jobs/job_data.gd.uid @@ -0,0 +1 @@ +uid://byr5ai03cpa5s diff --git a/data/jobs/rookie.tres b/data/jobs/rookie.tres new file mode 100644 index 0000000..948c1b8 --- /dev/null +++ b/data/jobs/rookie.tres @@ -0,0 +1,9 @@ +[gd_resource type="Resource" script_class="JobData" load_steps=2 format=3 uid="uid://dnyd68xhgm2de"] + +[ext_resource type="Script" uid="uid://byr5ai03cpa5s" path="res://data/jobs/job_data.gd" id="1_ii2bp"] + +[resource] +script = ExtResource("1_ii2bp") +name = "Rookie" +type = 1 +metadata/_custom_type_script = "uid://byr5ai03cpa5s" diff --git a/data/names/femme_names.txt b/data/names/femme_names.txt new file mode 100644 index 0000000..4a131f6 --- /dev/null +++ b/data/names/femme_names.txt @@ -0,0 +1,260 @@ +Abigail +Agatha +Agnes +Alice +Alison +Amabel +Amice +Amphelis +Amy +Anastasia +Andrea +Angelet +Ankret +Ann +Anne +Annabell +Annis +Anstice +Aphra +Appelin +Arabell +Argent +Armigil +Arminell +Audrey +Audriell +Aveline +Avis +Barbara +Beaton +Beatrice +Beatrix +Benedicta +Bertranne +Bethia +Blanch +Blandin +Bridget +Cassandra +Catherine +Cay +Cecily +Charity +Chesten +Christabel +Clare +Clarice +Clarimond +Clemence +Colette +Collys +Colubery +Constance +Damaris +Darnigold +Deanes +Deborah +Denance +Diana +Dinah +Dionise +Diot +Dorcas +Dorothy +Dowce +Dowsabel +Dunes +Ebbot +Edborough +Edith +Effery +Eglentyne +Eleanor +Elizabeth +Elle +Ellen +Ellis +Elsabeth +Elspeth +Em +Emm +Emlyn +Emmott +English +Epham +Ermengayle +Esther +Ethelburg +Etheldred +Eulalia +Eunice +Eupheme +Eve +Evelyn +Felice +Felicity +Fine +Flora +Fortune +Frances +Freda +Frideswide +Gartered +Gennet +Geraldine +Gertrude +Gillian +Gladys +Godeva +Goodeth +Grisel +Griselda +Grisigon +Guenevere +Guglielma +Hannabel +Hannah +Hawise +Helen +Helewise +Helysoune +Hester +Hild +Hilda +Hodierne +Huldah +Isabel +Ismay +Ismene +Isot +Jacqueline +Jacquemine +Jacquett +Jael +Jane +Janet +Jays +Jean +Jenet +Jenkin +Jennifer +Jeyes +Joan +Johanna +Judith +Julian +Katherine +Kenberry +Kerenhappuch +Kinborough +Laura +Lea +Lettice +Lillian +Lilias +Lora +Loveday +Lucy +Lydia +Mabel +Madeline +Mallyn +Margaret +Margery +Marian +Mariel +Martha +Mary +Matilda +Maud +Mehitabel +Melior +Meraud +Mercy +Merial +Michal +Milborough +Mildred +Miriam +Muriel +Naverin +Nest +Odierne +Olive +Oragge +Parnell +Pascas +Patient +Patty +Penelope +Perine +Pernell +Petronell +Philadelphia +Phillida +Phoebe +Phyllis +Pleasance +Pleasant +Priscilla +Protasia +Prudence +Quenborg +Rabbidge +Rachel +Rebecca +Richarda +Richemay +Richenda +Richenza +Richessa +Richolda +Richord +Richow +Robina +Rochele +Rosamund +Rose +Ruth +Sabine +Sanchia +Sapience +Sarah +Saxa +Scholast +Senobie +Sessley +Sexborough +Sibyl +Sidwell +Sisly +Sissot +Susan +Susannah +Tabitha +Tace +Tamar +Teffany +Temperance +Theophania +Thomasia +Thomasine +Tibbot +Tiffany +Troth +Truth +Ulaliah +Urith +Ursula +Violet +Walbrough +Warburgh +Welmot +Welthin +Werburgh +Wiborough +Wilborough +Willamine +Winifred +Yeedith \ No newline at end of file diff --git a/data/names/masc_names.txt b/data/names/masc_names.txt new file mode 100644 index 0000000..b1b641d --- /dev/null +++ b/data/names/masc_names.txt @@ -0,0 +1,331 @@ +Abednego +Abel +Abraham +Adam +Adeodatus +Adrian +Aeneas +Alan +Allen +Alban +Algernon +Aloysius +Ambrose +Amos +Amyas +Ancel +Angus +Anketil +Ansell +Anthony +Archibald +Arkulus +Armin +Arnold +Arthur +Aubrey +Augustine +Austin +Averill +Baldwin +Balthasar +Barnabas +Barnaby +Barnard +Bartholomew +Benedict +Benjamin +Bernard +Bertram +Bevis +Bonaventure +Boniface +Botolf +Brian +Bruno +Caesar +Caleb +Camillus +Caradoc +Charles +Chichester +Christopher +Ciprian +Colin +Constantine +Cornelius +Crispin +Crispian +Cuthbert +Cyriack +Daniel +David +Denzil +Deodatus +Dermot +Derrick +Dominick +Drew +Eamon +Edmund +Edward +Edwin +Elias +Elier +Elijah +Elkanah +Ellis +Emanuel +Emlyn +Emmett +Emrys +England +Enoder +Erasmus +Esdras +Esme +Ethelbert +Eubold +Eudo +Euseby +Evan +Everett +Ewen +Ezekial +Ezekias +Ezra +Fabian +Faithful +Falk +Felix +Ferdinando +Filbert +Firmin +Francis +Frank +Frederick +Fulbert +Fulk +Gabriel +Galfrid +Gamaliel +Gareth +Garret +Gavin +Gawain +Gedian +Gelbart +Gemmel +Geoffrey +George +Gerald +Gerard +German +Gerrance +Gershom +Gervase +Gilbert +Goddard +Godfrey +Godwin +Goldwin +Goronwy +Gowther +Gregory +Griffith +Griffin +Gualter +Guy +Habell +Hakon +Hamlet +Hamnet +Ham +Hamo +Hannibal +Harold +Harry +Helier +Henry +Herbert +Hercules +Herman +Hezekiah +Hierome +Hieronimus +Hippolytus +Homer +Hope +Howell +Hugh +Humphrey +Immanuel +Ingram +Ingraham +Innocent +Isaac +Ishmael +Israel +Issakhell +Jack +Jacob +Jacques +James +Jarvis +Jasper +Jeffrey +Jelbart +Jenkin +Jeremiah +Jeremy +Jerman +Jerome +Jervis +Jevan +John +Jonah, Jonas +Jonathan +Joscelin +Joseph +Joshua +Josiah +Josias +Julian +Julius +Justinian +Kenelm +Kenneth +Kenrick +Kenward +Kester +Lambert +Lancelot +Laurence Lawrence +Leonard +Levin +Lewis +Libbeus +Lionel +Llewelyn +Lucius +Luke +Macy +Madoc +Magnus +Malcolm +Manuel +Marcellus +Marion +Mark +Marmaduke +Marthias +Martin +Mathias +Maurice +Mawe +Melchior +Melchisadek +Meredith +Methuselah +Michael +Miles +Morris +Moses +Mungo +Nathan +Nathaniel +Nicholas +Ninian +Odo +Oliver +Omfrey +Original +Orlando +Osmond +Oswald +Oswin +Othniel +Otis +Ottiwell +Owen +Pagan +Pain +Pancras +Pascal +Pascoe +Patrick +Paul +Percival +Peregrine +Peter +Pethericke +Philbert +Philemon +Phythian +Pierre +Piers +Postumus +Quentin +Radulf +Ralph +Ranald +Randal +Ranulf +Raphael +Raymond +Reginald +Renatus +Renfred +Reynard +Reynold +Rhys +Richard +Robert +Roger +Roland +Ruben +Salathiel +Samson +Samuel +Savery +Sebastian +Seser +Seth +Sewall +Sidrack +Sigismond +Silas +Simeon +Simon +Solomon +Stephen +Terry +Theobald +Theodore +Theophilus +Thomas +Thurstan +Timothy +Titus +Tobias +Toby +Tristram +Udy +Umphry +Uriah +Urin, Urian +Vincent +Vivian +Vortigern +Waldeve +Walter +Warren +Wido +Wilfred +William +Wistan +Ybel +Yngerame +Zachariah +Zachary +Zachye \ No newline at end of file diff --git a/data/names/surnames.txt b/data/names/surnames.txt new file mode 100644 index 0000000..8368cb5 --- /dev/null +++ b/data/names/surnames.txt @@ -0,0 +1,2278 @@ +Whisperhair +Greatspear +Sagejumper +Redreaver +Pinetrap +Daybinder +Sagebend +Oceanrunner +Nicklefall +Clawgaze +Mirthsteam +Moonore +Mildbeam +Hallowedbough +Commondane +Firereaver +Pyrewillow +Moltenbleeder +Truthriver +Earthbloom +Fusebreaker +Hammerfeather +Silentarrow +Bladesun +Tallsprinter +Roseblower +Honormantle +Springripper +Amberglide +Windwhisper +Elfseeker +Swiftdancer +Lightstrike +Mirthwing +Orbwhisk +Truthmark +Shadowstalker +Plainbrow +Hawkforge +Treewhisper +Abirwik +Abyrford +de Acastre +Adamson +Akworth +Alan +Albright +Albyn +de Aldeburgh +Aldestanemore +Aldestanmore +Allertonde +Allerton +Alne +de Alne +Ambler +Ambrose +Amyas +Ancok +Andrew +Annetson +Annottson +Anotson +Anson +Apilby +Appil +Seller +Appilby +Appilton +Appylton +Arcle +Arcles +Arclez +Arnald +Arnalde +Arnyngton +Arowom +Arowome +Arrold +Aserley +Ashton +Askam +Askham +de Askham +Asper +Asshton +Asshwray +Athereton +Atkynson +Aukland +Austyn +del Awne +Aylde +Ayled +Ayredale +Babthorp +Bagon +Bailgrave +Bailly +Bailya +Bakar +Baker +Bakester +Bakster +Baldock +Baldok +Baleby +Ball +Balmaker +Bampton +Bank +del Bank +del Banke +Barber +Barbour +Barden +Bardeslay +Bardislay +Bardon +de Barkell +Barker +Barkour +Barlay +Barley +Barn +Barnard +Barnby +Barne +Barneby +Barnestonman +Barnstonman +Baron +Barr +Barry +Barton +de Barton +Bartram +Barwik +Barwyk +Baumburgh +Baumeburgh +Bauneburgh +Bautry +Bawde +Bawmburgh +Bawmer +Baxester +Baylbe +Baylison +Baynbrig +Baynes +Beamesley +Becham +Bedale +de Bedale +Bedeman +Bedford +Bedlyngton +Been +Beese +Beilbe +Beilby +Beile +Beileby +Beill +Beilleres +Bekwith +Bekwyth +Belamy +Beleby +Belemy +Belenny +Belford +Bell +Belle +Bellowes +Bellows +Bellyngton +Belos +Beltoft +Beme +Bemeslay +Bempton +Ben +Benclyff +Bene +Benett +Benson +Bentclyff +Bentlay +Bentley +Berden +Berebrewer +Berebruer +Berlot +Bery +Bese +Beseby +Best +Beswyk +Besyngby +Beverlay +Beverley +Bewyk +Beylbe +Bigot +Bilburgh +Billesdale +Bilton +Birden +Birlot +Birnes +Birnet +Birnett +Birstow +Birtby +Birtram +Bisshop +Bisshworth +Bladesmyth +Blakburn +Blakelok +Blakewell +Blakhornaby +Blaklok +Blakwell +Bland +Blaunkfronnt +Blaunkfront +Blaunkfronte +Blaunkfrount +Blevet +Blevett +Blevit +Blith +Blyth +Blythe +Boiss +Boland +Bolland +Bolron +Bolton +de Bolton +Borowe +Bortrell +Bosevell +Bosom +Bossall +de Bossall +Bosse +Boswell +Both +Bothe +del Bothe +Botrell +Botterell +Bouland +Bouman +Bours +Bowe +Bower +Bowes +Bowland +Bowmer +Bowre +Bows +Bowse +Boyland +Bracebrig +Bracebrigg +Bracebrigge +Brad +Bradefeld +Bradeford +Bradefot +Bradefote +Bradelay +Braderig +Bradfeld +Bradford +Bradfote +Bradley +Bradwell +Bragnall +Braithwate +Braker +Brampton +Bramwith +Bramwyth +Brandesby +Brathawayte +Brathewayte +Brathwayte +Brawith +Braythewate +Braythwaite +Braythwayte +Braythwayth +Breerton +Brer +Brerelay +Brereton +de Brereton +Brerton +Brewer +Brewester +Brewster +Brian +Brid +Brig +Brigdam +Briges +Brigg +Brigges +Brigham +Brignall +Britt +Brokden +Broket +Brokett +Brokholes +Brokholez +Brokker +Broudster +Broun +Brounberd +Broune +Brounfeld +Brounfeyld +Brounflete +Brown +Browne +Brownne +Bruche +Brugh +Bryan +Bryg +de Brygenhall +Brygham +Bryghton +Bubwith +Bubwyth +Bucdene +Bugthorp +Bukdale +Bukden +Bukeler +Bukeller +Bukler +Bullok +Bulman +Bulot +Burbrig +Burdon +Burell +Burgbrig +Burges +Burgez +Burgh +del Burgh +Burghbrig +Burghbrigg +Burghbryg +Burghe +Burgies +Burlay +Burley +Burndale +Burnelay +Burnlay +Burnley +Burowe +de Burowe +Burrell +Bursell +Burslay +Burton +de Burton +Bussy +Bustow +de Buth +Buthe +Butler +Butteler +Buttiller +de Buxton +Bygote +Bynnett +Bynnyng +Byrd +Byrdsall +Byrt +Byrtwesill +Cade +Cak +Caldbek +Calton +Cambys +Cambyssh +Camerage +Caminus +Cammus +Camsmyth +Camus +Candell +Canomby +de Canon +Capmakar +Capmaker +Capper +Cardemaker +Cardmaker +Care de Roy +Cariour +Carlele +Carneby +Carpenter +Carre +Carter +Cartmale +Carton +Cartwright +Castelford +Castelton +Castleton +Catclogh +Catcloghe +Cateryk +Catlogh +Catlow +Cato +Catom +Catour +Catryk +Catten +Catton +Cawod +Caytour +Celandre +Celor +Cendall +Cesay +Cesey +Ceszay +Ceszey +Ceton +Chambir +Chapell +Chapman +Charleston +Charleton +Charters +Chartirs +Chatirs +Chaumber +Chaumbir +Chaumbrelayne +Chaumer +Chaundler +Chellowe +Chemp +Chestre +Child +Childe +Chimnay +Chymnay +Chymney +Claibruke +Clapeham +Clarell +Claton +de Claxton +Claybroke +Claybruk +Claybruke +Clayton +Clement +Clerk +Clerke +Cleveland +Clevyn +Clevyng +Cliderow +Clif +Clifton +Cluyn +Clyderow +Clyderowe +Clyff +de Clyfton +Clynt +Cok +Coke +Cokehill +Coker +Cokhill +Cokill +Cokker +Cokkir +Col +Cole +Coller +Collestaine +Collestane +Collestayne +Collesthorp +Collesthorpp +Colling +Collins +Collyng +Collynges +Collyngs +Collynnez +Collynson +Colstan +Colstane +Colstaune +Colyer +Colyng +Colyng +Colynnez +Colyns +Colynson +Connesburgh +Constabill +Constable +Cook +Cooke +Cooper +Copper +Cordener +Corderay +Corderoy +Cornay +Cornhill +Cornwails +Cort +Costance +Cotes +Cotom +Cotyngham +de Cotyngham +Couk +Couke +Coup +Coupeland +Coupemanthorpp +Couper +Coupland +Courtnay +Courtney +Courtny +Coutheron +Coverdale +Coverham +de Coverham +Crake +Crathorn +Crathorne +Craven +de Craven +Crawgill +Crawgyll +Cridlyng +Cridyng +Cristendem +Crocelyn +Croft +Crofton +Croghlyn +Croglyn +Crokebane +Crokelyn +Cropper +Crosby +Crossby +Crosseby +Croukebayn +Croukebayne +Croukey +Croull +Crukebayn +Crukey +Crydlyng +Crydlyngton +Cudbert +Cuke +Cuniesburgh +Cuniesby +Cunnesburgh +Cunnesby +de Cure +Curesall +Curtace +Curtas +Curteis +Curtisse +Custance +Dale +Dalton +de Dalton +Damysell +Danby +Dandeson +Daneyell +Danson +Danyell +Danysell +Danyyhell +Darnyngton +Daunser +Davey +Davy +Davyas +Davyson +Daweson +Dawson +Day +Daymysell +Dayvell +Deken +Dekon +Dele +Deme +Dene +Denny +Dennyn +Dent +Denton +Deny +Denys +Depedale +Depeden +Dernyngton +Deverell +Dewe +Diconson +Doblay +Dobley +Dogeson +Don +Dondale +Dorem +Dounyr +Dowdale +Doweson +Downom +Drake +Driffeld +de Driffeld +Dryng +Drynge +Dubber +Dubley +Duffeld +del Duffeld +Duffelde +Dughty +Duinvyll +Dukdale +Dunford +Dunsford +Dunstall +Durant +Durrant +Dyconson +Dyconson +Dykonson +Dykson +Dynys +Dyvill +Earl +Ebor +Ecopp +Edewyn +Edwyn +Egremond +Egremont +Elerby +Elis +Ellerson +de Ellerson +Ellerton +Elvet +Elvett +Elvyngton +Elwald +Elwyn +Elys +Elysson +Emeryk +Emlay +Emrik +Enveld +Errard +Escryk +Essby +Essedale +Essham +de Essham +Essheton +de Essheton +Esshewe +Esshewra +Esshton +de Esshton +Esshwra +Esshwraa +Esteby +Esterby +de Esthorp +Eston +de Eston +Estton +Esyngwald +de Eton +Etton +Evenwod +Evinwod +Evynwod +Fairefax +Fairepoynt +Fairfaux +Fairfaux +Fairfax +Farefax +Farepount +Farepoynt +Farnlay +Farpoynt +Faucet +Faunconer +Fausell +Fauvell +Fawcett +Fayn +Fayrefax +Fayrepoynt +Fayrfax +Feiffer +Feiser +Feisour +Felton +Fenton +de Fenton +Fereby +Feriby +Fernlay +Fernley +Ferrour +Ferulay +Fery +Feryby +Fesaunt +Fideler +Firthbank +Fissh +Fissher +Fisshewyk +Fisshwyk +Flaxton +Fleming +Flemyng +Flesshewer +Fletcher +Folifait +Folyfayte +Foreste +Forester +Forster +Forstere +Foster +Foston +Foulbarn +Foulford +Fournas +Fourneis +Fournes +Fourneys +Fournis +Fox +Frank +Franke +Frankelayn +Frassell +Fraunk +Fraunke +Fraunkeleyn +Fraunklay +Fraunklayne +Fraxton +Freman +le Frerelane +Fresell +Fressell +Frissell +Frost +Frostell +Frostrane +Fryssell +Fulford +Fullford +Fulshaw +Fulshawe +Fynch +Fynche +Fyrth +Fyssh +Fysshe +Fyssher +Fysshergate +Fyssherwyf +Fysshewyke +Fysshwyk +Fysshwyke +Gaile +Gaille +Gaire +Galt +Gardiner +Gardyner +Gare +Garland +Garliker +Garlyker +Garnet +Garnett +Garnter +Garston +Garten +Garton +Gate +Gatescale +Gatescalez +Gatesheved +Gaunt +Gaunte +Gayle +Gayll +Gaylle +Gaynesburgh +Gayre +Gayt +Gayton +Gegges +Geldale +Genestes +de Gervaux +Giles +Gill +Gillyet +Gillyot +Girlington +Girlyngton +Girshop +Girsop +Girsshop +Girssop +Giry +Giselay +Glasen +Glassen +Glasyer +Glasyn +Glasyner +Glewe +Glone +Glover +Godale +Goddesalve +Godeshalve +Godsalfe +Godsalve +Gold +Goldale +Goldesburgh +Goldesmyth +Goldsmyth +Gollan +Golland +Gosdale +Goss +Gossep +Gott +Gousehill +Gower +Gra +Grantham +Grastok +Grauntham +Gray +Grayson +Graystok +Greenwell +Grene +Greneakirs +Grenebanke +Grenehod +Grenehode +Grenewell +Grenewode +Grenwod +Greteham +Gretham +Greyson +Griffyth +Grissop +Grissoppe +Groull +Gryme +Grynder +Gryndon +Gryssop +Gud +Gudale +Gudderswik +Guddeswyk +Gude +Gudeale +Guislay +Gunby +Gurnard +Gurnerd +Gusherd +Gutersworth +Guttersworth +Gutterswyk +Guy +Guye +Guyl +Guyour +Gybson +Gyles +Gyll +de Gyll +Gyor +Gyrdeler +Gyrlington +Gyrshop +Gyry +Gys +Hadellsay +Hadilsay +Hadilsey +Hadislay +Hagg +Hagge +Hagges +Hakworth +Haliday +Halifax +Haliwell +Hall +del Hall +Halliday +Halsall +Halyday +Hambald +Hamerton +Hancok +Hankes +Hankok +Hanselyn +Hanslyn +Hanson +Hantelyn +Hantrcroft +Hapton +Hardesang +Hardestye +Hardy +Harington +Harome +Harpham +Harrison +Hart +Harte +Harton +Harwod +Haryngton +Hastinges +Hastynges +Hastyngs +Hatfeld +Haucelyn +Hauke +Hauslyn +Haustelyn +Havercroft +Hawardyne +Hawk +Hawke +Haxay +Haxey +Hay +de Hay +Hayles +Hayll +Hayne +Hayner +Hayns +Hayre +Hayrester +de Hayton +Hebbe +Hebchester +Heceham +Hedon +Hefeld +Helay +Helibisse +Helm +de Helmelsay +Helmeslay +de Helmeslay +Helmesley +Helmslay +Helmyslay +Helperby +Hemelsay +de Hemelsay +Hemelsey +Hemylsay +Henreson +Henri +Henrison +Hereford +Herfford +Herpham +Herrison +Herryson +Hert +Hertford +Hervy +Heseham +Hesil +Hesill +Hesillwod +Hesilwod +Heslwod +Heslyngton +Hessill +Hessilwod +Hesyll +de Hesyll +Heton +Hewett +Hexes +Hexham +Hey +Hiknorth +del Hill +Hilton +Hipper +Hirst +Hissill +Hochonson +Hode +Hogerd +Hogeson +Hoggarde +Hoggeson +Holbeck +Holbek +Holdernes +Holgate +Hollebek +Hollegate +Holles +Holm +Holme +Holms +Holtby +Holteby +Homby +Hoppham +Hopplyn +Horbery +Horbury +Hornby +Horner +Hornyngton +Horsford +Hortford +Horton +Hostiler +Hostiller +Hotchonson +Housom +Houson +Hoveden +Hovyngam +Hovyngham +del How +Howden +Howe +del Howe +de la Howe +Howet +Howm +Howme +Howom +de Howom +Howram +Howsom +Hubank +Huby +Huchonson +Hude +Hudson +Huet +Hugate +Huggate +de Hull +Hulot +Hulott +Hundmanby +Hunmandby +Hunt +Hunte +Hunter +Huntyngton +Hurkok +Hurlok +Husthwayt +Hutchonson +Huthom +del Hyll +Hylton +Hyndelay +Hynderwell +Hyndirwell +Hyndlay +Hyndson +Hynse +Hyrst +Ince +Ingelby +Ingilby +Inglissh +Inglys +Inglyssh +Inglyssh +Inglyssh +Iranmonger +Ironmaker +Ironmanger +Ironmanger +Jakes +Jakeson +Jakson +Johnson +Johnston +Joner +Jonour +Jonson +Jowkyn +Jowkyn +Jownkyn +Joynour +Junkyn +Junkyn +Junour +Junour +Jure +Juynour +Ka +Kaa +Kamsmyth +Karr +Katton +Kay +Kechyn +Kedell +Keighlay +Kek +Kelay +Keld +Keley +Kelk +Keller +Kelles +Kemp +Kendale +Kendall +Kendell +Kenpper +Kent +Kepas +Kepask +Kerr +Ketill +Kettill +Kettyll +Ketyll +Key +Kighlay +Kighlay +Kighley +Kilburn +de Kilburn +Killom +Killynghall +King +Kirby +Kirk +Kirkby +Kirke +Kirkeby +Kirkeham +Kirkham +Kirkton +Knolles +Knollez +Knols +Kyam +Kyem +Kygh +de Kyghlay +Kyghley +Kyng +Kynge +Kyngeston +Kypas +Kypask +Kyrk +Kyrkby +Kyrkeby +Kyrkeham +Kyrkham +Kyrkton +Lace +Laicestre +de Lairethorp +Lairethorpp +Lairthorp +Lam +Lambe +Lame +Lamley +Lancastre +Lang +Langland +Langshawe +Langton +Lanom +Lasbury +Lassell +Lasselles +Lasset +Lassett +Lathom +Laton +Latoner +Latonour +Laurence +Laycestre +de Laycestre +Layerthorp +Layton +Lechelay +Lede +Ledes +Ledys +del Lee +Leedes +Lefe +Leicestre +Lemyng +Lepyngton +Lesberi +Lesberys +Lescrop +Lescrope +Lessberys +Lessebur +Leste +Lethelay +Letheley +Letwyn +Leversham +de Leverton +Levesham +Levyngton +Leycester +Leycestre +Lichefeld +Lightfote +Lighton +Lillelay +Lilly +Lillylowe +Lillyng +Lincolne +Litevyn +Litewyn +Litster +Littelbery +Littilbery +Litubury +Litveyn +Litwyn +Litwyne +Lo +Lokeryg +Lokrig +Lokryg +Lokryk +Lokryng +Loksmith +Loksmyth +Lokyng +Lokyngton +Lolland +Loncastre +Lonesdale +Lopyngton +Lord +Lorrimer +Lorymer +Lotterow +Lounesburgh +Lounesdale +Louth +Lowde +Lucas +Luce +Lucy +Lumhald +Lumhals +Lumman +Lutton +Lye +Lyghtfote +Lyllyng +Lynby +Lyncoln +Lyncolne +Lyndby +Lyndelay +Lyndesay +Lyndeszay +Lyndlay +Lyndley +Lynford +Lynner +Lynnynwever +Lynton +de Lynton +Lyon +Lyons +Lytster +Lytwyn +Machion +Madder +Maddersay +Mallom +de Malton +Manfeld +Mansell +Manware +Mar +Marchaunt +Mareshall +Maresshall +Mariot +Markett +Marr +Marre +de Marre +Marrsshall +Marshall +Marshton +Marsshall +Marsshton +Marston +Marton +de Marton +Maryner +Maryot +Masham +Mason +Massham +Masyng +Maunby +Maundevyle +Maundvile +Maundvile +Maver +Mawer +Mayfeld +de Mayfeld +Medcalf +Medcalff +Meddiall +Mede +Medelay +Medeley +Meeke +Meke +Melburn +de Melburn +Melles +Melryk +Menythorp +Merchand +Merston +Merton +Messingham +Messyngham +Mesyngham +Metcalf +Metcalfe +Metcalff +Meteham +Metham +Meux +Meverous +Middelham +Middellham +Middelton +Middiall +Middilton +Middleton +Midelton +Midiall +Midilton +Mirre +Misen +Mitchell +Mode +Modeley +Mody +Monkton +Moras +Morasse +More +del More +Moreby +de Moreby +Morehall +Moreland +Mores +Moresse +Moreton +de Moreton +Morland +Morton +Mortymer +Moss +Mosse +Mote +Mottram +Moubray +Moundevyle +Mounser +Mowbray +Mowebray +Mudd +Muston +de Muston +Mylne +Mylner +Mytchell +Mytonde +Myton +Neilson +Neleson +Nelson +Neuland +Neuport +Neuporte +Neuton +de Neuton +Nevell +Nevet +Nevile +Nevill +Nevyle +Nevyll +Newark +Newe +Newman +Newport +Newporte +Newton +Neylton +Nobill +Norfolk +Norman +Normanton +Normanville +North +Northefolk +Northfolk +Northfolke +Northhouse +Northman +Northouse +Northus +Norton +Nottyngham +Odlowe +Okes +Oklesthorp +Ordeux +Ordous +Orlow +Orlowe +Orwell +Osmond +Ostiler +Ostiller +Otlay +Ottelay +Otter +Otteray +Ourom +Oust +Outlawe +Oversaw +Owrom +Owsteby +Oy +Pacok +Painntour +Paisegod +Paisgod +Paisgode +Paisgude +Pak +Pale +Paline +Pall +Pallyn +Palmer +Panall +Pannall +Pannell +Pape +Paraunt +Paret +Parke +de Parke +Parkour +Parkynson +Parr +Parre +de Parre +Parrote +Parrott +Parys +Pataner +Patener +Patenmaker +Patoner +Patryk +Patryngham +Patyner +Patynere +Patynner +Paule +Paver +Payner +Paynter +Payntour +Peke +Pennok +Penreth +Penton +Peny +Peper +Pepir +Percy +Perers +Peres +Pereson +Perman +Person +Persson +Peton +Piereson +Pierson +Pikeryng +Pillay +Pille +Pilly +Plasterer +Plesyngton +Plomer +Plompton +Plovell +Plumber +Plumer +Plumere +Plummer +Plumpton +Plumton +Polayn +Pollington +Polly +Pollyngton +Polyngton +Ponderson +Pootherson +Poremanger +Port +Porte +Porter +Portjoy +Pothowe +Pottak +Potter +Pouchemaker +Poule +Pouls +Pountefreit +Pountefreite +Pountefret +Pountefrett +Pountfreit +Pountfret +Pountfrete +Pountfrett +Pountfreyt +Pountfreyte +Pounttfreyt +Precious +Prekett +Prence +Preston +Price +Priket +Prikett +Prince +Priston +Proudefote +Provest +Prykkett +Prynce +Pryns +Puddeszay +Pudesay +Pudeszay +Pudsay +Pudszay +Pullan +Punderson +Py +Pygot +Pygott +Pykall +Pykarde +Pykell +Pykeryng +Pymperton +Pympton +Pynchebek +Pynchest +Pynder +Pynner +Queldryk +Quixlay +de Quixlay +Raa +Raby +Radcliff +Radclyf +Radclyff +Radclyffe +Raghton +Raisbek +Raisebek +Rallyn +Rand +Rande +Rasebek +Raskell +Rasskell +Raufe +Raulyn +Raynald +Raynalde +Rayner +Raynold +Raysebek +Rede +Redenesse +Remyngton +Rest +Revetour +Richardson +Richemond +Riddeler +Ridlay +Ridley +Rillington +Rilly +Rillyngton +Rilyngton +Rimour +Riplingham +Ripon +de Ripon +Risse +Rissheworth +Risshford +Roberdes +Robinson +Robson +Robynson +Rocliff +Rocliffe +Roclyff +Roclyffe +Rode +Roderham +Rodes +Roeston +Roger +Rome +Roodes +Roos +Roseton +Rotherham +Rothwell +Roucliff +Rouclyff +Rouclyff +Roune +Routh +Routhe +Rowley +Rowlyn +Rowth +Rudd +Rudde +Ruddel +Ruddok +Rukby +Rukeby +Rukey +Rukshawe +Rumby +Rusebek +Russell +Ryddeley +Rydley +Ryllyngton +Rymour +Rypon +Rys +Ryse +Ryselay +Rysshworth +Ryther +Saddiller +Sadiller +Sadler +Sage +Salesbury +Sallay +de Sallay +Saller +Salley +Salmon +Salter +Sander +Sandford +Sandre +Sange +Santon +Sapemaker +Sapper +Saucemaker +Saunde +Saunder +Saunderson +Saundersson +Sausceby +Sauvage +Savage +Savagge +Savege +Sawer +Sawere +Sawman +Sawmon +Sawtre +Sawyer +Saxton +de Saxton +Scalby +Scamston +Scargell +Scargill +Scargyll +Scathelok +Scathlok +Scauceby +Scaucesby +Scauseby +Scawesby +Scawsby +Scawsceby +Scawseby +Scirviner +Sclatter +Scotton +Scrawesburgh +del Se +del See +Selby +de Selby +Selles +Semer +Semere +Semester +Seszay +Seton +Seynte +Shaddlok +Shadelok +Shadelok +Shadley +Shapples +Sharow +Sharowe +Sharp +Sharpils +Sharpp +Sharrowe +Shathelok +Shathlok +Shawe +Sheffeld +Shene +Shepp +Sheppils +Sherlay +Sherley +Sherman +Sheyn +Shipman +Shirlay +Shirley +Shirman +Shirwod +Shone +Shorefeld +Shoreswod +Shorewod +Shypton +Shyrwod +Shyrwud +Skathelok +Skelt +Skelton +Skipton +Skipwith +Skipwytth +Skirmer +Skott +Skotton +Skynner +Skynwyn +Skypwith +Slater +Sledman +Small +Smawes +Smith +Smyth +Smythe +Snart +Snawe +Snawesill +Snawsell +de Snaythe +Sneusall +Sokburn +Somer +Somerscales +Sopper +Sotheby +Sothill +Sounder +Southam +Southolme +Sowerby +Sowreby +Sowtham +Spatres +Spayn +Spayne +Specer +Spen +Spence +Spencer +Spense +Spenser +Spicer +Spofford +Spoffoth +Sponer +Sporfford +Sporier +Spurer +Spurre +Spurret +Spynk +Spynke +Spyser +Stafford +Stainelay +Staivelay +Stanehouse +Stanlay +Stans +Stanton +Stapilton +de Stapilton +Stapleton +Stave +Stavelay +Staveley +Stayneton +Staynhouse +Staynlay +Staynton +Stayvelay +Stele +Steresacre +Steresaker +Stereseacre +Sterk +Sterke +Stevenour +Steyneyhour +Steynour +Stillyngflete +Stillyngflett +Stir +Stirk +Stirston +Stirtavaunt +Stirtevaunt +Stockton +Stodeley +Stokdale +Stokeslay +Stokesley +Stoksley +Stokton +Storer +Storiour +Storour +Storrs +Strensall +de Strensall +Strynger +Stubbes +Stubbez +Studelay +Studlay +Studley +Sturston +Styllyngflete +Sumnyr +Sumpter +Sutham +de Suton +Sutton +de Sutton +Swan +Swann +Swathath +Swathe +Swerd +Swynton +Syggeston +Symson +Syther +Tailliour +Taillour +Taillyour +Tailour +Tailyour +Takton +Takyll +Talkan +Talliour +Tandfeld +Tanfeld +Tanfelde +Tarton +Taundfeld +Tayte +Teiller +Terry +Tesdale +Tesedale +Thakwraa +Thannibour +Therlthwayte +Thirland +Thirn +Thirsk +Thomas +Thomson +Thoresby +Thorne +Thorneton +Thornthayte +Thornthewaytt +Thornthwayte +Thornton +de Thornton +Thorp +Thorpp +Thrisk +Thrysk +Thuates +Thuresby +Thwayte +Thwaytes +Thwaytez +Thweng +Thwenge +Thweyng +Thweynge +Thwinge +Thwyng +Tieller +Tindall +Tinndale +Tirry +Tirswell +Tod +Tokwith +Tokwyth +Toller +Tolton +Tomson +Tonstall +Tonte +Topclyff +Torney +Toueton +Toung +Touse +Touthorp +Touton +Towton +Trewe +Truloffe +Truswell +Tubbac +Tunstall +Turlus +Turnbul +Turnour +Tuswell +Tutbag +Tutbak +Twys +Tydeman +Tyndale +Tynley +Tynly +Ughtred +Ughtrede +Ughtrete +Ughtreth +Unthank +Uppesall +Ursall +Usburn +Uscliff +Useburn +Useworth +Usflete +Usworth +Vause +Vaux +Venell +Vesty +Vicars +Vowre +Vowrs +Vyner +Vynes +Vynez +Vyntener +Vynter +Wade +Wady +Waid +Waitheman +Waithman +Waithmer +Wakefeld +Waldbe +Waldby +Waldeby +de Waldeby +Walding +Waldyby +Waleby +Waleys +Walker +Walkyngham +Wall +Waller +Walles +Wallesgrave +Wallez +Wallyngham +Walsfurth +Walshe +Walsheford +Walton +de Walton +Walus +Wandiford +Ward +Wardale +Warde +Wardell +Ware +Warke +Warmemouthe +Warter +Wartere +Warthell +Warthill +Wartre +de Wartre +Waryn +Wastell +Waterleader +Waterleder +Waterledyr +Wath +Watheman +Wathman +Watirleder +Watson +Wattes +Watton +Watyrleder +Wawby +Waystow +Wayte +Waytheman +Waythman +Webster +Welburn +Welez +Wellam +Welles +Wellom +Welton +de Welton +Wendre +Werelay +West +de Weste +Westeby +Westiby +Westmerland +Westow +Westowe +Wetewod +Wetewodd +Wetewode +Wever +Whachestre +Whallegrave +Whallesgrave +Whar +Wharfe +Wharff +Wheldale +Whirig +Whiryg +Whitchester +Whitchestre +White +Whitecak +Whitecake +Whitgyft +Whittechestre +Whixlay +de Whixlay +Whixley +Whyrig +Whyryg +Whyryk +Whyte +Wighton +Wigton +Wileson +Wilkyn +Wilkynson +Willett +Williamson +Willot +Willott +Willymote +Wilote +Wilson +Wistow +Wistowe +de Wistowe +Witton +Wod +Wodd +Wodhed +de Wodhous +Worcestre +Wragby +Wrangell +Wrangill +Wrangwissh +Wrangyll +Wrawby +Wraweby +Wright +Wryght +Wryghtson +Wycam +Wygeslay +Wyghton +Wygton +Wylson +de Wylton +Wylymot +Wyman +Wynder +Wyndill +Wyndin +Wyndowes +Wyndyll +Wynfeld +Wyngteryngham +Wynpenny +Wynter +Wynteryngham +Wyntryngham +Wyntyngham +Wyredale +Wyresdale +Wyryg +Wystow +Wystowe +de Wystowe +Wytam +Wyvell +Yereslay +Yereslay +Yerslay +Yholgrave +Yhoman +Yhong +Yhonge +Ynce +Ynglyssh +Yngylby +Yolgrave +Yollesgrave de Yolton +Yoman +Yong +Yonge +York +de York Yorke +Yotton +Yrinmonger diff --git a/guild.gd b/guild.gd index 667ba39..14e7107 100644 --- a/guild.gd +++ b/guild.gd @@ -9,12 +9,44 @@ const visitors = { } +var surnames : Array[String] = [] +var masc_names : Array[String] = [] +var femme_names : Array[String] = [] + +const job_list = [ + preload("res://data/jobs/farmer.tres"), + preload("res://data/jobs/rookie.tres") +] + +var jobs : Dictionary[String, JobData] = {} var members : Array[AdventurerData] = [] var quests : Dictionary[Quest,bool] = {} var hall : Guildhall = null var visitor_spawner : VisitorSpawner = null +func _ready() -> void: + var file = FileAccess.open("res://data/names/surnames.txt", FileAccess.READ) + while !file.eof_reached(): + var line = file.get_line().strip_edges() + surnames.append(line) + file.close() + + file = FileAccess.open("res://data/names/masc_names.txt", FileAccess.READ) + while !file.eof_reached(): + var line = file.get_line().strip_edges() + masc_names.append(line) + file.close() + + file = FileAccess.open("res://data/names/femme_names.txt", FileAccess.READ) + while !file.eof_reached(): + var line = file.get_line().strip_edges() + femme_names.append(line) + file.close() + + for job : JobData in job_list: + jobs[job.name] = job + func register_guild_member(member : AdventurerData, first : bool = false) -> void: members.append(member) if first: @@ -35,8 +67,24 @@ func assign_quest(member : AdventurerData, quest : Quest) -> void: Game.add_quest_progress_bar(quest) func spawn_visitor(pos : Vector2) -> void: - var visitor : AdventurerData = visitors["test"].data.instantiate() + var data : AdventurerData = visitors["test"].data.instantiate() var sprite : Adventurer = visitors["test"].sprite.instantiate() - sprite.data = visitor + var r = randf() + if r > 0.8: + data.gender = 2 #Nonbinary + if randf() > 0.5: + data.given_name = femme_names.pick_random() + else: + data.given_name = masc_names.pick_random() + elif r > 0.4: + data.gender = 1 #Female presenting + data.given_name = femme_names.pick_random() + else: + data.gender = 0 #Male presenting + data.given_name = masc_names.pick_random() + data.surname = surnames.pick_random() + data.name = data.given_name + " " + data.surname + data.job = jobs["Farmer"] + sprite.data = data hall.add_sprite(sprite) sprite.global_position = pos diff --git a/guild_employee.gd b/guild_employee.gd index ce7c4af..feec4c4 100644 --- a/guild_employee.gd +++ b/guild_employee.gd @@ -2,7 +2,6 @@ class_name GuildEmployee extends Adventurer @export var speech :String @onready var queue : GuildQueue = $Queue -var busy : bool signal service_provided() diff --git a/guildhall.tscn b/guildhall.tscn index b976d35..b37e7f6 100644 --- a/guildhall.tscn +++ b/guildhall.tscn @@ -1,16 +1,18 @@ -[gd_scene load_steps=12 format=4 uid="uid://cd08dp16bixfv"] +[gd_scene load_steps=13 format=4 uid="uid://cd08dp16bixfv"] [ext_resource type="Script" uid="uid://ccorfvcfa84gf" path="res://guildhall.gd" id="1_lsinl"] [ext_resource type="TileSet" uid="uid://6im0g3eg6sr4" path="res://test_tiles.tres" id="1_qel1r"] [ext_resource type="Script" uid="uid://dolqtw1ye4ras" path="res://player.gd" id="2_5n4iw"] +[ext_resource type="Texture2D" uid="uid://83ayd5rg7x8l" path="res://reception-table.png" id="3_13vc8"] [ext_resource type="Texture2D" uid="uid://cg6ptmynq0aq0" path="res://basic-sprite.png" id="4_l3mu1"] [ext_resource type="PackedScene" uid="uid://cf6nnjyp8kv78" path="res://receptionist.tscn" id="5_l3mu1"] [ext_resource type="Texture2D" uid="uid://bnt2dlv7kxw7s" path="res://questboard.png" id="6_2wofw"] [ext_resource type="Script" uid="uid://b0q2233msdtgo" path="res://guild_queue.gd" id="7_hph4e"] [sub_resource type="NavigationPolygon" id="NavigationPolygon_w7eqs"] -vertices = PackedVector2Array(803, 163, 803, 53, 1053, 53, 1053, 605, 35, 605, 221, 163, 35, 35, 221, 35) -polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Array(0, 3, 4, 5), PackedInt32Array(5, 4, 6, 7)]) +vertices = PackedVector2Array(591.3203, 170.54688, 591.3125, 170.53906, 614.1094, 159.47656, 694.9531, 80.92969, 694.9375, 80.921875, 702.6406, 67, 1053, 67, 1053, 605, 665.27344, 134.64063, 35, 605, 578.35156, 176.85938, 512.60156, 177.99219, 445.89844, 179.14063, 35, 35, 432.14063, 172.14844, 432.14063, 172.14063, 406.6172, 159.21875, 368.17188, 139.71875, 368.17188, 139.71094, 357.59375, 134.42969, 326.3125, 77.5625, 324.82813, 35, 325.8828, 65.21875) +polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2), PackedInt32Array(3, 4, 5), PackedInt32Array(5, 6, 7, 3), PackedInt32Array(8, 3, 7), PackedInt32Array(0, 2, 8, 7, 9, 10), PackedInt32Array(11, 10, 9), PackedInt32Array(12, 11, 9), PackedInt32Array(12, 9, 13, 14), PackedInt32Array(15, 14, 13, 16), PackedInt32Array(17, 16, 13), PackedInt32Array(18, 17, 13, 19), PackedInt32Array(20, 19, 13), PackedInt32Array(20, 13, 21, 22)]) +outlines = Array[PackedVector2Array]([PackedVector2Array(358, -18, 361, 68, 383, 108, 454, 144, 570, 142, 640, 108, 682, 32, 1075, 32, 1074, -10)]) border_size = 250.0 agent_radius = 35.0 @@ -38,15 +40,25 @@ tile_map_data = PackedByteArray("AAABAAEAAAAOAAEAAAACAAEAAAAOAAEAAAADAAEAAAAOAAE tile_set = ExtResource("1_qel1r") [node name="TileMapLayer2" type="TileMapLayer" parent="RoomRegion"] -tile_map_data = PackedByteArray("AAAEAAEAAAASAAwAAAAFAAEAAAATAAwAAAAGAAEAAAATAAwAAAAHAAEAAAATAAwAAAAIAAEAAAATAAwAAAAJAAEAAAATAAwAAAAKAAEAAAATAAwAAAALAAEAAAAUAAwAAAANAAAAAAAKABEAAAAOAAAAAAAKABEAAAAPAAAAAAAKABEAAAAQAAAAAAAKABEAAAA=") +tile_map_data = PackedByteArray("AAANAAAAAAAKABEAAAAOAAAAAAAKABEAAAAPAAAAAAAKABEAAAAQAAAAAAAKABEAAAA=") tile_set = ExtResource("1_qel1r") [node name="Sprites" type="Node2D" parent="."] z_index = 1 y_sort_enabled = true +[node name="Reception Desk" type="StaticBody2D" parent="Sprites"] +position = Vector2(512, 142) + +[node name="Sprite2D" type="Sprite2D" parent="Sprites/Reception Desk"] +texture = ExtResource("3_13vc8") +offset = Vector2(0, -80) + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Sprites/Reception Desk"] +polygon = PackedVector2Array(-86, -160, -152, -160, -152, -107, -148, -75, -128, -35, -57, 0, 56, 0, 127, -34, 148, -75, 152, -107, 152, -160, 86, -160, 86, -115, 75, -93, 52, -81, -51, -81, -75, -92, -86, -114) + [node name="Receptionist" parent="Sprites" instance=ExtResource("5_l3mu1")] -position = Vector2(512, -27) +position = Vector2(512, 29) [node name="Queue" parent="Sprites/Receptionist" index="3"] position = Vector2(0, 220) @@ -72,7 +84,7 @@ position = Vector2(448, 600) navigation_polygon = SubResource("NavigationPolygon_l3mu1") [node name="Quest Board" type="StaticBody2D" parent="."] -position = Vector2(940, 33) +position = Vector2(935, 32) [node name="Sprite2D" type="Sprite2D" parent="Quest Board"] position = Vector2(0, -64) diff --git a/profile_popup.gd b/profile_popup.gd index 01eeebd..85b34c9 100644 --- a/profile_popup.gd +++ b/profile_popup.gd @@ -2,12 +2,15 @@ extends Control @onready var name_label = %NameLabel @onready var level_label = %LevelLabel -@onready var class_label = %ClassLabel +@onready var job_label = %JobLabel @onready var activity_label = %ActivityLabel -func setup(new_name : String, level : int, clss : String, activity : String) -> void: +func setup(new_name : String, level : int, job : String, activity : String) -> void: name_label.text = new_name level_label.text = "Lv " + str(level) - class_label.text = clss + job_label.text = job + activity_label.text = activity + +func change_activity(activity : String) -> void: activity_label.text = activity diff --git a/profile_popup.tscn b/profile_popup.tscn index 164a10a..1118d82 100644 --- a/profile_popup.tscn +++ b/profile_popup.tscn @@ -51,7 +51,7 @@ layout_mode = 2 text = "Lvl" horizontal_alignment = 2 -[node name="ClassLabel" type="Label" parent="PanelContainer/VBoxContainer"] +[node name="JobLabel" type="Label" parent="PanelContainer/VBoxContainer"] unique_name_in_owner = true layout_mode = 2 text = "Class" diff --git a/reception-table.png b/reception-table.png new file mode 100644 index 0000000000000000000000000000000000000000..08322823ed3cb085459feeb128d89f0a726270ff GIT binary patch literal 1809 zcmc&#{a4ay76)GtR7z|>OdS)CwI!(IrnQ+(B5E#bldGUWDM@Pi64r{29uyn2d?|6Z z)M<2bt*l1-f*=Z05#bovn_&rTW`#AGqLwGYd@1+K>>sheJoj^-&$;)0?!D(cPxW^R zF-XVtjt~e08M}v+2!TL@K->n0foJVhkR52C#}i|S5a5yLBm@GxA4`fzDsGt>3qR(W zjIGk{4ZvA;ulaYR+ojwJKS8PA8~h#mcUzhwiDxAa!#*M)yD#(7m)i?BxCvJi<+O{F zYGKF3M8KD#>W}hHE<{xEid_2mKy_6*TgohyU+JSA;^9uYNo_^BR(Q?8Pqo>7l^# z0q@(N8OteCi;2sSbj5|TPYR1q(#N?c6Q@3GVv$JI3zsbgN>bB5)}E;Vqi>fNuQIms z8o4X;e=A%4unUJ5Wl^xPDQUJtP>G7CL+Yt~dkfOP?rv(D?@PM}j<&Rr18FFX!HI%B zEmi=q}db`-3GM6vO= z^`f-$l>tZFUuC_Dvd?o(oiB4L;#rjiE~cESpRH;yK1{Vr!&9(f5=CZ7NIJzp#@$Uw z@D|EV{wfz*(%6;rr8WJ-p9d*r@llULs4W2a@u6}a) zX2*~sZ2VOTWtQjtEjJ)1PE&lEotHgqQ!7$+h&8eZS$^}9p~;>DsjWj9pK0INW0;i$ zWsN~> z7-`Hw$t*zxOJz;MsgW3h2=1R7m{orLu<5y4PZuk|t$fw8A!uye?Re=G$8_Mb$%J_y z4ZS4Yl1{+}jp(f1*}C2+94s3?r%|C}Uxno8^-_NU3WF6Ga`v9@QSnABG;lVcOAn-X zt9Szz#{b;2ZfodFWp1euT!{0Y+$nk={s6N-Yl?pG@oi&gL6w)Ggd62Kpa0b#C;#$o zvmm1U-Xb^e=JcT>%Gp_O?~Ou{P}s0y=@!9#e)#%ye@L%>spjf@SvnE6cnb~qKHx5o z|EIn(>gH$L#%r5dj}_O9TPDm0O#bZ+MJ%bNjZ44--G1I1y6-!Bh&63qWL4qsOEufG zE6zEXeLKeB826`rp^QT}rw_*}Gxs;(?=3jF_sm=!2fk(=~dG&Mw#N=;0c?J(_H!NffyCDd`zR*mCw}20hh76i+n> z1b0GdNc}T2TKmezV_k4c#|S&`a4m19S5?J#?ih3d2s$e1gnj5n7JGjcJ1?)3=OwmM zihCH~I!LLkR7-L%dxm+R=cNFtI*G;;An2(i2dCUP&Aa5c?3qI*Uh;lWVRT>#LJ#h% zz26$e8X?OpJu%Ajsa6UTUX@dCMi=~9tLIlWdnQlF3z1tBQs%z~Zt1AMBiszlf_>!o z#vQ7FWKS9C&2Qb@8rRY=vJB=u)lJW`n}+#hWT-#C zZk}(#5@1~}!NVvZL+T0U&i;ix(lEXuCh=q!_W8bdyJHsAN%4CMMZS}foYhZ)rB8#a zVGq^=xc&=*zJJbL@p~!=XGFc_p^30{W>=v7q!n$O#{lhDtY~iulB&%BRle>iSxeO( zx1z0&T!C?CYxVqA0%PDO8w%WgY ze(9sA;Cxqr3pZH!by+HDAat}|(Av!Qid0%Qu{PltYFE)~c&eJ;xn>(Dyy=;PvZIBJ aUU7J_Q}!~h<%Agg;~=q72_%4+e&WB~_(Bo@ literal 0 HcmV?d00001 diff --git a/reception-table.png.import b/reception-table.png.import new file mode 100644 index 0000000..dd83fbc --- /dev/null +++ b/reception-table.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://83ayd5rg7x8l" +path="res://.godot/imported/reception-table.png-27debfc446f7f631abe84dd17f02d3ab.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://reception-table.png" +dest_files=["res://.godot/imported/reception-table.png-27debfc446f7f631abe84dd17f02d3ab.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/receptionist.png b/receptionist.png new file mode 100644 index 0000000000000000000000000000000000000000..0f1bbca618919c3857c98f4205096dca30ba18f7 GIT binary patch literal 2311 zcmV+i3HbJjP)Px-!AV3xRCt`#oJ(v}RT#(rmsS>l7$gk~QGvFWU>ee9ilBvdAqz1+)98*gnoc*x zXuyO-6E`kcNPNJi(}=~m!4O0Vm;ei))e3E^W8c3-t)fa zPRl#(6~2>*3$!9y#r_;3Wf#6=^a2FH$RL6SGWZ=MT%zM*T#wMp}KIcg^eSrbo2AzAo| zwpt9o`8J?lnzZE1qb869#QTikO>UTuoPnAe#(Gl}#x7x9PDbdww@g{)%$3<#+0HHW zYH6r!`?7nkOmhd?d2gA}FcxapmZh=lI`xt&>D285!14NeWkHeAI$mqZ=jo-jy-7Uk z>j1hC_0y8iTd%9OlTpbaSrz)UT5fFaP7JcPx-RryG+Rc)R}{9Y_6nhFWV@+Hm5^yD z+J}v2O+d9Flfdh?X$tE+*CpA&rWqZ&aUSxfi9ylvMdLI&K5g679j{i)3w2bA@yYAg zMmnHIONp&9(R#W!@pyf`*7~Xwx?E7!5Z6x{rhVyzZ{l26#}ld>p{g@9I+%Evs6472 zwkktJu(tK0QhC+M@{;DH1*(eccDVLX|eOZH+dJRq5r))BkPDIqHDtQoP zMnE__Qq_<4$CGSAvR+ zwT=VVaPCI0)~=$cUkI3-KX}vDqzp3pnnZP&?M-KLIvL5rlm}K(nTdIp>esa9tUb$< z6HxMi2_$=s7skWgS=6-V0O)OytCSd2HQC4@*)k$nz>RkkJ*K&UWW|FesbE!)Y1W{% z@9-f^;Y1Qa4}HP^Tm@nL$U7C484P!4gS-FD=T8J>==I3acCN9* z-C2wrZ5P&yMnaN_&gw`4n7@nDJ@T=|YHECd8@eXOKe{~|3tQbI30;pWLzoN^Nt6QG zv_&#GC$-Luj@Q@6j4|=BO4B{LSo=w`BhwRaVFF^Gf^xFM_q$;)(P zDIYNJRZ)LP@o3)%;Agkhg*sQ|yCh27*?&3{5oJScf7xwyfjzp$YaJT`pvFP3Tl(fZ zXLt3Yio(diWZ*kDHliip8}!ZopX(bW*hI&MzV8=rTKlu%@p5x!dGPx1{!Ls%r^W|> zAMeW#nO-Op*6lcOEqK3v)!oqb&Yz2(_B;=;e0m8%4vgJLrm8Fk3lxDxumCW1_%ip1 zv7+M{et8Bm3JAa}N zPaSvwyoG=*^yvZc8mh~UA}rBCaCA*fQ%UFLJFyU!iC+Ndw6%+!T;qs{ml8w<{>~+J_@p`sXjntT)u`nyvWmBSw%Y&p-FP;H1Ba%wiJ{w_x zJojZMBhT|Z{#IG=xMN2pBnv#8iHN}{m}1mOy3>=}853cm0AF-RK`K+#(}g3r&N zx)cJt_0iwP?a%afVO3+Bbh}f!yoknSO=}LTSDe%~L}omDO$E7n#Yy40=}d1I9dvOM z8m)wZ^(MOs9fket-&cig@E~-+OjNiD#yj-@Wg!KzUzK_N#VTdTEO>YQ58N`X`Im#& zI$$SGj|q<`WuPjLdWCc^^cggd>sZ70j;PBdkqi>h3*FRzCd*WUahmQQ;VqDiZ+;SQ z`8wm&rB0k414{fm3=fH1&&Tv<#Fpp*FL-nD;wQ=qY2bvf($O-=i-cJm&r-MmLwXku~z6O;UJUbA%zH_XWolmaDQN6DMf z*QJp29fn)K9$JvPDmnG2%uBp$rsb2!={mY$oqRXHFgAmuO2hJr