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

[blackarts] v1.2.6 bugfixes for FWI sorcerer guild #1738

Merged
merged 2 commits into from
Jan 14, 2025
Merged

[blackarts] v1.2.6 bugfixes for FWI sorcerer guild #1738

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f353c62
[blackarts] v1.2.6 bugfixes for FWI sorcerer guild
Deysh Jan 12, 2025
60f9e46
rubocop cleanup
Deysh Jan 12, 2025
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
22 changes: 18 additions & 4 deletions scripts/BlackArts.lic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@
contributors: Deysh, Tysong, Gob
game: Gemstone
tags: alchemy
version: 1.2.5
version: 1.2.6

Improvements:
Major_change.feature_addition.bugfix
v1.2.5 (2025-01-10)
- bugfix for finding correct mortar for grinding tasks
v1.2.6 (2025-01-11)
- remove Sorcerer Guild rooms in FWI that don't have crucibles
- add a 1 minute delay if character has cycled thru all guilds
- add check for FWI Sorcerer guildmaster that wanders
=end
=begin
v1.2.5 (2025-01-10)
- bugfix for finding correct mortar for grinding tasks
v1.2.4 (2025-01-09)
- added messaging for moth cloak
v1.2.3 (2024-12-31)
Expand Down Expand Up @@ -4110,6 +4114,10 @@ module BlackArts
exit
end

Util.go2("#{Char.prof.downcase} alchemy administrator")
Util.msg("yellow", " Sleeping 1 minute before moving to the next guild. \n")
sleep 60

Util.travel(3669)
if UserVars.mapdb_fwi_return_room.nil?
worn = GameObj[UserVars.mapdb_fwi_trinket].nil? ? false : true
Expand Down Expand Up @@ -4162,7 +4170,7 @@ module BlackArts
def self.find_workshops
location_list = BlackArts.data.current_room.find_all_nearest_by_tag("#{Char.prof.downcase} alchemy workshop")
_previous, shortest_distances = BlackArts.data.current_room.dijkstra
location_list.delete_if { |room_id| shortest_distances[room_id].nil? || shortest_distances[room_id].to_i > 10 }
location_list.delete_if { |room_id| shortest_distances[room_id].nil? || shortest_distances[room_id].to_i > 10 || room_id == 34600 || room_id == 34601 }
location_list = location_list.sort { |a, b| shortest_distances[a] <=> shortest_distances[b] }

if location_list.empty?
Expand Down Expand Up @@ -7015,6 +7023,12 @@ module BlackArts
Util.travel(BlackArts.data.current_admin)
Util.travel("#{Char.prof.downcase} alchemy guildmaster")

guildmaster = GameObj.npcs.find { |npc| npc.name =~ /guild/i }
# The Guild Master in the FWI Sorcerer Guild wanders
if guildmaster.nil? && Room.current.id == 34597
Util.travel(34583)
end

lines = Util.get_command("ask ##{GameObj.npcs.find { |npc| npc.name =~ /guild/i }.id} about next #{skill}", /You ask/i)

if lines.any? { |l| l =~ /you must diversify/ } && BlackArts.data.settings[:skill_types].size == 1
Expand Down
Loading