diff options
| -rw-r--r-- | crawl-ref/source/art-data.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/art-data.txt | 65 | ||||
| -rw-r--r-- | crawl-ref/source/artefact.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 88 | ||||
| -rwxr-xr-x | crawl-ref/source/util/art-data.pl | 4 |
5 files changed, 73 insertions, 92 deletions
diff --git a/crawl-ref/source/art-data.h b/crawl-ref/source/art-data.h index 883088ac48..9f37c68dba 100644 --- a/crawl-ref/source/art-data.h +++ b/crawl-ref/source/art-data.h @@ -906,7 +906,7 @@ "These boots were specially designed by the Assassin's Guild.", }, -/* 53: UNRAND_LEARS */ +/* 53: UNRAND_LEAR */ { "Lear's chain mail", "golden chain mail", OBJ_ARMOUR, ARM_CHAIN_MAIL, -1, 0, YELLOW, @@ -1025,7 +1025,7 @@ "", }, -/* 60: UNRAND_DRAGON */ +/* 60: UNRAND_DRAGONMASK */ { "mask of the Dragon", "blue mask", OBJ_ARMOUR, ARM_CAP, 0, 0, BLUE, diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt index ffa2dadafc..11ed98ec90 100644 --- a/crawl-ref/source/art-data.txt +++ b/crawl-ref/source/art-data.txt @@ -9,13 +9,13 @@ # fields. # # The name and appearance of each unrandart must be unique. -# +# # Changing the name of an unrand will change it's automatically # generated enumeration, unless its enumeration is forced with ENUM. # # "ENUM: FOO" can be used to force the enumeration for an unrand to be -# "UNRAND_FOO", for cases where the automatically generated enumarations -# of different unrands conflict. +# "UNRAND_FOO", for cases where the automatically generated enumerations +# of different unrandarts conflict. # # Add new artefact definitions at the end of the file; doing so should cause # no problems with save-file compatibilty, but for tile builds it will @@ -23,6 +23,14 @@ # own tiles). Changing the order of the definitions will likely cause # strange behaviour in games saved previous to the change, and deleting # definitions will break savefile compatibility. +# +# Each unrandart needs two tiles, one item tile and one equipment tile for the +# player doll. The former needs to be placed into rltiles/item and defined in +# dc-item.txt, the latter in the appropriate player/ subfolder and defined in +# dc-player.txt. In tilepick.cc the unrandart must then be assigned to the tile +# name defined in the dc-***.txt. +# For a start, placeholders (e.g. reference to the base type tiles) are fine, +# but they'll eventually need to be replaced with proper tiles. # This entry must always be first. ENUM: DUMMY1 @@ -47,8 +55,8 @@ APPEAR: bloodstained battleaxe OBJ: OBJ_WEAPONS/WPN_BATTLEAXE PLUS: +3/+11 COLOUR: RED -DESC_ID: This was the favourite weapon of the old god Trog, before it was - lost one day. It induces a bloodthirsty berserker rage in anyone +DESC_ID: This was the favourite weapon of the old god Trog, before it was + lost one day. It induces a bloodthirsty berserker rage in anyone who uses it to strike another. NAME: Mace of Variability @@ -63,8 +71,8 @@ APPEAR: purple glaive OBJ: OBJ_WEAPONS/WPN_GLAIVE PLUS: 0/+12 COLOUR: MAGENTA -DESC_ID: It is the creation of a mad god, and carries a curse which - transforms anyone possessing it into a prune. Fortunately, the +DESC_ID: It is the creation of a mad god, and carries a curse which + transforms anyone possessing it into a prune. Fortunately, the curse works very slowly, and one can use it briefly with no consequences worse than slightly purple skin and a few wrinkles. @@ -108,7 +116,7 @@ APPEAR: warped scythe OBJ: OBJ_WEAPONS/WPN_SCYTHE PLUS: +13/+13 COLOUR: DARKGREY -CURSED: -1 +CURSED: -1 DESC_ID: This weapon carries a terrible and highly irritating curse. NAME: Sceptre of Torment @@ -158,7 +166,7 @@ COLOUR: DARKGREY BRAND: SPWPN_VORPAL BERSERK: true ANGRY: true -STEALTH: -20 +STEALTH: -20 NAME: scimitar of Flaming Death APPEAR: smoking scimitar @@ -181,7 +189,7 @@ AC: 5 INT: 5 LIFE: true SEEINV: true -STEALTH: -20 +STEALTH: -20 NAME: demon blade "Leech" APPEAR: runed demon blade @@ -216,9 +224,9 @@ COLOUR: LIGHTRED BRAND: SPWPN_PAIN INT: 5 MAGIC: 30 -DESC: An ugly rusty dagger. +DESC: An ugly rusty dagger. DESC_END: Many years ago it was the property of a powerful mage called Boris. - He got lost in the Dungeon while seeking the Orb. + He got lost in the Dungeon while seeking the Orb. NAME: scythe "Finisher" APPEAR: blackened scythe @@ -248,7 +256,7 @@ COLOUR: YELLOW BRAND: SPWPN_SPEED DEX: 3 SEEINV: true -DESC: A wonderful golden bow. +DESC: A wonderful golden bow. DESC_END: It once belonged to a foreign god. It works best with special arrows which are not generally available. @@ -282,7 +290,7 @@ EV: 3 LIFE: true MAGIC: 20 ANGRY: true -STEALTH: -50 +STEALTH: -50 DESC_END: This sword was The Shining One's gift to a worshipper. DESC: A long sword made of one huge piece of crystal. @@ -330,7 +338,7 @@ BRAND: SPWPN_VAMPIRICISM POISON: true LIFE: true NOISES: true -STEALTH: -30 +STEALTH: -30 DESC_END: A really dark and malign artefact, which no wise man would even touch. NAME: trident of the Octopus King @@ -395,7 +403,7 @@ OBJ: OBJ_WEAPONS/WPN_BLOWGUN PLUS: +6/+6 COLOUR: WHITE INV: true -STEALTH: 60 +STEALTH: 60 DESC: It is designed for easy concealment, but still packs a nasty punch. NAME: Wyrmbane @@ -417,7 +425,7 @@ COLOUR: LIGHTCYAN EV: 4 DEX: 4 MAGIC: 20 -STEALTH: 50 +STEALTH: 50 DESC: A dainty little knife. DESC_END: This knife was made by Spriggans, or for Spriggans, or possibly from Spriggans. Anyway, it's in some way associated with those @@ -430,7 +438,7 @@ PLUS: +12/+16 COLOUR: LIGHTGREEN MUTATE: 6 CURSED: 1 -STEALTH: -20 +STEALTH: -20 DESC: A long sword made of weird glowing metal. NAME: great mace "Undeadhunter" @@ -499,7 +507,7 @@ SEEINV: true INV: true LEV: true DAM: -3 -STEALTH: 60 +STEALTH: 60 DESC_END: It allows its wearer to excel in the arts of thievery. NAME: shield "Bullseye" @@ -533,7 +541,7 @@ NOSPELL: true RND_TELE: true MUTATE: 5 CURSED: 1 -STEALTH: -80 +STEALTH: -80 DESC: A splendid flowing robe of fur and silk. NAME: cloak of Flash @@ -554,11 +562,11 @@ PLUS: +2 COLOUR: BROWN DEX: 3 INV: true -STEALTH: 80 +STEALTH: 80 DESC: Some soft boots. DESC_END: These boots were specially designed by the Assassin's Guild. -ENUM: LEARS +ENUM: LEAR NAME: Lear's chain mail APPEAR: golden chain mail OBJ: OBJ_ARMOUR/ARM_CHAIN_MAIL @@ -626,6 +634,7 @@ NOTELEP: true CURSED: -1 DESC: A weird-looking armour. +ENUM: DRAGONMASK NAME: mask of the Dragon APPEAR: blue mask OBJ: OBJ_ARMOUR/ARM_CAP @@ -644,7 +653,7 @@ COLOUR: DARKGREY MAGIC: 30 SEEINV: true INV: true -STEALTH: 50 +STEALTH: 50 DESC: A long black robe made of strange glossy material. DESC_END: According to legend, this robe was the gift of Ratri the Goddess of the Night to one of her followers. @@ -684,7 +693,7 @@ COLOUR: WHITE EV: 4 COLD: 1 ELEC: true -STEALTH: -30 +STEALTH: -30 DESC_END: A cloak woven of pure light beams. DESC: A phosphorescent cloak. @@ -710,7 +719,7 @@ COLOUR: LIGHTCYAN EV: 3 ELEC: true LEV: true -STEALTH: 50 +STEALTH: 50 DESC: A sky-blue amulet. NAME: ring of Shadows @@ -721,7 +730,7 @@ EV: 4 LIFE: true SEEINV: true ACC: -3 -STEALTH: 40 +STEALTH: 40 NAME: amulet of Cekugob APPEAR: crystal amulet @@ -752,7 +761,7 @@ MAGIC: 30 ANGRY: true DAM: 3 CURSED: 3 -STEALTH: -20 +STEALTH: -20 NAME: ring of Shaolin APPEAR: jade ring @@ -780,7 +789,7 @@ COLOUR: LIGHTBLUE AC: 4 EV: 4 DESC: A shield-shaped amulet. -DESC_END: Back in the good old days, every adventurer had one of these +DESC_END: Back in the good old days, every adventurer had one of these handy devices. That, and a pony. # This entry must alway be last. diff --git a/crawl-ref/source/artefact.h b/crawl-ref/source/artefact.h index 58b5cf55f7..d3b195c2b1 100644 --- a/crawl-ref/source/artefact.h +++ b/crawl-ref/source/artefact.h @@ -102,14 +102,14 @@ enum unrand_type UNRAND_MISFORTUNE, // robe of Misfortune UNRAND_FLASH, // cloak of Flash UNRAND_BOOTS_ASSASSIN, // boots of the Assassin - UNRAND_LEARS, // Lear's chain mail + UNRAND_LEAR, // Lear's chain mail UNRAND_ZHOR, // skin of Zhor UNRAND_SALAMANDER, // salamander hide armour UNRAND_WAR, // gauntlets of War UNRAND_RESISTANCE, // shield of Resistance UNRAND_FOLLY, // robe of Folly UNRAND_MAXWELL, // Maxwell's patent armour - UNRAND_DRAGON, // mask of the Dragon + UNRAND_DRAGONMASK, // mask of the Dragon UNRAND_NIGHT, // robe of Night UNRAND_DRAGON_KING, // armour of the Dragon King UNRAND_ALCHEMIST, // hat of the Alchemist diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 99360d295d..eae2663e46 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1141,13 +1141,12 @@ static int _tileidx_unrand_artefact(int idx) case UNRAND_ELEMENTAL_STAFF: return TILE_URAND_ELEMENTAL; case UNRAND_SNIPER: return TILE_URAND_SNIPER; case UNRAND_NIGHT: return TILE_URAND_NIGHT; - case UNRAND_PLUTONIUM: return TILE_URAND_PLUTONIUM; + case UNRAND_PLUTONIUM_SWORD: return TILE_URAND_PLUTONIUM; case UNRAND_UNDEADHUNTER: return TILE_URAND_UNDEADHUNTER; case UNRAND_DRAGON_KING: return TILE_URAND_DRAGON_KING; case UNRAND_ALCHEMIST: return TILE_URAND_ALCHEMIST; - case UNRAND_FENCER: return TILE_URAND_FENCER; + case UNRAND_FENCERS_GLOVES: return TILE_URAND_FENCER; case UNRAND_MAGE: return TILE_URAND_MAGE; - case UNRAND_BLOWGUN_ASSASSIN: return TILE_URAND_BLOWGUN; case UNRAND_WYRMBANE: return TILE_URAND_WYRMBANE; case UNRAND_SPRIGGANS_KNIFE: return TILE_URAND_SPRIGGANS_KNIFE; case UNRAND_STARLIGHT: return TILE_URAND_STARLIGHT; @@ -3406,61 +3405,34 @@ int tilep_equ_weapon(const item_def &item) case SPWPN_SWORD_OF_POWER: return TILEP_HAND1_SWORD_OF_POWER; case SPWPN_VAMPIRES_TOOTH: return TILEP_HAND1_VAMPIRES_TOOTH; case SPWPN_STAFF_OF_WUCAD_MU: return TILEP_HAND1_WUCAD_MU; - // Bloodbane - case UNRAND_BLOODBANE: return TILEP_HAND1_BLOODBANE; - // Flaming Death - case UNRAND_FLAMING_DEATH: return TILEP_HAND1_FLAMING_DEATH; - // mace of Brilliance - case UNRAND_BRILLIANCE: return TILEP_HAND1_MACE_OF_BRILLIANCE; - // demon blade Leech - case UNRAND_LEECH: return TILEP_HAND1_LEECH; - // dagger of Chilly Death - case UNRAND_CHILLY_DEATH: return TILEP_HAND1_CHILLY_DEATH; - // dagger "Morg" - case UNRAND_MORG: return TILEP_HAND1_MORG; - // scythe "Finisher" - case UNRAND_FINISHER: return TILEP_HAND1_FINISHER; - // sling "Punk - case UNRAND_PUNK: return TILEP_HAND1_PUNK; - // bow of Krishna - case UNRAND_KRISHNA: return TILEP_HAND1_KRISHNA; - // giant club "Skullcrusher" - case UNRAND_SKULLCRUSHER: return TILEP_HAND1_GIANT_CLUB_SLANT; - // glaive of the Guard - case UNRAND_GUARD: return TILEP_HAND1_GLAIVE_OF_THE_GUARD; - // sword of Jihad - case UNRAND_JIHAD: return TILEP_HAND1_JIHAD; - // crossbow "Fiery Devil" - case UNRAND_HELLFIRE: return TILEP_HAND1_FIERY_DEVIL; - // sword of Doom Knight - case UNRAND_DOOM_KNIGHT: return TILEP_HAND1_DOOM_KNIGHT; - // Eos - case UNRAND_EOS: return TILEP_HAND1_EOS; - // spear of Voo-Doo - case UNRAND_BOTONO: return TILEP_HAND1_VOODOO; - // trident of the Octopus king - case UNRAND_OCTOPUS_KING: return TILEP_HAND1_TRIDENT_OCTOPUS_KING; - // mithril axe "Arga" - case UNRAND_ARGA: return TILEP_HAND1_ARGA; - // Elemental Staff - case UNRAND_ELEMENTAL_STAFF: return TILEP_HAND1_ELEMENTAL_STAFF; - // hand crossbow "Sniper" - case UNRAND_SNIPER: return TILEP_HAND1_SNIPER; - // plutonium sword - case UNRAND_PLUTONIUM: return TILEP_HAND1_PLUTONIUM_SWORD; - // blowgun of the Assassin - case UNRAND_BLOWGUN_ASSASSIN: return TILEP_HAND1_BLOWGUN_ASSASSIN; - // Wyrmbane - case UNRAND_WYRMBANE: return TILEP_HAND1_WYRMBANE; - // Spriggan's Knife - case UNRAND_SPRIGGANS_KINFE: return TILEP_HAND1_SPRIGGANS_KNIFE; - // whip "Serpent Scourge" - case UNRAND_SERPENT_SCOURGE: return TILEP_HAND1_SERPENT_SCOURGE; - // knife of Accuracy - case UNRAND_ACCURACY: return TILEP_HAND1_KNIFE_OF_ACCURACY; - // bow "Erchidel" - // XXX: What happened to this unrand? - //case UNRAND_: return TILEP_HAND1_GREAT_BOW; + + case UNRAND_BLOODBANE: return TILEP_HAND1_BLOODBANE; + case UNRAND_FLAMING_DEATH: return TILEP_HAND1_FLAMING_DEATH; + case UNRAND_BRILLIANCE: return TILEP_HAND1_MACE_OF_BRILLIANCE; + case UNRAND_LEECH: return TILEP_HAND1_LEECH; + case UNRAND_CHILLY_DEATH: return TILEP_HAND1_CHILLY_DEATH; + case UNRAND_MORG: return TILEP_HAND1_MORG; + case UNRAND_FINISHER: return TILEP_HAND1_FINISHER; + case UNRAND_PUNK: return TILEP_HAND1_PUNK; + case UNRAND_KRISHNA: return TILEP_HAND1_KRISHNA; + case UNRAND_SKULLCRUSHER: return TILEP_HAND1_GIANT_CLUB_SLANT; + case UNRAND_GUARD: return TILEP_HAND1_GLAIVE_OF_THE_GUARD; + case UNRAND_JIHAD: return TILEP_HAND1_JIHAD; + case UNRAND_HELLFIRE: return TILEP_HAND1_FIERY_DEVIL; + case UNRAND_DOOM_KNIGHT: return TILEP_HAND1_DOOM_KNIGHT; + case UNRAND_EOS: return TILEP_HAND1_EOS; + case UNRAND_BOTONO: return TILEP_HAND1_VOODOO; + case UNRAND_OCTOPUS_KING: return TILEP_HAND1_TRIDENT_OCTOPUS_KING; + case UNRAND_ARGA: return TILEP_HAND1_ARGA; + case UNRAND_ELEMENTAL_STAFF: return TILEP_HAND1_ELEMENTAL_STAFF; + case UNRAND_SNIPER: return TILEP_HAND1_SNIPER; + case UNRAND_PLUTONIUM_SWORD: return TILEP_HAND1_PLUTONIUM_SWORD; + case UNRAND_BLOWGUN_ASSASSIN: return TILEP_HAND1_BLOWGUN_ASSASSIN; + case UNRAND_WYRMBANE: return TILEP_HAND1_WYRMBANE; + case UNRAND_SPRIGGANS_KNIFE: return TILEP_HAND1_SPRIGGANS_KNIFE; + case UNRAND_SERPENT_SCOURGE: return TILEP_HAND1_SERPENT_SCOURGE; + case UNRAND_ACCURACY: return TILEP_HAND1_KNIFE_OF_ACCURACY; + case UNRAND_PIERCER: return TILEP_HAND1_GREAT_BOW; } } diff --git a/crawl-ref/source/util/art-data.pl b/crawl-ref/source/util/art-data.pl index bbd7e716dc..48c966ac7a 100755 --- a/crawl-ref/source/util/art-data.pl +++ b/crawl-ref/source/util/art-data.pl @@ -534,7 +534,7 @@ sub write_enums if (@enum_list != @all_artefacts) { - print "Enumeartion list changed.\n"; + print "Enumeration list changed.\n"; $changed = 1; } else @@ -544,7 +544,7 @@ sub write_enums { if ($enum_list[$i] ne "UNRAND_$all_artefacts[$i]->{_ENUM}") { - print "Enumeartion list changed.\n"; + print "Enumeration list changed.\n"; $changed = 1; last; } |