diff --git a/doc/NetHack开源代码泛读报告.docx b/doc/NetHack开源代码泛读报告.docx new file mode 100644 index 0000000..ae9b9a1 Binary files /dev/null and b/doc/NetHack开源代码泛读报告.docx differ diff --git a/doc/test.txt b/doc/test.txt index 9d07aa0..2aefa72 100644 --- a/doc/test.txt +++ b/doc/test.txt @@ -1 +1,4 @@ -111 \ No newline at end of file +whatever you do +wherever you gou +i am always here +waitting for you \ No newline at end of file diff --git a/fountain.c b/fountain.c new file mode 100644 index 0000000..9ceb75d --- /dev/null +++ b/fountain.c @@ -0,0 +1,710 @@ +/* NetHack 3.7 fountain.c $NHDT-Date: 1687058871 2023/06/18 03:27:51 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.95 $ */ +/* Copyright Scott R. Turner, srt@ucla, 10/27/86 */ +/* NetHack may be freely redistributed. See license for details. */ + +/* Code for drinking from fountains. */ + +#include "hack.h" + +static void dowatersnakes(void); +static void dowaterdemon(void); +static void dowaternymph(void); +static void gush(coordxy, coordxy, genericptr_t); +static void dofindgem(void); +static boolean watchman_warn_fountain(struct monst *); + +DISABLE_WARNING_FORMAT_NONLITERAL + +/* used when trying to dip in or drink from fountain or sink or pool while + levitating above it, or when trying to move downwards in that state */ +void +floating_above(const char *what) +{ + const char *umsg = "are floating high above the %s."; + + if (u.utrap && (u.utraptype == TT_INFLOOR || u.utraptype == TT_LAVA)) { + /* when stuck in floor (not possible at fountain or sink location, + so must be attempting to move down), override the usual message */ + umsg = "are trapped in the %s."; + what = surface(u.ux, u.uy); /* probably redundant */ + } + You(umsg, what); +} + +RESTORE_WARNING_FORMAT_NONLITERAL + +/* Fountain of snakes! */ +static void +dowatersnakes(void) +{ + register int num = rn1(5, 2); // Generate a random number between 2 and 5 to represent the number of water snakes + struct monst *mtmp; + + if (!(gm.mvitals[PM_WATER_MOCCASIN].mvflags & G_GONE)) { // Check if water snakes are extinct + if (!Blind) { + pline("An endless stream of %s pours forth!", + Hallucination ? makeplural(rndmonnam(NULL)) : "snakes"); + } else { + Soundeffect(se_snakes_hissing, 75); // Play a sound effect of hissing snakes + You_hear("%s hissing!", something); // Output the sound of hissing + } + while (num-- > 0) { + if ((mtmp = makemon(&mons[PM_WATER_MOCCASIN], u.ux, u.uy, MM_NOMSG)) != 0 + && t_at(mtmp->mx, mtmp->my)) { + (void) mintrap(mtmp, NO_TRAP_FLAGS); // Place the water snake on the map and check for traps + } + } + } else { + Soundeffect(se_furious_bubbling, 20); // Play a sound effect of furious bubbling + pline_The("fountain bubbles furiously for a moment, then calms."); // Output a message about the fountain bubbling + } +} + + +/* Water demon */ +static void +dowaterdemon(void) +{ + struct monst *mtmp; + + if (!(gm.mvitals[PM_WATER_DEMON].mvflags & G_GONE)) { + if ((mtmp = makemon(&mons[PM_WATER_DEMON], u.ux, u.uy, + MM_NOMSG)) != 0) { + if (!Blind) + You("unleash %s!", a_monnam(mtmp)); + else + You_feel("the presence of evil."); + + /* Give those on low levels a (slightly) better chance of survival + */ + if (rnd(100) > (80 + level_difficulty())) { + pline("Grateful for %s release, %s grants you a wish!", + mhis(mtmp), mhe(mtmp)); + /* give a wish and discard the monster (mtmp set to null) */ + mongrantswish(&mtmp); + } else if (t_at(mtmp->mx, mtmp->my)) + (void) mintrap(mtmp, NO_TRAP_FLAGS); + } + } else { + Soundeffect(se_furious_bubbling, 20); + pline_The("fountain bubbles furiously for a moment, then calms."); + } +} + +/* Water Nymph */ +static void +dowaternymph(void) +{ + register struct monst *mtmp; + + if (!(gm.mvitals[PM_WATER_NYMPH].mvflags & G_GONE) // Check if water nymphs are extinct + && (mtmp = makemon(&mons[PM_WATER_NYMPH], u.ux, u.uy, MM_NOMSG)) != 0) { // Place a water nymph on the map + if (!Blind) + You("attract %s!", a_monnam(mtmp)); // Output a message indicating the player attracted the water nymph + else + You_hear("a seductive voice."); // Output a message indicating the sound of a seductive voice + mtmp->msleeping = 0; + if (t_at(mtmp->mx, mtmp->my)) + (void) mintrap(mtmp, NO_TRAP_FLAGS); // Check for traps at the location of the water nymph + } else if (!Blind) { + Soundeffect(se_bubble_rising, 50); // Play a sound effect of a rising bubble + Soundeffect(se_loud_pop, 50); // Play a sound effect of a loud pop + pline("A large bubble rises to the surface and pops."); // Output a message about a large bubble popping + } else { + Soundeffect(se_loud_pop, 50); // Play a sound effect of a loud pop + You_hear("a loud pop."); // Output a message indicating the sound of a loud pop + } +} + + +/* Gushing forth along LOS from (u.ux, u.uy) */ +/* + * Function to handle fountain gushing event + */ +void dogushforth(int drinking) +{ + int madepool = 0; + + /* + * Clear the area around player's position and check for fountain gushing + */ + do_clear_area(u.ux, u.uy, 7, gush, (genericptr_t) &madepool); + + /* + * If no pool was generated, display appropriate message based on whether the player is drinking or not + */ + if (!madepool) { + if (drinking) + Your("thirst is quenched."); + else + pline("Water sprays all over you."); + } +} + +/* + * Callback function for do_clear_area to handle each grid square + */ +static void gush(coordxy x, coordxy y, genericptr_t poolcnt) +{ + register struct monst *mtmp; + register struct trap *ttmp; + + /* + * Check various conditions to determine if a pool can be created at the specified location + */ + if (((x + y) % 2) || u_at(x, y) + || (rn2(1 + distmin(u.ux, u.uy, x, y))) || (levl[x][y].typ != ROOM) + || (sobj_at(BOULDER, x, y)) || nexttodoor(x, y)) + return; + + /* + * If there's a trap at the location, attempt to remove it + */ + if ((ttmp = t_at(x, y)) != 0 && !delfloortrap(ttmp)) + return; + + /* + * If a pool is created for the first time, display a message + */ + if (!((*(int *) poolcnt)++)) + pline("Water gushes forth from the overflowing fountain!"); +} + + /* Put a pool at x, y */ + set_levltyp(x, y, POOL); + levl[x][y].flags = 0; + /* No kelp! */ + del_engr_at(x, y); + water_damage_chain(gl.level.objects[x][y], TRUE); + + if ((mtmp = m_at(x, y)) != 0) + (void) minliquid(mtmp); + else + newsym(x, y); +} + +/* Find a gem in the sparkling waters. */ +static void +dofindgem(void) +{ + if (!Blind) + You("spot a gem in the sparkling waters!"); // If the player is not blind, they spot a gem in the fountain. + else + You_feel("a gem here!"); // If the player is blind, they feel a gem in the fountain. + (void) mksobj_at(rnd_class(DILITHIUM_CRYSTAL, LUCKSTONE - 1), u.ux, u.uy, + FALSE, FALSE); // Create a random gem object at the player's location. + SET_FOUNTAIN_LOOTED(u.ux, u.uy); // Set the fountain as looted. + newsym(u.ux, u.uy); // Update the symbol of the fountain on the map. + exercise(A_WIS, TRUE); /* a discovery! */ // Increase the player's wisdom experience. +} + +static boolean +watchman_warn_fountain(struct monst *mtmp) +{ + if (is_watch(mtmp->data) && couldsee(mtmp->mx, mtmp->my) + && mtmp->mpeaceful) { + if (!Deaf) { + pline("%s yells:", Amonnam(mtmp)); + verbalize("Hey, stop using that fountain!"); // If a peaceful watchman can see the player, they yell at the player to stop using the fountain. + } else { + pline("%s earnestly %s %s %s!", + Amonnam(mtmp), + nolimbs(mtmp->data) ? "shakes" : "waves", + mhis(mtmp), + nolimbs(mtmp->data) + ? mbodypart(mtmp, HEAD) + : makeplural(mbodypart(mtmp, ARM))); // If the player is deaf, the watchman communicates their message through body language. + } + return TRUE; + } + return FALSE; +} + +void +dryup(coordxy x, coordxy y, boolean isyou) +{ + if (IS_FOUNTAIN(levl[x][y].typ) + && (!rn2(3) || FOUNTAIN_IS_WARNED(x, y))) { + if (isyou && in_town(x, y) && !FOUNTAIN_IS_WARNED(x, y)) { + struct monst *mtmp; + + SET_FOUNTAIN_WARNED(x, y); + /* Warn about future fountain use. */ + mtmp = get_iter_mons(watchman_warn_fountain); + /* You can see or hear this effect */ + if (!mtmp) + pline_The("flow reduces to a trickle."); // If the player is in a town and no warning has been issued, issue the warning for future fountain use. + return; + } + if (isyou && wizard) { + if (y_n("Dry up fountain?") == 'n') + return; + } + /* FIXME: sight-blocking clouds should use block_point() when + being created and unblock_point() when going away, then this + glyph hackery wouldn't be necessary */ + if (cansee(x, y)) { + int glyph = glyph_at(x, y); + + if (!glyph_is_cmap(glyph) || glyph_to_cmap(glyph) != S_cloud) + pline_The("fountain dries up!"); // If the player can see, display the message that the fountain dries up. + } + /* replace the fountain with ordinary floor */ + set_levltyp(x, y, ROOM); /* updates level.flags.nfountains */ // Change the tile of the fountain to ordinary floor. + levl[x][y].flags = 0; + levl[x][y].blessedftn = 0; + /* The location is seen if the hero/monster is invisible + or felt if the hero is blind. */ + newsym(x, y); // Update the symbol of the fountain on the map. + if (isyou && in_town(x, y)) + (void) angry_guards(FALSE); // If the fountain was located in a town, generate angry guards. + } +} + +void +drinkfountain(void) +{ + /* What happens when you drink from a fountain? */ + register boolean mgkftn = (levl[u.ux][u.uy].blessedftn == 1); + register int fate = rnd(30); + + if (Levitation) { + floating_above("fountain"); + return; + } + + if (mgkftn && u.uluck >= 0 && fate >= 10) { + int i, ii, littleluck = (u.uluck < 4); + + pline("Wow! This makes you feel great!"); + /* blessed restore ability */ + for (ii = 0; ii < A_MAX; ii++) + if (ABASE(ii) < AMAX(ii)) { + ABASE(ii) = AMAX(ii); + gc.context.botl = 1; + } + /* gain ability, blessed if "natural" luck is high */ + i = rn2(A_MAX); /* start at a random attribute */ + for (ii = 0; ii < A_MAX; ii++) { + if (adjattrib(i, 1, littleluck ? -1 : 0) && littleluck) + break; + if (++i >= A_MAX) + i = 0; + } + display_nhwindow(WIN_MESSAGE, FALSE); + pline("A wisp of vapor escapes the fountain..."); + exercise(A_WIS, TRUE); + levl[u.ux][u.uy].blessedftn = 0; + return; + } + + if (fate < 10) { + pline_The("cool draught refreshes you."); + u.uhunger += rnd(10); /* don't choke on water */ + newuhs(FALSE); + if (mgkftn) + return; + } else { + switch (fate) { + case 19: /* Self-knowledge */ + You_feel("self-knowledgeable..."); + display_nhwindow(WIN_MESSAGE, FALSE); + enlightenment(MAGICENLIGHTENMENT, ENL_GAMEINPROGRESS); + exercise(A_WIS, TRUE); + pline_The("feeling subsides."); + break; + case 20: /* Foul water */ + pline_The("water is foul! You gag and vomit."); + morehungry(rn1(20, 11)); + vomit(); + break; + case 21: /* Poisonous */ + pline_The("water is contaminated!"); + if (Poison_resistance) { + pline("Perhaps it is runoff from the nearby %s farm.", + fruitname(FALSE)); + losehp(rnd(4), "unrefrigerated sip of juice", KILLED_BY_AN); + break; + } + poison_strdmg(rn1(4, 3), rnd(10), "contaminated water", + KILLED_BY); + exercise(A_CON, FALSE); + break; + case 22: /* Fountain of snakes! */ + dowatersnakes(); + break; + case 23: /* Water demon */ + dowaterdemon(); + break; + case 24: { /* Maybe curse some items */ + register struct obj *obj; + int buc_changed = 0; + + pline("This water's no good!"); + morehungry(rn1(20, 11)); + exercise(A_CON, FALSE); + /* this is more severe than rndcurse() */ + for (obj = gi.invent; obj; obj = obj->nobj) + if (obj->oclass != COIN_CLASS && !obj->cursed && !rn2(5)) { + curse(obj); + ++buc_changed; + } + if (buc_changed) + update_inventory(); + break; + } + case 25: /* See invisible */ + if (Blind) { + if (Invisible) { + You("feel transparent."); + } else { + You("feel very self-conscious."); + pline("Then it passes."); + } + } else { + You_see("an image of someone stalking you."); + pline("But it disappears."); + } + HSee_invisible |= FROMOUTSIDE; + newsym(u.ux, u.uy); + exercise(A_WIS, TRUE); + break; + case 26: /* See Monsters */ + if (monster_detect((struct obj *) 0, 0)) + pline_The("%s tastes like nothing.", hliquid("water")); + exercise(A_WIS, TRUE); + break; + case 27: /* Find a gem in the sparkling waters. */ + if (!FOUNTAIN_IS_LOOTED(u.ux, u.uy)) { + dofindgem(); + break; + } + /*FALLTHRU*/ + case 28: /* Water Nymph */ + dowaternymph(); + break; + case 29: /* Scare */ + { + register struct monst *mtmp; + + pline("This %s gives you bad breath!", + hliquid("water")); + for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) { + if (DEADMONSTER(mtmp)) + continue; + monflee(mtmp, 0, FALSE, FALSE); + } + break; + } + case 30: /* Gushing forth in this room */ + dogushforth(TRUE); + break; + default: + pline("This tepid %s is tasteless.", + hliquid("water")); + break; + } + } + dryup(u.ux, u.uy, TRUE); +} + +void +dipfountain(register struct obj *obj) +{ + int er = ER_NOTHING; + + if (Levitation) { + floating_above("fountain"); + return; + } + + if (obj->otyp == LONG_SWORD && u.ulevel >= 5 && !rn2(6) + /* once upon a time it was possible to poly N daggers into N swords */ + && obj->quan == 1L && !obj->oartifact + && !exist_artifact(LONG_SWORD, artiname(ART_EXCALIBUR))) { + static const char lady[] = "Lady of the Lake"; + + if (u.ualign.type != A_LAWFUL) { + /* Ha! Trying to cheat her. */ + pline("A freezing mist rises from the %s and envelopes the sword.", + hliquid("water")); + pline_The("fountain disappears!"); + curse(obj); + if (obj->spe > -6 && !rn2(3)) + obj->spe--; + obj->oerodeproof = FALSE; + exercise(A_WIS, FALSE); + livelog_printf(LL_ARTIFACT, + "was denied %s! The %s has deemed %s unworthy", + artiname(ART_EXCALIBUR), lady, uhim()); + } else { + /* The lady of the lake acts! - Eric Backus */ + /* Be *REAL* nice */ + pline( + "From the murky depths, a hand reaches up to bless the sword."); + pline("As the hand retreats, the fountain disappears!"); + obj = oname(obj, artiname(ART_EXCALIBUR), + ONAME_VIA_DIP | ONAME_KNOW_ARTI); + discover_artifact(ART_EXCALIBUR); + bless(obj); + obj->oeroded = obj->oeroded2 = 0; + obj->oerodeproof = TRUE; + exercise(A_WIS, TRUE); + livelog_printf(LL_ARTIFACT, "was given %s by the %s", + artiname(ART_EXCALIBUR), lady); + } + update_inventory(); + set_levltyp(u.ux, u.uy, ROOM); /* updates level.flags.nfountains */ + levl[u.ux][u.uy].flags = 0; + newsym(u.ux, u.uy); + if (in_town(u.ux, u.uy)) + (void) angry_guards(FALSE); + return; + } else { + er = water_damage(obj, NULL, TRUE); + + if (er == ER_DESTROYED || (er != ER_NOTHING && !rn2(2))) { + return; /* no further effect */ + } + } + + switch (rnd(30)) { + case 16: /* Curse the item */ + if (obj->oclass != COIN_CLASS && !obj->cursed) { + curse(obj); + } + break; + case 17: + case 18: + case 19: + case 20: /* Uncurse the item */ + if (obj->cursed) { + if (!Blind) + pline_The("%s glows for a moment.", hliquid("water")); + uncurse(obj); + } else { + pline("A feeling of loss comes over you."); + } + break; + case 21: /* Water Demon */ + dowaterdemon(); + break; + case 22: /* Water Nymph */ + dowaternymph(); + break; + case 23: /* an Endless Stream of Snakes */ + dowatersnakes(); + break; + case 24: /* Find a gem */ + if (!FOUNTAIN_IS_LOOTED(u.ux, u.uy)) { + dofindgem(); + break; + } + /*FALLTHRU*/ + case 25: /* Water gushes forth */ + dogushforth(FALSE); + break; + case 26: /* Strange feeling */ + pline("A strange tingling runs up your %s.", body_part(ARM)); + break; + case 27: /* Strange feeling */ + You_feel("a sudden chill."); + break; + case 28: /* Strange feeling */ + pline("An urge to take a bath overwhelms you."); + { + long money = money_cnt(gi.invent); + struct obj *otmp; + if (money > 10) { + /* Amount to lose. Might get rounded up as fountains don't + * pay change... */ + money = somegold(money) / 10; + for (otmp = gi.invent; otmp && money > 0; otmp = otmp->nobj) + if (otmp->oclass == COIN_CLASS) { + int denomination = objects[otmp->otyp].oc_cost; + long coin_loss = + (money + denomination - 1) / denomination; + coin_loss = min(coin_loss, otmp->quan); + otmp->quan -= coin_loss; + money -= coin_loss * denomination; + if (!otmp->quan) + delobj(otmp); + } + You("lost some of your gold in the fountain!"); + CLEAR_FOUNTAIN_LOOTED(u.ux, u.uy); + exercise(A_WIS, FALSE); + } + } + break; + case 29: /* You see coins */ + /* We make fountains have more coins the closer you are to the + * surface. After all, there will have been more people going + * by. Just like a shopping mall! Chris Woodbury */ + + if (FOUNTAIN_IS_LOOTED(u.ux, u.uy)) + break; + SET_FOUNTAIN_LOOTED(u.ux, u.uy); + (void) mkgold((long) (rnd((dunlevs_in_dungeon(&u.uz) - dunlev(&u.uz) + + 1) * 2) + 5), + u.ux, u.uy); + if (!Blind) + pline("Far below you, you see coins glistening in the %s.", + hliquid("water")); + exercise(A_WIS, TRUE); + newsym(u.ux, u.uy); + break; + default: + if (er == ER_NOTHING) + pline("Nothing seems to happen."); + break; + } + update_inventory(); + dryup(u.ux, u.uy, TRUE); +} + +void +breaksink(coordxy x, coordxy y) +{ + if (cansee(x, y) || u_at(x, y)) + pline_The("pipes break! Water spurts out!"); + /* updates level.flags.nsinks and level.flags.nfountains */ + set_levltyp(x, y, FOUNTAIN); + levl[x][y].looted = 0; + levl[x][y].blessedftn = 0; + SET_FOUNTAIN_LOOTED(x, y); + newsym(x, y); +} + +void +drinksink(void) +{ + struct obj *otmp; + struct monst *mtmp; + + /* If the player is levitating, they can't drink from the sink. */ + if (Levitation) { + floating_above("sink"); + return; + } + + /* Randomly determine what happens when the player drinks from the sink. */ + switch (rn2(20)) { + case 0: + You("take a sip of very cold %s.", hliquid("water")); + break; + case 1: + You("take a sip of very warm %s.", hliquid("water")); + break; + case 2: + You("take a sip of scalding hot %s.", hliquid("water")); + if (Fire_resistance) { + pline("It seems quite tasty."); + monstseesu(M_SEEN_FIRE); + } else { + losehp(rnd(6), "sipping boiling water", KILLED_BY); + monstunseesu(M_SEEN_FIRE); + } + /* Boiling water burns are considered fire damage. */ + break; + case 3: + /* Spawn a sewer rat in the sink, unless they're already gone. */ + if (gm.mvitals[PM_SEWER_RAT].mvflags & G_GONE) + pline_The("sink seems quite dirty."); + else { + mtmp = makemon(&mons[PM_SEWER_RAT], u.ux, u.uy, MM_NOMSG); + if (mtmp) + pline("Eek! There's %s in the sink!", + (Blind || !canspotmon(mtmp)) ? "something squirmy" + : a_monnam(mtmp)); + } + break; + case 4: + /* Spawn a potion that isn't water. */ + for (;;) { + otmp = mkobj(POTION_CLASS, FALSE); + if (otmp->otyp != POT_WATER) + break; + /* Reject water and try again. */ + obfree(otmp, (struct obj *) 0); + } + otmp->cursed = otmp->blessed = 0; + pline("Some %s liquid flows from the faucet.", + Blind ? "odd" : hcolor(OBJ_DESCR(objects[otmp->otyp]))); + otmp->dknown = !(Blind || Hallucination); + otmp->quan++; /* Avoid panic upon useup() */ + otmp->fromsink = 1; /* Kludge for docall() */ + (void) dopotion(otmp); + obfree(otmp, (struct obj *) 0); + break; + case 5: + /* Spawn a ring in the sink, unless one has already been looted. */ + if (!(levl[u.ux][u.uy].looted & S_LRING)) { + You("find a ring in the sink!"); + (void) mkobj_at(RING_CLASS, u.ux, u.uy, TRUE); + levl[u.ux][u.uy].looted |= S_LRING; + exercise(A_WIS, TRUE); + newsym(u.ux, u.uy); + } else + pline("Some dirty %s backs up in the drain.", hliquid("water")); + break; + case 6: + /* Break the sink. */ + breaksink(u.ux, u.uy); + break; + case 7: + /* Spawn a water elemental in the sink. */ + pline_The("%s moves as though of its own will!", hliquid("water")); + if ((gm.mvitals[PM_WATER_ELEMENTAL].mvflags & G_GONE) + || !makemon(&mons[PM_WATER_ELEMENTAL], u.ux, u.uy, MM_NOMSG)) + pline("But it quiets down."); + break; + case 8: + /* Drinking the water gives the player experience and a level-up. */ + pline("Yuk, this %s tastes awful.", hliquid("water")); + more_experienced(1, 0); + newexplevel(); + break; + case 9: + /* Drinking sewage causes the player to vomit and become hungry. */ + pline("Gaggg... this tastes like sewage! You vomit."); + morehungry(rn1(30 - ACURR(A_CON), 11)); + vomit(); + break; + case 10: + /* Drinking toxic waste polymorphs the player. */ + pline("This %s contains toxic wastes!", hliquid("water")); + if (!Unchanging) { + You("undergo a freakish metamorphosis!"); + polyself(POLY_NOFLAGS); + } + break; + /* More odd messages. */ + case 11: + Soundeffect(se_clanking_pipe, 50); + You_hear("clanking from the pipes..."); + break; + case 12: + Soundeffect(se_sewer_song, 100); + You_hear("snatches of song from among the sewers..."); + break; + case 13: + /* Drinking the water creates a gas cloud. */ + pline("Ew, what a stench!"); + create_gas_cloud(u.ux, u.uy, 1, 4); + break; + case 19: + /* Drinking the water causes something to grab at the player's hand, unless they're hallucinating. */ + if (Hallucination) { + pline("From the murky drain, a hand reaches up... --oops--"); + break; + } + /*FALLTHRU*/ + default: + /* Drinking the water has no special effect. */ + You("take a sip of %s %s.", + rn2(3) ? (rn2(2) ? "cold" : "warm") : "hot", + hliquid("water")); + } +} + +/*fountain.c*/ diff --git a/ljh.txt b/ljh.txt new file mode 100644 index 0000000..c21b5de --- /dev/null +++ b/ljh.txt @@ -0,0 +1,34 @@ +用例名：eat +执行者：玩家 +目标：通过吃东西来补充角色的饥饿值 +前置条件： + 玩家拥有至少一个可食用物品 + 玩家处于可以吃东西的状态（例如，非战斗状态） + 玩家饥饿值未满 +后置条件： + 食物使用后，玩家的饥饿值恢复 + 玩家的状态可能因食物效果而改变 +主要场景： + 玩家选择一个食物。 + 玩家点击“使用”选项。 + 游戏判断玩家是否满足使用该道具的条件（例如，是否饥饿，是否非战斗）。 + 如果满足条件，游戏将吃掉食物，并恢复饥饿值。 +如果为特殊食物，赋予特殊效果 + 使用后食物消失 + 玩家可以查看食物使用后的效果和状态变化。 +交互动作： + （1）玩家遇到特殊情况后下达命令cmd.c并apply.c执行来选择使用食物 + （2）检查是否饥饿，若饥饿则使用食物 + （3）根据食物使用更新内存分配alloc.c并记录时间date.c参数；若食物有效果则用apply.c应用效果 +用例交互图 + 玩家 + +| | 选择食物 |---------->| 判断条件饥饿值是否小于90 |---------->| 显示效果 |---------->| 恢复饥饿值更新状态 |---------->| 更新UI |---------->| 反馈 | + + 游戏系统 + +| | 触发条件 |---------->| 验证玩家 |---------->| 获取道具信息|---------->| 执行效果|---------->| 更新UI |---------->| 返回结果 | + + + + diff --git a/src/NetHack_3.7/.clang-format b/src/NetHack-NetHack-3.7/.clang-format similarity index 100% rename from src/NetHack_3.7/.clang-format rename to src/NetHack-NetHack-3.7/.clang-format diff --git a/src/NetHack_3.7/.gitattributes b/src/NetHack-NetHack-3.7/.gitattributes similarity index 100% rename from src/NetHack_3.7/.gitattributes rename to src/NetHack-NetHack-3.7/.gitattributes diff --git a/src/NetHack_3.7/.gitignore b/src/NetHack-NetHack-3.7/.gitignore similarity index 100% rename from src/NetHack_3.7/.gitignore rename to src/NetHack-NetHack-3.7/.gitignore diff --git a/src/NetHack_3.7/.gitmodules b/src/NetHack-NetHack-3.7/.gitmodules similarity index 100% rename from src/NetHack_3.7/.gitmodules rename to src/NetHack-NetHack-3.7/.gitmodules diff --git a/src/NetHack_3.7/Cross-compiling b/src/NetHack-NetHack-3.7/Cross-compiling similarity index 100% rename from src/NetHack_3.7/Cross-compiling rename to src/NetHack-NetHack-3.7/Cross-compiling diff --git a/src/NetHack_3.7/DEVEL/.gitattributes b/src/NetHack-NetHack-3.7/DEVEL/.gitattributes similarity index 100% rename from src/NetHack_3.7/DEVEL/.gitattributes rename to src/NetHack-NetHack-3.7/DEVEL/.gitattributes diff --git a/src/NetHack_3.7/DEVEL/DOTGIT/TARGET b/src/NetHack-NetHack-3.7/DEVEL/DOTGIT/TARGET similarity index 100% rename from src/NetHack_3.7/DEVEL/DOTGIT/TARGET rename to src/NetHack-NetHack-3.7/DEVEL/DOTGIT/TARGET diff --git a/src/NetHack_3.7/DEVEL/Developer.txt b/src/NetHack-NetHack-3.7/DEVEL/Developer.txt similarity index 100% rename from src/NetHack_3.7/DEVEL/Developer.txt rename to src/NetHack-NetHack-3.7/DEVEL/Developer.txt diff --git a/src/NetHack_3.7/DEVEL/code_features.txt b/src/NetHack-NetHack-3.7/DEVEL/code_features.txt similarity index 100% rename from src/NetHack_3.7/DEVEL/code_features.txt rename to src/NetHack-NetHack-3.7/DEVEL/code_features.txt diff --git a/src/NetHack_3.7/DEVEL/code_style.txt b/src/NetHack-NetHack-3.7/DEVEL/code_style.txt similarity index 100% rename from src/NetHack_3.7/DEVEL/code_style.txt rename to src/NetHack-NetHack-3.7/DEVEL/code_style.txt diff --git a/src/NetHack_3.7/DEVEL/git_recipes.txt b/src/NetHack-NetHack-3.7/DEVEL/git_recipes.txt similarity index 100% rename from src/NetHack_3.7/DEVEL/git_recipes.txt rename to src/NetHack-NetHack-3.7/DEVEL/git_recipes.txt diff --git a/src/NetHack_3.7/DEVEL/gitinfo.pl b/src/NetHack-NetHack-3.7/DEVEL/gitinfo.pl similarity index 100% rename from src/NetHack_3.7/DEVEL/gitinfo.pl rename to src/NetHack-NetHack-3.7/DEVEL/gitinfo.pl diff --git a/src/NetHack_3.7/DEVEL/hooksdir/NHadd b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/NHadd similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/NHadd rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/NHadd diff --git a/src/NetHack_3.7/DEVEL/hooksdir/NHgithook.pm b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/NHgithook.pm similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/NHgithook.pm rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/NHgithook.pm diff --git a/src/NetHack_3.7/DEVEL/hooksdir/NHsubst b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/NHsubst similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/NHsubst rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/NHsubst diff --git a/src/NetHack_3.7/DEVEL/hooksdir/NHtext b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/NHtext similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/NHtext rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/NHtext diff --git a/src/NetHack_3.7/DEVEL/hooksdir/TARGET b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/TARGET similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/TARGET rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/TARGET diff --git a/src/NetHack_3.7/DEVEL/hooksdir/applypatch-msg b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/applypatch-msg similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/applypatch-msg rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/applypatch-msg diff --git a/src/NetHack_3.7/DEVEL/hooksdir/commit-msg b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/commit-msg similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/commit-msg rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/commit-msg diff --git a/src/NetHack_3.7/DEVEL/hooksdir/nhsub b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/nhsub similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/nhsub rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/nhsub diff --git a/src/NetHack_3.7/DEVEL/hooksdir/post-applypatch b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/post-applypatch similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/post-applypatch rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/post-applypatch diff --git a/src/NetHack_3.7/DEVEL/hooksdir/post-checkout b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/post-checkout similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/post-checkout rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/post-checkout diff --git a/src/NetHack_3.7/DEVEL/hooksdir/post-commit b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/post-commit similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/post-commit rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/post-commit diff --git a/src/NetHack_3.7/DEVEL/hooksdir/post-merge b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/post-merge similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/post-merge rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/post-merge diff --git a/src/NetHack_3.7/DEVEL/hooksdir/post-rewrite b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/post-rewrite similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/post-rewrite rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/post-rewrite diff --git a/src/NetHack_3.7/DEVEL/hooksdir/pre-applypatch b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/pre-applypatch similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/pre-applypatch rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/pre-applypatch diff --git a/src/NetHack_3.7/DEVEL/hooksdir/pre-auto-gc b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/pre-auto-gc similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/pre-auto-gc rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/pre-auto-gc diff --git a/src/NetHack_3.7/DEVEL/hooksdir/pre-commit b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/pre-commit similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/pre-commit rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/pre-commit diff --git a/src/NetHack_3.7/DEVEL/hooksdir/pre-push b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/pre-push similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/pre-push rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/pre-push diff --git a/src/NetHack_3.7/DEVEL/hooksdir/pre-rebase b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/pre-rebase similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/pre-rebase rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/pre-rebase diff --git a/src/NetHack_3.7/DEVEL/hooksdir/prepare-commit-msg b/src/NetHack-NetHack-3.7/DEVEL/hooksdir/prepare-commit-msg similarity index 100% rename from src/NetHack_3.7/DEVEL/hooksdir/prepare-commit-msg rename to src/NetHack-NetHack-3.7/DEVEL/hooksdir/prepare-commit-msg diff --git a/src/NetHack_3.7/DEVEL/nhgitset.pl b/src/NetHack-NetHack-3.7/DEVEL/nhgitset.pl similarity index 100% rename from src/NetHack_3.7/DEVEL/nhgitset.pl rename to src/NetHack-NetHack-3.7/DEVEL/nhgitset.pl diff --git a/src/NetHack_3.7/Files b/src/NetHack-NetHack-3.7/Files similarity index 100% rename from src/NetHack_3.7/Files rename to src/NetHack-NetHack-3.7/Files diff --git a/src/NetHack_3.7/Porting b/src/NetHack-NetHack-3.7/Porting similarity index 100% rename from src/NetHack_3.7/Porting rename to src/NetHack-NetHack-3.7/Porting diff --git a/src/NetHack_3.7/README b/src/NetHack-NetHack-3.7/README similarity index 100% rename from src/NetHack_3.7/README rename to src/NetHack-NetHack-3.7/README diff --git a/src/NetHack_3.7/azure-pipelines.yml b/src/NetHack-NetHack-3.7/azure-pipelines.yml similarity index 100% rename from src/NetHack_3.7/azure-pipelines.yml rename to src/NetHack-NetHack-3.7/azure-pipelines.yml diff --git a/src/NetHack_3.7/dat/.gitattributes b/src/NetHack-NetHack-3.7/dat/.gitattributes similarity index 100% rename from src/NetHack_3.7/dat/.gitattributes rename to src/NetHack-NetHack-3.7/dat/.gitattributes diff --git a/src/NetHack_3.7/dat/.gitignore b/src/NetHack-NetHack-3.7/dat/.gitignore similarity index 100% rename from src/NetHack_3.7/dat/.gitignore rename to src/NetHack-NetHack-3.7/dat/.gitignore diff --git a/src/NetHack_3.7/dat/Arc-fila.lua b/src/NetHack-NetHack-3.7/dat/Arc-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Arc-fila.lua rename to src/NetHack-NetHack-3.7/dat/Arc-fila.lua diff --git a/src/NetHack_3.7/dat/Arc-filb.lua b/src/NetHack-NetHack-3.7/dat/Arc-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Arc-filb.lua rename to src/NetHack-NetHack-3.7/dat/Arc-filb.lua diff --git a/src/NetHack_3.7/dat/Arc-goal.lua b/src/NetHack-NetHack-3.7/dat/Arc-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Arc-goal.lua rename to src/NetHack-NetHack-3.7/dat/Arc-goal.lua diff --git a/src/NetHack_3.7/dat/Arc-loca.lua b/src/NetHack-NetHack-3.7/dat/Arc-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Arc-loca.lua rename to src/NetHack-NetHack-3.7/dat/Arc-loca.lua diff --git a/src/NetHack_3.7/dat/Arc-strt.lua b/src/NetHack-NetHack-3.7/dat/Arc-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Arc-strt.lua rename to src/NetHack-NetHack-3.7/dat/Arc-strt.lua diff --git a/src/NetHack_3.7/dat/Bar-fila.lua b/src/NetHack-NetHack-3.7/dat/Bar-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Bar-fila.lua rename to src/NetHack-NetHack-3.7/dat/Bar-fila.lua diff --git a/src/NetHack_3.7/dat/Bar-filb.lua b/src/NetHack-NetHack-3.7/dat/Bar-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Bar-filb.lua rename to src/NetHack-NetHack-3.7/dat/Bar-filb.lua diff --git a/src/NetHack_3.7/dat/Bar-goal.lua b/src/NetHack-NetHack-3.7/dat/Bar-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Bar-goal.lua rename to src/NetHack-NetHack-3.7/dat/Bar-goal.lua diff --git a/src/NetHack_3.7/dat/Bar-loca.lua b/src/NetHack-NetHack-3.7/dat/Bar-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Bar-loca.lua rename to src/NetHack-NetHack-3.7/dat/Bar-loca.lua diff --git a/src/NetHack_3.7/dat/Bar-strt.lua b/src/NetHack-NetHack-3.7/dat/Bar-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Bar-strt.lua rename to src/NetHack-NetHack-3.7/dat/Bar-strt.lua diff --git a/src/NetHack_3.7/dat/Cav-fila.lua b/src/NetHack-NetHack-3.7/dat/Cav-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Cav-fila.lua rename to src/NetHack-NetHack-3.7/dat/Cav-fila.lua diff --git a/src/NetHack_3.7/dat/Cav-filb.lua b/src/NetHack-NetHack-3.7/dat/Cav-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Cav-filb.lua rename to src/NetHack-NetHack-3.7/dat/Cav-filb.lua diff --git a/src/NetHack_3.7/dat/Cav-goal.lua b/src/NetHack-NetHack-3.7/dat/Cav-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Cav-goal.lua rename to src/NetHack-NetHack-3.7/dat/Cav-goal.lua diff --git a/src/NetHack_3.7/dat/Cav-loca.lua b/src/NetHack-NetHack-3.7/dat/Cav-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Cav-loca.lua rename to src/NetHack-NetHack-3.7/dat/Cav-loca.lua diff --git a/src/NetHack_3.7/dat/Cav-strt.lua b/src/NetHack-NetHack-3.7/dat/Cav-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Cav-strt.lua rename to src/NetHack-NetHack-3.7/dat/Cav-strt.lua diff --git a/src/NetHack_3.7/dat/GENFILES b/src/NetHack-NetHack-3.7/dat/GENFILES similarity index 100% rename from src/NetHack_3.7/dat/GENFILES rename to src/NetHack-NetHack-3.7/dat/GENFILES diff --git a/src/NetHack_3.7/dat/Hea-fila.lua b/src/NetHack-NetHack-3.7/dat/Hea-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Hea-fila.lua rename to src/NetHack-NetHack-3.7/dat/Hea-fila.lua diff --git a/src/NetHack_3.7/dat/Hea-filb.lua b/src/NetHack-NetHack-3.7/dat/Hea-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Hea-filb.lua rename to src/NetHack-NetHack-3.7/dat/Hea-filb.lua diff --git a/src/NetHack_3.7/dat/Hea-goal.lua b/src/NetHack-NetHack-3.7/dat/Hea-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Hea-goal.lua rename to src/NetHack-NetHack-3.7/dat/Hea-goal.lua diff --git a/src/NetHack_3.7/dat/Hea-loca.lua b/src/NetHack-NetHack-3.7/dat/Hea-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Hea-loca.lua rename to src/NetHack-NetHack-3.7/dat/Hea-loca.lua diff --git a/src/NetHack_3.7/dat/Hea-strt.lua b/src/NetHack-NetHack-3.7/dat/Hea-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Hea-strt.lua rename to src/NetHack-NetHack-3.7/dat/Hea-strt.lua diff --git a/src/NetHack_3.7/dat/Kni-fila.lua b/src/NetHack-NetHack-3.7/dat/Kni-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Kni-fila.lua rename to src/NetHack-NetHack-3.7/dat/Kni-fila.lua diff --git a/src/NetHack_3.7/dat/Kni-filb.lua b/src/NetHack-NetHack-3.7/dat/Kni-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Kni-filb.lua rename to src/NetHack-NetHack-3.7/dat/Kni-filb.lua diff --git a/src/NetHack_3.7/dat/Kni-goal.lua b/src/NetHack-NetHack-3.7/dat/Kni-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Kni-goal.lua rename to src/NetHack-NetHack-3.7/dat/Kni-goal.lua diff --git a/src/NetHack_3.7/dat/Kni-loca.lua b/src/NetHack-NetHack-3.7/dat/Kni-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Kni-loca.lua rename to src/NetHack-NetHack-3.7/dat/Kni-loca.lua diff --git a/src/NetHack_3.7/dat/Kni-strt.lua b/src/NetHack-NetHack-3.7/dat/Kni-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Kni-strt.lua rename to src/NetHack-NetHack-3.7/dat/Kni-strt.lua diff --git a/src/NetHack_3.7/dat/Mon-fila.lua b/src/NetHack-NetHack-3.7/dat/Mon-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Mon-fila.lua rename to src/NetHack-NetHack-3.7/dat/Mon-fila.lua diff --git a/src/NetHack_3.7/dat/Mon-filb.lua b/src/NetHack-NetHack-3.7/dat/Mon-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Mon-filb.lua rename to src/NetHack-NetHack-3.7/dat/Mon-filb.lua diff --git a/src/NetHack_3.7/dat/Mon-goal.lua b/src/NetHack-NetHack-3.7/dat/Mon-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Mon-goal.lua rename to src/NetHack-NetHack-3.7/dat/Mon-goal.lua diff --git a/src/NetHack_3.7/dat/Mon-loca.lua b/src/NetHack-NetHack-3.7/dat/Mon-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Mon-loca.lua rename to src/NetHack-NetHack-3.7/dat/Mon-loca.lua diff --git a/src/NetHack_3.7/dat/Mon-strt.lua b/src/NetHack-NetHack-3.7/dat/Mon-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Mon-strt.lua rename to src/NetHack-NetHack-3.7/dat/Mon-strt.lua diff --git a/src/NetHack_3.7/dat/Pri-fila.lua b/src/NetHack-NetHack-3.7/dat/Pri-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Pri-fila.lua rename to src/NetHack-NetHack-3.7/dat/Pri-fila.lua diff --git a/src/NetHack_3.7/dat/Pri-filb.lua b/src/NetHack-NetHack-3.7/dat/Pri-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Pri-filb.lua rename to src/NetHack-NetHack-3.7/dat/Pri-filb.lua diff --git a/src/NetHack_3.7/dat/Pri-goal.lua b/src/NetHack-NetHack-3.7/dat/Pri-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Pri-goal.lua rename to src/NetHack-NetHack-3.7/dat/Pri-goal.lua diff --git a/src/NetHack_3.7/dat/Pri-loca.lua b/src/NetHack-NetHack-3.7/dat/Pri-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Pri-loca.lua rename to src/NetHack-NetHack-3.7/dat/Pri-loca.lua diff --git a/src/NetHack_3.7/dat/Pri-strt.lua b/src/NetHack-NetHack-3.7/dat/Pri-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Pri-strt.lua rename to src/NetHack-NetHack-3.7/dat/Pri-strt.lua diff --git a/src/NetHack_3.7/dat/Ran-fila.lua b/src/NetHack-NetHack-3.7/dat/Ran-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Ran-fila.lua rename to src/NetHack-NetHack-3.7/dat/Ran-fila.lua diff --git a/src/NetHack_3.7/dat/Ran-filb.lua b/src/NetHack-NetHack-3.7/dat/Ran-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Ran-filb.lua rename to src/NetHack-NetHack-3.7/dat/Ran-filb.lua diff --git a/src/NetHack_3.7/dat/Ran-goal.lua b/src/NetHack-NetHack-3.7/dat/Ran-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Ran-goal.lua rename to src/NetHack-NetHack-3.7/dat/Ran-goal.lua diff --git a/src/NetHack_3.7/dat/Ran-loca.lua b/src/NetHack-NetHack-3.7/dat/Ran-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Ran-loca.lua rename to src/NetHack-NetHack-3.7/dat/Ran-loca.lua diff --git a/src/NetHack_3.7/dat/Ran-strt.lua b/src/NetHack-NetHack-3.7/dat/Ran-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Ran-strt.lua rename to src/NetHack-NetHack-3.7/dat/Ran-strt.lua diff --git a/src/NetHack_3.7/dat/Rog-fila.lua b/src/NetHack-NetHack-3.7/dat/Rog-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Rog-fila.lua rename to src/NetHack-NetHack-3.7/dat/Rog-fila.lua diff --git a/src/NetHack_3.7/dat/Rog-filb.lua b/src/NetHack-NetHack-3.7/dat/Rog-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Rog-filb.lua rename to src/NetHack-NetHack-3.7/dat/Rog-filb.lua diff --git a/src/NetHack_3.7/dat/Rog-goal.lua b/src/NetHack-NetHack-3.7/dat/Rog-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Rog-goal.lua rename to src/NetHack-NetHack-3.7/dat/Rog-goal.lua diff --git a/src/NetHack_3.7/dat/Rog-loca.lua b/src/NetHack-NetHack-3.7/dat/Rog-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Rog-loca.lua rename to src/NetHack-NetHack-3.7/dat/Rog-loca.lua diff --git a/src/NetHack_3.7/dat/Rog-strt.lua b/src/NetHack-NetHack-3.7/dat/Rog-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Rog-strt.lua rename to src/NetHack-NetHack-3.7/dat/Rog-strt.lua diff --git a/src/NetHack_3.7/dat/Sam-fila.lua b/src/NetHack-NetHack-3.7/dat/Sam-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Sam-fila.lua rename to src/NetHack-NetHack-3.7/dat/Sam-fila.lua diff --git a/src/NetHack_3.7/dat/Sam-filb.lua b/src/NetHack-NetHack-3.7/dat/Sam-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Sam-filb.lua rename to src/NetHack-NetHack-3.7/dat/Sam-filb.lua diff --git a/src/NetHack_3.7/dat/Sam-goal.lua b/src/NetHack-NetHack-3.7/dat/Sam-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Sam-goal.lua rename to src/NetHack-NetHack-3.7/dat/Sam-goal.lua diff --git a/src/NetHack_3.7/dat/Sam-loca.lua b/src/NetHack-NetHack-3.7/dat/Sam-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Sam-loca.lua rename to src/NetHack-NetHack-3.7/dat/Sam-loca.lua diff --git a/src/NetHack_3.7/dat/Sam-strt.lua b/src/NetHack-NetHack-3.7/dat/Sam-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Sam-strt.lua rename to src/NetHack-NetHack-3.7/dat/Sam-strt.lua diff --git a/src/NetHack_3.7/dat/Tou-fila.lua b/src/NetHack-NetHack-3.7/dat/Tou-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Tou-fila.lua rename to src/NetHack-NetHack-3.7/dat/Tou-fila.lua diff --git a/src/NetHack_3.7/dat/Tou-filb.lua b/src/NetHack-NetHack-3.7/dat/Tou-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Tou-filb.lua rename to src/NetHack-NetHack-3.7/dat/Tou-filb.lua diff --git a/src/NetHack_3.7/dat/Tou-goal.lua b/src/NetHack-NetHack-3.7/dat/Tou-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Tou-goal.lua rename to src/NetHack-NetHack-3.7/dat/Tou-goal.lua diff --git a/src/NetHack_3.7/dat/Tou-loca.lua b/src/NetHack-NetHack-3.7/dat/Tou-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Tou-loca.lua rename to src/NetHack-NetHack-3.7/dat/Tou-loca.lua diff --git a/src/NetHack_3.7/dat/Tou-strt.lua b/src/NetHack-NetHack-3.7/dat/Tou-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Tou-strt.lua rename to src/NetHack-NetHack-3.7/dat/Tou-strt.lua diff --git a/src/NetHack_3.7/dat/Val-fila.lua b/src/NetHack-NetHack-3.7/dat/Val-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Val-fila.lua rename to src/NetHack-NetHack-3.7/dat/Val-fila.lua diff --git a/src/NetHack_3.7/dat/Val-filb.lua b/src/NetHack-NetHack-3.7/dat/Val-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Val-filb.lua rename to src/NetHack-NetHack-3.7/dat/Val-filb.lua diff --git a/src/NetHack_3.7/dat/Val-goal.lua b/src/NetHack-NetHack-3.7/dat/Val-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Val-goal.lua rename to src/NetHack-NetHack-3.7/dat/Val-goal.lua diff --git a/src/NetHack_3.7/dat/Val-loca.lua b/src/NetHack-NetHack-3.7/dat/Val-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Val-loca.lua rename to src/NetHack-NetHack-3.7/dat/Val-loca.lua diff --git a/src/NetHack_3.7/dat/Val-strt.lua b/src/NetHack-NetHack-3.7/dat/Val-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Val-strt.lua rename to src/NetHack-NetHack-3.7/dat/Val-strt.lua diff --git a/src/NetHack_3.7/dat/Wiz-fila.lua b/src/NetHack-NetHack-3.7/dat/Wiz-fila.lua similarity index 100% rename from src/NetHack_3.7/dat/Wiz-fila.lua rename to src/NetHack-NetHack-3.7/dat/Wiz-fila.lua diff --git a/src/NetHack_3.7/dat/Wiz-filb.lua b/src/NetHack-NetHack-3.7/dat/Wiz-filb.lua similarity index 100% rename from src/NetHack_3.7/dat/Wiz-filb.lua rename to src/NetHack-NetHack-3.7/dat/Wiz-filb.lua diff --git a/src/NetHack_3.7/dat/Wiz-goal.lua b/src/NetHack-NetHack-3.7/dat/Wiz-goal.lua similarity index 100% rename from src/NetHack_3.7/dat/Wiz-goal.lua rename to src/NetHack-NetHack-3.7/dat/Wiz-goal.lua diff --git a/src/NetHack_3.7/dat/Wiz-loca.lua b/src/NetHack-NetHack-3.7/dat/Wiz-loca.lua similarity index 100% rename from src/NetHack_3.7/dat/Wiz-loca.lua rename to src/NetHack-NetHack-3.7/dat/Wiz-loca.lua diff --git a/src/NetHack_3.7/dat/Wiz-strt.lua b/src/NetHack-NetHack-3.7/dat/Wiz-strt.lua similarity index 100% rename from src/NetHack_3.7/dat/Wiz-strt.lua rename to src/NetHack-NetHack-3.7/dat/Wiz-strt.lua diff --git a/src/NetHack_3.7/dat/air.lua b/src/NetHack-NetHack-3.7/dat/air.lua similarity index 100% rename from src/NetHack_3.7/dat/air.lua rename to src/NetHack-NetHack-3.7/dat/air.lua diff --git a/src/NetHack_3.7/dat/asmodeus.lua b/src/NetHack-NetHack-3.7/dat/asmodeus.lua similarity index 100% rename from src/NetHack_3.7/dat/asmodeus.lua rename to src/NetHack-NetHack-3.7/dat/asmodeus.lua diff --git a/src/NetHack_3.7/dat/astral.lua b/src/NetHack-NetHack-3.7/dat/astral.lua similarity index 100% rename from src/NetHack_3.7/dat/astral.lua rename to src/NetHack-NetHack-3.7/dat/astral.lua diff --git a/src/NetHack_3.7/dat/baalz.lua b/src/NetHack-NetHack-3.7/dat/baalz.lua similarity index 100% rename from src/NetHack_3.7/dat/baalz.lua rename to src/NetHack-NetHack-3.7/dat/baalz.lua diff --git a/src/NetHack_3.7/dat/bigrm-1.lua b/src/NetHack-NetHack-3.7/dat/bigrm-1.lua similarity index 100% rename from src/NetHack_3.7/dat/bigrm-1.lua rename to src/NetHack-NetHack-3.7/dat/bigrm-1.lua diff --git a/src/NetHack_3.7/dat/bigrm-10.lua b/src/NetHack-NetHack-3.7/dat/bigrm-10.lua similarity index 100% rename from src/NetHack_3.7/dat/bigrm-10.lua rename to src/NetHack-NetHack-3.7/dat/bigrm-10.lua diff --git a/src/NetHack_3.7/dat/bigrm-11.lua b/src/NetHack-NetHack-3.7/dat/bigrm-11.lua similarity index 100% rename from src/NetHack_3.7/dat/bigrm-11.lua rename to src/NetHack-NetHack-3.7/dat/bigrm-11.lua diff --git a/src/NetHack_3.7/dat/bigrm-2.lua b/src/NetHack-NetHack-3.7/dat/bigrm-2.lua similarity index 100% rename from src/NetHack_3.7/dat/bigrm-2.lua rename to src/NetHack-NetHack-3.7/dat/bigrm-2.lua diff --git a/src/NetHack_3.7/dat/bigrm-3.lua b/src/NetHack-NetHack-3.7/dat/bigrm-3.lua similarity index 100% rename from src/NetHack_3.7/dat/bigrm-3.lua rename to src/NetHack-NetHack-3.7/dat/bigrm-3.lua diff --git a/src/NetHack_3.7/dat/bigrm-4.lua b/src/NetHack-NetHack-3.7/dat/bigrm-4.lua similarity index 100% rename from src/NetHack_3.7/dat/bigrm-4.lua rename to src/NetHack-NetHack-3.7/dat/bigrm-4.lua diff --git a/src/NetHack_3.7/dat/bigrm-5.lua b/src/NetHack-NetHack-3.7/dat/bigrm-5.lua similarity index 100% rename from src/NetHack_3.7/dat/bigrm-5.lua rename to src/NetHack-NetHack-3.7/dat/bigrm-5.lua diff --git a/src/NetHack_3.7/dat/bigrm-6.lua b/src/NetHack-NetHack-3.7/dat/bigrm-6.lua similarity index 100% rename from src/NetHack_3.7/dat/bigrm-6.lua rename to src/NetHack-NetHack-3.7/dat/bigrm-6.lua diff --git a/src/NetHack_3.7/dat/bigrm-7.lua b/src/NetHack-NetHack-3.7/dat/bigrm-7.lua similarity index 100% rename from src/NetHack_3.7/dat/bigrm-7.lua rename to src/NetHack-NetHack-3.7/dat/bigrm-7.lua diff --git a/src/NetHack_3.7/dat/bigrm-8.lua b/src/NetHack-NetHack-3.7/dat/bigrm-8.lua similarity index 100% rename from src/NetHack_3.7/dat/bigrm-8.lua rename to src/NetHack-NetHack-3.7/dat/bigrm-8.lua diff --git a/src/NetHack_3.7/dat/bigrm-9.lua b/src/NetHack-NetHack-3.7/dat/bigrm-9.lua similarity index 100% rename from src/NetHack_3.7/dat/bigrm-9.lua rename to src/NetHack-NetHack-3.7/dat/bigrm-9.lua diff --git a/src/NetHack_3.7/dat/bogusmon.txt b/src/NetHack-NetHack-3.7/dat/bogusmon.txt similarity index 100% rename from src/NetHack_3.7/dat/bogusmon.txt rename to src/NetHack-NetHack-3.7/dat/bogusmon.txt diff --git a/src/NetHack_3.7/dat/castle.lua b/src/NetHack-NetHack-3.7/dat/castle.lua similarity index 100% rename from src/NetHack_3.7/dat/castle.lua rename to src/NetHack-NetHack-3.7/dat/castle.lua diff --git a/src/NetHack_3.7/dat/cmdhelp b/src/NetHack-NetHack-3.7/dat/cmdhelp similarity index 100% rename from src/NetHack_3.7/dat/cmdhelp rename to src/NetHack-NetHack-3.7/dat/cmdhelp diff --git a/src/NetHack_3.7/dat/data.base b/src/NetHack-NetHack-3.7/dat/data.base similarity index 100% rename from src/NetHack_3.7/dat/data.base rename to src/NetHack-NetHack-3.7/dat/data.base diff --git a/src/NetHack_3.7/dat/dungeon.lua b/src/NetHack-NetHack-3.7/dat/dungeon.lua similarity index 100% rename from src/NetHack_3.7/dat/dungeon.lua rename to src/NetHack-NetHack-3.7/dat/dungeon.lua diff --git a/src/NetHack_3.7/dat/earth.lua b/src/NetHack-NetHack-3.7/dat/earth.lua similarity index 100% rename from src/NetHack_3.7/dat/earth.lua rename to src/NetHack-NetHack-3.7/dat/earth.lua diff --git a/src/NetHack_3.7/dat/engrave.txt b/src/NetHack-NetHack-3.7/dat/engrave.txt similarity index 100% rename from src/NetHack_3.7/dat/engrave.txt rename to src/NetHack-NetHack-3.7/dat/engrave.txt diff --git a/src/NetHack_3.7/dat/epitaph.txt b/src/NetHack-NetHack-3.7/dat/epitaph.txt similarity index 100% rename from src/NetHack_3.7/dat/epitaph.txt rename to src/NetHack-NetHack-3.7/dat/epitaph.txt diff --git a/src/NetHack_3.7/dat/fakewiz1.lua b/src/NetHack-NetHack-3.7/dat/fakewiz1.lua similarity index 100% rename from src/NetHack_3.7/dat/fakewiz1.lua rename to src/NetHack-NetHack-3.7/dat/fakewiz1.lua diff --git a/src/NetHack_3.7/dat/fakewiz2.lua b/src/NetHack-NetHack-3.7/dat/fakewiz2.lua similarity index 100% rename from src/NetHack_3.7/dat/fakewiz2.lua rename to src/NetHack-NetHack-3.7/dat/fakewiz2.lua diff --git a/src/NetHack_3.7/dat/fire.lua b/src/NetHack-NetHack-3.7/dat/fire.lua similarity index 100% rename from src/NetHack_3.7/dat/fire.lua rename to src/NetHack-NetHack-3.7/dat/fire.lua diff --git a/src/NetHack_3.7/dat/hellfill.lua b/src/NetHack-NetHack-3.7/dat/hellfill.lua similarity index 100% rename from src/NetHack_3.7/dat/hellfill.lua rename to src/NetHack-NetHack-3.7/dat/hellfill.lua diff --git a/src/NetHack_3.7/dat/help b/src/NetHack-NetHack-3.7/dat/help similarity index 100% rename from src/NetHack_3.7/dat/help rename to src/NetHack-NetHack-3.7/dat/help diff --git a/src/NetHack_3.7/dat/hh b/src/NetHack-NetHack-3.7/dat/hh similarity index 100% rename from src/NetHack_3.7/dat/hh rename to src/NetHack-NetHack-3.7/dat/hh diff --git a/src/NetHack_3.7/dat/history b/src/NetHack-NetHack-3.7/dat/history similarity index 100% rename from src/NetHack_3.7/dat/history rename to src/NetHack-NetHack-3.7/dat/history diff --git a/src/NetHack_3.7/dat/juiblex.lua b/src/NetHack-NetHack-3.7/dat/juiblex.lua similarity index 100% rename from src/NetHack_3.7/dat/juiblex.lua rename to src/NetHack-NetHack-3.7/dat/juiblex.lua diff --git a/src/NetHack_3.7/dat/keyhelp b/src/NetHack-NetHack-3.7/dat/keyhelp similarity index 100% rename from src/NetHack_3.7/dat/keyhelp rename to src/NetHack-NetHack-3.7/dat/keyhelp diff --git a/src/NetHack_3.7/dat/knox.lua b/src/NetHack-NetHack-3.7/dat/knox.lua similarity index 100% rename from src/NetHack_3.7/dat/knox.lua rename to src/NetHack-NetHack-3.7/dat/knox.lua diff --git a/src/NetHack_3.7/dat/license b/src/NetHack-NetHack-3.7/dat/license similarity index 100% rename from src/NetHack_3.7/dat/license rename to src/NetHack-NetHack-3.7/dat/license diff --git a/src/NetHack_3.7/dat/medusa-1.lua b/src/NetHack-NetHack-3.7/dat/medusa-1.lua similarity index 100% rename from src/NetHack_3.7/dat/medusa-1.lua rename to src/NetHack-NetHack-3.7/dat/medusa-1.lua diff --git a/src/NetHack_3.7/dat/medusa-2.lua b/src/NetHack-NetHack-3.7/dat/medusa-2.lua similarity index 100% rename from src/NetHack_3.7/dat/medusa-2.lua rename to src/NetHack-NetHack-3.7/dat/medusa-2.lua diff --git a/src/NetHack_3.7/dat/medusa-3.lua b/src/NetHack-NetHack-3.7/dat/medusa-3.lua similarity index 100% rename from src/NetHack_3.7/dat/medusa-3.lua rename to src/NetHack-NetHack-3.7/dat/medusa-3.lua diff --git a/src/NetHack_3.7/dat/medusa-4.lua b/src/NetHack-NetHack-3.7/dat/medusa-4.lua similarity index 100% rename from src/NetHack_3.7/dat/medusa-4.lua rename to src/NetHack-NetHack-3.7/dat/medusa-4.lua diff --git a/src/NetHack_3.7/dat/minefill.lua b/src/NetHack-NetHack-3.7/dat/minefill.lua similarity index 100% rename from src/NetHack_3.7/dat/minefill.lua rename to src/NetHack-NetHack-3.7/dat/minefill.lua diff --git a/src/NetHack_3.7/dat/minend-1.lua b/src/NetHack-NetHack-3.7/dat/minend-1.lua similarity index 100% rename from src/NetHack_3.7/dat/minend-1.lua rename to src/NetHack-NetHack-3.7/dat/minend-1.lua diff --git a/src/NetHack_3.7/dat/minend-2.lua b/src/NetHack-NetHack-3.7/dat/minend-2.lua similarity index 100% rename from src/NetHack_3.7/dat/minend-2.lua rename to src/NetHack-NetHack-3.7/dat/minend-2.lua diff --git a/src/NetHack_3.7/dat/minend-3.lua b/src/NetHack-NetHack-3.7/dat/minend-3.lua similarity index 100% rename from src/NetHack_3.7/dat/minend-3.lua rename to src/NetHack-NetHack-3.7/dat/minend-3.lua diff --git a/src/NetHack_3.7/dat/minetn-1.lua b/src/NetHack-NetHack-3.7/dat/minetn-1.lua similarity index 100% rename from src/NetHack_3.7/dat/minetn-1.lua rename to src/NetHack-NetHack-3.7/dat/minetn-1.lua diff --git a/src/NetHack_3.7/dat/minetn-2.lua b/src/NetHack-NetHack-3.7/dat/minetn-2.lua similarity index 100% rename from src/NetHack_3.7/dat/minetn-2.lua rename to src/NetHack-NetHack-3.7/dat/minetn-2.lua diff --git a/src/NetHack_3.7/dat/minetn-3.lua b/src/NetHack-NetHack-3.7/dat/minetn-3.lua similarity index 100% rename from src/NetHack_3.7/dat/minetn-3.lua rename to src/NetHack-NetHack-3.7/dat/minetn-3.lua diff --git a/src/NetHack_3.7/dat/minetn-4.lua b/src/NetHack-NetHack-3.7/dat/minetn-4.lua similarity index 100% rename from src/NetHack_3.7/dat/minetn-4.lua rename to src/NetHack-NetHack-3.7/dat/minetn-4.lua diff --git a/src/NetHack_3.7/dat/minetn-5.lua b/src/NetHack-NetHack-3.7/dat/minetn-5.lua similarity index 100% rename from src/NetHack_3.7/dat/minetn-5.lua rename to src/NetHack-NetHack-3.7/dat/minetn-5.lua diff --git a/src/NetHack_3.7/dat/minetn-6.lua b/src/NetHack-NetHack-3.7/dat/minetn-6.lua similarity index 100% rename from src/NetHack_3.7/dat/minetn-6.lua rename to src/NetHack-NetHack-3.7/dat/minetn-6.lua diff --git a/src/NetHack_3.7/dat/minetn-7.lua b/src/NetHack-NetHack-3.7/dat/minetn-7.lua similarity index 100% rename from src/NetHack_3.7/dat/minetn-7.lua rename to src/NetHack-NetHack-3.7/dat/minetn-7.lua diff --git a/src/NetHack_3.7/dat/nhcore.lua b/src/NetHack-NetHack-3.7/dat/nhcore.lua similarity index 100% rename from src/NetHack_3.7/dat/nhcore.lua rename to src/NetHack-NetHack-3.7/dat/nhcore.lua diff --git a/src/NetHack_3.7/dat/nhlib.lua b/src/NetHack-NetHack-3.7/dat/nhlib.lua similarity index 100% rename from src/NetHack_3.7/dat/nhlib.lua rename to src/NetHack-NetHack-3.7/dat/nhlib.lua diff --git a/src/NetHack_3.7/dat/opthelp b/src/NetHack-NetHack-3.7/dat/opthelp similarity index 100% rename from src/NetHack_3.7/dat/opthelp rename to src/NetHack-NetHack-3.7/dat/opthelp diff --git a/src/NetHack_3.7/dat/optmenu b/src/NetHack-NetHack-3.7/dat/optmenu similarity index 100% rename from src/NetHack_3.7/dat/optmenu rename to src/NetHack-NetHack-3.7/dat/optmenu diff --git a/src/NetHack_3.7/dat/oracle.lua b/src/NetHack-NetHack-3.7/dat/oracle.lua similarity index 100% rename from src/NetHack_3.7/dat/oracle.lua rename to src/NetHack-NetHack-3.7/dat/oracle.lua diff --git a/src/NetHack_3.7/dat/oracles.txt b/src/NetHack-NetHack-3.7/dat/oracles.txt similarity index 100% rename from src/NetHack_3.7/dat/oracles.txt rename to src/NetHack-NetHack-3.7/dat/oracles.txt diff --git a/src/NetHack_3.7/dat/orcus.lua b/src/NetHack-NetHack-3.7/dat/orcus.lua similarity index 100% rename from src/NetHack_3.7/dat/orcus.lua rename to src/NetHack-NetHack-3.7/dat/orcus.lua diff --git a/src/NetHack_3.7/dat/quest.lua b/src/NetHack-NetHack-3.7/dat/quest.lua similarity index 100% rename from src/NetHack_3.7/dat/quest.lua rename to src/NetHack-NetHack-3.7/dat/quest.lua diff --git a/src/NetHack_3.7/dat/rumors.fal b/src/NetHack-NetHack-3.7/dat/rumors.fal similarity index 100% rename from src/NetHack_3.7/dat/rumors.fal rename to src/NetHack-NetHack-3.7/dat/rumors.fal diff --git a/src/NetHack_3.7/dat/rumors.tru b/src/NetHack-NetHack-3.7/dat/rumors.tru similarity index 100% rename from src/NetHack_3.7/dat/rumors.tru rename to src/NetHack-NetHack-3.7/dat/rumors.tru diff --git a/src/NetHack_3.7/dat/sanctum.lua b/src/NetHack-NetHack-3.7/dat/sanctum.lua similarity index 100% rename from src/NetHack_3.7/dat/sanctum.lua rename to src/NetHack-NetHack-3.7/dat/sanctum.lua diff --git a/src/NetHack_3.7/dat/soko1-1.lua b/src/NetHack-NetHack-3.7/dat/soko1-1.lua similarity index 100% rename from src/NetHack_3.7/dat/soko1-1.lua rename to src/NetHack-NetHack-3.7/dat/soko1-1.lua diff --git a/src/NetHack_3.7/dat/soko1-2.lua b/src/NetHack-NetHack-3.7/dat/soko1-2.lua similarity index 100% rename from src/NetHack_3.7/dat/soko1-2.lua rename to src/NetHack-NetHack-3.7/dat/soko1-2.lua diff --git a/src/NetHack_3.7/dat/soko2-1.lua b/src/NetHack-NetHack-3.7/dat/soko2-1.lua similarity index 100% rename from src/NetHack_3.7/dat/soko2-1.lua rename to src/NetHack-NetHack-3.7/dat/soko2-1.lua diff --git a/src/NetHack_3.7/dat/soko2-2.lua b/src/NetHack-NetHack-3.7/dat/soko2-2.lua similarity index 100% rename from src/NetHack_3.7/dat/soko2-2.lua rename to src/NetHack-NetHack-3.7/dat/soko2-2.lua diff --git a/src/NetHack_3.7/dat/soko3-1.lua b/src/NetHack-NetHack-3.7/dat/soko3-1.lua similarity index 100% rename from src/NetHack_3.7/dat/soko3-1.lua rename to src/NetHack-NetHack-3.7/dat/soko3-1.lua diff --git a/src/NetHack_3.7/dat/soko3-2.lua b/src/NetHack-NetHack-3.7/dat/soko3-2.lua similarity index 100% rename from src/NetHack_3.7/dat/soko3-2.lua rename to src/NetHack-NetHack-3.7/dat/soko3-2.lua diff --git a/src/NetHack_3.7/dat/soko4-1.lua b/src/NetHack-NetHack-3.7/dat/soko4-1.lua similarity index 100% rename from src/NetHack_3.7/dat/soko4-1.lua rename to src/NetHack-NetHack-3.7/dat/soko4-1.lua diff --git a/src/NetHack_3.7/dat/soko4-2.lua b/src/NetHack-NetHack-3.7/dat/soko4-2.lua similarity index 100% rename from src/NetHack_3.7/dat/soko4-2.lua rename to src/NetHack-NetHack-3.7/dat/soko4-2.lua diff --git a/src/NetHack_3.7/dat/symbols b/src/NetHack-NetHack-3.7/dat/symbols similarity index 100% rename from src/NetHack_3.7/dat/symbols rename to src/NetHack-NetHack-3.7/dat/symbols diff --git a/src/NetHack_3.7/dat/themerms.lua b/src/NetHack-NetHack-3.7/dat/themerms.lua similarity index 100% rename from src/NetHack_3.7/dat/themerms.lua rename to src/NetHack-NetHack-3.7/dat/themerms.lua diff --git a/src/NetHack_3.7/dat/tower1.lua b/src/NetHack-NetHack-3.7/dat/tower1.lua similarity index 100% rename from src/NetHack_3.7/dat/tower1.lua rename to src/NetHack-NetHack-3.7/dat/tower1.lua diff --git a/src/NetHack_3.7/dat/tower2.lua b/src/NetHack-NetHack-3.7/dat/tower2.lua similarity index 100% rename from src/NetHack_3.7/dat/tower2.lua rename to src/NetHack-NetHack-3.7/dat/tower2.lua diff --git a/src/NetHack_3.7/dat/tower3.lua b/src/NetHack-NetHack-3.7/dat/tower3.lua similarity index 100% rename from src/NetHack_3.7/dat/tower3.lua rename to src/NetHack-NetHack-3.7/dat/tower3.lua diff --git a/src/NetHack_3.7/dat/tribute b/src/NetHack-NetHack-3.7/dat/tribute similarity index 100% rename from src/NetHack_3.7/dat/tribute rename to src/NetHack-NetHack-3.7/dat/tribute diff --git a/src/NetHack_3.7/dat/tut-1.lua b/src/NetHack-NetHack-3.7/dat/tut-1.lua similarity index 100% rename from src/NetHack_3.7/dat/tut-1.lua rename to src/NetHack-NetHack-3.7/dat/tut-1.lua diff --git a/src/NetHack_3.7/dat/tut-2.lua b/src/NetHack-NetHack-3.7/dat/tut-2.lua similarity index 100% rename from src/NetHack_3.7/dat/tut-2.lua rename to src/NetHack-NetHack-3.7/dat/tut-2.lua diff --git a/src/NetHack_3.7/dat/usagehlp b/src/NetHack-NetHack-3.7/dat/usagehlp similarity index 100% rename from src/NetHack_3.7/dat/usagehlp rename to src/NetHack-NetHack-3.7/dat/usagehlp diff --git a/src/NetHack_3.7/dat/valley.lua b/src/NetHack-NetHack-3.7/dat/valley.lua similarity index 100% rename from src/NetHack_3.7/dat/valley.lua rename to src/NetHack-NetHack-3.7/dat/valley.lua diff --git a/src/NetHack_3.7/dat/water.lua b/src/NetHack-NetHack-3.7/dat/water.lua similarity index 100% rename from src/NetHack_3.7/dat/water.lua rename to src/NetHack-NetHack-3.7/dat/water.lua diff --git a/src/NetHack_3.7/dat/wizard1.lua b/src/NetHack-NetHack-3.7/dat/wizard1.lua similarity index 100% rename from src/NetHack_3.7/dat/wizard1.lua rename to src/NetHack-NetHack-3.7/dat/wizard1.lua diff --git a/src/NetHack_3.7/dat/wizard2.lua b/src/NetHack-NetHack-3.7/dat/wizard2.lua similarity index 100% rename from src/NetHack_3.7/dat/wizard2.lua rename to src/NetHack-NetHack-3.7/dat/wizard2.lua diff --git a/src/NetHack_3.7/dat/wizard3.lua b/src/NetHack-NetHack-3.7/dat/wizard3.lua similarity index 100% rename from src/NetHack_3.7/dat/wizard3.lua rename to src/NetHack-NetHack-3.7/dat/wizard3.lua diff --git a/src/NetHack_3.7/dat/wizhelp b/src/NetHack-NetHack-3.7/dat/wizhelp similarity index 100% rename from src/NetHack_3.7/dat/wizhelp rename to src/NetHack-NetHack-3.7/dat/wizhelp diff --git a/src/NetHack_3.7/doc/.gitattributes b/src/NetHack-NetHack-3.7/doc/.gitattributes similarity index 100% rename from src/NetHack_3.7/doc/.gitattributes rename to src/NetHack-NetHack-3.7/doc/.gitattributes diff --git a/src/NetHack_3.7/doc/.gitignore b/src/NetHack-NetHack-3.7/doc/.gitignore similarity index 100% rename from src/NetHack_3.7/doc/.gitignore rename to src/NetHack-NetHack-3.7/doc/.gitignore diff --git a/src/NetHack_3.7/doc/Gbk-1pg-pfx.mn b/src/NetHack-NetHack-3.7/doc/Gbk-1pg-pfx.mn similarity index 100% rename from src/NetHack_3.7/doc/Gbk-1pg-pfx.mn rename to src/NetHack-NetHack-3.7/doc/Gbk-1pg-pfx.mn diff --git a/src/NetHack_3.7/doc/Gbk-1pg-sfx.mn b/src/NetHack-NetHack-3.7/doc/Gbk-1pg-sfx.mn similarity index 100% rename from src/NetHack_3.7/doc/Gbk-1pg-sfx.mn rename to src/NetHack-NetHack-3.7/doc/Gbk-1pg-sfx.mn diff --git a/src/NetHack_3.7/doc/Guidebook.mn b/src/NetHack-NetHack-3.7/doc/Guidebook.mn similarity index 100% rename from src/NetHack_3.7/doc/Guidebook.mn rename to src/NetHack-NetHack-3.7/doc/Guidebook.mn diff --git a/src/NetHack_3.7/doc/Guidebook.tex b/src/NetHack-NetHack-3.7/doc/Guidebook.tex similarity index 100% rename from src/NetHack_3.7/doc/Guidebook.tex rename to src/NetHack-NetHack-3.7/doc/Guidebook.tex diff --git a/src/NetHack_3.7/doc/Guidebook.txt b/src/NetHack-NetHack-3.7/doc/Guidebook.txt similarity index 100% rename from src/NetHack_3.7/doc/Guidebook.txt rename to src/NetHack-NetHack-3.7/doc/Guidebook.txt diff --git a/src/NetHack_3.7/doc/config.nh b/src/NetHack-NetHack-3.7/doc/config.nh similarity index 100% rename from src/NetHack_3.7/doc/config.nh rename to src/NetHack-NetHack-3.7/doc/config.nh diff --git a/src/NetHack_3.7/doc/dlb.6 b/src/NetHack-NetHack-3.7/doc/dlb.6 similarity index 100% rename from src/NetHack_3.7/doc/dlb.6 rename to src/NetHack-NetHack-3.7/doc/dlb.6 diff --git a/src/NetHack_3.7/doc/dlb.txt b/src/NetHack-NetHack-3.7/doc/dlb.txt similarity index 100% rename from src/NetHack_3.7/doc/dlb.txt rename to src/NetHack-NetHack-3.7/doc/dlb.txt diff --git a/src/NetHack_3.7/doc/fixes1-0.txt b/src/NetHack-NetHack-3.7/doc/fixes1-0.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes1-0.txt rename to src/NetHack-NetHack-3.7/doc/fixes1-0.txt diff --git a/src/NetHack_3.7/doc/fixes1-4-f.txt b/src/NetHack-NetHack-3.7/doc/fixes1-4-f.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes1-4-f.txt rename to src/NetHack-NetHack-3.7/doc/fixes1-4-f.txt diff --git a/src/NetHack_3.7/doc/fixes2-2.txt b/src/NetHack-NetHack-3.7/doc/fixes2-2.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes2-2.txt rename to src/NetHack-NetHack-3.7/doc/fixes2-2.txt diff --git a/src/NetHack_3.7/doc/fixes2-3-e.txt b/src/NetHack-NetHack-3.7/doc/fixes2-3-e.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes2-3-e.txt rename to src/NetHack-NetHack-3.7/doc/fixes2-3-e.txt diff --git a/src/NetHack_3.7/doc/fixes3-0-pl01.txt b/src/NetHack-NetHack-3.7/doc/fixes3-0-pl01.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-0-pl01.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-0-pl01.txt diff --git a/src/NetHack_3.7/doc/fixes3-0-pl02.txt b/src/NetHack-NetHack-3.7/doc/fixes3-0-pl02.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-0-pl02.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-0-pl02.txt diff --git a/src/NetHack_3.7/doc/fixes3-0-pl03.txt b/src/NetHack-NetHack-3.7/doc/fixes3-0-pl03.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-0-pl03.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-0-pl03.txt diff --git a/src/NetHack_3.7/doc/fixes3-0-pl04.txt b/src/NetHack-NetHack-3.7/doc/fixes3-0-pl04.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-0-pl04.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-0-pl04.txt diff --git a/src/NetHack_3.7/doc/fixes3-0-pl05.txt b/src/NetHack-NetHack-3.7/doc/fixes3-0-pl05.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-0-pl05.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-0-pl05.txt diff --git a/src/NetHack_3.7/doc/fixes3-0-pl06.txt b/src/NetHack-NetHack-3.7/doc/fixes3-0-pl06.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-0-pl06.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-0-pl06.txt diff --git a/src/NetHack_3.7/doc/fixes3-0-pl07.txt b/src/NetHack-NetHack-3.7/doc/fixes3-0-pl07.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-0-pl07.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-0-pl07.txt diff --git a/src/NetHack_3.7/doc/fixes3-0-pl08.txt b/src/NetHack-NetHack-3.7/doc/fixes3-0-pl08.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-0-pl08.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-0-pl08.txt diff --git a/src/NetHack_3.7/doc/fixes3-0-pl09.txt b/src/NetHack-NetHack-3.7/doc/fixes3-0-pl09.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-0-pl09.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-0-pl09.txt diff --git a/src/NetHack_3.7/doc/fixes3-0-pl10.txt b/src/NetHack-NetHack-3.7/doc/fixes3-0-pl10.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-0-pl10.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-0-pl10.txt diff --git a/src/NetHack_3.7/doc/fixes3-0.txt b/src/NetHack-NetHack-3.7/doc/fixes3-0.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-0.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-0.txt diff --git a/src/NetHack_3.7/doc/fixes3-1-1.txt b/src/NetHack-NetHack-3.7/doc/fixes3-1-1.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-1-1.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-1-1.txt diff --git a/src/NetHack_3.7/doc/fixes3-1-2.txt b/src/NetHack-NetHack-3.7/doc/fixes3-1-2.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-1-2.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-1-2.txt diff --git a/src/NetHack_3.7/doc/fixes3-1-3.txt b/src/NetHack-NetHack-3.7/doc/fixes3-1-3.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-1-3.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-1-3.txt diff --git a/src/NetHack_3.7/doc/fixes3-2-0.txt b/src/NetHack-NetHack-3.7/doc/fixes3-2-0.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-2-0.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-2-0.txt diff --git a/src/NetHack_3.7/doc/fixes3-2-1.txt b/src/NetHack-NetHack-3.7/doc/fixes3-2-1.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-2-1.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-2-1.txt diff --git a/src/NetHack_3.7/doc/fixes3-2-2.txt b/src/NetHack-NetHack-3.7/doc/fixes3-2-2.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-2-2.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-2-2.txt diff --git a/src/NetHack_3.7/doc/fixes3-2-3.txt b/src/NetHack-NetHack-3.7/doc/fixes3-2-3.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-2-3.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-2-3.txt diff --git a/src/NetHack_3.7/doc/fixes3-3-0.txt b/src/NetHack-NetHack-3.7/doc/fixes3-3-0.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-3-0.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-3-0.txt diff --git a/src/NetHack_3.7/doc/fixes3-3-1.txt b/src/NetHack-NetHack-3.7/doc/fixes3-3-1.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-3-1.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-3-1.txt diff --git a/src/NetHack_3.7/doc/fixes3-4-0.txt b/src/NetHack-NetHack-3.7/doc/fixes3-4-0.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-4-0.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-4-0.txt diff --git a/src/NetHack_3.7/doc/fixes3-4-1.txt b/src/NetHack-NetHack-3.7/doc/fixes3-4-1.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-4-1.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-4-1.txt diff --git a/src/NetHack_3.7/doc/fixes3-4-2.txt b/src/NetHack-NetHack-3.7/doc/fixes3-4-2.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-4-2.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-4-2.txt diff --git a/src/NetHack_3.7/doc/fixes3-4-3.txt b/src/NetHack-NetHack-3.7/doc/fixes3-4-3.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-4-3.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-4-3.txt diff --git a/src/NetHack_3.7/doc/fixes3-5-0.txt b/src/NetHack-NetHack-3.7/doc/fixes3-5-0.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-5-0.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-5-0.txt diff --git a/src/NetHack_3.7/doc/fixes3-6-0.txt b/src/NetHack-NetHack-3.7/doc/fixes3-6-0.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-6-0.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-6-0.txt diff --git a/src/NetHack_3.7/doc/fixes3-6-1.txt b/src/NetHack-NetHack-3.7/doc/fixes3-6-1.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-6-1.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-6-1.txt diff --git a/src/NetHack_3.7/doc/fixes3-6-2.txt b/src/NetHack-NetHack-3.7/doc/fixes3-6-2.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-6-2.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-6-2.txt diff --git a/src/NetHack_3.7/doc/fixes3-6-3.txt b/src/NetHack-NetHack-3.7/doc/fixes3-6-3.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-6-3.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-6-3.txt diff --git a/src/NetHack_3.7/doc/fixes3-6-4.txt b/src/NetHack-NetHack-3.7/doc/fixes3-6-4.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-6-4.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-6-4.txt diff --git a/src/NetHack_3.7/doc/fixes3-6-5.txt b/src/NetHack-NetHack-3.7/doc/fixes3-6-5.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-6-5.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-6-5.txt diff --git a/src/NetHack_3.7/doc/fixes3-6-6.txt b/src/NetHack-NetHack-3.7/doc/fixes3-6-6.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-6-6.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-6-6.txt diff --git a/src/NetHack_3.7/doc/fixes3-6-7.txt b/src/NetHack-NetHack-3.7/doc/fixes3-6-7.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-6-7.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-6-7.txt diff --git a/src/NetHack_3.7/doc/fixes3-7-0.txt b/src/NetHack-NetHack-3.7/doc/fixes3-7-0.txt similarity index 100% rename from src/NetHack_3.7/doc/fixes3-7-0.txt rename to src/NetHack-NetHack-3.7/doc/fixes3-7-0.txt diff --git a/src/NetHack_3.7/doc/fixesX-X-X.txt b/src/NetHack-NetHack-3.7/doc/fixesX-X-X.txt similarity index 100% rename from src/NetHack_3.7/doc/fixesX-X-X.txt rename to src/NetHack-NetHack-3.7/doc/fixesX-X-X.txt diff --git a/src/NetHack_3.7/doc/lua.adoc b/src/NetHack-NetHack-3.7/doc/lua.adoc similarity index 100% rename from src/NetHack_3.7/doc/lua.adoc rename to src/NetHack-NetHack-3.7/doc/lua.adoc diff --git a/src/NetHack_3.7/doc/makedefs.6 b/src/NetHack-NetHack-3.7/doc/makedefs.6 similarity index 100% rename from src/NetHack_3.7/doc/makedefs.6 rename to src/NetHack-NetHack-3.7/doc/makedefs.6 diff --git a/src/NetHack_3.7/doc/makedefs.txt b/src/NetHack-NetHack-3.7/doc/makedefs.txt similarity index 100% rename from src/NetHack_3.7/doc/makedefs.txt rename to src/NetHack-NetHack-3.7/doc/makedefs.txt diff --git a/src/NetHack_3.7/doc/mn.7 b/src/NetHack-NetHack-3.7/doc/mn.7 similarity index 100% rename from src/NetHack_3.7/doc/mn.7 rename to src/NetHack-NetHack-3.7/doc/mn.7 diff --git a/src/NetHack_3.7/doc/mn.txt b/src/NetHack-NetHack-3.7/doc/mn.txt similarity index 100% rename from src/NetHack_3.7/doc/mn.txt rename to src/NetHack-NetHack-3.7/doc/mn.txt diff --git a/src/NetHack_3.7/doc/mnh.7 b/src/NetHack-NetHack-3.7/doc/mnh.7 similarity index 100% rename from src/NetHack_3.7/doc/mnh.7 rename to src/NetHack-NetHack-3.7/doc/mnh.7 diff --git a/src/NetHack_3.7/doc/mnh.txt b/src/NetHack-NetHack-3.7/doc/mnh.txt similarity index 100% rename from src/NetHack_3.7/doc/mnh.txt rename to src/NetHack-NetHack-3.7/doc/mnh.txt diff --git a/src/NetHack_3.7/doc/nethack.6 b/src/NetHack-NetHack-3.7/doc/nethack.6 similarity index 100% rename from src/NetHack_3.7/doc/nethack.6 rename to src/NetHack-NetHack-3.7/doc/nethack.6 diff --git a/src/NetHack_3.7/doc/nethack.txt b/src/NetHack-NetHack-3.7/doc/nethack.txt similarity index 100% rename from src/NetHack_3.7/doc/nethack.txt rename to src/NetHack-NetHack-3.7/doc/nethack.txt diff --git a/src/NetHack_3.7/doc/options.txt b/src/NetHack-NetHack-3.7/doc/options.txt similarity index 100% rename from src/NetHack_3.7/doc/options.txt rename to src/NetHack-NetHack-3.7/doc/options.txt diff --git a/src/NetHack_3.7/doc/recover.6 b/src/NetHack-NetHack-3.7/doc/recover.6 similarity index 100% rename from src/NetHack_3.7/doc/recover.6 rename to src/NetHack-NetHack-3.7/doc/recover.6 diff --git a/src/NetHack_3.7/doc/recover.txt b/src/NetHack-NetHack-3.7/doc/recover.txt similarity index 100% rename from src/NetHack_3.7/doc/recover.txt rename to src/NetHack-NetHack-3.7/doc/recover.txt diff --git a/src/NetHack_3.7/doc/sound.txt b/src/NetHack-NetHack-3.7/doc/sound.txt similarity index 100% rename from src/NetHack_3.7/doc/sound.txt rename to src/NetHack-NetHack-3.7/doc/sound.txt diff --git a/src/NetHack_3.7/doc/tmac.n b/src/NetHack-NetHack-3.7/doc/tmac.n similarity index 100% rename from src/NetHack_3.7/doc/tmac.n rename to src/NetHack-NetHack-3.7/doc/tmac.n diff --git a/src/NetHack_3.7/doc/tmac.nh b/src/NetHack-NetHack-3.7/doc/tmac.nh similarity index 100% rename from src/NetHack_3.7/doc/tmac.nh rename to src/NetHack-NetHack-3.7/doc/tmac.nh diff --git a/src/NetHack_3.7/doc/window.txt b/src/NetHack-NetHack-3.7/doc/window.txt similarity index 100% rename from src/NetHack_3.7/doc/window.txt rename to src/NetHack-NetHack-3.7/doc/window.txt diff --git a/src/NetHack_3.7/include/.gitattributes b/src/NetHack-NetHack-3.7/include/.gitattributes similarity index 100% rename from src/NetHack_3.7/include/.gitattributes rename to src/NetHack-NetHack-3.7/include/.gitattributes diff --git a/src/NetHack_3.7/include/.gitignore b/src/NetHack-NetHack-3.7/include/.gitignore similarity index 100% rename from src/NetHack_3.7/include/.gitignore rename to src/NetHack-NetHack-3.7/include/.gitignore diff --git a/src/NetHack_3.7/include/align.h b/src/NetHack-NetHack-3.7/include/align.h similarity index 100% rename from src/NetHack_3.7/include/align.h rename to src/NetHack-NetHack-3.7/include/align.h diff --git a/src/NetHack_3.7/include/artifact.h b/src/NetHack-NetHack-3.7/include/artifact.h similarity index 100% rename from src/NetHack_3.7/include/artifact.h rename to src/NetHack-NetHack-3.7/include/artifact.h diff --git a/src/NetHack_3.7/include/artilist.h b/src/NetHack-NetHack-3.7/include/artilist.h similarity index 100% rename from src/NetHack_3.7/include/artilist.h rename to src/NetHack-NetHack-3.7/include/artilist.h diff --git a/src/NetHack_3.7/include/attrib.h b/src/NetHack-NetHack-3.7/include/attrib.h similarity index 100% rename from src/NetHack_3.7/include/attrib.h rename to src/NetHack-NetHack-3.7/include/attrib.h diff --git a/src/NetHack_3.7/include/botl.h b/src/NetHack-NetHack-3.7/include/botl.h similarity index 100% rename from src/NetHack_3.7/include/botl.h rename to src/NetHack-NetHack-3.7/include/botl.h diff --git a/src/NetHack_3.7/include/color.h b/src/NetHack-NetHack-3.7/include/color.h similarity index 100% rename from src/NetHack_3.7/include/color.h rename to src/NetHack-NetHack-3.7/include/color.h diff --git a/src/NetHack_3.7/include/config.h b/src/NetHack-NetHack-3.7/include/config.h similarity index 100% rename from src/NetHack_3.7/include/config.h rename to src/NetHack-NetHack-3.7/include/config.h diff --git a/src/NetHack_3.7/include/config1.h b/src/NetHack-NetHack-3.7/include/config1.h similarity index 100% rename from src/NetHack_3.7/include/config1.h rename to src/NetHack-NetHack-3.7/include/config1.h diff --git a/src/NetHack_3.7/include/context.h b/src/NetHack-NetHack-3.7/include/context.h similarity index 100% rename from src/NetHack_3.7/include/context.h rename to src/NetHack-NetHack-3.7/include/context.h diff --git a/src/NetHack_3.7/include/coord.h b/src/NetHack-NetHack-3.7/include/coord.h similarity index 100% rename from src/NetHack_3.7/include/coord.h rename to src/NetHack-NetHack-3.7/include/coord.h diff --git a/src/NetHack_3.7/include/cstd.h b/src/NetHack-NetHack-3.7/include/cstd.h similarity index 100% rename from src/NetHack_3.7/include/cstd.h rename to src/NetHack-NetHack-3.7/include/cstd.h diff --git a/src/NetHack_3.7/include/decl.h b/src/NetHack-NetHack-3.7/include/decl.h similarity index 100% rename from src/NetHack_3.7/include/decl.h rename to src/NetHack-NetHack-3.7/include/decl.h diff --git a/src/NetHack_3.7/include/defsym.h b/src/NetHack-NetHack-3.7/include/defsym.h similarity index 100% rename from src/NetHack_3.7/include/defsym.h rename to src/NetHack-NetHack-3.7/include/defsym.h diff --git a/src/NetHack_3.7/include/dgn_file.h b/src/NetHack-NetHack-3.7/include/dgn_file.h similarity index 100% rename from src/NetHack_3.7/include/dgn_file.h rename to src/NetHack-NetHack-3.7/include/dgn_file.h diff --git a/src/NetHack_3.7/include/display.h b/src/NetHack-NetHack-3.7/include/display.h similarity index 100% rename from src/NetHack_3.7/include/display.h rename to src/NetHack-NetHack-3.7/include/display.h diff --git a/src/NetHack_3.7/include/dlb.h b/src/NetHack-NetHack-3.7/include/dlb.h similarity index 100% rename from src/NetHack_3.7/include/dlb.h rename to src/NetHack-NetHack-3.7/include/dlb.h diff --git a/src/NetHack_3.7/include/dungeon.h b/src/NetHack-NetHack-3.7/include/dungeon.h similarity index 100% rename from src/NetHack_3.7/include/dungeon.h rename to src/NetHack-NetHack-3.7/include/dungeon.h diff --git a/src/NetHack_3.7/include/engrave.h b/src/NetHack-NetHack-3.7/include/engrave.h similarity index 100% rename from src/NetHack_3.7/include/engrave.h rename to src/NetHack-NetHack-3.7/include/engrave.h diff --git a/src/NetHack_3.7/include/extern.h b/src/NetHack-NetHack-3.7/include/extern.h similarity index 100% rename from src/NetHack_3.7/include/extern.h rename to src/NetHack-NetHack-3.7/include/extern.h diff --git a/src/NetHack_3.7/include/flag.h b/src/NetHack-NetHack-3.7/include/flag.h similarity index 100% rename from src/NetHack_3.7/include/flag.h rename to src/NetHack-NetHack-3.7/include/flag.h diff --git a/src/NetHack_3.7/include/fnamesiz.h b/src/NetHack-NetHack-3.7/include/fnamesiz.h similarity index 100% rename from src/NetHack_3.7/include/fnamesiz.h rename to src/NetHack-NetHack-3.7/include/fnamesiz.h diff --git a/src/NetHack_3.7/include/func_tab.h b/src/NetHack-NetHack-3.7/include/func_tab.h similarity index 100% rename from src/NetHack_3.7/include/func_tab.h rename to src/NetHack-NetHack-3.7/include/func_tab.h diff --git a/src/NetHack_3.7/include/global.h b/src/NetHack-NetHack-3.7/include/global.h similarity index 100% rename from src/NetHack_3.7/include/global.h rename to src/NetHack-NetHack-3.7/include/global.h diff --git a/src/NetHack_3.7/include/hack.h b/src/NetHack-NetHack-3.7/include/hack.h similarity index 100% rename from src/NetHack_3.7/include/hack.h rename to src/NetHack-NetHack-3.7/include/hack.h diff --git a/src/NetHack_3.7/include/integer.h b/src/NetHack-NetHack-3.7/include/integer.h similarity index 100% rename from src/NetHack_3.7/include/integer.h rename to src/NetHack-NetHack-3.7/include/integer.h diff --git a/src/NetHack_3.7/include/isaac64.h b/src/NetHack-NetHack-3.7/include/isaac64.h similarity index 100% rename from src/NetHack_3.7/include/isaac64.h rename to src/NetHack-NetHack-3.7/include/isaac64.h diff --git a/src/NetHack_3.7/include/lint.h b/src/NetHack-NetHack-3.7/include/lint.h similarity index 100% rename from src/NetHack_3.7/include/lint.h rename to src/NetHack-NetHack-3.7/include/lint.h diff --git a/src/NetHack_3.7/include/mail.h b/src/NetHack-NetHack-3.7/include/mail.h similarity index 100% rename from src/NetHack_3.7/include/mail.h rename to src/NetHack-NetHack-3.7/include/mail.h diff --git a/src/NetHack_3.7/include/mextra.h b/src/NetHack-NetHack-3.7/include/mextra.h similarity index 100% rename from src/NetHack_3.7/include/mextra.h rename to src/NetHack-NetHack-3.7/include/mextra.h diff --git a/src/NetHack_3.7/include/mfndpos.h b/src/NetHack-NetHack-3.7/include/mfndpos.h similarity index 100% rename from src/NetHack_3.7/include/mfndpos.h rename to src/NetHack-NetHack-3.7/include/mfndpos.h diff --git a/src/NetHack_3.7/include/micro.h b/src/NetHack-NetHack-3.7/include/micro.h similarity index 100% rename from src/NetHack_3.7/include/micro.h rename to src/NetHack-NetHack-3.7/include/micro.h diff --git a/src/NetHack_3.7/include/mkroom.h b/src/NetHack-NetHack-3.7/include/mkroom.h similarity index 100% rename from src/NetHack_3.7/include/mkroom.h rename to src/NetHack-NetHack-3.7/include/mkroom.h diff --git a/src/NetHack_3.7/include/monattk.h b/src/NetHack-NetHack-3.7/include/monattk.h similarity index 100% rename from src/NetHack_3.7/include/monattk.h rename to src/NetHack-NetHack-3.7/include/monattk.h diff --git a/src/NetHack_3.7/include/mondata.h b/src/NetHack-NetHack-3.7/include/mondata.h similarity index 100% rename from src/NetHack_3.7/include/mondata.h rename to src/NetHack-NetHack-3.7/include/mondata.h diff --git a/src/NetHack_3.7/include/monflag.h b/src/NetHack-NetHack-3.7/include/monflag.h similarity index 100% rename from src/NetHack_3.7/include/monflag.h rename to src/NetHack-NetHack-3.7/include/monflag.h diff --git a/src/NetHack_3.7/include/monst.h b/src/NetHack-NetHack-3.7/include/monst.h similarity index 100% rename from src/NetHack_3.7/include/monst.h rename to src/NetHack-NetHack-3.7/include/monst.h diff --git a/src/NetHack_3.7/include/monsters.h b/src/NetHack-NetHack-3.7/include/monsters.h similarity index 100% rename from src/NetHack_3.7/include/monsters.h rename to src/NetHack-NetHack-3.7/include/monsters.h diff --git a/src/NetHack_3.7/include/obj.h b/src/NetHack-NetHack-3.7/include/obj.h similarity index 100% rename from src/NetHack_3.7/include/obj.h rename to src/NetHack-NetHack-3.7/include/obj.h diff --git a/src/NetHack_3.7/include/objclass.h b/src/NetHack-NetHack-3.7/include/objclass.h similarity index 100% rename from src/NetHack_3.7/include/objclass.h rename to src/NetHack-NetHack-3.7/include/objclass.h diff --git a/src/NetHack_3.7/include/objects.h b/src/NetHack-NetHack-3.7/include/objects.h similarity index 100% rename from src/NetHack_3.7/include/objects.h rename to src/NetHack-NetHack-3.7/include/objects.h diff --git a/src/NetHack_3.7/include/optlist.h b/src/NetHack-NetHack-3.7/include/optlist.h similarity index 100% rename from src/NetHack_3.7/include/optlist.h rename to src/NetHack-NetHack-3.7/include/optlist.h diff --git a/src/NetHack_3.7/include/patchlevel.h b/src/NetHack-NetHack-3.7/include/patchlevel.h similarity index 100% rename from src/NetHack_3.7/include/patchlevel.h rename to src/NetHack-NetHack-3.7/include/patchlevel.h diff --git a/src/NetHack_3.7/include/pcconf.h b/src/NetHack-NetHack-3.7/include/pcconf.h similarity index 100% rename from src/NetHack_3.7/include/pcconf.h rename to src/NetHack-NetHack-3.7/include/pcconf.h diff --git a/src/NetHack_3.7/include/permonst.h b/src/NetHack-NetHack-3.7/include/permonst.h similarity index 100% rename from src/NetHack_3.7/include/permonst.h rename to src/NetHack-NetHack-3.7/include/permonst.h diff --git a/src/NetHack_3.7/include/prop.h b/src/NetHack-NetHack-3.7/include/prop.h similarity index 100% rename from src/NetHack_3.7/include/prop.h rename to src/NetHack-NetHack-3.7/include/prop.h diff --git a/src/NetHack_3.7/include/quest.h b/src/NetHack-NetHack-3.7/include/quest.h similarity index 100% rename from src/NetHack_3.7/include/quest.h rename to src/NetHack-NetHack-3.7/include/quest.h diff --git a/src/NetHack_3.7/include/rect.h b/src/NetHack-NetHack-3.7/include/rect.h similarity index 100% rename from src/NetHack_3.7/include/rect.h rename to src/NetHack-NetHack-3.7/include/rect.h diff --git a/src/NetHack_3.7/include/region.h b/src/NetHack-NetHack-3.7/include/region.h similarity index 100% rename from src/NetHack_3.7/include/region.h rename to src/NetHack-NetHack-3.7/include/region.h diff --git a/src/NetHack_3.7/include/rm.h b/src/NetHack-NetHack-3.7/include/rm.h similarity index 100% rename from src/NetHack_3.7/include/rm.h rename to src/NetHack-NetHack-3.7/include/rm.h diff --git a/src/NetHack_3.7/include/seffects.h b/src/NetHack-NetHack-3.7/include/seffects.h similarity index 100% rename from src/NetHack_3.7/include/seffects.h rename to src/NetHack-NetHack-3.7/include/seffects.h diff --git a/src/NetHack_3.7/include/skills.h b/src/NetHack-NetHack-3.7/include/skills.h similarity index 100% rename from src/NetHack_3.7/include/skills.h rename to src/NetHack-NetHack-3.7/include/skills.h diff --git a/src/NetHack_3.7/include/sndprocs.h b/src/NetHack-NetHack-3.7/include/sndprocs.h similarity index 100% rename from src/NetHack_3.7/include/sndprocs.h rename to src/NetHack-NetHack-3.7/include/sndprocs.h diff --git a/src/NetHack_3.7/include/sp_lev.h b/src/NetHack-NetHack-3.7/include/sp_lev.h similarity index 100% rename from src/NetHack_3.7/include/sp_lev.h rename to src/NetHack-NetHack-3.7/include/sp_lev.h diff --git a/src/NetHack_3.7/include/spell.h b/src/NetHack-NetHack-3.7/include/spell.h similarity index 100% rename from src/NetHack_3.7/include/spell.h rename to src/NetHack-NetHack-3.7/include/spell.h diff --git a/src/NetHack_3.7/include/sym.h b/src/NetHack-NetHack-3.7/include/sym.h similarity index 100% rename from src/NetHack_3.7/include/sym.h rename to src/NetHack-NetHack-3.7/include/sym.h diff --git a/src/NetHack_3.7/include/sys.h b/src/NetHack-NetHack-3.7/include/sys.h similarity index 100% rename from src/NetHack_3.7/include/sys.h rename to src/NetHack-NetHack-3.7/include/sys.h diff --git a/src/NetHack_3.7/include/tcap.h b/src/NetHack-NetHack-3.7/include/tcap.h similarity index 100% rename from src/NetHack_3.7/include/tcap.h rename to src/NetHack-NetHack-3.7/include/tcap.h diff --git a/src/NetHack_3.7/include/tile2x11.h b/src/NetHack-NetHack-3.7/include/tile2x11.h similarity index 100% rename from src/NetHack_3.7/include/tile2x11.h rename to src/NetHack-NetHack-3.7/include/tile2x11.h diff --git a/src/NetHack_3.7/include/tileset.h b/src/NetHack-NetHack-3.7/include/tileset.h similarity index 100% rename from src/NetHack_3.7/include/tileset.h rename to src/NetHack-NetHack-3.7/include/tileset.h diff --git a/src/NetHack_3.7/include/timeout.h b/src/NetHack-NetHack-3.7/include/timeout.h similarity index 100% rename from src/NetHack_3.7/include/timeout.h rename to src/NetHack-NetHack-3.7/include/timeout.h diff --git a/src/NetHack_3.7/include/tradstdc.h b/src/NetHack-NetHack-3.7/include/tradstdc.h similarity index 100% rename from src/NetHack_3.7/include/tradstdc.h rename to src/NetHack-NetHack-3.7/include/tradstdc.h diff --git a/src/NetHack_3.7/include/trap.h b/src/NetHack-NetHack-3.7/include/trap.h similarity index 100% rename from src/NetHack_3.7/include/trap.h rename to src/NetHack-NetHack-3.7/include/trap.h diff --git a/src/NetHack_3.7/include/unixconf.h b/src/NetHack-NetHack-3.7/include/unixconf.h similarity index 100% rename from src/NetHack_3.7/include/unixconf.h rename to src/NetHack-NetHack-3.7/include/unixconf.h diff --git a/src/NetHack_3.7/include/vision.h b/src/NetHack-NetHack-3.7/include/vision.h similarity index 100% rename from src/NetHack_3.7/include/vision.h rename to src/NetHack-NetHack-3.7/include/vision.h diff --git a/src/NetHack_3.7/include/vmsconf.h b/src/NetHack-NetHack-3.7/include/vmsconf.h similarity index 100% rename from src/NetHack_3.7/include/vmsconf.h rename to src/NetHack-NetHack-3.7/include/vmsconf.h diff --git a/src/NetHack_3.7/include/warnings.h b/src/NetHack-NetHack-3.7/include/warnings.h similarity index 100% rename from src/NetHack_3.7/include/warnings.h rename to src/NetHack-NetHack-3.7/include/warnings.h diff --git a/src/NetHack_3.7/include/winX.h b/src/NetHack-NetHack-3.7/include/winX.h similarity index 100% rename from src/NetHack_3.7/include/winX.h rename to src/NetHack-NetHack-3.7/include/winX.h diff --git a/src/NetHack_3.7/include/winami.h b/src/NetHack-NetHack-3.7/include/winami.h similarity index 100% rename from src/NetHack_3.7/include/winami.h rename to src/NetHack-NetHack-3.7/include/winami.h diff --git a/src/NetHack_3.7/include/wincurs.h b/src/NetHack-NetHack-3.7/include/wincurs.h similarity index 100% rename from src/NetHack_3.7/include/wincurs.h rename to src/NetHack-NetHack-3.7/include/wincurs.h diff --git a/src/NetHack_3.7/include/windconf.h b/src/NetHack-NetHack-3.7/include/windconf.h similarity index 100% rename from src/NetHack_3.7/include/windconf.h rename to src/NetHack-NetHack-3.7/include/windconf.h diff --git a/src/NetHack_3.7/include/winprocs.h b/src/NetHack-NetHack-3.7/include/winprocs.h similarity index 100% rename from src/NetHack_3.7/include/winprocs.h rename to src/NetHack-NetHack-3.7/include/winprocs.h diff --git a/src/NetHack_3.7/include/wintty.h b/src/NetHack-NetHack-3.7/include/wintty.h similarity index 100% rename from src/NetHack_3.7/include/wintty.h rename to src/NetHack-NetHack-3.7/include/wintty.h diff --git a/src/NetHack_3.7/include/wintype.h b/src/NetHack-NetHack-3.7/include/wintype.h similarity index 100% rename from src/NetHack_3.7/include/wintype.h rename to src/NetHack-NetHack-3.7/include/wintype.h diff --git a/src/NetHack_3.7/include/xwindow.h b/src/NetHack-NetHack-3.7/include/xwindow.h similarity index 100% rename from src/NetHack_3.7/include/xwindow.h rename to src/NetHack-NetHack-3.7/include/xwindow.h diff --git a/src/NetHack_3.7/include/xwindowp.h b/src/NetHack-NetHack-3.7/include/xwindowp.h similarity index 100% rename from src/NetHack_3.7/include/xwindowp.h rename to src/NetHack-NetHack-3.7/include/xwindowp.h diff --git a/src/NetHack_3.7/include/you.h b/src/NetHack-NetHack-3.7/include/you.h similarity index 100% rename from src/NetHack_3.7/include/you.h rename to src/NetHack-NetHack-3.7/include/you.h diff --git a/src/NetHack_3.7/include/youprop.h b/src/NetHack-NetHack-3.7/include/youprop.h similarity index 100% rename from src/NetHack_3.7/include/youprop.h rename to src/NetHack-NetHack-3.7/include/youprop.h diff --git a/src/NetHack_3.7/outdated/.gitattributes b/src/NetHack-NetHack-3.7/outdated/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/.gitattributes diff --git a/src/NetHack_3.7/outdated/.travis.yml b/src/NetHack-NetHack-3.7/outdated/.travis.yml similarity index 100% rename from src/NetHack_3.7/outdated/.travis.yml rename to src/NetHack-NetHack-3.7/outdated/.travis.yml diff --git a/src/NetHack_3.7/outdated/dat/symbols b/src/NetHack-NetHack-3.7/outdated/dat/symbols similarity index 100% rename from src/NetHack_3.7/outdated/dat/symbols rename to src/NetHack-NetHack-3.7/outdated/dat/symbols diff --git a/src/NetHack_3.7/outdated/include/.gitattributes b/src/NetHack-NetHack-3.7/outdated/include/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/include/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/include/.gitattributes diff --git a/src/NetHack_3.7/outdated/include/amiconf.h b/src/NetHack-NetHack-3.7/outdated/include/amiconf.h similarity index 100% rename from src/NetHack_3.7/outdated/include/amiconf.h rename to src/NetHack-NetHack-3.7/outdated/include/amiconf.h diff --git a/src/NetHack_3.7/outdated/include/beconf.h b/src/NetHack-NetHack-3.7/outdated/include/beconf.h similarity index 100% rename from src/NetHack_3.7/outdated/include/beconf.h rename to src/NetHack-NetHack-3.7/outdated/include/beconf.h diff --git a/src/NetHack_3.7/outdated/include/bitmfile.h b/src/NetHack-NetHack-3.7/outdated/include/bitmfile.h similarity index 100% rename from src/NetHack_3.7/outdated/include/bitmfile.h rename to src/NetHack-NetHack-3.7/outdated/include/bitmfile.h diff --git a/src/NetHack_3.7/outdated/include/def_os2.h b/src/NetHack-NetHack-3.7/outdated/include/def_os2.h similarity index 100% rename from src/NetHack_3.7/outdated/include/def_os2.h rename to src/NetHack-NetHack-3.7/outdated/include/def_os2.h diff --git a/src/NetHack_3.7/outdated/include/gem_rsc.h b/src/NetHack-NetHack-3.7/outdated/include/gem_rsc.h similarity index 100% rename from src/NetHack_3.7/outdated/include/gem_rsc.h rename to src/NetHack-NetHack-3.7/outdated/include/gem_rsc.h diff --git a/src/NetHack_3.7/outdated/include/load_img.h b/src/NetHack-NetHack-3.7/outdated/include/load_img.h similarity index 100% rename from src/NetHack_3.7/outdated/include/load_img.h rename to src/NetHack-NetHack-3.7/outdated/include/load_img.h diff --git a/src/NetHack_3.7/outdated/include/mac-carbon.h b/src/NetHack-NetHack-3.7/outdated/include/mac-carbon.h similarity index 100% rename from src/NetHack_3.7/outdated/include/mac-carbon.h rename to src/NetHack-NetHack-3.7/outdated/include/mac-carbon.h diff --git a/src/NetHack_3.7/outdated/include/mac-qt.h b/src/NetHack-NetHack-3.7/outdated/include/mac-qt.h similarity index 100% rename from src/NetHack_3.7/outdated/include/mac-qt.h rename to src/NetHack-NetHack-3.7/outdated/include/mac-qt.h diff --git a/src/NetHack_3.7/outdated/include/mac-term.h b/src/NetHack-NetHack-3.7/outdated/include/mac-term.h similarity index 100% rename from src/NetHack_3.7/outdated/include/mac-term.h rename to src/NetHack-NetHack-3.7/outdated/include/mac-term.h diff --git a/src/NetHack_3.7/outdated/include/macconf.h b/src/NetHack-NetHack-3.7/outdated/include/macconf.h similarity index 100% rename from src/NetHack_3.7/outdated/include/macconf.h rename to src/NetHack-NetHack-3.7/outdated/include/macconf.h diff --git a/src/NetHack_3.7/outdated/include/macpopup.h b/src/NetHack-NetHack-3.7/outdated/include/macpopup.h similarity index 100% rename from src/NetHack_3.7/outdated/include/macpopup.h rename to src/NetHack-NetHack-3.7/outdated/include/macpopup.h diff --git a/src/NetHack_3.7/outdated/include/mactty.h b/src/NetHack-NetHack-3.7/outdated/include/mactty.h similarity index 100% rename from src/NetHack_3.7/outdated/include/mactty.h rename to src/NetHack-NetHack-3.7/outdated/include/mactty.h diff --git a/src/NetHack_3.7/outdated/include/macwin.h b/src/NetHack-NetHack-3.7/outdated/include/macwin.h similarity index 100% rename from src/NetHack_3.7/outdated/include/macwin.h rename to src/NetHack-NetHack-3.7/outdated/include/macwin.h diff --git a/src/NetHack_3.7/outdated/include/mttypriv.h b/src/NetHack-NetHack-3.7/outdated/include/mttypriv.h similarity index 100% rename from src/NetHack_3.7/outdated/include/mttypriv.h rename to src/NetHack-NetHack-3.7/outdated/include/mttypriv.h diff --git a/src/NetHack_3.7/outdated/include/os2conf.h b/src/NetHack-NetHack-3.7/outdated/include/os2conf.h similarity index 100% rename from src/NetHack_3.7/outdated/include/os2conf.h rename to src/NetHack-NetHack-3.7/outdated/include/os2conf.h diff --git a/src/NetHack_3.7/outdated/include/system.h b/src/NetHack-NetHack-3.7/outdated/include/system.h similarity index 100% rename from src/NetHack_3.7/outdated/include/system.h rename to src/NetHack-NetHack-3.7/outdated/include/system.h diff --git a/src/NetHack_3.7/outdated/include/tosconf.h b/src/NetHack-NetHack-3.7/outdated/include/tosconf.h similarity index 100% rename from src/NetHack_3.7/outdated/include/tosconf.h rename to src/NetHack-NetHack-3.7/outdated/include/tosconf.h diff --git a/src/NetHack_3.7/outdated/include/trampoli.h b/src/NetHack-NetHack-3.7/outdated/include/trampoli.h similarity index 100% rename from src/NetHack_3.7/outdated/include/trampoli.h rename to src/NetHack-NetHack-3.7/outdated/include/trampoli.h diff --git a/src/NetHack_3.7/outdated/include/wceconf.h b/src/NetHack-NetHack-3.7/outdated/include/wceconf.h similarity index 100% rename from src/NetHack_3.7/outdated/include/wceconf.h rename to src/NetHack-NetHack-3.7/outdated/include/wceconf.h diff --git a/src/NetHack_3.7/outdated/include/winGnome.h b/src/NetHack-NetHack-3.7/outdated/include/winGnome.h similarity index 100% rename from src/NetHack_3.7/outdated/include/winGnome.h rename to src/NetHack-NetHack-3.7/outdated/include/winGnome.h diff --git a/src/NetHack_3.7/outdated/include/wingem.h b/src/NetHack-NetHack-3.7/outdated/include/wingem.h similarity index 100% rename from src/NetHack_3.7/outdated/include/wingem.h rename to src/NetHack-NetHack-3.7/outdated/include/wingem.h diff --git a/src/NetHack_3.7/outdated/sys/amiga/.gitattributes b/src/NetHack-NetHack-3.7/outdated/sys/amiga/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/.gitattributes diff --git a/src/NetHack_3.7/outdated/sys/amiga/Build.ami b/src/NetHack-NetHack-3.7/outdated/sys/amiga/Build.ami similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/Build.ami rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/Build.ami diff --git a/src/NetHack_3.7/outdated/sys/amiga/Install.ami b/src/NetHack-NetHack-3.7/outdated/sys/amiga/Install.ami similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/Install.ami rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/Install.ami diff --git a/src/NetHack_3.7/outdated/sys/amiga/Makefile.agc b/src/NetHack-NetHack-3.7/outdated/sys/amiga/Makefile.agc similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/Makefile.agc rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/Makefile.agc diff --git a/src/NetHack_3.7/outdated/sys/amiga/Makefile.ami b/src/NetHack-NetHack-3.7/outdated/sys/amiga/Makefile.ami similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/Makefile.ami rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/Makefile.ami diff --git a/src/NetHack_3.7/outdated/sys/amiga/NetHack.cnf b/src/NetHack-NetHack-3.7/outdated/sys/amiga/NetHack.cnf similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/NetHack.cnf rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/NetHack.cnf diff --git a/src/NetHack_3.7/outdated/sys/amiga/amidos.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/amidos.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/amidos.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/amidos.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/amidos.p b/src/NetHack-NetHack-3.7/outdated/sys/amiga/amidos.p similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/amidos.p rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/amidos.p diff --git a/src/NetHack_3.7/outdated/sys/amiga/amifont.uu b/src/NetHack-NetHack-3.7/outdated/sys/amiga/amifont.uu similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/amifont.uu rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/amifont.uu diff --git a/src/NetHack_3.7/outdated/sys/amiga/amifont8.uu b/src/NetHack-NetHack-3.7/outdated/sys/amiga/amifont8.uu similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/amifont8.uu rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/amifont8.uu diff --git a/src/NetHack_3.7/outdated/sys/amiga/amigst.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/amigst.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/amigst.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/amigst.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/amii.hlp b/src/NetHack-NetHack-3.7/outdated/sys/amiga/amii.hlp similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/amii.hlp rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/amii.hlp diff --git a/src/NetHack_3.7/outdated/sys/amiga/amimenu.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/amimenu.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/amimenu.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/amimenu.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/amirip.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/amirip.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/amirip.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/amirip.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/amistack.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/amistack.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/amistack.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/amistack.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/amitty.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/amitty.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/amitty.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/amitty.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/amiwind.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/amiwind.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/amiwind.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/amiwind.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/amiwind.p b/src/NetHack-NetHack-3.7/outdated/sys/amiga/amiwind.p similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/amiwind.p rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/amiwind.p diff --git a/src/NetHack_3.7/outdated/sys/amiga/clipwin.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/clipwin.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/clipwin.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/clipwin.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/colorwin.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/colorwin.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/colorwin.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/colorwin.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/grave16.xpm b/src/NetHack-NetHack-3.7/outdated/sys/amiga/grave16.xpm similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/grave16.xpm rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/grave16.xpm diff --git a/src/NetHack_3.7/outdated/sys/amiga/ifchange b/src/NetHack-NetHack-3.7/outdated/sys/amiga/ifchange similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/ifchange rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/ifchange diff --git a/src/NetHack_3.7/outdated/sys/amiga/mkdmake b/src/NetHack-NetHack-3.7/outdated/sys/amiga/mkdmake similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/mkdmake rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/mkdmake diff --git a/src/NetHack_3.7/outdated/sys/amiga/txt2iff.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/txt2iff.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/txt2iff.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/txt2iff.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/winamenu.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/winamenu.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/winamenu.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/winamenu.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/winami.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/winami.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/winami.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/winami.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/winami.p b/src/NetHack-NetHack-3.7/outdated/sys/amiga/winami.p similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/winami.p rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/winami.p diff --git a/src/NetHack_3.7/outdated/sys/amiga/winchar.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/winchar.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/winchar.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/winchar.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/windefs.h b/src/NetHack-NetHack-3.7/outdated/sys/amiga/windefs.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/windefs.h rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/windefs.h diff --git a/src/NetHack_3.7/outdated/sys/amiga/winext.h b/src/NetHack-NetHack-3.7/outdated/sys/amiga/winext.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/winext.h rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/winext.h diff --git a/src/NetHack_3.7/outdated/sys/amiga/winfuncs.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/winfuncs.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/winfuncs.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/winfuncs.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/winkey.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/winkey.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/winkey.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/winkey.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/winproto.h b/src/NetHack-NetHack-3.7/outdated/sys/amiga/winproto.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/winproto.h rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/winproto.h diff --git a/src/NetHack_3.7/outdated/sys/amiga/winreq.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/winreq.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/winreq.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/winreq.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/winstr.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/winstr.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/winstr.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/winstr.c diff --git a/src/NetHack_3.7/outdated/sys/amiga/xpm2iff.c b/src/NetHack-NetHack-3.7/outdated/sys/amiga/xpm2iff.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/amiga/xpm2iff.c rename to src/NetHack-NetHack-3.7/outdated/sys/amiga/xpm2iff.c diff --git a/src/NetHack_3.7/outdated/sys/atari/.gitattributes b/src/NetHack-NetHack-3.7/outdated/sys/atari/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/sys/atari/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/sys/atari/.gitattributes diff --git a/src/NetHack_3.7/outdated/sys/atari/Install.tos b/src/NetHack-NetHack-3.7/outdated/sys/atari/Install.tos similarity index 100% rename from src/NetHack_3.7/outdated/sys/atari/Install.tos rename to src/NetHack-NetHack-3.7/outdated/sys/atari/Install.tos diff --git a/src/NetHack_3.7/outdated/sys/atari/atarifnt.uue b/src/NetHack-NetHack-3.7/outdated/sys/atari/atarifnt.uue similarity index 100% rename from src/NetHack_3.7/outdated/sys/atari/atarifnt.uue rename to src/NetHack-NetHack-3.7/outdated/sys/atari/atarifnt.uue diff --git a/src/NetHack_3.7/outdated/sys/atari/nethack.mnu b/src/NetHack-NetHack-3.7/outdated/sys/atari/nethack.mnu similarity index 100% rename from src/NetHack_3.7/outdated/sys/atari/nethack.mnu rename to src/NetHack-NetHack-3.7/outdated/sys/atari/nethack.mnu diff --git a/src/NetHack_3.7/outdated/sys/atari/setup.g b/src/NetHack-NetHack-3.7/outdated/sys/atari/setup.g similarity index 100% rename from src/NetHack_3.7/outdated/sys/atari/setup.g rename to src/NetHack-NetHack-3.7/outdated/sys/atari/setup.g diff --git a/src/NetHack_3.7/outdated/sys/atari/tos.c b/src/NetHack-NetHack-3.7/outdated/sys/atari/tos.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/atari/tos.c rename to src/NetHack-NetHack-3.7/outdated/sys/atari/tos.c diff --git a/src/NetHack_3.7/outdated/sys/atari/unx2atar.sed b/src/NetHack-NetHack-3.7/outdated/sys/atari/unx2atar.sed similarity index 100% rename from src/NetHack_3.7/outdated/sys/atari/unx2atar.sed rename to src/NetHack-NetHack-3.7/outdated/sys/atari/unx2atar.sed diff --git a/src/NetHack_3.7/outdated/sys/be/.gitattributes b/src/NetHack-NetHack-3.7/outdated/sys/be/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/sys/be/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/sys/be/.gitattributes diff --git a/src/NetHack_3.7/outdated/sys/be/README b/src/NetHack-NetHack-3.7/outdated/sys/be/README similarity index 100% rename from src/NetHack_3.7/outdated/sys/be/README rename to src/NetHack-NetHack-3.7/outdated/sys/be/README diff --git a/src/NetHack_3.7/outdated/sys/be/bemain.c b/src/NetHack-NetHack-3.7/outdated/sys/be/bemain.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/be/bemain.c rename to src/NetHack-NetHack-3.7/outdated/sys/be/bemain.c diff --git a/src/NetHack_3.7/outdated/sys/mac/.gitattributes b/src/NetHack-NetHack-3.7/outdated/sys/mac/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/sys/mac/.gitattributes diff --git a/src/NetHack_3.7/outdated/sys/mac/Files.r b/src/NetHack-NetHack-3.7/outdated/sys/mac/Files.r similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/Files.r rename to src/NetHack-NetHack-3.7/outdated/sys/mac/Files.r diff --git a/src/NetHack_3.7/outdated/sys/mac/Install.mw b/src/NetHack-NetHack-3.7/outdated/sys/mac/Install.mw similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/Install.mw rename to src/NetHack-NetHack-3.7/outdated/sys/mac/Install.mw diff --git a/src/NetHack_3.7/outdated/sys/mac/MacHelp b/src/NetHack-NetHack-3.7/outdated/sys/mac/MacHelp similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/MacHelp rename to src/NetHack-NetHack-3.7/outdated/sys/mac/MacHelp diff --git a/src/NetHack_3.7/outdated/sys/mac/NHDeflts b/src/NetHack-NetHack-3.7/outdated/sys/mac/NHDeflts similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/NHDeflts rename to src/NetHack-NetHack-3.7/outdated/sys/mac/NHDeflts diff --git a/src/NetHack_3.7/outdated/sys/mac/NHrsrc.hqx b/src/NetHack-NetHack-3.7/outdated/sys/mac/NHrsrc.hqx similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/NHrsrc.hqx rename to src/NetHack-NetHack-3.7/outdated/sys/mac/NHrsrc.hqx diff --git a/src/NetHack_3.7/outdated/sys/mac/NHsound.hqx b/src/NetHack-NetHack-3.7/outdated/sys/mac/NHsound.hqx similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/NHsound.hqx rename to src/NetHack-NetHack-3.7/outdated/sys/mac/NHsound.hqx diff --git a/src/NetHack_3.7/outdated/sys/mac/News b/src/NetHack-NetHack-3.7/outdated/sys/mac/News similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/News rename to src/NetHack-NetHack-3.7/outdated/sys/mac/News diff --git a/src/NetHack_3.7/outdated/sys/mac/README b/src/NetHack-NetHack-3.7/outdated/sys/mac/README similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/README rename to src/NetHack-NetHack-3.7/outdated/sys/mac/README diff --git a/src/NetHack_3.7/outdated/sys/mac/carbon.plist b/src/NetHack-NetHack-3.7/outdated/sys/mac/carbon.plist similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/carbon.plist rename to src/NetHack-NetHack-3.7/outdated/sys/mac/carbon.plist diff --git a/src/NetHack_3.7/outdated/sys/mac/dprintf.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/dprintf.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/dprintf.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/dprintf.c diff --git a/src/NetHack_3.7/outdated/sys/mac/maccurs.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/maccurs.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/maccurs.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/maccurs.c diff --git a/src/NetHack_3.7/outdated/sys/mac/macerrs.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/macerrs.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/macerrs.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/macerrs.c diff --git a/src/NetHack_3.7/outdated/sys/mac/macfile.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/macfile.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/macfile.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/macfile.c diff --git a/src/NetHack_3.7/outdated/sys/mac/machelp.hqx b/src/NetHack-NetHack-3.7/outdated/sys/mac/machelp.hqx similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/machelp.hqx rename to src/NetHack-NetHack-3.7/outdated/sys/mac/machelp.hqx diff --git a/src/NetHack_3.7/outdated/sys/mac/macmain.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/macmain.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/macmain.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/macmain.c diff --git a/src/NetHack_3.7/outdated/sys/mac/macmenu.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/macmenu.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/macmenu.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/macmenu.c diff --git a/src/NetHack_3.7/outdated/sys/mac/mactopl.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/mactopl.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/mactopl.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/mactopl.c diff --git a/src/NetHack_3.7/outdated/sys/mac/mactty.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/mactty.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/mactty.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/mactty.c diff --git a/src/NetHack_3.7/outdated/sys/mac/macunix.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/macunix.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/macunix.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/macunix.c diff --git a/src/NetHack_3.7/outdated/sys/mac/macwin.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/macwin.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/macwin.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/macwin.c diff --git a/src/NetHack_3.7/outdated/sys/mac/mgetline.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/mgetline.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/mgetline.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/mgetline.c diff --git a/src/NetHack_3.7/outdated/sys/mac/mmodal.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/mmodal.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/mmodal.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/mmodal.c diff --git a/src/NetHack_3.7/outdated/sys/mac/mrecover.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/mrecover.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/mrecover.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/mrecover.c diff --git a/src/NetHack_3.7/outdated/sys/mac/mrecover.hqx b/src/NetHack-NetHack-3.7/outdated/sys/mac/mrecover.hqx similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/mrecover.hqx rename to src/NetHack-NetHack-3.7/outdated/sys/mac/mrecover.hqx diff --git a/src/NetHack_3.7/outdated/sys/mac/mttymain.c b/src/NetHack-NetHack-3.7/outdated/sys/mac/mttymain.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/mac/mttymain.c rename to src/NetHack-NetHack-3.7/outdated/sys/mac/mttymain.c diff --git a/src/NetHack_3.7/outdated/sys/msdos/.gitattributes b/src/NetHack-NetHack-3.7/outdated/sys/msdos/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/sys/msdos/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/sys/msdos/.gitattributes diff --git a/src/NetHack_3.7/outdated/sys/msdos/Makefile.BC b/src/NetHack-NetHack-3.7/outdated/sys/msdos/Makefile.BC similarity index 100% rename from src/NetHack_3.7/outdated/sys/msdos/Makefile.BC rename to src/NetHack-NetHack-3.7/outdated/sys/msdos/Makefile.BC diff --git a/src/NetHack_3.7/outdated/sys/msdos/Makefile.MSC b/src/NetHack-NetHack-3.7/outdated/sys/msdos/Makefile.MSC similarity index 100% rename from src/NetHack_3.7/outdated/sys/msdos/Makefile.MSC rename to src/NetHack-NetHack-3.7/outdated/sys/msdos/Makefile.MSC diff --git a/src/NetHack_3.7/outdated/sys/msdos/SCHEMA35.MSC b/src/NetHack-NetHack-3.7/outdated/sys/msdos/SCHEMA35.MSC similarity index 100% rename from src/NetHack_3.7/outdated/sys/msdos/SCHEMA35.MSC rename to src/NetHack-NetHack-3.7/outdated/sys/msdos/SCHEMA35.MSC diff --git a/src/NetHack_3.7/outdated/sys/msdos/moveinit.pat b/src/NetHack-NetHack-3.7/outdated/sys/msdos/moveinit.pat similarity index 100% rename from src/NetHack_3.7/outdated/sys/msdos/moveinit.pat rename to src/NetHack-NetHack-3.7/outdated/sys/msdos/moveinit.pat diff --git a/src/NetHack_3.7/outdated/sys/msdos/ovlinit.c b/src/NetHack-NetHack-3.7/outdated/sys/msdos/ovlinit.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/msdos/ovlinit.c rename to src/NetHack-NetHack-3.7/outdated/sys/msdos/ovlinit.c diff --git a/src/NetHack_3.7/outdated/sys/msdos/schema1.BC b/src/NetHack-NetHack-3.7/outdated/sys/msdos/schema1.BC similarity index 100% rename from src/NetHack_3.7/outdated/sys/msdos/schema1.BC rename to src/NetHack-NetHack-3.7/outdated/sys/msdos/schema1.BC diff --git a/src/NetHack_3.7/outdated/sys/msdos/schema2.BC b/src/NetHack-NetHack-3.7/outdated/sys/msdos/schema2.BC similarity index 100% rename from src/NetHack_3.7/outdated/sys/msdos/schema2.BC rename to src/NetHack-NetHack-3.7/outdated/sys/msdos/schema2.BC diff --git a/src/NetHack_3.7/outdated/sys/msdos/schema3.MSC b/src/NetHack-NetHack-3.7/outdated/sys/msdos/schema3.MSC similarity index 100% rename from src/NetHack_3.7/outdated/sys/msdos/schema3.MSC rename to src/NetHack-NetHack-3.7/outdated/sys/msdos/schema3.MSC diff --git a/src/NetHack_3.7/outdated/sys/os2/.gitattributes b/src/NetHack-NetHack-3.7/outdated/sys/os2/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/sys/os2/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/sys/os2/.gitattributes diff --git a/src/NetHack_3.7/outdated/sys/os2/Install.os2 b/src/NetHack-NetHack-3.7/outdated/sys/os2/Install.os2 similarity index 100% rename from src/NetHack_3.7/outdated/sys/os2/Install.os2 rename to src/NetHack-NetHack-3.7/outdated/sys/os2/Install.os2 diff --git a/src/NetHack_3.7/outdated/sys/os2/Makefile.os2 b/src/NetHack-NetHack-3.7/outdated/sys/os2/Makefile.os2 similarity index 100% rename from src/NetHack_3.7/outdated/sys/os2/Makefile.os2 rename to src/NetHack-NetHack-3.7/outdated/sys/os2/Makefile.os2 diff --git a/src/NetHack_3.7/outdated/sys/os2/nhpmico.uu b/src/NetHack-NetHack-3.7/outdated/sys/os2/nhpmico.uu similarity index 100% rename from src/NetHack_3.7/outdated/sys/os2/nhpmico.uu rename to src/NetHack-NetHack-3.7/outdated/sys/os2/nhpmico.uu diff --git a/src/NetHack_3.7/outdated/sys/os2/os2.c b/src/NetHack-NetHack-3.7/outdated/sys/os2/os2.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/os2/os2.c rename to src/NetHack-NetHack-3.7/outdated/sys/os2/os2.c diff --git a/src/NetHack_3.7/outdated/sys/unix/README.linux b/src/NetHack-NetHack-3.7/outdated/sys/unix/README.linux similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/README.linux rename to src/NetHack-NetHack-3.7/outdated/sys/unix/README.linux diff --git a/src/NetHack_3.7/outdated/sys/unix/cross-amiga.sh b/src/NetHack-NetHack-3.7/outdated/sys/unix/cross-amiga.sh similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/cross-amiga.sh rename to src/NetHack-NetHack-3.7/outdated/sys/unix/cross-amiga.sh diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/cross-amiga b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/cross-amiga similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/cross-amiga rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/cross-amiga diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/include/cross-amiga-post b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/include/cross-amiga-post similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/include/cross-amiga-post rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/include/cross-amiga-post diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/include/cross-amiga-pre b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/include/cross-amiga-pre similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/include/cross-amiga-pre rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/include/cross-amiga-pre diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/linux b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/linux similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/linux rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/linux diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/linux-chroot b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/linux-chroot similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/linux-chroot rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/linux-chroot diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/linux-qt4 b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/linux-qt4 similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/linux-qt4 rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/linux-qt4 diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/linux-qt5 b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/linux-qt5 similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/linux-qt5 rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/linux-qt5 diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/linux-x11 b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/linux-x11 similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/linux-x11 rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/linux-x11 diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/macosx b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/macosx rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/macosx10.10 b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx10.10 similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/macosx10.10 rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx10.10 diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/macosx10.10-qt b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx10.10-qt similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/macosx10.10-qt rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx10.10-qt diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/macosx10.14 b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx10.14 similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/macosx10.14 rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx10.14 diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/macosx10.5 b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx10.5 similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/macosx10.5 rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx10.5 diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/macosx10.7 b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx10.7 similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/macosx10.7 rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx10.7 diff --git a/src/NetHack_3.7/outdated/sys/unix/hints/macosx10.8 b/src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx10.8 similarity index 100% rename from src/NetHack_3.7/outdated/sys/unix/hints/macosx10.8 rename to src/NetHack-NetHack-3.7/outdated/sys/unix/hints/macosx10.8 diff --git a/src/NetHack_3.7/outdated/sys/vms/lev_lex.h b/src/NetHack-NetHack-3.7/outdated/sys/vms/lev_lex.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/vms/lev_lex.h rename to src/NetHack-NetHack-3.7/outdated/sys/vms/lev_lex.h diff --git a/src/NetHack_3.7/outdated/sys/wince/.gitattributes b/src/NetHack-NetHack-3.7/outdated/sys/wince/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/sys/wince/.gitattributes diff --git a/src/NetHack_3.7/outdated/sys/wince/Install.ce b/src/NetHack-NetHack-3.7/outdated/sys/wince/Install.ce similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/Install.ce rename to src/NetHack-NetHack-3.7/outdated/sys/wince/Install.ce diff --git a/src/NetHack_3.7/outdated/sys/wince/bootstrp.mak b/src/NetHack-NetHack-3.7/outdated/sys/wince/bootstrp.mak similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/bootstrp.mak rename to src/NetHack-NetHack-3.7/outdated/sys/wince/bootstrp.mak diff --git a/src/NetHack_3.7/outdated/sys/wince/ceinc/.gitattributes b/src/NetHack-NetHack-3.7/outdated/sys/wince/ceinc/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/ceinc/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/sys/wince/ceinc/.gitattributes diff --git a/src/NetHack_3.7/outdated/sys/wince/ceinc/assert.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/ceinc/assert.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/ceinc/assert.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/ceinc/assert.h diff --git a/src/NetHack_3.7/outdated/sys/wince/ceinc/errno.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/ceinc/errno.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/ceinc/errno.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/ceinc/errno.h diff --git a/src/NetHack_3.7/outdated/sys/wince/ceinc/fcntl.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/ceinc/fcntl.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/ceinc/fcntl.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/ceinc/fcntl.h diff --git a/src/NetHack_3.7/outdated/sys/wince/ceinc/sys/.gitattributes b/src/NetHack-NetHack-3.7/outdated/sys/wince/ceinc/sys/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/ceinc/sys/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/sys/wince/ceinc/sys/.gitattributes diff --git a/src/NetHack_3.7/outdated/sys/wince/ceinc/sys/stat.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/ceinc/sys/stat.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/ceinc/sys/stat.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/ceinc/sys/stat.h diff --git a/src/NetHack_3.7/outdated/sys/wince/celib.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/celib.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/celib.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/celib.c diff --git a/src/NetHack_3.7/outdated/sys/wince/cesetup.bat b/src/NetHack-NetHack-3.7/outdated/sys/wince/cesetup.bat similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/cesetup.bat rename to src/NetHack-NetHack-3.7/outdated/sys/wince/cesetup.bat diff --git a/src/NetHack_3.7/outdated/sys/wince/cesound.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/cesound.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/cesound.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/cesound.c diff --git a/src/NetHack_3.7/outdated/sys/wince/defaults.nh b/src/NetHack-NetHack-3.7/outdated/sys/wince/defaults.nh similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/defaults.nh rename to src/NetHack-NetHack-3.7/outdated/sys/wince/defaults.nh diff --git a/src/NetHack_3.7/outdated/sys/wince/keypad.uu b/src/NetHack-NetHack-3.7/outdated/sys/wince/keypad.uu similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/keypad.uu rename to src/NetHack-NetHack-3.7/outdated/sys/wince/keypad.uu diff --git a/src/NetHack_3.7/outdated/sys/wince/menubar.uu b/src/NetHack-NetHack-3.7/outdated/sys/wince/menubar.uu similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/menubar.uu rename to src/NetHack-NetHack-3.7/outdated/sys/wince/menubar.uu diff --git a/src/NetHack_3.7/outdated/sys/wince/mhaskyn.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhaskyn.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhaskyn.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhaskyn.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhaskyn.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhaskyn.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhaskyn.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhaskyn.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhcmd.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhcmd.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhcmd.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhcmd.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhcmd.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhcmd.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhcmd.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhcmd.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhcolor.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhcolor.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhcolor.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhcolor.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhcolor.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhcolor.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhcolor.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhcolor.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhdlg.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhdlg.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhdlg.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhdlg.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhdlg.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhdlg.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhdlg.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhdlg.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhfont.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhfont.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhfont.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhfont.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhfont.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhfont.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhfont.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhfont.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhinput.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhinput.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhinput.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhinput.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhinput.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhinput.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhinput.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhinput.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhmain.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhmain.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhmain.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhmain.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhmain.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhmain.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhmain.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhmain.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhmap.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhmap.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhmap.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhmap.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhmap.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhmap.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhmap.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhmap.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhmenu.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhmenu.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhmenu.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhmenu.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhmenu.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhmenu.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhmenu.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhmenu.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhmsg.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhmsg.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhmsg.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhmsg.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhmsgwnd.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhmsgwnd.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhmsgwnd.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhmsgwnd.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhmsgwnd.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhmsgwnd.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhmsgwnd.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhmsgwnd.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhrip.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhrip.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhrip.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhrip.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhrip.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhrip.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhrip.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhrip.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhstatus.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhstatus.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhstatus.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhstatus.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhstatus.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhstatus.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhstatus.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhstatus.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhtext.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhtext.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhtext.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhtext.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhtext.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhtext.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhtext.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhtext.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mhtxtbuf.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhtxtbuf.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhtxtbuf.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhtxtbuf.c diff --git a/src/NetHack_3.7/outdated/sys/wince/mhtxtbuf.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/mhtxtbuf.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mhtxtbuf.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mhtxtbuf.h diff --git a/src/NetHack_3.7/outdated/sys/wince/mswproc.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/mswproc.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/mswproc.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/mswproc.c diff --git a/src/NetHack_3.7/outdated/sys/wince/newres.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/newres.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/newres.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/newres.h diff --git a/src/NetHack_3.7/outdated/sys/wince/nhico.uu b/src/NetHack-NetHack-3.7/outdated/sys/wince/nhico.uu similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/nhico.uu rename to src/NetHack-NetHack-3.7/outdated/sys/wince/nhico.uu diff --git a/src/NetHack_3.7/outdated/sys/wince/resource.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/resource.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/resource.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/resource.h diff --git a/src/NetHack_3.7/outdated/sys/wince/winMS.h b/src/NetHack-NetHack-3.7/outdated/sys/wince/winMS.h similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/winMS.h rename to src/NetHack-NetHack-3.7/outdated/sys/wince/winMS.h diff --git a/src/NetHack_3.7/outdated/sys/wince/winhack.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/winhack.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/winhack.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/winhack.c diff --git a/src/NetHack_3.7/outdated/sys/wince/winhack.rc b/src/NetHack-NetHack-3.7/outdated/sys/wince/winhack.rc similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/winhack.rc rename to src/NetHack-NetHack-3.7/outdated/sys/wince/winhack.rc diff --git a/src/NetHack_3.7/outdated/sys/wince/winhcksp.rc b/src/NetHack-NetHack-3.7/outdated/sys/wince/winhcksp.rc similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/winhcksp.rc rename to src/NetHack-NetHack-3.7/outdated/sys/wince/winhcksp.rc diff --git a/src/NetHack_3.7/outdated/sys/wince/winmain.c b/src/NetHack-NetHack-3.7/outdated/sys/wince/winmain.c similarity index 100% rename from src/NetHack_3.7/outdated/sys/wince/winmain.c rename to src/NetHack-NetHack-3.7/outdated/sys/wince/winmain.c diff --git a/src/NetHack_3.7/outdated/sys/windows/travis-gcc.sh b/src/NetHack-NetHack-3.7/outdated/sys/windows/travis-gcc.sh similarity index 100% rename from src/NetHack_3.7/outdated/sys/windows/travis-gcc.sh rename to src/NetHack-NetHack-3.7/outdated/sys/windows/travis-gcc.sh diff --git a/src/NetHack_3.7/outdated/sys/windows/vs/travisci.sh b/src/NetHack-NetHack-3.7/outdated/sys/windows/vs/travisci.sh similarity index 100% rename from src/NetHack_3.7/outdated/sys/windows/vs/travisci.sh rename to src/NetHack-NetHack-3.7/outdated/sys/windows/vs/travisci.sh diff --git a/src/NetHack_3.7/outdated/win/Qt3/.gitattributes b/src/NetHack-NetHack-3.7/outdated/win/Qt3/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/.gitattributes diff --git a/src/NetHack_3.7/outdated/win/Qt3/Info.plist b/src/NetHack-NetHack-3.7/outdated/win/Qt3/Info.plist similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/Info.plist rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/Info.plist diff --git a/src/NetHack_3.7/outdated/win/Qt3/Install.Qt b/src/NetHack-NetHack-3.7/outdated/win/Qt3/Install.Qt similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/Install.Qt rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/Install.Qt diff --git a/src/NetHack_3.7/outdated/win/Qt3/knethack.lnk b/src/NetHack-NetHack-3.7/outdated/win/Qt3/knethack.lnk similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/knethack.lnk rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/knethack.lnk diff --git a/src/NetHack_3.7/outdated/win/Qt3/knh-mini.xpm b/src/NetHack-NetHack-3.7/outdated/win/Qt3/knh-mini.xpm similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/knh-mini.xpm rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/knh-mini.xpm diff --git a/src/NetHack_3.7/outdated/win/Qt3/knh.xpm b/src/NetHack-NetHack-3.7/outdated/win/Qt3/knh.xpm similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/knh.xpm rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/knh.xpm diff --git a/src/NetHack_3.7/outdated/win/Qt3/qpe-nethack.control b/src/NetHack-NetHack-3.7/outdated/win/Qt3/qpe-nethack.control similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/qpe-nethack.control rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/qpe-nethack.control diff --git a/src/NetHack_3.7/outdated/win/Qt3/qt3_clust.cpp b/src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3_clust.cpp similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/qt3_clust.cpp rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3_clust.cpp diff --git a/src/NetHack_3.7/outdated/win/Qt3/qt3_clust.h b/src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3_clust.h similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/qt3_clust.h rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3_clust.h diff --git a/src/NetHack_3.7/outdated/win/Qt3/qt3_kde0.h b/src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3_kde0.h similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/qt3_kde0.h rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3_kde0.h diff --git a/src/NetHack_3.7/outdated/win/Qt3/qt3_win.cpp b/src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3_win.cpp similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/qt3_win.cpp rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3_win.cpp diff --git a/src/NetHack_3.7/outdated/win/Qt3/qt3_win.h b/src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3_win.h similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/qt3_win.h rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3_win.h diff --git a/src/NetHack_3.7/outdated/win/Qt3/qt3_xpms.h b/src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3_xpms.h similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/qt3_xpms.h rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3_xpms.h diff --git a/src/NetHack_3.7/outdated/win/Qt3/qt3tableview.cpp b/src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3tableview.cpp similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/qt3tableview.cpp rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3tableview.cpp diff --git a/src/NetHack_3.7/outdated/win/Qt3/qt3tableview.h b/src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3tableview.h similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/qt3tableview.h rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/qt3tableview.h diff --git a/src/NetHack_3.7/outdated/win/Qt3/tileedit.cpp b/src/NetHack-NetHack-3.7/outdated/win/Qt3/tileedit.cpp similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/tileedit.cpp rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/tileedit.cpp diff --git a/src/NetHack_3.7/outdated/win/Qt3/tileedit.h b/src/NetHack-NetHack-3.7/outdated/win/Qt3/tileedit.h similarity index 100% rename from src/NetHack_3.7/outdated/win/Qt3/tileedit.h rename to src/NetHack-NetHack-3.7/outdated/win/Qt3/tileedit.h diff --git a/src/NetHack_3.7/outdated/win/gem/.gitattributes b/src/NetHack-NetHack-3.7/outdated/win/gem/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/win/gem/.gitattributes diff --git a/src/NetHack_3.7/outdated/win/gem/Install.gem b/src/NetHack-NetHack-3.7/outdated/win/gem/Install.gem similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/Install.gem rename to src/NetHack-NetHack-3.7/outdated/win/gem/Install.gem diff --git a/src/NetHack_3.7/outdated/win/gem/bitmfile.c b/src/NetHack-NetHack-3.7/outdated/win/gem/bitmfile.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/bitmfile.c rename to src/NetHack-NetHack-3.7/outdated/win/gem/bitmfile.c diff --git a/src/NetHack_3.7/outdated/win/gem/gem_rsc.uu b/src/NetHack-NetHack-3.7/outdated/win/gem/gem_rsc.uu similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/gem_rsc.uu rename to src/NetHack-NetHack-3.7/outdated/win/gem/gem_rsc.uu diff --git a/src/NetHack_3.7/outdated/win/gem/gem_rso.uu b/src/NetHack-NetHack-3.7/outdated/win/gem/gem_rso.uu similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/gem_rso.uu rename to src/NetHack-NetHack-3.7/outdated/win/gem/gem_rso.uu diff --git a/src/NetHack_3.7/outdated/win/gem/gr_rect.c b/src/NetHack-NetHack-3.7/outdated/win/gem/gr_rect.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/gr_rect.c rename to src/NetHack-NetHack-3.7/outdated/win/gem/gr_rect.c diff --git a/src/NetHack_3.7/outdated/win/gem/gr_rect.h b/src/NetHack-NetHack-3.7/outdated/win/gem/gr_rect.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/gr_rect.h rename to src/NetHack-NetHack-3.7/outdated/win/gem/gr_rect.h diff --git a/src/NetHack_3.7/outdated/win/gem/load_img.c b/src/NetHack-NetHack-3.7/outdated/win/gem/load_img.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/load_img.c rename to src/NetHack-NetHack-3.7/outdated/win/gem/load_img.c diff --git a/src/NetHack_3.7/outdated/win/gem/tile2img.c b/src/NetHack-NetHack-3.7/outdated/win/gem/tile2img.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/tile2img.c rename to src/NetHack-NetHack-3.7/outdated/win/gem/tile2img.c diff --git a/src/NetHack_3.7/outdated/win/gem/title.uu b/src/NetHack-NetHack-3.7/outdated/win/gem/title.uu similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/title.uu rename to src/NetHack-NetHack-3.7/outdated/win/gem/title.uu diff --git a/src/NetHack_3.7/outdated/win/gem/wingem.c b/src/NetHack-NetHack-3.7/outdated/win/gem/wingem.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/wingem.c rename to src/NetHack-NetHack-3.7/outdated/win/gem/wingem.c diff --git a/src/NetHack_3.7/outdated/win/gem/wingem1.c b/src/NetHack-NetHack-3.7/outdated/win/gem/wingem1.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/wingem1.c rename to src/NetHack-NetHack-3.7/outdated/win/gem/wingem1.c diff --git a/src/NetHack_3.7/outdated/win/gem/xpm2img.c b/src/NetHack-NetHack-3.7/outdated/win/gem/xpm2img.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gem/xpm2img.c rename to src/NetHack-NetHack-3.7/outdated/win/gem/xpm2img.c diff --git a/src/NetHack_3.7/outdated/win/gnome/.gitattributes b/src/NetHack-NetHack-3.7/outdated/win/gnome/.gitattributes similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/.gitattributes rename to src/NetHack-NetHack-3.7/outdated/win/gnome/.gitattributes diff --git a/src/NetHack_3.7/outdated/win/gnome/README b/src/NetHack-NetHack-3.7/outdated/win/gnome/README similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/README rename to src/NetHack-NetHack-3.7/outdated/win/gnome/README diff --git a/src/NetHack_3.7/outdated/win/gnome/gn_xpms.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gn_xpms.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gn_xpms.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gn_xpms.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnaskstr.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnaskstr.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnaskstr.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnaskstr.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnaskstr.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnaskstr.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnaskstr.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnaskstr.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnbind.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnbind.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnbind.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnbind.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnbind.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnbind.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnbind.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnbind.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnglyph.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnglyph.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnglyph.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnglyph.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnglyph.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnglyph.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnglyph.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnglyph.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnmain.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnmain.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnmain.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnmain.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnmain.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnmain.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnmain.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnmain.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnmap.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnmap.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnmap.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnmap.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnmap.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnmap.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnmap.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnmap.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnmenu.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnmenu.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnmenu.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnmenu.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnmenu.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnmenu.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnmenu.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnmenu.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnmesg.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnmesg.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnmesg.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnmesg.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnmesg.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnmesg.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnmesg.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnmesg.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnomeprv.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnomeprv.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnomeprv.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnomeprv.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnopts.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnopts.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnopts.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnopts.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnopts.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnopts.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnopts.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnopts.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnplayer.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnplayer.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnplayer.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnplayer.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnplayer.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnplayer.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnplayer.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnplayer.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnsignal.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnsignal.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnsignal.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnsignal.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnsignal.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnsignal.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnsignal.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnsignal.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnstatus.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnstatus.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnstatus.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnstatus.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnstatus.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnstatus.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnstatus.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnstatus.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gntext.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gntext.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gntext.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gntext.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gntext.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gntext.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gntext.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gntext.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnworn.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnworn.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnworn.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnworn.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnworn.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnworn.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnworn.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnworn.h diff --git a/src/NetHack_3.7/outdated/win/gnome/gnyesno.c b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnyesno.c similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnyesno.c rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnyesno.c diff --git a/src/NetHack_3.7/outdated/win/gnome/gnyesno.h b/src/NetHack-NetHack-3.7/outdated/win/gnome/gnyesno.h similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/gnyesno.h rename to src/NetHack-NetHack-3.7/outdated/win/gnome/gnyesno.h diff --git a/src/NetHack_3.7/outdated/win/gnome/mapbg.xpm b/src/NetHack-NetHack-3.7/outdated/win/gnome/mapbg.xpm similarity index 100% rename from src/NetHack_3.7/outdated/win/gnome/mapbg.xpm rename to src/NetHack-NetHack-3.7/outdated/win/gnome/mapbg.xpm diff --git a/src/NetHack_3.7/sound/fmod/fmod.c b/src/NetHack-NetHack-3.7/sound/fmod/fmod.c similarity index 100% rename from src/NetHack_3.7/sound/fmod/fmod.c rename to src/NetHack-NetHack-3.7/sound/fmod/fmod.c diff --git a/src/NetHack_3.7/sound/macsound/macsound.m b/src/NetHack-NetHack-3.7/sound/macsound/macsound.m similarity index 100% rename from src/NetHack_3.7/sound/macsound/macsound.m rename to src/NetHack-NetHack-3.7/sound/macsound/macsound.m diff --git a/src/NetHack_3.7/sound/qtsound/README.md b/src/NetHack-NetHack-3.7/sound/qtsound/README.md similarity index 100% rename from src/NetHack_3.7/sound/qtsound/README.md rename to src/NetHack-NetHack-3.7/sound/qtsound/README.md diff --git a/src/NetHack_3.7/sound/wav/.gitignore b/src/NetHack-NetHack-3.7/sound/wav/.gitignore similarity index 100% rename from src/NetHack_3.7/sound/wav/.gitignore rename to src/NetHack-NetHack-3.7/sound/wav/.gitignore diff --git a/src/NetHack_3.7/sound/wav/README b/src/NetHack-NetHack-3.7/sound/wav/README similarity index 100% rename from src/NetHack_3.7/sound/wav/README rename to src/NetHack-NetHack-3.7/sound/wav/README diff --git a/src/NetHack_3.7/sound/wav/attributions.txt b/src/NetHack-NetHack-3.7/sound/wav/attributions.txt similarity index 100% rename from src/NetHack_3.7/sound/wav/attributions.txt rename to src/NetHack-NetHack-3.7/sound/wav/attributions.txt diff --git a/src/NetHack_3.7/sound/wav/sa2_xpleveldown.uu b/src/NetHack-NetHack-3.7/sound/wav/sa2_xpleveldown.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sa2_xpleveldown.uu rename to src/NetHack-NetHack-3.7/sound/wav/sa2_xpleveldown.uu diff --git a/src/NetHack_3.7/sound/wav/sa2_xplevelup.uu b/src/NetHack-NetHack-3.7/sound/wav/sa2_xplevelup.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sa2_xplevelup.uu rename to src/NetHack-NetHack-3.7/sound/wav/sa2_xplevelup.uu diff --git a/src/NetHack_3.7/sound/wav/se_squeak_A.uu b/src/NetHack-NetHack-3.7/sound/wav/se_squeak_A.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/se_squeak_A.uu rename to src/NetHack-NetHack-3.7/sound/wav/se_squeak_A.uu diff --git a/src/NetHack_3.7/sound/wav/se_squeak_B.uu b/src/NetHack-NetHack-3.7/sound/wav/se_squeak_B.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/se_squeak_B.uu rename to src/NetHack-NetHack-3.7/sound/wav/se_squeak_B.uu diff --git a/src/NetHack_3.7/sound/wav/se_squeak_B_flat.uu b/src/NetHack-NetHack-3.7/sound/wav/se_squeak_B_flat.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/se_squeak_B_flat.uu rename to src/NetHack-NetHack-3.7/sound/wav/se_squeak_B_flat.uu diff --git a/src/NetHack_3.7/sound/wav/se_squeak_C.uu b/src/NetHack-NetHack-3.7/sound/wav/se_squeak_C.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/se_squeak_C.uu rename to src/NetHack-NetHack-3.7/sound/wav/se_squeak_C.uu diff --git a/src/NetHack_3.7/sound/wav/se_squeak_D.uu b/src/NetHack-NetHack-3.7/sound/wav/se_squeak_D.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/se_squeak_D.uu rename to src/NetHack-NetHack-3.7/sound/wav/se_squeak_D.uu diff --git a/src/NetHack_3.7/sound/wav/se_squeak_D_flat.uu b/src/NetHack-NetHack-3.7/sound/wav/se_squeak_D_flat.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/se_squeak_D_flat.uu rename to src/NetHack-NetHack-3.7/sound/wav/se_squeak_D_flat.uu diff --git a/src/NetHack_3.7/sound/wav/se_squeak_E.uu b/src/NetHack-NetHack-3.7/sound/wav/se_squeak_E.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/se_squeak_E.uu rename to src/NetHack-NetHack-3.7/sound/wav/se_squeak_E.uu diff --git a/src/NetHack_3.7/sound/wav/se_squeak_E_flat.uu b/src/NetHack-NetHack-3.7/sound/wav/se_squeak_E_flat.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/se_squeak_E_flat.uu rename to src/NetHack-NetHack-3.7/sound/wav/se_squeak_E_flat.uu diff --git a/src/NetHack_3.7/sound/wav/se_squeak_F.uu b/src/NetHack-NetHack-3.7/sound/wav/se_squeak_F.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/se_squeak_F.uu rename to src/NetHack-NetHack-3.7/sound/wav/se_squeak_F.uu diff --git a/src/NetHack_3.7/sound/wav/se_squeak_F_sharp.uu b/src/NetHack-NetHack-3.7/sound/wav/se_squeak_F_sharp.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/se_squeak_F_sharp.uu rename to src/NetHack-NetHack-3.7/sound/wav/se_squeak_F_sharp.uu diff --git a/src/NetHack_3.7/sound/wav/se_squeak_G.uu b/src/NetHack-NetHack-3.7/sound/wav/se_squeak_G.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/se_squeak_G.uu rename to src/NetHack-NetHack-3.7/sound/wav/se_squeak_G.uu diff --git a/src/NetHack_3.7/sound/wav/se_squeak_G_sharp.uu b/src/NetHack-NetHack-3.7/sound/wav/se_squeak_G_sharp.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/se_squeak_G_sharp.uu rename to src/NetHack-NetHack-3.7/sound/wav/se_squeak_G_sharp.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Bell.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Bell.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Bell.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Bell.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Bugle_A.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_A.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Bugle_A.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_A.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Bugle_B.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_B.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Bugle_B.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_B.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Bugle_C.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_C.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Bugle_C.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_C.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Bugle_D.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_D.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Bugle_D.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_D.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Bugle_E.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_E.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Bugle_E.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_E.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Bugle_F.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_F.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Bugle_F.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_F.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Bugle_G.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_G.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Bugle_G.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Bugle_G.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Drum_Of_Earthquake.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Drum_Of_Earthquake.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Drum_Of_Earthquake.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Drum_Of_Earthquake.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Fire_Horn.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Fire_Horn.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Fire_Horn.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Fire_Horn.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Frost_Horn.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Frost_Horn.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Frost_Horn.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Frost_Horn.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Leather_Drum.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Leather_Drum.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Leather_Drum.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Leather_Drum.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Flute_A.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_A.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Flute_A.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_A.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Flute_B.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_B.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Flute_B.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_B.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Flute_C.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_C.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Flute_C.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_C.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Flute_D.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_D.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Flute_D.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_D.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Flute_E.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_E.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Flute_E.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_E.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Flute_F.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_F.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Flute_F.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_F.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Flute_G.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_G.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Flute_G.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Flute_G.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Harp_A.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_A.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Harp_A.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_A.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Harp_B.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_B.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Harp_B.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_B.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Harp_C.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_C.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Harp_C.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_C.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Harp_D.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_D.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Harp_D.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_D.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Harp_E.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_E.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Harp_E.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_E.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Harp_F.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_F.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Harp_F.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_F.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Magic_Harp_G.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_G.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Magic_Harp_G.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Magic_Harp_G.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Tooled_Horn_A.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_A.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Tooled_Horn_A.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_A.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Tooled_Horn_B.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_B.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Tooled_Horn_B.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_B.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Tooled_Horn_C.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_C.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Tooled_Horn_C.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_C.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Tooled_Horn_D.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_D.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Tooled_Horn_D.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_D.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Tooled_Horn_E.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_E.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Tooled_Horn_E.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_E.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Tooled_Horn_F.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_F.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Tooled_Horn_F.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_F.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Tooled_Horn_G.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_G.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Tooled_Horn_G.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Tooled_Horn_G.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Flute_A.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_A.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Flute_A.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_A.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Flute_B.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_B.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Flute_B.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_B.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Flute_C.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_C.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Flute_C.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_C.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Flute_D.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_D.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Flute_D.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_D.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Flute_E.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_E.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Flute_E.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_E.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Flute_F.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_F.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Flute_F.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_F.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Flute_G.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_G.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Flute_G.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Flute_G.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Harp_A.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_A.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Harp_A.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_A.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Harp_B.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_B.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Harp_B.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_B.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Harp_C.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_C.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Harp_C.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_C.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Harp_D.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_D.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Harp_D.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_D.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Harp_E.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_E.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Harp_E.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_E.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Harp_F.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_F.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Harp_F.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_F.uu diff --git a/src/NetHack_3.7/sound/wav/sound_Wooden_Harp_G.uu b/src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_G.uu similarity index 100% rename from src/NetHack_3.7/sound/wav/sound_Wooden_Harp_G.uu rename to src/NetHack-NetHack-3.7/sound/wav/sound_Wooden_Harp_G.uu diff --git a/src/NetHack_3.7/sound/wav/uu2wav.cmd b/src/NetHack-NetHack-3.7/sound/wav/uu2wav.cmd similarity index 100% rename from src/NetHack_3.7/sound/wav/uu2wav.cmd rename to src/NetHack-NetHack-3.7/sound/wav/uu2wav.cmd diff --git a/src/NetHack_3.7/sound/wav/uu2wav.sh b/src/NetHack-NetHack-3.7/sound/wav/uu2wav.sh similarity index 100% rename from src/NetHack_3.7/sound/wav/uu2wav.sh rename to src/NetHack-NetHack-3.7/sound/wav/uu2wav.sh diff --git a/src/NetHack_3.7/sound/windsound/windsound.c b/src/NetHack-NetHack-3.7/sound/windsound/windsound.c similarity index 100% rename from src/NetHack_3.7/sound/windsound/windsound.c rename to src/NetHack-NetHack-3.7/sound/windsound/windsound.c diff --git a/src/NetHack_3.7/src/.gitattributes b/src/NetHack-NetHack-3.7/src/.gitattributes similarity index 100% rename from src/NetHack_3.7/src/.gitattributes rename to src/NetHack-NetHack-3.7/src/.gitattributes diff --git a/src/NetHack_3.7/src/.gitignore b/src/NetHack-NetHack-3.7/src/.gitignore similarity index 100% rename from src/NetHack_3.7/src/.gitignore rename to src/NetHack-NetHack-3.7/src/.gitignore diff --git a/src/NetHack_3.7/src/allmain.c b/src/NetHack-NetHack-3.7/src/allmain.c similarity index 100% rename from src/NetHack_3.7/src/allmain.c rename to src/NetHack-NetHack-3.7/src/allmain.c diff --git a/src/NetHack_3.7/src/alloc.c b/src/NetHack-NetHack-3.7/src/alloc.c similarity index 100% rename from src/NetHack_3.7/src/alloc.c rename to src/NetHack-NetHack-3.7/src/alloc.c diff --git a/src/NetHack_3.7/src/apply.c b/src/NetHack-NetHack-3.7/src/apply.c similarity index 100% rename from src/NetHack_3.7/src/apply.c rename to src/NetHack-NetHack-3.7/src/apply.c diff --git a/src/NetHack_3.7/src/artifact.c b/src/NetHack-NetHack-3.7/src/artifact.c similarity index 100% rename from src/NetHack_3.7/src/artifact.c rename to src/NetHack-NetHack-3.7/src/artifact.c diff --git a/src/NetHack_3.7/src/attrib.c b/src/NetHack-NetHack-3.7/src/attrib.c similarity index 100% rename from src/NetHack_3.7/src/attrib.c rename to src/NetHack-NetHack-3.7/src/attrib.c diff --git a/src/NetHack_3.7/src/ball.c b/src/NetHack-NetHack-3.7/src/ball.c similarity index 100% rename from src/NetHack_3.7/src/ball.c rename to src/NetHack-NetHack-3.7/src/ball.c diff --git a/src/NetHack_3.7/src/bones.c b/src/NetHack-NetHack-3.7/src/bones.c similarity index 100% rename from src/NetHack_3.7/src/bones.c rename to src/NetHack-NetHack-3.7/src/bones.c diff --git a/src/NetHack_3.7/src/botl.c b/src/NetHack-NetHack-3.7/src/botl.c similarity index 100% rename from src/NetHack_3.7/src/botl.c rename to src/NetHack-NetHack-3.7/src/botl.c diff --git a/src/NetHack_3.7/src/cmd.c b/src/NetHack-NetHack-3.7/src/cmd.c similarity index 100% rename from src/NetHack_3.7/src/cmd.c rename to src/NetHack-NetHack-3.7/src/cmd.c diff --git a/src/NetHack_3.7/src/date.c b/src/NetHack-NetHack-3.7/src/date.c similarity index 100% rename from src/NetHack_3.7/src/date.c rename to src/NetHack-NetHack-3.7/src/date.c diff --git a/src/NetHack_3.7/src/dbridge.c b/src/NetHack-NetHack-3.7/src/dbridge.c similarity index 100% rename from src/NetHack_3.7/src/dbridge.c rename to src/NetHack-NetHack-3.7/src/dbridge.c diff --git a/src/NetHack_3.7/src/decl.c b/src/NetHack-NetHack-3.7/src/decl.c similarity index 100% rename from src/NetHack_3.7/src/decl.c rename to src/NetHack-NetHack-3.7/src/decl.c diff --git a/src/NetHack_3.7/src/detect.c b/src/NetHack-NetHack-3.7/src/detect.c similarity index 100% rename from src/NetHack_3.7/src/detect.c rename to src/NetHack-NetHack-3.7/src/detect.c diff --git a/src/NetHack_3.7/src/dig.c b/src/NetHack-NetHack-3.7/src/dig.c similarity index 100% rename from src/NetHack_3.7/src/dig.c rename to src/NetHack-NetHack-3.7/src/dig.c diff --git a/src/NetHack_3.7/src/display.c b/src/NetHack-NetHack-3.7/src/display.c similarity index 100% rename from src/NetHack_3.7/src/display.c rename to src/NetHack-NetHack-3.7/src/display.c diff --git a/src/NetHack_3.7/src/dlb.c b/src/NetHack-NetHack-3.7/src/dlb.c similarity index 100% rename from src/NetHack_3.7/src/dlb.c rename to src/NetHack-NetHack-3.7/src/dlb.c diff --git a/src/NetHack_3.7/src/do.c b/src/NetHack-NetHack-3.7/src/do.c similarity index 100% rename from src/NetHack_3.7/src/do.c rename to src/NetHack-NetHack-3.7/src/do.c diff --git a/src/NetHack_3.7/src/do_name.c b/src/NetHack-NetHack-3.7/src/do_name.c similarity index 100% rename from src/NetHack_3.7/src/do_name.c rename to src/NetHack-NetHack-3.7/src/do_name.c diff --git a/src/NetHack_3.7/src/do_wear.c b/src/NetHack-NetHack-3.7/src/do_wear.c similarity index 100% rename from src/NetHack_3.7/src/do_wear.c rename to src/NetHack-NetHack-3.7/src/do_wear.c diff --git a/src/NetHack_3.7/src/dog.c b/src/NetHack-NetHack-3.7/src/dog.c similarity index 100% rename from src/NetHack_3.7/src/dog.c rename to src/NetHack-NetHack-3.7/src/dog.c diff --git a/src/NetHack_3.7/src/dogmove.c b/src/NetHack-NetHack-3.7/src/dogmove.c similarity index 100% rename from src/NetHack_3.7/src/dogmove.c rename to src/NetHack-NetHack-3.7/src/dogmove.c diff --git a/src/NetHack_3.7/src/dokick.c b/src/NetHack-NetHack-3.7/src/dokick.c similarity index 100% rename from src/NetHack_3.7/src/dokick.c rename to src/NetHack-NetHack-3.7/src/dokick.c diff --git a/src/NetHack_3.7/src/dothrow.c b/src/NetHack-NetHack-3.7/src/dothrow.c similarity index 100% rename from src/NetHack_3.7/src/dothrow.c rename to src/NetHack-NetHack-3.7/src/dothrow.c diff --git a/src/NetHack_3.7/src/drawing.c b/src/NetHack-NetHack-3.7/src/drawing.c similarity index 100% rename from src/NetHack_3.7/src/drawing.c rename to src/NetHack-NetHack-3.7/src/drawing.c diff --git a/src/NetHack_3.7/src/dungeon.c b/src/NetHack-NetHack-3.7/src/dungeon.c similarity index 100% rename from src/NetHack_3.7/src/dungeon.c rename to src/NetHack-NetHack-3.7/src/dungeon.c diff --git a/src/NetHack_3.7/src/eat.c b/src/NetHack-NetHack-3.7/src/eat.c similarity index 99% rename from src/NetHack_3.7/src/eat.c rename to src/NetHack-NetHack-3.7/src/eat.c index 11ec198..e33ea5f 100644 --- a/src/NetHack_3.7/src/eat.c +++ b/src/NetHack-NetHack-3.7/src/eat.c @@ -46,7 +46,6 @@ static int eat_ok(struct obj *); static int offer_ok(struct obj *); static int tin_ok(struct obj *); -/* also used to see if you're allowed to eat cats and dogs */ #define CANNIBAL_ALLOWED() (Role_if(PM_CAVE_DWELLER) || Race_if(PM_ORC)) /* monster types that cause hero to be turned into stone if eaten */ diff --git a/src/NetHack_3.7/src/end.c b/src/NetHack-NetHack-3.7/src/end.c similarity index 100% rename from src/NetHack_3.7/src/end.c rename to src/NetHack-NetHack-3.7/src/end.c diff --git a/src/NetHack_3.7/src/engrave.c b/src/NetHack-NetHack-3.7/src/engrave.c similarity index 100% rename from src/NetHack_3.7/src/engrave.c rename to src/NetHack-NetHack-3.7/src/engrave.c diff --git a/src/NetHack_3.7/src/exper.c b/src/NetHack-NetHack-3.7/src/exper.c similarity index 100% rename from src/NetHack_3.7/src/exper.c rename to src/NetHack-NetHack-3.7/src/exper.c diff --git a/src/NetHack_3.7/src/explode.c b/src/NetHack-NetHack-3.7/src/explode.c similarity index 100% rename from src/NetHack_3.7/src/explode.c rename to src/NetHack-NetHack-3.7/src/explode.c diff --git a/src/NetHack_3.7/src/extralev.c b/src/NetHack-NetHack-3.7/src/extralev.c similarity index 100% rename from src/NetHack_3.7/src/extralev.c rename to src/NetHack-NetHack-3.7/src/extralev.c diff --git a/src/NetHack_3.7/src/files.c b/src/NetHack-NetHack-3.7/src/files.c similarity index 100% rename from src/NetHack_3.7/src/files.c rename to src/NetHack-NetHack-3.7/src/files.c diff --git a/src/NetHack_3.7/src/fountain.c b/src/NetHack-NetHack-3.7/src/fountain.c similarity index 100% rename from src/NetHack_3.7/src/fountain.c rename to src/NetHack-NetHack-3.7/src/fountain.c diff --git a/src/NetHack_3.7/src/hack.c b/src/NetHack-NetHack-3.7/src/hack.c similarity index 100% rename from src/NetHack_3.7/src/hack.c rename to src/NetHack-NetHack-3.7/src/hack.c diff --git a/src/NetHack_3.7/src/hacklib.c b/src/NetHack-NetHack-3.7/src/hacklib.c similarity index 100% rename from src/NetHack_3.7/src/hacklib.c rename to src/NetHack-NetHack-3.7/src/hacklib.c diff --git a/src/NetHack_3.7/src/insight.c b/src/NetHack-NetHack-3.7/src/insight.c similarity index 100% rename from src/NetHack_3.7/src/insight.c rename to src/NetHack-NetHack-3.7/src/insight.c diff --git a/src/NetHack_3.7/src/invent.c b/src/NetHack-NetHack-3.7/src/invent.c similarity index 100% rename from src/NetHack_3.7/src/invent.c rename to src/NetHack-NetHack-3.7/src/invent.c diff --git a/src/NetHack_3.7/src/isaac64.c b/src/NetHack-NetHack-3.7/src/isaac64.c similarity index 100% rename from src/NetHack_3.7/src/isaac64.c rename to src/NetHack-NetHack-3.7/src/isaac64.c diff --git a/src/NetHack_3.7/src/light.c b/src/NetHack-NetHack-3.7/src/light.c similarity index 100% rename from src/NetHack_3.7/src/light.c rename to src/NetHack-NetHack-3.7/src/light.c diff --git a/src/NetHack_3.7/src/lock.c b/src/NetHack-NetHack-3.7/src/lock.c similarity index 100% rename from src/NetHack_3.7/src/lock.c rename to src/NetHack-NetHack-3.7/src/lock.c diff --git a/src/NetHack_3.7/src/mail.c b/src/NetHack-NetHack-3.7/src/mail.c similarity index 100% rename from src/NetHack_3.7/src/mail.c rename to src/NetHack-NetHack-3.7/src/mail.c diff --git a/src/NetHack_3.7/src/makemon.c b/src/NetHack-NetHack-3.7/src/makemon.c similarity index 100% rename from src/NetHack_3.7/src/makemon.c rename to src/NetHack-NetHack-3.7/src/makemon.c diff --git a/src/NetHack_3.7/src/mcastu.c b/src/NetHack-NetHack-3.7/src/mcastu.c similarity index 100% rename from src/NetHack_3.7/src/mcastu.c rename to src/NetHack-NetHack-3.7/src/mcastu.c diff --git a/src/NetHack_3.7/src/mdlib.c b/src/NetHack-NetHack-3.7/src/mdlib.c similarity index 100% rename from src/NetHack_3.7/src/mdlib.c rename to src/NetHack-NetHack-3.7/src/mdlib.c diff --git a/src/NetHack_3.7/src/mhitm.c b/src/NetHack-NetHack-3.7/src/mhitm.c similarity index 100% rename from src/NetHack_3.7/src/mhitm.c rename to src/NetHack-NetHack-3.7/src/mhitm.c diff --git a/src/NetHack_3.7/src/mhitu.c b/src/NetHack-NetHack-3.7/src/mhitu.c similarity index 100% rename from src/NetHack_3.7/src/mhitu.c rename to src/NetHack-NetHack-3.7/src/mhitu.c diff --git a/src/NetHack_3.7/src/minion.c b/src/NetHack-NetHack-3.7/src/minion.c similarity index 100% rename from src/NetHack_3.7/src/minion.c rename to src/NetHack-NetHack-3.7/src/minion.c diff --git a/src/NetHack_3.7/src/mklev.c b/src/NetHack-NetHack-3.7/src/mklev.c similarity index 100% rename from src/NetHack_3.7/src/mklev.c rename to src/NetHack-NetHack-3.7/src/mklev.c diff --git a/src/NetHack_3.7/src/mkmap.c b/src/NetHack-NetHack-3.7/src/mkmap.c similarity index 100% rename from src/NetHack_3.7/src/mkmap.c rename to src/NetHack-NetHack-3.7/src/mkmap.c diff --git a/src/NetHack_3.7/src/mkmaze.c b/src/NetHack-NetHack-3.7/src/mkmaze.c similarity index 100% rename from src/NetHack_3.7/src/mkmaze.c rename to src/NetHack-NetHack-3.7/src/mkmaze.c diff --git a/src/NetHack_3.7/src/mkobj.c b/src/NetHack-NetHack-3.7/src/mkobj.c similarity index 100% rename from src/NetHack_3.7/src/mkobj.c rename to src/NetHack-NetHack-3.7/src/mkobj.c diff --git a/src/NetHack_3.7/src/mkroom.c b/src/NetHack-NetHack-3.7/src/mkroom.c similarity index 100% rename from src/NetHack_3.7/src/mkroom.c rename to src/NetHack-NetHack-3.7/src/mkroom.c diff --git a/src/NetHack_3.7/src/mon.c b/src/NetHack-NetHack-3.7/src/mon.c similarity index 100% rename from src/NetHack_3.7/src/mon.c rename to src/NetHack-NetHack-3.7/src/mon.c diff --git a/src/NetHack_3.7/src/mondata.c b/src/NetHack-NetHack-3.7/src/mondata.c similarity index 99% rename from src/NetHack_3.7/src/mondata.c rename to src/NetHack-NetHack-3.7/src/mondata.c index d66b54c..0308fac 100644 --- a/src/NetHack_3.7/src/mondata.c +++ b/src/NetHack-NetHack-3.7/src/mondata.c @@ -1539,7 +1539,7 @@ mon_learns_traps(struct monst *mtmp, int ttyp) mtmp->mtrapseen |= (1L << (ttyp - 1)); } -/* monsters see a trap trigger, and remember it */ + void mons_see_trap(struct trap *ttmp) { diff --git a/src/NetHack_3.7/src/monmove.c b/src/NetHack-NetHack-3.7/src/monmove.c similarity index 100% rename from src/NetHack_3.7/src/monmove.c rename to src/NetHack-NetHack-3.7/src/monmove.c diff --git a/src/NetHack_3.7/src/monst.c b/src/NetHack-NetHack-3.7/src/monst.c similarity index 100% rename from src/NetHack_3.7/src/monst.c rename to src/NetHack-NetHack-3.7/src/monst.c diff --git a/src/NetHack_3.7/src/mplayer.c b/src/NetHack-NetHack-3.7/src/mplayer.c similarity index 100% rename from src/NetHack_3.7/src/mplayer.c rename to src/NetHack-NetHack-3.7/src/mplayer.c diff --git a/src/NetHack_3.7/src/mthrowu.c b/src/NetHack-NetHack-3.7/src/mthrowu.c similarity index 99% rename from src/NetHack_3.7/src/mthrowu.c rename to src/NetHack-NetHack-3.7/src/mthrowu.c index efe8411..52980d4 100644 --- a/src/NetHack_3.7/src/mthrowu.c +++ b/src/NetHack-NetHack-3.7/src/mthrowu.c @@ -1327,7 +1327,7 @@ hits_bars( && obj_type != WAX_CANDLE && obj_type != LENSES && obj_type != TIN_WHISTLE && obj_type != MAGIC_WHISTLE); break; - case ROCK_CLASS: /* includes boulder */ + case ROCK_CLASS: if (obj_type != STATUE || mons[otmp->corpsenm].msize > MZ_TINY) hits = TRUE; break; diff --git a/src/NetHack_3.7/src/muse.c b/src/NetHack-NetHack-3.7/src/muse.c similarity index 99% rename from src/NetHack_3.7/src/muse.c rename to src/NetHack-NetHack-3.7/src/muse.c index d766faa..e6b5f0e 100644 --- a/src/NetHack_3.7/src/muse.c +++ b/src/NetHack-NetHack-3.7/src/muse.c @@ -3067,7 +3067,7 @@ green_mon(struct monst *mon) if (iflags.use_color) return (ptr->mcolor == CLR_GREEN || ptr->mcolor == CLR_BRIGHT_GREEN); #endif - /* approximation */ + if (strstri(ptr->pmnames[NEUTRAL], "green") || (ptr->pmnames[MALE] && strstri(ptr->pmnames[MALE], "green")) || (ptr->pmnames[FEMALE] && strstri(ptr->pmnames[FEMALE], "green"))) diff --git a/src/NetHack_3.7/src/music.c b/src/NetHack-NetHack-3.7/src/music.c similarity index 100% rename from src/NetHack_3.7/src/music.c rename to src/NetHack-NetHack-3.7/src/music.c diff --git a/src/NetHack_3.7/src/nhlobj.c b/src/NetHack-NetHack-3.7/src/nhlobj.c similarity index 100% rename from src/NetHack_3.7/src/nhlobj.c rename to src/NetHack-NetHack-3.7/src/nhlobj.c diff --git a/src/NetHack_3.7/src/nhlsel.c b/src/NetHack-NetHack-3.7/src/nhlsel.c similarity index 100% rename from src/NetHack_3.7/src/nhlsel.c rename to src/NetHack-NetHack-3.7/src/nhlsel.c diff --git a/src/NetHack_3.7/src/nhlua.c b/src/NetHack-NetHack-3.7/src/nhlua.c similarity index 100% rename from src/NetHack_3.7/src/nhlua.c rename to src/NetHack-NetHack-3.7/src/nhlua.c diff --git a/src/NetHack_3.7/src/o_init.c b/src/NetHack-NetHack-3.7/src/o_init.c similarity index 100% rename from src/NetHack_3.7/src/o_init.c rename to src/NetHack-NetHack-3.7/src/o_init.c diff --git a/src/NetHack_3.7/src/objects.c b/src/NetHack-NetHack-3.7/src/objects.c similarity index 100% rename from src/NetHack_3.7/src/objects.c rename to src/NetHack-NetHack-3.7/src/objects.c diff --git a/src/NetHack_3.7/src/objnam.c b/src/NetHack-NetHack-3.7/src/objnam.c similarity index 100% rename from src/NetHack_3.7/src/objnam.c rename to src/NetHack-NetHack-3.7/src/objnam.c diff --git a/src/NetHack_3.7/src/options.c b/src/NetHack-NetHack-3.7/src/options.c similarity index 100% rename from src/NetHack_3.7/src/options.c rename to src/NetHack-NetHack-3.7/src/options.c diff --git a/src/NetHack_3.7/src/pager.c b/src/NetHack-NetHack-3.7/src/pager.c similarity index 100% rename from src/NetHack_3.7/src/pager.c rename to src/NetHack-NetHack-3.7/src/pager.c diff --git a/src/NetHack_3.7/src/pickup.c b/src/NetHack-NetHack-3.7/src/pickup.c similarity index 100% rename from src/NetHack_3.7/src/pickup.c rename to src/NetHack-NetHack-3.7/src/pickup.c diff --git a/src/NetHack_3.7/src/pline.c b/src/NetHack-NetHack-3.7/src/pline.c similarity index 100% rename from src/NetHack_3.7/src/pline.c rename to src/NetHack-NetHack-3.7/src/pline.c diff --git a/src/NetHack_3.7/src/polyself.c b/src/NetHack-NetHack-3.7/src/polyself.c similarity index 100% rename from src/NetHack_3.7/src/polyself.c rename to src/NetHack-NetHack-3.7/src/polyself.c diff --git a/src/NetHack_3.7/src/potion.c b/src/NetHack-NetHack-3.7/src/potion.c similarity index 100% rename from src/NetHack_3.7/src/potion.c rename to src/NetHack-NetHack-3.7/src/potion.c diff --git a/src/NetHack_3.7/src/pray.c b/src/NetHack-NetHack-3.7/src/pray.c similarity index 100% rename from src/NetHack_3.7/src/pray.c rename to src/NetHack-NetHack-3.7/src/pray.c diff --git a/src/NetHack_3.7/src/priest.c b/src/NetHack-NetHack-3.7/src/priest.c similarity index 100% rename from src/NetHack_3.7/src/priest.c rename to src/NetHack-NetHack-3.7/src/priest.c diff --git a/src/NetHack_3.7/src/quest.c b/src/NetHack-NetHack-3.7/src/quest.c similarity index 100% rename from src/NetHack_3.7/src/quest.c rename to src/NetHack-NetHack-3.7/src/quest.c diff --git a/src/NetHack_3.7/src/questpgr.c b/src/NetHack-NetHack-3.7/src/questpgr.c similarity index 100% rename from src/NetHack_3.7/src/questpgr.c rename to src/NetHack-NetHack-3.7/src/questpgr.c diff --git a/src/NetHack_3.7/src/read.c b/src/NetHack-NetHack-3.7/src/read.c similarity index 100% rename from src/NetHack_3.7/src/read.c rename to src/NetHack-NetHack-3.7/src/read.c diff --git a/src/NetHack_3.7/src/rect.c b/src/NetHack-NetHack-3.7/src/rect.c similarity index 100% rename from src/NetHack_3.7/src/rect.c rename to src/NetHack-NetHack-3.7/src/rect.c diff --git a/src/NetHack_3.7/src/region.c b/src/NetHack-NetHack-3.7/src/region.c similarity index 100% rename from src/NetHack_3.7/src/region.c rename to src/NetHack-NetHack-3.7/src/region.c diff --git a/src/NetHack_3.7/src/restore.c b/src/NetHack-NetHack-3.7/src/restore.c similarity index 99% rename from src/NetHack_3.7/src/restore.c rename to src/NetHack-NetHack-3.7/src/restore.c index cebf27c..50fb8af 100644 --- a/src/NetHack_3.7/src/restore.c +++ b/src/NetHack-NetHack-3.7/src/restore.c @@ -1478,7 +1478,7 @@ validate(NHFILE *nhfp, const char *name, boolean without_waitsynch_perfile) if (nhfp->structlevel) rlen = (readLenType) read(nhfp->fd, (genericptr_t) &sfi, sizeof sfi); - minit(); /* ZEROCOMP */ + minit(); if (rlen == 0) { if (verbose) { pline("File \"%s\" is empty during save file feature check?", diff --git a/src/NetHack_3.7/src/rip.c b/src/NetHack-NetHack-3.7/src/rip.c similarity index 100% rename from src/NetHack_3.7/src/rip.c rename to src/NetHack-NetHack-3.7/src/rip.c diff --git a/src/NetHack_3.7/src/rnd.c b/src/NetHack-NetHack-3.7/src/rnd.c similarity index 98% rename from src/NetHack_3.7/src/rnd.c rename to src/NetHack-NetHack-3.7/src/rnd.c index bda9cbc..9b5b707 100644 --- a/src/NetHack_3.7/src/rnd.c +++ b/src/NetHack-NetHack-3.7/src/rnd.c @@ -22,7 +22,7 @@ struct rnglist_t { enum { CORE = 0, DISP = 1 }; static struct rnglist_t rnglist[] = { - { rn2, FALSE, { 0 } }, /* CORE */ + { rn2, FALSE, { 0 } }, { rn2_on_display_rng, FALSE, { 0 } }, /* DISP */ }; diff --git a/src/NetHack_3.7/src/role.c b/src/NetHack-NetHack-3.7/src/role.c similarity index 100% rename from src/NetHack_3.7/src/role.c rename to src/NetHack-NetHack-3.7/src/role.c diff --git a/src/NetHack_3.7/src/rumors.c b/src/NetHack-NetHack-3.7/src/rumors.c similarity index 100% rename from src/NetHack_3.7/src/rumors.c rename to src/NetHack-NetHack-3.7/src/rumors.c diff --git a/src/NetHack_3.7/src/save.c b/src/NetHack-NetHack-3.7/src/save.c similarity index 100% rename from src/NetHack_3.7/src/save.c rename to src/NetHack-NetHack-3.7/src/save.c diff --git a/src/NetHack_3.7/src/sfstruct.c b/src/NetHack-NetHack-3.7/src/sfstruct.c similarity index 100% rename from src/NetHack_3.7/src/sfstruct.c rename to src/NetHack-NetHack-3.7/src/sfstruct.c diff --git a/src/NetHack_3.7/src/shk.c b/src/NetHack-NetHack-3.7/src/shk.c similarity index 100% rename from src/NetHack_3.7/src/shk.c rename to src/NetHack-NetHack-3.7/src/shk.c diff --git a/src/NetHack_3.7/src/shknam.c b/src/NetHack-NetHack-3.7/src/shknam.c similarity index 100% rename from src/NetHack_3.7/src/shknam.c rename to src/NetHack-NetHack-3.7/src/shknam.c diff --git a/src/NetHack_3.7/src/sit.c b/src/NetHack-NetHack-3.7/src/sit.c similarity index 100% rename from src/NetHack_3.7/src/sit.c rename to src/NetHack-NetHack-3.7/src/sit.c diff --git a/src/NetHack_3.7/src/sounds.c b/src/NetHack-NetHack-3.7/src/sounds.c similarity index 100% rename from src/NetHack_3.7/src/sounds.c rename to src/NetHack-NetHack-3.7/src/sounds.c diff --git a/src/NetHack_3.7/src/sp_lev.c b/src/NetHack-NetHack-3.7/src/sp_lev.c similarity index 100% rename from src/NetHack_3.7/src/sp_lev.c rename to src/NetHack-NetHack-3.7/src/sp_lev.c diff --git a/src/NetHack_3.7/src/spell.c b/src/NetHack-NetHack-3.7/src/spell.c similarity index 100% rename from src/NetHack_3.7/src/spell.c rename to src/NetHack-NetHack-3.7/src/spell.c diff --git a/src/NetHack_3.7/src/steal.c b/src/NetHack-NetHack-3.7/src/steal.c similarity index 100% rename from src/NetHack_3.7/src/steal.c rename to src/NetHack-NetHack-3.7/src/steal.c diff --git a/src/NetHack_3.7/src/steed.c b/src/NetHack-NetHack-3.7/src/steed.c similarity index 99% rename from src/NetHack_3.7/src/steed.c rename to src/NetHack-NetHack-3.7/src/steed.c index 4947dde..81e287d 100644 --- a/src/NetHack_3.7/src/steed.c +++ b/src/NetHack-NetHack-3.7/src/steed.c @@ -847,8 +847,7 @@ place_monster(struct monst* mon, coordxy x, coordxy y) char buf[QBUFSZ]; buf[0] = '\0'; - /* normal map bounds are <1..COLNO-1,0..ROWNO-1> but sometimes - vault guards (either living or dead) are parked at <0,0> */ + if (!isok(x, y) && (x != 0 || y != 0 || !mon->isgd)) { describe_level(buf, 0); impossible("trying to place %s at <%d,%d> mstate:%lx on %s", diff --git a/src/NetHack_3.7/src/symbols.c b/src/NetHack-NetHack-3.7/src/symbols.c similarity index 100% rename from src/NetHack_3.7/src/symbols.c rename to src/NetHack-NetHack-3.7/src/symbols.c diff --git a/src/NetHack_3.7/src/sys.c b/src/NetHack-NetHack-3.7/src/sys.c similarity index 100% rename from src/NetHack_3.7/src/sys.c rename to src/NetHack-NetHack-3.7/src/sys.c diff --git a/src/NetHack_3.7/src/teleport.c b/src/NetHack-NetHack-3.7/src/teleport.c similarity index 100% rename from src/NetHack_3.7/src/teleport.c rename to src/NetHack-NetHack-3.7/src/teleport.c diff --git a/src/NetHack_3.7/src/timeout.c b/src/NetHack-NetHack-3.7/src/timeout.c similarity index 99% rename from src/NetHack_3.7/src/timeout.c rename to src/NetHack-NetHack-3.7/src/timeout.c index 65306af..9ec13c3 100644 --- a/src/NetHack_3.7/src/timeout.c +++ b/src/NetHack-NetHack-3.7/src/timeout.c @@ -19,8 +19,7 @@ static void see_lamp_flicker(struct obj *, const char *); static void lantern_message(struct obj *); static void cleanup_burn(ANY_P *, long); -/* used by wizard mode #timeout and #wizintrinsic; order by 'interest' - for timeout countdown, where most won't occur in normal play */ + static const struct propname { int prop_num; const char *prop_name; diff --git a/src/NetHack_3.7/src/topten.c b/src/NetHack-NetHack-3.7/src/topten.c similarity index 100% rename from src/NetHack_3.7/src/topten.c rename to src/NetHack-NetHack-3.7/src/topten.c diff --git a/src/NetHack_3.7/src/track.c b/src/NetHack-NetHack-3.7/src/track.c similarity index 75% rename from src/NetHack_3.7/src/track.c rename to src/NetHack-NetHack-3.7/src/track.c index b5ccd2d..5fc1c59 100644 --- a/src/NetHack_3.7/src/track.c +++ b/src/NetHack-NetHack-3.7/src/track.c @@ -12,14 +12,14 @@ static NEARDATA int utcnt, utpnt; static NEARDATA coord utrack[UTSZ]; void -initrack(void) +initrack(void) /* This function initializes the aaaa tracking system by setting the values of utcnt and utpnt to 0. */ { utcnt = utpnt = 0; } /* add to track */ void -settrack(void) +settrack(void)/* This function adds a coordinate to the tracking system by updating the values of utcnt and utpnt accordingly. */ { if (utcnt < UTSZ) utcnt++; @@ -31,7 +31,8 @@ settrack(void) } coord * -gettrack(coordxy x, coordxy y) +gettrack(coordxy x, coordxy y)/* This function retrieves coordinate from the tracking system based on the given x and y coordinates. It returns a pointer to the coord structure if a match is found; otherwise, it returns NULL. */ + { register int cnt, ndist; register coord *tc; diff --git a/src/NetHack_3.7/src/trap.c b/src/NetHack-NetHack-3.7/src/trap.c similarity index 100% rename from src/NetHack_3.7/src/trap.c rename to src/NetHack-NetHack-3.7/src/trap.c diff --git a/src/NetHack_3.7/src/u_init.c b/src/NetHack-NetHack-3.7/src/u_init.c similarity index 100% rename from src/NetHack_3.7/src/u_init.c rename to src/NetHack-NetHack-3.7/src/u_init.c diff --git a/src/NetHack_3.7/src/uhitm.c b/src/NetHack-NetHack-3.7/src/uhitm.c similarity index 100% rename from src/NetHack_3.7/src/uhitm.c rename to src/NetHack-NetHack-3.7/src/uhitm.c diff --git a/src/NetHack_3.7/src/utf8map.c b/src/NetHack-NetHack-3.7/src/utf8map.c similarity index 100% rename from src/NetHack_3.7/src/utf8map.c rename to src/NetHack-NetHack-3.7/src/utf8map.c diff --git a/src/NetHack_3.7/src/vault.c b/src/NetHack-NetHack-3.7/src/vault.c similarity index 99% rename from src/NetHack_3.7/src/vault.c rename to src/NetHack-NetHack-3.7/src/vault.c index c658e4a..77a1c40 100644 --- a/src/NetHack_3.7/src/vault.c +++ b/src/NetHack-NetHack-3.7/src/vault.c @@ -836,7 +836,7 @@ gd_move_cleanup( */ x = grd->mx, y = grd->my; see_guard = canspotmon(grd); - parkguard(grd); /* move to <0,0> */ + parkguard(grd); wallify_vault(grd); restfakecorr(grd); debugpline2("gd_move_cleanup: %scleanup%s", diff --git a/src/NetHack_3.7/src/version.c b/src/NetHack-NetHack-3.7/src/version.c similarity index 100% rename from src/NetHack_3.7/src/version.c rename to src/NetHack-NetHack-3.7/src/version.c diff --git a/src/NetHack_3.7/src/vision.c b/src/NetHack-NetHack-3.7/src/vision.c similarity index 100% rename from src/NetHack_3.7/src/vision.c rename to src/NetHack-NetHack-3.7/src/vision.c diff --git a/src/NetHack_3.7/src/weapon.c b/src/NetHack-NetHack-3.7/src/weapon.c similarity index 100% rename from src/NetHack_3.7/src/weapon.c rename to src/NetHack-NetHack-3.7/src/weapon.c diff --git a/src/NetHack_3.7/src/were.c b/src/NetHack-NetHack-3.7/src/were.c similarity index 100% rename from src/NetHack_3.7/src/were.c rename to src/NetHack-NetHack-3.7/src/were.c diff --git a/src/NetHack_3.7/src/wield.c b/src/NetHack-NetHack-3.7/src/wield.c similarity index 100% rename from src/NetHack_3.7/src/wield.c rename to src/NetHack-NetHack-3.7/src/wield.c diff --git a/src/NetHack_3.7/src/windows.c b/src/NetHack-NetHack-3.7/src/windows.c similarity index 100% rename from src/NetHack_3.7/src/windows.c rename to src/NetHack-NetHack-3.7/src/windows.c diff --git a/src/NetHack_3.7/src/wizard.c b/src/NetHack-NetHack-3.7/src/wizard.c similarity index 100% rename from src/NetHack_3.7/src/wizard.c rename to src/NetHack-NetHack-3.7/src/wizard.c diff --git a/src/NetHack_3.7/src/worm.c b/src/NetHack-NetHack-3.7/src/worm.c similarity index 100% rename from src/NetHack_3.7/src/worm.c rename to src/NetHack-NetHack-3.7/src/worm.c diff --git a/src/NetHack_3.7/src/worn.c b/src/NetHack-NetHack-3.7/src/worn.c similarity index 100% rename from src/NetHack_3.7/src/worn.c rename to src/NetHack-NetHack-3.7/src/worn.c diff --git a/src/NetHack_3.7/src/write.c b/src/NetHack-NetHack-3.7/src/write.c similarity index 100% rename from src/NetHack_3.7/src/write.c rename to src/NetHack-NetHack-3.7/src/write.c diff --git a/src/NetHack_3.7/src/zap.c b/src/NetHack-NetHack-3.7/src/zap.c similarity index 100% rename from src/NetHack_3.7/src/zap.c rename to src/NetHack-NetHack-3.7/src/zap.c diff --git a/src/NetHack_3.7/submodules/CHKSUMS b/src/NetHack-NetHack-3.7/submodules/CHKSUMS similarity index 100% rename from src/NetHack_3.7/submodules/CHKSUMS rename to src/NetHack-NetHack-3.7/submodules/CHKSUMS diff --git a/src/NetHack_3.7/sys/libnh/README.md b/src/NetHack-NetHack-3.7/sys/libnh/README.md similarity index 100% rename from src/NetHack_3.7/sys/libnh/README.md rename to src/NetHack-NetHack-3.7/sys/libnh/README.md diff --git a/src/NetHack_3.7/sys/libnh/libnhmain.c b/src/NetHack-NetHack-3.7/sys/libnh/libnhmain.c similarity index 100% rename from src/NetHack_3.7/sys/libnh/libnhmain.c rename to src/NetHack-NetHack-3.7/sys/libnh/libnhmain.c diff --git a/src/NetHack_3.7/sys/libnh/sysconf b/src/NetHack-NetHack-3.7/sys/libnh/sysconf similarity index 100% rename from src/NetHack_3.7/sys/libnh/sysconf rename to src/NetHack-NetHack-3.7/sys/libnh/sysconf diff --git a/src/NetHack_3.7/sys/libnh/test/README.md b/src/NetHack-NetHack-3.7/sys/libnh/test/README.md similarity index 100% rename from src/NetHack_3.7/sys/libnh/test/README.md rename to src/NetHack-NetHack-3.7/sys/libnh/test/README.md diff --git a/src/NetHack_3.7/sys/libnh/test/libtest.c b/src/NetHack-NetHack-3.7/sys/libnh/test/libtest.c similarity index 100% rename from src/NetHack_3.7/sys/libnh/test/libtest.c rename to src/NetHack-NetHack-3.7/sys/libnh/test/libtest.c diff --git a/src/NetHack_3.7/sys/libnh/test/run.sh b/src/NetHack-NetHack-3.7/sys/libnh/test/run.sh similarity index 100% rename from src/NetHack_3.7/sys/libnh/test/run.sh rename to src/NetHack-NetHack-3.7/sys/libnh/test/run.sh diff --git a/src/NetHack_3.7/sys/msdos/.gitattributes b/src/NetHack-NetHack-3.7/sys/msdos/.gitattributes similarity index 100% rename from src/NetHack_3.7/sys/msdos/.gitattributes rename to src/NetHack-NetHack-3.7/sys/msdos/.gitattributes diff --git a/src/NetHack_3.7/sys/msdos/Install.dos b/src/NetHack-NetHack-3.7/sys/msdos/Install.dos similarity index 100% rename from src/NetHack_3.7/sys/msdos/Install.dos rename to src/NetHack-NetHack-3.7/sys/msdos/Install.dos diff --git a/src/NetHack-NetHack-3.7/sys/msdos/Makefile.GCC b/src/NetHack-NetHack-3.7/sys/msdos/Makefile.GCC new file mode 100644 index 0000000..b7fee8c --- /dev/null +++ b/src/NetHack-NetHack-3.7/sys/msdos/Makefile.GCC @@ -0,0 +1,1489 @@ +# NetHack 3.7 Makefile.GCC $NHDT-Date: 1596498268 2020/08/03 23:44:28 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.53 $ +# Copyright (c) NetHack PC Development Team 1996-2022. +# PC NetHack 3.7 Makefile for djgpp V2 +# +# Gnu gcc compiler for msdos (djgpp) +# Requires Gnu Make utility (V3.79.1 or greater) supplied with djgpp +# +# For questions or comments: devteam@nethack.org +# +# In addition to your C compiler, +# +# if you want to change you will need a +# files with suffix workalike for +# .y yacc +# .l lex +# +# Note that flex (lex) and bison (yacc) are included with the +# djgpp distribution and work quite well. This makefile assumes +# you have them installed correctly. + +# Game Installation Variables +# NOTE: Make sure GAMEDIR exists before make is started. + +GAME = nethack +# The GNU Make has a problem if you include a drive spec below (unfortunately). +GAMEDIR =../binary + +# Optional PDCurses support +# Uncomment these and set them appropriately if you want to +# include curses port support alongside TTY support in your +# NetHack.exe binary. +# +# You'll have to set PDCURSES_H to the correct location of the +# PDCurses header (.h) files and PDCURSES_C to the location +# of your PDCurses C files which must already be resident on +# your machine. +# +ifdef WANT_WIN_CURSES +ADD_CURSES=Y +ifdef WANT_DOSVGA +PDCURSES_TOP=../lib/pdcurmod +PDCDOS = $(PDCURSES_TOP)/dosvga +else +PDCURSES_TOP=../lib/pdcurses +PDCDOS = $(PDCURSES_TOP)/dos +endif +endif + +#--------------------------------------------------------------- +ifeq "$(LUA_VERSION)" "5.3.5" +LUAVER=535 +else +LUAVER=546 +endif +#--------------------------------------------------------------- +# Location of LUA +# +# Original source needs to be obtained from: +# http://www.lua.org/ftp/lua-5.4.6.tar.gz +# +# This build assumes that the LUA sources are located +# at the specified location. If they are actually elsewhere +# you'll need to specify the correct spot below in order to +# successfully build NetHack-3.7. +# +ADD_LUA=Y +LUATOP=../lib/lua$(LUAVER) +# + +#--------------------------------------------------------------- +# Location of terminus-fonts +# +FONTTOP=../lib/terminus +#============================================================================== +# This marks the end of the BUILD DECISIONS section. +#============================================================================== +# +# Directories, gcc likes unix style directory specs +# + +OBJ = o +DAT = ../dat +DOC = ../doc +INCL = ../include +MSYS = ../sys/msdos +SRC = ../src +SSHR = ../sys/share +UTIL = ../util +WIN = ../win/tty +WCURSES = ../win/curses +WSHR = ../win/share + +# +# Executables. + +CC = gcc +LINK = gcc +MAKEBIN = make + +# +# Special libraries and how to link them in. + +LIBS = -lpc + +# If TERMLIB is defined in pcconf.h, comment out the upper line and +# uncomment the lower. Note that you must build the termc library +# and place it in djgpp's lib directory. See termcap.zip for details + +TERMLIB = +#TERMLIB = -ltermc + +LIBRARIES = $(LIBS) $(TERMLIB) + +# +# Uncomment the line below if you want to store all the level files, +# help files, etc. in a single library file. + +USE_DLB = Y + +# djgpp includes ls.exe and touch.exe in fil41b.zip from the v2gnu +# folder so be sure to include that when downloading djgpp. Doing +# so will make changing this unnecessary. + +LS = ls -1 # ls.exe from djgpp distribution +#LS = dir /l/b # DOS command + +# To build a binary without any graphics +# suitable for blind players, +# set SUPPRESS_GRAPHICS to Y +# (Note: binary will require ANSI.SYS driver or equivalent loaded) +# SUPPRESS_GRAPHICS = Y +SUPPRESS_GRAPHICS = + +# ZLIB Support +# To support zlib compression in bones and save files, you must +# define ZLIB_COMP in include/config.h. +# You must also have a zlib library to link NetHack with, and +# for the djgpp build, you need one compatible with djgpp. +# At the time that this was written (post-NetHack 3.4.3) the +# following URL was a valid place to get a pre-built djgpp library +# to add to your djgpp tools directory tree. +# http://www.delorie.com/pub/djgpp/current/v2tk/zlib114b.zip +# +# If you defined ZLIB_COMP in include/config.h to build in support +# for ZLIB compression, you need to uncomment the line below. +#ZLIB= -lz + +#=============================================== +#======= End of Modification Section =========== +#=============================================== +################################################ +# # +# Nothing below here should have to be changed.# +# # +################################################ + +GAMEFILE = $(GAMEDIR)/$(GAME).exe + +# Changing this conditional block is not recommended +ifeq "$(USE_DLB)" "Y" +DLBFLG = -DDLB +else +DLBFLG = +endif + +TERMLIB = +# Build NetHack suitable for blind players + +#========================================== +#================ MACROS ================== +#========================================== +# This section creates shorthand macros for many objects +# referenced later on in the Makefile. +# +# Have windows path styles available for use in commands +# +W_OBJ =$(subst /,\, $(OBJ)) +W_INCL =$(subst /,\, $(INCL)) +W_DAT =$(subst /,\, $(DAT)) +W_DOC =$(subst /,\, $(DOC)) +W_UTIL =$(subst /,\, $(UTIL)) +W_SRC =$(subst /,\, $(SRC)) +W_SSYS =$(subst /,\, $(SSYS)) +W_MSWSYS =$(subst /,\, $(MSWSYS)) +W_TTY =$(subst /,\, $(TTY)) +W_MSWIN =$(subst /,\, $(MSWIN)) +ifeq "$(ADD_CURSES)" "Y" +W_WCURSES =$(subst /,\, $(WCURSES)) +endif +W_WSHR =$(subst /,\, $(WSHR)) +W_GAMEDIR =$(subst /,\, $(GAMEDIR)) + +# +# Shorten up the location for some files +# + +O = $(OBJ)/ + +U = $(UTIL)/ + +#========================================== +# Utility Objects. +#========================================== + +VGAOBJ = $(O)vidvga.o $(O)vidvesa.o $(O)font.o + +MAKESRC = makedefs.c + +MAKEDEFSOBJS = $(O)makedefs.o $(O)monst.o $(O)objects.o $(O)alloc.o \ + $(O)date.o $(O)panic.o + +RECOVOBJS = $(O)recover.o + + +#========================================== +# Tile related object files. +#========================================== + +ifeq ($(SUPPRESS_GRAPHICS),Y) +TILOBJ = +TILOBJ2 = +TEXTIO = +TEXTIO2 = +TILE_BMP = +TILEUTIL = +TILEFILES = +TILEFILES2 = +GIFREADERS = +GIFREAD2 = +PPMWRITERS = +PPMWRIT2 = + +else + +TILOBJ = $(O)tile.o $(VGAOBJ) + +TILOBJ2 = $(O)tileset.o $(O)bmptiles.o $(O)giftiles.o + +TEXTIO = $(O)tiletext.o $(O)tiletxt.o $(O)drawing.o $(O)monst.o \ + $(O)objects.o $(O)stubvid.o + +TEXTIO2 = $(O)tiletex2.o $(O)tiletxt2.o $(O)drawing.o $(O)monst.o \ + $(O)objects.o $(O)stubvid.o + +TILE_BMP = $(DAT)/nhtiles.bmp + +TILEUTIL = $(TILOBJ) $(U)tile2bin.exe $(U)til2bin2.exe $(TILE_BMP) + +TILEFILES = $(WSHR)/monsters.txt $(WSHR)/objects.txt $(WSHR)/other.txt + +TILEFILES2 = $(WSHR)/monthin.txt $(WSHR)/objthin.txt $(WSHR)/oththin.txt + +GIFREADERS = $(O)gifread.o $(O)alloc.o $(O)panic.o + +GIFREAD2 = $(O)gifread2.o $(O)alloc.o $(O)panic.o + +PPMWRITERS = $(O)ppmwrite.o $(O)alloc.o $(O)panic.o + +PPMWRIT2 = $(O)ppmwrit2.o $(O)alloc.o $(O)panic.o +endif + +#REGEX = $(O)pmatchregex.o +#REGEX = $(O)cppregex.o +REGEX = $(O)posixreg.o + +DLBOBJ = $(O)dlb.o + +# Object files for the game itself. + + +VOBJ01 = $(O)allmain.o $(O)alloc.o $(O)apply.o $(O)artifact.o $(O)attrib.o +VOBJ02 = $(O)ball.o $(O)bones.o $(O)botl.o $(O)cmd.o $(O)date.o $(O)dbridge.o +VOBJ03 = $(O)decl.o $(O)detect.o $(O)dig.o $(O)display.o $(O)do.o +VOBJ04 = $(O)do_name.o $(O)do_wear.o $(O)dog.o $(O)dogmove.o $(O)dokick.o +VOBJ05 = $(O)dothrow.o $(O)drawing.o $(O)dungeon.o $(O)eat.o $(O)end.o +VOBJ06 = $(O)engrave.o $(O)exper.o $(O)explode.o $(O)extralev.o $(O)files.o +VOBJ07 = $(O)fountain.o $(O)getline.o $(O)hack.o $(O)hacklib.o $(O)insight.o $(O)invent.o +VOBJ08 = $(O)isaac64.o $(O)lock.o $(O)mail.o $(O)main.o $(O)makemon.o +VOBJ09 = $(O)mcastu.o $(O)mdlib.o $(O)mhitm.o $(O)mhitu.o $(O)minion.o $(O)mkmap.o +VOBJ10 = $(O)mklev.o $(O)mkmaze.o $(O)mkobj.o $(O)mkroom.o $(O)mon.o +VOBJ11 = $(O)mondata.o $(O)monmove.o $(O)monst.o $(O)mplayer.o $(O)mthrowu.o +VOBJ12 = $(O)muse.o $(O)music.o $(O)o_init.o $(O)objects.o $(O)objnam.o +VOBJ13 = $(O)options.o $(O)pickup.o $(O)pline.o $(O)polyself.o $(O)potion.o +VOBJ14 = $(O)quest.o $(O)questpgr.o $(O)pager.o $(O)pray.o $(O)priest.o +VOBJ15 = $(O)read.o $(O)rect.o $(O)region.o $(O)restore.o $(O)rip.o +VOBJ16 = $(O)rnd.o $(O)role.o $(O)rumors.o $(O)save.o $(O)sfstruct.o +VOBJ17 = $(O)shk.o $(O)shknam.o $(O)sit.o $(O)sounds.o $(O)sp_lev.o +VOBJ18 = $(O)spell.o $(O)steal.o $(O)steed.o $(O)symbols.o $(O)sys.o +VOBJ19 = $(O)teleport.o $(O)termcap.o $(O)timeout.o $(O)topl.o $(O)topten.o +VOBJ20 = $(O)track.o $(O)trap.o $(O)u_init.o $(O)uhitm.o $(O)utf8map.o $(O)vault.o +VOBJ21 = $(O)vision.o $(O)weapon.o $(O)were.o $(O)wield.o $(O)windows.o +VOBJ22 = $(O)wintty.o $(O)wizard.o $(O)worm.o $(O)worn.o $(O)write.o +VOBJ23 = $(O)zap.o $(O)light.o $(O)dlb.o +VOBJ24 = $(REGEX) + +SOBJ = $(O)msdos.o $(O)pcsys.o $(O)tty.o $(O)unix.o \ + $(O)video.o $(O)vidtxt.o $(O)pckeys.o + +VVOBJ = $(O)version.o + +LUAOBJ = $(O)nhlua.o $(O)nhlsel.o $(O)nhlobj.o +LUA_QTEXT_FILE = "quest.lua" + +ifeq "$(ADD_CURSES)" "Y" +CURSESOBJ= $(O)cursdial.o $(O)cursinit.o $(O)cursinvt.o $(O)cursmain.o \ + $(O)cursmesg.o $(O)cursmisc.o $(O)cursstat.o $(O)curswins.o +else +CURSESOBJ= +endif + +VOBJ = $(VOBJ01) $(VOBJ02) $(VOBJ03) $(VOBJ04) $(VOBJ05) \ + $(VOBJ06) $(VOBJ07) $(VOBJ08) $(VOBJ09) $(VOBJ10) \ + $(VOBJ11) $(VOBJ12) $(VOBJ13) $(VOBJ14) $(VOBJ15) \ + $(VOBJ16) $(VOBJ17) $(VOBJ18) $(VOBJ19) $(VOBJ20) \ + $(VOBJ21) $(VOBJ22) $(VOBJ23) $(VOBJ24) $(VOBJ25) \ + $(CURSESOBJ) $(LUAOBJ) + +ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ) + +#===============-================================================= +# LUA library +# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz +#================================================================= + +LUASRC = $(LUATOP)/src +LUALIB = $(O)lua$(LUAVER)s.a +LUAINCL = -I$(LUASRC) +#LUAFLAGS = unix added -lm here? +LUATARGETS = lua.exe luac.exe $(LUALIB) + +LUASRCFILES = lapi.c lauxlib.c lbaselib.c lcode.c \ + lcorolib.c lctype.c ldblib.c ldebug.c ldo.c \ + ldump.c lfunc.c lgc.c linit.c liolib.c llex.c \ + lmathlib.c lmem.c loadlib.c lobject.c lopcodes.c \ + loslib.c lparser.c lstate.c lstring.c lstrlib.c \ + ltable.c ltablib.c ltm.c lundump.c lutf8lib.c \ + lvm.c lzio.c + +LUAOBJFILES1 = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \ + $(O)lcode.o $(O)lcorolib.o $(O)lctype.o $(O)ldblib.o \ + $(O)ldebug.o $(O)ldo.o $(O)ldump.o $(O)lfunc.o +LUAOBJFILES2 = $(O)lgc.o $(O)linit.o $(O)liolib.o $(O)llex.o \ + $(O)lmathlib.o $(O)lmem.o $(O)loadlib.o $(O)lobject.o \ + $(O)lopcodes.o $(O)loslib.o $(O)lparser.o $(O)lstate.o +LUAOBJFILES3 = $(O)lstring.o $(O)lstrlib.o $(O)ltable.o $(O)ltablib.o \ + $(O)ltm.o $(O)lundump.o $(O)lutf8lib.o $(O)lvm.o $(O)lzio.o +LUAOBJFILES = $(LUAOBJFILES1) $(LUAOBJFILES2) $(LUAOBJFILES3) + +ifeq "$(ADD_CURSES)" "Y" +#========================================== +# PDCurses build macros +#========================================== +PDCURSES_CURSES_H = $(PDCURSES_TOP)/curses.h +PDCURSES_CURSPRIV_H = $(PDCURSES_TOP)/curspriv.h +PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H) +PDCSRC = $(PDCURSES_TOP)/pdcurses +PDCLIBOBJS1 = $(O)addch.o $(O)addchstr.o $(O)addstr.o $(O)attr.o $(O)beep.o \ + $(O)bkgd.o $(O)border.o $(O)clear.o $(O)color.o $(O)delch.o $(O)deleteln.o \ + $(O)getch.o +PDCLIBOBJS2 = $(O)getstr.o $(O)getyx.o $(O)inch.o $(O)inchstr.o $(O)initscr.o \ + $(O)inopts.o $(O)insch.o $(O)insstr.o $(O)instr.o $(O)kernel.o \ + $(O)keyname.o $(O)mouse.o +PDCLIBOBJS3 = $(O)move.o $(O)outopts.o $(O)overlay.o $(O)pad.o $(O)panel.o \ + $(O)printw.o $(O)refresh.o $(O)scanw.o $(O)scr_dump.o $(O)scroll.o \ + $(O)slk.o $(O)termattr.o +PDCLIBOBJS4 = $(O)touch.o $(O)util.o $(O)window.o $(O)debug.o +PDCLIBOBJS = $(PDCLIBOBJS1) $(PDCLIBOBJS2) $(PDCLIBOBJS3) $(PDCLIBOBJS4) + +PDCOBJS = $(O)pdcclip.o $(O)pdcdisp.o $(O)pdcgetsc.o $(O)pdckbd.o \ + $(O)pdcscrn.o $(O)pdcsetsc.o $(O)pdcutil.o + +#PDCOBJS = $(O)pdcclip.o $(O)pdcdisp.o $(O)pdcgetsc.o $(O)pdckbd.o $(O)pdcscrn.o \ +# $(O)pdcsetsc.o $(O)pdcutil.o + +PDCLIB = $(O)pdcurses.a + +PDCINCL = -I$(PDCURSES_TOP) -I$(PDCSRC) -I$(PDCDOS) +else +PDCLIB = +PDCINCL = +endif + +#========================================== +# Header file macros +#========================================== + +PATCHLEV_H = $(INCL)/patchlev.h +DGN_FILE_H = $(INCL)/align.h $(INCL)/dgn_file.h +DUNGEON_H = $(INCL)/align.h $(INCL)/dungeon.h +MONDATA_H = $(INCL)/align.h $(INCL)/mondata.h +MONST_H = $(INCL)/align.h $(INCL)/monst.h $(INCL)/mextra.h +PERMONST_H = $(INCL)/monattk.h $(INCL)/monflag.h $(INCL)/align.h \ + $(INCL)/permonst.h +REGION_H = $(INCL)/region.h +RM_H = $(INCL)/align.h $(INCL)/rm.h +SKILLS_H = $(INCL)/skills.h +SP_LEV_H = $(INCL)/align.h $(INCL)/sp_lev.h +YOUPROP_H = $(PERMONST_H) $(MONDATA_H) $(INCL)/prop.h \ + $(INCL)/youprop.h +YOU_H = $(MONST_H) $(YOUPROP_H) $(INCL)/align.h \ + $(INCL)/attrib.h $(INCL)/you.h +DISPLAY_H = $(MONDATA_H) $(INCL)/vision.h $(INCL)/display.h +PCCONF_H = $(INCL)/micro.h $(INCL)/cstd.h $(INCL)/pcconf.h \ + $(MSYS)/pcvideo.h +CONFIG_H = $(GLOBAL_H) $(INCL)/fnamesiz.h $(INCL)/tradstdc.h \ + $(INCL)/config1.h $(INCL)/config.h +DECL_H = $(YOU_H) $(INCL)/spell.h $(INCL)/color.h \ + $(INCL)/obj.h $(INCL)/objects.h \ + $(INCL)/decl.h +GLOBAL_H = $(PCCONF_H) $(INCL)/coord.h $(INCL)/global.h +HACK_H = $(CONFIG_H) $(INCL)/context.h $(DUNGEON_H) \ + $(DECL_H) $(DISPLAY_H) $(INCL)/sym.h \ + $(INCL)/defsym.h $(INCL)/mkroom.h $(INCL)/objclass.h \ + $(INCL)/trap.h $(INCL)/flag.h $(RM_H) \ + $(INCL)/vision.h $(INCL)/wintype.h $(INCL)/engrave.h \ + $(INCL)/rect.h $(INCL)/hack.h $(REGION_H) \ + $(INCL)/sys.h +DLB_H = $(INCL)/dlb.h + +ifeq ($(SUPPRESS_GRAPHICS),Y) +TILE_H = +else +TILE_H = $(WSHR)/tile.h $(INCL)/tileset.h +endif + +ifeq ($(USE_DLB),Y) +DLB = dlb +DLBOBJS = $(O)dlb_main.o $(O)dlb.o $(O)alloc.o $(O)panic.o +else +DLB = +DLBOBJS = +endif + +ifdef DJGPP +DJ1 = $(dir $(DJGPP)) +CWSDPMI = $(subst /,\,$(DJ1))bin\CWSDPMI.* +endif + +#========================================== +# More compiler setup macros +#========================================== +# +ifeq "$(ADD_CURSES)" "Y" +CURSESDEF=-D"CURSES_GRAPHICS" -D"CURSES_BRIEF_INCLUDE" +ifdef WANT_DOSVGA +CURSESDEF += -DCURSES_UNICODE -DPDC_WIDE +endif +else +CURSESDEF= +CURSESLIB= +endif + +INCLDIR=$(PDCINCL) -I../include -I../sys/msdos $(LUAINCL) + +# Debugging +#cflags = -pg -c $(INCLDIR) $(DLBFLG) $(CURSESDEF) -DSUPPRESS_GRAPHICS +#LFLAGS = -pg + +cflags = -c -O $(INCLDIR) $(DLBFLG) $(CURSESDEF) -DSUPPRESS_GRAPHICS +LFLAGS = + +# Debugging +#cflags = -g -c $(INCLDIR) $(DLBFLG) $(CURSESDEF) -DTILES_IN_GLYPHMAP +#LFLAGS = -g + +# Normal +cflags = -c -O $(INCLDIR) $(DLBFLG) $(CURSESDEF) -DTILES_IN_GLYPHMAP +LFLAGS = + +#========================================== +#================ RULES ================== +#========================================== + +.SUFFIXES: .exe .o .til .uu .c .y .l + +#========================================== +# Rules for files in src +#========================================== + +$(OBJ)/%.o : /%.c + $(CC) $(cflags) -o$@ $< + +$(OBJ)/%.o : $(SRC)/%.c + $(CC) $(cflags) -o$@ $< + +#========================================== +# Rules for files in sys/share +#========================================== + +$(OBJ)/%.o : $(SSHR)/%.c + $(CC) $(cflags) -o$@ $< + +#========================================== +# Rules for files in sys/msdos +#========================================== + +$(OBJ)/%.o : $(MSYS)/%.c + $(CC) $(cflags) -I../sys/msdos -o$@ $< + +#========================================== +# Rules for files in util +#========================================== + +$(OBJ)/%.o : $(UTIL)/%.c + $(CC) $(cflags) -o$@ $< + +#========================================== +# Rules for files in win/share +#========================================== + +$(OBJ)/%.o : $(WSHR)/%.c + $(CC) $(cflags) -I../win/share -o$@ $< + +#{$(WSHR)}.txt{$(DAT)}.txt: +# copy $< $@ + +#========================================== +# Rules for files in win/tty +#========================================== + +$(OBJ)/%.o : $(TTY)/%.c + $(CC) $(cflags) -o$@ $< + +#========================================== +# Rules for files in win/curses +#========================================== + +$(OBJ)/%.o : $(WCURSES)/%.c + $(CC) -DPDC_NCMOUSE $(cflags) -o$@ $< + +#========================================== +# Rules for files in PDCurses +#========================================== + +$(OBJ)/%.o : $(PDCURSES_TOP)/%.c + $(CC) $(cflags) -o$@ $< + +$(OBJ)/%.o : $(PDCSRC)/%.c + $(CC) $(cflags) -o$@ $< + +$(OBJ)/%.o : $(PDCDOS)/%.c + $(CC) $(cflags) -o$@ $< + +#========================================== +# Rules for LUA files +#========================================== + +$(OBJ)/%.o : $(LUASRC)/%.c + $(CC) $(cflags) -o$@ $< + +#========================================== +# Primary Targets. +#========================================== + +# The default target. + +all : install + +install: $(GAMEFILE) $(O)install.tag + @echo Done. + +default: $(GAMEFILE) + +util: $(O)utility.tag + +$(O)utility.tag: $(INCL)/date.h $(INCL)/trap.h $(INCL)/objects.h \ + $(TILEUTIL) + $(subst /,\,echo utilities made > $@) + +tileutil: $(U)gif2txt.exe $(U)txt2ppm.exe + @echo Optional tile development utilities are up to date. + +recover: $(U)recover.exe + @$(subst /,\,if exist $(U)recover.exe copy $(U)recover.exe $(GAMEDIR)) + @$(subst /,\,if exist $(DOC)/recover.txt copy $(DOC)/recover.txt $(GAMEDIR)) + +$(O)install.tag: $(O)dat.tag $(O)fonts.tag $(GAMEFILE) +ifeq ($(USE_DLB),Y) + @$(subst /,\,copy $(DAT)/nhdat $(GAMEDIR)) + @$(subst /,\,copy $(DAT)/license $(GAMEDIR)) +else + @$(subst /,\,copy $(DAT)/*. $(GAMEDIR)) + @$(subst /,\,copy $(DAT)/*.dat $(GAMEDIR)) + @$(subst /,\,copy $(DAT)/*.lua $(GAMEDIR)) + @$(subst /,\,copy $(MSYS)/msdoshlp.txt $(GAMEDIR)) + @$(subst /,\,if exist $(GAMEDIR)/makefile. del $(GAMEDIR)/makefile.) +endif +ifdef TERMLIB + @$(subst /,\,copy $(SSHR)/termcap $(GAMEDIR)) +endif + @$(subst /,\,if exist $(TILE_BMP) copy $(TILE_BMP) $(GAMEDIR)) + @$(subst /,\,if exist $(DAT)/symbols copy $(DAT)/symbols $(GAMEDIR)) + @$(subst /,\,copy $(SSHR)/NetHack.cnf $(GAMEDIR)/defaults.nh) + -@$(subst /,\,touch $(GAMEDIR)/record) + @$(subst /,\,copy $(DOC)/guideb*.txt $(GAMEDIR)) + @$(subst /,\,copy $(MSYS)/sysconf $(GAMEDIR)) + @$(subst /,\,if not exist $(GAMEDIR)/sysconf touch $(GAMEDIR)/sysconf) + @$(subst /,\,if exist $(DOC)/nethack.txt copy $(DOC)/nethack.txt $(GAMEDIR)) +ifdef CWSDPMI + @$(subst /,\,if exist $(CWSDPMI) copy $(CWSDPMI) $(GAMEDIR)) +else + @$(subst /,\,echo Could not find a copy of CWSDPMI.EXE to put into $(GAMEDIR)) +endif + @$(subst /,\,copy $(MSYS)/fonts/*.psf $(GAMEDIR)) + @$(subst /,\,echo install done > $@) + +#========================================== +# The main target. +#========================================== + +$(GAMEFILE): $(O)obj.tag $(PATCHLEV_H) $(PDCLIB) $(LUATARGETS) \ + $(O)utility.tag $(ALLOBJ) + @if exist temp.a del temp.a + @ar ruS temp.a $(VOBJ01) + @ar ruS temp.a $(VOBJ02) + @ar ruS temp.a $(VOBJ03) + @ar ruS temp.a $(VOBJ04) + @ar ruS temp.a $(VOBJ05) + @ar ruS temp.a $(VOBJ06) + @ar ruS temp.a $(VOBJ07) + @ar ruS temp.a $(VOBJ08) + @ar ruS temp.a $(VOBJ09) + @ar ruS temp.a $(VOBJ10) + @ar ruS temp.a $(VOBJ11) + @ar ruS temp.a $(VOBJ12) + @ar ruS temp.a $(VOBJ13) + @ar ruS temp.a $(VOBJ14) + @ar ruS temp.a $(VOBJ15) + @ar ruS temp.a $(VOBJ16) + @ar ruS temp.a $(VOBJ17) + @ar ruS temp.a $(VOBJ18) + @ar ruS temp.a $(VOBJ19) + @ar ruS temp.a $(VOBJ20) + @ar ruS temp.a $(VOBJ21) + @ar ruS temp.a $(VOBJ22) + @ar ruS temp.a $(VOBJ23) + @ar ruS temp.a $(VOBJ24) + @ar ruS temp.a $(VOBJ25) + @ar ruS temp.a $(SOBJ) + @ar ruS temp.a $(TILOBJ) + @ar ruS temp.a $(TILOBJ2) + @ar ruS temp.a $(VVOBJ) + @ar ruS temp.a $(LUAOBJ) +ifeq "$(ADD_CURSES)" "Y" + @ar ruS temp.a $(CURSESOBJ) +endif + @ranlib temp.a + $(LINK) $(LFLAGS) -o$(GAME).exe temp.a \ + $(PDCLIB) $(LUALIB) $(LIBRARIES) $(ZLIB) + @$(subst /,\,stubedit $(GAME).exe minstack=2048K) + @$(subst /,\,copy $(GAME).exe $(GAMEFILE)) + @$(subst /,\,del $(GAME).exe) + +#========================================== +#=========== SECONDARY TARGETS ============ +#========================================== +# +# The following include files depend on makedefs to be created. +# +# date.h should be remade every time any of the source or include +# files is modified. + + +$(INCL)/date.h : $(U)makedefs.exe + -$(subst /,\,$(U)makedefs -v) + +$(INCL)/onames.h: $(U)makedefs.exe + -$(subst /,\,$(U)makedefs -o) + +$(INCL)/pm.h: $(U)makedefs.exe + -$(subst /,\,$(U)makedefs -p) + +#========================================== +# Makedefs Stuff +#========================================== + +$(U)makedefs.exe: $(MAKEDEFSOBJS) + $(LINK) $(LFLAGS) -o$@ $(MAKEDEFSOBJS) + +$(O)makedefs.o: $(CONFIG_H) $(PERMONST_H) $(INCL)/objclass.h \ + $(INCL)/sym.h $(INCL)/defsym.h $(U)makedefs.c + +#========================================== +# Recover Utility +#========================================== + +$(U)recover.exe: $(RECOVOBJS) + $(LINK) $(LFLAGS) -o$@ $(O)recover.o + +$(O)recover.o: $(CONFIG_H) $(U)recover.c + $(CC) $(cflags) -o$@ $(U)recover.c + +#========================================== +# Header file moves required for tile support +#========================================== + +ifeq ($(SUPPRESS_GRAPHICS),Y) + +else +# +# Tile Mapping +# + +$(SRC)/tile.c: $(U)tilemap.exe + @$(subst /,\,$(U)tilemap.exe) + @echo A new $@ has been created + +TILEMAPOBJS = $(O)tilemap.o $(O)monst.o $(O)objects.o $(O)drawing.o + +$(U)tilemap.exe: $(TILEMAPOBJS) + $(LINK) $(LFLAGS) -o$@ $(TILEMAPOBJS) + +$(O)tilemap.o: $(WSHR)/tilemap.c $(HACK_H) $(TILE_H) + $(CC) $(cflags) -I$(WSHR) -I$(MSYS) -o$@ $(WSHR)/tilemap.c + +endif + +#========================================== +# Tile Utilities +# Required for tile support +#========================================== + +$(DAT)/nhtiles.bmp: $(TILEFILES) $(U)tile2bmp.exe + @echo Creating binary tile files (this may take some time) + @$(subst /,\,chdir $(DAT)) + @$(subst /,\,$(U)tile2bmp.exe $@) + @$(subst /,\,chdir $(SRC)) + +$(U)tile2bmp.exe: $(O)tile2bmp.o $(TEXTIO) + -rm -f temp.a + @ar ru temp.a $(TEXTIO) + $(LINK) $(LFLAGS) -o$@ $(O)tile2bmp.o temp.a + +$(U)tile2bin.exe: $(O)tile2bin.o $(TEXTIO) + -rm -f temp.a + @ar ru temp.a $(TEXTIO) + $(LINK) $(LFLAGS) -o$@ $(O)tile2bin.o temp.a + +$(U)til2bin2.exe: $(O)til2bin2.o $(TEXTIO2) + -rm -f temp.a + @ar ru temp.a $(TEXTIO2) + $(LINK) $(LFLAGS) -o$@ $(O)til2bin2.o temp.a + +$(U)thintile.exe: $(O)thintile.o + $(LINK) $(LFLAGS) -o$@ $(O)thintile.o + +$(O)thintile.o: $(HACK_H) $(WSHR)/tile.h $(WSHR)/thintile.c + $(CC) $(cflags) -o$@ $(WSHR)/thintile.c + +$(O)thintile.tag: $(U)thintile.exe $(TILEFILES) + @$(subst /,\,$(U)thintile.exe) + @$(subst /,\,echo thintiles created >$@) + +$(O)tile2bmp.o: $(HACK_H) $(TILE_H) $(WSHR)/tile2bmp.c + $(CC) $(cflags) -I$(MSYS) -I$(WSHR) -o$@ $(WSHR)/tile2bmp.c + +$(O)tile2bin.o: $(HACK_H) $(TILE_H) $(MSYS)/pctiles.h $(MSYS)/pcvideo.h $(MSYS)/tile2bin.c + $(CC) $(cflags) -I$(MSYS) -I$(WSHR) -o$@ $(MSYS)/tile2bin.c + +$(O)til2bin2.o: $(HACK_H) $(TILE_H) $(MSYS)/pctiles.h $(MSYS)/pcvideo.h $(MSYS)/tile2bin.c + $(CC) $(cflags) -I$(MSYS) -I$(WSHR) -DTILE_X=8 -DOVERVIEW_FILE -o$@ $(MSYS)/tile2bin.c + +$(O)tiletext.o: $(CONFIG_H) $(TILE_H) $(WSHR)/tiletext.c + $(CC) $(cflags) -I$(MSYS) -I$(WSHR) -o$@ $(WSHR)/tiletext.c + +$(O)tiletex2.o: $(CONFIG_H) $(TILE_H) $(WSHR)/tiletext.c + $(CC) $(cflags) -I$(MSYS) -I$(WSHR) -DTILE_X=8 -o$@ $(WSHR)/tiletext.c + +$(O)tiletxt.o: $(CONFIG_H) $(TILE_H) $(WSHR)/tilemap.c + $(CC) $(cflags) -I$(MSYS) -I$(WSHR) -DTILETEXT -o$@ $(WSHR)/tilemap.c + +$(O)tiletxt2.o: $(CONFIG_H) $(TILE_H) $(WSHR)/tilemap.c + $(CC) $(cflags) -I$(MSYS) -I$(WSHR) -DTILETEXT -DTILE_X=8 -o$@ $(WSHR)/tilemap.c +# +# Optional GIF Utilities (for development) +# + +$(U)gif2txt.exe: $(GIFREADERS) $(TEXTIO) + $(LINK) $(LFLAGS) -o$@ $(GIFREADERS) $(TEXTIO) + +$(U)gif2txt2.exe: $(GIFREAD2) $(TEXTIO2) + $(LINK) $(LFLAGS) -o$@ $(GIFREAD2) $(TEXTIO2) + +$(U)txt2ppm.exe: $(PPMWRITERS) $(TEXTIO) + $(LINK) $(LFLAGS) -o$@ $(PPMWRITERS) $(TEXTIO) + +$(U)txt2ppm2.exe: $(PPMWRIT2) $(TEXTIO2) + $(LINK) $(LFLAGS) -o$@ $(PPMWRIT2) $(TEXTIO2) + +$(O)gifread.o: $(CONFIG_H) $(WSHR)/tile.h $(WSHR)/gifread.c + +$(O)gifread2.o: $(CONFIG_H) $(WSHR)/tile.h $(WSHR)/gifread.c + $(CC) $(cflags) -DTILE_X=8 -o$@ $(WSHR)/gifread.c + +ppmwrite.c: $(WSHR)/ppmwrite.c + @$(subst /,\,copy $(WSHR)/ppmwrite.c .) + +$(O)ppmwrite.o: $(CONFIG_H) $(WSHR)/tile.h + +$(O)ppmwrit2.o: $(CONFIG_H) $(WSHR)/tile.h ppmwrite.c + $(CC) $(cflags) -DTILE_X=8 -o$@ ppmwrite.c + +# +# Optional tile viewer (development sources only) +# + +$(U)viewtib.exe: $(O)viewtib.o + $(LINK) $(LFLAGS) -o$@ $(O)viewtib.o $(LIBRARIES) + +$(O)viewtib.o: $(MSYS)/viewtib.c + +#========================================== +# PDCurses Library +#========================================== + +$(O)pdcurses.a : $(PDCLIBOBJS) $(PDCOBJS) + ar rcS $@ $(PDCLIBOBJS1) + ar rcS $@ $(PDCLIBOBJS2) + ar rcS $@ $(PDCLIBOBJS3) + ar rcS $@ $(PDCLIBOBJS4) + ar rcs $@ $(PDCOBJS) + +#========================================== +# Other Util Dependencies. +#========================================== + +$(O)alloc.o: $(CONFIG_H) alloc.c + $(CC) $(cflags) -o$@ alloc.c + +$(O)drawing.o: $(CONFIG_H) drawing.c $(MSYS)/pcvideo.h + $(CC) $(cflags) -I$(MSYS) -o$@ drawing.c + +$(O)decl.o: $(CONFIG_H) decl.c + $(CC) $(cflags) -o$@ decl.c + +$(O)monst.o: $(CONFIG_H) $(PERMONST_H) $(INCL)/sym.h \ + $(INCL)/defsym.h $(INCL)/color.h monst.c + $(CC) $(cflags) -o$@ monst.c + +$(O)objects.o: $(CONFIG_H) $(INCL)/obj.h $(INCL)/objclass.h \ + $(INCL)/prop.h $(INCL)/color.h objects.c + $(CC) $(cflags) -o$@ objects.c + +$(O)panic.o: $(CONFIG_H) $(U)panic.c + +#============================================================ +# make data.base an 8.3 filename to prevent an make warning +#============================================================ + +DATABASE = $(DAT)/data.bas + + +$(O)dat.tag: $(DAT)/nhdat + @$(subst /,\,echo dat done >$@) + +$(DAT)/data: $(O)utility.tag $(DATABASE) + @$(subst /,\,$(U)makedefs.exe -d) + +$(DAT)/rumors: $(O)utility.tag $(DAT)/rumors.tru $(DAT)/rumors.fal + @$(subst /,\,$(U)makedefs.exe -r) + +$(DAT)/oracles: $(O)utility.tag $(DAT)/oracles.txt + @$(subst /,\,$(U)makedefs.exe -h) + +$(DAT)/bogusmon: $(O)utility.tag $(DAT)/bogusmon.txt + @$(subst /,\,$(U)makedefs.exe -s) + +$(DAT)/engrave: $(O)utility.tag $(DAT)/engrave.txt + @$(subst /,\,$(U)makedefs.exe -s) + +$(DAT)/epitaph: $(O)utility.tag $(DAT)/epitaph.txt + @$(subst /,\,$(U)makedefs.exe -s) + +$(O)sp_lev.tag: $(O)utility.tag + @$(subst /,\,echo sp_levs done > $@) + +#========================================== +# DLB stuff +#========================================== + +#note that dir below assumes bin/dir.exe from djgpp distribution +# +$(DAT)/nhdat: $(U)dlb_main.exe $(DAT)/data $(DAT)/rumors \ + $(DAT)/oracles \ + $(QUEST_DAT) \ + $(O)sp_lev.tag \ + $(DAT)/bogusmon $(DAT)/engrave $(DAT)/epitaph $(DAT)/tribute + @$(subst /,\,echo dat done >$(O)dat.tag) + @$(subst /,\,cd $(DAT)) + @$(subst /,\,copy $(MSYS)/msdoshlp.txt .) + @$(LS) data oracles options rumors help hh >dlb.lst + @$(LS) cmdhelp history opthelp optmenu wizhelp license msdoshlp.txt >>dlb.lst + @$(LS) bogusmon engrave epitaph tribute >>dlb.lst + $(LS) $(subst /,\,*.lua) >>dlb.lst + @$(subst /,\,$(U)dlb_main cvIf dlb.lst nhdat) + @$(subst /,\,cd $(SRC)) + +$(U)dlb_main.exe: $(DLBOBJS) + $(LINK) $(LFLAGS) -o$@ $(DLBOBJS) + +$(O)dlb_main.o: $(U)dlb_main.c $(INCL)/config.h $(DLB_H) + $(CC) $(cflags) -o$@ $(U)dlb_main.c + +#============================================================= +# LUA +#============================================================= + +lua.exe: $(O)lua.o $(LUALIB) + $(CC) $(LFLAGS) -o$@ $(O)lua.o $(LUALIB) + +luac.exe: $(O)luac.o $(O)lua$(LUAVER)s.a + $(CC) $(LFLAGSU) -o$@ $(O)luac.o $(LUALIB) + +$(O)lua$(LUAVER)s.a: $(LUAOBJFILES) + ar rcS $@ $(LUAOBJFILES1) + ar rcS $@ $(LUAOBJFILES2) + ar rcs $@ $(LUAOBJFILES3) + +$(O)lua.o: $(LUASRC)/lua.c +$(O)luac.o: $(LUASRC)/luac.c + +#========================================== +# Fonts for Unicode support +#========================================== + +$(O)fonts.tag: lua.exe $(MSYS)/fonts/makefont.lua + lua $(MSYS)/fonts/makefont.lua $(FONTTOP)/ter-u16b.bdf $(MSYS)/fonts/ter-u16b.psf + lua $(MSYS)/fonts/makefont.lua $(FONTTOP)/ter-u16v.bdf $(MSYS)/fonts/ter-u16v.psf + lua $(MSYS)/fonts/makefont.lua $(FONTTOP)/ter-u18b.bdf $(MSYS)/fonts/ter-u18b.psf + lua $(MSYS)/fonts/makefont.lua $(FONTTOP)/ter-u20b.bdf $(MSYS)/fonts/ter-u20b.psf + lua $(MSYS)/fonts/makefont.lua $(FONTTOP)/ter-u22b.bdf $(MSYS)/fonts/ter-u22b.psf + lua $(MSYS)/fonts/makefont.lua $(FONTTOP)/ter-u24b.bdf $(MSYS)/fonts/ter-u24b.psf + lua $(MSYS)/fonts/makefont.lua $(FONTTOP)/ter-u28b.bdf $(MSYS)/fonts/ter-u28b.psf + lua $(MSYS)/fonts/makefont.lua $(FONTTOP)/ter-u32b.bdf $(MSYS)/fonts/ter-u32b.psf + @echo Fonts done >$(O)fonts.tag + +#========================================== +# Housekeeping. +#========================================== + +clean: + $(subst /,\,if exist $(O)*.o del $(O)*.o) + $(subst /,\,if exist $(O)dat.tag del $(O)dat.tag) + $(subst /,\,if exist $(O)fonts.tag del $(O)fonts.tag) + $(subst /,\,if exist $(MSYS)/fonts/*.psf del $(MSYS)/fonts/*.psf) + $(subst /,\,if exist $(O)install.tag del $(O)install.tag) + $(subst /,\,if exist $(O)$(GAME).lnk del $(O)$(GAME).lnk) + $(subst /,\,if exist $(O)obj.tag del $(O)obj.tag) + $(subst /,\,if exist $(O)sp_lev.tag del $(O)sp_lev.tag) + $(subst /,\,if exist $(O)thintile.tag del $(O)thintile.tag) + $(subst /,\,if exist $(O)utility.tag del $(O)utility.tag) + $(subst /,\,if exist temp.a del temp.a) + +spotless: clean + + $(subst /,\,if exist $(U)makedefs.exe del $(U)makedefs.exe) + $(subst /,\,if exist $(U)recover.exe del $(U)recover.exe) + $(subst /,\,if exist $(U)tilemap.exe del $(U)tilemap.exe) + $(subst /,\,if exist $(U)tile2bmp.exe del $(U)tile2bmp.exe) + $(subst /,\,if exist $(U)tile2bin.exe del $(U)tile2bin.exe) + $(subst /,\,if exist $(U)til2bin2.exe del $(U)til2bin2.exe) + $(subst /,\,if exist $(U)thintile.exe del $(U)thintile.exe) + $(subst /,\,if exist $(U)dlb_main.exe del $(U)dlb_main.exe) + $(subst /,\,if exist $(INCL)/onames.h del $(INCL)/onames.h) + $(subst /,\,if exist $(INCL)/pm.h del $(INCL)/pm.h) + $(subst /,\,if exist $(INCL)/date.h del $(INCL)/date.h) + $(subst /,\,if exist $(SRC)/tile.c del $(SRC)/tile.c) + $(subst /,\,if exist $(DAT)/options del $(DAT)/options) + $(subst /,\,if exist $(DAT)/data del $(DAT)/data) + $(subst /,\,if exist $(DAT)/rumors del $(DAT)/rumors) + $(subst /,\,if exist $(DAT)/oracles del $(DAT)/oracles) +ifndef LUA_QTEXT_FILE + $(subst /,\,if exist $(DAT)/quest.dat del $(DAT)/quest.dat) +endif + $(subst /,\,if exist $(DAT)/bogusmon del $(DAT)/bogusmon) + $(subst /,\,if exist $(DAT)/engrave del $(DAT)/engrave) + $(subst /,\,if exist $(DAT)/epitaph del $(DAT)/epitaph) + $(subst /,\,if exist $(DAT)/dlb.lst del $(DAT)/dlb.lst) + $(subst /,\,if exist $(DAT)/nhdat del $(DAT)/nhdat) + $(subst /,\,if exist $(TILE_BMP) del $(TILE_BMP)) + $(subst /,\,if exist $(WSHR)/monthin.txt del $(WSHR)/monthin.txt) + $(subst /,\,if exist $(WSHR)/objthin.txt del $(WSHR)/objthin.txt) + $(subst /,\,if exist $(WSHR)/oththin.txt del $(WSHR)/oththin.txt) + +#========================================== +# Create directory for holding object files +#========================================== + +$(O)obj.tag: + -$(subst /,\,@if not exist $(OBJ)/*.* mkdir $(OBJ)) + @$(subst /,\,@echo directory created > $@) + +#=========================================== +# Work around some djgpp long file name woes +#=========================================== + +$(PATCHLEV_H): + @$(subst /,\,if not exist $@ copy $(INCL)/patchlevel.h $(INCL)/patchlev.h) + +#========================================== +# Game Dependencies +#========================================== + +# sys/share +$(O)main.o: $(HACK_H) $(DLB_H) $(SSHR)/pcmain.c + $(CC) $(cflags) -o$@ $(SSHR)/pcmain.c + +$(O)tty.o: $(HACK_H) $(INCL)/wintty.h $(SSHR)/pctty.c + $(CC) $(cflags) -o$@ $(SSHR)/pctty.c + +$(O)unix.o: $(HACK_H) $(SSHR)/pcunix.c + $(CC) $(cflags) -o$@ $(SSHR)/pcunix.c + +#$(O)pcsys.o : $(HACK_H) $(SSHR)/pcsys.c +# $(CC) $(cflags) -o$@ $(SSHR)/pcsys.c + +$(O)posixreg.o : $(HACK_H) $(SSHR)/posixreg.c + $(CC) $(cflags) -o$@ $(SSHR)/posixreg.c + +#$(O)cppregex.o : $(HACK_H) $(SSHR)/cppregex.cpp +# gpp $(cflags) -std=c++11 -o$@ $(SSHR)/cppregex.cpp + +$(O)pmatchre.o : $(HACK_H) $(SSHR)/pmatchre.c + $(CC) $(cflags) -o$@ $(SSHR)/pmatchre.c + +# sys/msdos +$(O)msdos.o : $(HACK_H) $(MSYS)/msdos.c +# $(CC) $(cflags) -o$@ $(MSYS)/msdos.c + +$(O)pckeys.o : $(HACK_H) $(MSYS)/pckeys.c +# $(CC) $(cflags) -o$@ $(MSYS)/pckeys.c + +$(O)pctiles.o : $(HACK_H) $(MSYS)/pctiles.c $(MSYS)/portio.h + $(CC) $(cflags) -I$(MSYS) -I$(WSHR) -o$@ $(MSYS)/pctiles.c + +$(O)video.o : $(HACK_H) $(MSYS)/pcvideo.h $(MSYS)/portio.h $(MSYS)/video.c +# $(CC) $(cflags) -o$@ -I$(MSYS) $(MSYS)/video.c + +$(O)vidvga.o : $(HACK_H) $(MSYS)/pcvideo.h $(MSYS)/portio.h $(TILE_H) $(MSYS)/vidvga.c + $(CC) $(cflags) -I$(MSYS) -I$(WSHR) -o$@ $(MSYS)/vidvga.c + +$(O)vidvesa.o : $(HACK_H) $(MSYS)/pcvideo.h $(MSYS)/portio.h $(TILE_H) $(MSYS)/vidvesa.c + $(CC) $(cflags) -I$(MSYS) -I$(WSHR) -o$@ $(MSYS)/vidvesa.c + +$(O)vidtxt.o : $(HACK_H) $(MSYS)/pcvideo.h $(MSYS)/portio.h $(TILE_H) $(MSYS)/vidtxt.c +# $(CC) $(cflags) -o$@ -I$(MSYS) $(MSYS)/vidtxt.c + +$(O)font.o : $(HACK_H) $(MSYS)/font.h $(MSYS)/font.c + $(CC) $(cflags) -I$(MSYS) -I$(WSHR) -o$@ $(MSYS)/font.c + +$(O)stubvid.o : $(HACK_H) $(MSYS)/pcvideo.h $(MSYS)/video.c + $(CC) $(cflags) -I$(MSYS) -DSTUBVIDEO -o$@ $(MSYS)/video.c + +# Dependencies + +$(O)pmatchre.o: $(SSHR)/pmatchre.c $(HACK_H) +$(O)tileset.o: $(WSHR)/tileset.c $(HACK_H) +$(O)bmptiles.o: $(WSHR)/bmptiles.c $(INCL)/config.h $(INCL)/tileset.h $(INCL)/integer.h +$(O)giftiles.o: $(WSHR)/giftiles.c $(INCL)/config.h $(INCL)/tileset.h $(INCL)/integer.h +$(O)dlb.o: dlb.c $(CONFIG_H) $(INCL)/dlb.h + $(CC) $(cflags) -I../sys/msdos -o$@ dlb.c + +# +# The rest are stolen from sys/unix/Makefile.src, +# with the following changes: +# * The CONFIG_H and HACK_H sections commented out. +# * dlb.o is commented out because there's a rule above that includes +# a .h file in ../sys/msdos. +# * Window.o for X11 is commented out. +# Other than that, these dependencies are untouched. +# That means that there is some irrelevant stuff in here, but maintenance should be +# easier. +# +TARGETPFX=$(O) +TARGET_CC=$(CC) +TARGET_CFLAGS=$(cflags) +# +# DO NOT DELETE THIS LINE OR CHANGE ANYTHING BEYOND IT + +# config.h timestamp +#$(CONFIG_H): ../include/config.h ../include/config1.h ../include/patchlevel.h \ +# ../include/tradstdc.h ../include/integer.h \ +# ../include/global.h ../include/coord.h ../include/vmsconf.h \ +# ../include/cstd.h ../include/nhlua.h ../include/unixconf.h \ +# ../include/pcconf.h ../include/micro.h ../include/windconf.h \ +# ../include/warnings.h ../include/fnamesiz.h +# touch $(CONFIG_H) +# hack.h timestamp +#$(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.h \ +# ../include/dungeon.h ../include/wintype.h ../include/sym.h \ +# ../include/defsym.h ../include/mkroom.h ../include/artilist.h \ +# ../include/objclass.h ../include/objects.h \ +# ../include/youprop.h ../include/prop.h ../include/permonst.h \ +# ../include/monattk.h ../include/monflag.h \ +# ../include/monsters.h ../include/mondata.h \ +# ../include/context.h ../include/rm.h ../include/botl.h \ +# ../include/rect.h ../include/region.h ../include/trap.h \ +# ../include/display.h ../include/vision.h ../include/color.h \ +# ../include/decl.h ../include/quest.h ../include/spell.h \ +# ../include/obj.h ../include/engrave.h ../include/you.h \ +# ../include/attrib.h ../include/monst.h ../include/mextra.h \ +# ../include/skills.h ../include/timeout.h ../include/flag.h \ +# ../include/winprocs.h ../include/sys.h +# touch $(HACK_H) +# +$(TARGETPFX)pcmain.o: ../sys/share/pcmain.c $(HACK_H) ../include/dlb.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../sys/share/pcmain.c +$(TARGETPFX)pcsys.o: ../sys/share/pcsys.c $(HACK_H) ../include/wintty.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../sys/share/pcsys.c +$(TARGETPFX)pctty.o: ../sys/share/pctty.c $(HACK_H) ../include/wintty.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../sys/share/pctty.c +$(TARGETPFX)pcunix.o: ../sys/share/pcunix.c $(HACK_H) ../include/wintty.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../sys/share/pcunix.c +$(TARGETPFX)pmatchregex.o: ../sys/share/pmatchregex.c $(HACK_H) + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../sys/share/pmatchregex.c +$(TARGETPFX)posixregex.o: ../sys/share/posixregex.c $(HACK_H) + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../sys/share/posixregex.c +$(TARGETPFX)random.o: ../sys/share/random.c $(HACK_H) + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../sys/share/random.c +$(TARGETPFX)ioctl.o: ../sys/share/ioctl.c $(HACK_H) ../include/tcap.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../sys/share/ioctl.c +$(TARGETPFX)unixtty.o: ../sys/share/unixtty.c $(HACK_H) + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../sys/share/unixtty.c +$(TARGETPFX)unixmain.o: ../sys/unix/unixmain.c $(HACK_H) ../include/dlb.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../sys/unix/unixmain.c +$(TARGETPFX)unixunix.o: ../sys/unix/unixunix.c $(HACK_H) + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../sys/unix/unixunix.c +$(TARGETPFX)unixres.o: ../sys/unix/unixres.c $(CONFIG_H) + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../sys/unix/unixres.c +$(TARGETPFX)getline.o: ../win/tty/getline.c $(HACK_H) ../include/wintty.h \ + ../include/func_tab.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/tty/getline.c +$(TARGETPFX)termcap.o: ../win/tty/termcap.c $(HACK_H) ../include/wintty.h \ + ../include/tcap.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/tty/termcap.c +$(TARGETPFX)topl.o: ../win/tty/topl.c $(HACK_H) ../include/tcap.h \ + ../include/wintty.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/tty/topl.c +$(TARGETPFX)wintty.o: ../win/tty/wintty.c $(HACK_H) ../include/dlb.h \ + ../include/tcap.h ../include/wintty.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/tty/wintty.c +$(TARGETPFX)cursmain.o: ../win/curses/cursmain.c $(HACK_H) ../include/wincurs.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/curses/cursmain.c +$(TARGETPFX)curswins.o: ../win/curses/curswins.c $(HACK_H) \ + ../include/wincurs.h ../win/curses/curswins.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/curses/curswins.c +$(TARGETPFX)cursmisc.o: ../win/curses/cursmisc.c $(HACK_H) \ + ../include/wincurs.h ../win/curses/cursmisc.h \ + ../include/func_tab.h ../include/dlb.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/curses/cursmisc.c +$(TARGETPFX)cursdial.o: ../win/curses/cursdial.c $(HACK_H) \ + ../include/wincurs.h ../win/curses/cursdial.h \ + ../include/func_tab.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/curses/cursdial.c +$(TARGETPFX)cursstat.o: ../win/curses/cursstat.c $(HACK_H) \ + ../include/wincurs.h ../win/curses/cursstat.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/curses/cursstat.c +$(TARGETPFX)cursinit.o: ../win/curses/cursinit.c $(HACK_H) \ + ../include/wincurs.h ../win/curses/cursinit.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/curses/cursinit.c +$(TARGETPFX)cursmesg.o: ../win/curses/cursmesg.c $(HACK_H) \ + ../include/wincurs.h ../win/curses/cursmesg.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/curses/cursmesg.c +$(TARGETPFX)cursinvt.o: ../win/curses/cursinvt.c $(HACK_H) \ + ../include/wincurs.h ../win/curses/cursinvt.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/curses/cursinvt.c +#$(TARGETPFX)Window.o: ../win/X11/Window.c ../include/xwindowp.h \ +# ../include/xwindow.h $(CONFIG_H) ../include/lint.h \ +# ../include/winX.h ../include/color.h ../include/wintype.h +# $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/Window.c +$(TARGETPFX)dialogs.o: ../win/X11/dialogs.c $(CONFIG_H) ../include/lint.h \ + ../include/winX.h ../include/color.h ../include/wintype.h + $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/dialogs.c +$(TARGETPFX)winX.o: ../win/X11/winX.c $(HACK_H) ../include/winX.h \ + ../include/dlb.h ../include/xwindow.h ../win/X11/nh72icon \ + ../win/X11/nh56icon ../win/X11/nh32icon + $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/winX.c +$(TARGETPFX)winmap.o: ../win/X11/winmap.c ../include/xwindow.h $(HACK_H) \ + ../include/dlb.h ../include/winX.h ../include/tile2x11.h + $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/winmap.c +$(TARGETPFX)winmenu.o: ../win/X11/winmenu.c $(HACK_H) ../include/winX.h + $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/winmenu.c +$(TARGETPFX)winmesg.o: ../win/X11/winmesg.c ../include/xwindow.h $(HACK_H) \ + ../include/winX.h + $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/winmesg.c +$(TARGETPFX)winmisc.o: ../win/X11/winmisc.c $(HACK_H) ../include/func_tab.h \ + ../include/winX.h + $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/winmisc.c +$(TARGETPFX)winstat.o: ../win/X11/winstat.c $(HACK_H) ../include/winX.h \ + ../include/xwindow.h + $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/winstat.c +$(TARGETPFX)wintext.o: ../win/X11/wintext.c $(HACK_H) ../include/winX.h \ + ../include/xwindow.h + $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/wintext.c +$(TARGETPFX)winval.o: ../win/X11/winval.c $(HACK_H) ../include/winX.h + $(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/winval.c +$(TARGETPFX)tile.o: tile.c $(HACK_H) +$(TARGETPFX)winshim.o: ../win/shim/winshim.c $(HACK_H) + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/shim/winshim.c +$(TARGETPFX)cppregex.o: ../sys/share/cppregex.cpp $(CONFIG_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../sys/share/cppregex.cpp +$(TARGETPFX)qt_bind.o: ../win/Qt/qt_bind.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_bind.h ../win/Qt/qt_main.h \ + ../win/Qt/qt_kde0.h ../win/Qt/qt_click.h ../win/Qt/qt_delay.h \ + ../win/Qt/qt_xcmd.h ../win/Qt/qt_key.h ../win/Qt/qt_map.h \ + ../win/Qt/qt_win.h ../win/Qt/qt_clust.h ../win/Qt/qt_menu.h \ + ../win/Qt/qt_rip.h ../win/Qt/qt_msg.h ../win/Qt/qt_plsel.h \ + ../win/Qt/qt_svsel.h ../win/Qt/qt_set.h ../win/Qt/qt_stat.h \ + ../win/Qt/qt_icon.h ../win/Qt/qt_streq.h ../win/Qt/qt_line.h \ + ../win/Qt/qt_yndlg.h ../win/Qt/qt_str.h ../include/dlb.h \ + $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_bind.cpp +$(TARGETPFX)qt_click.o: ../win/Qt/qt_click.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_click.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_click.cpp +$(TARGETPFX)qt_clust.o: ../win/Qt/qt_clust.cpp ../win/Qt/qt_clust.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_clust.cpp +$(TARGETPFX)qt_delay.o: ../win/Qt/qt_delay.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_delay.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_delay.cpp +$(TARGETPFX)qt_glyph.o: ../win/Qt/qt_glyph.cpp $(HACK_H) \ + ../include/tile2x11.h ../win/Qt/qt_pre.h ../win/Qt/qt_post.h \ + ../win/Qt/qt_glyph.h ../win/Qt/qt_bind.h ../win/Qt/qt_main.h \ + ../win/Qt/qt_kde0.h ../win/Qt/qt_set.h ../win/Qt/qt_inv.h \ + ../win/Qt/qt_map.h ../win/Qt/qt_win.h ../win/Qt/qt_clust.h \ + ../win/Qt/qt_str.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_glyph.cpp +$(TARGETPFX)qt_icon.o: ../win/Qt/qt_icon.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_icon.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_icon.cpp +$(TARGETPFX)qt_inv.o: ../win/Qt/qt_inv.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_inv.h ../win/Qt/qt_glyph.h \ + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_set.h \ + ../win/Qt/qt_bind.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_inv.cpp +$(TARGETPFX)qt_key.o: ../win/Qt/qt_key.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_key.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_key.cpp +$(TARGETPFX)qt_line.o: ../win/Qt/qt_line.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_line.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_line.cpp +$(TARGETPFX)qt_main.o: ../win/Qt/qt_main.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ + qt_main.moc ../win/Qt/qt_bind.h ../win/Qt/qt_glyph.h \ + ../win/Qt/qt_inv.h ../win/Qt/qt_key.h ../win/Qt/qt_map.h \ + ../win/Qt/qt_win.h ../win/Qt/qt_clust.h ../win/Qt/qt_msg.h \ + ../win/Qt/qt_set.h ../win/Qt/qt_stat.h ../win/Qt/qt_icon.h \ + ../win/Qt/qt_str.h qt_kde0.moc $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_main.cpp +$(TARGETPFX)qt_map.o: ../win/Qt/qt_map.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_map.h ../win/Qt/qt_win.h \ + ../win/Qt/qt_clust.h qt_map.moc ../win/Qt/qt_click.h \ + ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_bind.h \ + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_str.h \ + $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_map.cpp +$(TARGETPFX)qt_menu.o: ../win/Qt/qt_menu.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_menu.h ../win/Qt/qt_win.h \ + ../win/Qt/qt_rip.h qt_menu.moc ../win/Qt/qt_key.h \ + ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_bind.h \ + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_streq.h \ + ../win/Qt/qt_line.h ../win/Qt/qt_str.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_menu.cpp +$(TARGETPFX)qt_msg.o: ../win/Qt/qt_msg.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_msg.h ../win/Qt/qt_win.h \ + qt_msg.moc ../win/Qt/qt_map.h ../win/Qt/qt_clust.h \ + ../win/Qt/qt_set.h ../win/Qt/qt_bind.h ../win/Qt/qt_main.h \ + ../win/Qt/qt_kde0.h ../win/Qt/qt_str.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_msg.cpp +$(TARGETPFX)qt_plsel.o: ../win/Qt/qt_plsel.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_plsel.h qt_plsel.moc \ + ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ + ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h \ + $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_plsel.cpp +$(TARGETPFX)qt_rip.o: ../win/Qt/qt_rip.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_rip.h ../win/Qt/qt_bind.h \ + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_str.h \ + $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_rip.cpp +$(TARGETPFX)qt_set.o: ../win/Qt/qt_set.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_set.h ../win/Qt/qt_bind.h \ + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h qt_set.moc \ + ../win/Qt/qt_glyph.h ../win/Qt/qt_xcmd.h ../win/Qt/qt_str.h \ + $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_set.cpp +$(TARGETPFX)qt_stat.o: ../win/Qt/qt_stat.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_stat.h ../win/Qt/qt_win.h \ + ../win/Qt/qt_icon.h qt_stat.moc ../win/Qt/qt_set.h \ + ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ + ../win/Qt/qt_str.h ../win/Qt/qt_xpms.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_stat.cpp +$(TARGETPFX)qt_str.o: ../win/Qt/qt_str.cpp ../win/Qt/qt_str.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_str.cpp +$(TARGETPFX)qt_streq.o: ../win/Qt/qt_streq.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_streq.h ../win/Qt/qt_line.h \ + ../win/Qt/qt_str.h ../win/Qt/qt_set.h ../win/Qt/qt_bind.h \ + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_streq.cpp +$(TARGETPFX)qt_svsel.o: ../win/Qt/qt_svsel.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_svsel.h ../win/Qt/qt_bind.h \ + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_str.h \ + $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_svsel.cpp +$(TARGETPFX)qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_win.h ../win/Qt/qt_bind.h \ + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_click.h \ + ../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h ../win/Qt/qt_key.h \ + ../win/Qt/qt_icon.h ../win/Qt/qt_map.h ../win/Qt/qt_clust.h \ + ../win/Qt/qt_menu.h ../win/Qt/qt_rip.h ../win/Qt/qt_msg.h \ + ../win/Qt/qt_set.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_win.cpp +$(TARGETPFX)qt_xcmd.o: ../win/Qt/qt_xcmd.cpp $(HACK_H) ../include/func_tab.h \ + ../win/Qt/qt_pre.h ../win/Qt/qt_post.h ../win/Qt/qt_xcmd.h \ + qt_xcmd.moc ../win/Qt/qt_key.h ../win/Qt/qt_bind.h \ + ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_set.h \ + ../win/Qt/qt_str.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_xcmd.cpp +$(TARGETPFX)qt_yndlg.o: ../win/Qt/qt_yndlg.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_yndlg.h qt_yndlg.moc \ + ../win/Qt/qt_key.h ../win/Qt/qt_str.h $(QTn_H) + $(TARGET_CXX) $(TARGET_CXXFLAGS) -c -o $@ ../win/Qt/qt_yndlg.cpp +qt_kde0.moc: ../win/Qt/qt_kde0.h $(QTn_H) + $(MOCPATH) -o $@ ../win/Qt/qt_kde0.h +qt_main.moc: ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h $(QTn_H) + $(MOCPATH) -o $@ ../win/Qt/qt_main.h +qt_map.moc: ../win/Qt/qt_map.h ../win/Qt/qt_win.h ../win/Qt/qt_clust.h $(QTn_H) + $(MOCPATH) -o $@ ../win/Qt/qt_map.h +qt_menu.moc: ../win/Qt/qt_menu.h ../win/Qt/qt_win.h ../win/Qt/qt_rip.h $(QTn_H) + $(MOCPATH) -o $@ ../win/Qt/qt_menu.h +qt_msg.moc: ../win/Qt/qt_msg.h ../win/Qt/qt_win.h $(QTn_H) + $(MOCPATH) -o $@ ../win/Qt/qt_msg.h +qt_plsel.moc: ../win/Qt/qt_plsel.h $(QTn_H) + $(MOCPATH) -o $@ ../win/Qt/qt_plsel.h +qt_set.moc: ../win/Qt/qt_set.h ../win/Qt/qt_bind.h ../win/Qt/qt_main.h \ + ../win/Qt/qt_kde0.h $(QTn_H) + $(MOCPATH) -o $@ ../win/Qt/qt_set.h +qt_stat.moc: ../win/Qt/qt_stat.h ../win/Qt/qt_win.h ../win/Qt/qt_icon.h \ + $(QTn_H) + $(MOCPATH) -o $@ ../win/Qt/qt_stat.h +qt_xcmd.moc: ../win/Qt/qt_xcmd.h $(QTn_H) + $(MOCPATH) -o $@ ../win/Qt/qt_xcmd.h +qt_yndlg.moc: ../win/Qt/qt_yndlg.h $(QTn_H) + $(MOCPATH) -o $@ ../win/Qt/qt_yndlg.h +$(TARGETPFX)wc_chainin.o: ../win/chain/wc_chainin.c $(HACK_H) + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/chain/wc_chainin.c +$(TARGETPFX)wc_chainout.o: ../win/chain/wc_chainout.c $(HACK_H) + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/chain/wc_chainout.c +$(TARGETPFX)wc_trace.o: ../win/chain/wc_trace.c $(HACK_H) ../include/wintty.h \ + ../include/func_tab.h + $(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/chain/wc_trace.c +$(TARGETPFX)allmain.o: allmain.c $(HACK_H) +$(TARGETPFX)alloc.o: alloc.c $(CONFIG_H) +$(TARGETPFX)apply.o: apply.c $(HACK_H) +$(TARGETPFX)artifact.o: artifact.c $(HACK_H) ../include/artifact.h +$(TARGETPFX)attrib.o: attrib.c $(HACK_H) +$(TARGETPFX)ball.o: ball.c $(HACK_H) +$(TARGETPFX)bones.o: bones.c $(HACK_H) +$(TARGETPFX)botl.o: botl.c $(HACK_H) +$(TARGETPFX)cmd.o: cmd.c $(HACK_H) ../include/func_tab.h +$(TARGETPFX)dbridge.o: dbridge.c $(HACK_H) +$(TARGETPFX)decl.o: decl.c $(HACK_H) +$(TARGETPFX)detect.o: detect.c $(HACK_H) ../include/artifact.h +$(TARGETPFX)dig.o: dig.c $(HACK_H) +$(TARGETPFX)display.o: display.c $(HACK_H) +#$(TARGETPFX)dlb.o: dlb.c $(CONFIG_H) ../include/dlb.h +$(TARGETPFX)do.o: do.c $(HACK_H) +$(TARGETPFX)do_name.o: do_name.c $(HACK_H) +$(TARGETPFX)do_wear.o: do_wear.c $(HACK_H) +$(TARGETPFX)dog.o: dog.c $(HACK_H) +$(TARGETPFX)dogmove.o: dogmove.c $(HACK_H) ../include/mfndpos.h +$(TARGETPFX)dokick.o: dokick.c $(HACK_H) +$(TARGETPFX)dothrow.o: dothrow.c $(HACK_H) +$(TARGETPFX)drawing.o: drawing.c $(CONFIG_H) ../include/color.h \ + ../include/rm.h ../include/objclass.h ../include/defsym.h \ + ../include/objects.h ../include/wintype.h ../include/sym.h +$(TARGETPFX)dungeon.o: dungeon.c $(HACK_H) ../include/dgn_file.h \ + ../include/dlb.h +$(TARGETPFX)eat.o: eat.c $(HACK_H) +$(TARGETPFX)end.o: end.c $(HACK_H) ../include/dlb.h +$(TARGETPFX)engrave.o: engrave.c $(HACK_H) +$(TARGETPFX)exper.o: exper.c $(HACK_H) +$(TARGETPFX)explode.o: explode.c $(HACK_H) +$(TARGETPFX)extralev.o: extralev.c $(HACK_H) +$(TARGETPFX)files.o: files.c $(HACK_H) ../include/dlb.h ../include/wintty.h \ + #zlib.h +$(TARGETPFX)fountain.o: fountain.c $(HACK_H) +$(TARGETPFX)hack.o: hack.c $(HACK_H) +$(TARGETPFX)hacklib.o: hacklib.c $(HACK_H) +$(TARGETPFX)insight.o: insight.c $(HACK_H) +$(TARGETPFX)invent.o: invent.c $(HACK_H) +$(TARGETPFX)isaac64.o: isaac64.c $(CONFIG_H) ../include/isaac64.h +$(TARGETPFX)light.o: light.c $(HACK_H) +$(TARGETPFX)lock.o: lock.c $(HACK_H) +$(TARGETPFX)mail.o: mail.c $(HACK_H) ../include/mail.h +$(TARGETPFX)makemon.o: makemon.c $(HACK_H) +$(TARGETPFX)mcastu.o: mcastu.c $(HACK_H) +$(TARGETPFX)mdlib.o: mdlib.c $(CONFIG_H) ../include/permonst.h \ + ../include/align.h ../include/monattk.h ../include/monflag.h \ + ../include/monsters.h ../include/objclass.h \ + ../include/defsym.h ../include/objects.h ../include/wintype.h \ + ../include/sym.h ../include/artilist.h ../include/dungeon.h \ + ../include/obj.h ../include/monst.h ../include/mextra.h \ + ../include/you.h ../include/attrib.h ../include/prop.h \ + ../include/skills.h ../include/context.h ../include/flag.h \ + ../include/dlb.h +$(TARGETPFX)mhitm.o: mhitm.c $(HACK_H) ../include/artifact.h +$(TARGETPFX)mhitu.o: mhitu.c $(HACK_H) ../include/artifact.h +$(TARGETPFX)minion.o: minion.c $(HACK_H) +$(TARGETPFX)mklev.o: mklev.c $(HACK_H) +$(TARGETPFX)mkmap.o: mkmap.c $(HACK_H) ../include/sp_lev.h +$(TARGETPFX)mkmaze.o: mkmaze.c $(HACK_H) ../include/sp_lev.h +$(TARGETPFX)mkobj.o: mkobj.c $(HACK_H) +$(TARGETPFX)mkroom.o: mkroom.c $(HACK_H) +$(TARGETPFX)mon.o: mon.c $(HACK_H) ../include/mfndpos.h +$(TARGETPFX)mondata.o: mondata.c $(HACK_H) +$(TARGETPFX)monmove.o: monmove.c $(HACK_H) ../include/mfndpos.h \ + ../include/artifact.h +$(TARGETPFX)monst.o: monst.c $(CONFIG_H) ../include/permonst.h \ + ../include/align.h ../include/monattk.h ../include/monflag.h \ + ../include/monsters.h ../include/wintype.h ../include/sym.h \ + ../include/defsym.h ../include/color.h +$(TARGETPFX)mplayer.o: mplayer.c $(HACK_H) +$(TARGETPFX)mthrowu.o: mthrowu.c $(HACK_H) +$(TARGETPFX)muse.o: muse.c $(HACK_H) +$(TARGETPFX)music.o: music.c $(HACK_H) +$(TARGETPFX)nhlua.o: nhlua.c $(HACK_H) ../include/dlb.h +$(TARGETPFX)nhlsel.o: nhlsel.c $(HACK_H) ../include/sp_lev.h +$(TARGETPFX)nhlobj.o: nhlobj.c $(HACK_H) ../include/sp_lev.h +$(TARGETPFX)o_init.o: o_init.c $(HACK_H) +$(TARGETPFX)objects.o: objects.c $(CONFIG_H) ../include/obj.h \ + ../include/prop.h ../include/skills.h ../include/color.h \ + ../include/objclass.h ../include/defsym.h ../include/objects.h +$(TARGETPFX)objnam.o: objnam.c $(HACK_H) +$(TARGETPFX)options.o: options.c $(CONFIG_H) ../include/objclass.h \ + ../include/defsym.h ../include/objects.h ../include/flag.h \ + $(HACK_H) ../include/tcap.h ../include/optlist.h +$(TARGETPFX)pager.o: pager.c $(HACK_H) ../include/dlb.h +$(TARGETPFX)pickup.o: pickup.c $(HACK_H) +$(TARGETPFX)pline.o: pline.c $(HACK_H) +$(TARGETPFX)polyself.o: polyself.c $(HACK_H) +$(TARGETPFX)potion.o: potion.c $(HACK_H) +$(TARGETPFX)pray.o: pray.c $(HACK_H) +$(TARGETPFX)priest.o: priest.c $(HACK_H) ../include/mfndpos.h +$(TARGETPFX)quest.o: quest.c $(HACK_H) +$(TARGETPFX)questpgr.o: questpgr.c $(HACK_H) ../include/dlb.h \ + ../include/wintty.h +$(TARGETPFX)read.o: read.c $(HACK_H) +$(TARGETPFX)rect.o: rect.c $(HACK_H) +$(TARGETPFX)region.o: region.c $(HACK_H) +$(TARGETPFX)restore.o: restore.c $(HACK_H) ../include/tcap.h +$(TARGETPFX)rip.o: rip.c $(HACK_H) +$(TARGETPFX)rnd.o: rnd.c $(HACK_H) ../include/isaac64.h +$(TARGETPFX)role.o: role.c $(HACK_H) +$(TARGETPFX)rumors.o: rumors.c $(HACK_H) ../include/dlb.h +$(TARGETPFX)save.o: save.c $(HACK_H) +$(TARGETPFX)sfstruct.o: sfstruct.c $(HACK_H) +$(TARGETPFX)shk.o: shk.c $(HACK_H) +$(TARGETPFX)shknam.o: shknam.c $(HACK_H) +$(TARGETPFX)sit.o: sit.c $(HACK_H) ../include/artifact.h +$(TARGETPFX)sounds.o: sounds.c $(HACK_H) +$(TARGETPFX)sp_lev.o: sp_lev.c $(HACK_H) ../include/sp_lev.h +$(TARGETPFX)spell.o: spell.c $(HACK_H) +$(TARGETPFX)steal.o: steal.c $(HACK_H) +$(TARGETPFX)steed.o: steed.c $(HACK_H) +$(TARGETPFX)symbols.o: symbols.c $(HACK_H) ../include/tcap.h +$(TARGETPFX)sys.o: sys.c $(HACK_H) +$(TARGETPFX)teleport.o: teleport.c $(HACK_H) +$(TARGETPFX)timeout.o: timeout.c $(HACK_H) +$(TARGETPFX)topten.o: topten.c $(HACK_H) ../include/dlb.h +$(TARGETPFX)track.o: track.c $(HACK_H) +$(TARGETPFX)trap.o: trap.c $(HACK_H) +$(TARGETPFX)u_init.o: u_init.c $(HACK_H) +$(TARGETPFX)utf8map.o: utf8map.c $(HACK_H) +$(TARGETPFX)uhitm.o: uhitm.c $(HACK_H) +$(TARGETPFX)vault.o: vault.c $(HACK_H) +$(TARGETPFX)version.o: version.c $(HACK_H) ../include/dlb.h +$(TARGETPFX)vision.o: vision.c $(HACK_H) +$(TARGETPFX)weapon.o: weapon.c $(HACK_H) +$(TARGETPFX)were.o: were.c $(HACK_H) +$(TARGETPFX)wield.o: wield.c $(HACK_H) +$(TARGETPFX)windows.o: windows.c $(HACK_H) ../include/wintty.h +$(TARGETPFX)wizard.o: wizard.c $(HACK_H) +$(TARGETPFX)worm.o: worm.c $(HACK_H) +$(TARGETPFX)worn.o: worn.c $(HACK_H) +$(TARGETPFX)write.o: write.c $(HACK_H) +$(TARGETPFX)zap.o: zap.c $(HACK_H) +# DEPENDENCIES MUST END AT END OF FILE +# IF YOU PUT STUFF HERE IT WILL GO AWAY diff --git a/src/NetHack_3.7/sys/msdos/exceptn.S.patch b/src/NetHack-NetHack-3.7/sys/msdos/exceptn.S.patch similarity index 100% rename from src/NetHack_3.7/sys/msdos/exceptn.S.patch rename to src/NetHack-NetHack-3.7/sys/msdos/exceptn.S.patch diff --git a/src/NetHack_3.7/sys/msdos/fetch-cross-compiler.sh b/src/NetHack-NetHack-3.7/sys/msdos/fetch-cross-compiler.sh similarity index 100% rename from src/NetHack_3.7/sys/msdos/fetch-cross-compiler.sh rename to src/NetHack-NetHack-3.7/sys/msdos/fetch-cross-compiler.sh diff --git a/src/NetHack_3.7/sys/msdos/font.c b/src/NetHack-NetHack-3.7/sys/msdos/font.c similarity index 100% rename from src/NetHack_3.7/sys/msdos/font.c rename to src/NetHack-NetHack-3.7/sys/msdos/font.c diff --git a/src/NetHack_3.7/sys/msdos/font.h b/src/NetHack-NetHack-3.7/sys/msdos/font.h similarity index 100% rename from src/NetHack_3.7/sys/msdos/font.h rename to src/NetHack-NetHack-3.7/sys/msdos/font.h diff --git a/src/NetHack_3.7/sys/msdos/fonts/.gitignore b/src/NetHack-NetHack-3.7/sys/msdos/fonts/.gitignore similarity index 100% rename from src/NetHack_3.7/sys/msdos/fonts/.gitignore rename to src/NetHack-NetHack-3.7/sys/msdos/fonts/.gitignore diff --git a/src/NetHack_3.7/sys/msdos/fonts/README.txt b/src/NetHack-NetHack-3.7/sys/msdos/fonts/README.txt similarity index 100% rename from src/NetHack_3.7/sys/msdos/fonts/README.txt rename to src/NetHack-NetHack-3.7/sys/msdos/fonts/README.txt diff --git a/src/NetHack_3.7/sys/msdos/fonts/makefont.lua b/src/NetHack-NetHack-3.7/sys/msdos/fonts/makefont.lua similarity index 100% rename from src/NetHack_3.7/sys/msdos/fonts/makefont.lua rename to src/NetHack-NetHack-3.7/sys/msdos/fonts/makefont.lua diff --git a/src/NetHack_3.7/sys/msdos/fonts/nh-u16b.bdf b/src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u16b.bdf similarity index 100% rename from src/NetHack_3.7/sys/msdos/fonts/nh-u16b.bdf rename to src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u16b.bdf diff --git a/src/NetHack_3.7/sys/msdos/fonts/nh-u16v.bdf b/src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u16v.bdf similarity index 100% rename from src/NetHack_3.7/sys/msdos/fonts/nh-u16v.bdf rename to src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u16v.bdf diff --git a/src/NetHack_3.7/sys/msdos/fonts/nh-u18b.bdf b/src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u18b.bdf similarity index 100% rename from src/NetHack_3.7/sys/msdos/fonts/nh-u18b.bdf rename to src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u18b.bdf diff --git a/src/NetHack_3.7/sys/msdos/fonts/nh-u20b.bdf b/src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u20b.bdf similarity index 100% rename from src/NetHack_3.7/sys/msdos/fonts/nh-u20b.bdf rename to src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u20b.bdf diff --git a/src/NetHack_3.7/sys/msdos/fonts/nh-u22b.bdf b/src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u22b.bdf similarity index 100% rename from src/NetHack_3.7/sys/msdos/fonts/nh-u22b.bdf rename to src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u22b.bdf diff --git a/src/NetHack_3.7/sys/msdos/fonts/nh-u24b.bdf b/src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u24b.bdf similarity index 100% rename from src/NetHack_3.7/sys/msdos/fonts/nh-u24b.bdf rename to src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u24b.bdf diff --git a/src/NetHack_3.7/sys/msdos/fonts/nh-u28b.bdf b/src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u28b.bdf similarity index 100% rename from src/NetHack_3.7/sys/msdos/fonts/nh-u28b.bdf rename to src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u28b.bdf diff --git a/src/NetHack_3.7/sys/msdos/fonts/nh-u32b.bdf b/src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u32b.bdf similarity index 100% rename from src/NetHack_3.7/sys/msdos/fonts/nh-u32b.bdf rename to src/NetHack-NetHack-3.7/sys/msdos/fonts/nh-u32b.bdf diff --git a/src/NetHack_3.7/sys/msdos/msdos.c b/src/NetHack-NetHack-3.7/sys/msdos/msdos.c similarity index 100% rename from src/NetHack_3.7/sys/msdos/msdos.c rename to src/NetHack-NetHack-3.7/sys/msdos/msdos.c diff --git a/src/NetHack_3.7/sys/msdos/msdoshlp.txt b/src/NetHack-NetHack-3.7/sys/msdos/msdoshlp.txt similarity index 100% rename from src/NetHack_3.7/sys/msdos/msdoshlp.txt rename to src/NetHack-NetHack-3.7/sys/msdos/msdoshlp.txt diff --git a/src/NetHack_3.7/sys/msdos/nhico.uu b/src/NetHack-NetHack-3.7/sys/msdos/nhico.uu similarity index 100% rename from src/NetHack_3.7/sys/msdos/nhico.uu rename to src/NetHack-NetHack-3.7/sys/msdos/nhico.uu diff --git a/src/NetHack_3.7/sys/msdos/nhlua.h b/src/NetHack-NetHack-3.7/sys/msdos/nhlua.h similarity index 100% rename from src/NetHack_3.7/sys/msdos/nhlua.h rename to src/NetHack-NetHack-3.7/sys/msdos/nhlua.h diff --git a/src/NetHack_3.7/sys/msdos/nhpif.uu b/src/NetHack-NetHack-3.7/sys/msdos/nhpif.uu similarity index 100% rename from src/NetHack_3.7/sys/msdos/nhpif.uu rename to src/NetHack-NetHack-3.7/sys/msdos/nhpif.uu diff --git a/src/NetHack_3.7/sys/msdos/pckeys.c b/src/NetHack-NetHack-3.7/sys/msdos/pckeys.c similarity index 100% rename from src/NetHack_3.7/sys/msdos/pckeys.c rename to src/NetHack-NetHack-3.7/sys/msdos/pckeys.c diff --git a/src/NetHack_3.7/sys/msdos/pctiles.c b/src/NetHack-NetHack-3.7/sys/msdos/pctiles.c similarity index 100% rename from src/NetHack_3.7/sys/msdos/pctiles.c rename to src/NetHack-NetHack-3.7/sys/msdos/pctiles.c diff --git a/src/NetHack_3.7/sys/msdos/pctiles.h b/src/NetHack-NetHack-3.7/sys/msdos/pctiles.h similarity index 100% rename from src/NetHack_3.7/sys/msdos/pctiles.h rename to src/NetHack-NetHack-3.7/sys/msdos/pctiles.h diff --git a/src/NetHack_3.7/sys/msdos/pcvideo.h b/src/NetHack-NetHack-3.7/sys/msdos/pcvideo.h similarity index 100% rename from src/NetHack_3.7/sys/msdos/pcvideo.h rename to src/NetHack-NetHack-3.7/sys/msdos/pcvideo.h diff --git a/src/NetHack_3.7/sys/msdos/portio.h b/src/NetHack-NetHack-3.7/sys/msdos/portio.h similarity index 100% rename from src/NetHack_3.7/sys/msdos/portio.h rename to src/NetHack-NetHack-3.7/sys/msdos/portio.h diff --git a/src/NetHack_3.7/sys/msdos/setup.bat b/src/NetHack-NetHack-3.7/sys/msdos/setup.bat similarity index 100% rename from src/NetHack_3.7/sys/msdos/setup.bat rename to src/NetHack-NetHack-3.7/sys/msdos/setup.bat diff --git a/src/NetHack_3.7/sys/msdos/sysconf b/src/NetHack-NetHack-3.7/sys/msdos/sysconf similarity index 100% rename from src/NetHack_3.7/sys/msdos/sysconf rename to src/NetHack-NetHack-3.7/sys/msdos/sysconf diff --git a/src/NetHack_3.7/sys/msdos/tile2bin.c b/src/NetHack-NetHack-3.7/sys/msdos/tile2bin.c similarity index 100% rename from src/NetHack_3.7/sys/msdos/tile2bin.c rename to src/NetHack-NetHack-3.7/sys/msdos/tile2bin.c diff --git a/src/NetHack_3.7/sys/msdos/vesa.h b/src/NetHack-NetHack-3.7/sys/msdos/vesa.h similarity index 100% rename from src/NetHack_3.7/sys/msdos/vesa.h rename to src/NetHack-NetHack-3.7/sys/msdos/vesa.h diff --git a/src/NetHack_3.7/sys/msdos/video.c b/src/NetHack-NetHack-3.7/sys/msdos/video.c similarity index 100% rename from src/NetHack_3.7/sys/msdos/video.c rename to src/NetHack-NetHack-3.7/sys/msdos/video.c diff --git a/src/NetHack_3.7/sys/msdos/vidtxt.c b/src/NetHack-NetHack-3.7/sys/msdos/vidtxt.c similarity index 100% rename from src/NetHack_3.7/sys/msdos/vidtxt.c rename to src/NetHack-NetHack-3.7/sys/msdos/vidtxt.c diff --git a/src/NetHack_3.7/sys/msdos/vidvesa.c b/src/NetHack-NetHack-3.7/sys/msdos/vidvesa.c similarity index 100% rename from src/NetHack_3.7/sys/msdos/vidvesa.c rename to src/NetHack-NetHack-3.7/sys/msdos/vidvesa.c diff --git a/src/NetHack_3.7/sys/msdos/vidvga.c b/src/NetHack-NetHack-3.7/sys/msdos/vidvga.c similarity index 100% rename from src/NetHack_3.7/sys/msdos/vidvga.c rename to src/NetHack-NetHack-3.7/sys/msdos/vidvga.c diff --git a/src/NetHack_3.7/sys/share/.gitattributes b/src/NetHack-NetHack-3.7/sys/share/.gitattributes similarity index 100% rename from src/NetHack_3.7/sys/share/.gitattributes rename to src/NetHack-NetHack-3.7/sys/share/.gitattributes diff --git a/src/NetHack_3.7/sys/share/Makefile.lib b/src/NetHack-NetHack-3.7/sys/share/Makefile.lib similarity index 100% rename from src/NetHack_3.7/sys/share/Makefile.lib rename to src/NetHack-NetHack-3.7/sys/share/Makefile.lib diff --git a/src/NetHack_3.7/sys/share/NetHack.cnf b/src/NetHack-NetHack-3.7/sys/share/NetHack.cnf similarity index 100% rename from src/NetHack_3.7/sys/share/NetHack.cnf rename to src/NetHack-NetHack-3.7/sys/share/NetHack.cnf diff --git a/src/NetHack_3.7/sys/share/cppregex.cpp b/src/NetHack-NetHack-3.7/sys/share/cppregex.cpp similarity index 100% rename from src/NetHack_3.7/sys/share/cppregex.cpp rename to src/NetHack-NetHack-3.7/sys/share/cppregex.cpp diff --git a/src/NetHack_3.7/sys/share/ioctl.c b/src/NetHack-NetHack-3.7/sys/share/ioctl.c similarity index 100% rename from src/NetHack_3.7/sys/share/ioctl.c rename to src/NetHack-NetHack-3.7/sys/share/ioctl.c diff --git a/src/NetHack_3.7/sys/share/pcmain.c b/src/NetHack-NetHack-3.7/sys/share/pcmain.c similarity index 100% rename from src/NetHack_3.7/sys/share/pcmain.c rename to src/NetHack-NetHack-3.7/sys/share/pcmain.c diff --git a/src/NetHack_3.7/sys/share/pcsys.c b/src/NetHack-NetHack-3.7/sys/share/pcsys.c similarity index 100% rename from src/NetHack_3.7/sys/share/pcsys.c rename to src/NetHack-NetHack-3.7/sys/share/pcsys.c diff --git a/src/NetHack_3.7/sys/share/pctty.c b/src/NetHack-NetHack-3.7/sys/share/pctty.c similarity index 100% rename from src/NetHack_3.7/sys/share/pctty.c rename to src/NetHack-NetHack-3.7/sys/share/pctty.c diff --git a/src/NetHack_3.7/sys/share/pcunix.c b/src/NetHack-NetHack-3.7/sys/share/pcunix.c similarity index 100% rename from src/NetHack_3.7/sys/share/pcunix.c rename to src/NetHack-NetHack-3.7/sys/share/pcunix.c diff --git a/src/NetHack_3.7/sys/share/pmatchregex.c b/src/NetHack-NetHack-3.7/sys/share/pmatchregex.c similarity index 100% rename from src/NetHack_3.7/sys/share/pmatchregex.c rename to src/NetHack-NetHack-3.7/sys/share/pmatchregex.c diff --git a/src/NetHack_3.7/sys/share/posixregex.c b/src/NetHack-NetHack-3.7/sys/share/posixregex.c similarity index 100% rename from src/NetHack_3.7/sys/share/posixregex.c rename to src/NetHack-NetHack-3.7/sys/share/posixregex.c diff --git a/src/NetHack_3.7/sys/share/random.c b/src/NetHack-NetHack-3.7/sys/share/random.c similarity index 100% rename from src/NetHack_3.7/sys/share/random.c rename to src/NetHack-NetHack-3.7/sys/share/random.c diff --git a/src/NetHack_3.7/sys/share/tclib.c b/src/NetHack-NetHack-3.7/sys/share/tclib.c similarity index 100% rename from src/NetHack_3.7/sys/share/tclib.c rename to src/NetHack-NetHack-3.7/sys/share/tclib.c diff --git a/src/NetHack_3.7/sys/share/termcap b/src/NetHack-NetHack-3.7/sys/share/termcap similarity index 100% rename from src/NetHack_3.7/sys/share/termcap rename to src/NetHack-NetHack-3.7/sys/share/termcap diff --git a/src/NetHack_3.7/sys/share/termcap.uu b/src/NetHack-NetHack-3.7/sys/share/termcap.uu similarity index 100% rename from src/NetHack_3.7/sys/share/termcap.uu rename to src/NetHack-NetHack-3.7/sys/share/termcap.uu diff --git a/src/NetHack_3.7/sys/share/unixtty.c b/src/NetHack-NetHack-3.7/sys/share/unixtty.c similarity index 100% rename from src/NetHack_3.7/sys/share/unixtty.c rename to src/NetHack-NetHack-3.7/sys/share/unixtty.c diff --git a/src/NetHack_3.7/sys/share/uudecode.c b/src/NetHack-NetHack-3.7/sys/share/uudecode.c similarity index 100% rename from src/NetHack_3.7/sys/share/uudecode.c rename to src/NetHack-NetHack-3.7/sys/share/uudecode.c diff --git a/src/NetHack_3.7/sys/unix/.gitattributes b/src/NetHack-NetHack-3.7/sys/unix/.gitattributes similarity index 100% rename from src/NetHack_3.7/sys/unix/.gitattributes rename to src/NetHack-NetHack-3.7/sys/unix/.gitattributes diff --git a/src/NetHack_3.7/sys/unix/.gitignore b/src/NetHack-NetHack-3.7/sys/unix/.gitignore similarity index 100% rename from src/NetHack_3.7/sys/unix/.gitignore rename to src/NetHack-NetHack-3.7/sys/unix/.gitignore diff --git a/src/NetHack_3.7/sys/unix/Install.unx b/src/NetHack-NetHack-3.7/sys/unix/Install.unx similarity index 100% rename from src/NetHack_3.7/sys/unix/Install.unx rename to src/NetHack-NetHack-3.7/sys/unix/Install.unx diff --git a/src/NetHack_3.7/sys/unix/Makefile.dat b/src/NetHack-NetHack-3.7/sys/unix/Makefile.dat similarity index 100% rename from src/NetHack_3.7/sys/unix/Makefile.dat rename to src/NetHack-NetHack-3.7/sys/unix/Makefile.dat diff --git a/src/NetHack_3.7/sys/unix/Makefile.doc b/src/NetHack-NetHack-3.7/sys/unix/Makefile.doc similarity index 100% rename from src/NetHack_3.7/sys/unix/Makefile.doc rename to src/NetHack-NetHack-3.7/sys/unix/Makefile.doc diff --git a/src/NetHack_3.7/sys/unix/Makefile.src b/src/NetHack-NetHack-3.7/sys/unix/Makefile.src similarity index 100% rename from src/NetHack_3.7/sys/unix/Makefile.src rename to src/NetHack-NetHack-3.7/sys/unix/Makefile.src diff --git a/src/NetHack_3.7/sys/unix/Makefile.top b/src/NetHack-NetHack-3.7/sys/unix/Makefile.top similarity index 100% rename from src/NetHack_3.7/sys/unix/Makefile.top rename to src/NetHack-NetHack-3.7/sys/unix/Makefile.top diff --git a/src/NetHack_3.7/sys/unix/Makefile.utl b/src/NetHack-NetHack-3.7/sys/unix/Makefile.utl similarity index 100% rename from src/NetHack_3.7/sys/unix/Makefile.utl rename to src/NetHack-NetHack-3.7/sys/unix/Makefile.utl diff --git a/src/NetHack_3.7/sys/unix/NetHack.xcodeproj/.gitattributes b/src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/.gitattributes similarity index 100% rename from src/NetHack_3.7/sys/unix/NetHack.xcodeproj/.gitattributes rename to src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/.gitattributes diff --git a/src/NetHack_3.7/sys/unix/NetHack.xcodeproj/.gitignore b/src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/.gitignore similarity index 100% rename from src/NetHack_3.7/sys/unix/NetHack.xcodeproj/.gitignore rename to src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/.gitignore diff --git a/src/NetHack_3.7/sys/unix/NetHack.xcodeproj/project.pbxproj b/src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/project.pbxproj similarity index 100% rename from src/NetHack_3.7/sys/unix/NetHack.xcodeproj/project.pbxproj rename to src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/project.pbxproj diff --git a/src/NetHack_3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/.gitignore b/src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/.gitignore similarity index 100% rename from src/NetHack_3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/.gitignore rename to src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/.gitignore diff --git a/src/NetHack_3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from src/NetHack_3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/src/NetHack_3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from src/NetHack_3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/src/NetHack_3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from src/NetHack_3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/src/NetHack_3.7/sys/unix/NetHack.xcodeproj/xcshareddata/xcschemes/NetHack.xcscheme b/src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/xcshareddata/xcschemes/NetHack.xcscheme similarity index 100% rename from src/NetHack_3.7/sys/unix/NetHack.xcodeproj/xcshareddata/xcschemes/NetHack.xcscheme rename to src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/xcshareddata/xcschemes/NetHack.xcscheme diff --git a/src/NetHack_3.7/sys/unix/NetHack.xcodeproj/xcshareddata/xcschemes/makedefs.xcscheme b/src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/xcshareddata/xcschemes/makedefs.xcscheme similarity index 100% rename from src/NetHack_3.7/sys/unix/NetHack.xcodeproj/xcshareddata/xcschemes/makedefs.xcscheme rename to src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/xcshareddata/xcschemes/makedefs.xcscheme diff --git a/src/NetHack_3.7/sys/unix/NetHack.xcodeproj/xcshareddata/xcschemes/recover.xcscheme b/src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/xcshareddata/xcschemes/recover.xcscheme similarity index 100% rename from src/NetHack_3.7/sys/unix/NetHack.xcodeproj/xcshareddata/xcschemes/recover.xcscheme rename to src/NetHack-NetHack-3.7/sys/unix/NetHack.xcodeproj/xcshareddata/xcschemes/recover.xcscheme diff --git a/src/NetHack_3.7/sys/unix/NewInstall.unx b/src/NetHack-NetHack-3.7/sys/unix/NewInstall.unx similarity index 100% rename from src/NetHack_3.7/sys/unix/NewInstall.unx rename to src/NetHack-NetHack-3.7/sys/unix/NewInstall.unx diff --git a/src/NetHack_3.7/sys/unix/README.xcode b/src/NetHack-NetHack-3.7/sys/unix/README.xcode similarity index 100% rename from src/NetHack_3.7/sys/unix/README.xcode rename to src/NetHack-NetHack-3.7/sys/unix/README.xcode diff --git a/src/NetHack_3.7/sys/unix/XCode.xcconfig b/src/NetHack-NetHack-3.7/sys/unix/XCode.xcconfig similarity index 100% rename from src/NetHack_3.7/sys/unix/XCode.xcconfig rename to src/NetHack-NetHack-3.7/sys/unix/XCode.xcconfig diff --git a/src/NetHack_3.7/sys/unix/depend.awk b/src/NetHack-NetHack-3.7/sys/unix/depend.awk similarity index 100% rename from src/NetHack_3.7/sys/unix/depend.awk rename to src/NetHack-NetHack-3.7/sys/unix/depend.awk diff --git a/src/NetHack_3.7/sys/unix/gitinfo.sh b/src/NetHack-NetHack-3.7/sys/unix/gitinfo.sh similarity index 100% rename from src/NetHack_3.7/sys/unix/gitinfo.sh rename to src/NetHack-NetHack-3.7/sys/unix/gitinfo.sh diff --git a/src/NetHack_3.7/sys/unix/hints/.gitattributes b/src/NetHack-NetHack-3.7/sys/unix/hints/.gitattributes similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/.gitattributes rename to src/NetHack-NetHack-3.7/sys/unix/hints/.gitattributes diff --git a/src/NetHack_3.7/sys/unix/hints/include/compiler.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/include/compiler.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/include/compiler.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/include/compiler.370 diff --git a/src/NetHack_3.7/sys/unix/hints/include/cross-post.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/include/cross-post.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/include/cross-post.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/include/cross-post.370 diff --git a/src/NetHack_3.7/sys/unix/hints/include/cross-pre.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/include/cross-pre.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/include/cross-pre.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/include/cross-pre.370 diff --git a/src/NetHack_3.7/sys/unix/hints/include/gbdates-post.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/include/gbdates-post.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/include/gbdates-post.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/include/gbdates-post.370 diff --git a/src/NetHack_3.7/sys/unix/hints/include/gbdates-pre.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/include/gbdates-pre.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/include/gbdates-pre.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/include/gbdates-pre.370 diff --git a/src/NetHack_3.7/sys/unix/hints/include/multisnd-post.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/include/multisnd-post.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/include/multisnd-post.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/include/multisnd-post.370 diff --git a/src/NetHack_3.7/sys/unix/hints/include/multisnd1-pre.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/include/multisnd1-pre.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/include/multisnd1-pre.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/include/multisnd1-pre.370 diff --git a/src/NetHack_3.7/sys/unix/hints/include/multisnd2-pre.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/include/multisnd2-pre.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/include/multisnd2-pre.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/include/multisnd2-pre.370 diff --git a/src/NetHack_3.7/sys/unix/hints/include/multiw-1.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/include/multiw-1.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/include/multiw-1.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/include/multiw-1.370 diff --git a/src/NetHack_3.7/sys/unix/hints/include/multiw-2.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/include/multiw-2.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/include/multiw-2.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/include/multiw-2.370 diff --git a/src/NetHack_3.7/sys/unix/hints/include/multiw-3.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/include/multiw-3.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/include/multiw-3.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/include/multiw-3.370 diff --git a/src/NetHack_3.7/sys/unix/hints/linux-minimal b/src/NetHack-NetHack-3.7/sys/unix/hints/linux-minimal similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/linux-minimal rename to src/NetHack-NetHack-3.7/sys/unix/hints/linux-minimal diff --git a/src/NetHack_3.7/sys/unix/hints/linux.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/linux.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/linux.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/linux.370 diff --git a/src/NetHack_3.7/sys/unix/hints/macOS.370 b/src/NetHack-NetHack-3.7/sys/unix/hints/macOS.370 similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/macOS.370 rename to src/NetHack-NetHack-3.7/sys/unix/hints/macOS.370 diff --git a/src/NetHack_3.7/sys/unix/hints/macosx.sh b/src/NetHack-NetHack-3.7/sys/unix/hints/macosx.sh similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/macosx.sh rename to src/NetHack-NetHack-3.7/sys/unix/hints/macosx.sh diff --git a/src/NetHack_3.7/sys/unix/hints/solaris b/src/NetHack-NetHack-3.7/sys/unix/hints/solaris similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/solaris rename to src/NetHack-NetHack-3.7/sys/unix/hints/solaris diff --git a/src/NetHack_3.7/sys/unix/hints/solaris-playground b/src/NetHack-NetHack-3.7/sys/unix/hints/solaris-playground similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/solaris-playground rename to src/NetHack-NetHack-3.7/sys/unix/hints/solaris-playground diff --git a/src/NetHack_3.7/sys/unix/hints/unix b/src/NetHack-NetHack-3.7/sys/unix/hints/unix similarity index 100% rename from src/NetHack_3.7/sys/unix/hints/unix rename to src/NetHack-NetHack-3.7/sys/unix/hints/unix diff --git a/src/NetHack_3.7/sys/unix/mkmkfile.sh b/src/NetHack-NetHack-3.7/sys/unix/mkmkfile.sh similarity index 100% rename from src/NetHack_3.7/sys/unix/mkmkfile.sh rename to src/NetHack-NetHack-3.7/sys/unix/mkmkfile.sh diff --git a/src/NetHack_3.7/sys/unix/nethack.sh b/src/NetHack-NetHack-3.7/sys/unix/nethack.sh similarity index 100% rename from src/NetHack_3.7/sys/unix/nethack.sh rename to src/NetHack-NetHack-3.7/sys/unix/nethack.sh diff --git a/src/NetHack_3.7/sys/unix/setup.sh b/src/NetHack-NetHack-3.7/sys/unix/setup.sh similarity index 100% rename from src/NetHack_3.7/sys/unix/setup.sh rename to src/NetHack-NetHack-3.7/sys/unix/setup.sh diff --git a/src/NetHack_3.7/sys/unix/sysconf b/src/NetHack-NetHack-3.7/sys/unix/sysconf similarity index 100% rename from src/NetHack_3.7/sys/unix/sysconf rename to src/NetHack-NetHack-3.7/sys/unix/sysconf diff --git a/src/NetHack_3.7/sys/unix/unixmain.c b/src/NetHack-NetHack-3.7/sys/unix/unixmain.c similarity index 100% rename from src/NetHack_3.7/sys/unix/unixmain.c rename to src/NetHack-NetHack-3.7/sys/unix/unixmain.c diff --git a/src/NetHack_3.7/sys/unix/unixres.c b/src/NetHack-NetHack-3.7/sys/unix/unixres.c similarity index 100% rename from src/NetHack_3.7/sys/unix/unixres.c rename to src/NetHack-NetHack-3.7/sys/unix/unixres.c diff --git a/src/NetHack_3.7/sys/unix/unixunix.c b/src/NetHack-NetHack-3.7/sys/unix/unixunix.c similarity index 100% rename from src/NetHack_3.7/sys/unix/unixunix.c rename to src/NetHack-NetHack-3.7/sys/unix/unixunix.c diff --git a/src/NetHack_3.7/sys/vms/.gitattributes b/src/NetHack-NetHack-3.7/sys/vms/.gitattributes similarity index 100% rename from src/NetHack_3.7/sys/vms/.gitattributes rename to src/NetHack-NetHack-3.7/sys/vms/.gitattributes diff --git a/src/NetHack_3.7/sys/vms/Install.vms b/src/NetHack-NetHack-3.7/sys/vms/Install.vms similarity index 100% rename from src/NetHack_3.7/sys/vms/Install.vms rename to src/NetHack-NetHack-3.7/sys/vms/Install.vms diff --git a/src/NetHack_3.7/sys/vms/Makefile.dat b/src/NetHack-NetHack-3.7/sys/vms/Makefile.dat similarity index 100% rename from src/NetHack_3.7/sys/vms/Makefile.dat rename to src/NetHack-NetHack-3.7/sys/vms/Makefile.dat diff --git a/src/NetHack_3.7/sys/vms/Makefile.doc b/src/NetHack-NetHack-3.7/sys/vms/Makefile.doc similarity index 100% rename from src/NetHack_3.7/sys/vms/Makefile.doc rename to src/NetHack-NetHack-3.7/sys/vms/Makefile.doc diff --git a/src/NetHack_3.7/sys/vms/Makefile.src b/src/NetHack-NetHack-3.7/sys/vms/Makefile.src similarity index 100% rename from src/NetHack_3.7/sys/vms/Makefile.src rename to src/NetHack-NetHack-3.7/sys/vms/Makefile.src diff --git a/src/NetHack_3.7/sys/vms/Makefile.top b/src/NetHack-NetHack-3.7/sys/vms/Makefile.top similarity index 100% rename from src/NetHack_3.7/sys/vms/Makefile.top rename to src/NetHack-NetHack-3.7/sys/vms/Makefile.top diff --git a/src/NetHack_3.7/sys/vms/Makefile.utl b/src/NetHack-NetHack-3.7/sys/vms/Makefile.utl similarity index 100% rename from src/NetHack_3.7/sys/vms/Makefile.utl rename to src/NetHack-NetHack-3.7/sys/vms/Makefile.utl diff --git a/src/NetHack_3.7/sys/vms/install.com b/src/NetHack-NetHack-3.7/sys/vms/install.com similarity index 100% rename from src/NetHack_3.7/sys/vms/install.com rename to src/NetHack-NetHack-3.7/sys/vms/install.com diff --git a/src/NetHack_3.7/sys/vms/nethack.com b/src/NetHack-NetHack-3.7/sys/vms/nethack.com similarity index 100% rename from src/NetHack_3.7/sys/vms/nethack.com rename to src/NetHack-NetHack-3.7/sys/vms/nethack.com diff --git a/src/NetHack_3.7/sys/vms/oldcrtl.c b/src/NetHack-NetHack-3.7/sys/vms/oldcrtl.c similarity index 100% rename from src/NetHack_3.7/sys/vms/oldcrtl.c rename to src/NetHack-NetHack-3.7/sys/vms/oldcrtl.c diff --git a/src/NetHack_3.7/sys/vms/spec_lev.com b/src/NetHack-NetHack-3.7/sys/vms/spec_lev.com similarity index 100% rename from src/NetHack_3.7/sys/vms/spec_lev.com rename to src/NetHack-NetHack-3.7/sys/vms/spec_lev.com diff --git a/src/NetHack_3.7/sys/vms/sysconf b/src/NetHack-NetHack-3.7/sys/vms/sysconf similarity index 100% rename from src/NetHack_3.7/sys/vms/sysconf rename to src/NetHack-NetHack-3.7/sys/vms/sysconf diff --git a/src/NetHack_3.7/sys/vms/vmsbuild.com b/src/NetHack-NetHack-3.7/sys/vms/vmsbuild.com similarity index 100% rename from src/NetHack_3.7/sys/vms/vmsbuild.com rename to src/NetHack-NetHack-3.7/sys/vms/vmsbuild.com diff --git a/src/NetHack_3.7/sys/vms/vmsfiles.c b/src/NetHack-NetHack-3.7/sys/vms/vmsfiles.c similarity index 100% rename from src/NetHack_3.7/sys/vms/vmsfiles.c rename to src/NetHack-NetHack-3.7/sys/vms/vmsfiles.c diff --git a/src/NetHack_3.7/sys/vms/vmsmail.c b/src/NetHack-NetHack-3.7/sys/vms/vmsmail.c similarity index 100% rename from src/NetHack_3.7/sys/vms/vmsmail.c rename to src/NetHack-NetHack-3.7/sys/vms/vmsmail.c diff --git a/src/NetHack_3.7/sys/vms/vmsmain.c b/src/NetHack-NetHack-3.7/sys/vms/vmsmain.c similarity index 100% rename from src/NetHack_3.7/sys/vms/vmsmain.c rename to src/NetHack-NetHack-3.7/sys/vms/vmsmain.c diff --git a/src/NetHack_3.7/sys/vms/vmsmisc.c b/src/NetHack-NetHack-3.7/sys/vms/vmsmisc.c similarity index 100% rename from src/NetHack_3.7/sys/vms/vmsmisc.c rename to src/NetHack-NetHack-3.7/sys/vms/vmsmisc.c diff --git a/src/NetHack_3.7/sys/vms/vmstty.c b/src/NetHack-NetHack-3.7/sys/vms/vmstty.c similarity index 100% rename from src/NetHack_3.7/sys/vms/vmstty.c rename to src/NetHack-NetHack-3.7/sys/vms/vmstty.c diff --git a/src/NetHack_3.7/sys/vms/vmsunix.c b/src/NetHack-NetHack-3.7/sys/vms/vmsunix.c similarity index 100% rename from src/NetHack_3.7/sys/vms/vmsunix.c rename to src/NetHack-NetHack-3.7/sys/vms/vmsunix.c diff --git a/src/NetHack_3.7/sys/windows/.gitattributes b/src/NetHack-NetHack-3.7/sys/windows/.gitattributes similarity index 100% rename from src/NetHack_3.7/sys/windows/.gitattributes rename to src/NetHack-NetHack-3.7/sys/windows/.gitattributes diff --git a/src/NetHack_3.7/sys/windows/.gitignore b/src/NetHack-NetHack-3.7/sys/windows/.gitignore similarity index 100% rename from src/NetHack_3.7/sys/windows/.gitignore rename to src/NetHack-NetHack-3.7/sys/windows/.gitignore diff --git a/src/NetHack_3.7/sys/windows/.nethackrc.template b/src/NetHack-NetHack-3.7/sys/windows/.nethackrc.template similarity index 100% rename from src/NetHack_3.7/sys/windows/.nethackrc.template rename to src/NetHack-NetHack-3.7/sys/windows/.nethackrc.template diff --git a/src/NetHack_3.7/sys/windows/Install.windows b/src/NetHack-NetHack-3.7/sys/windows/Install.windows similarity index 100% rename from src/NetHack_3.7/sys/windows/Install.windows rename to src/NetHack-NetHack-3.7/sys/windows/Install.windows diff --git a/src/NetHack_3.7/sys/windows/Makefile.mingw32 b/src/NetHack-NetHack-3.7/sys/windows/Makefile.mingw32 similarity index 100% rename from src/NetHack_3.7/sys/windows/Makefile.mingw32 rename to src/NetHack-NetHack-3.7/sys/windows/Makefile.mingw32 diff --git a/src/NetHack_3.7/sys/windows/Makefile.mingw32.depend b/src/NetHack-NetHack-3.7/sys/windows/Makefile.mingw32.depend similarity index 100% rename from src/NetHack_3.7/sys/windows/Makefile.mingw32.depend rename to src/NetHack-NetHack-3.7/sys/windows/Makefile.mingw32.depend diff --git a/src/NetHack_3.7/sys/windows/Makefile.nmake b/src/NetHack-NetHack-3.7/sys/windows/Makefile.nmake similarity index 100% rename from src/NetHack_3.7/sys/windows/Makefile.nmake rename to src/NetHack-NetHack-3.7/sys/windows/Makefile.nmake diff --git a/src/NetHack_3.7/sys/windows/console.rc b/src/NetHack-NetHack-3.7/sys/windows/console.rc similarity index 100% rename from src/NetHack_3.7/sys/windows/console.rc rename to src/NetHack-NetHack-3.7/sys/windows/console.rc diff --git a/src/NetHack_3.7/sys/windows/consoletty.c b/src/NetHack-NetHack-3.7/sys/windows/consoletty.c similarity index 100% rename from src/NetHack_3.7/sys/windows/consoletty.c rename to src/NetHack-NetHack-3.7/sys/windows/consoletty.c diff --git a/src/NetHack_3.7/sys/windows/guitty.c b/src/NetHack-NetHack-3.7/sys/windows/guitty.c similarity index 100% rename from src/NetHack_3.7/sys/windows/guitty.c rename to src/NetHack-NetHack-3.7/sys/windows/guitty.c diff --git a/src/NetHack_3.7/sys/windows/nethack.def b/src/NetHack-NetHack-3.7/sys/windows/nethack.def similarity index 100% rename from src/NetHack_3.7/sys/windows/nethack.def rename to src/NetHack-NetHack-3.7/sys/windows/nethack.def diff --git a/src/NetHack_3.7/sys/windows/nhico.uu b/src/NetHack-NetHack-3.7/sys/windows/nhico.uu similarity index 100% rename from src/NetHack_3.7/sys/windows/nhico.uu rename to src/NetHack-NetHack-3.7/sys/windows/nhico.uu diff --git a/src/NetHack_3.7/sys/windows/nhsetup.bat b/src/NetHack-NetHack-3.7/sys/windows/nhsetup.bat similarity index 100% rename from src/NetHack_3.7/sys/windows/nhsetup.bat rename to src/NetHack-NetHack-3.7/sys/windows/nhsetup.bat diff --git a/src/NetHack_3.7/sys/windows/porthelp b/src/NetHack-NetHack-3.7/sys/windows/porthelp similarity index 100% rename from src/NetHack_3.7/sys/windows/porthelp rename to src/NetHack-NetHack-3.7/sys/windows/porthelp diff --git a/src/NetHack_3.7/sys/windows/sysconf.template b/src/NetHack-NetHack-3.7/sys/windows/sysconf.template similarity index 100% rename from src/NetHack_3.7/sys/windows/sysconf.template rename to src/NetHack-NetHack-3.7/sys/windows/sysconf.template diff --git a/src/NetHack_3.7/sys/windows/vs/.gitattributes b/src/NetHack-NetHack-3.7/sys/windows/vs/.gitattributes similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/.gitattributes rename to src/NetHack-NetHack-3.7/sys/windows/vs/.gitattributes diff --git a/src/NetHack_3.7/sys/windows/vs/.gitignore b/src/NetHack-NetHack-3.7/sys/windows/vs/.gitignore similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/.gitignore rename to src/NetHack-NetHack-3.7/sys/windows/vs/.gitignore diff --git a/src/NetHack_3.7/sys/windows/vs/Images/BadgeLogo.scale-100.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/BadgeLogo.scale-100.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/BadgeLogo.scale-100.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/BadgeLogo.scale-100.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/BadgeLogo.scale-125.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/BadgeLogo.scale-125.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/BadgeLogo.scale-125.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/BadgeLogo.scale-125.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/BadgeLogo.scale-150.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/BadgeLogo.scale-150.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/BadgeLogo.scale-150.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/BadgeLogo.scale-150.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/BadgeLogo.scale-200.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/BadgeLogo.scale-200.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/BadgeLogo.scale-200.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/BadgeLogo.scale-200.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/BadgeLogo.scale-400.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/BadgeLogo.scale-400.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/BadgeLogo.scale-400.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/BadgeLogo.scale-400.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/LargeTile.scale-100.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/LargeTile.scale-100.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/LargeTile.scale-100.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/LargeTile.scale-100.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/LargeTile.scale-125.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/LargeTile.scale-125.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/LargeTile.scale-125.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/LargeTile.scale-125.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/LargeTile.scale-150.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/LargeTile.scale-150.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/LargeTile.scale-150.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/LargeTile.scale-150.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/LargeTile.scale-200.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/LargeTile.scale-200.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/LargeTile.scale-200.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/LargeTile.scale-200.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/LargeTile.scale-400.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/LargeTile.scale-400.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/LargeTile.scale-400.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/LargeTile.scale-400.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/LockScreenLogo.scale-200.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/LockScreenLogo.scale-200.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/LockScreenLogo.scale-200.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/LockScreenLogo.scale-200.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/SmallTile.scale-100.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/SmallTile.scale-100.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/SmallTile.scale-100.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/SmallTile.scale-100.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/SmallTile.scale-125.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/SmallTile.scale-125.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/SmallTile.scale-125.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/SmallTile.scale-125.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/SmallTile.scale-150.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/SmallTile.scale-150.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/SmallTile.scale-150.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/SmallTile.scale-150.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/SmallTile.scale-200.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/SmallTile.scale-200.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/SmallTile.scale-200.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/SmallTile.scale-200.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/SmallTile.scale-400.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/SmallTile.scale-400.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/SmallTile.scale-400.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/SmallTile.scale-400.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/SplashScreen.scale-100.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/SplashScreen.scale-100.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/SplashScreen.scale-100.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/SplashScreen.scale-100.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/SplashScreen.scale-125.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/SplashScreen.scale-125.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/SplashScreen.scale-125.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/SplashScreen.scale-125.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/SplashScreen.scale-150.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/SplashScreen.scale-150.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/SplashScreen.scale-150.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/SplashScreen.scale-150.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/SplashScreen.scale-200.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/SplashScreen.scale-200.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/SplashScreen.scale-200.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/SplashScreen.scale-200.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/SplashScreen.scale-400.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/SplashScreen.scale-400.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/SplashScreen.scale-400.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/SplashScreen.scale-400.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square150x150Logo.scale-100.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square150x150Logo.scale-100.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square150x150Logo.scale-100.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square150x150Logo.scale-100.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square150x150Logo.scale-125.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square150x150Logo.scale-125.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square150x150Logo.scale-125.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square150x150Logo.scale-125.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square150x150Logo.scale-150.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square150x150Logo.scale-150.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square150x150Logo.scale-150.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square150x150Logo.scale-150.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square150x150Logo.scale-200.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square150x150Logo.scale-200.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square150x150Logo.scale-200.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square150x150Logo.scale-200.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square150x150Logo.scale-400.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square150x150Logo.scale-400.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square150x150Logo.scale-400.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square150x150Logo.scale-400.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.scale-100.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.scale-100.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.scale-100.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.scale-100.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.scale-125.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.scale-125.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.scale-125.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.scale-125.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.scale-150.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.scale-150.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.scale-150.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.scale-150.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.scale-200.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.scale-200.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.scale-200.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.scale-200.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.scale-400.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.scale-400.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.scale-400.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.scale-400.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-16.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-16.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-16.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-16.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-24.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-24.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-24.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-24.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-256.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-256.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-256.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-256.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-32.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-32.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-32.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-32.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-48.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-48.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-48.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Square44x44Logo.targetsize-48.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/StoreLogo.backup.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/StoreLogo.backup.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/StoreLogo.backup.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/StoreLogo.backup.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/StoreLogo.scale-100.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/StoreLogo.scale-100.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/StoreLogo.scale-100.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/StoreLogo.scale-100.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/StoreLogo.scale-125.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/StoreLogo.scale-125.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/StoreLogo.scale-125.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/StoreLogo.scale-125.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/StoreLogo.scale-150.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/StoreLogo.scale-150.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/StoreLogo.scale-150.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/StoreLogo.scale-150.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/StoreLogo.scale-200.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/StoreLogo.scale-200.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/StoreLogo.scale-200.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/StoreLogo.scale-200.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/StoreLogo.scale-400.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/StoreLogo.scale-400.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/StoreLogo.scale-400.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/StoreLogo.scale-400.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Wide310x150Logo.scale-100.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Wide310x150Logo.scale-100.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Wide310x150Logo.scale-100.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Wide310x150Logo.scale-100.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Wide310x150Logo.scale-125.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Wide310x150Logo.scale-125.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Wide310x150Logo.scale-125.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Wide310x150Logo.scale-125.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Wide310x150Logo.scale-150.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Wide310x150Logo.scale-150.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Wide310x150Logo.scale-150.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Wide310x150Logo.scale-150.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Wide310x150Logo.scale-200.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Wide310x150Logo.scale-200.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Wide310x150Logo.scale-200.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Wide310x150Logo.scale-200.png diff --git a/src/NetHack_3.7/sys/windows/vs/Images/Wide310x150Logo.scale-400.png b/src/NetHack-NetHack-3.7/sys/windows/vs/Images/Wide310x150Logo.scale-400.png similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Images/Wide310x150Logo.scale-400.png rename to src/NetHack-NetHack-3.7/sys/windows/vs/Images/Wide310x150Logo.scale-400.png diff --git a/src/NetHack_3.7/sys/windows/vs/NetHack.sln b/src/NetHack-NetHack-3.7/sys/windows/vs/NetHack.sln similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/NetHack.sln rename to src/NetHack-NetHack-3.7/sys/windows/vs/NetHack.sln diff --git a/src/NetHack_3.7/sys/windows/vs/NetHack/NetHack.vcxproj b/src/NetHack-NetHack-3.7/sys/windows/vs/NetHack/NetHack.vcxproj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/NetHack/NetHack.vcxproj rename to src/NetHack-NetHack-3.7/sys/windows/vs/NetHack/NetHack.vcxproj diff --git a/src/NetHack_3.7/sys/windows/vs/NetHack/afternethack.proj b/src/NetHack-NetHack-3.7/sys/windows/vs/NetHack/afternethack.proj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/NetHack/afternethack.proj rename to src/NetHack-NetHack-3.7/sys/windows/vs/NetHack/afternethack.proj diff --git a/src/NetHack_3.7/sys/windows/vs/NetHackPackage.appxmanifest b/src/NetHack-NetHack-3.7/sys/windows/vs/NetHackPackage.appxmanifest similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/NetHackPackage.appxmanifest rename to src/NetHack-NetHack-3.7/sys/windows/vs/NetHackPackage.appxmanifest diff --git a/src/NetHack_3.7/sys/windows/vs/NetHackPackage.wapproj b/src/NetHack-NetHack-3.7/sys/windows/vs/NetHackPackage.wapproj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/NetHackPackage.wapproj rename to src/NetHack-NetHack-3.7/sys/windows/vs/NetHackPackage.wapproj diff --git a/src/NetHack_3.7/sys/windows/vs/NetHackProperties.props b/src/NetHack-NetHack-3.7/sys/windows/vs/NetHackProperties.props similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/NetHackProperties.props rename to src/NetHack-NetHack-3.7/sys/windows/vs/NetHackProperties.props diff --git a/src/NetHack_3.7/sys/windows/vs/NetHackW/NetHackW.vcxproj b/src/NetHack-NetHack-3.7/sys/windows/vs/NetHackW/NetHackW.vcxproj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/NetHackW/NetHackW.vcxproj rename to src/NetHack-NetHack-3.7/sys/windows/vs/NetHackW/NetHackW.vcxproj diff --git a/src/NetHack_3.7/sys/windows/vs/PDCurses/PDCurses.vcxproj b/src/NetHack-NetHack-3.7/sys/windows/vs/PDCurses/PDCurses.vcxproj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/PDCurses/PDCurses.vcxproj rename to src/NetHack-NetHack-3.7/sys/windows/vs/PDCurses/PDCurses.vcxproj diff --git a/src/NetHack_3.7/sys/windows/vs/PDCursesGui/pdcursesgui.vcxproj b/src/NetHack-NetHack-3.7/sys/windows/vs/PDCursesGui/pdcursesgui.vcxproj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/PDCursesGui/pdcursesgui.vcxproj rename to src/NetHack-NetHack-3.7/sys/windows/vs/PDCursesGui/pdcursesgui.vcxproj diff --git a/src/NetHack_3.7/sys/windows/vs/Package.StoreAssociation.xml b/src/NetHack-NetHack-3.7/sys/windows/vs/Package.StoreAssociation.xml similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/Package.StoreAssociation.xml rename to src/NetHack-NetHack-3.7/sys/windows/vs/Package.StoreAssociation.xml diff --git a/src/NetHack_3.7/sys/windows/vs/ScreenShot.PNG b/src/NetHack-NetHack-3.7/sys/windows/vs/ScreenShot.PNG similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/ScreenShot.PNG rename to src/NetHack-NetHack-3.7/sys/windows/vs/ScreenShot.PNG diff --git a/src/NetHack_3.7/sys/windows/vs/build.bat b/src/NetHack-NetHack-3.7/sys/windows/vs/build.bat similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/build.bat rename to src/NetHack-NetHack-3.7/sys/windows/vs/build.bat diff --git a/src/NetHack_3.7/sys/windows/vs/common.props b/src/NetHack-NetHack-3.7/sys/windows/vs/common.props similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/common.props rename to src/NetHack-NetHack-3.7/sys/windows/vs/common.props diff --git a/src/NetHack_3.7/sys/windows/vs/config.props b/src/NetHack-NetHack-3.7/sys/windows/vs/config.props similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/config.props rename to src/NetHack-NetHack-3.7/sys/windows/vs/config.props diff --git a/src/NetHack_3.7/sys/windows/vs/console.props b/src/NetHack-NetHack-3.7/sys/windows/vs/console.props similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/console.props rename to src/NetHack-NetHack-3.7/sys/windows/vs/console.props diff --git a/src/NetHack_3.7/sys/windows/vs/cpp.hint b/src/NetHack-NetHack-3.7/sys/windows/vs/cpp.hint similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/cpp.hint rename to src/NetHack-NetHack-3.7/sys/windows/vs/cpp.hint diff --git a/src/NetHack_3.7/sys/windows/vs/default.props b/src/NetHack-NetHack-3.7/sys/windows/vs/default.props similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/default.props rename to src/NetHack-NetHack-3.7/sys/windows/vs/default.props diff --git a/src/NetHack_3.7/sys/windows/vs/default_dll.props b/src/NetHack-NetHack-3.7/sys/windows/vs/default_dll.props similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/default_dll.props rename to src/NetHack-NetHack-3.7/sys/windows/vs/default_dll.props diff --git a/src/NetHack_3.7/sys/windows/vs/default_lib.props b/src/NetHack-NetHack-3.7/sys/windows/vs/default_lib.props similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/default_lib.props rename to src/NetHack-NetHack-3.7/sys/windows/vs/default_lib.props diff --git a/src/NetHack_3.7/sys/windows/vs/dirs.props b/src/NetHack-NetHack-3.7/sys/windows/vs/dirs.props similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/dirs.props rename to src/NetHack-NetHack-3.7/sys/windows/vs/dirs.props diff --git a/src/NetHack_3.7/sys/windows/vs/dlb/afterdlb.proj b/src/NetHack-NetHack-3.7/sys/windows/vs/dlb/afterdlb.proj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/dlb/afterdlb.proj rename to src/NetHack-NetHack-3.7/sys/windows/vs/dlb/afterdlb.proj diff --git a/src/NetHack_3.7/sys/windows/vs/dlb/dlb.vcxproj b/src/NetHack-NetHack-3.7/sys/windows/vs/dlb/dlb.vcxproj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/dlb/dlb.vcxproj rename to src/NetHack-NetHack-3.7/sys/windows/vs/dlb/dlb.vcxproj diff --git a/src/NetHack_3.7/sys/windows/vs/dll.props b/src/NetHack-NetHack-3.7/sys/windows/vs/dll.props similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/dll.props rename to src/NetHack-NetHack-3.7/sys/windows/vs/dll.props diff --git a/src/NetHack_3.7/sys/windows/vs/files.props b/src/NetHack-NetHack-3.7/sys/windows/vs/files.props similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/files.props rename to src/NetHack-NetHack-3.7/sys/windows/vs/files.props diff --git a/src/NetHack_3.7/sys/windows/vs/makedefs/aftermakedefs.proj b/src/NetHack-NetHack-3.7/sys/windows/vs/makedefs/aftermakedefs.proj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/makedefs/aftermakedefs.proj rename to src/NetHack-NetHack-3.7/sys/windows/vs/makedefs/aftermakedefs.proj diff --git a/src/NetHack_3.7/sys/windows/vs/makedefs/makedefs.vcxproj b/src/NetHack-NetHack-3.7/sys/windows/vs/makedefs/makedefs.vcxproj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/makedefs/makedefs.vcxproj rename to src/NetHack-NetHack-3.7/sys/windows/vs/makedefs/makedefs.vcxproj diff --git a/src/NetHack_3.7/sys/windows/vs/recover/afterrecover.proj b/src/NetHack-NetHack-3.7/sys/windows/vs/recover/afterrecover.proj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/recover/afterrecover.proj rename to src/NetHack-NetHack-3.7/sys/windows/vs/recover/afterrecover.proj diff --git a/src/NetHack_3.7/sys/windows/vs/recover/recover.vcxproj b/src/NetHack-NetHack-3.7/sys/windows/vs/recover/recover.vcxproj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/recover/recover.vcxproj rename to src/NetHack-NetHack-3.7/sys/windows/vs/recover/recover.vcxproj diff --git a/src/NetHack_3.7/sys/windows/vs/tile2bmp/aftertile2bmp.proj b/src/NetHack-NetHack-3.7/sys/windows/vs/tile2bmp/aftertile2bmp.proj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/tile2bmp/aftertile2bmp.proj rename to src/NetHack-NetHack-3.7/sys/windows/vs/tile2bmp/aftertile2bmp.proj diff --git a/src/NetHack_3.7/sys/windows/vs/tile2bmp/tile2bmp.vcxproj b/src/NetHack-NetHack-3.7/sys/windows/vs/tile2bmp/tile2bmp.vcxproj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/tile2bmp/tile2bmp.vcxproj rename to src/NetHack-NetHack-3.7/sys/windows/vs/tile2bmp/tile2bmp.vcxproj diff --git a/src/NetHack_3.7/sys/windows/vs/tilemap/aftertilemap.proj b/src/NetHack-NetHack-3.7/sys/windows/vs/tilemap/aftertilemap.proj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/tilemap/aftertilemap.proj rename to src/NetHack-NetHack-3.7/sys/windows/vs/tilemap/aftertilemap.proj diff --git a/src/NetHack_3.7/sys/windows/vs/tilemap/tilemap.vcxproj b/src/NetHack-NetHack-3.7/sys/windows/vs/tilemap/tilemap.vcxproj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/tilemap/tilemap.vcxproj rename to src/NetHack-NetHack-3.7/sys/windows/vs/tilemap/tilemap.vcxproj diff --git a/src/NetHack_3.7/sys/windows/vs/tiles/tiles.vcxproj b/src/NetHack-NetHack-3.7/sys/windows/vs/tiles/tiles.vcxproj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/tiles/tiles.vcxproj rename to src/NetHack-NetHack-3.7/sys/windows/vs/tiles/tiles.vcxproj diff --git a/src/NetHack_3.7/sys/windows/vs/uudecode/afteruudecode.proj b/src/NetHack-NetHack-3.7/sys/windows/vs/uudecode/afteruudecode.proj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/uudecode/afteruudecode.proj rename to src/NetHack-NetHack-3.7/sys/windows/vs/uudecode/afteruudecode.proj diff --git a/src/NetHack_3.7/sys/windows/vs/uudecode/uudecode.vcxproj b/src/NetHack-NetHack-3.7/sys/windows/vs/uudecode/uudecode.vcxproj similarity index 100% rename from src/NetHack_3.7/sys/windows/vs/uudecode/uudecode.vcxproj rename to src/NetHack-NetHack-3.7/sys/windows/vs/uudecode/uudecode.vcxproj diff --git a/src/NetHack_3.7/sys/windows/win10.c b/src/NetHack-NetHack-3.7/sys/windows/win10.c similarity index 100% rename from src/NetHack_3.7/sys/windows/win10.c rename to src/NetHack-NetHack-3.7/sys/windows/win10.c diff --git a/src/NetHack_3.7/sys/windows/win10.h b/src/NetHack-NetHack-3.7/sys/windows/win10.h similarity index 100% rename from src/NetHack_3.7/sys/windows/win10.h rename to src/NetHack-NetHack-3.7/sys/windows/win10.h diff --git a/src/NetHack_3.7/sys/windows/win32api.h b/src/NetHack-NetHack-3.7/sys/windows/win32api.h similarity index 100% rename from src/NetHack_3.7/sys/windows/win32api.h rename to src/NetHack-NetHack-3.7/sys/windows/win32api.h diff --git a/src/NetHack_3.7/sys/windows/windmain.c b/src/NetHack-NetHack-3.7/sys/windows/windmain.c similarity index 100% rename from src/NetHack_3.7/sys/windows/windmain.c rename to src/NetHack-NetHack-3.7/sys/windows/windmain.c diff --git a/src/NetHack_3.7/sys/windows/windsys.c b/src/NetHack-NetHack-3.7/sys/windows/windsys.c similarity index 100% rename from src/NetHack_3.7/sys/windows/windsys.c rename to src/NetHack-NetHack-3.7/sys/windows/windsys.c diff --git a/src/NetHack_3.7/sys/windows/winos.h b/src/NetHack-NetHack-3.7/sys/windows/winos.h similarity index 100% rename from src/NetHack_3.7/sys/windows/winos.h rename to src/NetHack-NetHack-3.7/sys/windows/winos.h diff --git a/src/NetHack_3.7/test/.gitattributes b/src/NetHack-NetHack-3.7/test/.gitattributes similarity index 100% rename from src/NetHack_3.7/test/.gitattributes rename to src/NetHack-NetHack-3.7/test/.gitattributes diff --git a/src/NetHack_3.7/test/test_cnf.lua b/src/NetHack-NetHack-3.7/test/test_cnf.lua similarity index 100% rename from src/NetHack_3.7/test/test_cnf.lua rename to src/NetHack-NetHack-3.7/test/test_cnf.lua diff --git a/src/NetHack_3.7/test/test_des.lua b/src/NetHack-NetHack-3.7/test/test_des.lua similarity index 100% rename from src/NetHack_3.7/test/test_des.lua rename to src/NetHack-NetHack-3.7/test/test_des.lua diff --git a/src/NetHack_3.7/test/test_lev.lua b/src/NetHack-NetHack-3.7/test/test_lev.lua similarity index 100% rename from src/NetHack_3.7/test/test_lev.lua rename to src/NetHack-NetHack-3.7/test/test_lev.lua diff --git a/src/NetHack_3.7/test/test_obj.lua b/src/NetHack-NetHack-3.7/test/test_obj.lua similarity index 100% rename from src/NetHack_3.7/test/test_obj.lua rename to src/NetHack-NetHack-3.7/test/test_obj.lua diff --git a/src/NetHack_3.7/test/test_sel.lua b/src/NetHack-NetHack-3.7/test/test_sel.lua similarity index 100% rename from src/NetHack_3.7/test/test_sel.lua rename to src/NetHack-NetHack-3.7/test/test_sel.lua diff --git a/src/NetHack_3.7/test/test_shk.lua b/src/NetHack-NetHack-3.7/test/test_shk.lua similarity index 100% rename from src/NetHack_3.7/test/test_shk.lua rename to src/NetHack-NetHack-3.7/test/test_shk.lua diff --git a/src/NetHack_3.7/test/test_src.lua b/src/NetHack-NetHack-3.7/test/test_src.lua similarity index 100% rename from src/NetHack_3.7/test/test_src.lua rename to src/NetHack-NetHack-3.7/test/test_src.lua diff --git a/src/NetHack_3.7/test/testmove.lua b/src/NetHack-NetHack-3.7/test/testmove.lua similarity index 100% rename from src/NetHack_3.7/test/testmove.lua rename to src/NetHack-NetHack-3.7/test/testmove.lua diff --git a/src/NetHack_3.7/test/testwish.lua b/src/NetHack-NetHack-3.7/test/testwish.lua similarity index 100% rename from src/NetHack_3.7/test/testwish.lua rename to src/NetHack-NetHack-3.7/test/testwish.lua diff --git a/src/NetHack_3.7/util/.gitattributes b/src/NetHack-NetHack-3.7/util/.gitattributes similarity index 100% rename from src/NetHack_3.7/util/.gitattributes rename to src/NetHack-NetHack-3.7/util/.gitattributes diff --git a/src/NetHack_3.7/util/.gitignore b/src/NetHack-NetHack-3.7/util/.gitignore similarity index 100% rename from src/NetHack_3.7/util/.gitignore rename to src/NetHack-NetHack-3.7/util/.gitignore diff --git a/src/NetHack_3.7/util/dlb_main.c b/src/NetHack-NetHack-3.7/util/dlb_main.c similarity index 100% rename from src/NetHack_3.7/util/dlb_main.c rename to src/NetHack-NetHack-3.7/util/dlb_main.c diff --git a/src/NetHack_3.7/util/makedefs.c b/src/NetHack-NetHack-3.7/util/makedefs.c similarity index 100% rename from src/NetHack_3.7/util/makedefs.c rename to src/NetHack-NetHack-3.7/util/makedefs.c diff --git a/src/NetHack_3.7/util/mdgrep.h b/src/NetHack-NetHack-3.7/util/mdgrep.h similarity index 100% rename from src/NetHack_3.7/util/mdgrep.h rename to src/NetHack-NetHack-3.7/util/mdgrep.h diff --git a/src/NetHack_3.7/util/mdgrep.pl b/src/NetHack-NetHack-3.7/util/mdgrep.pl similarity index 100% rename from src/NetHack_3.7/util/mdgrep.pl rename to src/NetHack-NetHack-3.7/util/mdgrep.pl diff --git a/src/NetHack_3.7/util/panic.c b/src/NetHack-NetHack-3.7/util/panic.c similarity index 100% rename from src/NetHack_3.7/util/panic.c rename to src/NetHack-NetHack-3.7/util/panic.c diff --git a/src/NetHack_3.7/util/recover.c b/src/NetHack-NetHack-3.7/util/recover.c similarity index 100% rename from src/NetHack_3.7/util/recover.c rename to src/NetHack-NetHack-3.7/util/recover.c diff --git a/src/NetHack_3.7/win/Qt/.gitattributes b/src/NetHack-NetHack-3.7/win/Qt/.gitattributes similarity index 100% rename from src/NetHack_3.7/win/Qt/.gitattributes rename to src/NetHack-NetHack-3.7/win/Qt/.gitattributes diff --git a/src/NetHack_3.7/win/Qt/.gitignore b/src/NetHack-NetHack-3.7/win/Qt/.gitignore similarity index 100% rename from src/NetHack_3.7/win/Qt/.gitignore rename to src/NetHack-NetHack-3.7/win/Qt/.gitignore diff --git a/src/NetHack_3.7/win/Qt/Qt-issues.txt b/src/NetHack-NetHack-3.7/win/Qt/Qt-issues.txt similarity index 100% rename from src/NetHack_3.7/win/Qt/Qt-issues.txt rename to src/NetHack-NetHack-3.7/win/Qt/Qt-issues.txt diff --git a/src/NetHack_3.7/win/Qt/qt_bind.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_bind.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_bind.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_bind.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_bind.h b/src/NetHack-NetHack-3.7/win/Qt/qt_bind.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_bind.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_bind.h diff --git a/src/NetHack_3.7/win/Qt/qt_click.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_click.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_click.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_click.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_click.h b/src/NetHack-NetHack-3.7/win/Qt/qt_click.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_click.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_click.h diff --git a/src/NetHack_3.7/win/Qt/qt_clust.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_clust.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_clust.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_clust.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_clust.h b/src/NetHack-NetHack-3.7/win/Qt/qt_clust.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_clust.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_clust.h diff --git a/src/NetHack_3.7/win/Qt/qt_delay.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_delay.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_delay.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_delay.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_delay.h b/src/NetHack-NetHack-3.7/win/Qt/qt_delay.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_delay.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_delay.h diff --git a/src/NetHack_3.7/win/Qt/qt_glyph.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_glyph.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_glyph.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_glyph.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_glyph.h b/src/NetHack-NetHack-3.7/win/Qt/qt_glyph.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_glyph.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_glyph.h diff --git a/src/NetHack_3.7/win/Qt/qt_icon.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_icon.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_icon.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_icon.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_icon.h b/src/NetHack-NetHack-3.7/win/Qt/qt_icon.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_icon.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_icon.h diff --git a/src/NetHack_3.7/win/Qt/qt_inv.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_inv.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_inv.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_inv.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_inv.h b/src/NetHack-NetHack-3.7/win/Qt/qt_inv.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_inv.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_inv.h diff --git a/src/NetHack_3.7/win/Qt/qt_kde0.h b/src/NetHack-NetHack-3.7/win/Qt/qt_kde0.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_kde0.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_kde0.h diff --git a/src/NetHack_3.7/win/Qt/qt_key.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_key.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_key.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_key.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_key.h b/src/NetHack-NetHack-3.7/win/Qt/qt_key.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_key.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_key.h diff --git a/src/NetHack_3.7/win/Qt/qt_line.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_line.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_line.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_line.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_line.h b/src/NetHack-NetHack-3.7/win/Qt/qt_line.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_line.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_line.h diff --git a/src/NetHack_3.7/win/Qt/qt_main.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_main.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_main.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_main.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_main.h b/src/NetHack-NetHack-3.7/win/Qt/qt_main.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_main.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_main.h diff --git a/src/NetHack_3.7/win/Qt/qt_map.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_map.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_map.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_map.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_map.h b/src/NetHack-NetHack-3.7/win/Qt/qt_map.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_map.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_map.h diff --git a/src/NetHack_3.7/win/Qt/qt_menu.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_menu.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_menu.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_menu.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_menu.h b/src/NetHack-NetHack-3.7/win/Qt/qt_menu.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_menu.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_menu.h diff --git a/src/NetHack_3.7/win/Qt/qt_msg.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_msg.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_msg.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_msg.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_msg.h b/src/NetHack-NetHack-3.7/win/Qt/qt_msg.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_msg.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_msg.h diff --git a/src/NetHack_3.7/win/Qt/qt_plsel.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_plsel.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_plsel.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_plsel.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_plsel.h b/src/NetHack-NetHack-3.7/win/Qt/qt_plsel.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_plsel.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_plsel.h diff --git a/src/NetHack_3.7/win/Qt/qt_post.h b/src/NetHack-NetHack-3.7/win/Qt/qt_post.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_post.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_post.h diff --git a/src/NetHack_3.7/win/Qt/qt_pre.h b/src/NetHack-NetHack-3.7/win/Qt/qt_pre.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_pre.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_pre.h diff --git a/src/NetHack_3.7/win/Qt/qt_rip.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_rip.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_rip.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_rip.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_rip.h b/src/NetHack-NetHack-3.7/win/Qt/qt_rip.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_rip.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_rip.h diff --git a/src/NetHack_3.7/win/Qt/qt_set.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_set.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_set.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_set.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_set.h b/src/NetHack-NetHack-3.7/win/Qt/qt_set.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_set.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_set.h diff --git a/src/NetHack_3.7/win/Qt/qt_stat.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_stat.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_stat.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_stat.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_stat.h b/src/NetHack-NetHack-3.7/win/Qt/qt_stat.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_stat.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_stat.h diff --git a/src/NetHack_3.7/win/Qt/qt_str.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_str.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_str.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_str.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_str.h b/src/NetHack-NetHack-3.7/win/Qt/qt_str.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_str.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_str.h diff --git a/src/NetHack_3.7/win/Qt/qt_streq.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_streq.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_streq.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_streq.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_streq.h b/src/NetHack-NetHack-3.7/win/Qt/qt_streq.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_streq.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_streq.h diff --git a/src/NetHack_3.7/win/Qt/qt_svsel.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_svsel.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_svsel.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_svsel.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_svsel.h b/src/NetHack-NetHack-3.7/win/Qt/qt_svsel.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_svsel.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_svsel.h diff --git a/src/NetHack_3.7/win/Qt/qt_win.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_win.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_win.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_win.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_win.h b/src/NetHack-NetHack-3.7/win/Qt/qt_win.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_win.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_win.h diff --git a/src/NetHack_3.7/win/Qt/qt_xcmd.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_xcmd.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_xcmd.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_xcmd.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_xcmd.h b/src/NetHack-NetHack-3.7/win/Qt/qt_xcmd.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_xcmd.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_xcmd.h diff --git a/src/NetHack_3.7/win/Qt/qt_xpms.h b/src/NetHack-NetHack-3.7/win/Qt/qt_xpms.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_xpms.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_xpms.h diff --git a/src/NetHack_3.7/win/Qt/qt_yndlg.cpp b/src/NetHack-NetHack-3.7/win/Qt/qt_yndlg.cpp similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_yndlg.cpp rename to src/NetHack-NetHack-3.7/win/Qt/qt_yndlg.cpp diff --git a/src/NetHack_3.7/win/Qt/qt_yndlg.h b/src/NetHack-NetHack-3.7/win/Qt/qt_yndlg.h similarity index 100% rename from src/NetHack_3.7/win/Qt/qt_yndlg.h rename to src/NetHack-NetHack-3.7/win/Qt/qt_yndlg.h diff --git a/src/NetHack_3.7/win/X11/.gitattributes b/src/NetHack-NetHack-3.7/win/X11/.gitattributes similarity index 100% rename from src/NetHack_3.7/win/X11/.gitattributes rename to src/NetHack-NetHack-3.7/win/X11/.gitattributes diff --git a/src/NetHack_3.7/win/X11/Install.X11 b/src/NetHack-NetHack-3.7/win/X11/Install.X11 similarity index 100% rename from src/NetHack_3.7/win/X11/Install.X11 rename to src/NetHack-NetHack-3.7/win/X11/Install.X11 diff --git a/src/NetHack_3.7/win/X11/NetHack.ad b/src/NetHack-NetHack-3.7/win/X11/NetHack.ad similarity index 100% rename from src/NetHack_3.7/win/X11/NetHack.ad rename to src/NetHack-NetHack-3.7/win/X11/NetHack.ad diff --git a/src/NetHack_3.7/win/X11/Window.c b/src/NetHack-NetHack-3.7/win/X11/Window.c similarity index 100% rename from src/NetHack_3.7/win/X11/Window.c rename to src/NetHack-NetHack-3.7/win/X11/Window.c diff --git a/src/NetHack_3.7/win/X11/X11-issues.txt b/src/NetHack-NetHack-3.7/win/X11/X11-issues.txt similarity index 100% rename from src/NetHack_3.7/win/X11/X11-issues.txt rename to src/NetHack-NetHack-3.7/win/X11/X11-issues.txt diff --git a/src/NetHack_3.7/win/X11/dialogs.c b/src/NetHack-NetHack-3.7/win/X11/dialogs.c similarity index 100% rename from src/NetHack_3.7/win/X11/dialogs.c rename to src/NetHack-NetHack-3.7/win/X11/dialogs.c diff --git a/src/NetHack_3.7/win/X11/ibm.bdf b/src/NetHack-NetHack-3.7/win/X11/ibm.bdf similarity index 100% rename from src/NetHack_3.7/win/X11/ibm.bdf rename to src/NetHack-NetHack-3.7/win/X11/ibm.bdf diff --git a/src/NetHack_3.7/win/X11/nethack.rc b/src/NetHack-NetHack-3.7/win/X11/nethack.rc similarity index 100% rename from src/NetHack_3.7/win/X11/nethack.rc rename to src/NetHack-NetHack-3.7/win/X11/nethack.rc diff --git a/src/NetHack_3.7/win/X11/nh10.bdf b/src/NetHack-NetHack-3.7/win/X11/nh10.bdf similarity index 100% rename from src/NetHack_3.7/win/X11/nh10.bdf rename to src/NetHack-NetHack-3.7/win/X11/nh10.bdf diff --git a/src/NetHack_3.7/win/X11/nh32icon b/src/NetHack-NetHack-3.7/win/X11/nh32icon similarity index 100% rename from src/NetHack_3.7/win/X11/nh32icon rename to src/NetHack-NetHack-3.7/win/X11/nh32icon diff --git a/src/NetHack_3.7/win/X11/nh56icon b/src/NetHack-NetHack-3.7/win/X11/nh56icon similarity index 100% rename from src/NetHack_3.7/win/X11/nh56icon rename to src/NetHack-NetHack-3.7/win/X11/nh56icon diff --git a/src/NetHack_3.7/win/X11/nh72icon b/src/NetHack-NetHack-3.7/win/X11/nh72icon similarity index 100% rename from src/NetHack_3.7/win/X11/nh72icon rename to src/NetHack-NetHack-3.7/win/X11/nh72icon diff --git a/src/NetHack_3.7/win/X11/nh_icon.xpm b/src/NetHack-NetHack-3.7/win/X11/nh_icon.xpm similarity index 100% rename from src/NetHack_3.7/win/X11/nh_icon.xpm rename to src/NetHack-NetHack-3.7/win/X11/nh_icon.xpm diff --git a/src/NetHack_3.7/win/X11/pet_mark.xbm b/src/NetHack-NetHack-3.7/win/X11/pet_mark.xbm similarity index 100% rename from src/NetHack_3.7/win/X11/pet_mark.xbm rename to src/NetHack-NetHack-3.7/win/X11/pet_mark.xbm diff --git a/src/NetHack_3.7/win/X11/pilemark.xbm b/src/NetHack-NetHack-3.7/win/X11/pilemark.xbm similarity index 100% rename from src/NetHack_3.7/win/X11/pilemark.xbm rename to src/NetHack-NetHack-3.7/win/X11/pilemark.xbm diff --git a/src/NetHack_3.7/win/X11/rip.xpm b/src/NetHack-NetHack-3.7/win/X11/rip.xpm similarity index 100% rename from src/NetHack_3.7/win/X11/rip.xpm rename to src/NetHack-NetHack-3.7/win/X11/rip.xpm diff --git a/src/NetHack_3.7/win/X11/tile2x11.c b/src/NetHack-NetHack-3.7/win/X11/tile2x11.c similarity index 100% rename from src/NetHack_3.7/win/X11/tile2x11.c rename to src/NetHack-NetHack-3.7/win/X11/tile2x11.c diff --git a/src/NetHack_3.7/win/X11/winX.c b/src/NetHack-NetHack-3.7/win/X11/winX.c similarity index 100% rename from src/NetHack_3.7/win/X11/winX.c rename to src/NetHack-NetHack-3.7/win/X11/winX.c diff --git a/src/NetHack_3.7/win/X11/winmap.c b/src/NetHack-NetHack-3.7/win/X11/winmap.c similarity index 100% rename from src/NetHack_3.7/win/X11/winmap.c rename to src/NetHack-NetHack-3.7/win/X11/winmap.c diff --git a/src/NetHack_3.7/win/X11/winmenu.c b/src/NetHack-NetHack-3.7/win/X11/winmenu.c similarity index 100% rename from src/NetHack_3.7/win/X11/winmenu.c rename to src/NetHack-NetHack-3.7/win/X11/winmenu.c diff --git a/src/NetHack_3.7/win/X11/winmesg.c b/src/NetHack-NetHack-3.7/win/X11/winmesg.c similarity index 100% rename from src/NetHack_3.7/win/X11/winmesg.c rename to src/NetHack-NetHack-3.7/win/X11/winmesg.c diff --git a/src/NetHack_3.7/win/X11/winmisc.c b/src/NetHack-NetHack-3.7/win/X11/winmisc.c similarity index 100% rename from src/NetHack_3.7/win/X11/winmisc.c rename to src/NetHack-NetHack-3.7/win/X11/winmisc.c diff --git a/src/NetHack_3.7/win/X11/winstat.c b/src/NetHack-NetHack-3.7/win/X11/winstat.c similarity index 100% rename from src/NetHack_3.7/win/X11/winstat.c rename to src/NetHack-NetHack-3.7/win/X11/winstat.c diff --git a/src/NetHack_3.7/win/X11/wintext.c b/src/NetHack-NetHack-3.7/win/X11/wintext.c similarity index 100% rename from src/NetHack_3.7/win/X11/wintext.c rename to src/NetHack-NetHack-3.7/win/X11/wintext.c diff --git a/src/NetHack_3.7/win/X11/winval.c b/src/NetHack-NetHack-3.7/win/X11/winval.c similarity index 100% rename from src/NetHack_3.7/win/X11/winval.c rename to src/NetHack-NetHack-3.7/win/X11/winval.c diff --git a/src/NetHack_3.7/win/chain/.gitattributes b/src/NetHack-NetHack-3.7/win/chain/.gitattributes similarity index 100% rename from src/NetHack_3.7/win/chain/.gitattributes rename to src/NetHack-NetHack-3.7/win/chain/.gitattributes diff --git a/src/NetHack_3.7/win/chain/wc_chainin.c b/src/NetHack-NetHack-3.7/win/chain/wc_chainin.c similarity index 100% rename from src/NetHack_3.7/win/chain/wc_chainin.c rename to src/NetHack-NetHack-3.7/win/chain/wc_chainin.c diff --git a/src/NetHack_3.7/win/chain/wc_chainout.c b/src/NetHack-NetHack-3.7/win/chain/wc_chainout.c similarity index 100% rename from src/NetHack_3.7/win/chain/wc_chainout.c rename to src/NetHack-NetHack-3.7/win/chain/wc_chainout.c diff --git a/src/NetHack_3.7/win/chain/wc_trace.c b/src/NetHack-NetHack-3.7/win/chain/wc_trace.c similarity index 100% rename from src/NetHack_3.7/win/chain/wc_trace.c rename to src/NetHack-NetHack-3.7/win/chain/wc_trace.c diff --git a/src/NetHack_3.7/win/curses/Bugs.txt b/src/NetHack-NetHack-3.7/win/curses/Bugs.txt similarity index 100% rename from src/NetHack_3.7/win/curses/Bugs.txt rename to src/NetHack-NetHack-3.7/win/curses/Bugs.txt diff --git a/src/NetHack_3.7/win/curses/Readme.txt b/src/NetHack-NetHack-3.7/win/curses/Readme.txt similarity index 100% rename from src/NetHack_3.7/win/curses/Readme.txt rename to src/NetHack-NetHack-3.7/win/curses/Readme.txt diff --git a/src/NetHack_3.7/win/curses/Todo.txt b/src/NetHack-NetHack-3.7/win/curses/Todo.txt similarity index 100% rename from src/NetHack_3.7/win/curses/Todo.txt rename to src/NetHack-NetHack-3.7/win/curses/Todo.txt diff --git a/src/NetHack_3.7/win/curses/cursdial.c b/src/NetHack-NetHack-3.7/win/curses/cursdial.c similarity index 100% rename from src/NetHack_3.7/win/curses/cursdial.c rename to src/NetHack-NetHack-3.7/win/curses/cursdial.c diff --git a/src/NetHack_3.7/win/curses/cursdial.h b/src/NetHack-NetHack-3.7/win/curses/cursdial.h similarity index 100% rename from src/NetHack_3.7/win/curses/cursdial.h rename to src/NetHack-NetHack-3.7/win/curses/cursdial.h diff --git a/src/NetHack_3.7/win/curses/cursinit.c b/src/NetHack-NetHack-3.7/win/curses/cursinit.c similarity index 100% rename from src/NetHack_3.7/win/curses/cursinit.c rename to src/NetHack-NetHack-3.7/win/curses/cursinit.c diff --git a/src/NetHack_3.7/win/curses/cursinit.h b/src/NetHack-NetHack-3.7/win/curses/cursinit.h similarity index 100% rename from src/NetHack_3.7/win/curses/cursinit.h rename to src/NetHack-NetHack-3.7/win/curses/cursinit.h diff --git a/src/NetHack_3.7/win/curses/cursinvt.c b/src/NetHack-NetHack-3.7/win/curses/cursinvt.c similarity index 100% rename from src/NetHack_3.7/win/curses/cursinvt.c rename to src/NetHack-NetHack-3.7/win/curses/cursinvt.c diff --git a/src/NetHack_3.7/win/curses/cursinvt.h b/src/NetHack-NetHack-3.7/win/curses/cursinvt.h similarity index 100% rename from src/NetHack_3.7/win/curses/cursinvt.h rename to src/NetHack-NetHack-3.7/win/curses/cursinvt.h diff --git a/src/NetHack_3.7/win/curses/cursmain.c b/src/NetHack-NetHack-3.7/win/curses/cursmain.c similarity index 100% rename from src/NetHack_3.7/win/curses/cursmain.c rename to src/NetHack-NetHack-3.7/win/curses/cursmain.c diff --git a/src/NetHack_3.7/win/curses/cursmesg.c b/src/NetHack-NetHack-3.7/win/curses/cursmesg.c similarity index 100% rename from src/NetHack_3.7/win/curses/cursmesg.c rename to src/NetHack-NetHack-3.7/win/curses/cursmesg.c diff --git a/src/NetHack_3.7/win/curses/cursmesg.h b/src/NetHack-NetHack-3.7/win/curses/cursmesg.h similarity index 100% rename from src/NetHack_3.7/win/curses/cursmesg.h rename to src/NetHack-NetHack-3.7/win/curses/cursmesg.h diff --git a/src/NetHack_3.7/win/curses/cursmisc.c b/src/NetHack-NetHack-3.7/win/curses/cursmisc.c similarity index 100% rename from src/NetHack_3.7/win/curses/cursmisc.c rename to src/NetHack-NetHack-3.7/win/curses/cursmisc.c diff --git a/src/NetHack_3.7/win/curses/cursmisc.h b/src/NetHack-NetHack-3.7/win/curses/cursmisc.h similarity index 100% rename from src/NetHack_3.7/win/curses/cursmisc.h rename to src/NetHack-NetHack-3.7/win/curses/cursmisc.h diff --git a/src/NetHack_3.7/win/curses/cursstat.c b/src/NetHack-NetHack-3.7/win/curses/cursstat.c similarity index 100% rename from src/NetHack_3.7/win/curses/cursstat.c rename to src/NetHack-NetHack-3.7/win/curses/cursstat.c diff --git a/src/NetHack_3.7/win/curses/cursstat.h b/src/NetHack-NetHack-3.7/win/curses/cursstat.h similarity index 100% rename from src/NetHack_3.7/win/curses/cursstat.h rename to src/NetHack-NetHack-3.7/win/curses/cursstat.h diff --git a/src/NetHack_3.7/win/curses/curswins.c b/src/NetHack-NetHack-3.7/win/curses/curswins.c similarity index 100% rename from src/NetHack_3.7/win/curses/curswins.c rename to src/NetHack-NetHack-3.7/win/curses/curswins.c diff --git a/src/NetHack_3.7/win/curses/curswins.h b/src/NetHack-NetHack-3.7/win/curses/curswins.h similarity index 100% rename from src/NetHack_3.7/win/curses/curswins.h rename to src/NetHack-NetHack-3.7/win/curses/curswins.h diff --git a/src/NetHack_3.7/win/macosx/.gitattributes b/src/NetHack-NetHack-3.7/win/macosx/.gitattributes similarity index 100% rename from src/NetHack_3.7/win/macosx/.gitattributes rename to src/NetHack-NetHack-3.7/win/macosx/.gitattributes diff --git a/src/NetHack_3.7/win/macosx/NetHackCrashReport.JavaScript b/src/NetHack-NetHack-3.7/win/macosx/NetHackCrashReport.JavaScript similarity index 100% rename from src/NetHack_3.7/win/macosx/NetHackCrashReport.JavaScript rename to src/NetHack-NetHack-3.7/win/macosx/NetHackCrashReport.JavaScript diff --git a/src/NetHack_3.7/win/macosx/NetHackGuidebook.applescript b/src/NetHack-NetHack-3.7/win/macosx/NetHackGuidebook.applescript similarity index 100% rename from src/NetHack_3.7/win/macosx/NetHackGuidebook.applescript rename to src/NetHack-NetHack-3.7/win/macosx/NetHackGuidebook.applescript diff --git a/src/NetHack_3.7/win/macosx/NetHackRecover.applescript b/src/NetHack-NetHack-3.7/win/macosx/NetHackRecover.applescript similarity index 100% rename from src/NetHack_3.7/win/macosx/NetHackRecover.applescript rename to src/NetHack-NetHack-3.7/win/macosx/NetHackRecover.applescript diff --git a/src/NetHack_3.7/win/macosx/NetHackTerm.applescript b/src/NetHack-NetHack-3.7/win/macosx/NetHackTerm.applescript similarity index 100% rename from src/NetHack_3.7/win/macosx/NetHackTerm.applescript rename to src/NetHack-NetHack-3.7/win/macosx/NetHackTerm.applescript diff --git a/src/NetHack_3.7/win/macosx/recover.pl b/src/NetHack-NetHack-3.7/win/macosx/recover.pl similarity index 100% rename from src/NetHack_3.7/win/macosx/recover.pl rename to src/NetHack-NetHack-3.7/win/macosx/recover.pl diff --git a/src/NetHack_3.7/win/share/.gitattributes b/src/NetHack-NetHack-3.7/win/share/.gitattributes similarity index 100% rename from src/NetHack_3.7/win/share/.gitattributes rename to src/NetHack-NetHack-3.7/win/share/.gitattributes diff --git a/src/NetHack_3.7/win/share/.gitignore b/src/NetHack-NetHack-3.7/win/share/.gitignore similarity index 100% rename from src/NetHack_3.7/win/share/.gitignore rename to src/NetHack-NetHack-3.7/win/share/.gitignore diff --git a/src/NetHack_3.7/win/share/bmptiles.c b/src/NetHack-NetHack-3.7/win/share/bmptiles.c similarity index 100% rename from src/NetHack_3.7/win/share/bmptiles.c rename to src/NetHack-NetHack-3.7/win/share/bmptiles.c diff --git a/src/NetHack_3.7/win/share/gifread.c b/src/NetHack-NetHack-3.7/win/share/gifread.c similarity index 100% rename from src/NetHack_3.7/win/share/gifread.c rename to src/NetHack-NetHack-3.7/win/share/gifread.c diff --git a/src/NetHack_3.7/win/share/giftiles.c b/src/NetHack-NetHack-3.7/win/share/giftiles.c similarity index 100% rename from src/NetHack_3.7/win/share/giftiles.c rename to src/NetHack-NetHack-3.7/win/share/giftiles.c diff --git a/src/NetHack_3.7/win/share/monsters.txt b/src/NetHack-NetHack-3.7/win/share/monsters.txt similarity index 100% rename from src/NetHack_3.7/win/share/monsters.txt rename to src/NetHack-NetHack-3.7/win/share/monsters.txt diff --git a/src/NetHack_3.7/win/share/nhcrashreport.lua b/src/NetHack-NetHack-3.7/win/share/nhcrashreport.lua similarity index 100% rename from src/NetHack_3.7/win/share/nhcrashreport.lua rename to src/NetHack-NetHack-3.7/win/share/nhcrashreport.lua diff --git a/src/NetHack_3.7/win/share/nhicns.uu b/src/NetHack-NetHack-3.7/win/share/nhicns.uu similarity index 100% rename from src/NetHack_3.7/win/share/nhicns.uu rename to src/NetHack-NetHack-3.7/win/share/nhicns.uu diff --git a/src/NetHack_3.7/win/share/nhsplash.xpm b/src/NetHack-NetHack-3.7/win/share/nhsplash.xpm similarity index 100% rename from src/NetHack_3.7/win/share/nhsplash.xpm rename to src/NetHack-NetHack-3.7/win/share/nhsplash.xpm diff --git a/src/NetHack_3.7/win/share/objects.txt b/src/NetHack-NetHack-3.7/win/share/objects.txt similarity index 100% rename from src/NetHack_3.7/win/share/objects.txt rename to src/NetHack-NetHack-3.7/win/share/objects.txt diff --git a/src/NetHack_3.7/win/share/other.txt b/src/NetHack-NetHack-3.7/win/share/other.txt similarity index 100% rename from src/NetHack_3.7/win/share/other.txt rename to src/NetHack-NetHack-3.7/win/share/other.txt diff --git a/src/NetHack_3.7/win/share/ppmwrite.c b/src/NetHack-NetHack-3.7/win/share/ppmwrite.c similarity index 100% rename from src/NetHack_3.7/win/share/ppmwrite.c rename to src/NetHack-NetHack-3.7/win/share/ppmwrite.c diff --git a/src/NetHack_3.7/win/share/renumtiles.pl b/src/NetHack-NetHack-3.7/win/share/renumtiles.pl similarity index 100% rename from src/NetHack_3.7/win/share/renumtiles.pl rename to src/NetHack-NetHack-3.7/win/share/renumtiles.pl diff --git a/src/NetHack_3.7/win/share/safeproc.c b/src/NetHack-NetHack-3.7/win/share/safeproc.c similarity index 100% rename from src/NetHack_3.7/win/share/safeproc.c rename to src/NetHack-NetHack-3.7/win/share/safeproc.c diff --git a/src/NetHack_3.7/win/share/thintile.c b/src/NetHack-NetHack-3.7/win/share/thintile.c similarity index 100% rename from src/NetHack_3.7/win/share/thintile.c rename to src/NetHack-NetHack-3.7/win/share/thintile.c diff --git a/src/NetHack_3.7/win/share/tile.doc b/src/NetHack-NetHack-3.7/win/share/tile.doc similarity index 100% rename from src/NetHack_3.7/win/share/tile.doc rename to src/NetHack-NetHack-3.7/win/share/tile.doc diff --git a/src/NetHack_3.7/win/share/tile.h b/src/NetHack-NetHack-3.7/win/share/tile.h similarity index 100% rename from src/NetHack_3.7/win/share/tile.h rename to src/NetHack-NetHack-3.7/win/share/tile.h diff --git a/src/NetHack_3.7/win/share/tile2bmp.c b/src/NetHack-NetHack-3.7/win/share/tile2bmp.c similarity index 100% rename from src/NetHack_3.7/win/share/tile2bmp.c rename to src/NetHack-NetHack-3.7/win/share/tile2bmp.c diff --git a/src/NetHack_3.7/win/share/tilemap.c b/src/NetHack-NetHack-3.7/win/share/tilemap.c similarity index 100% rename from src/NetHack_3.7/win/share/tilemap.c rename to src/NetHack-NetHack-3.7/win/share/tilemap.c diff --git a/src/NetHack_3.7/win/share/tileset.c b/src/NetHack-NetHack-3.7/win/share/tileset.c similarity index 100% rename from src/NetHack_3.7/win/share/tileset.c rename to src/NetHack-NetHack-3.7/win/share/tileset.c diff --git a/src/NetHack_3.7/win/share/tiletext.c b/src/NetHack-NetHack-3.7/win/share/tiletext.c similarity index 100% rename from src/NetHack_3.7/win/share/tiletext.c rename to src/NetHack-NetHack-3.7/win/share/tiletext.c diff --git a/src/NetHack_3.7/win/share/tiletxt.c b/src/NetHack-NetHack-3.7/win/share/tiletxt.c similarity index 100% rename from src/NetHack_3.7/win/share/tiletxt.c rename to src/NetHack-NetHack-3.7/win/share/tiletxt.c diff --git a/src/NetHack_3.7/win/shim/winshim.c b/src/NetHack-NetHack-3.7/win/shim/winshim.c similarity index 100% rename from src/NetHack_3.7/win/shim/winshim.c rename to src/NetHack-NetHack-3.7/win/shim/winshim.c diff --git a/src/NetHack_3.7/win/tty/.gitattributes b/src/NetHack-NetHack-3.7/win/tty/.gitattributes similarity index 100% rename from src/NetHack_3.7/win/tty/.gitattributes rename to src/NetHack-NetHack-3.7/win/tty/.gitattributes diff --git a/src/NetHack_3.7/win/tty/getline.c b/src/NetHack-NetHack-3.7/win/tty/getline.c similarity index 100% rename from src/NetHack_3.7/win/tty/getline.c rename to src/NetHack-NetHack-3.7/win/tty/getline.c diff --git a/src/NetHack_3.7/win/tty/termcap.c b/src/NetHack-NetHack-3.7/win/tty/termcap.c similarity index 100% rename from src/NetHack_3.7/win/tty/termcap.c rename to src/NetHack-NetHack-3.7/win/tty/termcap.c diff --git a/src/NetHack_3.7/win/tty/topl.c b/src/NetHack-NetHack-3.7/win/tty/topl.c similarity index 100% rename from src/NetHack_3.7/win/tty/topl.c rename to src/NetHack-NetHack-3.7/win/tty/topl.c diff --git a/src/NetHack_3.7/win/tty/wintty.c b/src/NetHack-NetHack-3.7/win/tty/wintty.c similarity index 100% rename from src/NetHack_3.7/win/tty/wintty.c rename to src/NetHack-NetHack-3.7/win/tty/wintty.c diff --git a/src/NetHack_3.7/win/win32/.gitattributes b/src/NetHack-NetHack-3.7/win/win32/.gitattributes similarity index 100% rename from src/NetHack_3.7/win/win32/.gitattributes rename to src/NetHack-NetHack-3.7/win/win32/.gitattributes diff --git a/src/NetHack_3.7/win/win32/.gitignore b/src/NetHack-NetHack-3.7/win/win32/.gitignore similarity index 100% rename from src/NetHack_3.7/win/win32/.gitignore rename to src/NetHack-NetHack-3.7/win/win32/.gitignore diff --git a/src/NetHack_3.7/win/win32/NetHackW.c b/src/NetHack-NetHack-3.7/win/win32/NetHackW.c similarity index 100% rename from src/NetHack_3.7/win/win32/NetHackW.c rename to src/NetHack-NetHack-3.7/win/win32/NetHackW.c diff --git a/src/NetHack_3.7/win/win32/NetHackW.exe.manifest b/src/NetHack-NetHack-3.7/win/win32/NetHackW.exe.manifest similarity index 100% rename from src/NetHack_3.7/win/win32/NetHackW.exe.manifest rename to src/NetHack-NetHack-3.7/win/win32/NetHackW.exe.manifest diff --git a/src/NetHack_3.7/win/win32/NetHackW.rc b/src/NetHack-NetHack-3.7/win/win32/NetHackW.rc similarity index 100% rename from src/NetHack_3.7/win/win32/NetHackW.rc rename to src/NetHack-NetHack-3.7/win/win32/NetHackW.rc diff --git a/src/NetHack_3.7/win/win32/mhaskyn.c b/src/NetHack-NetHack-3.7/win/win32/mhaskyn.c similarity index 100% rename from src/NetHack_3.7/win/win32/mhaskyn.c rename to src/NetHack-NetHack-3.7/win/win32/mhaskyn.c diff --git a/src/NetHack_3.7/win/win32/mhaskyn.h b/src/NetHack-NetHack-3.7/win/win32/mhaskyn.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhaskyn.h rename to src/NetHack-NetHack-3.7/win/win32/mhaskyn.h diff --git a/src/NetHack_3.7/win/win32/mhdlg.c b/src/NetHack-NetHack-3.7/win/win32/mhdlg.c similarity index 100% rename from src/NetHack_3.7/win/win32/mhdlg.c rename to src/NetHack-NetHack-3.7/win/win32/mhdlg.c diff --git a/src/NetHack_3.7/win/win32/mhdlg.h b/src/NetHack-NetHack-3.7/win/win32/mhdlg.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhdlg.h rename to src/NetHack-NetHack-3.7/win/win32/mhdlg.h diff --git a/src/NetHack_3.7/win/win32/mhfont.c b/src/NetHack-NetHack-3.7/win/win32/mhfont.c similarity index 100% rename from src/NetHack_3.7/win/win32/mhfont.c rename to src/NetHack-NetHack-3.7/win/win32/mhfont.c diff --git a/src/NetHack_3.7/win/win32/mhfont.h b/src/NetHack-NetHack-3.7/win/win32/mhfont.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhfont.h rename to src/NetHack-NetHack-3.7/win/win32/mhfont.h diff --git a/src/NetHack_3.7/win/win32/mhinput.c b/src/NetHack-NetHack-3.7/win/win32/mhinput.c similarity index 100% rename from src/NetHack_3.7/win/win32/mhinput.c rename to src/NetHack-NetHack-3.7/win/win32/mhinput.c diff --git a/src/NetHack_3.7/win/win32/mhinput.h b/src/NetHack-NetHack-3.7/win/win32/mhinput.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhinput.h rename to src/NetHack-NetHack-3.7/win/win32/mhinput.h diff --git a/src/NetHack_3.7/win/win32/mhmain.c b/src/NetHack-NetHack-3.7/win/win32/mhmain.c similarity index 100% rename from src/NetHack_3.7/win/win32/mhmain.c rename to src/NetHack-NetHack-3.7/win/win32/mhmain.c diff --git a/src/NetHack_3.7/win/win32/mhmain.h b/src/NetHack-NetHack-3.7/win/win32/mhmain.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhmain.h rename to src/NetHack-NetHack-3.7/win/win32/mhmain.h diff --git a/src/NetHack_3.7/win/win32/mhmap.c b/src/NetHack-NetHack-3.7/win/win32/mhmap.c similarity index 100% rename from src/NetHack_3.7/win/win32/mhmap.c rename to src/NetHack-NetHack-3.7/win/win32/mhmap.c diff --git a/src/NetHack_3.7/win/win32/mhmap.h b/src/NetHack-NetHack-3.7/win/win32/mhmap.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhmap.h rename to src/NetHack-NetHack-3.7/win/win32/mhmap.h diff --git a/src/NetHack_3.7/win/win32/mhmenu.c b/src/NetHack-NetHack-3.7/win/win32/mhmenu.c similarity index 100% rename from src/NetHack_3.7/win/win32/mhmenu.c rename to src/NetHack-NetHack-3.7/win/win32/mhmenu.c diff --git a/src/NetHack_3.7/win/win32/mhmenu.h b/src/NetHack-NetHack-3.7/win/win32/mhmenu.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhmenu.h rename to src/NetHack-NetHack-3.7/win/win32/mhmenu.h diff --git a/src/NetHack_3.7/win/win32/mhmsg.h b/src/NetHack-NetHack-3.7/win/win32/mhmsg.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhmsg.h rename to src/NetHack-NetHack-3.7/win/win32/mhmsg.h diff --git a/src/NetHack_3.7/win/win32/mhmsgwnd.c b/src/NetHack-NetHack-3.7/win/win32/mhmsgwnd.c similarity index 100% rename from src/NetHack_3.7/win/win32/mhmsgwnd.c rename to src/NetHack-NetHack-3.7/win/win32/mhmsgwnd.c diff --git a/src/NetHack_3.7/win/win32/mhmsgwnd.h b/src/NetHack-NetHack-3.7/win/win32/mhmsgwnd.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhmsgwnd.h rename to src/NetHack-NetHack-3.7/win/win32/mhmsgwnd.h diff --git a/src/NetHack_3.7/win/win32/mhrip.c b/src/NetHack-NetHack-3.7/win/win32/mhrip.c similarity index 100% rename from src/NetHack_3.7/win/win32/mhrip.c rename to src/NetHack-NetHack-3.7/win/win32/mhrip.c diff --git a/src/NetHack_3.7/win/win32/mhrip.h b/src/NetHack-NetHack-3.7/win/win32/mhrip.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhrip.h rename to src/NetHack-NetHack-3.7/win/win32/mhrip.h diff --git a/src/NetHack_3.7/win/win32/mhsplash.c b/src/NetHack-NetHack-3.7/win/win32/mhsplash.c similarity index 100% rename from src/NetHack_3.7/win/win32/mhsplash.c rename to src/NetHack-NetHack-3.7/win/win32/mhsplash.c diff --git a/src/NetHack_3.7/win/win32/mhsplash.h b/src/NetHack-NetHack-3.7/win/win32/mhsplash.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhsplash.h rename to src/NetHack-NetHack-3.7/win/win32/mhsplash.h diff --git a/src/NetHack_3.7/win/win32/mhstatus.c b/src/NetHack-NetHack-3.7/win/win32/mhstatus.c similarity index 100% rename from src/NetHack_3.7/win/win32/mhstatus.c rename to src/NetHack-NetHack-3.7/win/win32/mhstatus.c diff --git a/src/NetHack_3.7/win/win32/mhstatus.h b/src/NetHack-NetHack-3.7/win/win32/mhstatus.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhstatus.h rename to src/NetHack-NetHack-3.7/win/win32/mhstatus.h diff --git a/src/NetHack_3.7/win/win32/mhtext.c b/src/NetHack-NetHack-3.7/win/win32/mhtext.c similarity index 100% rename from src/NetHack_3.7/win/win32/mhtext.c rename to src/NetHack-NetHack-3.7/win/win32/mhtext.c diff --git a/src/NetHack_3.7/win/win32/mhtext.h b/src/NetHack-NetHack-3.7/win/win32/mhtext.h similarity index 100% rename from src/NetHack_3.7/win/win32/mhtext.h rename to src/NetHack-NetHack-3.7/win/win32/mhtext.h diff --git a/src/NetHack_3.7/win/win32/mnsel.uu b/src/NetHack-NetHack-3.7/win/win32/mnsel.uu similarity index 100% rename from src/NetHack_3.7/win/win32/mnsel.uu rename to src/NetHack-NetHack-3.7/win/win32/mnsel.uu diff --git a/src/NetHack_3.7/win/win32/mnselcnt.uu b/src/NetHack-NetHack-3.7/win/win32/mnselcnt.uu similarity index 100% rename from src/NetHack_3.7/win/win32/mnselcnt.uu rename to src/NetHack-NetHack-3.7/win/win32/mnselcnt.uu diff --git a/src/NetHack_3.7/win/win32/mnunsel.uu b/src/NetHack-NetHack-3.7/win/win32/mnunsel.uu similarity index 100% rename from src/NetHack_3.7/win/win32/mnunsel.uu rename to src/NetHack-NetHack-3.7/win/win32/mnunsel.uu diff --git a/src/NetHack_3.7/win/win32/mswproc.c b/src/NetHack-NetHack-3.7/win/win32/mswproc.c similarity index 100% rename from src/NetHack_3.7/win/win32/mswproc.c rename to src/NetHack-NetHack-3.7/win/win32/mswproc.c diff --git a/src/NetHack_3.7/win/win32/nethack.rc b/src/NetHack-NetHack-3.7/win/win32/nethack.rc similarity index 100% rename from src/NetHack_3.7/win/win32/nethack.rc rename to src/NetHack-NetHack-3.7/win/win32/nethack.rc diff --git a/src/NetHack_3.7/win/win32/nhresource.h b/src/NetHack-NetHack-3.7/win/win32/nhresource.h similarity index 100% rename from src/NetHack_3.7/win/win32/nhresource.h rename to src/NetHack-NetHack-3.7/win/win32/nhresource.h diff --git a/src/NetHack_3.7/win/win32/petmark.uu b/src/NetHack-NetHack-3.7/win/win32/petmark.uu similarity index 100% rename from src/NetHack_3.7/win/win32/petmark.uu rename to src/NetHack-NetHack-3.7/win/win32/petmark.uu diff --git a/src/NetHack_3.7/win/win32/pilemark.uu b/src/NetHack-NetHack-3.7/win/win32/pilemark.uu similarity index 100% rename from src/NetHack_3.7/win/win32/pilemark.uu rename to src/NetHack-NetHack-3.7/win/win32/pilemark.uu diff --git a/src/NetHack_3.7/win/win32/record.uu b/src/NetHack-NetHack-3.7/win/win32/record.uu similarity index 100% rename from src/NetHack_3.7/win/win32/record.uu rename to src/NetHack-NetHack-3.7/win/win32/record.uu diff --git a/src/NetHack_3.7/win/win32/resource.h b/src/NetHack-NetHack-3.7/win/win32/resource.h similarity index 100% rename from src/NetHack_3.7/win/win32/resource.h rename to src/NetHack-NetHack-3.7/win/win32/resource.h diff --git a/src/NetHack_3.7/win/win32/rip.uu b/src/NetHack-NetHack-3.7/win/win32/rip.uu similarity index 100% rename from src/NetHack_3.7/win/win32/rip.uu rename to src/NetHack-NetHack-3.7/win/win32/rip.uu diff --git a/src/NetHack_3.7/win/win32/splash.uu b/src/NetHack-NetHack-3.7/win/win32/splash.uu similarity index 100% rename from src/NetHack_3.7/win/win32/splash.uu rename to src/NetHack-NetHack-3.7/win/win32/splash.uu diff --git a/src/NetHack_3.7/win/win32/tiles-mingw32.mak b/src/NetHack-NetHack-3.7/win/win32/tiles-mingw32.mak similarity index 100% rename from src/NetHack_3.7/win/win32/tiles-mingw32.mak rename to src/NetHack-NetHack-3.7/win/win32/tiles-mingw32.mak diff --git a/src/NetHack_3.7/win/win32/tiles.mak b/src/NetHack-NetHack-3.7/win/win32/tiles.mak similarity index 100% rename from src/NetHack_3.7/win/win32/tiles.mak rename to src/NetHack-NetHack-3.7/win/win32/tiles.mak diff --git a/src/NetHack_3.7/win/win32/winMS.h b/src/NetHack-NetHack-3.7/win/win32/winMS.h similarity index 100% rename from src/NetHack_3.7/win/win32/winMS.h rename to src/NetHack-NetHack-3.7/win/win32/winMS.h