diff --git a/bin/findstopwords.py b/bin/findstopwords.py new file mode 100755 index 0000000..5c59226 --- /dev/null +++ b/bin/findstopwords.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 + +import sys +import itertools + +stopwordsfile = sys.argv[1] +puzzlefile = sys.argv[2] +with open(stopwordsfile) as f: + stopwords = f.read().strip().split("|", 1).pop().split(",") +#print(stopwords) +with open(puzzlefile) as f: + puzzles = [[list(c) for c in x.strip().split("|")[0].split(",")] for x in f.readlines() if ("#" not in x) and ("[eof]" not in x)] +for p in puzzles: + allwords = set(["".join(x) for x in list(itertools.product(*itertools.zip_longest(*p)))]) + for s in stopwords: + if s in allwords: + print(s, p) + else: + for w in allwords: + if s in w: + print(s, ["".join(x) for x in p]) + break diff --git a/res/levels/A b/res/levels/A index 4b3c28e..3a46d23 100644 --- a/res/levels/A +++ b/res/levels/A @@ -1,100 +1,100 @@ # 4x3, easy -CLSE,OIUK,DVEN|CLUE,DISK,OVEN +CLSE,OIUK,DVEN|CLUE,DISK,OVEN|PRESS ? FOR HELP VLLN,WIEK,PAAW|PLAN,VIEW,WALK TILW,KAEM,CNNY|CALM,KNEW,TINY -OANN,TNCG,HHAE|HANG,ONCE,THAN +EEEC,TPTE,BOIF|BEEF,EPIC,TOTE FBEE,UINO,ONDY|FINE,OBEY,UNDO IIAA,CDEL,DASE|CASE,DIAL,IDEA MEUN,THDS,NAOE|MADE,NEON,THUS GTAD,IAEH,MLTM|GLAD,ITEM,MATH -WILP,JRME,UUGL|JUMP,URGE,WILL +CAOF,LELN,DINY|CALF,DENY,LION VURS,DAYZ,FEZB|DAYS,FUZZ,VERB BIOM,CRTK,FACY|BACK,CITY,FROM MEMU,UGNB,TOLY|MENU,TOMB,UGLY ROSW,DIEM,CHAH|CHEW,DISH,ROAM ECVS,GNIE,AADD|ACID,ENDS,GAVE +UAIY,CNTO,TLAL|CLAY,TAIL,UNTO +ERKE,HIIT,DDAG|DRAG,EDIT,HIKE UIIK,KSEP,WHCR|KICK,USER,WHIP,WICK IECF,RHET,WTAH|ITCH,REEF,WHAT,WHET AADM,CWMS,SDIE|ADDS,CAME,SWIM,SAME MOUG,SRAH,BUCL|BRAG,MUCH,SOUL,SUCH DROK,EDRE,LUGP|DROP,EDGE,LURK,LURE -SRMG,DUOY,AONR|ARMY,DOOR,SUNG,SONG +OANN,TNCG,HHAE|HANG,ONCE,THAN,TANG +WILP,JRME,UUGL|JUMP,URGE,WILL,WIMP IIAB,HRDE,FLON|FLAB,HIDE,IRON,FLAN RIER,OEAS,HWCE|HEAR,OWES,RICE,REAR POIR,RUTN,KIOE|KITE,POOR,RUIN,ROTE MILO,EEMK,DNVY|DEMO,ENVY,MILK,MEMO CAAA,SRNE,APEN|AREA,CANE,SPAN,SANE -FAER,PVNP,OLAT|FLAP,OVER,PANT,FLAT OASD,PPEY,BUIN|BUSY,OPEN,PAID,PAIN ERWS,FCHO,ROEE|ECHO,FREE,ROWS,FOES -QUSH,POGZ,SIIE|POSE,QUIZ,SIGH,PUSH GEKF,DAIE,MRAP|DEAF,GRIP,MAKE,DRIP WNRF,KUGS,SIOW|KNOW,SURF,WIGS,SNOW TRCD,EOIT,AMLH|ARCH,EMIT,TOLD,ARID +FAER,PVNP,OLAT|FLAP,OVER,PANT,FLAT,PLAT +QUSH,POGZ,SIIE|POSE,QUIZ,SIGH,PUSH,POSH GITS,EOOY,FASD|EASY,FITS,GOOD,EATS,FOOD SEIR,OOET,TMUM|OMIT,SEEM,TOUR,SOUR,TOUT -BIZS,JAED,SLTZ|BLED,JAZZ,SITS,BITS,SLED -THOG,CMEE,SAGN|CAGE,SMOG,THEN,SAGE,SHOE +THOG,CMEE,SAGN|CAGE,SMOG,THEN,SAGE,SHOE,THEE EYLY,FAES,ONKE|EYES,FAKE,ONLY,OAKS,ONES -GUAF,RITS,LALR|GULF,LIAR,RATS,GALS,GUTS +GUAF,RITS,LALR|GULF,LIAR,RATS,GALS,GUTS,GITS,RUTS,LATS CALT,OWIN,THSS|CAST,OWLS,THIN,THIS,TWIN -CEID,PRRB,BUNE|BEND,CRIB,PURE,CURB,CURE +CEID,PRRB,BUNE|BEND,CRIB,PURE,CURB,CURE,BUND,PEND SOVN,HAIX,WHAE|HOAX,SHIN,WAVE,HAVE,SAVE -MUAY,DISE,AWGS|AWAY,DIGS,MUSE,MISS,MUGS +MUAY,DISE,AWGS|AWAY,DIGS,MUSE,MISS,MUGS,MUSS BAXN,TLWE,GOUI|BLUE,GOWN,TAXI,GLUE,TOWN SMNK,MLEB,OOON|MONK,OMEN,SLOB,MOON,SOON WTPM,AIOH,GUSE|ATOM,GUSH,WIPE,WISE,WISH OPRL,BAAT,ZEIO|BAIT,OPAL,ZERO,BEAT,ZEAL -OAIE,GOZW,PLOL|GLOW,OOZE,PAIL,PLOW,POOL -FXST,EUFY,DEIS|DEFY,EXIT,FUSS,DEFT,DUST -TOAK,BERE,ABL |ABLE,BEAK,TORE,TEAK +DNIY,SOLP,JURL|DOLL,JURY,SNIP,DULL,SOIL +OAIE,GOZW,PLOL|GLOW,OOZE,PAIL,PLOW,POOL,GAZE +FXST,EUFY,DEIS|DEFY,EXIT,FUSS,DEFT,DUST,FESS +TOAK,BERE,ABL |ABLE,BEAK,TORE,TEAK,TOAK TAID,SKPP, E|SAID,SKIP,TAPE,SKID SISK,TADN,L GY|LADY,SIGN,TASK,TIDY TLOT,MUBP,S SA|MUST,SLOP,TUBA,SLOT SOZN,NIUE, WAT|NOUN,SIZE,SWAT,SWAN -SECE,VIWS,T K|SEWS,TICK,VICE,SICK -AERS,EIA ,PAM |AIMS,EARS,PEAS,AIRS +SECE,VIWS,T K|SEWS,TICK,VICE,SICK,TICS +AERS,EIA ,PAM |AIMS,EARS,PEAS,AIRS,PARS OVNP,SIAL, LIS|OVAL,SINS,SLIP,SLAP -MAYP,LOLD, OS|LAYS,LOOP,MOLD,MOOD +MAYP,LOLD, OS|LAYS,LOOP,MOLD,MOOD,MAYS,MOOS AASG,FLOO,RR H|ALSO,FROG,RASH,FLOG YAIT,VOLN,R W |RAIN,VOLT,YAWN,VAIN SUAA,TONR, N P|SNAP,SOAR,TUNA,SOAP -SUIO,TRPS,OAR |OURS,SAPS,TRIO,OARS +SUIO,TRPS,OAR |OURS,SAPS,TRIO,OARS,TAPS,TARS,SUPS WNYS,JEIT,UOS |JOYS,UNIT,WEST,JEST -WEEE,KONP,ZAD |KEEP,WADE,ZONE,WANE -PHNS,HIAT,T |HINT,PINS,THAT,PINT -ACLT,FASS, ETL|ACTS,FAST,FELL,FALL,FELT -BSEM,UEAE, ARD|BARE,BEAM,USED,BARD,BEAD +WEEE,KONP,ZAD |KEEP,WADE,ZONE,WANE,WEEP +PHNS,HIAT,T |HINT,PINS,THAT,PINT,TINT,TINS +ACLT,FASS, ETL|ACTS,FAST,FELL,FALL,FELT,FATS,FESS +BSEM,UEAE, ARD|BARE,BEAM,USED,BARD,BEAD,BERM CEAE,TAVN,Y RR|CAVE,TEAR,YARN,CARE,YEAR KNOS,DOEB,R LE|DOES,KNOB,ROLE,DOLE,KNEE -EOON,ZAKM,P RE|EARN,POKE,ZOOM,PARE,PORE FIIN,MOSH,T AL|FISH,MOAN,TOIL,FOAL,FOIL HOEW,GRPE,T LL|GREW,HOPE,TOLL,HOLE,TREE NORL,HUSM, LH|HULL,HUSH,NORM,HURL,NULL -JIPS,NOKE,L |JOKE,LIKE,NIPS,LIPS,LOPE -NOVA,LEEE, ASD|LAVA,LOSE,NEED,LOVE,NOSE -FEDE,VAIL,H T |FADE,HATE,VEIL,FAIL,FATE +JIPS,NOKE,L |JOKE,LIKE,NIPS,LIPS,LOPE,NOPE +NOVA,LEEE, ASD|LAVA,LOSE,NEED,LOVE,NOSE,NOVA +FEDE,VAIL,H T |FADE,HATE,VEIL,FAIL,FATE,FETE HRRM,DAUK,T N |DRUM,HARM,TANK,DANK,DARK MUAK,PLCY, E |MUCK,PECK,PLAY,PEAK,PUCK SAOS,LOWL,W |LOWS,SAWS,WOOL,LAWS,SOWS WOBT,DERN, A |DEBT,WART,WORN,DART,WARN CINE,NYST,M |CYST,MINE,NINE,MINT,MIST -WGNS,EEET,B GP|BEEP,EGGS,WENT,BEES,BEET,BENT +WGNS,EEET,B GP|BEEP,EGGS,WENT,BEES,BEET,BENT,WEEP,BEGS SIIW,FPEM, KLN|FILM,SKEW,SPIN,SKIM,SKIN,SPEW RUMB,TAST,NEC |NUMB,REST,TACT,NEST,RUST,TEST -GAER,SEZY,LRA |GREY,LAZY,SEAR,GEAR,GRAY,LEER -BIFP,SOWT,L ML|BOWL,LIMP,SOFT,LIFT,LOFT,SIFT -HANT,RLAN,CEL |CLAN,HALT,RENT,CENT,HEAT,RANT +GAER,SEZY,LRA |GREY,LAZY,SEAR,GEAR,GRAY,LEER,SEER +HANT,RLAN,CEL |CLAN,HALT,RENT,CENT,HEAT,RANT,CANT TOUM,PYPT, HEE|POUT,THEM,TYPE,POEM,POET,POPE VEEY,SORF,L AK|LOAF,SEEK,VERY,LEAF,LEAK,SOAK -DAPK,COAW, RCE|CAPE,DOCK,DRAW,COPE,CRAW,DOPE -GEAD,KIPL, RLT|GILL,GRAD,KEPT,GILD,KILL,KILT +GEAD,KIPL, RLT|GILL,GRAD,KEPT,GILD,KILL,KILT,GELD,GILT VERT,SHNN,HOU |HORN,SHUN,VENT,SENT,SHUT,SORT DHAS,CIET,F RM|CHAT,DIES,FIRM,DIET,DIRT,FIAT -HAMP,ROIK,F NR|FAIR,HONK,RAMP,HAIR,RANK,ROMP +HAMP,ROIK,F NR|FAIR,HONK,RAMP,HAIR,RANK,ROMP,HANK MUUT,STLE, EAN|MULE,SEAT,STUN,MEAN,MEAT,MELT SITD,HASY,P RH|HARD,PITY,SASH,HASH,PATH,PITH -PAOE,WOTS,O LD|OATS,POLE,WOOD,PALE,PALS,POTS +PAOE,WOTS,O LD|OATS,POLE,WOOD,PALE,PALS,POTS,PATS,PATE PHOT,SALL, EC |PACT,SELL,SHOT,PALL,PELT,SALT,SECT VAUR,LOTE,P N |LANE,POUR,VOTE,LATE,LONE,PANE,VANE NEMP,PUWS,D T |DUMP,NEWS,PETS,NETS,NUTS,PUMP,PUTS diff --git a/res/levels/B b/res/levels/B index 8eed660..1dd8b01 100644 --- a/res/levels/B +++ b/res/levels/B @@ -1,5 +1,5 @@ # 5x3, easy -LOOTT,SUEEE,QWBBY|LOBBY,QUOTE,SWEET +LOOTT,SUEEE,QWBBY|LOBBY,QUOTE,SWEET|PRESS ? FOR HELP ENIOF,BRUAL,TLJFY|BLUFF,ENJOY,TRIAL OFOGN,IMAED,FLTOE|FLOOD,IMAGE,OFTEN RALLH,STDIO,MUYCE|MULCH,RADIO,STYLE diff --git a/res/levels/C b/res/levels/C index db16f3b..c4ab6a0 100644 --- a/res/levels/C +++ b/res/levels/C @@ -1,5 +1,5 @@ # 6x3, easy -OBPGIR,LAJEET,NONKCN|LONGER,NAPKIN,OBJECT +OBPGIR,LAJEET,NONKCN|LONGER,NAPKIN,OBJECT|PRESS ? FOR HELP BUTIEE,PNODPD,URNMLT|BUNDLE,PROMPT,UNTIED IADGGD,FRVEHE,SNIAET|FRIGHT,INDEED,SAVAGE TSUPTT,FAIOOD,ERCLRY|ESCORT,FAULTY,TRIPOD diff --git a/res/levels/D b/res/levels/D index b4b76d9..455e363 100644 --- a/res/levels/D +++ b/res/levels/D @@ -1,5 +1,5 @@ # 7x3, easy -SUIIATE,AORLONY,NBTFICS|ABILITY,NOTIONS,SURFACE +SUIIATE,AORLONY,NBTFICS|ABILITY,NOTIONS,SURFACE|PRESS ? FOR HELP ELEGMET,BESEFNY,RRIUALS|BRIEFLY,ELEGANT,RESUMES DERPLNN,COWTHRY,JALEOIS|CARTONS,DOLPHIN,JEWELRY TRAMOOY,PIININX,DARADTD|DIAMOND,PARADOX,TRINITY @@ -34,8 +34,8 @@ SEMATLE,GIPIIDR,RRETNAY|GREATLY,RIPTIDE,SEMINAR,REPTILE LOACOUG,SPHKEVE,ACOIINT|ACHIEVE,LOOKOUT,SPACING,LOOKING,SOAKING WMUNEES,BRISGLT,SASDKTE|BASSETT,SMUDGES,WRINKLE,BRIDGES,BRISKET HENGINS,CULMPTG,JAIIHER|CALMING,HEIGHTS,JUNIPER,CALIPER,HANGING -AEUHIES,TMAZONT,MRTMPDG|AMAZING,METHODS,TRUMPET,AMAZONS,TEAMING -CDIIIAL,LRMPPNG,AASTRLE|ADMIRAL,CRIPPLE,LASTING,CAMPING,CASTING +CUIEFDY,RTRBNES,SHMALLD|CHIEFLY,RUMBLED,STRANDS,RUMBLES,SHIELDS +PROPAAN,VHTMRCD,SEIEPEY|PRIMACY,SHOPPED,VETERAN,PROPPED,SHIPPED OSTLICH,CHCRTDE,INAOUIC|CHAOTIC,INCLUDE,OSTRICH,CHALICE,INTRUDE PRAFHSE,KNIGUES,ALORMTD|ALARMED,KNIGHTS,PROFUSE,PLAGUED,PLAGUES WUFAEAS,EATFBET,DNRRLLE|DURABLE,ENTREAT,WAFFLES,DUFFELS,ENTREES @@ -56,19 +56,19 @@ KAOFIEN,DRPTTNG,CNIWAID|CAPTAIN,DRIFTED,KNOWING,CROWING,KNITTED,KNOTTED AEAPIRG,CNMIATY,POXKENE|ANXIETY,COMPARE,PEAKING,COMPANY,COMPETE,COMPING CARMBON,SNUTOEE,GRAPPLD|CARTOON,GRUMBLE,SNAPPED,CRAMPED,CRUMBLE,GRAPPLE PUCCEES,ABNSHTL,SEYRMAD|ABYSMAL,PUNCHED,SECRETS,PUNCHES,SUCCEED,SUNSETS -BWIBFNG,TOODLTM,HRELIUH|BRIBING,HOODLUM,TWELFTH,BOILING,TOILING,TOOLING EMTIOCD,IHPRNRT,CXALTEE|CHARTED,EXTINCT,IMPLORE,CHAINED,EXALTED,EXPLORE TEXPARE,OIPRILL,DVETUNG|DIPPING,OVERALL,TEXTURE,DIETING,TEXTILE,TIPPING RELVILE,GRASEMS,WAICONY|GRAVELY,RAISINS,WELCOME,GRAVELS,REASONS,WEASELS -HLASTEC,PAEDEIR,WHRTHST|HARDEST,PLASTIC,WHETHER,HARSHER,PLASTER,PLATTER +SETIRPY,RMEKING,THORAES|RETIRES,SMOKING,THERAPY,RETRIES,SEEKING,SHORING SLALIUS,PNIYFRT,IPFDECL|INFLICT,PLAYFUL,SPIDERS,PLAYERS,SLAYERS,SLIDERS +RATBENG,OUCIIAS,VIBMOUL|OATMEAL,RUBBING,VICIOUS,RATIONS,RIBBING,RIBBONS SAUUDLS,LOGNIRG,JIMPANY|JAGUARS,LIMPING,SOUNDLY,LAUNDRY,SIGNALS,SIGNING WUITEEL,INCLHAR,NE GI D|INITIAL,NUCLEAR,WEIGHED,NEITHER IESTDED,HOIRINR,WNHAL G|HOSTING,INHALED,WEIRDER,INHALER TNOTFLE,GRYWING,ALUF M |ANYTIME,GLOWING,TRUFFLE,GROWING SAUMAIN,HUSTTUL, RNFED|HARMFUL,HAUNTED,SUSTAIN,HURTFUL -VRERTIR,SPAAKEN,GIT M D|GREATER,SPARKED,VITAMIN,SPEAKER CPVIEWT,AENNCOG,RUR INS|APRICOT,CUNNING,REVIEWS,RUNNING +TALEWED,RYILSAT, P I Y|RAILWAY,TALLIED,TYPESET,RALLIED DINGAUL,PUTIFOG,M STENN|DUNGEON,MUSTANG,PITIFUL,DUTIFUL FTEKHNN,SRUSIEG,COOD D|COOKING,FRESHEN,STUDIED,CRUSHED DIVOTED,GESTORT,RLI K R|DISTORT,GLITTER,REVOKED,DEVOTED @@ -100,3 +100,4 @@ TILHEED,FRAMINT,A SCK G|AILMENT,FISHING,TRACKED,FILMING,FRAMING,TRACING MLAAHEY,FRESTLS,CONT |CREATES,FLASHES,MONTHLY,CLASHES,CRASHES,FRESHLY NESLINT,BAGSECG,S I OON|BASSOON,NEGLECT,SAILING,BAILING,NAILING,SESSION [eof] + diff --git a/res/levels/E b/res/levels/E index 14a11bc..3310413 100644 --- a/res/levels/E +++ b/res/levels/E @@ -1,102 +1,102 @@ # 4x4, intermediate -IOLA,ALOO,DEEI,HDSK|ALSO,DELI,HOOK,IDEA,DESK +IOLA,ALOO,DEEI,HDSK|ALSO,DELI,HOOK,IDEA,DESK|PRESS ? FOR HELP MIIK,RRBS,UNLT,T P|MILK,RIBS,TRIP,UNIT,TILT RNDO,UANK,HVER,OIGH|HIGH,OVER,RANK,UNDO,RINK -LYOP,SLCH,RITW,M M |LIMP,MYTH,RICH,SLOW,SLOP +TAOD,NHFW,CUVU,FONY|CHOW,FUND,NAVY,TOFU,FOOD UDOR,ONEM,HUTO,THNG|HUNG,ODOR,THEM,UNTO,ONTO LSEE,IOTN, ICS, L |ISLE,LICE,LIEN,LOTS,LIES -CULP,EDAK,LEGM,FANY|CALM,EDGY,FUNK,LEAP,LEAK +CULP,EDAK,LEGM,FANY|CALM,EDGY,FUNK,LEAP,LEAK,CAGY RIWY,KEPI,P RS,Z LK|KIWI,PERK,RELY,ZIPS,RIPS -OMIK,IODM,JUET,BTNY|BODY,ITEM,JUNK,OMIT,BUNK +OMIK,IODM,JUET,BTNY|BODY,ITEM,JUNK,OMIT,BUNK,BUNT GVEM,EUIS,NXAL, END|EVIL,EXAM,GUNS,NEED,NUNS -WEFP,TLTO,DAOY,FICS|DEFY,FLOP,TACO,WITS,FITS -SOLY,HIAC,TYNB, CD |HOLY,SCAB,SYNC,TIDY,TINY -WHNR,AVEM,CCOE,ELIT|ACNE,CLOT,EVER,WHIM,WHOM -TBSN,IRBS,EURH,L K |EBBS,IRKS,LUSH,TURN,ERRS +WEFP,TLTO,DAOY,FICS|DEFY,FLOP,TACO,WITS,FITS,WETS +TBSN,IRBS,EURH,L K |EBBS,IRKS,LUSH,TURN,ERRS,TUSH KNOC,CPIN,EWAB,OYED|CYAN,EPIC,KNOB,OWED,OPEN -DLET,IITE,FU A, O |DIET,DUET,FLEE,IOTA,FLEA +DLET,IITE,FU A, O |DIET,DUET,FLEE,IOTA,FLEA,DOTE RHAP,OPPL,TIUE,SKIG|OPAL,RIPE,SKIP,THUG,SHIP -SLEA,PPLY, ONL, W|PLEA,POLL,PONY,SPEW,SLEW -MAML,WHCY,COOO,EEEH|COOL,EACH,MEMO,WHEY,WOOL -YRLK,EUCH,GTIS, OTP|ETCH,GRIP,GUTS,YOLK,GULP -OOHS,ECDE,NWLO,TUFU|ECHO,NUDE,OWLS,TOFU,NODE +SLEA,PPLY, ONL, W|PLEA,POLL,PONY,SPEW,SLEW,POLY +MAML,WHCY,COOO,EEEH|COOL,EACH,MEMO,WHEY,WOOL,MACH +YRLK,EUCH,GTIS, OTP|ETCH,GRIP,GUTS,YOLK,GULP,GOTH,YUCK RUOI,TRSE,IAIS, OXF|IRIS,ROOF,RUSE,TAXI,ROSE BILY,GUOW,AACD,PNET|ANEW,BUOY,GILD,PACT,BALD SEZE,MOET,O DM,R |MEET,OOZE,RODE,SEEM,MODE -GEFB,RNRT,IIIO,TLTM|GLIB,INTO,RIFT,TERM,GIFT +GEFB,RNRT,IIIO,TLTM|GLIB,INTO,RIFT,TERM,GIFT,GERM JUIH,SLRD,MRCY,G |GRID,JURY,MUCH,SLID,SUCH PREN,FISY,ZPOH,UERO|FISH,PREY,UPON,ZERO,FERN -GNUE,FOLR,OUKF,J S|FOUR,GULF,JOKE,ONUS,GOLF +GNUE,FOLR,OUKF,J S|FOUR,GULF,JOKE,ONUS,GOLF,GNUS ECZU,JHTT,CIRY,SAOZ|CITY,ECRU,JAZZ,SHOT,CART GDOB,PLRS,RUGE,E |EDGE,GLOB,PURE,RUGS,PUGS FURH,KOSP,EMLR,REIK|EMIR,FORK,KELP,RUSH,FOLK LIWW,FTNL,DOEU,SE Y|DENY,FOWL,LIEU,STEW,FEEL -TBID,ELOS,QHKZ,OUUE|ELKS,OBOE,QUIZ,THUD,THIS,THUS +TBID,ELOS,QHKZ,OUUE|ELKS,OBOE,QUIZ,THUD,THIS,THUS,QUID MKSA,TUNT,S IN,Q |MUST,QUIT,SKIN,TUNA,SKIT,SUIT -TNKW,ITWH,KOOE,DUCN|DUKE,ITCH,KNOW,TOWN,DOWN,INCH -UOOE,TRRH,ZATM,OIG |OATH,TIRE,URGE,ZOOM,TORE,TOTE -SEEB,TUUY,RAZE,LTNL|LAZY,REEL,STUB,TUNE,LANE,SANE +TNKW,ITWH,KOOE,DUCN|DUKE,ITCH,KNOW,TOWN,DOWN,INCH,TOON,TOKE +ROAE,WHVL,DIEN,C B |COAL,DIVE,ROBE,WHEN,COVE,DIAL,DOVE +UOOE,TRRH,ZATM,OIG |OATH,TIRE,URGE,ZOOM,TORE,TOTE,TARE +SEEB,TUUY,RAZE,LTNL|LAZY,REEL,STUB,TUNE,LANE,SANE,LAZE TELD,HRXE,F UT, P|FEUD,HELP,TEXT,TRUE,FELT,HELD NIEA,KELN,ORCE,CANF|CALF,KEEN,NINE,ORCA,CANE,NICE NIAR,STLE,IUMK, D B|IDLE,NUMB,SILK,STAR,STAB,SULK TRKS,ANLN,EWVY,CEIL|ARKS,CELL,ENVY,TWIN,EELS,TELL -NDMS,LAON,IIDL, E|IDOL,LADS,LION,NAME,LIDS,LIME -GOLY,WRUG,CIIN,PHOR|CHUG,GRIN,POOR,WILY,COIN,POUR -QAIP,MUBS,P LK, R |MARK,PUBS,PULP,QUIP,PALS,PARK +NDMS,LAON,IIDL, E|IDOL,LADS,LION,NAME,LIDS,LIME,LAME +GOLY,WRUG,CIIN,PHOR|CHUG,GRIN,POOR,WILY,COIN,POUR,GOON,POLY +QAIP,MUBS,P LK, R |MARK,PUBS,PULP,QUIP,PALS,PARK,MARS WAMT,MUAY,FYEN,HOVL|FUEL,HYMN,MOAT,WAVY,FOAL,MOAN -AEIE,WKRD,LRLN, U T|AKIN,LURE,WELD,WRIT,ARID,WERE +AEIE,WKRD,LRLN, U T|AKIN,LURE,WELD,WRIT,ARID,WERE,WELT LTUN,GNLY,KAOT,SEVL|GALL,KNOT,LEVY,STUN,SALT,SELL HOSY,YEKS,RAAP, R |HARP,REAP,ROSY,YAKS,HEAP,HERS -AISA,GVOW,RALB,SWAE|AVOW,GALA,RISE,SWAB,GALE,SALE +AISA,GVOW,RALB,SWAE|AVOW,GALA,RISE,SWAB,GALE,SALE,RILE PLPE,WWOS,SIET,E |EWES,PLOT,SLOT,WIPE,PIES,PIPE -JOPN,NTEY,BRAE,SAIP|BRAY,JOIN,NAPE,STEP,SOAP,STAY -TAYS,OUS ,DOI ,F R |DAIS,FUSS,OARS,TOYS,DAYS,OURS -GNAE,MIIB,OKCS,SREM|GRAB,MICE,ONES,SKIM,GRAM,ONCE +JOPN,NTEY,BRAE,SAIP|BRAY,JOIN,NAPE,STEP,SOAP,STAY,NOPE,JAPE,BRAN +TAYS,OUS ,DOI ,F R |DAIS,FUSS,OARS,TOYS,DAYS,OURS,TARS +GNAE,MIIB,OKCS,SREM|GRAB,MICE,ONES,SKIM,GRAM,ONCE,ORCS,ORES,GRIM,SKIS GOTE,OLAM, AWN, VUL|GATE,GLUM,GOWN,OVAL,GLUE,GOAL -RAAM,JPCD,SYWE,DOEL|DYED,JOWL,RACE,SPAM,ROAD,ROAM +RAAM,JPCD,SYWE,DOEL|DYED,JOWL,RACE,SPAM,ROAD,ROAM,DYAD DRUO,YEMR,P AK,C X|CRUX,DEMO,PEAK,YEAR,DEAR,PEAR -CUEH,AAIY,PHTD,TCLT|ACID,CULT,PATH,THEY,PAID,PUTT -FEIS,JPTN,SLUX, E|FLUE,FLUX,JETS,SPIN,SETS,SPUN +CUEH,AAIY,PHTD,TCLT|ACID,CULT,PATH,THEY,PAID,PUTT,CHIT +FEIS,JPTN,SLUX, E|FLUE,FLUX,JETS,SPIN,SETS,SPUN,FETE OERO,MRID,TUAA,DKSH|DEAD,MUSH,OKRA,TRIO,MESA,MESH EAAY,SECE,HDFK, DR|EDDY,HACK,SAFE,SEAR,HEAR,SACK -CDAT,DLIE,AURK,ECCW|ACRE,CLAW,DUCK,EDIT,CURE,DUCT -HUIR,DWMP,SERM, F|DUMP,HEIR,SURF,SWIM,HEMP,HUMP -SNET,CEMB,KHIC,LACW|CHIC,KNEW,LAMB,SECT,CHEW,KNIT -SIPA,BUFM,DOUS, RSH|BUSH,DIPS,DRUM,SOFA,BOSS,DISH +BRRM,EEAE,AOCH,MCHO|ARCH,BEAM,ECHO,MORE,ACRE,MERE +HUIR,DWMP,SERM, F|DUMP,HEIR,SURF,SWIM,HEMP,HUMP,SERF +DENG,GLRO,FOEX,H AF|DEAF,FLEX,GONG,HERO,FLAG,FLAX,HOAX +SIPA,BUFM,DOUS, RSH|BUSH,DIPS,DRUM,SOFA,BOSS,DISH,SUSS,SIPS TOBH,CIEB,RUMY,SEGN|COMB,RUBY,SIGH,TEEN,SEEN,SIGN,TOMB +PESY,RLEF,L AT,C F |CLAY,LEFT,PEST,REEF,LEAF,PLAY,REST LRAP,TNSK,GAWN,M W|GNAW,LAWN,MASK,TRAP,GASP,GAWK,TASK SNSL,VOAF,JAIA,LIOB|JAIL,LOAF,SNOB,VISA,SAIL,SOIL,VIAL -REMT,GONS, AB , U |GOUT,RAMS,RENT,ROBS,GEMS,RANT,ROUT -SEDD,KAIG,WIAS,MNUK|KIDS,MAID,SNUG,WEAK,SAID,SEAS,SNAG +REMT,GONS, AB , U |GOUT,RAMS,RENT,ROBS,GEMS,RANT,ROUT,GABS,GAMS,GOBS +SEDD,KAIG,WIAS,MNUK|KIDS,MAID,SNUG,WEAK,SAID,SEAS,SNAG,MEAD VIOG,NMWS,REEW,S T|NEWS,RIOT,SMOG,VIEW,NEWT,SEES,SEWS ARLM,DNNA,WAAD,OURY|AURA,DRAM,ONLY,WAND,WARD,WARM,WARY LOPM,RNOW,S K, E|LOOM,ROOK,ROPE,SNOW,LOOK,LOPE,ROOM -GROE,SDDS,RWCK,OIAN|GROK,ODDS,RICE,SWAN,RIDE,SICK,SIDE -PEAT,SRPN,W WY, N |PRAY,SENT,SEWN,WEPT,SEAT,WEAN,WENT -KNAH,SLEX,GUSE,COIM|COAX,GUSH,KNEE,SLIM,CLAM,GLEE,SLAM -PEOP,SHRL,KO N,N D|KERN,NERD,POOL,SHOP,NEON,NOON,SOON -DSNA,UIEG,LUSR,SATP|DATA,LISP,SUNG,USER,LUNG,SANG,SING +GROE,SDDS,RWCK,OIAN|GROK,ODDS,RICE,SWAN,RIDE,SICK,SIDE,RIDS +PEAT,SRPN,W WY, N |PRAY,SENT,SEWN,WEPT,SEAT,WEAN,WENT,PEAT,GLAM +KNAH,SLEX,GUSE,COIM|COAX,GUSH,KNEE,SLIM,CLAM,GLEE,SLAM,GOSH +DSNA,UIEG,LUSR,SATP|DATA,LISP,SUNG,USER,LUNG,SANG,SING,DING WREY,COPT, AFM, AS|COPY,CRAM,WAFT,WOES,CAPS,COAT,COPS APSY,SURT,VEDR,DWUS|AWRY,DUDS,SPUR,VEST,DUST,SPRY,VERY -DENG,GLRO,FOEX,H AF|DEAF,FLEX,GONG,HERO,FLAG,FLAX,HOAX +RILL,BOVE,LB ,A |ABLE,BILL,LIVE,ROLL,BILE,LOVE,ROLE HLEY,EXWK,ARIT,SAAA|AREA,EXIT,HAWK,SLAY,ARIA,SLAT,SLIT -JIYS,EGST,GUG , E |EGGS,GIST,GUYS,JEST,GUST,JIGS,JUST -AIUP,DTNS,OPOC,ZEEM|ATOP,DEEM,OPUS,ZINC,ATOM,DEEP,DIES -LYAL,HRPE,FALA,D VW|DRAW,FALL,HYPE,LAVA,DALE,HALL,HAVE -DIUS,COMD,TULM,PLRF|COLD,DIMS,PLUM,TURF,CORD,PLUS,TOLD +JIYS,EGST,GUG , E |EGGS,GIST,GUYS,JEST,GUST,JIGS,JUST,JUGS +AIUP,DTNS,OPOC,ZEEM|ATOP,DEEM,OPUS,ZINC,ATOM,DEEP,DIES,DINS +LYAL,HRPE,FALA,D VW|DRAW,FALL,HYPE,LAVA,DALE,HALL,HAVE,HALE +DIUS,COMD,TULM,PLRF|COLD,DIMS,PLUM,TURF,CORD,PLUS,TOLD,TURD TAIN,ERSG,MHTE,F OY|EASY,FROG,MATE,THIN,EASE,FATE,MAIN -UOAO,LVLY,FLGN,EGEP|EVEN,FLAP,LOGO,UGLY,FLAN,FLAY,LOAN -BINY,FURM,MAZZ, I |BUZZ,FIRM,MAIM,MANY,FARM,FURY,FUZZ +UOAO,LVLY,FLGN,EGEP|EVEN,FLAP,LOGO,UGLY,FLAN,FLAY,LOAN,ELAN +BINY,FURM,MAZZ, I |BUZZ,FIRM,MAIM,MANY,FARM,FURY,FUZZ,BURY,FIZZ HECD,SITB,RNRA,PAUY|HERD,PITA,RACY,SNUB,HARD,HERB,PITY PIEK,CHNT,F AF,L |CHEF,FIAT,LINK,PINT,CHAT,LINT,PINK -VYTB,CLNG,RIRP,BEIE|BYTE,CLIP,RING,VERB,BITE,CITE,VINE +VYTB,CLNG,RIRP,BEIE|BYTE,CLIP,RING,VERB,BITE,CITE,VINE,BLIP,RITE CENB,RRAU,N IR,M N|CRIB,MENU,NEAR,REIN,CRAB,MEAN,REAR -CACS,KIOK,IRTB,TLUN|CLUB,IRON,KITS,TACK,CATS,KICK,TICK +CACS,KIOK,IRTB,TLUN|CLUB,IRON,KITS,TACK,CATS,KICK,TICK,TICS TOOS,BIAE,G VK, E |BIAS,GIVE,GOES,TOOK,BOOK,TIES,TOES SMTA,OAAM,EOGS,YHEN|EATS,OMEN,SHAM,YOGA,OATS,SAGA,SAGS -TOPT,IMBS,BEGR,D U |BOGS,DEBT,IMPS,TOUR,DOGS,DOUR,TOPS -PIML,VEET,WOIP, H |POET,VEIL,WHIP,WIMP,PEEL,PEEP,POMP,WHET -ROAN,SCGR, AUE, L|RAGE,SCAN,SCAR,SOUL,ROAR,SAGE,SOAR,SOUR +SAOT,BTPW,TESE, YWL|BAWL,STOW,TEST,TYPE,BASE,BEST,TAPE +TOPT,IMBS,BEGR,D U |BOGS,DEBT,IMPS,TOUR,DOGS,DOUR,TOPS,TOUT,BOUT +SNET,CEMB,KHIC,LACW|CHIC,KNEW,LAMB,SECT,CHEW,KNIT +ROAN,SCGR, AUE, L|RAGE,SCAN,SCAR,SOUL,ROAR,SAGE,SOAR,SOUR,ROAN SOMB,WIVE, ATN, RE |SITE,WAVE,WOMB,WREN,SAME,SATE,SAVE,SOME -WIDR,ZUBE,TEAA, L|TIDE,TUBA,WEAR,ZEAL,TEAL,TEAR,TUBE,WIDE +WIDR,ZUBE,TEAA, L|TIDE,TUBA,WEAR,ZEAL,TEAL,TEAR,TUBE,WIDE,WEAL +ALIT,LANW,CUSR,E A |AUNT,CLAW,EAST,LAIR,CAST,LAST,LUST [eof] diff --git a/res/levels/F b/res/levels/F index 5dfb284..696e9a1 100644 --- a/res/levels/F +++ b/res/levels/F @@ -1,5 +1,5 @@ # 5x4, intermediate -RILIT,CUIEA,DGBNG,AOGRR|AGING,COBRA,DIGIT,RULER,DOING +RILIT,CUIEA,DGBNG,AOGRR|AGING,COBRA,DIGIT,RULER,DOING|PRESS ? FOR HELP MEDHE,RAVOA,NIACH,H CIC|HAVOC,MEDIA,NICHE,REACH,MEDIC WSADE,PROLY,SOETD,RPWEM|PSALM,ROWDY,SPEED,WROTE,SPADE TWUSS,REMLT,QUIEE, I |QUILT,REUSE,TIMES,TWIST,QUIET @@ -82,15 +82,15 @@ AHITE,JOKVS,SXOEM,B OD|AXIOM,BOOTS,JOKED,SHOVE,JOKES,SHOES,SHOTS HADEE,CZONR,BUY T,O T D|BUYER,CADET,HATED,OZONE,CATER,CUTER,OUTER JNEET,IOVNX,LEW R,EVD L|EVENT,INDEX,JEWEL,LOVER,LEVEL,LEVER,LOWER GOILR,JUKEE,L DTY,F FG |FUDGE,GUILE,JOKER,LOFTY,GODLY,JUDGE,LODGE -SERIE,PNIFD,KLAV ,I N |INANE,KNIFE,PLAID,SERVE,KNAVE,PLANE,SLAVE SMELO,VIDEL,ADORD,L V E|ADORE,LIVED,SMELL,VIDEO,ADDED,AIDED,SIDED LESKY,PANR ,T EN , RT |LEERY,PENNY,PERKY,TASTY,PARRY,PARTY,PESKY MMRLY,PALKE,V PVS,I TH |IMPLY,MARKS,PATHS,VALVE,MALLS,MAPLE,PARKS SLASE,FSLUY,EASKA, EGA |ESSAY,FLAKY,SALSA,SEGUE,FALSE,FLAKE,SASSY +TIEOY,CWMED,DHIVW,W DLE|CHIVE,DIMLY,TWEED,WIDOW,CHILD,WHILE,WIELD NOUGE,DIVUD,VEIIN,L GNS|DEIGN,LIVID,NOUNS,VOGUE,LOINS,VEINS,VIVID CACSE,VORAS,LIPGR,FRA |CRASS,FORGE,LAPSE,VICAR,COPSE,CRAGS,LARGE -TIEOY,CWMED,DHIVW,W DLE|CHIVE,DIMLY,TWEED,WIDOW,CHILD,WHILE,WIELD SIILG,BWGED,MUENE, TX |BUGLE,MIXED,STEED,SWING,BUILD,STING,SWINE +ITENE,KISGL,SNAL ,A |AISLE,INANE,KNELL,STAGE,SIEGE,STALE,STALL SLAUT,VRIED,BALME,DH S |BLAST,DRIED,SHAME,VALUE,BLAME,SLIME,VALET TRALL,JEIBS,IOERE, DYD |IDYLL,JEERS,TOADS,TRIBE,TEARS,TOILS,TRADE TMBUR,IOREL,NUVOE,FAW |FUROR,IMBUE,NAVEL,TOWER,FAVOR,NOVEL,TOWEL diff --git a/res/levels/G b/res/levels/G index 0277316..b3ea412 100644 --- a/res/levels/G +++ b/res/levels/G @@ -1,7 +1,7 @@ # 6x4, intermediate -JNNCAD,SIHIHM,PUFOLY,UCGSSW|JIGSAW,PUNCHY,SCHISM,UNFOLD,UNHOLY +JNNCAD,SIHIHM,PUFOLY,UCGSSW|JIGSAW,PUNCHY,SCHISM,UNFOLD,UNHOLY|PRESS ? FOR HELP ERROVS,VHCBTE,GNOSRL, E A |ENCORE,GHOSTS,GROOVE,VERBAL,ERRORS -VRLHON,UMCILE,NISZUT,OOZAID|NOZZLE,ORCHID,UMLAUT,VISION,URCHIN +EEPPOY,PRCDED,R OLUP,D O R|DEPLOY,ERODED,PEPPER,RECOUP,PROPER HIPGEH,LAESCS,STNVAE, RN |HINGES,LAPSES,LARVAE,STENCH,SIEVES UFFTUM,OIPRIG,VTCLEE,SNOICD|OFFICE,STORED,UNPLUG,VICTIM,SIFTED FARCID,POINHH,MLASCE, U Y|FLINCH,MARSHY,PLACID,POUNCE,FLASHY @@ -66,7 +66,7 @@ SLXELY,EIUTES,PTED T, E |ELUDES,PIXELS,SEXTET,STEELY,ETUDES,STEELS GEOVPT,DURIEH,QRIUCR,ABVWTE|ABRUPT,DEVICE,GROWTH,QUIVER,DRIVER,GROUCH,GROWER ATATNT,LBDICD,SDY IC, A EG|ABATED,ADDICT,LAYING,STATIC,ADDING,LADING,SAYING,STATED ENCAEW,CEMIAL,USNPUR,GAFHIS|CAMPUS,ESCHEW,GENIAL,UNFAIR,CACHES,CAMPER,GENIUS -NALTCN,BEWLAH,TTKROD,S AERS|BALLAD,NEWTON,STARCH,TAKERS,BAKERS,BALLON,SEARCH,SEWERS +ROLGON,AANOLE,JIRQUS,TLC Y |ALLOYS,JINGLE,RACOON,TORQUE,JARGON,TANGLE,TINGLE,TONGUE DAUIIY,STRRNA,MOAKEG,ACSCDT|ACACIA,DOSING,MARKET,STURDY,DARING,MARINA,STRING CAVKED,B NDOT,G SITY,M C |BANDED,CAVITY,GASKET,MASCOT,BANKED,BASKET,CASKET,MASKED TWFTEM,AUTNRR,WFIITY,MAEANT|AFFIRM,MUTANT,TWENTY,WAITER,MATTER,MUTINY,MUTTER @@ -77,7 +77,7 @@ YIKINO,MOSLID,STUDRG,WAGUET|MISLED,STUDIO,WAKING,YOGURT,MAKING,MAULED,WAGING BEOIDT,DPSUES,SIAHT ,F RS |BEARDS,DESIST,FISHES,SPOUTS,DISHES,SPARES,SPORES,SPORTS WINGEY,GORMRS,BEAESD, YPA |BEAMED,BYPASS,GORGES,WINERY,BINARY,WINGED,WIPERS,WORMED MLLGEY,BIROAE,PNARTL,UAGHUD|BARREL,MIGHTY,PLAGUE,UNLOAD,BAGGED,BARRED,MARRED -BUPHLE,SPSPDL,UIGATY,EEFI |BEFALL,EIGHTY,SUPPLY,UPSIDE,BESIDE,BUSILY,SUPPLE,UPPITY +EXTTPD,FORAGT,DAEMEE, N |DOTTED,EARNED,EXEMPT,FORAGE,DARNED,DARTED,FARMED,FORMED CAIEED,WFRAPR,SCFVNE,O |CAREER,OFFEND,SCRAPE,WAIVED,CARVED,CARVER,SCREED,WAIVER JIGFKN,YULCEL,PEAEOS,QOYLUD|JOYFUL,PIGEON,QUACKS,YELLED,POLLED,POLLEN,PULLED GUCHNL,OBTOED,CISK G,NALT |CASHED,GUTTED,NICKEL,OBLONG,CACHED,GUSHED,NICKED,OUSTED @@ -86,12 +86,12 @@ CASIEY,RITWAH,PEDGSO,J R ND|CASINO,JETWAY,PERISH,RIDGED,PARIAH,PARISH,PITIED,RAD HAPKIP,GRTNTS,NIAHER,C N|CATNIP,GRANTS,HITHER,NAPKIN,CIPHER,CRANES,GATHER,GIANTS PUAESS,MEEPET,ARCATY,TCPDOW|ACCESS,MEADOW,PUPPET,TREATY,TEAPOT,TRADES,TREATS GINSRN,CAVGER,FEAETS, R |CAVERN,FEASTS,GENRES,GINGER,CEASES,FEVERS,FINGER,GIVERS -PNCRRD,DOSLEE,UHAKG ,C OU |CHARGE,DOCKED,POOLED,UNSURE,CHOKED,COCKED,COOKED,COOLED +MIRMMT,TOEIOL,IRGEAA,FNN SR|FORMAL,INGEST,MINIMA,TREMOR,FINEST,FINIAL,FOREST,FORMAT MRRTLC,SWOAAD,BEAGIE,EYEITY|BEAGLE,EROTIC,MYRIAD,SWEATY,BEETLE,EERILY,MYRTLE FAOVOE,DERANR,SRCELS,G DD T|DECENT,FERVOR,GROANS,SADDLE,DECALS,SEDANS,SERENE,SERVOS SIOGCY,QURPAT,DLGEIE,MAEASN|DIRECT,MAGPIE,QUEASY,SLOGAN,DIGEST,MARGIN,SUREST PAENTL,DRNTOE,OEDDLR, LA AY|DENTAL,ORATOR,PADDLE,PLENTY,DEADLY,PEDDLE,PLANAR,PRETTY -WEOSKD,BHFFMH,SUIOEE,PCCTCY|BECOME,PUFFED,SCOTCH,WHISKY,BUFFED,SUITED,WHITED +FANAEY,SNAVTG,ILSIBN,EH BNE|EASING,FLABBY,INNATE,SHAVEN,INNING,INSANE,SANITY,SHABBY TNSENN,DOPDED,UALP R,SE |DEPEND,SOLDER,TAPPED,UNSEEN,DAPPER,TAPPER,TOPPED,TOPPER MINDNE,USELOT,BCABED,OOTALY|BOTANY,MINDED,OCELOT,USABLE,BONDED,MOTLEY,OCTANE GAARNG,HGMVOD,PRINES,EUGA |EGGNOG,GRAVES,HUMANS,PAIRED,GAINED,HAIRED,PAGANS,PAINED @@ -100,3 +100,4 @@ ERIITA,FARFSH,GTNAGE,SI L |ERRATA,FINISH,GARAGE,STIFLE,FINALE,FINITE,GARISH,STR IOFEAY,RELOSR,DNULFE,FLVFKT|DOLLAR,FLUFFY,INFEST,REVOKE,DEFEAT,INVEST,INVOKE FETHHT,WIAACY,SNUGLD,IOGKE |FOUGHT,INTACT,SIGHED,WEAKLY,SNUGLY,SOAKED,SOUGHT,WIGGLY [eof] + diff --git a/res/levels/H b/res/levels/H index 2d0af54..b15b17a 100644 --- a/res/levels/H +++ b/res/levels/H @@ -1,5 +1,5 @@ # 7x4, intermediate -BEUVATE,MAASEIT,SRTNLGN,GOOWIEY|BETWEEN,GRAVITY,MOONLIT,SAUSAGE,GRANITE +BEUVATE,MAASEIT,SRTNLGN,GOOWIEY|BETWEEN,GRAVITY,MOONLIT,SAUSAGE,GRANITE|PRESS ? FOR HELP RLRPETS,TEIEWAL,SATGAEE, INUP D|RENEWAL,SITUATE,SLIPPED,TARGETS,RENEWED HEGDDSD,THNOEAS,CITURNT,ASEHUER|ASTOUND,CHEDDAR,HIGHEST,TENURES,TENURED RQOAATT,SRLOLOM,PEBIRNS, UGOAR|PROGRAM,REBOOTS,RELIANT,SQUALOR,SQUIRTS @@ -8,7 +8,6 @@ RENCACU,POWREAE,VITDOED, SERUS|POWERED,RETRACE,RONDEAU,VISCOUS,PITEOUS SUUAMES,ULWPTPH,BRIURDE,TPPNOSD|BLUNTED,SUPPOSE,TRIUMPH,UPWARDS,TRIPODS POETETS,URGCNCE,S RNIDY, NE ON|PORTION,PRECEDE,SONNETS,URGENCY,POETICS SLESVEC,NMAENUL,ETMDTIS,IERIFSE|ELASTIC,IMMENSE,NEEDFUL,STRIVES,SLEEVES -WEITRAO,NHAPIEL,S USPOE,P NM VD|NEUTRAL,PENSIVE,SHAMPOO,WHIPPED,SHIPPED WPEBARB,RORCILE,AHJRKET,SDUUNCD|ADJUNCT,RHUBARB,SPECKLE,WORRIED,SPURNED NEQTUIE,VUMOOSY,SIRURAL,R SERA|NURSERY,REMORSE,SEQUOIA,VIRTUAL,NURTURE VEPUORD,HRRITEK,IMSDBNY,AITWILG|ARTWORK,HERDING,IMPUTED,VISIBLY,VISITED @@ -17,11 +16,9 @@ ILLNRNS,SNFENMO,FICHGGE,AHIIELY|ALCHEMY,FILINGS,INFERNO,SHINGLE,ALLERGY LAPEBEL,METLIRD,R SARAE, CP T |LATERAL,MACABRE,REPLIED,RESPITE,METERED NCTWAOS,IOIECNN,OARAITG,FNFLGRD|FORWARD,INFECTS,NAILING,OCTAGON,FAILING JIUVELE,SWXRNGY,PACTAEN, OIK S|JOURNEY,PACKAGE,SIXTEEN,SWIVELS,JACKALS -SHHOELY,ETTCLAS,TXSTMMN,OYIAKED|EXHALED,OTTOMAN,SYSTEMS,THICKLY,THICKEN UUMRDGS,LSNIVEH,ONTONCR,HIC IO |HUMIDOR,LININGS,OSTRICH,UNCOVER,OUTINGS HNUSIHD,STCTSTT,WOAUGNE,IROIUEG|HOUSING,INCISED,STATUTE,WROUGHT,STATING HTGBCNS,MAPTEED,ORAIARL,SE HBA |HEATERS,MAGICAL,ORPHANS,STABBED,SAPIENS -DACEANR,WNYTEEL,SXEAKLS,ERSWIDG|DRYWALL,EXCEEDS,SNEAKER,WASTING,EASTING PRSUEAR,GIELLSS,UNCCALN,V OM I |GREMLIN,PROCESS,UNCLEAR,VISUALS,UNCLEAN TTLEZAT,EEGTOSR,ADHBREL,SUVANOE|ADVERSE,ETHANOL,SELTZER,TUGBOAT,SEVERAL GRSTINT,RAPIEAD,ILADCRE, NL UIG|GRADING,ILLICIT,INSTEAD,RAPTURE,GRATING @@ -31,9 +28,10 @@ STNIPSH,AIOUIOR,LNGPMEN,DYAASIC|ANGUISH,DYNAMIC,LIAISON,STOPPER,SNAPPER PARINGS,VESEMLN,FOTYRU ,R PSEA |FOREMAN,PAPYRUS,RATINGS,VESSELS,VETERAN CRNQRAS,AUFAIEL,MEHFSIT,GPOEUNA|APHASIA,CROQUET,GENERAL,MUFFINS,GENESIS FNALGWE,SEOCLEM,TRUBOLR,P LGTOS|FELLOWS,PROBLEM,SNUGGLE,TRACTOR,PROCTOR +FXANHRL,EUPLOLY,SEOUTAS,DRBTRBE|DEATHLY,EXPLORE,FRONTAL,SUBURBS,DEBTORS,DEPLORE FLOUANE,AOROGLA,PIAENTS,BBLCFDY|ABOUNDS,BOLOGNA,FIREFLY,PLACATE,ALREADY,POLENTA TLATOUN,PEDINOY,SATA IC, LS|PLAINLY,PLATOON,SATANIC,TEDIOUS,TATTOOS,TETANUS -MYEDPSE,EODBRTW,CRIEELS,BAMPNOT|BADDEST,CRIPPLE,EYEBROW,MOMENTS,COMPELS,COMPETE +YIILREA,DHAGDTN,CANDPID,SEEANAI|CHIANTI,DEADPAN,SANGRIA,YIELDED,CHAGRIN,SHEARED QUSUSED,VETAMIT,RIERINN,M P |MISUSED,QUERIED,REPRINT,VITAMIN,REPAINT,RESUMED PEMDHGL,UOENIOY,SROESIW,ZTALOUS|PRODIGY,SOMEHOW,UTENSIL,ZEALOUS,UROLOGY,ZOOLOGY PHLEORX,LOTTULE,KEOHEOY,S YLBT |KEYHOLE,LOTTERY,POLLUTE,SHOEBOX,POTHOLE,POTTERY @@ -48,7 +46,6 @@ HATTLNR,POIFEES,MIODWAY,WHLSP |HALFWAY,MITTENS,POODLES,WHISPER,MAIDENS,PAISLEY NWYSISY,PAEATLH,UOLMENR,SNIEAET|NOISILY,PAYMENT,SWEATER,UNLEASH,SWEETER,SWEETLY OIIKENG,VEOLOGS,LURGI Y,GR T|GEOLOGY,LURKING,ORIGINS,VIOLENT,VIOLINS,VIRGINS RHOLACY,OAYSIEA,NDPRSTE,PERENIX|NARRATE,ODYSSEY,PHOENIX,REPLICA,PERLITE,REPLACE -GECQTET,UISOUND,RNRSALY,FA M E|FIRSTLY,GERMANE,RACQUET,UNSOUND,RECOUNT,RESOUND TNIGELD,NERATWN,UAKNINY,MREVOEG|MERGING,NAIVELY,TREATED,UNKNOWN,TAINTED,UNRATED SUSUIES,RERDLTD,ERES ON,HWOL |EROSION,HURDLES,RESULTS,SWELLED,SESSION,SWOLLEN LCPLVAL,UPUIIEG,SOAAESD,ONTDCNT|LOUDEST,OPTICAL,SCALING,UNPAVED,LOADING,OPULENT @@ -57,12 +54,16 @@ JEDRERE,PUAVTAY,QRITAET,MITICTL|JITTERY,MEDICAL,PRIVATE,QUARTET,MEDIATE,METICAL SABAIOR,MMOPSGL,ELRNRED, PAT AO|ELAPSED,EMBARGO,MARTIAL,SPONSOR,SPANIEL,SPATIAL OHONNDR,SULCTEY,IRATGLS,WSTAAST|ISLANDS,OUTCAST,SHATTER,WRONGLY,ORANGES,OUTAGES EOVTRNG,MPOEISE,DIIROM ,RE |DIVERSE,EPITOME,MOORING,REVERSE,RIOTING,ROOTING -PAUKFNR,LNOOEIS,IOAIRAE,SRSCIRG|INSOFAR,LOOKING,PRAIRIE,SAUCERS,LOOKERS,SOAKING +SCOTEYL,DEELFTE,GONEYED,ALTKLUS|ACOLYTE,DONKEYS,GLEEFUL,SETTLED,GENTEEL,SETTLES RNRAANS,SELEIEY,IASCGSM,D TTT R|DESTINY,INTEGER,RELATES,SARCASM,DELETES,RETAINS PAYLREN,LWHCOIT,IOPEBOD,SNAALRW|INHABIT,LAYERED,POPCORN,SWALLOW,INHALED,INHERIT TRVDIUE,COTMORO,MTALBLM,SUEAE Y|CUTLERY,MOVABLE,STADIUM,TREMOLO,MUTABLE,TREMBLE MOSTATK,ORTLPKD,HUAPOOS,WIRNEEE|HORNETS,MISTAKE,OUTLOOK,WRAPPED,MISTOOK,OUTLETS GOVDTNT,VAUIEED,C RRA S, EM |COVETED,GARDENS,GOURMET,VARIANT,COURANT,COURTED +AAGOHIS,DCCPULY,PORALNN,LELENTT|ACCOUNT,DOLPHIN,LEGALLY,PARENTS,ACCENTS,LOCALLY +PIAHHES,WAOLFWY,BUSDOFL,QRNPIUT|BASHFUL,PROPHET,QUALIFY,WINDOWS,WASHOUT,WISHFUL +CLULBNT,BURDOOR,SALNAEE,MENIDUU|BLUNDER,CARIBOU,MUNDANE,SELLOUT,BURNOUT,CALIBER +GECQTET,UISOUND,RNRSALY,FA M E|FIRSTLY,GERMANE,RACQUET,UNSOUND,RECOUNT,RESOUND,GERMANY PHMIBUD,URSHXRE,RAEMANS,WNOPIEG|PREPARE,RHOMBUS,UNMIXED,WASHING,PROPANE,RAMMING,RAMPING UNIGDKG,KIDLIRN,LAECOND,WORA EE|KARAOKE,LODGING,UNICORN,WIELDED,WAILING,WARLIKE,WARLORD UUURRAM,PISTEEL,RAFICIS,MSLGPRD|MUSICAL,PILGRIM,RAFTERS,USURPED,MASTERS,MISREAD,MISTRAL @@ -71,7 +72,6 @@ MANLATD,SIEROOM,VPBHSEE,OHOSVUS|MANHOOD,OPOSSUM,SHELVES,VIBRATE,OPERATE,SHELVED, HOYALCR,RRNDUTS,MAEIAME,P S EY|HANDLER,MANIACS,PRESUME,ROYALTY,HANDLES,MANDATE,PREDATE TUGOEMY,LNNNDCG,USOPALI,SOUDINK|LOOPING,SUNDECK,TSUNAMI,UNGODLY,SOUNDLY,SUNNING,TUNNING TCITLOD,WRUFFLG,SARBHEE,G CK |GARBLED,SCUFFLE,TRICKLE,WARTHOG,SCUFFED,TRICKED,TRUFFLE -ITERRES,PLNDETR,RIASTNT,KETUASE|ITERATE,KINDEST,PLASTER,RETURNS,PEASANT,PENDANT,PENDENT PAORFEY,FRRNOUD,TEIWNTS, NALRL|FROWNED,PAINFUL,PENALTY,TERRORS,FERROUS,PARROTS,TENANTS IRVLIET,TLIWEUG,PNONKNS,NUCALID|INVALID,NUCLEUS,PLOWING,TRINKET,IRONIES,IRONING,TROLLED EIELISE,LYPTTES,REISURH,OP AAD |EYELASH,LEISURE,OPIATES,RIPTIDE,EYELIDS,REPAIRS,REPLIES diff --git a/res/levels/I b/res/levels/I index bfb638b..5d1cc86 100644 --- a/res/levels/I +++ b/res/levels/I @@ -1,6 +1,8 @@ # 4x5, advanced -TEIK,SOEU,WHFM, U T, T |STEM,SUIT,TOFU,WEEK,WHIM,SEEK,SEEM,SHIM,SOFT,THEM +TEIK,SOEU,WHFM, U T, T |STEM,SUIT,TOFU,WEEK,WHIM,SEEK,SEEM,SHIM,SOFT,THEM|PRESS ? FOR HELP +JYUY,OWNK,FLRX,AXEN,MUTH|AWRY,FLUX,JUNK,MYTH,OXEN,FLEX,FUNK,FURY,JURY VOEA,SIIW, ECL, UT, S |SECT,SOIL,SOUL,VIEW,VISA,VEIL,VEST +ANCH,IALD,FBBY,CO K, S|ABLY,CABS,COLD,FOLK,INCH,FOLD SUNN,TRRD,UAIP,Q F, S|QUIP,SAID,SURF,TURN,URNS,SAND,SUNS,TARP,TRIP,TURF SRON,ULIO,TEWE, NTD, OU |SEWN,SLID,SOON,TRUE,UNTO,SOWN,TOTE,TOWN,TRIO VERN,GUEB,NOIT,ABUU, C D|ABET,ACID,GURU,NOUN,VERB,GOUT,NEED,NERD,VEIN,VOID @@ -13,7 +15,6 @@ NUBS,AXPE,TYWA,EBL , E |AXLE,EBBS,NEWS,TUBA,TYPE,ABLE,EELS,TUBE IAOI,FUXY,TELS,BMBT, P |BABY,BUOY,FELT,IMPS,TAXI,BELT,TABS,TEXT BHTT,PAOP,G GK,C CS, I |BAGS,CATS,CHOP,GAIT,PACK,BACK,BAIT,CHIP,GAGS,PACT AOAL,RADY,LEEN,ZW ,K |AWAY,KOAN,LADY,REEL,ZEAL,KEEN,LEAN,LOAN,REAL -JYUY,OWNK,FLRX,AXEN,MUTH|AWRY,FLUX,JUNK,MYTH,OXEN,FLEX,FUNK,FURY,JURY NHCN,UAIY,PGLC,CI E,B |BALE,CHIC,NICE,PAIN,UGLY,BILE,PACE,PALE,PILE AOLL,LYKW,YVMP,RANS, OX|AVOW,LAMP,LYNX,ROLL,YAKS,LOOP,RAMP,RAMS,ROMP TKUT,SMIN, WLG, T , I |SILT,SKIT,SMUG,STUN,TWIN,SKIN,TILT @@ -23,7 +24,9 @@ RUIZ,ZTSH,QLNY,SAUB, O |QUIZ,RUSH,SLOB,STUB,ZANY,RASH,SASH SKNW,RCOK, LAN, HED, I |RINK,SCAN,SHOW,SKEW,SLED,RIND,SHED,SINK,SLEW,SLOW OOUE,RHKM,WAOS, NB , Z |ONUS,OOZE,ROBS,WAKE,WHOM,OAKS,RAKE,ROBE,ROOM,WOKE WLYE,OIEN,PNFA, M S, A |OMEN,ONES,PAYS,PLEA,WIFE,PIES,WAYS +EOOM,DXAK,IUWN,HLLP,AT S|ATOP,DOWN,EXAM,HULK,ILLS,ATOM,DOOM,HOOK,HOOP NUSD,YENB,MBOA,OAWE, MN|MEND,MESA,NUMB,OBOE,YAWN,MANE,MUSE,NAME,NEON +FORN,PHAL,B T,S M,N |BORN,FOAL,NORM,PORT,SHAM,BOAT,FOAM,FORM,FORT,SORT OOLR,PAWP,WPEN, IUF, M |OPEN,PAWN,POUR,WIMP,WOLF,PIER,POMP SAES,TUIR,RHT , TA , C |RATS,SCAR,STIR,SUES,THIS,RUES,STAR RIFY,WAAT,TRR , C , D |RACY,TART,TIDY,TRAY,WAFT,RAFT,RIFT,TACT,WART,WARY @@ -52,7 +55,6 @@ SMLL,GTOG,WIAH, PTB, M|GILL,SMOG,SPAM,STAB,WITH,WILL WDEB,TOML,IACO,G AA, SP|GOAL,IDEA,TACO,TOMB,WASP,GASP,WOMB KRWE,ILUS,LISN,GUOI, H|GLUE,IRON,KISS,KIWI,LUSH,GUSH,LION KAZE,ODGR,FUIZ,SNE , O |FAIR,FUZZ,KNEE,ODOR,SAGE,FAZE -ANCH,IALD,FBBY,CO K, S|ABLY,CABS,COLD,FOLK,INCH,FOLD FLMB,RIEN,HDSL,EVOS,I U |EVEN,FLUB,HISS,IDOL,RIMS,ELMS FEIM,LPRC,EVSL, ICS, E|EPIC,EVIL,FIRM,LESS,LICE,FIRE EAEN,FONH,WLAD,JRC , I |EACH,FLAN,JOIN,WAND,WREN,FLED @@ -62,7 +64,6 @@ MTUM,GIRY,PLCO,IEMH, O K|GORY,ITCH,MEMO,PICK,PLUM,GLUM,MOCK,PECK,PERK,PORK FALY,WIEE,RN O,OU ,HL |FLEE,HALO,ONLY,RULE,WILY,FILE,OILY EYRN,HOER, UUL, LS, D|EYES,HOLD,HORN,HOUR,HULL,HUES,HURL HDGP,ECRE,IEPN,PIM , O |EDGE,HEMP,HERE,ICON,PIPE,HIRE -HOOY,EDDW,GLPM,D S,F |DOOM,EDDY,FLOW,GLOW,HOPS,GODS EUHY,TAFE,PERB,GLOO,DCP |DEFY,ECHO,GLOB,PURE,TAPE,DARE,DUPE,PARE,PLOY IRBP,MCAB,JAKS,S UL,D O |DROP,IRKS,JABS,MAUL,SCAB,DRAB SHIA,DPAN, WF , E , O |DEAN,SHIN,SOFA,SPIN,SWAN,SPAN @@ -79,7 +80,6 @@ BUER,NLLL,TRUS,OWZZ, OT|BLUR,BUZZ,NULL,OWES,TROT,BULL,OWLS TIVM,CEAS,BYCE,G N, K|BIAS,CYAN,GIVE,TEAM,TICK,BEAK,BEAM,BEAN,TEAK,TEAS BCRD,FIIP,CRUU,DE ,EO |BIRD,COUP,DRIP,ECRU,FEUD,CORD,CRUD,FORD FETE,BLLS,MOOP,D Z , V |BETS,DOLE,DOZE,FLOP,MOVE,DOVE,MOLE -IUNE,EXLG,OIIT,KDMS,G |EXIT,GUMS,IDLE,KING,OILS,EDIT,GUNS,KILT GMIE,EAER,UES ,SSN ,RI |EMIR,GENE,RISE,SANE,USER,EASE,SINE WOMS,HNKT,ASOL,FU ,K |ASKS,FOOT,HUMS,KNOT,WOOL,FOOL,HOOT DLLR,ARAD,FJOG,CI ,G |AJAR,CLOG,DRAG,FLAG,GILD,CLAD,FLOG,FROG,GLAD,GRAD @@ -91,12 +91,12 @@ BIIE,DHNG,T VN,W ET, KA|BIKE,DIET,DIVA,THIN,WING,DINE,DIVE,THEN,WHEN,WINE CARF,VEEY,D MP, LN, W |CALF,DAMP,DAWN,DEEP,VERY,CAMP,CARP,VARY LEME,DKSP,SUIO,WH D,R |DEMO,LUMP,RUSE,SKID,WHIP,DUMP,RUMP,SHIP,SKIP EWAS,WRGP,SE T,HG ,F |EGGS,FEAT,HEAT,SWAT,WRAP,HEAP,SEAS,SEAT,SWAP +GUAK,BNST,CDLP,E I ,R |BULK,CUSP,EDIT,GNAT,RUST,BUSK,CULT,GULP,GUST AHAE,DNDF,CETY, ER, N |ANTE,CEDE,CHEF,DEAR,DENY,CHAR,DEAF,DEER -HROD,GAEP,PER ,IC , I |GIRD,HARP,HERD,ICED,PROP,HARD,HEED,PEEP,PREP -FORN,PHAL,B T,S M,N |BORN,FOAL,NORM,PORT,SHAM,BOAT,FOAM,FORM,FORT,SORT CIRK,LACW, HOU, ST, E |CART,CHOW,LICK,LIEU,LIST,CASK,CAST,CHEW,LACK,LAST PAOT,SLRN,BIMS,A ,Y |AIMS,BARN,PLOT,SLOT,YARN,AIRS,ALMS,BARS,PART BADS,FNLB,ELAK,W O , K |BLOB,ELKS,ENDS,FLAB,WALK,BALK,FADS,FLAK DIER,EOGO,KVTS, JE, D |DOGS,DOJO,EVER,KIDS,KITE,DIES,DIGS,DODO,DOES,KITS BUPG,CLYS,SOFM, WUF, I |BUYS,COPS,CUFF,SLUG,SWIM,BOYS,CUPS,SLIM,SLUM +ERFS,MIAT,HONN,AAKD,D |ARKS,DAFT,EONS,HIND,MOAN,HAND,HINT,MIND,MINT,MOAT [eof] diff --git a/res/levels/J b/res/levels/J index 9534ca7..5dcd12c 100644 --- a/res/levels/J +++ b/res/levels/J @@ -1,5 +1,5 @@ # 5x5, advanced -AANNE,SNMLG,CTPEH,UPZCP,BUUIL|APPLE,BUNCH,CAMEL,STUNG,UNZIP,SAUCE +AANNE,SNMLG,CTPEH,UPZCP,BUUIL|APPLE,BUNCH,CAMEL,STUNG,UNZIP,SAUCE|PRESS ? FOR HELP WIAPT,BHERA,TLVWN,RNOEL,I I R|BLOWN,INEPT,RIVER,TIARA,WHIRL,INERT,THORN,WHEEL SLNID,EOTBY,LEBJT,PAAUP,BVICO|BANJO,EVICT,LOBBY,PLAID,SETUP,PATIO NUNNR,PYRSH,SEWON,MLAEY, LK |MURKY,NYLON,PENNY,SEWER,SLASH,MELON,NEWER,PERKY,PYLON,SUNNY @@ -9,7 +9,7 @@ MORUK,WEAOE,KIYIW,GRDPM,SATAF|GRAPE,KAYAK,MOTIF,SERUM,WIDOW,MADAM SOADT,OBBCY,GYUNA,LCNEL,ALTAH|ABBEY,GOUDA,LYNCH,OCTAL,SLANT,OCTET AAIMT,FPUVP,TEAKE,BH RS,N |APART,BEAKS,FAIRS,NAIVE,THUMP,BEAMS,BEARS,FEARS,TEAMS,TEARS HOINA,SSEEN,UMOTO,RETGR,MYHCK|HYENA,MOTTO,REIGN,SMOCK,USHER,METER -BENSE,AOAEW,MROC ,D RZ , LO |ARROW,BOOZE,BRACE,DENSE,MELEE,AROSE,BELOW,MOOSE +AAKWD,DRCLN,JNUIE,SUAET,LWENP|ANKLE,DRAWN,JAUNT,LUCID,SWEEP,AWAIT,DRAIN,LACED,SWEET KILJZ,TRNTA,NEGNI,SAAUE,WHEKD|KHAKI,NINJA,SEGUE,TREND,WALTZ,SHAKE EANGT,AXMKN,LRULR,DICOY,C S|ARMOR,CANON,DINGY,EXULT,LICKS,DIMLY,DRUGS,LACKS,LINKS AHSMT,EUIFB,HDURE,TRTKY,DXOOL|ADORE,DRIFT,EXTOL,HUSKY,THUMB,DROOL @@ -28,10 +28,10 @@ WYIIR,KORLG,USAEA,QUCKY,LAENC|KOALA,LYRIC,QUEER,USING,WACKY,LUCKY,LYING TUAWL,CGNEE,AVR S,RHO , R |AGREE,AVOWS,CRAWL,RUNES,THAWS,CROWS,CURES,THREE,TUNES ZIWEN,TWPRY,JUIPL,UEDGD,YNALE|JUDGE,TWILL,UNWED,YEARN,ZIPPY,JEWEL,TWIRL TRKRY,GOEES,JSAVT,UPSIL, D|GRAVY,JOKED,TRAIL,UPSET,USERS,GRAIL,GREET,JOKES,TRAIT,TREES -KSSUN,TUFEK,QOOIR,IAXLE,WNARL|ISSUE,KNOLL,QUARK,TOXIN,WAFER,INFER,QUAIL +BWIPE,RIAKY,GLGHN,ICYLT,AACOH|AWAKE,BACON,GLYPH,ICILY,RIGHT,ALIKE,BIGOT HOCFA,REIIR,GWWLE,S NRT, PUS|GENRE,HOWLS,RECUR,SEPIA,SWIFT,GENIE,GENUS,HEIRS,SOILS LNCIH,MULRY,VIIVR,UEAAT,FAFCE|FAIRY,LEAVE,MULCH,UNFIT,VICAR,LEARY,VALVE -HWONR,OGMDY,AUZRS, OLEE, AO |AGONY,AWARE,HOLDS,HUMOR,OOZES,HOLES,HOMES,HOODS,OGLES +DEBET,ESAMC,QTTGS,UUIIW,ALEOE|ATTIC,DEEMS,ELBOW,QUIET,USAGE,AUTOS NACRA,WCMAD,MHEIR,OOIUE,QUNLT|MANIA,NOMAD,OCCUR,QUILT,WHERE,QUEUE,WHEAT,WHILE SDSWT,ENAOW,THREL,AAEI , VP |ADEPT,ANVIL,EASEL,SHAWL,THROW,ADAPT,SHEET,SHREW,SNAIL,THREW LILOT,SRORL,OUBAR,TWRIE,JOCDN|JUROR,LOCAL,ORBIT,SWORN,TILDE,SOLAR,SWOON,SWORE @@ -69,7 +69,7 @@ AURBL,GPIAH,SINCN,LLE Y,F I|ALIBI,FINAL,GLEAN,LUNCH,SPRAY,AURAL,SPICY RENFR,LAMKE,STDIM,CROPT,DUUAY|CRUFT,DENIM,LUMPY,RADAR,STOKE,CEDAR,LUNAR,REMIT FOHRS,AHRGR,ETTCE,CEOOH,WCI |ACTOR,CHORE,ETHOS,FORCE,WEIGH,FETCH,FORGE,WHICH CEWIT,PDIRW,BYMOP,AHAAE,ENDCY|ADMIT,BYWAY,CHIRP,ENDOW,PEACE,CHART,EDICT,ENACT -FIUDE,ANISH,GRFGT,HBNZZ,S T |ABUZZ,FIFTH,GRIST,HINGE,SNIDE,ABIDE,ABUSE,ANISE,ARISE +SRGNS,CIUCE,BOAD ,ISSU ,V |BRACE,CRUDE,ISSUE,SIGNS,VOGUE,BOGUS,CRANE MBTCE,BRCOO,AAIUK,RINIT,NEBHS|ABBOT,BRICK,MENUS,NICHE,RATIO,BATHE,BATHS,MINCE,MINUS DHAEW,TDCME,AEFLT,MAUAR, YG |ADAGE,ADULT,DEFER,MACAW,THYME,DEALT GDYLL,SAAMP,ITLOH,TIKEO,HUBCR|GULCH,HIKER,IDYLL,STAMP,TABOO,STALL @@ -78,7 +78,7 @@ FLACL,EAGHH,OPLKE,PUOMT,NOSAA|EPOCH,FLAME,NASAL,OUGHT,POLKA,FLAKE,FLOAT,PLACE YEALS,IAPUH,MOLST,RNO , UR |INPUT,MARSH,MULLS,ROOST,YEAST,MALLS,MEALS,ROAST,ROLLS,YELLS WONLD,EBUDS,QQAIM,OIOEP, U Y|EQUIP,OBOES,QUALM,WINDY,WOULD,WINDS,WINES,WOODS LRWUD,SNGLN,OONRT,GLUEI,ETAAY|ENNUI,GLUED,LOWLY,ORGAN,START,GOURD -TLEGY,EOLED,RIGLT,HWXH ,VE |ELEGY,HOLLY,RIGHT,TWEET,VEXED,EIGHT,RILED,TIGHT,TILED,TWEED +LROFY,PICET,IHTOH,ULENN,TEMCR|IRONY,LEMON,PITCH,THEFT,ULCER,LEECH,LITER,PEONY,PHONY,TIMER SRNEE,QOHOS,HYRUK,ACICR,GUAZP|ACHES,GRAZE,HONOR,QUICK,SYRUP,ACRES,GORES,GRACE,QUACK EAKFK,VLEES,SRROD,LOW R, A |ERROR,LAKES,LOAFS,SLEEK,VOWED,ERRED,LOWER,SOWED HUOAU,MOWON,AAIET,CHYPD,BDMLI|ADOPT,BAYOU,CHILI,HUMAN,MOWED,BUILD,BUILT,CHILD,COMET diff --git a/res/levels/K b/res/levels/K index 628bcd5..1fe80e3 100644 --- a/res/levels/K +++ b/res/levels/K @@ -1,10 +1,10 @@ # 6x5, advanced -TRADNE,RIUCUD,UOROH ,VNSIL , DQE |RISQUE,TOUCHE,TRADED,UNDONE,VIRILE,RIDDLE,TORQUE,TRACED,UNSOLD +TRADNE,RIUCUD,UOROH ,VNSIL , DQE |RISQUE,TOUCHE,TRADED,UNDONE,VIRILE,RIDDLE,TORQUE,TRACED,UNSOLD|PRESS ? FOR HELP YOABEM,SANHLE,TNUPUS,RICRT ,U S |RINSES,SACRUM,TOUPEE,UNABLE,YACHTS,RICHES,ROASTS,ROUBLE,SNARES,TOASTS VRTOON,REAING,ZOIPTD,W N S,T B |ROBOTS,TRIPOD,VOTING,WEAPON,ZONING,ROBINS,TONING,TOTING,TRAINS,TRAITS VTONLY,POLDOS,TEA CM,SRI DE, A |POODLE,SELDOM,STANDS,TRANCE,VAINLY,PRINCE,STANCE UOASES,SNLOTY,PTOYSD, NI H, I X|POLISH,PONIES,SNOOTY,STAYED,UNISEX,POISED,POLITY -RTIIUS,ULTKRT,SUHCDR, NUUEY, CFF |RUCKUS,SLICER,STUFFY,UNHURT,UNTIDY,SLICES,SNIFFS,STIFFS,STUFFS,SUCKER +MRVORW,TEKVUY,RAGEET,S DNAP, IR |MAGNET,MAKEUP,REDRAW,SAVORY,TRIVET,REGRET,REVERT TTREMS,SWLVKE,PITLV , OEAE , T |PIRATE,SOLVES,STEAKS,TOTEMS,TWELVE,SIEVES,SWEATS,SWEETS,TITLES,TWEAKS SADTGC,RLPGES,OEYNIN, XID , N |OXYGEN,RANGES,REDDEN,SEPTIC,SLINGS,OXIDES,SLIDES SEATRY,PAIALW,RTRBAS, OESE , P |POETRY,RAISES,SEESAW,STABLY,STRAPS,PARSES,PARTLY,STATES,STEALS @@ -12,7 +12,7 @@ OTLCCY,SUTTAN, CAKEK, HRIRE, B |OUTCRY,SCRIBE,SHAKEN,STRICK,SULTAN,SHRIEK,SUL PHCNEE,NCUANR,SEETSS, IR A, O |NEUTER,PECANS,PHRASE,SCONES,SIENNA,PHONES,SCENES REAEIO,QCFLVE,SULIBL,AAZ LA,G T |ACTIVE,GAZEBO,QUALIA,REFILL,SALIVA,RELIVE,RETELL,RUTILE AEUHNS,INTVEM,TRRUSE,SMMI , C O |ACROSS,ANTHEM,IMMUNE,SERVES,TRUISM,ARMIES,SERIES,SERINE -RAAUAT,STOCMA,ARQMIR,YCIGON,DEN |ACQUIT,DRAGON,RANCOR,STIGMA,YEOMAN,ACACIA,DEACON,SEAMAN,SEQUIN +BPSUIS,COREND,DCNSCL,UAQILT,AIH U |ACQUIT,BASINS,CONSUL,DIRECT,UPHELD,BASICS,CASSIS,UPHILL PEPANY,VLNVRR,RIO CT,TAS EK, M GE|PAPACY,PLOVER,REMARK,TENANT,VISAGE,REPACK UTRLTW,PNLEOY,SIXAAR, HFFLK, I IS|PILLOW,PIXELS,SHIFTY,STREAK,UNFAIR,PILLAR,SHIFTS,STILLS,STILTS SBUBKE,RQLNGL,OPTEED, EAINA, AS|OBLIGE,RETINA,SEABED,SPANKS,SQUEAL,RELIED,RELIES,SPLINE @@ -22,13 +22,13 @@ VOICUL,USBFET,TUNB D,WATD S,OIEP |OUTPUT,TABBED,USEFUL,VOICES,WINDED,OUNCES,VOI PMMUUE,QATDSY,SHUAGS,NUESR ,R IC |NATURE,PUMICE,QUEASY,RHESUS,SMUDGE,SATIRE,SHEARS,SMEARS,SUTURE TPAEER,VARSOT,NOYDUM,UUSH S, RN |NURSES,TANDEM,TRADER,UPSHOT,VOYEUR,TARSUS,TOSSES,TRADES SRBORT,NOTAIY,MCHEME,UTR N , EM |MEMORY,NOTARY,SCHEME,STRAIT,URBANE,MOMENT,SERENE -TAONYS,MUDAET,SOCTA ,QHA W , IG K |MACAWS,QUOTAS,SHANKS,SIGNET,TODAYS,MAGNET,QUOTES,THANKS -PHRSEY,NNAALG,TLINNL,UUSUSH,ME TT |MUSSEL,NEATLY,PLINTH,THRASH,UNSUNG,MEASLY,THINLY,THRALL,THRUSH,UNRULY +WARROD,QUTSRS,MOZICW,HPEAT ,OI |HAZARD,MORROW,OPTICS,QUESTS,WIZARD,HARROW,HOTROD,MARROW +HYIFHE,OPRIFT,RRPOCD,POOGES,LE S |HEIGHT,LYRICS,OPPOSE,PROOFS,ROOFED,HEROES,REPOSE PROLBL,MIIPLE,NHNGES,SKPU , R |MINGLE,NIPPLE,PROPEL,SHRUBS,SKILLS,SINGLE ROUTET,PWCPVR,SCAULE,OKSR , AE |OCCULT,PAUPER,ROSTER,SKATER,SWERVE,POSTER,RASTER,ROUTER,SOUTER RWOUES,NUAWMY,SHDRA , NIT , YM |NUDITY,RHYMES,RUNWAY,SHOUTS,SWARMS,SHARES,SHORES,SHORTS,SHORTY,SUNRAY WASOAR,MORAET,TPYILC,UR KUY, I |MARKET,MOSAIC,TRYOUT,UPROAR,WARILY,MARKER,WORKER -BOPTMT,SIOMHR,ZEEHNP,THTAAE,DRROY |BITMAP,DREAMT,SOOTHE,THRONE,ZEPHYR,THROAT +RHRGEP,TEECUS,F COO ,M NK ,G M |FENCES,GECKOS,MERGES,RECOUP,THEMES,THROES OUHPIT,UCMEED,SSIMRS,NOTL , OS |NOISES,OUTLET,SCOPED,SUMMIT,USHERS,OUTSET,SCOPES,SOILED,SUMMED LHBALS,SPOUYT,UIREAD, TN WR, N|LINEAR,SHOULD,STRAYS,STREWN,UPBEAT,SHOALS,SHREWD,SPRAYS,SPREAD,STRAWS LETLIR,QNQMLS,NIOUED,KUIHP ,SLU |KNOLLS,LIQUID,NETHER,QUILLS,SLUMPS,SETUPS @@ -39,7 +39,7 @@ BYGMRC,DEOILY,RTLGIT,AREANE, AE |ATOMIC,BEAGLE,BYLINE,DREARY,REGENT,ARGENT,BRA AXFCOS,OEGUUE,EBEIET,DOALS , CCMA |ABACUS,DEFIES,DOGMAS,EXCUSE,OCELOT,ACCUSE,DEFUSE,EXCISE FUCBNS,AIMPDT,DBIEEE,RJODL , S R |ABIDES,ASCENT,DIMPLE,FJORDS,RUMBLE,ASIDES,DIODES,FUMBLE PCELTS,WIOMIT,SBUUCX,ARSES , DJ |ABJECT,ADULTS,PREMIX,SCOUTS,WISEST,ADJUST -RUNBEO,NOMOCR,LICIAL,SA TY,V |LIMBER,NUMBER,ROCOCO,SOCIAL,VANITY,LUMBAR,LUMBER,RACIAL,SANITY,SOMBER +KERNLS,SOADAE,HC EEL, U R, M|HEADER,HORDES,HURDLE,KERNEL,SCREAM,HERDER JAOVRE,STBDAS,WOIINL, A ED, V |JOVIAL,SABINE,STAIRS,WAIVED,WOODED,STAINS,STAVES,STOVES,WAIVES INLUUO,TSNGKR,AHTOOX,WIDRAT,GAONTE|ASTUTE,GINGKO,INDOOR,THORAX,WALNUT YTLULW,ROEENS,SERLOT,L W S , C |LOWEST,RERUNS,SELECT,STEELS,YELLOW,STRESS @@ -47,18 +47,18 @@ DXBUCH,EAMOTY,TUOEET,BHPBON,ODDIGR|BABOON,DUMBER,EXPECT,ODDITY,THOUGH DAIFAS,AOPETL,PRROLN,MPTHO , A |APPEAL,DRIFTS,MAROON,MORALS,PATHOS,MOTELS GAOPVH,BNCUFL,OOSKEF,PETAON,ECYOGE|BECKON,ENOUGH,GOSPEL,OCTAVE,PAYOFF ABIUTD,HRBAAY,EUSOIZ,GAPTRC, R N|ABROAD,AUBURN,ERSATZ,GRITTY,HAPTIC,ABSURD -PISORC,REBNAB,CBGKTL,AOCACE,N U E |ABSORB,COGNAC,NICKEL,POUNCE,REBATE,NEGATE +FAHSTA,ETENZS,PIGIIC, RVHNG, Y|ETHNIC,FIESTA,FIGHTS,FRENZY,PAVING,EIGHTS,EIGHTY,PAGING OLTOTA,PCABRS,AOPNAR, HOLID, U |ACTORS,OUTBID,PHOBIA,PLANTS,POPLAR,PLANAR EREURE,AEFGGA,VIROIN,RDAM S, N O|ADAGIO,ANEMIA,ERRORS,REFUGE,VIRGIN,VERMIN NDCPIW,STAHPO,ESUADE,AEPDTS, EE |ADAPTS,ESCAPE,NEPHEW,SECEDE,STUDIO,ESCHEW,ETUDES BEFILM,IAYCUE,NTUENF,PHASOA,AFSLEN|AFFINE,BEACON,ITSELF,NAUSEA,PHYLUM SQLIAE,PLIRIL,RAUPPN,ATESRH, US |ALLURE,PLURAL,RAISIN,SQUISH,STEPPE,SQUIRE RHAAUR,OONQOT,CNWDRE,TPSUN ,I DE |CONDOR,INSURE,OPAQUE,RODENT,THWART,INDENT,INSANE,INSERT -COCKRO,FCUPOT,SUHGHN, P E E, R Y|COUPON,CUCKOO,FOUGHT,SCURRY,SPHERE,SOUGHT +MEEIRE,RIREOD,EHCUIR,WNSBT , O RZ |ENSURE,MIRROR,MORBID,RECITE,WHEEZE,RESIZE EVSDLY,GREEGR,UEONSE,CNUGEN, NI |CRUISE,EVENLY,GENDER,GROGGY,UNSEEN,ENSIGN,GRUDGE,GRUNGE,GRUNGY HMPAIR,IHLDNN,TEACTS,RAROWY, L |HARDLY,IMPAIR,REACTS,TALONS,THROWN,HEROIN,HERONS,REPAIR,THROWS SAVNUY,EPRTGH,W MBHE,L LRSS,I OIIC|EARTHY,IAMBIC,LAVISH,SPONGE,WALRUS,EARTHS,SPONGY,SPRIGS -TRZNBR,EKIMKE,LNXUMO,VICYRY,AUUTOS|AKIMBO,ENZYME,LUXURY,TRUNKS,VICTOR +FSFCST,TGYEKE,EIDNIS,PLRTH , AB |EGRESS,FIFTHS,PLANKS,PSYCHE,TIDBIT,ELDEST,FLANKS NUYONT,KLANGS,LIUEUE,WADDLY, O C |KLUDGE,LAYOUT,LOUDLY,NUANCE,WIDENS,LOUNGE,WADDLE,WIDELY CMSEDD,IUPGTT,NNIQUE,DAEHE ,URGA |CREATE,DASHED,IMPEDE,NUGGET,UNIQUE,CASHED CORTOE,RITAAL,M WUTY,H YBG , MO |COWBOY,COYOTE,HOMAGE,MORTAL,RITUAL,MIRAGE,ROTATE @@ -70,8 +70,7 @@ PETIED,EHOTTN,ABSACH,CNLSZE,T R |ABLAZE,CHOSEN,ENRICH,PETITE,TESTED,CHOICE,ENL BUACES,ANIKIP,LECALC,JANDUN, C |ACIDIC,ANNALS,BACKUP,JUICES,LEADEN,LANCES PMNAUS,UFLNCE,TUFGEL,APAI T,SH E |AFFECT,PHAGES,SPLICE,TUNNEL,UMLAUT,TUNICS FOLECT,BPBRSS,IGRAWE,AYI ED, N |AGREED,APIECE,BYLAWS,FOREST,INBRED,AGREES -AOOTAT,GUPAOE,RAIBLS,EGH SR,BD H |AGHAST,BOOTHS,EDIBLE,GUITAR,RAPTOR,EDITOR -CRTOVN,AYSANY,GEEROC,PSHHLF,BLOEIT|ASSENT,BEHALF,CLERIC,GROOVY,PYTHON +LLFWIT,AFNAEN,PAEVCH,SP C D,ER R|AFFAIR,ELEVEN,LANCET,PREACH,SPEWED,LANCER RENUPT,IIOEED,TNFGCE, ATIFY, R L|INFECT,RATIFY,REFUEL,TINGED,TROUPE,RANGED,RINGED JESSSS,TUOTOY,GIMARW,BLWEY ,A L |ALWAYS,BESTOW,GLOSSY,JUSTLY,TIMERS,JEWELS,TIMELY AUULES,SEBTGT,GMNILY,DLE UH, P C |AMULET,DEPICT,GENIUS,SLEIGH,SUBTLY,DENIES,GENTLY,SMELLS,SMELLY,SUBLET @@ -87,16 +86,18 @@ LDZIFW,RWAARE,DILRCS,BER OD,AUM |ADMIRE,BURROW,DWARFS,LIZARD,RELICS,BURROS,LIL LRARHG,EUOTEE,OOTDAS,FD IN ,A C |ADORES,ERODES,FRACAS,LOATHE,OUTING,ADORNS EKEDUS,LXGPOH,SEOTCN,ADRITD, R AN |ADOPTS,ERRAND,EXODUS,LEGION,SKETCH,SKEINS DIAUTS,AEDRDW,UPLGEE,WLGEAH,J SS |ALLUDE,DEARTH,JIGSAW,UPSETS,WEDGES,DEGREE,DELETE,DILUTE -IYMRSY,MOSNLT,AUVOTF,QLAEED,LRO Z|ALMOST,IRONED,LOVELY,MYSELF,QUARTZ,LOANED,LOONEY,MOANED,MOORED +AAVROR,REIMDD,EFFCEY,SDEICE,H N GO|ADVICE,EFFIGY,HAIRDO,RANCOR,SEEMED,HAIRED,SAVIOR,SENIOR EMRECO,AAUOND,CUTIAL,INLSET,BCH |AMUSED,BURIAL,CALICO,ECHOED,INTENT,BURIED,CAUSAL,CAUSED,CURSED,INTEND MECFIS,RUFENN,VAR ET,LOW LR,C |CAREER,LUCENT,MUFFIN,RECENT,VOWELS,COFFIN LHLQSE,DOOLAT,CLCIUR,STRMPS, IUN |CLIQUE,DOLLAR,LOCUST,SHRINE,STOMPS,CHIMPS,COLLAR,STRIPE,STRIPS SRISLY,FBEEIS,VENGUT,OPRICH,CUJ |CRISIS,FUNGUS,OBJECT,SPEECH,VERILY,CENSUS,CEREUS,FREELY,SURELY,VERSUS -SCLRHE,THIMDS,MOAAPI,DECTST, N A |DECADE,DELTAS,MONTHS,SCAMPI,THIRST,DEATHS,SHARDS,SHARPS,TENTHS,THIRDS +OANUMN,RBJTSR,WOCIRE,IEG O ,DNT |DOCTOR,INJURE,OBTUSE,REGIME,WANTON,RATION,RECTOR,REGION,RETIRE,RETURN JEVUSN,DNNTMP,UAGERR,POLIAY,S WR E|DEVISE,JAGUAR,PANTRY,SOLEMN,UNWRAP,PALTRY,SENTRY,SEVERE,UNWISE TOFPLT,MEOUIA,WNWVCS,DYLEE ,E S |DEFECT,ENSUES,MYOPIA,TOWELS,WOLVES,DELVES,DOWELS -ROBHED,FYSEIT,HIORAL,SENWS , N |FISHED,HONEST,HYBRID,RESEAL,SNOWED,FINEST +GHDSIN,IOVEUE,SLPURS,EMEI M,T |ELDERS,GOVERN,IMPURE,SODIUM,THESIS,EMPIRE,THEIRS ZUNOTS,MYGMAE,GEDLEY, AMRLL, RA |GENRES,MAMMAL,MEDLEY,MURALS,ZYGOTE,MADRAS,MEDALS,ZEROES TRCATC,VENPRD,BAOUCE,SPRRE , I |BARRED,SPRUCE,TENURE,TROPIC,VACATE,SACRED,SECURE,SENATE,TARRED +NEBPEE,GNAEAL,FREBLS,P UR ,K |FEEBLE,GRAPES,KNEELS,NEURAL,PEBBLE,PEARLS FLSSNY,DOUGSI,AIOMHM,ETYLIL,SGNIUS|ALUMNI,DINGHY,EGOISM,FOSSIL,STYLUS [eof] + diff --git a/res/levels/L b/res/levels/L index 4090111..f649488 100644 --- a/res/levels/L +++ b/res/levels/L @@ -1,5 +1,5 @@ # 7x5, advanced -IAAGKUY,DMVERIL,TRIOFET,EIDNMCC,BNSHERE|BASHFUL,DIVORCE,ENDEMIC,IMAGERY,TRINKET +IAAGKUY,DMVERIL,TRIOFET,EIDNMCC,BNSHERE|BASHFUL,DIVORCE,ENDEMIC,IMAGERY,TRINKET|PRESS ? FOR HELP AUAALOD,SBVNEIG,ONLIINN,IAOTDTE,Q A T|ABANDON,INVALID,OBVIATE,QUOTING,SALIENT,SALTING CAUBPIT,JFHAELI,ETNMZAN,OIFUBZL,KRCGNOE|CRUMBLE,ETHANOL,JACUZZI,KINGPIN,OFFBEAT QRORTLL,THTAPOD,SOAMREE, U TL O, P |QUARREL,SHAMPOO,SPOTTED,TOTALED,TRAMPLE,SHORTED,SPORTED,TROTTED @@ -11,7 +11,7 @@ SVBLAEN,IDABITT,EATHLUC,CLYSOOH,WIOAKID|CLOAKED,EVASION,IDYLLIC,SABBATH,WITHOUT SEPARIS,PSMDETN,OADOSN ,R LTCR , T E |OSMOSIS,PALACES,PATTERN,REPORTS,SADDENS,RETORTS,SETTERS GRAOEAC,JEWRHDT,EOREOIE,CIVPLSR,PASITEL|CORRODE,EASIEST,GRAPHIC,JEWELER,PIVOTAL REDEENE,VANGUON,PICWIMY,MU UWFS, ISAT|MIDWIFE,PUNGENT,RACEWAY,VACUUMS,VENISON,MEDIUMS -SEYBBOT,ANNAOCN,BARINNY,GXODDDE,ERTMAEX|ANYBODY,BROADEN,EXTINCT,GERMANE,SANDBOX +SEYBBOT,ANNAOCN,BARINNY,GXODDDE,ERTMAEX|ANYBODY,BROADEN,EXTINCT,GERMANE,SANDBOX,GERMANY SUMNGED,MNNWIRS,UEBFANE, AIK Y , H O L |MANKIND,MEMOIRS,SHINGLE,SUBWAYS,UNIFIED,UNIFIES WALROKA,AOIUIEK,PRTSURT,SISGBLE,DHPWKSD|ARTWORK,DISGUST,PAPRIKA,SOLUBLE,WHISKED PUCFELL,APRNNIY,HEPEATT,TCEA CS, OM |ACCENTS,APPEALS,HUMANLY,PERFECT,TOENAIL,HORNETS diff --git a/src/million.a b/src/million.a index 2933807..934fea8 100644 --- a/src/million.a +++ b/src/million.a @@ -72,6 +72,7 @@ Start !source "src/ui.main.menu.a" !source "src/ui.about.a" !source "src/ui.play.a" + !source "src/ui.message.a" !source "src/ui.common.a" !source "src/puzzle.a" !source "src/storage.a" diff --git a/src/ui.about.a b/src/ui.about.a index 6de0f6e..6c0921c 100644 --- a/src/ui.about.a +++ b/src/ui.about.a @@ -47,8 +47,8 @@ kAboutWritten !byte 14 !raw "WRITTEN BY 4AM" kAboutTested - !byte 20 - !raw "PLAYTESTED BY QKUMBA" + !byte 21 + !raw "PLAYTESTED BY OPTION8" kAboutMusic !byte 22 !raw "MUSIC BY GABRIEL FAURE" diff --git a/src/ui.main.menu.a b/src/ui.main.menu.a index ec03ebe..a958bc8 100644 --- a/src/ui.main.menu.a +++ b/src/ui.main.menu.a @@ -256,7 +256,7 @@ asterisk !byte "*" version !byte 4 - !raw "V0.1" + !raw "V0.3" menuline_play !byte 20 !raw "RETURN.....PLAY GAME" diff --git a/src/ui.message.a b/src/ui.message.a new file mode 100644 index 0000000..c4b805c --- /dev/null +++ b/src/ui.message.a @@ -0,0 +1,56 @@ +;license:MIT +;(c) 2020 by 4am +; +; utility functions for showing modeless auto-disappearing messages during play +; +; Public functions: +; - SetNextMessage +; - ShowMessage +; - HideMessage +; + +showingMessage ; [byte][private] + !byte 0 ; 1 = currently showing message, 0 = not + +currentMessage ; [private] + !byte 20 + !raw "01234567890123456789" + +noMessage ; [private] + !byte 20 + !raw " " + +SetNextMessage +; copies a new message into private buffer +; (does not display the new message on screen) +; in: A/Y points to length-prefixed string (max 20 characters) + +ST16 $FE + ldy #0 + lda ($FE), y + tay ; Y = string length +- lda ($FE), y + sta currentMessage, y + dey + bpl - + rts + +HideMessage +; out: preserves A +; safe to call multiple times, does nothing if no message is showing + pha + lda showingMessage + beq + + +PRINT_AT noMessage, 7, 10 + lda #0 + sta showingMessage ++ pla + rts + +ShowMessage +; should really only call once +; will clear message before showing the new one, so there may be a small flicker + jsr HideMessage + +PRINT_AT currentMessage, 7, 10 + lda #1 + sta showingMessage + rts diff --git a/src/ui.play.a b/src/ui.play.a index bbd0593..df5d9c0 100644 --- a/src/ui.play.a +++ b/src/ui.play.a @@ -33,10 +33,10 @@ kWorldRightMargins !byte 27,28,30,31 !byte 27,28,30,31 -kStartingColor +kThinLineStartingColor !byte $D5,$AA -kPlayKeys +kPlayKeys ; must keep in sync with kPlayKeyHandlersLo/Hi arrays !byte $0B ; up arrow !byte $0A ; down arrow !byte $08 ; left arrow @@ -82,6 +82,7 @@ PlayEventLoop bit CLEARKBD and #$7F sta gLastKeyPressed + jsr HideMessage ldx #0 - ldy kPlayKeys, x @@ -287,6 +288,13 @@ AnimatePuzzleIntoPlace @max cpy #$FD ; SMC bne -- rts +; +LDADDR test_message +; jsr SetNextMessage +; jmp ShowMessage +; +;test_message +; !byte 18 +; !raw " PRESS ? FOR HELP" ;------------------------------------------------------------------------------ ; DrawPuzzleChrome @@ -380,7 +388,7 @@ DrawThinLine tya and #1 tax - lda kStartingColor, x + lda kThinLineStartingColor, x - sta ($FE), y eor #$7F iny @@ -436,7 +444,7 @@ DrawOneSelectionIndicator and #1 eor #1 tax - lda kStartingColor, x + lda kThinLineStartingColor, x ldx gSelectedLogicalColumn beq + - iny