diff --git a/data/base-healingherbs.yaml b/data/base-healingherbs.yaml index f4ec7c1fa2..63aef93b77 100644 --- a/data/base-healingherbs.yaml +++ b/data/base-healingherbs.yaml @@ -1,4 +1,6 @@ -### Added Riverhaven(uses Lang shop as primary) ### +### Added Riverhaven(uses Lang shop as primary) ### 10/27/24 +### Added Ratha (Thanks to Sharkbait!) ### + herb_stocks: Crossing: - name: jadice flower @@ -353,7 +355,7 @@ herb_stocks: room: 8666 price: 750 quantity: 7 - - name: blocil potion + - name: blocil potion location: Riverhaven size: 6 stackable: true @@ -423,3 +425,130 @@ herb_stocks: room: 8666 price: 500 quantity: 19 + Ratha: + - name: jadice flower + size: 6 + stackable: false + room: 7203 + price: 617 + quantity: 20 + - name: plovik leaf + size: 6 + stackable: false + room: 7203 + price: 617 + quantity: 20 + - name: nilos salve + size: 6 + stackable: false + room: 7203 + price: 617 + quantity: 10 + - name: hulnik grass + size: 6 + stackable: false + room: 7203 + price: 617 + quantity: 10 + - name: nemoih root + size: 6 + stackable: false + room: 7203 + price: 665 + quantity: 10 + - name: georin salve + size: 6 + stackable: false + room: 7203 + price: 665 + quantity: 10 + - name: sufil sap + size: 6 + stackable: false + room: 7203 + price: 665 + quantity: 10 + - name: yelith root + size: 6 + stackable: false + room: 7203 + price: 712 + quantity: 20 + - name: ithor potion + size: 6 + stackable: false + room: 7203 + price: 712 + quantity: 20 + - name: muljin sap + size: 6 + stackable: false + room: 7203 + price: 712 + quantity: 10 + - name: junliar stem + size: 6 + stackable: false + room: 7203 + price: 712 + quantity: 10 + - name: blocil potion + size: 6 + stackable: false + room: 7203 + price: 937 + quantity: 6 + - name: riolur leaf + size: 6 + stackable: false + room: 7203 + price: 760 + quantity: 10 + - name: qun pollen + size: 6 + stackable: false + room: 7203 + price: 427 + quantity: 12 + - name: genich stem + size: 6 + stackable: false + room: 7203 + price: 427 + quantity: 12 + - name: nuloe stem + size: 6 + stackable: false + room: 7203 + price: 475 + quantity: 10 + - name: cebi root + size: 6 + stackable: false + room: 7203 + price: 475 + quantity: 10 + - name: hulij elixir + size: 6 + stackable: false + room: 7203 + price: 475 + quantity: 12 + - name: hisan salve + size: 6 + stackable: false + room: 7203 + price: 570 + quantity: 10 + - name: jadice pollen + size: 6 + stackable: false + room: 7203 + price: 475 + quantity: 10 + - name: ojhenik potion + size: 6 + stackable: false + room: 7203 + price: 475 + quantity: 12 diff --git a/data/base-sorting.yaml b/data/base-sorting.yaml index 478bbd3cc9..960e7fcef5 100644 --- a/data/base-sorting.yaml +++ b/data/base-sorting.yaml @@ -1,10 +1,651 @@ -cambrinth: +### 10/27/24 - New and Reorganized Categories. Regex condensed entries. New items added. +### Note: The categories that have the '_nouns' suffix populate same-named categories without the suffix. +### So “clothing” and “clothing_nouns” will overlap and both populate the “clothing" list. +### The '_nouns' sections are the end of the file. +### +### Items not caught in the _nouns categories correctly can be added into their counterparts. +### The easiest way for sorter to catch it seems to be, for example: +### Text a perfectly smooth sphere of blued moonsilver +### Regex (perfectly.)?smooth sphere(.of)?(.blued)?(.moonsilver)? +appearance: +- pair of slender silver bands +- warped glass vial +- peacock blue beard glitter +- small ebony wardrobe(.carved with a whimsical design of dancing fae)? +- small Seed(.of)?(.Entropy)?(.wrought)?(.from)?(.purple gold)? +- trio of multihued moons +music: +- zills +- cowbell +- chamois cloth +pilgrim badge: +- pilgrim\'s badge +### GEAR ### +gear - armour: +- contoured demonscale mask darkened +- tapered demonscale helm(.darkened)?(. to a deep abyssal black)? +- sleek shirt(.embroidered with writhing tel'athi vipers)? +gear - brawling: +- animite shackle +- Dwarven iron bracer +- handwraps +- forearm wrap +- footwraps +- hand claws +- parry stick +- (?:elbow|knee) (?:blades|wraps|spikes) +- knuckles +- knuckleguards +- stomping boots +- reinforced leather armguard(.with blackened steel riveting)? +gear - shield: +- dented pot lid(.dappled with scorch marks)? +gear - weapon: +- farmer's hand sickle(.composed of iron)? +- darkstone longsword(.trailing wraith-bone ringlets)?(.from the pommel)? +### CLOTHING ### +clothing: +- cuffed oilcloth boots bound by wide ties +- Katamba\-black dergatine odaj.* +- scorched leather beard guard +- fitted shirt(.of)?(.celadon)?(.Elven)?(.wool)?(.buttoned)?(.with)?(.silver)? +clothing - hiders: +- heavily stained alchemist's robe +clothing - skates: +- skates +clothing - wings: +- .*wings.* +### CONTAINERS ### +container: +- .*dergatine backpack enmeshed +- shimmery cloth-of-gold gamebag +container - autolooter: +- loot(?:sack|pouch|belt) +- spidersilk clutch +- pearlescent shagreen belt bag +container - hold anything: +- abyssal black thigh bag +- spidersilk hip pouch +- Elven wool thigh pouch +container - vault storage: +- (?:bottom|middle|top) drawer +- brass hook +- steel wire rack +- (?:small|large) shelf +### CONTAINER - STACKERS ### +stacker - crafting: +- torch cluster bundled +- rough burlap pouch(.painted with a basalt runestone)? +stacker - dirt: +- (scruffy.)?jadeleaf(.arm)?.pouch(.with an acenite clasp)? +- soft suede (?:pouch|pouch with knotted vine cords) +- sleek moonsilk thigh bag(.with a tursa buckle)? +- polished ebony pillbox(.with a fine silver chain)? +- stained leather bag(.with fraying cord straps)? +stacker - herbs: +- (?:foraging|herb(al)?).(?:apron|case|pouch) +stacker - lockpicks: +- lockpick (?:ring|wristcuff) +- wavy.*spiral +stacker - scrolls: +- abyssal-black codex +- petite dark blue tome +- poke .* +- booklet +- carmine codex +- scroll case +- papers +- folio +- folio graced +- faceted crystal-bound tome boasting a rainbow sapphire dragon +- yellow notebook +- worn book +- eventide-hued tome boldly +- compact scroll folio shaded slate grey +- (?:gold swirled|swirled|slim sluagh-hide) codex +- stormy grey scroll case(.composed of matte thornweave)? +- star-streaked midnight black sack fastened with an obsidian murder crow +### CRAFTING ### +crafting - general: +- waist strap for a crafting instruction book +- laborer's drab cotton odaj +- forger's belt +- toolbelt +- packet of deed claim forms +- instructions +- arrow flights? +- backer +- backing +- borax flux +- bow string +- cleaning cloth +- cloth padding +- cotton thread +- deed register +- flask of oil +- grain alcohol +- haft +- leather cord +- leather strips? +- mechanisms +- packet +- salts +- stamp +- tanning lotion +- tool catalog +- totem +- water +- basic runestone +- (?:burlap|cotton|linen|silk|wool) cloth +- lumber +- (?:Adder|Aesetani applewood|Aformosia|Albarco|Alder|Alerce|Apple|Ash|Aspen|Avodire|Azurelle|Balsa|Bamboo|Birch|Bloodwood|Bocote|Cedar|Cherry|Copperwood|Crabwood|Cypress|Darkspine|Diamondwood|Dragonwood|Durian|Ebony|E'erdream|Elm|Felwood|Finivire|Fir|Glitvire|Gloomwood|Goldwood|Greenheart|Hemlock|Hickory|Ilomba|Iroko|Ironwood|Kapok|Larch|Lelori|Lirisan|Macawood|Mahogany|Mangrove|Maple|Mistwood|Moabi|Oak|Osage|Pine|Ramin|Redwood|Rockwood|Rosewood|Sandalwood|Shadowbark|Silverwood|Smokewood|Spruce|Tamarak|Tamboti|Teak|Walnut|Willow|Yew|Zingana) (?:stick|branch|limb|log) +- bone +- (?:Alabaster|Andesite|Anjisis|Basalt|Belzune|Blackwater jet|Breccia|Diamondique|Dolomite|Felstone|Fulginode|Gabbro|Granite|Jade|Limestone|Marble|Obsidian|Onyx|Pumice|Quartzite|Sandstone|Schist|Senci|Serpentine|Soapstone|Travertine|Xenomite) (?:rocks|rock|stone|boulder|pebble) +- ingot +- yarn +crafting - alchemy tools: +- alchemy work order logbook +- large.*bowl +- mortar +- pestle +- mixing (?:bowl|stick) +- sieve +- heavy cauldron +crafting - enchanting tools: +- brazier +- burin +- enchanting work order logbook +- fount +- imbue.* rod +- imbue.*rod +- loop +- sigil (?:tome|book|volume) +- sigil-.* +- large.*tome +crafting - engineering tools: +- bone saw +- carving knife +- chisels +- clamps +- drawknife +- engineering work order logbook +- metal clamps? +- rasp +- rifflers +- tinker's tools +- woodcutting saw +- wood glue +- wood shaper +- wood stain +crafting - forging tools: +- (?:aldamdin|audrualm|ball-peen|Blacksmith's|cross-peen|damite|diagonal-peen|forging|straight-peen|Silversteel-faced|tomiek) (?:hammer|mallet) +- (?:Aldamdin|curved|damite|Glaes-edged|Kertig|square|tapered|Tomiek|triple-fluted|Tyrium|wide).*shovel +- bellows +- forging work order logbook +- pliers +- stirring rod +- tongs +- wire brush +crafting - outfitting tools: +- awl +- hide scraper +- knitting needles +- outfitting work order logbook +- pins +- sewing needles +- scissors +- slickstone +- yardstick +- distaff +- small darkened blade +### ESTATE HOLDER AND HOUSE ### +estate holder: +- (?:bank|vault|darkened leather).book +- platinum sigil +estate holder - home and furniture: +- miniature hay bale +- pair of iron sconces +- furniture voucher +- circle +- decorative volcanic rocks +- windchime +- pile +- pillow +- pile of clay limbs +- garland of gaethzen orbs +- furniture voucher +### MAGICAL ### +magical: +- glass egg +- glass octahedron +- glowing starstone +- potency crystal +- infuser stone +- dark leather wallet +- oily sea-green potion +- .*wand.* +- dried gourd rattle +- rose-colored vial +- golden bangle +- worm charm +- sanguine-stained verdant heart +magical - cambrinth: - .*cambrinth.* +- sturdy belt(.dangling thirty-nine cambrinth disks)? +- ^armband(.displaying an array of cambrinth lotus flowers)? +- dusty traveler's backpack +- rugged fractalline hip pouch +- plain homespun arm pouch +- tattered aubergine robe(.covered in cambrinth\-beaded symbols)? +magical - food generator: +- ^yellow pouch(.embroidered with many ears of corn)? +- ^red pouch(.embroidered with a pork chop)? +- brightly painted box(.with many happy\-looking animals)? +magical - gaethzen: +- .*gaethzen.* +- shielded gaethzen lantern +magical - ritual focus: +- tyrium Elemental Dragon(.with eyes of lightning amethyst)? +- ka'hurst havri'negh emblem(.inlaid with an intricate geometric design)? +- (flat)?(.rosewood)?.effigy pipe(.ornamented by a small plump animal)? +- lifelike anatomical heart(.carved from bloodmist garnet)? +- vela'tohr plant lifesculpted +- wizened Life Dragon(.carved from verdant lirisan)? +- platinum triquetra(.interlaced with a circle of blue gold)? +- brooch.(of knotted brass)?(.accented with malachite and rose quartz)? +- fine necklace(.of golden discs interspersed between lapis lazuli shapes)? +- wooden toy soldier(.holding an abnormally large shield)? +- (clockwork.)?armillary sphere(.with golden rings)? +- howling wolf(.carved from eventide moonstone)? +- nightfire opal charm inscribed with a simple moon +- pallid ouroboros ring(.carved from dreamstone)? +- obsidian-tipped arrow(.with a broken shaft)? +- small bronze compass(.etched with a series of circular sigils)? +- double ouroboros amulet(.carved from dreamstone)? +### MATERIALS ### +material: +- (?:fibrous|tiny).*icon of.*(strands)? +- chunk of.* +material - alteration: +- windsteel (?:boulder|clump) +- spiritwood (?:branch|limb) +- (?:short|long|massive) plank +- perfectly smooth sphere +- (perfectly.)?smooth sphere(.of)?(.blued)?(.moonsilver)? +- (blued.)?moonsilver sphere +material - cassava: +- cassava root cradled +- cassava +material - chakrel: +- .*chakrel.* +material - soulstone: +- soulstone +- palladium war (?:belt|belt set with a central soulstone) +- braided diamond-hide (?:baldric| baldric with a soulstone and animite buckle) +### TOYS & FLUFF ### +toy: +- abacus +- dark chocolate\-hued dream pillow +- roly\-poly dragon doll(.wearing a fuzzy red hat)? +- shiny green togball(.embellished with iridescent gold ink)? +toy - collectibles: +- cards? +- dira +toy - fire and smoke: +- (?:black|dark piece of polished) flint +- goatskin pouch +- tobacco pouch +toy - writing: +- quill +- (?:writing|companion).slate +toy - pet: +- assassin bug +- beetle +- birdeater +- centipede +- lizard +- mantis +- scorpion +- spider +- tarantula +- wheel bug +- woodlouse hunter +- soft woven sack +- glittery\s.*\sblob(.formed from fine silky sand)? +### TRAINERS ### +trainer: +- (?:keepsake|training|jewelry) box +- weave climbing rope +- dark leather pouch +- .*liquor cabinet +- sanowret crystal +trainer - textbooks: +- textbook +- gilded guidebook +- battered field guide(.with a worn leather cover)? +- glossy black leather textbook with gold script on the front +- massive codex +- black and gold swirled codex crafted from wood +- carmine codex featuring a stitched cover +- large square atlas +- simple blue compendium +### VALUABLE ### +valuable: +- bloodscrip +- boarding pass +- coins? +- concise contract +- dueling slip +- map +- memory orb +- note +- package +- pass +- permit +- profile +- sealed writ +- Su Helmas contract +- mirror-finish memory orb of polished telothian +valuable - collection pieces: +- (?:moonsilver|platinum) chain +- unembellished ring +- (?:ruby|onyx|sapphire) chunk +- (?:heavy|long|curved|short) (?:blade|handle|pommel) +- (?:large|medium|small) (?:cover|grip|rim) +- star-streaked midnight black (?:sack|sack fastened with an obsidian murder crow) +valuable - gem pouch: +- gem pouch +valuable - rare gems: +- Amlothite +- Cloudstone +- Dawgolite +- Durgauldite +- Elanthite +- Er'qutrite +- Estrildite +- Grazhite +- Hav'roth's Ambrosia +- Ismenite +- Katambite +- Merewaldite +- Penhetite +- Sphere of polished coral banded with sunrise hues +- Syrin's heart +- Szeldite +- Verenite +- Xibarite +- Yavasite +- Yoakenite +- pure .* tarina +- (?:Dragonvein|Fire|Inkdrop|Mountain|Plumed) agate +- (?:Orchid|Viperscale) alexandrite +- (?:Dragonfire|Dragon's blood|Drake's heart) amber +- (?:Lightning|Violet's Heart) amethyst +- Tiger lily carnelian +- (?:Chaos|Mermaid's) chalcedony +- Volcano's Heart citrine +- Imperial coral +- (?:Black assassin's|Black|Blue|Champagne|Dalterein|Fortune's Star|Huntress|Lilac|Midnight|Molten\-core|Night|Ocean's Heart|Pink|Red|Royal star|Scorpion|Sea|Smoky|White) diamond +- (?:Absinthe|Bearclaw|Crimson|Glacier|Ilithi|Nature's Canopy|Ocean's Deep|Red|Scarlet|Shadow|Siato star|Spring|Taisidon|Winter) emerald +- (?:Bloodmist|Demantoid|Forest's Heart|Nimbus|Plum|Taisidon sunset) garnet +- Bleeding heart jade +- (?:Autumn|Forest fire|Ocean|Spiderweb|Sunstar|Wild Horse) jasper +- (?:Blackwater|Riverhaven) jet +- Hekemhhg lazuli +- Eventide moonstone +- (?:Grazhir's|Midnight) onyx +- (?:Aurora|Black|Cherry|Chocolate|Dendritic|Draconic|Dragon Fire|Firesilk|Flame|Frost Flare|Frost|Frostfire|Frostflare|Nightfire|Sky|Sunset|Water|Winter) opal +- (?:Baroque|Dafora|Damaryn|Damilyo|Ebon Jackal's Heart|Fang|Fire|Frost|Geshi|Idopun|Moon|Pitch|Taisidonian|Talan) pearl +- (?:Blood|Cloud|Conquerer's|Dragon's Blood|Dragon's Eye|Dragon's Heart|Gemfire|Grapefruit|Imperial|Merlot|Midnight|Moonspun|Serpent's Heart|Smoke|Star|Starlight|Teiro's Hate|Vengeance) ruby +- (?:Crimson|Dalaeji black|Dragon's scale|Drogor's Wrath|Duskbloom|Elamiri|Eluned's tear|Haze|Ice|Idon's|Imperial|Lotus Flower|Mermaid's Tear|Musparan Gold|Phantom|Rainbow|Serpent's head|Shrike's Eye|Star|Summer's Heart|Tempest|Twilight|Viper's eye|Zoluren White) sapphire +- (?:Dusk|Katamba|Unicorn|Zenith) spinel +- (?:Fire Maiden topaz|Golden|Imperial|Lava|Lion's Heart|Mystic|Saffron|Smoky|Starfire|Stormfire|Stormheart|Xibar|Zoluren Royal) topaz +- (?:Aurora|Reshalian|Seastar|Vela'tohr|Watermelon) tourmaline +- (?:Jungle|Cloud) turquoise -container: +### GENERAL ### +herbs: +- blocil berries +- (?:blue|hisan|jadice|red) flower +- (?:georin|hulnik|nilos) grass +- (?:aevaes|aloe|hulij|plovik|riolur) leaves +- (?:belradi|eghmok) moss +- (?:jadice|qun) pollen +- (?:cebi|ithor|lujeakave|nemoih|ojhenik|yelith) root +- (?:dioica|muljin|sufil) sap +- (?:genich|junliar|nuloe) stem +- seolarn weed +- (?:dried|crushed) aevaes +- (?:dried|crushed) aloe +- (?:dried|crushed) belradi +- (?:dried|crushed) blocil +- (?:dried|crushed) blue flowers? +- (?:dried|crushed) cebi +- (?:dried|crushed) dioica +- (?:dried|crushed) eghmok +- (?:dried|crushed) genich +- (?:dried|crushed) georin +- (?:dried|crushed) hisan +- (?:dried|crushed) hulij +- (?:dried|crushed) hulnik +- (?:dried|crushed) ithor +- (?:dried|crushed) jadice +- (?:dried|crushed) junliar +- (?:dried|crushed) lujeakave +- (?:dried|crushed) muljin +- (?:dried|crushed) nemoih +- (?:dried|crushed) nilos +- (?:dried|crushed) nuloe +- (?:dried|crushed) ojhenik +- (?:dried|crushed) plovik +- (?:dried|crushed) qun +- (?:dried|crushed) red flowers? +- (?:dried|crushed) riolur +- (?:dried|crushed) seolarn +- (?:dried|crushed) sufil +- (?:dried|crushed) yelith +ammunition_nouns: +- bolts? +- arrows? +- rocks? +- (?:balanced|elongated|smooth) .* stones? +- blowgun darts? +- blunt(-tipped)?\s(stone|arrow|bolt)s? +- frost-white shards? +gear - armour_nouns: +- armet +- armor +- aventail +- balaclava +- bascinet +- breastplate +- chain mail +- chain shirt +- cowl +- double chain +- double leather +- doublet +- fauld +- full plate +- gauntlets +- gloves +- greathelm +- greaves +- half plate +- hauberk +- helm +- jerkin +- leathers +- legguards +- mantlet +- mask +- battle odaj +- plate +- robes +- tasset +- vambraces +appearance_nouns: +- brush +- comb +- mirror +box_nouns: +- coffer +- strongbox +- chest +- caddy +- trunk +- casket +- skippet +- crate +- \bbox\b +clothing_nouns: +- alpargatas +- alb +- apron +- armband +- ascot +- ashcloak +- aumusse +- balac +- baldric +- ballgown +- bandana +- bloomers +- blouse +- boa +- bodice +- bodysuit +- boots +- bowtie +- belt +- beret +- bilaud +- blindfold +- boutonniere +- brace pad +- breeches +- britches +- brogans +- burnoose +- bustier +- cap +- cape +- cassock +- catils +- chemise +- cheongsam +- chola top +- cloak +- clogs +- coat +- walking coat finely +- coinec +- corsage +- costume +- cowl +- cravat +- crown +- cufflinks +- cyclas +- doublet +- dress +- ears +- eyepatch +- fedora +- frock +- galoshes +- gamantang +- garland +- garter +- gerri +- gloves +- goggles +- gown +- greatcloak +- greatcloak accented down +- greatkilt +- hat +- headband +- headdress +- headscarf +- hood +- ilalish +- jacket +- jersey +- jumper +- kerchief +- kilt +- kimono +- kirtle +- knickers +- leggings +- loincloth +- longcoat +- mantle +- mask +- moccasins +- mules +- mra'sin +- nightgown +- odaj +- outfit +- overalls +- overcoat +- pantaloons +- pants +- pinafore +- poncho +- Pr'mra'sin +- Pr'ysin +- prayer beads +- rantija +- ribbon +- robe +- ruven +- sandals +- sarong +- sash +- scarf +- shawl +- shift +- shirt +- shoes +- shroud +- skirt +- skullcap +- sleeves +- slippers +- sochi +- socks +- spats +- spectacles +- stockings +- stole +- sunbonnet +- sundress +- surcoat +- suspenders +- tabard +- tailcoat +- tail drape +- tartan tam +- tunic +- turban +- tutu +- trews +- tricorn +- trousers +- heavy golden stitching +- uaro's'sugi +- uuzhal +- veil +- vest +- waistcoat +- wig +- wings +container_nouns: - arca -- backpack -- backtube +- back(?:pack|tube) - \bbags?\b - baldric - barrel @@ -16,6 +657,7 @@ container: - carton - \bcase\b - cauldron +- chest - container - duffel - feedbag @@ -26,7 +668,6 @@ container: - humidor - \bkit\b - knapsack -- lockpick ring - lootsack - moneybelt - \bpack\b @@ -38,18 +679,18 @@ container: - rucksack - rugursora - \bsack\b +- saddlebag - satchel - scabbard - sheath +- sidebag - skillet - toolbag - toolbox - \btote\b -- treasure chest - wallet - workbag - -jewelry: +jewelry_nouns: - amulet - anklet - badge @@ -73,132 +714,28 @@ jewelry: - pin - ring - /(? 140 - @hometown = 'Crossing' + if @hometown == 'Riverhaven' && DRSkill.getrank('Athletics') < 150 + echo "Cannot swim the Jantspyre River." + echo "You are athletic enough to handle herb shopping in Therengia." + exit end - if (@hometown != 'Crossing' && @hometown != 'Shard') && !(herbs_override_herbstock && user_herbs) - echo 'Only Crossing, Riverhaven (with over 140 Athletics), and Shard hometowns supported. You may provide Crossing or Shard as an argument to override your hometown.' + if (@hometown != 'Crossing' && @hometown != 'Shard' && @hometown != 'Riverhaven' && @hometown != 'Ratha') && !(herbs_override_herbstock && user_herbs) + echo 'Only Crossing, Riverhaven (150+ athletics), Ratha, and Shard hometowns supported. You may provide Crossing or Shard as an argument to override your hometown.' echo 'Alternatively, define custom herbs in your yaml\'s herbs setting and set herbs_override_herbstock to true.' exit end diff --git a/profiles/base.yaml b/profiles/base.yaml index e6faba2d0e..7f0cb91ac9 100644 --- a/profiles/base.yaml +++ b/profiles/base.yaml @@ -2555,6 +2555,13 @@ moonwatch_correct: false # generally releasing cyclics cyclic_no_release: +# Set a cyclic spell to segue to instead of releasing a cyclic when combat-trainer ends. +# Bard only setting. Must know how to segue. +# Strongly recommended to use a justice safe spell. Works best when the chosen spell is also in cyclic_no_release: +# Use the cyclic spell abbrevation. E.g. botf. The segue command's parser doesn't like full spell names. +segue_spell_on_stop: +segue_prep_on_stop: + # The number of seconds the `skill-recorder` script waits # between checking your guild, skills, and spells to know # things like if your Thief is qualified to use passages diff --git a/ranger-companion.lic b/ranger-companion.lic index 8f6788688b..c4ef6f71e9 100644 --- a/ranger-companion.lic +++ b/ranger-companion.lic @@ -1,4 +1,4 @@ -##Added Functionality for Wolves +# #Added Functionality for Wolves ### Requires a Red Meat Pouch =begin Documentation: https://elanthipedia.play.net/Lich_script_repository#ranger-companion @@ -9,7 +9,6 @@ custom_require.call(%w[common drinfomon]) no_pause_all class Companion - def initialize unless DRStats.ranger? echo '***MUST BE A RANGER***' @@ -21,7 +20,7 @@ class Companion exit end - while line = get + while (line = get) waitrt? # A baby wolf stands up then paces back and forth nervously. @@ -41,8 +40,7 @@ class Companion DRC.bput('pet raccoon', 'You pet', 'Touch what') end - - if line =~ /^A .*(young|full-grown) wolf begins to whimper./ + if line =~ /^A .*(young|full-grown) wolf begins to whimper./ pause 1 until DRC.pause_all waitrt? DRC.bput('stow left', 'Stow what', 'You put') @@ -50,35 +48,34 @@ class Companion when 'What were you referring to' DRC.bput('signal companion to sleep', 'wolf wanders off to find', 'Your companion is not', 'You have no companion', 'snapping your fingers') exit - end - case DRC.bput('get my meat', 'You get', 'What were you referring to') + end + case DRC.bput('get my meat', 'You get', 'What were you referring to') when 'What were you referring to' DRC.bput('signal companion to sleep', 'wolf wanders off to find', 'Your companion is not', 'You have no companion', 'snapping your fingers') - exit - end - case DRC.bput('smell my meat', 'notice a pungent but flavorful smell', 'notice a slight odor', 'almost gag from the stench') + exit + end + case DRC.bput('smell my meat', 'notice a pungent but flavorful smell', 'notice a slight odor', 'almost gag from the stench') when 'notice a pungent but flavorful smell' - case DRC.bput('feed my meat to wolf', 'wolf greedily devours', "It doesn't seem hungry", "You can't feed with", 'wolf shies away from you') + case DRC.bput('feed my meat to wolf', 'wolf greedily devours', "It doesn't seem hungry", "You can't feed with", 'wolf shies away from you') when 'wolf shies away from you' DRC.bput('feed my meat to second wolf', 'The baby wolf greedily drinks', "It doesn't seem hungry", "You can't feed with", 'wolf shies away from you') when "You can't feed with" DRC.bput('signal companion to sleep', 'wolf wanders off to find', 'Your companion is not', 'You have no companion', 'snapping your fingers') exit end - when 'notice a slight odor' + when 'notice a slight odor' DRC.bput('drop my meat', 'You drop', 'What were you referring to') - DRC.bput('signal companion to sleep', 'wolf wanders off to find', 'Your companion is not', 'You have no companion', 'snapping your fingers') + DRC.bput('signal companion to sleep', 'wolf wanders off to find', 'Your companion is not', 'You have no companion', 'snapping your fingers') exit - when 'almost gag from the stench' + when 'almost gag from the stench' DRC.bput('drop my meat', 'You drop', 'What were you referring to') - DRC.bput('signal companion to sleep', 'wolf wanders off to find', 'Your companion is not', 'You have no companion', 'snapping your fingers') + DRC.bput('signal companion to sleep', 'wolf wanders off to find', 'Your companion is not', 'You have no companion', 'snapping your fingers') exit - end + end DRC.unpause_all end - - - if line =~ /^A .*baby wolf begins to whimper./ + + if line =~ /^A .*baby wolf begins to whimper./ pause 1 until DRC.pause_all waitrt? DRC.bput('stow left', 'Stow what', 'You put') @@ -100,6 +97,7 @@ class Companion # Move to next loop iteration unless we see racoon whimpering next unless line =~ /^A .* raccoon begins to whimper./ + pause 1 until DRC.pause_all waitrt?