From 023bfd0e5d0ed61deb113fc7717465c2b410a78b Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Tue, 10 Sep 2024 18:58:05 +0200
Subject: [PATCH] Autowiki for fishing. (#86035)
## About The Pull Request
I've come to realize manually updating all fishing stuff on the very
much outdated wiki would be a colossal pain in the rear, so I've decided
to automate a few bits to generate autowiki lists containing information
about fish, fish traits, bait, hooks, reels, fishng rods, fish sources
and fish experiments.
Now tested.
## Why It's Good For The Game
Making a huge autowiki for a feature that's being constantly updated (by
me) but still has a particularly lame and outdated page on the wiki.
## Changelog
N/A
---
code/__DEFINES/fish.dm | 30 +-
code/__HELPERS/cmp.dm | 17 +
.../subsystem/processing/fishing.dm | 36 +-
code/datums/components/profound_fisher.dm | 2 +
code/game/objects/items/food/bait.dm | 27 +-
code/modules/autowiki/pages/base.dm | 5 +
code/modules/autowiki/pages/fishing.dm | 445 ++++++++++++++++++
code/modules/autowiki/pages/soup.dm | 20 +-
code/modules/autowiki/pages/vending.dm | 5 +-
code/modules/clothing/gloves/special.dm | 5 +-
.../experisci/experiment/types/experiment.dm | 6 +
code/modules/fishing/bait.dm | 2 +-
code/modules/fishing/fish/_fish.dm | 2 +-
code/modules/fishing/fish/fish_evolution.dm | 14 +-
code/modules/fishing/fish/fish_traits.dm | 8 +-
code/modules/fishing/fish_catalog.dm | 45 +-
code/modules/fishing/fishing_equipment.dm | 24 +-
code/modules/fishing/fishing_rod.dm | 30 +-
code/modules/fishing/sources/_fish_source.dm | 165 ++++++-
code/modules/fishing/sources/source_types.dm | 57 ++-
code/modules/research/techweb/_techweb.dm | 6 +-
code/modules/unit_tests/fish_unit_tests.dm | 1 +
icons/obj/fishing.dmi | Bin 25513 -> 24835 bytes
icons/obj/storage/box.dmi | Bin 13393 -> 12799 bytes
tgstation.dme | 1 +
25 files changed, 847 insertions(+), 106 deletions(-)
create mode 100644 code/modules/autowiki/pages/fishing.dm
diff --git a/code/__DEFINES/fish.dm b/code/__DEFINES/fish.dm
index 04557b4a8e6..b8154bd2d89 100644
--- a/code/__DEFINES/fish.dm
+++ b/code/__DEFINES/fish.dm
@@ -158,8 +158,8 @@
#define AQUARIUM_FLUID_SALTWATER "Saltwater"
#define AQUARIUM_FLUID_SULPHWATEVER "Sulfuric Water"
#define AQUARIUM_FLUID_AIR "Air"
-#define AQUARIUM_FLUID_ANADROMOUS "Adaptive to both Freshwater and Saltwater"
-#define AQUARIUM_FLUID_ANY_WATER "Adaptive to all kind of water"
+#define AQUARIUM_FLUID_ANADROMOUS "Anadromous"
+#define AQUARIUM_FLUID_ANY_WATER "Any Fluid"
///Fluff. The name of the aquarium company shown in the fish catalog
#define AQUARIUM_COMPANY "Aquatech Ltd."
@@ -189,6 +189,8 @@
#define FISH_PROPERTIES_FAV_BAIT "fav_bait"
#define FISH_PROPERTIES_BAD_BAIT "bad_bait"
#define FISH_PROPERTIES_TRAITS "fish_traits"
+#define FISH_PROPERTIES_BEAUTY_SCORE "beauty_score"
+#define FISH_PROPERTIES_EVOLUTIONS "evolutions"
///Define for favorite and disliked baits that aren't just item typepaths.
#define FISH_BAIT_TYPE "Type"
@@ -196,3 +198,27 @@
#define FISH_BAIT_REAGENT "Reagent"
#define FISH_BAIT_VALUE "Value"
#define FISH_BAIT_AMOUNT "Amount"
+
+
+///We multiply the weight of fish inside the loot table by this value if we are goofy enough to fish without a bait.
+#define FISH_WEIGHT_MULT_WITHOUT_BAIT 0.15
+
+/**
+ * A macro to ensure the wikimedia filenames of fish icons are unique, especially since there're a couple fish that have
+ * quite ambiguous names/icon_states like "checkered" or "pike"
+ */
+#define FISH_AUTOWIKI_FILENAME(fish) SANITIZE_FILENAME("[initial(fish.icon_state)]_wiki_fish")
+
+///The list keys for the autowiki for fish sources
+#define FISH_SOURCE_AUTOWIKI_NAME "name"
+#define FISH_SOURCE_AUTOWIKI_ICON "icon"
+#define FISH_SOURCE_AUTOWIKI_WEIGHT "weight"
+#define FISH_SOURCE_AUTOWIKI_WEIGHT_SUFFIX "weight_suffix"
+#define FISH_SOURCE_AUTOWIKI_NOTES "notes"
+
+///Special value for the name key that always comes first when the data is sorted, regardless of weight.
+#define FISH_SOURCE_AUTOWIKI_DUD "Nothing"
+///Special value for the name key that always comes last
+#define FISH_SOURCE_AUTOWIKI_OTHER "Other Stuff"
+///The filename for the icon for "other stuff" which we don't articulate about on the autowiki
+#define FISH_SOURCE_AUTOWIKI_QUESTIONMARK "questionmark"
diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm
index f9957f4c739..76651964e24 100644
--- a/code/__HELPERS/cmp.dm
+++ b/code/__HELPERS/cmp.dm
@@ -195,3 +195,20 @@
/proc/cmp_deathmatch_mods(datum/deathmatch_modifier/a, datum/deathmatch_modifier/b)
return sorttext(b.name, a.name)
+
+/**
+ * Orders fish types following this order (freshwater -> saltwater -> anadromous -> sulphuric water -> any water -> air)
+ * If both share the same required fluid type, they'll be ordered by name instead.
+ */
+/proc/cmp_fish_fluid(obj/item/fish/a, obj/item/fish/b)
+ var/static/list/fluids_priority = list(
+ AQUARIUM_FLUID_FRESHWATER,
+ AQUARIUM_FLUID_SALTWATER,
+ AQUARIUM_FLUID_ANADROMOUS,
+ AQUARIUM_FLUID_SULPHWATEVER,
+ AQUARIUM_FLUID_ANY_WATER,
+ AQUARIUM_FLUID_AIR,
+ )
+ var/position_a = fluids_priority.Find(initial(a.required_fluid_type))
+ var/position_b = fluids_priority.Find(initial(b.required_fluid_type))
+ return cmp_numeric_asc(position_a, position_b) || cmp_text_asc(initial(b.name), initial(a.name))
diff --git a/code/controllers/subsystem/processing/fishing.dm b/code/controllers/subsystem/processing/fishing.dm
index a81ff0dec67..0e8c126fe93 100644
--- a/code/controllers/subsystem/processing/fishing.dm
+++ b/code/controllers/subsystem/processing/fishing.dm
@@ -13,10 +13,38 @@ PROCESSING_SUBSYSTEM_DEF(fishing)
fish_properties = list()
for(var/fish_type in subtypesof(/obj/item/fish))
var/obj/item/fish/fish = new fish_type(null, FALSE)
- fish_properties[fish_type] = list()
- fish_properties[fish_type][FISH_PROPERTIES_FAV_BAIT] = fish.favorite_bait.Copy()
- fish_properties[fish_type][FISH_PROPERTIES_BAD_BAIT] = fish.disliked_bait.Copy()
- fish_properties[fish_type][FISH_PROPERTIES_TRAITS] = fish.fish_traits.Copy()
+ var/list/properties = list()
+ fish_properties[fish_type] = properties
+ properties[FISH_PROPERTIES_FAV_BAIT] = fish.favorite_bait.Copy()
+ properties[FISH_PROPERTIES_BAD_BAIT] = fish.disliked_bait.Copy()
+ properties[FISH_PROPERTIES_TRAITS] = fish.fish_traits.Copy()
+
+ var/list/evo_types = fish.evolution_types?.Copy()
+ properties[FISH_PROPERTIES_EVOLUTIONS] = evo_types
+ for(var/type in evo_types)
+ LAZYADD(GLOB.fishes_by_fish_evolution[type], fish_type)
+
+ var/beauty_score = "???"
+ switch(fish.beauty)
+ if(-INFINITY to FISH_BEAUTY_DISGUSTING)
+ beauty_score = "OH HELL NAW!"
+ if(FISH_BEAUTY_DISGUSTING to FISH_BEAUTY_UGLY)
+ beauty_score = "☆☆☆☆☆"
+ if(FISH_BEAUTY_UGLY to FISH_BEAUTY_BAD)
+ beauty_score = "★☆☆☆☆"
+ if(FISH_BEAUTY_BAD to FISH_BEAUTY_NULL)
+ beauty_score = "★★☆☆☆"
+ if(FISH_BEAUTY_NULL to FISH_BEAUTY_GENERIC)
+ beauty_score = "★★★☆☆"
+ if(FISH_BEAUTY_GENERIC to FISH_BEAUTY_GOOD)
+ beauty_score = "★★★★☆"
+ if(FISH_BEAUTY_GOOD to FISH_BEAUTY_GREAT)
+ beauty_score = "★★★★★"
+ if(FISH_BEAUTY_GREAT to INFINITY)
+ beauty_score = "★★★★★★"
+
+ properties[FISH_PROPERTIES_BEAUTY_SCORE] = beauty_score
+
qdel(fish)
///init the list of things lures can catch
diff --git a/code/datums/components/profound_fisher.dm b/code/datums/components/profound_fisher.dm
index 5bd5af12943..3766d32b14a 100644
--- a/code/datums/components/profound_fisher.dm
+++ b/code/datums/components/profound_fisher.dm
@@ -127,3 +127,5 @@
line = /obj/item/fishing_line/reinforced
bait = /obj/item/food/bait/doughball/synthetic/unconsumable
resistance_flags = INDESTRUCTIBLE
+ reel_overlay = null
+ show_in_wiki = FALSE //abstract fishing rod
diff --git a/code/game/objects/items/food/bait.dm b/code/game/objects/items/food/bait.dm
index f31eb44f308..711c6cb1e68 100644
--- a/code/game/objects/items/food/bait.dm
+++ b/code/game/objects/items/food/bait.dm
@@ -6,6 +6,8 @@
var/bait_quality = TRAIT_BASIC_QUALITY_BAIT
/// Icon state added to main fishing rod icon when this bait is equipped
var/rod_overlay_icon_state
+ /// Is this included in the autowiki?
+ var/show_on_wiki = TRUE
/obj/item/food/bait/Initialize(mapload)
. = ..()
@@ -36,9 +38,14 @@
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
inhand_icon_state = "pen"
+ bait_quality = TRAIT_GREAT_QUALITY_BAIT //this is only here for autowiki purposes, it's removed on init.
food_reagents = list(/datum/reagent/drug/kronkaine = 2) //The kronkaine is the thing that makes this a great bait.
tastes = list("hypocrisy" = 1)
+/obj/item/food/bait/natural/Initialize(mapload)
+ . = ..()
+ REMOVE_TRAIT(src, bait_quality, INNATE_TRAIT)
+
/obj/item/food/bait/doughball
name = "doughball"
desc = "Small piece of dough. Simple but effective fishing bait."
@@ -51,17 +58,12 @@
bait_quality = TRAIT_BASIC_QUALITY_BAIT
rod_overlay_icon_state = "dough_overlay"
-/**
- * Bound to the tech fishing rod, from which cannot be removed,
- * Bait-related preferences and traits, both negative and positive,
- * should be ignored by this bait.
- * Otherwise it'd be hard/impossible to cath some fish with it,
- * making that rod a shoddy choice in the long run.
- */
+///The abstract synthetic doughball type.
/obj/item/food/bait/doughball/synthetic
name = "synthetic doughball"
icon_state = "doughball_blue"
preserved_food = TRUE
+ show_on_wiki = FALSE //It's an abstract item.
/obj/item/food/bait/doughball/synthetic/Initialize(mapload)
. = ..()
@@ -70,10 +72,17 @@
///Found in the can of omni-baits, only available from the super fishing toolbox, from the fishing mystery box.
/obj/item/food/bait/doughball/synthetic/super
name = "super-doughball"
- desc = "No fish will be able to resist this."
+ desc = "Be they herbivore or carnivores, no fish will be able to resist this."
bait_quality = TRAIT_GREAT_QUALITY_BAIT
+ show_on_wiki = TRUE
-///Used by the advanced fishing rod
+/**
+ * Bound to the tech fishing rod, from which cannot be removed,
+ * Bait-related preferences and traits, both negative and positive,
+ * should be ignored by this bait.
+ * Otherwise it'd be hard/impossible to cath some fish with it,
+ * making that rod a shoddy choice in the long run.
+ */
/obj/item/food/bait/doughball/syntethic/unconsumable
/obj/item/food/bait/doughball/synthetic/unconsumable/Initialize(mapload)
diff --git a/code/modules/autowiki/pages/base.dm b/code/modules/autowiki/pages/base.dm
index 8e745ace61c..ce32bfd4032 100644
--- a/code/modules/autowiki/pages/base.dm
+++ b/code/modules/autowiki/pages/base.dm
@@ -46,7 +46,12 @@
if (IsAdminAdvancedProcCall())
return
+ var/static/uploaded_icons = list()
+ if(uploaded_icons["[name]"])
+ CRASH("We tried uploading an icon, but the name \"[name]\" was already taken!")
+
fcopy(icon, "data/autowiki_files/[name].png")
+ uploaded_icons["[name]"] = TRUE
/// Escape a parameter such that it can be correctly put inside a wiki output
/datum/autowiki/proc/escape_value(parameter)
diff --git a/code/modules/autowiki/pages/fishing.dm b/code/modules/autowiki/pages/fishing.dm
new file mode 100644
index 00000000000..1267547c85c
--- /dev/null
+++ b/code/modules/autowiki/pages/fishing.dm
@@ -0,0 +1,445 @@
+/datum/autowiki/fish
+ page = "Template:Autowiki/Content/Fish"
+
+/datum/autowiki/fish/generate()
+ var/output = ""
+
+ var/datum/reagent/def_food = /obj/item/fish::food
+ var/def_food_name = initial(def_food.name)
+ var/def_feeding = /obj/item/fish::feeding_frequency
+ var/def_feeding_text = DisplayTimeText(def_feeding)
+ var/def_breeding = /obj/item/fish::breeding_timeout
+ var/def_breeding_text = DisplayTimeText(def_breeding)
+
+ var/list/generated_icons = list()
+ var/list/fish_types = subtypesof(/obj/item/fish)
+ sortTim(fish_types, GLOBAL_PROC_REF(cmp_fish_fluid))
+
+ for (var/obj/item/fish/fish as anything in fish_types)
+
+ var/filename = FISH_AUTOWIKI_FILENAME(fish)
+
+ if(!generated_icons[filename])
+ upload_icon(icon(fish:icon, fish::icon_state, frame = 1), filename)
+ generated_icons[filename] = TRUE
+
+ if(!fish::show_in_catalog)
+ continue
+
+ var/list/properties = SSfishing.fish_properties[fish]
+
+ var/description = escape_value(fish::desc)
+ var/list/extra_info = list()
+ if(fish::fillet_type != /obj/item/food/fishmeat)
+ var/obj/item/fillet = fish::fillet_type
+ if(!fillet)
+ extra_info += "Cannot be butchered."
+ else
+ extra_info += "When butchered, it'll yield [initial(fillet.name)]."
+ var/datum/reagent/food = fish::food
+ if(food != def_food)
+ extra_info += "It has to be fed [initial(food.name)] instead of [def_food_name]"
+ if(fish::feeding_frequency != def_feeding)
+ extra_info += "It has to be fed every [DisplayTimeText(fish::feeding_frequency)] instead of [def_feeding_text]"
+ if(fish::breeding_timeout != def_breeding)
+ extra_info += "It takes [DisplayTimeText(fish::breeding_timeout)] to reproduce instead of [def_breeding_text]"
+ if(length(extra_info))
+ description += "
[extra_info.Join(extra_info,"
")]"
+
+ output += "\n\n" + include_template("Autowiki/FishEntry", list(
+ "name" = full_capitalize(escape_value(fish::name)),
+ "icon" = filename,
+ "description" = description,
+ "size_weight" = "[fish::average_size]cm / [fish::average_weight]g",
+ "fluid" = escape_value(fish::required_fluid_type),
+ "temperature" = "[fish::required_temperature_min] - [fish::required_temperature_max] K",
+ "stable_population" = fish::stable_population,
+ "traits" = generate_traits(properties[FISH_PROPERTIES_TRAITS]),
+ "favorite_baits" = generate_baits(properties[FISH_PROPERTIES_FAV_BAIT]),
+ "disliked_baits" = generate_baits(properties[FISH_PROPERTIES_BAD_BAIT], TRUE),
+ "beauty_score" = properties[FISH_PROPERTIES_BEAUTY_SCORE],
+ ))
+
+ return output
+
+/datum/autowiki/fish/proc/generate_baits(list/baits, bad = FALSE)
+ var/list/list = list()
+ if(!length(baits))
+ return list("None")
+
+ for (var/identifier in baits)
+ if(ispath(identifier)) //Just a path
+ var/obj/item/item = identifier
+ list += initial(item.name)
+ continue
+ var/list/special_identifier = identifier
+ switch(special_identifier["Type"])
+ if("Foodtype")
+ list += english_list(bitfield_to_list(special_identifier["Value"], FOOD_FLAGS_IC))
+ if("Reagent")
+ var/datum/reagent/reagent = special_identifier["Value"]
+ list += "[reagent::name][bad ? "" : "(At least [special_identifier["Amount"]] units)"]"
+
+ return list
+
+/datum/autowiki/fish/proc/generate_traits(list/traits)
+ var/output = ""
+
+ for(var/trait_type in traits)
+ var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+ output += include_template("Autowiki/FishTypeTraits", list(
+ "name" = escape_value(trait.name),
+ "description" = escape_value(trait.catalog_description),
+ ))
+
+ return output
+
+/datum/autowiki/fish_trait
+ page = "Template:Autowiki/Content/Fish/Trait"
+
+/datum/autowiki/fish_trait/generate()
+ var/output = ""
+
+ for(var/trait_type in GLOB.fish_traits)
+ var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+ var/desc = escape_value(trait.catalog_description)
+ if(length(trait.incompatible_traits))
+ var/incompatible = list()
+ for(var/datum/fish_trait/bad as anything in trait.incompatible_traits)
+ incompatible += span_bold(initial(bad.name))
+ desc += "
Incompatible with [english_list(incompatible)]."
+ output += include_template("Autowiki/FishAllTraits", list(
+ "name" = escape_value(trait.name),
+ "description" = escape_value(trait.catalog_description),
+ "inheritability" = trait.inheritability,
+ "inheritability_diff" = trait.diff_traits_inheritability,
+
+ ))
+
+ return output
+
+/datum/autowiki/fish_bait
+ page = "Template:Autowiki/Content/Fish/Bait"
+
+/datum/autowiki/fish_bait/generate()
+ var/output = ""
+
+ var/list/generated_icons = list()
+ for (var/obj/item/food/bait/bait as anything in subtypesof(/obj/item/food/bait))
+ if(!bait::show_on_wiki)
+ continue
+
+ var/filename = SANITIZE_FILENAME("[bait::icon_state]_wiki_bait")
+
+ var/quality = "Bland"
+
+ var/list/foodtypes
+ if(ispath(bait, /obj/item/food/bait/doughball/synthetic))
+ foodtypes = list("Don't worry about it")
+ else
+ foodtypes = bitfield_to_list(bait::foodtypes, FOOD_FLAGS_IC) || list("None")
+
+ switch(bait::bait_quality)
+ if(TRAIT_BASIC_QUALITY_BAIT)
+ quality = "Basic"
+ if(TRAIT_GOOD_QUALITY_BAIT)
+ quality = "Good"
+ if(TRAIT_GREAT_QUALITY_BAIT)
+ quality = "Great"
+
+ output += "\n\n" + include_template("Autowiki/FishBait", list(
+ "name" = full_capitalize(escape_value(bait::name)),
+ "icon" = filename,
+ "description" = escape_value(bait::desc),
+ "foodtypes" = foodtypes,
+ "quality" = quality,
+ ))
+
+ if(!generated_icons[filename])
+ upload_icon(icon(bait:icon, bait::icon_state, frame = 1), filename)
+ generated_icons[filename] = TRUE
+
+ var/filename = SANITIZE_FILENAME(/obj/item/stock_parts/power_store/cell/lead::icon_state)
+
+ var/lead_desc = /obj/item/stock_parts/power_store/cell/lead::desc
+ lead_desc += " You probably shouldn't use it unless you're trying to catch a zipzap."
+ output += "\n\n" + include_template("Autowiki/FishBait", list(
+ "name" = full_capitalize(escape_value(/obj/item/stock_parts/power_store/cell/lead::name)),
+ "icon" = filename,
+ "description" = lead_desc,
+ "foodtypes" = "None",
+ "quality" = "Poisonous",
+ ))
+
+ upload_icon(icon(/obj/item/stock_parts/power_store/cell/lead::icon, /obj/item/stock_parts/power_store/cell/lead::icon_state), filename)
+
+ var/obj/needletype = /obj/item/fish/needlefish
+ output += "\n\n" + include_template("Autowiki/FishBait", list(
+ "name" = "Baitfish",
+ "icon" = FISH_AUTOWIKI_FILENAME(needletype),
+ "description" = "Smaller fish such as goldfish, needlefish, armorfish and lavaloops can also be used as bait, It's a fish eat fish world.",
+ "foodtypes" = "Seafood?",
+ "quality" = "Good",
+ ))
+
+ output += "\n\n" + include_template("Autowiki/FishBait", list(
+ "name" = "Food",
+ "icon" = "plain_bread",
+ "description" = "In absence of baits, food can be used as a substitute.",
+ "foodtypes" = "Depends",
+ "quality" = "Bland most of the times",
+ ))
+
+ upload_icon(icon(/obj/item/food/bread/plain::icon, /obj/item/food/bread/plain::icon_state), "plain_bread")
+
+ return output
+
+/datum/autowiki/fishing_line
+ page = "Template:Autowiki/Content/Fish/Line"
+
+/datum/autowiki/fishing_line/generate()
+ var/output = ""
+
+ var/list/generated_icons = list()
+ for (var/obj/item/fishing_line/line as anything in typesof(/obj/item/fishing_line))
+ var/filename = SANITIZE_FILENAME("[line::icon_state]_wiki_line")
+
+ output += "\n\n" + include_template("Autowiki/FishLine", list(
+ "name" = full_capitalize(escape_value(line::name)),
+ "icon" = filename,
+ "description" = escape_value(line::wiki_desc),
+ ))
+
+ if(!generated_icons[filename])
+ upload_icon(icon(line:icon, line::icon_state), filename)
+ generated_icons[filename] = TRUE
+
+ return output
+
+/datum/autowiki/fishing_hook
+ page = "Template:Autowiki/Content/Fish/Hook"
+
+/datum/autowiki/fishing_hook/generate()
+ var/output = ""
+
+ var/list/generated_icons = list()
+ for (var/obj/item/fishing_hook/hook as anything in typesof(/obj/item/fishing_hook))
+ var/filename = SANITIZE_FILENAME("[hook::icon_state]_wiki_hook")
+
+ output += "\n\n" + include_template("Autowiki/FishHook", list(
+ "name" = full_capitalize(escape_value(hook::name)),
+ "icon" = filename,
+ "description" = escape_value(hook::wiki_desc),
+ ))
+
+ if(!generated_icons[filename])
+ upload_icon(icon(hook:icon, hook::icon_state), filename)
+ generated_icons[filename] = TRUE
+
+ return output
+
+/datum/autowiki/fishing_rod
+ page = "Template:Autowiki/Content/Fish/Rod"
+
+/datum/autowiki/fishing_rod/generate()
+ var/output = ""
+
+ var/list/generated_icons = list()
+ for (var/obj/item/fishing_rod/rod as anything in typesof(/obj/item/fishing_rod))
+ if(!rod::show_in_wiki)
+ continue
+
+ var/filename = SANITIZE_FILENAME("[rod::icon_state]_wiki_rod")
+
+ var/desc = escape_value(rod::ui_description)
+ if(rod::wiki_description)
+ desc += "
[escape_value(rod::wiki_description)]"
+ output += "\n\n" + include_template("Autowiki/FishingRod", list(
+ "name" = full_capitalize(escape_value(rod::name)),
+ "icon" = filename,
+ "description" = desc,
+ ))
+
+ if(!generated_icons[filename])
+ var/icon/rod_icon = icon(rod:icon, rod::icon_state)
+ if(rod::reel_overlay)
+ var/icon/line = icon(rod::icon, rod::reel_overlay)
+ line.Blend(rod::default_line_color, ICON_MULTIPLY)
+ rod_icon.Blend(line, ICON_OVERLAY)
+ upload_icon(rod_icon, filename)
+ generated_icons[filename] = TRUE
+
+ return output
+
+/datum/autowiki/fish_sources
+ page = "Template:Autowiki/Content/Fish/Source"
+
+/datum/autowiki/fish_sources/generate()
+ var/output = ""
+
+ for(var/source_type in GLOB.preset_fish_sources)
+ var/datum/fish_source/source = GLOB.preset_fish_sources[source_type]
+ if(!source.catalog_description)
+ continue
+
+ output += "\n\n" + include_template("Autowiki/FishSource", list(
+ "name" = full_capitalize(source.catalog_description),
+ "difficulty" = source.fishing_difficulty,
+ "contents" = get_contents(source),
+ ))
+
+ ///Used for stuff that isn't fish by default
+ upload_icon(icon('icons/effects/random_spawners.dmi', "questionmark"), FISH_SOURCE_AUTOWIKI_QUESTIONMARK)
+
+ return output
+
+/datum/autowiki/fish_sources/proc/get_contents(datum/fish_source/source)
+ var/output = ""
+ var/list/data = source.generate_wiki_contents(src)
+ sortTim(data, GLOBAL_PROC_REF(cmp_autowiki_fish_sources_content))
+ for(var/list/entry in data)
+ entry[FISH_SOURCE_AUTOWIKI_WEIGHT] = "[round(entry[FISH_SOURCE_AUTOWIKI_WEIGHT], 0.1)]%"
+ var/weight_suffix = entry[FISH_SOURCE_AUTOWIKI_WEIGHT_SUFFIX]
+ if(weight_suffix)
+ entry[FISH_SOURCE_AUTOWIKI_WEIGHT] += " [weight_suffix]"
+ entry -= FISH_SOURCE_AUTOWIKI_WEIGHT
+ output += include_template("Autowiki/FishSourceContents", entry)
+
+ return output
+
+///Sort the autowiki fish entries by their weight. However, duds always come first.
+/proc/cmp_autowiki_fish_sources_content(list/A, list/B)
+ if(A[FISH_SOURCE_AUTOWIKI_NAME] == FISH_SOURCE_AUTOWIKI_DUD)
+ return -1
+ if(B[FISH_SOURCE_AUTOWIKI_NAME] == FISH_SOURCE_AUTOWIKI_DUD)
+ return 1
+ if(A[FISH_SOURCE_AUTOWIKI_NAME] == FISH_SOURCE_AUTOWIKI_OTHER)
+ return 1
+ if(B[FISH_SOURCE_AUTOWIKI_NAME] == FISH_SOURCE_AUTOWIKI_OTHER)
+ return -1
+ return B[FISH_SOURCE_AUTOWIKI_WEIGHT] - A[FISH_SOURCE_AUTOWIKI_WEIGHT]
+
+/datum/autowiki/fish_scan
+ page = "Template:Autowiki/Content/Fish/Scan"
+
+/datum/autowiki/fish_scan/generate()
+ var/output = ""
+
+ var/list/generated_icons = list()
+ var/datum/techweb/techweb = locate(/datum/techweb/admin) in SSresearch.techwebs
+ for(var/scan_type in typesof(/datum/experiment/scanning/fish))
+ techweb.add_experiment(scan_type) //Make sure each followup experiment is available
+ var/datum/experiment/scanning/fish/scan = locate(scan_type) in techweb.available_experiments
+ if(!scan) //Just to be sure, if the scan was already completed.
+ scan = locate(scan_type) in techweb.completed_experiments
+
+ output += "\n\n" + include_template("Autowiki/FishScan", list(
+ "name" = full_capitalize(escape_value(scan.name)),
+ "description" = escape_value(scan.description),
+ "requirements" = build_requirements(scan),
+ "rewards" = build_rewards(scan, generated_icons),
+
+ ))
+
+ return output
+
+/datum/autowiki/fish_scan/proc/build_requirements(datum/experiment/scanning/fish/scan)
+ var/output = ""
+ for(var/obj/item/type as anything in scan.required_atoms)
+ var/name = initial(type.name)
+ //snowflake case because the default holographic fish is called goldfish but we don't want to confuse readers.
+ if(type == /obj/item/fish/holo)
+ name = "holographic Fish"
+ output += include_template("Autowiki/FishScanRequirements", list(
+ "name" = full_capitalize(escape_value(name)),
+ "amount" = scan.required_atoms[type],
+ ))
+ return output
+
+/datum/autowiki/fish_scan/proc/build_rewards(datum/experiment/scanning/fish/scan, list/generated_icons)
+ var/output = ""
+ var/datum/fish_source/portal/reward = GLOB.preset_fish_sources[scan.fish_source_reward]
+ var/filename = SANITIZE_FILENAME("fishing_portal_[reward.radial_state]")
+
+ var/list/unlocks = list()
+ for(var/datum/experiment/unlock as anything in scan.next_experiments)
+ unlocks += initial(unlock.name)
+ output += include_template("Autowiki/FishScanRewards", list(
+ "name" = full_capitalize(escape_value("[reward.radial_name] Dimension")),
+ "icon" = filename,
+ "points" = scan.get_points_reward_text(),
+ "unlock" = english_list(unlocks, nothing_text = "Nothing"),
+ ))
+
+ if(!generated_icons[filename])
+ upload_icon(icon(icon = 'icons/hud/radial_fishing.dmi', icon_state = reward.radial_state), filename)
+ generated_icons[filename] = TRUE
+
+ return output
+
+/datum/autowiki/fish_evolution
+ page = "Template:Autowiki/Content/Fish/Evolution"
+
+/datum/autowiki/fish_evolution/generate()
+ var/output = ""
+
+ for(var/evo_type in GLOB.fish_evolutions)
+ var/datum/fish_evolution/evolution = GLOB.fish_evolutions[evo_type]
+ if(!evolution.show_on_wiki)
+ continue
+
+ output += "\n\n" + include_template("Autowiki/FishEvolution", list(
+ "name" = escape_value(evolution.name),
+ "fish" = get_fish(evo_type),
+ "min_max_temp" = "[evolution.required_temperature_min] - [evolution.required_temperature_max] K",
+ "notes" = escape_value(evolution.conditions_note),
+ "result_icon" = evolution.show_result_on_wiki ? FISH_AUTOWIKI_FILENAME(evolution.new_fish_type) : FISH_SOURCE_AUTOWIKI_QUESTIONMARK,
+ ))
+
+ return output
+
+/datum/autowiki/fish_evolution/proc/get_fish(evo_type)
+ var/output = ""
+
+ for(var/obj/item/fish/fish as anything in GLOB.fishes_by_fish_evolution[evo_type])
+ if(!initial(fish.show_in_catalog))
+ continue
+ output += include_template("Autowiki/FishEvolutionCandidate", list(
+ "name" = escape_value(full_capitalize(initial(fish.name))),
+ "icon" = FISH_AUTOWIKI_FILENAME(fish),
+ ))
+
+ return output
+
+/datum/autowiki/fish_lure
+ page = "Template:Autowiki/Content/Fish/Lure"
+
+/datum/autowiki/fish_lure/generate()
+ var/output = ""
+
+ for(var/obj/item/fishing_lure/lure as anything in SSfishing.lure_catchables)
+ var/state = initial(lure.icon_state)
+ var/filename = SANITIZE_FILENAME("[state]_wiki_lure")
+ output += "\n\n" + include_template("Autowiki/FishLure", list(
+ "name" = escape_value(full_capitalize(initial(lure.name))),
+ "desc" = escape_value(initial(lure.name)),
+ "icon" = filename,
+ "catchables" = build_catchables(SSfishing.lure_catchables[lure]),
+ ))
+
+ upload_icon(icon(icon = initial(lure.icon), icon_state = state), filename)
+
+ return output
+
+/datum/autowiki/fish_lure/proc/build_catchables(list/catchables)
+ var/output = ""
+
+ for(var/obj/item/fish/fish as anything in catchables)
+ if(!initial(fish.show_in_catalog))
+ continue
+ output += include_template("Autowiki/FishLureCatchables", list(
+ "name" = escape_value(full_capitalize(initial(fish.name))),
+ "icon" = FISH_AUTOWIKI_FILENAME(fish),
+ ))
+
+ return output
diff --git a/code/modules/autowiki/pages/soup.dm b/code/modules/autowiki/pages/soup.dm
index f67d00e97a0..754beb3a82a 100644
--- a/code/modules/autowiki/pages/soup.dm
+++ b/code/modules/autowiki/pages/soup.dm
@@ -16,6 +16,7 @@
var/container_for_images = /obj/item/reagent_containers/cup/bowl
+ var/list/already_generated_icons = list()
for(var/soup_recipe_type in subtypesof(/datum/chemical_reaction/food/soup))
var/datum/chemical_reaction/food/soup/soup_recipe = new soup_recipe_type()
// Used to determine what icon is displayed on the wiki
@@ -123,14 +124,17 @@
template_list["results"] = escape_value(compiled_results)
// -- While we're here, generate an icon of the bowl --
- if(!soup_icon_state)
- var/obj/item/reagent_containers/cup/bowl/soup_bowl = new()
- soup_bowl.reagents.add_reagent(result_soup_type, soup_bowl.reagents.maximum_volume)
- upload_icon(getFlatIcon(soup_bowl, no_anim = TRUE), filename)
- qdel(soup_bowl)
- else
- var/image/compiled_image = image(icon = soup_icon, icon_state = soup_icon_state)
- upload_icon(getFlatIcon(compiled_image, no_anim = TRUE), filename)
+
+ if(!already_generated_icons[filename])
+ if(!soup_icon_state)
+ var/obj/item/reagent_containers/cup/bowl/soup_bowl = new()
+ soup_bowl.reagents.add_reagent(result_soup_type, soup_bowl.reagents.maximum_volume)
+ upload_icon(getFlatIcon(soup_bowl, no_anim = TRUE), filename)
+ qdel(soup_bowl)
+ else
+ var/image/compiled_image = image(icon = soup_icon, icon_state = soup_icon_state)
+ upload_icon(getFlatIcon(compiled_image, no_anim = TRUE), filename)
+ already_generated_icons[filename] = TRUE
// -- Cleanup --
qdel(soup_recipe)
diff --git a/code/modules/autowiki/pages/vending.dm b/code/modules/autowiki/pages/vending.dm
index 0a8dd3db0a9..e110afa760e 100644
--- a/code/modules/autowiki/pages/vending.dm
+++ b/code/modules/autowiki/pages/vending.dm
@@ -10,7 +10,10 @@
// So we put it inside, something
var/obj/parent = new
- for (var/vending_type in sort_list(subtypesof(/obj/machinery/vending), GLOBAL_PROC_REF(cmp_typepaths_asc)))
+ for (var/obj/machinery/vending/vending_type as anything in sort_list(subtypesof(/obj/machinery/vending), GLOBAL_PROC_REF(cmp_typepaths_asc)))
+ var/obj/machinery/vending/parent_machine = type2parent(vending_type)
+ if(initial(parent_machine.name) == initial(vending_type.name))
+ continue //Same name, likely just a slightly touched up subtype for specific maps.
var/obj/machinery/vending/vending_machine = new vending_type(parent)
vending_machine.use_power = FALSE
vending_machine.update_icon(UPDATE_ICON_STATE)
diff --git a/code/modules/clothing/gloves/special.dm b/code/modules/clothing/gloves/special.dm
index 1366a29ac4a..b5c16ba4dc5 100644
--- a/code/modules/clothing/gloves/special.dm
+++ b/code/modules/clothing/gloves/special.dm
@@ -210,11 +210,14 @@
///The internal fishing rod of the athletic fishing gloves. The more athletic you're, the easier the minigame will be.
/obj/item/fishing_rod/mob_fisher/athletic
+ name = "athletics fishing gloves"
icon = /obj/item/clothing/gloves/fishing::icon
icon_state = /obj/item/clothing/gloves/fishing::icon_state
line = null
bait = null
- ui_description = "The integrated fishing rod of a pair of athletic fishing gloves"
+ ui_description = "A pair of gloves to fish without a fishing rod while training your athletics."
+ wiki_description = "It requires the Advanced Fishing Technology Node to be researched to be printed. It may hurt the user when catching larger fish."
+ show_in_wiki = TRUE //Show this cool pair of gloves in the wiki.
/obj/item/fishing_rod/mob_fisher/athletic/Initialize(mapload)
. = ..()
diff --git a/code/modules/experisci/experiment/types/experiment.dm b/code/modules/experisci/experiment/types/experiment.dm
index add015622f6..358d795f68f 100644
--- a/code/modules/experisci/experiment/types/experiment.dm
+++ b/code/modules/experisci/experiment/types/experiment.dm
@@ -99,3 +99,9 @@
experiment_handler.selected_experiment = null
var/announcetext = experiment_handler.linked_web.complete_experiment(src)
experiment_handler.announce_message_to_all(announcetext)
+
+/datum/experiment/proc/get_points_reward_text()
+ var/list/english_list_keys = list()
+ for(var/points_type in points_reward)
+ english_list_keys += "[points_reward[points_type]] [points_type]"
+ return "[english_list(english_list_keys)] points"
diff --git a/code/modules/fishing/bait.dm b/code/modules/fishing/bait.dm
index 8fb66ad4c3d..fbbe23d2ccc 100644
--- a/code/modules/fishing/bait.dm
+++ b/code/modules/fishing/bait.dm
@@ -1,6 +1,6 @@
/obj/item/bait_can
name = "can o bait"
- desc = "there's a lot of them in there, getting them out takes a while though"
+ desc = "there's a lot of them in there, getting them out takes a while though."
icon = 'icons/obj/fishing.dmi'
icon_state = "bait_can"
base_icon_state = "bait_can"
diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index 08d09188e6b..cdaa1902b09 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -6,7 +6,7 @@
// Fish path used for autogenerated fish
/obj/item/fish
- name = "generic looking aquarium fish"
+ name = "fish"
desc = "very bland"
icon = 'icons/obj/aquarium/fish.dmi'
lefthand_file = 'icons/mob/inhands/fish_lefthand.dmi'
diff --git a/code/modules/fishing/fish/fish_evolution.dm b/code/modules/fishing/fish/fish_evolution.dm
index 688b0c201c7..d7b8f744f0a 100644
--- a/code/modules/fishing/fish/fish_evolution.dm
+++ b/code/modules/fishing/fish/fish_evolution.dm
@@ -1,4 +1,7 @@
+///A global list of fish evolutions, which are singletons.
GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolution, list()))
+///A list of fish evolution types, each having an associated list containing all fish types that have it.
+GLOBAL_LIST_EMPTY(fishes_by_fish_evolution)
/**
* Fish evolution datums
@@ -7,7 +10,9 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio
* then there's a chance the offspring may be of a new type rather than the same as its source or mate (if any).
*/
/datum/fish_evolution
+ ///The name of the evolution. If not set, it'll be generated on runtime from the name of the new fish type.
var/name
+ ///The probability that this evolution can happen.
var/probability = 0
///The obj/item/fish path of the new fish
var/obj/item/fish/new_fish_type = /obj/item/fish
@@ -21,8 +26,14 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio
var/list/removed_traits
///A text string shown in the catalog, containing information on conditions specific to this evolution.
var/conditions_note
+ ///Is this evolution shown on the wiki?
+ var/show_on_wiki = TRUE
+ ///Is the result of this evolution shown on the wiki?
+ var/show_result_on_wiki = TRUE
/datum/fish_evolution/New()
+ ..()
+ SHOULD_CALL_PARENT(TRUE)
if(!ispath(new_fish_type, /obj/item/fish))
stack_trace("[type] instantiated with a new fish type of [new_fish_type]. That's not a fish, hun, things will break.")
if(!name)
@@ -87,6 +98,7 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio
new_fish_type = /obj/item/fish/mastodon
new_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/amphibious, /datum/fish_trait/predator, /datum/fish_trait/aggressive)
conditions_note = "The fish (and its mate) needs to be unusually big both in size and weight."
+ show_result_on_wiki = FALSE
/datum/fish_evolution/mastodon/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium)
if((source.size < 120 || source.weight < 3000) || (mate && (mate.size < 120 || mate.weight < 3000)))
@@ -106,13 +118,11 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio
required_temperature_max = MIN_AQUARIUM_TEMP+10
/datum/fish_evolution/three_eyes
- name = "Three-eyed Goldfish"
probability = 3
new_fish_type = /obj/item/fish/goldfish/three_eyes
new_traits = list(/datum/fish_trait/recessive)
/datum/fish_evolution/chainsawfish
- name = "Chainsawfish"
probability = 30
new_fish_type = /obj/item/fish/chainsawfish
new_traits = list(/datum/fish_trait/predator, /datum/fish_trait/aggressive)
diff --git a/code/modules/fishing/fish/fish_traits.dm b/code/modules/fishing/fish/fish_traits.dm
index bb52ee095a8..c289e1d8907 100644
--- a/code/modules/fishing/fish/fish_traits.dm
+++ b/code/modules/fishing/fish/fish_traits.dm
@@ -132,10 +132,16 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
/datum/fish_trait/shiny_lover/difficulty_mod(obj/item/fishing_rod/rod, mob/fisherman)
. = ..()
- // These fish are easier to catch with shiny lure
+ // These fish are easier to catch with shiny hook
if(rod.hook && rod.hook.fishing_hook_traits & FISHING_HOOK_SHINY)
.[ADDITIVE_FISHING_MOD] -= FISH_TRAIT_MINOR_DIFFICULTY_BOOST
+/datum/fish_trait/shiny_lover/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman)
+ . = ..()
+ // These fish are harder to find without a shiny hook
+ if(rod.hook && rod.hook.fishing_hook_traits & FISHING_HOOK_SHINY)
+ .[MULTIPLICATIVE_FISHING_MOD] = 0.5
+
/datum/fish_trait/picky_eater
name = "Picky Eater"
catalog_description = "This fish is very picky and will ignore low quality bait (unless it's amongst its favorites)."
diff --git a/code/modules/fishing/fish_catalog.dm b/code/modules/fishing/fish_catalog.dm
index f0880804f8e..6a64b85184f 100644
--- a/code/modules/fishing/fish_catalog.dm
+++ b/code/modules/fishing/fish_catalog.dm
@@ -16,11 +16,10 @@
var/static/fish_info
if(!fish_info)
fish_info = list()
- for(var/_fish_type as anything in subtypesof(/obj/item/fish))
- var/obj/item/fish/fish = _fish_type
- var/list/fish_data = list()
+ for(var/obj/item/fish/fish as anything in subtypesof(/obj/item/fish))
if(!initial(fish.show_in_catalog))
continue
+ var/list/fish_data = list()
fish_data["name"] = initial(fish.name)
fish_data["desc"] = initial(fish.desc)
fish_data["fluid"] = initial(fish.required_fluid_type)
@@ -37,27 +36,9 @@
else
fish_data["feed"] = "[AQUARIUM_COMPANY] Fish Feed"
fish_data["fishing_tips"] = build_fishing_tips(fish)
- var/beauty_score = initial(fish.beauty)
- switch(beauty_score)
- if(-INFINITY to FISH_BEAUTY_DISGUSTING)
- beauty_score = "OH HELL NAW!"
- if(FISH_BEAUTY_DISGUSTING to FISH_BEAUTY_UGLY)
- beauty_score = "☆☆☆☆☆"
- if(FISH_BEAUTY_UGLY to FISH_BEAUTY_BAD)
- beauty_score = "★☆☆☆☆"
- if(FISH_BEAUTY_BAD to FISH_BEAUTY_NULL)
- beauty_score = "★★☆☆☆"
- if(FISH_BEAUTY_NULL to FISH_BEAUTY_GENERIC)
- beauty_score = "★★★☆☆"
- if(FISH_BEAUTY_GENERIC to FISH_BEAUTY_GOOD)
- beauty_score = "★★★★☆"
- if(FISH_BEAUTY_GOOD to FISH_BEAUTY_GREAT)
- beauty_score = "★★★★★"
- if(FISH_BEAUTY_GREAT to INFINITY)
- beauty_score = "★★★★★★"
- fish_data["beauty"] = beauty_score
+ fish_data["beauty"] = SSfishing.fish_properties[fish][FISH_PROPERTIES_BEAUTY_SCORE]
+
fish_info += list(fish_data)
- // TODO: Custom entries for unusual stuff
.["fish_info"] = fish_info
.["sponsored_by"] = AQUARIUM_COMPANY
@@ -68,12 +49,12 @@
return initial(bait_item.name)
if(islist(bait))
var/list/special_identifier = bait
- switch(special_identifier["Type"])
- if("Foodtype")
- return jointext(bitfield_to_list(special_identifier["Value"], FOOD_FLAGS_IC),",")
- if("Reagent")
- var/datum/reagent/prototype = special_identifier["Value"]
- return "[initial(prototype.name)] (at least [special_identifier["Amount"]]u)"
+ switch(special_identifier[FISH_BAIT_TYPE])
+ if(FISH_BAIT_FOODTYPE)
+ return jointext(bitfield_to_list(special_identifier[FISH_BAIT_VALUE], FOOD_FLAGS_IC),",")
+ if(FISH_BAIT_REAGENT)
+ var/datum/reagent/prototype = special_identifier[FISH_BAIT_VALUE]
+ return "[initial(prototype.name)] (at least [special_identifier[FISH_BAIT_AMOUNT]]u)"
else
stack_trace("Unknown bait identifier in fish favourite/disliked list")
return "SOMETHING VERY WEIRD"
@@ -91,8 +72,8 @@
spot_descriptions += source.catalog_description
.["spots"] = english_list(spot_descriptions, nothing_text = "Unknown")
var/list/fish_list_properties = SSfishing.fish_properties
- var/list/fav_bait = fish_list_properties[fishy][NAMEOF(fishy, favorite_bait)]
- var/list/disliked_bait = fish_list_properties[fishy][NAMEOF(fishy, disliked_bait)]
+ var/list/fav_bait = fish_list_properties[fishy][FISH_PROPERTIES_FAV_BAIT]
+ var/list/disliked_bait = fish_list_properties[fishy][FISH_PROPERTIES_BAD_BAIT]
var/list/bait_list = list()
// Favourite/Disliked bait
for(var/bait_type_or_trait in fav_bait)
@@ -104,7 +85,7 @@
.["disliked_bait"] = english_list(bait_list, nothing_text = "None")
// Fish traits description
var/list/trait_descriptions = list()
- var/list/fish_traits = fish_list_properties[fishy][NAMEOF(fishy, fish_traits)]
+ var/list/fish_traits = fish_list_properties[fishy][FISH_PROPERTIES_TRAITS]
var/fish_difficulty = initial(fishy.fishing_difficulty_modifier)
for(var/fish_trait in fish_traits)
var/datum/fish_trait/trait = GLOB.fish_traits[fish_trait]
diff --git a/code/modules/fishing/fishing_equipment.dm b/code/modules/fishing/fishing_equipment.dm
index e20f6c54a91..5b2a250f42b 100644
--- a/code/modules/fishing/fishing_equipment.dm
+++ b/code/modules/fishing/fishing_equipment.dm
@@ -16,6 +16,8 @@
var/list/fishing_line_traits
/// Color of the fishing line
var/line_color = COLOR_GRAY
+ ///The description given to the autowiki
+ var/wiki_desc = "A generic fishing line. Without one, the casting range of the rod will be significantly hampered."
/obj/item/fishing_line/reinforced
name = "reinforced fishing line reel"
@@ -23,6 +25,7 @@
icon_state = "reel_green"
fishing_line_traits = FISHING_LINE_REINFORCED
line_color = "#2b9c2b"
+ wiki_desc = "Allows you to fish in lava and plasma rivers and lakes."
/obj/item/fishing_line/cloaked
name = "cloaked fishing line reel"
@@ -30,6 +33,7 @@
icon_state = "reel_white"
fishing_line_traits = FISHING_LINE_CLOAKED
line_color = "#82cfdd"
+ wiki_desc = "Fishing anxious and wary fish will be easier with this equipped."
/obj/item/fishing_line/bouncy
name = "flexible fishing line reel"
@@ -37,6 +41,7 @@
icon_state = "reel_red"
fishing_line_traits = FISHING_LINE_BOUNCY
line_color = "#99313f"
+ wiki_desc = "It reduces the progression loss during the fishing minigame."
/obj/item/fishing_line/sinew
name = "fishing sinew"
@@ -44,6 +49,7 @@
icon_state = "reel_sinew"
fishing_line_traits = FISHING_LINE_REINFORCED|FISHING_LINE_STIFF
line_color = "#d1cca3"
+ wiki_desc = "Crafted from sinew. It allows you to fish in lava and plasma like the reinforced line, but it'll make the minigame harder."
/**
* A special line reel that let you skip the biting phase of the minigame, netting you a completion bonus,
@@ -56,6 +62,9 @@
icon_state = "reel_auto"
fishing_line_traits = FISHING_LINE_AUTOREEL
line_color = "#F88414"
+ wiki_desc = "Automatically starts the minigame once the fish bites the bait. It also spin fishing lures for you without needing an input. \
+ It can also be used to snag in objects from a distance more rapidly.
\
+ It requires the Advanced Fishing Technology Node to be researched to be printed."
/obj/item/fishing_line/auto_reel/Initialize(mapload)
. = ..()
@@ -118,7 +127,8 @@
var/rod_overlay_icon_state = "hook_overlay"
/// What subtype of `/obj/item/chasm_detritus` do we fish out of chasms? Defaults to `/obj/item/chasm_detritus`.
var/chasm_detritus_type = /datum/chasm_detritus
-
+ ///The description given to the autowiki
+ var/wiki_desc = "A generic fishing hook. You won't be able to fish without one."
/**
* Simple getter proc for hooks to implement special hook bonuses for
@@ -162,6 +172,7 @@
icon_state = "treasure"
rod_overlay_icon_state = "hook_treasure_overlay"
chasm_detritus_type = /datum/chasm_detritus/restricted/objects
+ wiki_desc = "It vastly improves the chances of catching things other than fish."
/obj/item/fishing_hook/magnet/Initialize(mapload)
. = ..()
@@ -190,13 +201,14 @@
icon_state = "gold_shiny"
fishing_hook_traits = FISHING_HOOK_SHINY
rod_overlay_icon_state = "hook_shiny_overlay"
+ wiki_desc = "It's used to attract shiny-loving fish and make them easier to catch."
/obj/item/fishing_hook/weighted
name = "weighted hook"
icon_state = "weighted"
fishing_hook_traits = FISHING_HOOK_WEIGHTED
rod_overlay_icon_state = "hook_weighted_overlay"
-
+ wiki_desc = "It reduces the bounce that happens when you hit the boundaries of the minigame bar."
/obj/item/fishing_hook/rescue
name = "rescue hook"
@@ -204,6 +216,8 @@
icon_state = "rescue"
rod_overlay_icon_state = "hook_rescue_overlay"
chasm_detritus_type = /datum/chasm_detritus/restricted/bodies
+ wiki_desc = "A hook used to rescue bodies whom have fallen into chasms. \
+ You won't catch fish with it, nor it can't be used for fishing outside of chasms, though it can still be used to reel in people and items from unreachable locations.."
/obj/item/fishing_hook/rescue/can_be_hooked(atom/target)
return ..() || isliving(target)
@@ -233,6 +247,7 @@
name = "bone hook"
desc = "A simple hook carved from sharpened bone"
icon_state = "hook_bone"
+ wiki_desc = "A generic fishing hook carved out of sharpened bone. Bone fishing rods come pre-equipped with it."
/obj/item/fishing_hook/stabilized
name = "gyro-stabilized hook"
@@ -240,6 +255,8 @@
icon_state = "gyro"
fishing_hook_traits = FISHING_HOOK_BIDIRECTIONAL
rod_overlay_icon_state = "hook_gyro_overlay"
+ wiki_desc = "It allows you to move both up (left-click) and down (right-click) during the minigame while negating gravity.
\
+ It requires the Advanced Fishing Technology Node to be researched to be printed."
/obj/item/fishing_hook/stabilized/examine(mob/user)
. = ..()
@@ -252,6 +269,9 @@
w_class = WEIGHT_CLASS_NORMAL
fishing_hook_traits = FISHING_HOOK_NO_ESCAPE|FISHING_HOOK_NO_ESCAPE|FISHING_HOOK_KILL
rod_overlay_icon_state = "hook_jaws_overlay"
+ wiki_desc = "A beartrap-looking hook that makes losing the fishing minigame impossible (Unless you drop the rod or get stunned). However it'll hurt the fish and eventually kill it. \
+ Funnily enough, you can snag in people with it too. It won't hurt them like a actual beartrap, but it'll still slow them down.
\
+ It has to be bought from the black market uplink."
/obj/item/fishing_hook/jaws/can_be_hooked(atom/target)
return ..() || isliving(target)
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index 28ae51d4236..86fe5178a6c 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/code/modules/fishing/fishing_rod.dm
@@ -17,8 +17,12 @@
var/cast_range = 3
/// Fishing minigame difficulty modifier (additive)
var/difficulty_modifier = 0
- /// Explaination of rod functionality shown in the ui
+ /// Explaination of rod functionality shown in the ui and the autowiki
var/ui_description = "A classic fishing rod, with no special qualities."
+ /// More explaination shown in the wiki after ui_description
+ var/wiki_description = ""
+ /// Is this fishing rod shown in the wiki
+ var/show_in_wiki = TRUE
var/obj/item/bait
var/obj/item/fishing_line/line = /obj/item/fishing_line
@@ -295,10 +299,11 @@
/obj/item/fishing_rod/proc/get_fishing_overlays()
. = list()
var/line_color = line?.line_color || default_line_color
- /// Line part by the rod, always visible
- var/mutable_appearance/reel_appearance = mutable_appearance(icon, reel_overlay)
- reel_appearance.color = line_color
- . += reel_appearance
+ /// Line part by the rod.
+ if(reel_overlay)
+ var/mutable_appearance/reel_appearance = mutable_appearance(icon, reel_overlay)
+ reel_appearance.color = line_color
+ . += reel_appearance
// Line & hook is also visible when only bait is equipped but it uses default appearances then
if(hook || bait)
@@ -480,10 +485,12 @@
/obj/item/fishing_rod/unslotted
hook = null
line = null
+ show_in_wiki = FALSE
/obj/item/fishing_rod/bone
name = "bone fishing rod"
desc = "A humble rod, made with whatever happened to be on hand."
+ ui_description = "A fishing rod crafted with leather, sinew and bones."
icon_state = "fishing_rod_bone"
reel_overlay = "reel_bone"
default_line_color = "red"
@@ -498,6 +505,7 @@
force = 0
w_class = WEIGHT_CLASS_NORMAL
ui_description = "A collapsible fishing rod that can fit within a backpack."
+ wiki_description = "It has to be bought from Cargo."
reel_overlay = "reel_telescopic"
///The force of the item when extended.
var/active_force = 8
@@ -547,15 +555,20 @@
if(user)
balloon_alert(user, active ? "extended" : "collapsed")
playsound(src, 'sound/weapons/batonextend.ogg', 50, TRUE)
- update_appearance(UPDATE_OVERLAYS)
+ update_appearance()
QDEL_NULL(fishing_line)
return COMPONENT_NO_DEFAULT_MESSAGE
+/obj/item/fishing_rod/telescopic/update_icon_state()
+ . = ..()
+ icon_state = "[initial(icon_state)][!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE) ? "_collapsed" : ""]"
+
/obj/item/fishing_rod/telescopic/master
name = "master fishing rod"
desc = "The mythical rod of a lost fisher king. Said to be imbued with un-paralleled fishing power. There's writing on the back of the pole. \"中国航天制造\""
difficulty_modifier = -10
- ui_description = "This rod makes fishing easy even for an absolute beginner."
+ ui_description = "A mythical telescopic fishing rod that makes fishing quite easier."
+ wiki_description = null
icon_state = "fishing_rod_master"
reel_overlay = "reel_master"
active_force = 13 //It's that sturdy
@@ -566,7 +579,8 @@
/obj/item/fishing_rod/tech
name = "advanced fishing rod"
desc = "An embedded universal constructor along with micro-fusion generator makes this marvel of technology never run out of bait. Interstellar treaties prevent using it outside of recreational fishing. And you can fish with this. "
- ui_description = "This rod has an infinite supply of synth-bait. Also doubles as an Experi-Scanner for fish."
+ ui_description = "A rod with an infinite supply of synthetic bait. Doubles as an Experi-Scanner for fish."
+ wiki_description = "It requires the Advanced Fishing Technology Node to be researched to be printed."
icon_state = "fishing_rod_science"
reel_overlay = "reel_science"
bait = /obj/item/food/bait/doughball/synthetic/unconsumable
diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm
index a63c087fcc6..2c1e1ca53e4 100644
--- a/code/modules/fishing/sources/_fish_source.dm
+++ b/code/modules/fishing/sources/_fish_source.dm
@@ -88,6 +88,20 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
/obj/structure/closet/crate/necropolis/tendril,
))
+
+ ///List of multipliers used to make fishes more common compared to everything else depending on bait quality, indexed from best to worst.
+ var/static/weight_result_multiplier = list(
+ TRAIT_GREAT_QUALITY_BAIT = 9,
+ TRAIT_GOOD_QUALITY_BAIT = 3.5,
+ TRAIT_BASIC_QUALITY_BAIT = 2,
+ )
+ ///List of exponents used to level out the table weight differences between fish depending on bait quality.
+ var/static/weight_leveling_exponents = list(
+ TRAIT_GREAT_QUALITY_BAIT = 0.7,
+ TRAIT_GOOD_QUALITY_BAIT = 0.55,
+ TRAIT_BASIC_QUALITY_BAIT = 0.4,
+ )
+
/datum/fish_source/New()
if(!PERFORM_ALL_TESTS(focus_only/fish_sources_tables))
return
@@ -271,7 +285,7 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
/// Builds a fish weights table modified by bait/rod/user properties
/datum/fish_source/proc/get_modified_fish_table(obj/item/fishing_rod/rod, mob/fisherman, atom/location)
var/obj/item/bait = rod.bait
- ///An exponent used to level out the difference in probabilities between fishes/mobs on the table depending on bait quality.
+ ///An exponent used to level out the table weight differences between fish depending on bait quality.
var/leveling_exponent = 0
///Multiplier used to make fishes more common compared to everything else.
var/result_multiplier = 1
@@ -280,15 +294,12 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
var/list/final_table = fish_table.Copy()
if(bait)
- if(HAS_TRAIT(bait, TRAIT_GREAT_QUALITY_BAIT))
- result_multiplier = 9
- leveling_exponent = 0.5
- else if(HAS_TRAIT(bait, TRAIT_GOOD_QUALITY_BAIT))
- result_multiplier = 3.5
- leveling_exponent = 0.25
- else if(HAS_TRAIT(bait, TRAIT_BASIC_QUALITY_BAIT))
- result_multiplier = 2
- leveling_exponent = 0.1
+ for(var/trait in weight_result_multiplier)
+ if(HAS_TRAIT(bait, trait))
+ result_multiplier = weight_result_multiplier[trait]
+ weight_leveling_exponents = weight_leveling_exponents[trait]
+ break
+
if(HAS_TRAIT(rod, TRAIT_ROD_REMOVE_FISHING_DUD))
final_table -= FISHING_DUD
@@ -308,7 +319,7 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
if(mult > 1 && HAS_TRAIT(bait, TRAIT_BAIT_ALLOW_FISHING_DUD))
final_table -= FISHING_DUD
else
- final_table[result] = round(final_table[result] * 0.15, 1) //Fishing without bait is not going to be easy
+ final_table[result] = round(final_table[result] * FISH_WEIGHT_MULT_WITHOUT_BAIT, 1) //Fishing without bait is not going to be easy
// Apply fish trait modifiers
final_table[result] = get_fish_trait_catch_mods(final_table[result], result, rod, fisherman, location)
@@ -316,25 +327,29 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
if(final_table[result] <= 0)
final_table -= result
- ///here we even out the chances of fishie based on bait quality: better baits lead rarer fishes being more common.
- if(leveling_exponent)
- var/highest_fish_weight
- var/list/collected_fish_weights = list()
- for(var/fishable in final_table)
- if(ispath(fishable, /obj/item/fish))
- var/fish_weight = fish_table[fishable]
- collected_fish_weights[fishable] = fish_weight
- if(fish_weight > highest_fish_weight)
- highest_fish_weight = fish_weight
- for(var/fish in collected_fish_weights)
- var/difference = highest_fish_weight - collected_fish_weights[fish]
- if(!difference)
- continue
- final_table[fish] += round(difference**leveling_exponent, 1)
+ if(leveling_exponent)
+ level_out_fish(final_table, leveling_exponent)
return final_table
+///A proc that levels out the weights of various fish, leading to rarer fishes being more common.
+/datum/fish_source/proc/level_out_fish(list/table, exponent)
+ var/highest_fish_weight
+ var/list/collected_fish_weights = list()
+ for(var/fishable in table)
+ if(ispath(fishable, /obj/item/fish))
+ var/fish_weight = table[fishable]
+ collected_fish_weights[fishable] = fish_weight
+ if(fish_weight > highest_fish_weight)
+ highest_fish_weight = fish_weight
+
+ for(var/fish in collected_fish_weights)
+ var/difference = highest_fish_weight - collected_fish_weights[fish]
+ if(!difference)
+ continue
+ table[fish] += round(difference**exponent, 1)
+
/datum/fish_source/proc/get_fish_trait_catch_mods(weight, obj/item/fish/fish, obj/item/fishing_rod/rod, mob/user, atom/location)
if(!ispath(fish, /obj/item/fish))
return weight
@@ -425,3 +440,101 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
reward.pixel_y = rand(-9, 9)
if(severity >= EXPLODE_DEVASTATE)
reward.ex_act(EXPLODE_LIGHT)
+
+/**
+ * Called by /datum/autowiki/fish_sources unless the catalog entry for this fish source is null.
+ * It should Return a list of entries with keys named "name", "icon", "weight" and "notes"
+ * detailing the contents of this fish source.
+ */
+/datum/fish_source/proc/generate_wiki_contents(datum/autowiki/fish_sources/wiki)
+ var/list/data = list()
+ var/list/only_fish = list()
+
+ var/total_weight = 0
+ var/total_weight_without_bait = 0
+ var/total_weight_no_fish = 0
+
+ var/list/tables_by_quality = list()
+ var/list/total_weight_by_quality = list()
+ var/list/total_weight_by_quality_no_fish = list()
+
+ for(var/obj/item/fish/fish as anything in fish_table)
+ var/weight = fish_table[fish]
+ if(fish != FISHING_DUD)
+ total_weight += weight
+ if(!ispath(fish, /obj/item/fish))
+ total_weight_without_bait += weight
+ total_weight_no_fish += weight
+ continue
+ if(initial(fish.show_in_catalog))
+ only_fish += fish
+ total_weight_without_bait += round(fish_table[fish] * FISH_WEIGHT_MULT_WITHOUT_BAIT, 1)
+
+ for(var/trait in weight_result_multiplier)
+ var/list/table_copy = fish_table.Copy()
+ table_copy -= FISHING_DUD
+ var/exponent = weight_leveling_exponents[trait]
+ var/multiplier = weight_result_multiplier[trait]
+ for(var/fish as anything in table_copy)
+ if(!ispath(fish, /obj/item/fish))
+ continue
+ table_copy[fish] = round(table_copy[fish] * multiplier, 1)
+
+ level_out_fish(table_copy, exponent)
+ tables_by_quality[trait] = table_copy
+
+ var/tot_weight = 0
+ var/tot_weight_no_fish = 0
+ for(var/result in table_copy)
+ var/weight = table_copy[result]
+ tot_weight += weight
+ if(!ispath(result, /obj/item/fish))
+ tot_weight_no_fish += weight
+ total_weight_by_quality[trait] = tot_weight
+ total_weight_by_quality_no_fish[trait] = tot_weight_no_fish
+
+ //show the improved weights in ascending orders for fish.
+ tables_by_quality = reverseList(tables_by_quality)
+
+ if(FISHING_DUD in fish_table)
+ data += LIST_VALUE_WRAP_LISTS(list(
+ FISH_SOURCE_AUTOWIKI_NAME = FISH_SOURCE_AUTOWIKI_DUD,
+ FISH_SOURCE_AUTOWIKI_ICON = "",
+ FISH_SOURCE_AUTOWIKI_WEIGHT = PERCENT(fish_table[FISHING_DUD]/total_weight_without_bait),
+ FISH_SOURCE_AUTOWIKI_WEIGHT_SUFFIX = "WITHOUT A BAIT",
+ FISH_SOURCE_AUTOWIKI_NOTES = "Unless you have a magnet or rescue hook or you know what you're doing, always use a bait",
+ ))
+
+ for(var/obj/item/fish/fish as anything in only_fish)
+ var/weight = fish_table[fish]
+ var/deets = "Can be caught indefinitely"
+ if(fish in fish_counts)
+ deets = "It's quite rare and can only be caught up to [fish_counts[fish]] times"
+ if(fish in fish_count_regen)
+ deets += " every [DisplayTimeText(fish::breeding_timeout)]"
+ var/list/weight_deets = list()
+ for(var/trait in tables_by_quality)
+ weight_deets += "[round(PERCENT(tables_by_quality[trait][fish]/total_weight_by_quality[trait]), 0.1)]%"
+ var/weight_suffix = "([english_list(weight_deets, and_text = ", ")])"
+ data += LIST_VALUE_WRAP_LISTS(list(
+ FISH_SOURCE_AUTOWIKI_NAME = wiki.escape_value(full_capitalize(initial(fish.name))),
+ FISH_SOURCE_AUTOWIKI_ICON = FISH_AUTOWIKI_FILENAME(fish),
+ FISH_SOURCE_AUTOWIKI_WEIGHT = PERCENT(weight/total_weight),
+ FISH_SOURCE_AUTOWIKI_WEIGHT_SUFFIX = weight_suffix,
+ FISH_SOURCE_AUTOWIKI_NOTES = deets,
+ ))
+
+ if(total_weight_no_fish) //There are things beside fish that we can catch.
+ var/list/weight_deets = list()
+ for(var/trait in tables_by_quality)
+ weight_deets += "[round(PERCENT(total_weight_by_quality_no_fish[trait]/total_weight_by_quality[trait]), 0.1)]%"
+ var/weight_suffix = "([english_list(weight_deets, and_text = ", ")])"
+ data += LIST_VALUE_WRAP_LISTS(list(
+ FISH_SOURCE_AUTOWIKI_NAME = FISH_SOURCE_AUTOWIKI_OTHER,
+ FISH_SOURCE_AUTOWIKI_ICON = FISH_SOURCE_AUTOWIKI_QUESTIONMARK,
+ FISH_SOURCE_AUTOWIKI_WEIGHT = PERCENT(total_weight_no_fish/total_weight),
+ FISH_SOURCE_AUTOWIKI_WEIGHT_SUFFIX = weight_suffix,
+ FISH_SOURCE_AUTOWIKI_NOTES = "Who knows what it may be. Try and find out",
+ ))
+
+ return data
diff --git a/code/modules/fishing/sources/source_types.dm b/code/modules/fishing/sources/source_types.dm
index 6aea78b9943..ffbb2bb5332 100644
--- a/code/modules/fishing/sources/source_types.dm
+++ b/code/modules/fishing/sources/source_types.dm
@@ -370,7 +370,7 @@
fish_table = list(
FISHING_DUD = 20,
/obj/item/fish/ratfish = 10,
- /obj/item/fish/slimefish = 4
+ /obj/item/fish/slimefish = 4,
)
fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 10
@@ -401,6 +401,15 @@
)
fishing_difficulty = FISHING_EASY_DIFFICULTY
+/datum/fish_source/holographic/generate_wiki_contents(datum/autowiki/fish_sources/wiki)
+ var/obj/item/fish/prototype = /obj/item/fish/holo/checkered
+ return LIST_VALUE_WRAP_LISTS(list(
+ FISH_SOURCE_AUTOWIKI_NAME = "Holographic Fish",
+ FISH_SOURCE_AUTOWIKI_ICON = FISH_AUTOWIKI_FILENAME(prototype),
+ FISH_SOURCE_AUTOWIKI_WEIGHT = 100,
+ FISH_SOURCE_AUTOWIKI_NOTES = "Holographic fish disappears outside the Holodeck",
+ ))
+
/datum/fish_source/holographic/reason_we_cant_fish(obj/item/fishing_rod/rod, mob/fisherman, atom/parent)
. = ..()
if(!istype(get_area(fisherman), /area/station/holodeck))
@@ -445,7 +454,7 @@
fish_table = list(
FISHING_DUD = 25,
/obj/item/food/grown/grass = 25,
- RANDOM_SEED = 16,
+ FISHING_RANDOM_SEED = 16,
/obj/item/seeds/grass = 6,
/obj/item/seeds/random = 1,
/mob/living/basic/frog = 1,
@@ -454,13 +463,55 @@
fish_counts = list(
/obj/item/food/grown/grass = 10,
/obj/item/seeds/grass = 4,
- RANDOM_SEED = 4,
+ FISHING_RANDOM_SEED = 4,
/obj/item/seeds/random = 1,
/mob/living/basic/frog = 1,
/mob/living/basic/axolotl = 1,
)
fishing_difficulty = FISHING_EASY_DIFFICULTY - 5
+/datum/fish_source/hydro_tray/generate_wiki_contents(datum/autowiki/fish_sources/wiki)
+ var/list/data = list()
+ var/total_weight = 0
+ var/critter_weight = 0
+ var/seed_weight = 0
+ var/other_weight = 0
+ var/dud_weight = fish_table[FISHING_DUD]
+ for(var/content in fish_table)
+ var/weight = fish_table[content]
+ total_weight += weight
+ if(ispath(content, /mob/living))
+ critter_weight += weight
+ else if(ispath(content, /obj/item/food/grown) || ispath(content, /obj/item/seeds) || content == FISHING_RANDOM_SEED)
+ seed_weight += weight
+ else if(content != FISHING_DUD)
+ other_weight += weight
+
+ data += LIST_VALUE_WRAP_LISTS(list(
+ FISH_SOURCE_AUTOWIKI_NAME = FISH_SOURCE_AUTOWIKI_DUD,
+ FISH_SOURCE_AUTOWIKI_DUD = "",
+ FISH_SOURCE_AUTOWIKI_WEIGHT = PERCENT(dud_weight/total_weight),
+ FISH_SOURCE_AUTOWIKI_WEIGHT_SUFFIX = "WITHOUT A BAIT",
+ FISH_SOURCE_AUTOWIKI_NOTES = "",
+ ))
+
+ data += LIST_VALUE_WRAP_LISTS(list(
+ FISH_SOURCE_AUTOWIKI_NAME = "Critter",
+ FISH_SOURCE_AUTOWIKI_DUD = "",
+ FISH_SOURCE_AUTOWIKI_WEIGHT = PERCENT(critter_weight/total_weight),
+ FISH_SOURCE_AUTOWIKI_NOTES = "A small creature, usually a frog or an axolotl",
+ ))
+
+ if(other_weight)
+ data += LIST_VALUE_WRAP_LISTS(list(
+ FISH_SOURCE_AUTOWIKI_NAME = "Other Stuff",
+ FISH_SOURCE_AUTOWIKI_DUD = "",
+ FISH_SOURCE_AUTOWIKI_WEIGHT = PERCENT(other_weight/total_weight),
+ FISH_SOURCE_AUTOWIKI_NOTES = "Other stuff, who knows...",
+ ))
+
+ return data
+
/datum/fish_source/hydro_tray/reason_we_cant_fish(obj/item/fishing_rod/rod, mob/fisherman, atom/parent)
if(!istype(parent, /obj/machinery/hydroponics/constructable))
return ..()
diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm
index 1a5a3875511..fd6ca7949b4 100644
--- a/code/modules/research/techweb/_techweb.dm
+++ b/code/modules/research/techweb/_techweb.dm
@@ -317,11 +317,7 @@
var/points_rewarded
if(completed_experiment.points_reward)
add_point_list(completed_experiment.points_reward)
- points_rewarded = ",[refund > 0 ? " and" : ""] rewarding "
- var/list/english_list_keys = list()
- for(var/points_type in completed_experiment.points_reward)
- english_list_keys += "[completed_experiment.points_reward[points_type]] [points_type]"
- points_rewarded += "[english_list(english_list_keys)] points"
+ points_rewarded = ",[refund > 0 ? " and" : ""] rewarding [completed_experiment.get_points_reward_text()]"
result_text += points_rewarded
result_text += "!"
diff --git a/code/modules/unit_tests/fish_unit_tests.dm b/code/modules/unit_tests/fish_unit_tests.dm
index 2fb2487f781..e3ede57fc29 100644
--- a/code/modules/unit_tests/fish_unit_tests.dm
+++ b/code/modules/unit_tests/fish_unit_tests.dm
@@ -84,6 +84,7 @@
fish_traits = list(/datum/fish_trait/dummy)
stable_population = INFINITY
breeding_timeout = 0
+ show_in_catalog = FALSE //skipped by the autowiki unit test.
/obj/item/fish/testdummy/two
fish_traits = list(/datum/fish_trait/dummy/two)
diff --git a/icons/obj/fishing.dmi b/icons/obj/fishing.dmi
index 2344d2b8ed9e6d87c0a7cead2e122ee85a09ba16..9c6a535fd839e20bc3f1d823cbb4f0fd4843083b 100644
GIT binary patch
literal 24835
zcmb@t1yEeU_bzw|1Sd!c1c%_k-8~Qp5C{<5-6c2-u0azZI01qNcV}?-;5s42G#JjE)0&B85DQNVnmpU6^+#E)hz
zqmBpdt&5Jj07K7v^G0i0wDOtAo7rfA<{&`z&`fcR0S$!|CS~v!l|X@YkOf
zb-@!eh#3qPui5h0Gm8cFXFH1WG++6Rx?R{~K;oXIWHujV
zew>G&l;Ta#YsBsru!*BUZwB4Cj
zkp|7<7MzIKJ{NK?WF^z82c4;^J*qC`8PoeARY%3hmet}4cMXSIEEH6%X)G2t6gzUZ
zKLjPNC6#I8T5H*YayKhM?)WPCW>o${M!m&GiL
zzhpYNKixWPd^Ej9{QCoMF!i^yEdb~%%Dt0N^H?~{@YGZ@yX|WWbH%~e1tgw_N_Y6k
zO>$H5@Ejhx4h&8q4gL93wd`duRFj#arImUk^E^Ml(Zaf{J2|wG?O+j;p&6ZFh_dtS
z)`Y*0i+y#N-5GiFK{qL>nsnQD^itream@K=m-PGhL6oS0-^iJ?k&q;CXbb}>QSsO%
zaF8UP(V+&iM<|BDEQWkF+f%=g*je)6BArlH9)vv~9vUJir{ep5U2PI?&x8g?SUVqE
zvz==%<9DJX0@(kC%#*UbI;%1tL8fX><#Wj29J<{rl9Rk+#c*@tek8sY5frRY;BvLQ$$nVGD~`dF<(pA)`wPF1czO%`bmEUJ-me
zbyeqi(D^ucZE*Zg7@r_%s-GcFj?qZ(tc|Gf+^{VjGRi=W=v(XxlDoQuy{#ZprMk
zC=xzmn;Bcfjo#?GaDN#nFQB2JXiRND;$OY%P7{52bQIP{;fMe9O03v}r6Q3rV)f?T
zPC-K_OBMip%UoYzo)LRr|AtTL`ZCV_ncu|7%?D0o$jNgwO=Eb5!{LHsiSG4xX;#T-
zh#es6Cxra6ZJFNc-u-X*`^vRj+2hlTgxfXKDFaD!25AvZ;m16sOMe~l07`vli?)32
zN90+5zZ*~I*7uECYzkbrlI3Ku${#_;H}eJbBF85^sCg)H<XE
z+`{9WI4BGo>Hedo4DwPEVVMar)dp{*#}TTzy^m2+P{S8JqNsPFnBG
z#LpBZu~Gax5*Sz~a5B#m)?_fyL1%0AOSDji6s$
zhH_FP{`lTY@edya)AiDEaaNh`yuD6UQBjXWsw24`L|u`c
zz7BXmx*e%VY@_ZXA|v+u*=VlbepqLf(sx5-d>^|$P~$@SaPq$Y58mqBphUm=$SVq<
z%uH9xN=raxlKYPco+~LR7+qvJHk)rt^5W}CjX%*W_E$}UXH&h)DE9802pusSVRzom_Jv~Y3;cMC
zC@Q)lGg7?LN(l~a?O+{~Z}yUbkx>E^M@8jNrOA$dLPA3ONUeyl@Dh?0kBqMrg)eH4
zbkCD~ZJG6yD@QPI0x5HmullDSE1+>v;0^F^91{-xR6*En8v_@%(_74`cDLZK`{Li0
z$#-|(asm%uJH9%TvC?W(F8YSkB=2mv0-Wj_@9zV&c#RC%3O7ozhRlsmL&OKdpR(n
zjM(`I2wY2E?ys$drl&&y|M>X$d>$S`5nDqIU6(Jx
z7e7o3QM{y9xNzQoq6$xDR8=50(Dib(-J&#o{Nmt%>0`={{DRm&I~J3G)A0A}^G@4;
zn^m&?qo(aQ5jE~@%Y&+D<*K8ZiI4&%(5`UjZ*Om>=h5B6&u%uF
z#e^L%Aft#Jk2fWL`YmN;Kf%R3X2q_d+<%N#q=CX(|)fp%Yy8Tjn?BYU4{+M|8T@5w~_2rw58&?LCmmJgwj8C`oE@e~Qwimw4
z!Ayh9j*|r`+z%!>p*b}ry8Vv(x9&81{GgEU#r?}CPOwIiL>44O#z_b>hQ;<&W4}5#
zc6M^IpgmsS9yyZJC|)&37vDPa{m`hTX}PGDnrmo^H6=8Ni=TAScZ}b&ZvgE~kd0q!
z&z_%y@MEo{#Eo8cc>V8TKc9V==J}w1+kGR}=E}-9Z*Lp3HV9dAQaLy=>FMdm8+C3n
ze3mm9lMQ4-SH^oa7M~#1I6#G28|l)yRmCnB&ga%9Nzk_1T59q3>+ZiAtZ0Aj^SbC{
zb13ajJQMiKXB4Qleg#4?0s>T$pk&_wCMq&suM{iO!KG+B!zth+add+TgHA>V!91=0b)zx{cs=v5I5Cith)=O5q)k;e1&}%ml
z@5^1erI?(Q67Xey{H{KVXn2WjL+gp4%&Ym9XfBYn^ib
zMdm!2P3~glzz+*%C;6&maA_UpWKb%u&`>5g5i1?LODbts{}_tZoao3!@6&CoebMAj
z=jlcPtoA9YHlP?ijD+YvgLh2ZJeZ
zSH=kKgTz1$jjoqlrdE&5@9T00y|%MayzRZB-;sp)rZ##BTw2JO!0Z{f>#x--Eh~$*Au?Z~7&h#{tt)(u@$y3Z;RthRqtxw4eV%%2)n{
z7U}CbmDt97V>~5VosQBxSmrL9z{tt#BeZA&*g+54d`BASl~vDvEC|L?a0$(BQhrCx
zDxo#Fgk?AB?Z0%bBcxlSO<95&4)JeCL}hqd>6jE0%MO(i;koILp)+D)_e-;7J#~KVMHa7r9
zUBTsHC{T54dkp$(ZJAC;@5aUk%e7tqQ`mKflYo7_AonIyp1PM4m@_f6!#&aVdf3-_
zgb;E|Z51c^`+?C$h9WtmsecH4lZ{-s7!To4fnr+S>+wUjc+A1cxQ#QVW^hQ04^uZ~
z4swiG5^^{rq^-ys*RFl6iM~GQKvqy1A&_}No5=7mioj2APioHL
zND?)M2rt1nK0knbQ0~8jc*_4gd5Y}AQ3y%2kw(J$`(+c83yH3o+1RjgadD^i11T90
z?NdmFJpxm1vxAKBUcTh;Tz|)G08Phu@j^yZ^L0+GI8FjWz3er)2yw^{Cb4z%(e$pU
zM(ic!)6-L&q;LKW!ALXI45;6~f7fhqq{6_Oz0;gF~S5N3Vp;--SW1MN*b@*%v#
z8TGP%;3^`4G79hBArTS~^d@|uMaCwN8Xs3aM=iRYny;u}m%*b8&yW4YXZ+WTyKkVd
zjU5cs2Hb9#c6h79kYBu7$rN$MYeh~z`dG7&V{o$3o}ZsDkvGWhLAl*q;kYKr3yvLV
zA6;&C+M8nR-%7<@3=9hTo}3)MHIx+ZkG3u`?0`7!c$KSuLlKC9y_#9RgM)3+ZS|E9>BH>#?Eq1Jc<=44%!Yu+;-F|pn
z7dW^OWyutPW#IO#F
z4xr-8*88QuhC*^XNo{lLLTAr`JQXzHwXg^KubiCUcj7qMMgBV@X#*#c>v=R6(hZGg
z1WsvnOi#^$w~GU4{vyD=~d7Cu8Hf+rI6?(|G!_!k&cXt#&Z_cL{T0AKK1;@X^
zQ2)*OEj^tM_44loLliO3Gq5QD$o^-u#}x?r!;|p}xgV7|hoyn?f5SyVL7ALUz`=4n
z&f2!(g?eMmEW4hcz#3!}7pIhR43=rU(Zh-CQ=3D0u
z4{7EN`p3rd>FS9n;w6pQ+q?v=9dwuDy>tOo(5*~ObJ=;3qH!f~TtyO7Q$vG~2th0M
zrxLB!L~a4M&b((^%B89{K5It_I@NS>DSMXH_9H6!#q~i6u7(f!FEuojFdfn&H{Ko|
z`9NC0iEPK`GYt+2snpmR#EJNsktT&1>s;c)`r@X#r9XVA=u28hv~A0sr(Ms
zWql9Mr=*nBb6izk1sviS^61V~9+J7Ha#kak3bJ9JzM=u7gN6CY!lwKujR|?DmSlH@
z!e`QUBOKl*{=)xsJId$F9R7qn3bn?BPfqmbncu#XuH>`LF9L6Gky&9~LJ8CRA-4zEa9ykrb_;qr;hc9myhAl`h;8>|S2bai&lb%tQfgK}LkNj%L^
zJ-E9Ep$r8|j|A(=2G@GfZCRtfXYJo&!QQ8~%y25aClD?P7@nIt)=+vv4>A#A+H{0u
zY61ge&1PQ_!0@#DYj{+YDFz{{>3SNg2hr?<7#o|?jz>r0o4GwkBY}I~Ex))UAjPu>
z6ZrMwptAq&>}21Y?KuiIxe3YsoxGx#SBzFu#9rFP>8+`uVV0xaHk626
z?4J~xn{jNqYijAf3fF!y3Tfo
zhegSQS<%i2x9;xmhXv8K!AVa7Q9h&DJ?FhL4xLhZ`1ts^AmJR`Ht7+zyi5k-o1#p6
z#9nKiZ@n88v`F#;=EP{`T?X$B%
z@kKVacJS)i@Nm?R*~+My`y!OLPaD>|?^3fr9&UXc-nvBl($zxxqDi7RH@S@fuak|h
z!(^F$NZ&m)2ix1l*H{Ih|CoN7AKqM?C%*}-proRrV&>+?2ce%dtFhxPC+D9AdSgvu
zJ-vzC1h&k3m{4i_$M$u+AkC^;F1%Zm=|ZgK(wI^q1EM@79|u|x`|wBh*yD!(_6v|lwP^A2Io#XYTLmmuzb
zPlp_hw&y!K2xPuGBiykxBoDOIrbRswB_bjkz(;?MHm8Xe3FG_GY>gUdnaZr&@a@DR
z7s42bq=17&g#a1R5U#NWHU9o7Pxwu?^UmgB0TV5m617uObK(t{Qv6TY@y#FYe
z-NXF;&4>1>Qw}vr7N3W&1nCH8>-Vc&*K}Ct^HtMP?@IW{hR@Sxtsc;Rp_#YW_K>`$
z;j_x>Mxtdi9t^)2dQkX@uowS4qDsuUJM8BP3-6;M6(YU1Ci302g&4b2FZg<&cVru{
zRo1IW*gNAu6`VVZA$6`e$JUh8Mo#g+DbKYz5o`b6rO82o@$78@LmH!B4|u@>n;5_m
z%Y*he_H4o~g*$J0O#IJ&FZ;wCWQqJacvo@@yh!WY1V$cJf6pp-VVRfvSp>ypY!kFu
zjFETl&&~16ZA6+x;@0Ot;jT^DBk3oJ^HIj5FyD60RU>owvJtYW+x-ZR0StCvXnh?K
zyh6GS+dSnu=SwrW1An}hnYYe&4u!&U?JX5wS^z!faK&FK6V(>j-Mzibd|lMcC~cxq
zT5PUJcO7A8C!m@de6M1xCIv}^;;%|Pa6U2M(}N(?mnM~r9zi^Qze&K$=`TqSDT(z^6&<#>Q^sbBcKuDkL%aNr!5PztFR*qWTuJB$EItUwJpUm88gbE*JO5y=nFEzo%EP_81MIEDKJUj)vC62t
zxTCZ)r8l&P_$%ptRTDwzifzXZy!V}LDS7J3j*iEdtE;Pri4kHD_;GDl7`DNp%7%{D
z^-C7<_LN!H)iIM#@H0)d3^Xsn6yBh%4O9JQ!@3kN*8m>CPQ|9{f{ow?(x
z-$DJ!w*QYpz<+%GKZSt*jfV)6|EKrYFxXn+;vjuW!xp>yh9K_i3q4LrOCz!No55M%
z^@FdWc!>v6J@b8gkt#73ygy%!Vr;T84jSoN^^*->=s%7km-=IyjVjC@y_PpwPy0pI
z+wEZKnJNU$-iJ+{m{eD3e)1F;oVMog_y5APN*Rx!EVVsOuy^{UpOlo+{ksGm;*>RI
zfh?A*r@$0X8`Zae(;;R|l;L*9gP2xV&GU&zVBGREgJU}`7`szYPR*RvL$sa#Oep-J77>JJX=ghW})
zDpIAPlsceHroiedkfJ~>Mo9GSn+_6o3TEN=Pm&+ADGdk-326$yd{WboF?x9L>R~Hw
z>WHuoF2hZw69uwbNF5#hBO@{G%s2sm&U#b{GBagF<>G1OZOeS@y}!=@+5VA$CQ{@c
zjqRf6-}fUZrY4?S10mAZ_`jzmA!hbeQ(MH>gQlFDQ;_l*=LfO7W2wZrxMvm?7WjmO
zIW;wE@X?70+|kidP$>i}XU}GM?5wPQAGZ}0&@U}5RoKo~-PReId~gi9ZPWDXkz0Ua
zdF`$2PkJArz4l+hgBsi|92S;i$;n+oi;pM`|A1JUJ3WVpz=kWe(=~UQrlO5Kc*>oS
z{)T7uP0*5b?@k=gmw<2A2>y`@p}|XU3a7;-ji^k4z)d^c&FldjjA?PBPq-0-LsZV=
zV$dqt((mql-X~Ou9*n0aX5;-704oE=+WIQs`JO0H*!0_UjUrvVgx-sw_2OxN-Ebc^
zsCKCq@)vz5PYN4_Sbq-7CaWC+VSA5sD8^e+sL`2$wl+E_IZO85ps#1gOcEns0uM~d
zwny#?iSOdm$fM3f5tF`t86?!p>!`Jj@A*1!_(ob07H@t+c^-`fN&w0}WqT4<0;t?q
zi8%(}P;>#RoXstDRK?KYB$BDEt%j_r^w4I0&=~EqnLAq#J{`eXQx)p+b8%^AyJtyp
zxWBY!4TeN2Ad4O*3h;~TQA;X9P>@^`sHimT93d$R$Y%E6>2g@v!sHk0P>XQCD8Eng
z+BiFW4hSp|zw(=}GFwVuR83|zI_)gIpT9R9HIYS=WUgST4c=KQEn9_z@z3Jsd}E{+
zAfeSeIZ7$Ux)4p6{KM0}P247WEhq5UG)Oo!)f311xG>Z)4*#8(S5jCg%fJPsPFg*1
zw~hW5cq9k>PFWp_e+Rsc^#6H?Rov0L($F!*Q*gL^S`JX?0C*PM3Ws3_8)KbAy
zPS5o`S~^^Dzq0^+e)hWg@-V$Nf2$x9H)|EsYOcudh7(3Ls(q5)jIi8M!^0GzIj7o60GJexh=?#WGYhef
zLDbO0>V3^`W5fPQIA+7p&Mvyy{b=v5^>DGC1pjeTNz6=6P7XwcRsI)I9Q~%8h11p}
zcMA)@imFuLF%Ch+#Z0GXXSKe?uKP3a-Ga<0?FV&r^}@0;WT2tBIVU$4$;`~mFsfs4
z@Pp>%j~_oeVRd#oA-~>`Wb5?~KRSyj%u-IFvy_{T9BWU-dM3>W;d9j=sbew2SNLlN#_ejNA!kjg%^qK
zTw}sr+5*j4zczUf4i1#{^m!ad~+eNJ&DywmVtCML|JP
zsP|g|si*=k~)=gHbW9wA8lWU;?9puz|k5e*f_Bl#LLmZB|xR24?2q
z($dnI00|991`#`3=FPi;SR`bT=jZOl^JsB~>^F65zC!DXZBdb>`}NmXcL90XT!EK|
z=Pw&X&uB%nF5D-7(*HI-L*ewobx5R2!@Z6qcp@+P0m^n#!t5)!i7aC^HVV^A5P^k|brxVMP*kwoCE_PJ&=
zmjA;W_R#ZWV`1FA5?UdBhSAz8uN`|=v#$C!x5ZDTAnu>_Kg!_Mm_#N`L?_>NhZ>#O
z^v(a;ptMjvps{F8Y7;%d()tIwO2L&NNj=AuX?b*Kc$>TZGV!eQnKC$7RsB`v&pklQ
z%LlE+g*E%njoYo1nZ2rddeL!lcvNSb(!XMr;Z@>x*?cr5w`K{oA;rb5f#bHe;Ey^I
zz*+q(Qu^b^D^L>`nPPghs7_d#8pwskti!W%`-^Cpr3iw^C|r6(NtJf&HOLL1JMIpy
z?-ir%TZh5Dr8f58N^z^jZg0$9wQ`&}L|pT_-RlTG0hwmlPaj7SS~(ocAhXb0LrbjF
z_&j+nU5N19a&tvhRbZ<~*y-up5k>)EbcW!vlr)>Q1&u^UM@{2%wqhDD!`rukm1LNx%v6E(F~!`
z+5ha>&ZL&d!Ts9*f5G7Ym#yG`VEk8}i7Je+dIgfU%-Am_EgfPmNkX#J>RrD=@g?y#
zTQf!d=xVXvVF!d%P}{G8xdl!&^)H3i%g8hJ4puS5|BXtHq$s_b8MDUxFcu4KGIa4za)Zzn3eJAX!NEk4JYj-fYs8+=E3hZ7N8_U9CBq+?*xugWbB#@1
zW>c2yub}k|GHt+}`4plcj{R
z5wdiyi*;t%5TESaopYHFubz+k8|Yk#6f?6-Xz!Bt?JfzXJ_%1Y{^|Lz
zQHI6upFQpQJe}6aW$$M-{|$c4#f5Ri(A0qDtt~Gytq`)@s;Um#cNB7eR|1Fz2Z4|8dzti)
zN&CRH2R*7%&~BA~bQK;G6C+utN+L@AyQm0nT}MZ!Yi0uNQh%jF@#8ZlrdEeUONP7N
z&mdGhHCj&3#MJKpdA|KR4l8R%_+-Bw#J0S=Ji3%eYY|R+RqBTkP$xmpZ6kOE`1x0T
zEllV#9hfH7=~KSnwzV&ZKIr#xLcIyqd3h_G9NYCA*cz^%|0T2DxI6^>r>4{}kFWZA
z4;R0urbf)NWBG5p`b>t45h}%gXZuwSeOAT*GKRLu#A{Bb+^xs_^tH7AtbQ~+2(`2u
zITwAl04~8zP1+XBQX6~;u5$|u=#qpMhBIz%6?QOk^}0G_3)#>Q*+r)@qZev0&XO{F
zh<9?UNJFzbmUiM(NIo{k#}LE8SzA}f%V5MFTGacYTbB3(vNpP|E8-BeNqf$`+w7$%
zqp@Dg>c9O0cjjytf2(8;GjwD^#dezp4Y%X4wi)hqyzVGQRiv-`UZomn#;Wiu(&C~&
z3uyo9rIuLO%AFTjdcP5ujCy?Cv{Us;YfH+wp1)?!8O)`0GQ@
zNnTKg^h=jSvhJ;rew<8i+He7r5SUhl>sTwrj{%pXNig7e%1-5mHD%-e?}Uv1uMy|}
ze{tj`4W!dP^Ww?B5r7r_CVT@{?cg52;DATn|8n#BEj1h68}
zYlUxZ*Z`_l3n}5tmk0p(ufva3=vBBXt2Y3ArxLx&PvKIBr##oWvP7H4xh6helztgp
z2O4g@yTqn?>qcb3^iF-xe|0cceg}n??%i<_NbweKZ2UB8GUm(23hga-c!;(O;y5{)
zMV4AHvb|e)y-1+iGg~jB0{&xB=`JrP!@8#53-d;{?EEETpYXOyNQs#$1ut
zxAPnoAeHp}{0&!iOHq|k%(kBBr%zs%j+#dY2pzG$j5F(EH(LUPXR6D{$k
zwfBDUJ%l~meyUaQ-C8#~u0ExRX%+?1I>wDzLV1nhg*GdfJC`ow6lN&edMYQB!|907
zz~U(n8^|s;g%u6n|FbcAO5FbMuJ4K{U;(*1X!L90BO0|g7Rd=Zz3ZK;O(G}Yc$dTW
z)B5W5C`=?0S4XlTv4IsV%Y?Y%5)%*Bp4-JEDagvKO(-J+eh*j*Hw-F&G8{GwIW)oK
zzV26p!R=8U8o7hQLKqP+?0qjnD&X}R#hqcIQPD=X*;VJy78ES&61;vLPA(xa*XYgn
zRCETbJz7OrU{0R~Mr_Idq4Pj@{^8C3QXM+j0S$itapv?s?c(*vclWW;q&&z(zi$zM
z-)~8(Ejn5}C@6S{ZJ>Gxz_$-Kii$0OVe6yoHs1mnh5f(a?(V0$_tLLZtQRlL(L;X8
zkpc{ebi=GGqjmwcZE|e-qGuv*=Qw5EuqGB##fUb`PbVLL^5cR<
zqEN}~ig1tXI)$J7SVc#oeX{9Ne^2#T1kXxY{P5U~2;5lE%wk1;;j#e(n@j`_GJC!y
zH*PsJM3!n(N6ZJY6Ac`tcsA=AnhGrd4k$J_sK|(B$iYp3YYr9>^qqbbu(p&Ufat0daH(8ayZBUh+;f{y7(5@D%i_UgYRPcVZSZ`$hjpcjHK{s+VE;gXY*4yzdfu2%S6_OzBk
zvGTxh_e{@cTP7s@-a)@R+hYhOpcFTKPYaaaAu=9db?A9_I+
zS+-UilNetHJ+(ns#!6;KheoDMEf4v7`*>d|=rLQ(FeR4L+CYtrjF|cPUxTy;FcWK!
zXNDqwb!PY0#~aHICHlDpxBNA^kQXXA9=WaCGr0HZlMPfVRMR!v;GIT;C9?uS1*wI#
z7CNVRY3HC1IKiJz@6Q}ox0L(>)o8;OPFwFyFhlKP61dNNik40IPi-+@Y%?J6Bc3rQ
zno)rzq4h;cRR*DB+OX~9d$1P&I^+7|4MUu>E0lU(=CQ9v+3l#T4kBDBpmIu9c5kjj
zgLRL=^vhsJ{au^=cPKQT{-Z74e0hGolub9SrI(P4Rz+ldRdI@D%SiT&jUzJTKZ`&>
zD8-!lxa2Q*Vl*sa@P&brSCpdOHTR{09_BQT7`!`IF4ZSuADT!97IZ)4{rP3*aa5W)
zmtc|h(IG6~zmmtYIMnR{#QG?EWdoRcr9}ojY5mO4W&o~z%FZr2wp7tr;<~uT
zU!_Ie?uxrl13O;k(-Rj1<}W!5L!;QeTMB*j}b3C7}QWL%!JL
z%*H-9ErDRM?qI2v6s*LeMq8#J?*DZTlFmU&S93#=ogG~zW|EXLGb)1j4t^jt7@S*&
zgNp>pC*bdl1zi=_#zg6uLceV!&6qC&Wvyhi8c?V#9~YqC>`J0k>y7zIHAgFI5dm|6
zB5aN}vH6$)qyqq}AbW%WceLnp!CVdd$ePgJF{_7{qIh3Ss!Df6xw+iiwfsNJ!)kWp
zjH~k#-VMj!&=i;ha;tjv4u6uhhH;r{$M-1B-r1R~^I5NuylkrsUvQ9x{JdJZ`ReKA
z8djj;u7E)j<7^QhGDg7s+V(P|9i|`JvU~4nKBA5!=ppa6#!{!o<#^MPKJ=H@h|ZX6
zV{Mm5_7w4(te`RjKFBPo_=YCW0(0iL4i{{}pq5ecqU@ek%Oc?jM|KwlaE|PzU}Z0
zamCAef%OLVkuutB+u1l}^D}qW}c85}kOTWqu%tcXy
zEGN(x-Yt+ENo6aqf*gh6pJ)`qn%(&!Sbf!FzIyMWJI1Hq)0$C0;LaxtK~hLYG!RpI
zQru#Q#Wxo#M6kt<*|C@NDJLFR8v^_u3OxWNWj}F#BD>h2mZ}&atr%_I%OnPK<}l!KozhsdJwCdSpNZP{6r=
zU(WS(EjY`z2Y=;v=Orp#d@*GjY%sFE-NKuQ=+7pq6T;;+H=nM-p^Pk
zUENNH-|X1BpucDasttUw#qaINJ5>+KgBocL{{3S;za0S?J(Aft`fY+1F#|my(HDXy
zsbFmUOC2pDsRm~0{w)|Q$X=Rmui~LO$oBNSAlO!E=|Z7pV+2d63m_`{k-QQME}Mp4
zV*TqvT6cg;^KleA?5OqPMf)}0oaZ@mR->hbb$9*s;MSMyTP+tC?k8T?Oql_;
z_$14Sn%?A!_dfmQzdmQAYwNwGpb%SKXPM)|8Q%8U?9at?9G?ey0CB>F5ZU&38(WA#
zJ;oT2oaapJe1Y~;$N{$=P>ZmT?0q1VW8>Y8a|CB5#asAkVWJxP5%>z!BwV4MF^WUs8J#u_6EwA_
z^=d}xz-^5va_L$Ig;I6}rV(+FT8MFhNQX+Mc>|s}6&yh@PFldob101!wE2guZz6nzPWG8Ant
zWgD_XkBzTWgFN_)&x=WLE4?5W?l6avMt~<4rWpmEIDD-)d$vzi{yLE3<#n`S&M5IW
zu7Y+`LkOcT_zr$ecY@a)Bw=k$>~G{My1y`eT+onQiaabohj*GISbYt*pWgFQs@B(G
z&&+{iyWJfR#7>j=U4FFsscXDzHjV=_#1*C5U7GG!BivWpCB6-9b-I7Z!?PGoC&=gM
z`zU_GLXt^Xo|*IN=iE8<=ud&Kt@53fn^&^wAZhP8?2bmkgcWyIA35ptXIGCiy6#AL
zkKaxm-!12BA-C7=$EyYxgRt6ai^&21uPE|RkRJ04NEdJ>2Al7_JY0PD-iN}dV6}j6
z>%~(?2I&|1Kh!r4QsM!Bx7b*G{emCrHi{0`XkZ7KWz7MPcl9FvhCqA4zA?u()fo%o
zPmr(1?$Vv3Sxu)>JR8*3=7jy7C&hoa=CMPU4pyo?^3!u$t8}c+0Y-Ol4rHnPW;Yw;
zl2oTl8d9u7RE7-o?o{go3}w&Cii@4B=dqLPg`Qz!kw#Qod|aQZqNvG_HztWWd5Yl4JpO>P%mp-0qM|FCVRH9NkY@Ad9HilCz8+IY^#J&^S{
zXrJ`Vmsj(QOPGh;H7_*#Jm{&vhhj}fC~~lserW3ewRH#G7XmdVUH_tQxDK;BH$Q*(
z0KrJ%I{On*MZ*vgrB7=;quaih^4POFyW3amlVbmsur5_y<+AvQanw`J=zA7xpqux-
zJoz&WG*K!jKW==PvzO}khfTFmebEc%AcyhNAnqam_Zp!#wwE?>c)_$Gs?7z`sxME2
zI@<$+YIy$!AfiY>KJ*(PtrrmSJK~fbE=rxGIo&xIKurq9R=P);G0EPkw1U~RG_0^Y
z>b{DrevYNGXLknzxj)o%f`&gZG1)V_v55}+G+>Z|`wo={-SB%HBasNMf694WDSVH|
z6QWT5+bnH_@s_8ilmc>$kOtojzBMO+gjV_7@rjYeC9=^%(Upm|L#1onwiGkc-<@Hz-9#vrI|GvdDe{
z37x0_0%%*IAM!YN1q=D4l*WvjtUKe(+F3FZ9m5vq{1kit!Q9bFJbaEdwlg8-MRFSk
zXG}P5f6l>dB5GjaNotXW(SNN48x^JrK)-a-NpL%IF&OU1>39L
zY(X4Ww2Gp)JRjN
zqxt-wer_~)4G0^FRlx^N&FC&J~0fx{4Bt#4S6`p#5h}_ou
zDiJs&rx-YmozmTWTUvJI0I%wr!_Mb^>t?KPL-Vm*Qg9X-3Vh7G3u`5(>*^nKFizJY
zSYc?(`HV<-HgZTq+J6-6WUs~VbV|W%`M1k_QS7=I2LCic!vs>|!j9BS%|%eKaC3_k
zdzRP$qEw9=g7nKVT~N@ezi
zbhO#zqU#D5SU&x9Sx
zr!T15Ayi+71QWaaF7^4;Tl09I4N{$B$9F&rFeApLgTle0tC|g7z7kH)&D~!rSTp2BJ{ODYajpXqZ1E+gY*$w1!86c)qWuG()
z|M`UDAT?j=K|Ia&Hohlwf0HJ>KKnpjc;xo&WY3WhyCx1Bo0eX9ft=`r;)XmMcCFNj
z6%(mQ6Cp&gfeLOFL%zINDB1zNt#fP>7Wffj7e}?-LqE?`umAcqFOqWQ5n3L4UtR6r
zp!b)8$=3&w!=X3?6aH;*pyU?W;8yR6`E^cUiU-n+K#Q)lpZ+qeSD}1_>2YBpUt^DN
zX?thWTs>j->w(B|i*1W8`Z2S`_AV2F==k=PyCSjJ{jl?2A;;nsBFEDcIhnqlYFN(u
zE93Un*@j~_w~8z4l}OrRj1z7q=v)A9bn+3XFY#C{{%?M$8Qz}j-^T*PU`het=qd^y
zsiGp`yZXqwXQ^ZUw|y(^IYLb-wq#RbZEX}!OBBe_vqt`#jfZ5E&xz#sBZaV%Ro$-+
z$vH#S*E8cRIh5EwD;{+nxfu1uep`<@Uo@MNwC
zsU&Ytk2p(&>psa>VVSkxNeh|C<3O;(lPks0XhXYOW>AmvaQ8AdR1F^w&cv5k)w+vn
z^~IXH7Mb_6cx&0(Goo%Vz#|Y`{N!lK<2uiPy;gXK!@0jFN=`QXPu~tLrZ`R|>k5$o
zB0x-QAU=ul%P$$Tjk#WWj?N~lk4Ek82E$j&K2l6ZBT1$}O*%jrEe9g;#SPy+W=z6*a_RK04&dWtsnpLNJV^BmMu^GC16UN3oj~
z&Xv%ETWW!*#88)UOG_k))xZzYyQ(5M!3DUyy_wRsD_Lju)zP$!%p1A_wru3@p`1j#
zY|pc~51-B4-FkZw0ue~a*8_l(>#M7!v`mpP=))>urz=Zkj#YT8GK^j)K)6
zt!Z28YmZw<c%
zmX-`;uT#;?ICM^&zX<;i_VK+{N5!-Y>6RTb
zhhDa3c6~i_Dr{(ZMJ<)YtA#cx-C+I^Bw~7?@jZV!mh8r27Y(MRWEB)3<4N}wAXUr=
zTk`G~NmAun0d@m;|3pyz%5C7JLO!OC&md}NuNdVFa^JzWG=E0RFw|5K|HtkXffgNF
z=9poQ$e#(%vG+I__3NkVZ^2U>Bb@Xgi?w!tmKr2O#`r(+o&m$_)2%qNi}JG6Zpbr1
z>O)6z!F)(e*w8=W@zc)?_E8rJ{U`1u8Y)lt?s9*}pFWawf|F6sC~)rH
z+32M8+A-@TX=Y`TTGQRWU)yf<+@$9*$y=$;9j@g2U|N2H#=?P_0Pv)8G8jDr+-&dalKPVondIPDu}x&lQ%)OS
zAqyq57A3YrMV{t8jxc^D3`m>rxq$;5G^q}{jU4xXqSTl%=_IP
zwt!uLtHH+5XBcsfPstoP8|r;4<8mXPs7^1C75|82lv*++(z)*-3LpP_7>l%|Pz?ho
z7bJQkp`cK6a^gL)zd=$Q1{PMxQ?6^9DI3D_(a4C(E=uqnDX$%!&CVWX31_(nMJ8!f
zdhyr(#?){abhLd-0VTc8E;30N-AP~)!NB*bv}1AgI}L3b#SPBK^jJio?$)oPLx((X15t`8C8gJmEKqHWv*ubJTyI2|>lek_OXkfPYeX0^!D!
zrQFFh%V%8wa?xfOs!KuuRG6kbjGc3*I>ow^0Du&ky;p@66$oSbaX-_y11m8CDON$%
zW48ku%q!sR$O`>N_9wo!t_zd+VJ&>Sd?hpBuK7sL?#$rW4hT1lMbao3T2
zf;f*4!}01DCa=%5qwP+_df_55QRH7Wd^Xemj5~VNlrKJ#`IrqvgM`4x48gq5zW=??
zPr3f7*cMb^vm&2-U1jS{q{3wF2Hmqh9~m%G`SC=0gIX`OGDwwwT6S{o
zdohgdgGx=25_oR&_Q2PZaQl^_c%r=fliAQEvj3n=HQGf0o;c~CLxE}p^AhsfXL_}J
z_-O>Zq+n_Q*VThixRv{&;$YaL1a6(EwRi$%__iI`f-Dp-F#rfJq_K(k$l+S6XzN&|
z^h!*&k!8xXqs4`3`1?J1rf3=#41d&UR|Od;6G2%&56I9|nQYF>D6Xb7t_&9YtZQCJ
z7`u;O&B$r+Ah`${`}yVDSv)6`O&uYOZ84jx^U1$ESu$f`LQ}W(Bsua=#xqK-y)ni6
zJWhZ^xKsd(iCme6&
z(_=^0Uo+g9e$}BqMGeC(D3(>qssmS}U*~OyZ$780iS61vfyF--Qvd&>s_P7A^Z(wD
zReN^WqqM4M)ZS4P^|h+QsM!)~tC+PnwOUFlW+|mcs1+;rUTtkk#0ZKI)Ts4;{NDXv
z<;r#C#q;?*XWZvL=RWa=Q9kWs{ju-+z=54-TX6E9bJqd)ragkN_8d}T+$pJ+$+Y3l
z-S;{nm*K3^eZ=qb1VDwm0ehIj>*d*EAs*AbmVD3;U@c9~b8~ZThhYl^gI2zAAZded
zVDj0qW+s#JS_R)n(+QCa*Eq!7BkoBR4ZgoB@8A>gJpQ2fPT0%KBPEGB*tb^wbVqGi
zeBqGo`UwUAI<>NU*2xraGBQrq2dG@w(U)v0asfNog?YgbsEhcO_x^feZuY!fCnq9b
zT+L(V%;d`ATuwJC;n=ZE8uNL_T4;+K7YSJi>-oy8wG17=Ttc8>T?2h3QABI0(t6f;
z)92&M`ETQDC!lmsbK1>ZEzG?`!_qQ)=O4&$krQ_VpAOx`lBoZ7hX}SL28?tq3&{E~
zdJ`u0Rb=2-2G2l_pPn_)=#^MU`L0AVDmIpCpAtBN9z&pxu;`MN*5?>eL)xddO|O3G
zf5WMe?QCt50gw8(Nu7Y^=KePdT7|c*pnEGl!BedDG3n~>+ddkn@iOk*iD*_D@W!Bj~}_|VFY$qZXoy`VeEudZ0*{m
zca_@Z6ni^5#VGH<3*>7$Y@
z(CgC{*7n=qt*dHgi^VEHM^~5JoTTL^;nD1cf+Qj$a&q~Gq6pxP(sY1B6`$$6-7*9
z@qQfY(R5KQEn^ZxlH+#kQ
z8JDQ|V!BBu;7);T5E}{7Vy_^G3^HCA$~}5y6!v=K*9}6sE7&ET{P%lqTyK~D54efu
z#s@J#juF{;J!ifPXq|3t0ZGuRDSe@|GPzld6@CuZ1`(!~g8yE&XtOdIWf^8&s;|fW
zcQ7ZB5Maf*lyvj+z=kg3O*z;7-DGkx6U)xtrpcZ|Q|@+Gnt?c0@k=P+**$=0S*x`>
zh%0qoGgrkVQ+-NBS}RTx_Abj=QMugYZ`KM2*NpV$B2+yjz)Usvw`F{1AQ
z4q8xVd_xCBVBiF9Okq!K5!+{{=?Z4`qMmT}To!OvS7Bw=XI~0^xE_be|LV~9DVGiu
z21%x*utqoOu!chQsse3-PC}mdRxO;k3kC@%xu&rzz`(L-?545?#e(H}XfSqc`DE05
z$Xd0EOAQH&(gz#aYIpn)5Soh|9hcEtGg5!^SEtA74M61abyXJEa`si=j2C5BA72cL
zCPbPNBkv=i+#3Owo_AT(1qu}DSDf%3
z=Hc6V9VQlZA>$;roya4=%1@Z`Ky&YDC;-@KNpYvSH&Y^tB+VIE4_8bb|D=*ICs6U)
zFs?;S(cvkThzg@8YQi~^XoSH1;GL4T;J8ZxN@*zF!B&LrSkvK^AC@3kmn{fbxv5%2
zxK-jWj3|hbP*7z7b!|l+yNe6Bc`{Z;w;(=$>K(Gp!L*B52eE^wI0QbTUZ{#=)n@cI
zGcgX^GPFEr*X|!emKSWAbg)Z6H*7GPqynjD{-nUWKoR#fY!3T4gN~27Q}*o`aQJYi
z-m_OnQrq
zkpT7(5G`jGb9|`Of>%uGpX`UJWd)CC*}jh^Z`=4JRrBDS^tryJc}htV@|_!oZDhzy
zjueX8ZrASV0z%GYq3y?0p8MPDap%f`%#8=!RrlPW8-IBgLgL{oLXBzRC5`8;XNJqIdU_rIxOQcmR`Kyu#PsRUo%@NyV`3S2se?
zW$i8CCpoo_w$3`|27y5B<705jq{6-w?cMh2(7<{x34vRLMdn6l4f5lPd6h@hvU9>Y
z`+Xl?eCMenWRlPjtOpuE1UYEc99e%zxT$+lyy#KYL^WB&u@idx>vTtGpu2USgA5^G
zHQ70yhdUrdC;hSWDVa%i%u`W|{xBlBlEM*R4;}GHv`*Ac1h6hj68s#eSSmi7RX!&U
zpRm_elET7ATDsn1Sl$KI3XlM?3`F0?oDyxs$R{k+dU*X{?bi(R$lr|6vX`9Fl_x{3
zD{#d7>@;eiNL1D!T}4jr=r-UOsaB~Cnj2UliQRxkd^`k64mrXYO{aQD!;1>}yuUzK{2SWkyI
zXr`bJRysDt6HZ9~O(%BRkV!L2ZGIZ#u(CXgPXDj{GGKVUg-=Rw_f!aXOVme6pJ?pj~)vE3gWSR6yzEB)*=lE!(jG3&W2;sf$ohXNF%-pUHUy
zaPIA~MO0^w0=oVjo0YBtWFeUw!f{qhpfLW%_XV$(a|WyNRW|WqUZDE>LN=;gN?Xy)
z>)=6my@ybW%xfqU3Z7Xp@z>NcK(^7Dt>soEZkp)DAYQDo1-4}t3H-xBv12^?Q>wkUJ$|9
zm#>x`nX%>aAv-O0U=@Pft=9qgdJ!XGLwr^SuX(&T9lmj(px16VW`FTm_k`pz-ln>M
zWDSr1n=h4bJ#?el_|g6Ja5X_sLTSRqw(L%1?%yv=zKNXnADp-r$@KIsGj}j<+dYQo
zJ0n8uq2-0;5vi<_m_>|NiLr=p3!((S`+BkY!-^>JnHk{ll~_
z*LCg27=4|@I6AdhCRhgnfw@rns^Z-!lNg|DJTttEtmZaz>L(rf;f%KD-meu~2ShnH
z4z)Z?KucK@Z&2xfRlBG^NvJ^7=dE?a&^{copP#B5dM-&cVC(A)@$(J$dRYPRY7&HN
z`fsJ9n!jJgV-Q#BY%oIXGdGM>xi4?UtWIZpOU@x3ZDARfua$%p^=E-$rh!D#N0dLT
zXsFF##fD&}fCMV=+v+l@b(6QvTJBl&e&R##ugB!+)K~QXa*k8EaHCaZzAkVoslf@g
zEdAh&da2sGpic%!phwrFMX9p6l_Rz}s}dRyxMC(!)E;}>g|9W-6Z&S2M*r{-YgVNiG}kqi=k=G~u2SBDNi#
z4&EYd-vHxW$;J3vH^)VWoM;dz$kpFwQU4mXxSaL~UA>*alYg=V5{2lFRdG*8p`hO^
zv8)55hN*$qxf^RW31zeG+W#=6&xK@z8prwr?9bp_t~~*`{g+a^7evw@)cSxcDLOm1
z@9oenut;dO5WqsEQOsOig9!dXk7)z*7ctO}xqmJ8Ka=mXj~O~CU;*BJZe_hs_)gr=
z;5F7EC2*+b0(-Y4!a~ICnz>l(U$aR)i5wT+_0aZ~rN>PEnnKFUgIS+_8vXj9zb@vN
zmQ&NyeZO3|`+DxQVXN#V{e01?1FE9~Hj@7mv#At6b2*TBI7?#b?gf81c_-{W+#<5vfV^#d$S~y$
z8GD%siLfh{?LH0OTEB67YpeOwxZ@s=o>^1eAME-RqK3xa?II@7w4_4J>H3T(QS14^
z^ZXSv#l3q6Wv#&{20gTGStP&&4+n`Uh1W;nz0~nu6H7_cL!^UVHog6`2ffb6@raR-
zjzYVCEbh^FqB
z)B;7NeeU2`OTd>*WwTyS-gOnOq&dhi2z+|VRR@jD5Y6J}|r?OohvkdM5cxCLb@
z?URwVW*3&!9C>@E%MUV&j
z8qC()G0E447;LwSi*-`(6fVU1MX3}vejfB8_#+)MN4JQZ3jUid$e6|B&?j~nEhoXJ
zWNfB;$2Z_^)r)j;`FQCZlD(rVM|>-q^6>3ZWd}-a^Zt8=_(*Ho#MT}A8z^IUp6UM31<)5_!oGwCW+L`^O?MTN28uS5s-En
z4(?wOH{uR0N4g@h0pi*IOLJ$U`%A}~;98gkadozZh`W%-Q8xRC$_tq!jh7q>c|8Ucu&sXG#>Cd9-e+)dTeJ$<6vqd$9%mbN=cbS
z9Vj*BDd_WXlCbjJN(AZaNJ}OSSt*M*N|_e9VI`XJ%~Fb*sV^dvdX!)v1CHkz;8>k-
zvj)LEi}_%MJlOit^S*^l*QC=A>n6=)6~+vqS9N`Eelv25-sJeXo9CTRuqBM
zvw9G4pjcbWQ}3B8qT5%g-HJYf4I+`3FgrmIN##mZ0hdui70{o23VA%7J+y3Td6``s
zxh;r?p;>GS_6*&+G^)FYAKbeh&~eDJgSNjg1JC92%=k^ZY;KHml#icLIf5PSUDVzO
zYgVSK_6OaeCb@YfMV=)MzlubC|7eX=L6QgGQ>g*MoV&{l9(?YIwu$XW9b*ge*;dg$=ga^Cu^7=DO#;
z5Hej+_V|og(0~D&N_f}Xrx2f-?DTCf=$^C|y__`tnt;Ok;>tjri8&emYw&00GgTGK
zQ^5_kDH5nh!Xp&6A<@a_`_Jitr%c;5gU%+?Z_uNKEQw{!xQVvw)AjO~-@0HN%&YAc
z4Lfs*<;WQ^z)Z}zw^@oc)yZu{eRWXvAe3z3idXbKpdP_0?DXBja`{#9-mjth@-PX>
ztET3Snq^6>mg)V?AORo~WJkr&Nm>qV4w(}9B-cp~Rvd#2A;POSLSzz>cdFS9BulRR
z$28Z?$n<@MvVolVX3BeFx=(}2#i$KdM(fIxIKOt|)>T*+yI|_hxQBJX9m*nZMYV}~
z^QRu~PgLo1Yq)?!^@)0}KTh1Znc}fE0i_X;z2`hYeV95QPx8g37IOvv;jk&N^$RYK
zYSvAmi0#Tic+qLdLTom~tkP|>?OTrc2ZHli;MkHP+5bh}KiunTc&As#d4g5SGY{}0
zSM4$Q2Edrp@6r2;pySEH%`m$qKe7B8Cm8K-(r+ku2x|nb>-eO+i63cw>}2GN`#IEm
zuLx{Ys@tL_JUqi$*~%HjbdgtvU(HsCUvxd+0K$^eF!J-@N>5ap)3$7r=kdCJ@$Ab#
z-6NbeS(mIyH$7EoiGkR&PA>J(KQzLwtLmu&;THevTqTC8NAU+?Q#H#dEt+|c=%xz8
zn^r#ZDJa(Gg7^~5{Xe@)&hz8Zw_f%?>DjSFIVGT02*mtwXA=>Xkz1EKhO*&l_
zO-2umpN1W6b)kR=WnWUvol!cz(Z)81k#CTUvdaEJ-AlJG&*EB`agaNRc56SH9(BTS
z$Ba^XBSq87<7AMubk?B5{Wz#R?mdCm@V!JF6mrv|4nv@5WYGANbQGHWr>z7wo~E^+
z5I=z6U%siTwuQLBR89>zs#J_myV(EqQ+gHDrYuT{(g)BGH^a?4+ya}Y3q-U~q0U3i(C$1U_ny;kuZ{%Al7yUjnc2>+n$WV=Fsu=214FguGWtQ;^iHc(U@#7|R|*B&DSy-4tKNz>%da>-y0Q7Q
zO$&W9KX=sqTJ~sfUFEb`ZhiZ}VaS5p%N32%>6m4pTm7Wjp;$Rey^%8&osH`2&+-7k
z=5(KN=E|;5BZ-__>|otmvgUUUgp`en@2tA-y>oM6o@dj4l2L(9vPZtJ6@nbz%DpZ^
zXC(#IEH^3&@@_aLC(F*yjaZ)hLh(_&Hu&U)HC1=}2tjik
ze`ScqU$4AP^@(?g+l;$ilb`jka`Kvq(yf6YGa4|#Y_1dw80I$c+ctw=O0jF_z948C
zWN4-EWPPg=vm#1m=+#x~vbhN8`mS6b@^(M7L_CjV*VL+hO`TWVY83(EGHPQ#z1vpe
zck*7bVbifJBWK7X6!oU}aWk!4+DEsiH(@pSSl08PL#U2k;~j@5h3gb_uipZ(IxYdm
z)nH%>3jk}jtGDiD>%%G6{ZbHr{=mcd77~JAW1Jtfr$JPuu=efDrw;SA{#3cg>bkVNIz7It
z>)AKx?1>V(T-+WJ%Hj%fsmUAHU?P9Xe$M;oU;fV~lMzwy&kX==4gH7ZYSv-@2S2|Q
A#{d8T
literal 25513
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