• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revisionf2d761347883755e5904768156ff34d9aa8e5473 (tree)
Time2019-06-01 13:39:26
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 SVAL_* を object.h へ移動.

Change Summary

Incremental Difference

--- a/src/defines.h
+++ b/src/defines.h
@@ -277,617 +277,6 @@
277277 #define CEM_RIDING 0x0001
278278 #define CEM_P_CAN_ENTER_PATTERN 0x0002
279279
280-/*** Object "tval" and "sval" codes ***/
281-
282-/* Any subvalue */
283-#define SV_ANY 255
284-
285-/* The "sval" codes for TV_FIGURINE */
286-#define SV_FIGURINE_NORMAL 0
287-
288-#define SV_CAPTURE_NONE 0
289-
290-/* The "sval" codes for TV_STATUE */
291-#define SV_WOODEN_STATUE 0
292-#define SV_CLAY_STATUE 1
293-#define SV_STONE_STATUE 2
294-#define SV_IRON_STATUE 3
295-#define SV_COPPER_STATUE 4
296-#define SV_SILVER_STATUE 5
297-#define SV_GOLDEN_STATUE 6
298-#define SV_IVORY_STATUE 7
299-#define SV_MITHRIL_STATUE 8
300-#define SV_ORNATE_STATUE 9
301-#define SV_PHOTO 50
302-
303-/* The "sval" codes for TV_CORPSE */
304-#define SV_SKELETON 0
305-#define SV_CORPSE 1
306-
307-/* The "sval" codes for TV_SHOT/TV_ARROW/TV_BOLT */
308-#define SV_AMMO_LIGHT 0 /* pebbles */
309-#define SV_AMMO_NORMAL 1 /* shots, arrows, bolts */
310-#define SV_AMMO_HEAVY 2 /* seeker arrows and bolts, mithril shots */
311-
312-/* The "sval" codes for TV_BOW (note information in "sval") */
313-#define SV_SLING 2 /* (x2) */
314-#define SV_SHORT_BOW 12 /* (x2) */
315-#define SV_LONG_BOW 13 /* (x3) */
316-#define SV_LIGHT_XBOW 23 /* (x3) */
317-#define SV_HEAVY_XBOW 24 /* (x4) */
318-#define SV_CRIMSON 50 /* (x0) */
319-#define SV_HARP 51 /* (x0) */
320-#define SV_NAMAKE_BOW 63 /* (x3) */
321-
322-/* The "sval" codes for TV_DIGGING */
323-#define SV_SHOVEL 1
324-#define SV_GNOMISH_SHOVEL 2
325-#define SV_DWARVEN_SHOVEL 3
326-#define SV_PICK 4
327-#define SV_ORCISH_PICK 5
328-#define SV_DWARVEN_PICK 6
329-#define SV_MATTOCK 7
330-
331-/* The "sval" values for TV_HAFTED */
332-#define SV_CLUB 1 /* 1d4 */
333-#define SV_WHIP 2 /* 1d6 */
334-#define SV_QUARTERSTAFF 3 /* 1d9 */
335-#define SV_NUNCHAKU 4 /* 2d3 */
336-#define SV_MACE 5 /* 2d4 */
337-#define SV_BALL_AND_CHAIN 6 /* 2d4 */
338-#define SV_JO_STAFF 7 /* 1d7 */
339-#define SV_WAR_HAMMER 8 /* 3d3 */
340-#define SV_THREE_PIECE_ROD 11 /* 3d3 */
341-#define SV_MORNING_STAR 12 /* 2d6 */
342-#define SV_FLAIL 13 /* 2d6 */
343-#define SV_BO_STAFF 14 /* 1d11 */
344-#define SV_LEAD_FILLED_MACE 15 /* 3d4 */
345-#define SV_TETSUBO 16 /* 2d7 */
346-#define SV_TWO_HANDED_FLAIL 18 /* 3d6 */
347-#define SV_GREAT_HAMMER 19 /* 4d6 */
348-#define SV_MACE_OF_DISRUPTION 20 /* 5d8 */
349-#define SV_WIZSTAFF 21 /* 1d2 */
350-#define SV_GROND 50 /* 3d9 */
351-#define SV_NAMAKE_HAMMER 63 /* 1d77 */
352-
353-/* The "sval" values for TV_POLEARM */
354-#define SV_HATCHET 1 /* 1d5 */
355-#define SV_SPEAR 2 /* 1d6 */
356-#define SV_SICKLE 3 /* 2d3 */
357-#define SV_AWL_PIKE 4 /* 1d8 */
358-#define SV_TRIDENT 5 /* 1d9 */
359-#define SV_FAUCHARD 6 /* 1d10 */
360-#define SV_BROAD_SPEAR 7 /* 1d9 */
361-#define SV_PIKE 8 /* 2d5 */
362-#define SV_NAGINATA 9 /* 2d6 */
363-#define SV_BEAKED_AXE 10 /* 2d6 */
364-#define SV_BROAD_AXE 11 /* 2d6 */
365-#define SV_LUCERNE_HAMMER 12 /* 2d5 */
366-#define SV_GLAIVE 13 /* 2d6 */
367-#define SV_LAJATANG 14 /* 2d7 */
368-#define SV_HALBERD 15 /* 3d4 */
369-#define SV_GUISARME 16 /* 2d5 */
370-#define SV_SCYTHE 17 /* 5d3 */
371-#define SV_LANCE 20 /* 2d8 */
372-#define SV_BATTLE_AXE 22 /* 2d8 */
373-#define SV_GREAT_AXE 25 /* 4d4 */
374-#define SV_TRIFURCATE_SPEAR 26 /* 2d9 */
375-#define SV_LOCHABER_AXE 28 /* 3d8 */
376-#define SV_HEAVY_LANCE 29 /* 4d8 */
377-#define SV_SCYTHE_OF_SLICING 30 /* 8d4 */
378-#define SV_TSURIZAO 40 /* 1d1 */
379-#define SV_DEATH_SCYTHE 50 /* 10d10 */
380-
381-/* The "sval" codes for TV_SWORD */
382-#define SV_BROKEN_DAGGER 1 /* 1d1 */
383-#define SV_BROKEN_SWORD 2 /* 1d2 */
384-#define SV_DAGGER 4 /* 1d4 */
385-#define SV_MAIN_GAUCHE 5 /* 1d5 */
386-#define SV_TANTO 6 /* 1d5 */
387-#define SV_RAPIER 7 /* 1d6 */
388-#define SV_SMALL_SWORD 8 /* 1d6 */
389-#define SV_BASILLARD 9 /* 1d8 */
390-#define SV_SHORT_SWORD 10 /* 1d7 */
391-#define SV_SABRE 11 /* 1d7 */
392-#define SV_CUTLASS 12 /* 1d7 */
393-#define SV_WAKIZASHI 13 /* 2d4 */
394-#define SV_KHOPESH 14 /* 2d4 */
395-#define SV_TULWAR 15 /* 2d4 */
396-#define SV_BROAD_SWORD 16 /* 2d5 */
397-#define SV_LONG_SWORD 17 /* 2d5 */
398-#define SV_SCIMITAR 18 /* 2d5 */
399-#define SV_NINJATO 19 /* 1d9 */
400-#define SV_KATANA 20 /* 3d4 */
401-#define SV_BASTARD_SWORD 21 /* 3d4 */
402-#define SV_GREAT_SCIMITAR 22 /* 4d5 */
403-#define SV_CLAYMORE 23 /* 2d8 */
404-#define SV_ESPADON 24 /* 2d9 */
405-#define SV_TWO_HANDED_SWORD 25 /* 3d6 */
406-#define SV_FLAMBERGE 26 /* 3d7 */
407-#define SV_NO_DACHI 27 /* 5d4 */
408-#define SV_EXECUTIONERS_SWORD 28 /* 4d5 */
409-#define SV_ZWEIHANDER 29 /* 4d6 */
410-#define SV_BLADE_OF_CHAOS 30 /* 6d5 */
411-#define SV_DIAMOND_EDGE 31 /* 7d5 */
412-#define SV_DOKUBARI 32 /* 1d1 */
413-#define SV_HAYABUSA 33 /* 1d6 */
414-
415-/* The "sval" codes for TV_SHIELD */
416-#define SV_SMALL_LEATHER_SHIELD 2
417-#define SV_SMALL_METAL_SHIELD 3
418-#define SV_LARGE_LEATHER_SHIELD 4
419-#define SV_LARGE_METAL_SHIELD 5
420-#define SV_DRAGON_SHIELD 6
421-#define SV_KNIGHT_SHIELD 7
422-#define SV_MIRROR_SHIELD 10
423-#define SV_YATA_MIRROR 50
424-
425-/* The "sval" codes for TV_HELM */
426-#define SV_HARD_LEATHER_CAP 2
427-#define SV_METAL_CAP 3
428-#define SV_JINGASA 4 /* 4 */
429-#define SV_IRON_HELM 5
430-#define SV_STEEL_HELM 6
431-#define SV_DRAGON_HELM 7
432-#define SV_KABUTO 8 /* 7 */
433-
434-/* The "sval" codes for TV_CROWN */
435-#define SV_IRON_CROWN 10
436-#define SV_GOLDEN_CROWN 11
437-#define SV_JEWELED_CROWN 12
438-#define SV_CHAOS 50
439-
440-/* The "sval" codes for TV_BOOTS */
441-#define SV_PAIR_OF_SOFT_LEATHER_BOOTS 2
442-#define SV_PAIR_OF_HARD_LEATHER_BOOTS 3
443-#define SV_PAIR_OF_DRAGON_GREAVE 4
444-#define SV_PAIR_OF_METAL_SHOD_BOOTS 6
445-
446-/* The "sval" codes for TV_CLOAK */
447-#define SV_CLOAK 1
448-#define SV_ELVEN_CLOAK 2
449-#define SV_FUR_CLOAK 3
450-#define SV_ETHEREAL_CLOAK 5
451-#define SV_SHADOW_CLOAK 6
452-
453-/* The "sval" codes for TV_GLOVES */
454-#define SV_SET_OF_LEATHER_GLOVES 1
455-#define SV_SET_OF_GAUNTLETS 2
456-#define SV_SET_OF_DRAGON_GLOVES 3
457-#define SV_SET_OF_CESTI 5
458-
459-/* The "sval" codes for TV_SOFT_ARMOR */
460-#define SV_T_SHIRT 0
461-#define SV_FILTHY_RAG 1
462-#define SV_ROBE 2
463-#define SV_PAPER_ARMOR 3 /* 4 */
464-#define SV_SOFT_LEATHER_ARMOR 4
465-#define SV_SOFT_STUDDED_LEATHER 5
466-#define SV_HARD_LEATHER_ARMOR 6
467-#define SV_HARD_STUDDED_LEATHER 7
468-#define SV_RHINO_HIDE_ARMOR 8
469-#define SV_CORD_ARMOR 9 /* 6 */
470-#define SV_PADDED_ARMOR 10 /* 4 */
471-#define SV_LEATHER_SCALE_MAIL 11
472-#define SV_LEATHER_JACK 12
473-#define SV_KUROSHOUZOKU 13
474-#define SV_STONE_AND_HIDE_ARMOR 15 /* 15 */
475-#define SV_ABUNAI_MIZUGI 50
476-#define SV_YOIYAMI_ROBE 60
477-#define SV_NAMAKE_ARMOR 63
478-
479-/* The "sval" codes for TV_HARD_ARMOR */
480-#define SV_RUSTY_CHAIN_MAIL 1 /* 14- */
481-#define SV_RING_MAIL 2 /* 12 */
482-#define SV_METAL_SCALE_MAIL 3 /* 13 */
483-#define SV_CHAIN_MAIL 4 /* 14 */
484-#define SV_DOUBLE_RING_MAIL 5 /* 15 */
485-#define SV_AUGMENTED_CHAIN_MAIL 6 /* 16 */
486-#define SV_DOUBLE_CHAIN_MAIL 7 /* 16 */
487-#define SV_BAR_CHAIN_MAIL 8 /* 18 */
488-#define SV_METAL_BRIGANDINE_ARMOUR 9 /* 19 */
489-#define SV_SPLINT_MAIL 10 /* 19 */
490-#define SV_DO_MARU 11 /* 20 */
491-#define SV_PARTIAL_PLATE_ARMOUR 12 /* 22 */
492-#define SV_METAL_LAMELLAR_ARMOUR 13 /* 23 */
493-#define SV_HARAMAKIDO 14 /* 17 */
494-#define SV_FULL_PLATE_ARMOUR 15 /* 25 */
495-#define SV_O_YOROI 16 /* 24 */
496-#define SV_RIBBED_PLATE_ARMOUR 18 /* 28 */
497-#define SV_MITHRIL_CHAIN_MAIL 20 /* 28+ */
498-#define SV_MITHRIL_PLATE_MAIL 25 /* 35+ */
499-#define SV_ADAMANTITE_PLATE_MAIL 30 /* 40+ */
500-
501-/* The "sval" codes for TV_DRAG_ARMOR */
502-#define SV_DRAGON_BLACK 1
503-#define SV_DRAGON_BLUE 2
504-#define SV_DRAGON_WHITE 3
505-#define SV_DRAGON_RED 4
506-#define SV_DRAGON_GREEN 5
507-#define SV_DRAGON_MULTIHUED 6
508-#define SV_DRAGON_SHINING 10
509-#define SV_DRAGON_LAW 12
510-#define SV_DRAGON_BRONZE 14
511-#define SV_DRAGON_GOLD 16
512-#define SV_DRAGON_CHAOS 18
513-#define SV_DRAGON_BALANCE 20
514-#define SV_DRAGON_POWER 30
515-
516-/* The sval codes for TV_LITE */
517-#define SV_LITE_TORCH 0
518-#define SV_LITE_LANTERN 1
519-#define SV_LITE_FEANOR 2
520-#define SV_LITE_EDISON 3
521-#define SV_LITE_GALADRIEL 4
522-#define SV_LITE_ELENDIL 5
523-#define SV_LITE_JUDGE 6
524-#define SV_LITE_LORE 7
525-#define SV_LITE_PALANTIR 8
526-#define SV_LITE_FLY_STONE 9
527-
528-/* The "sval" codes for TV_AMULET */
529-#define SV_AMULET_DOOM 0
530-#define SV_AMULET_TELEPORT 1
531-#define SV_AMULET_ADORNMENT 2
532-#define SV_AMULET_SLOW_DIGEST 3
533-#define SV_AMULET_RESIST_ACID 4
534-#define SV_AMULET_SEARCHING 5
535-#define SV_AMULET_BRILLIANCE 6
536-#define SV_AMULET_CHARISMA 7
537-#define SV_AMULET_THE_MAGI 8
538-#define SV_AMULET_REFLECTION 9
539-#define SV_AMULET_CARLAMMAS 10
540-#define SV_AMULET_INGWE 11
541-#define SV_AMULET_DWARVES 12
542-#define SV_AMULET_NO_MAGIC 13
543-#define SV_AMULET_NO_TELE 14
544-#define SV_AMULET_RESISTANCE 15
545-#define SV_AMULET_TELEPATHY 16
546-#define SV_AMULET_FARAMIR 17
547-#define SV_AMULET_BOROMIR 18
548-#define SV_AMULET_MAGATAMA 19
549-#define SV_AMULET_INROU 20
550-#define SV_AMULET_INTELLIGENCE 21
551-#define SV_AMULET_WISDOM 22
552-#define SV_AMULET_MAGIC_MASTERY 23
553-#define SV_AMULET_NIGHT 24
554-
555-/* The sval codes for TV_RING */
556-#define SV_RING_WOE 0
557-#define SV_RING_AGGRAVATION 1
558-#define SV_RING_WEAKNESS 2
559-#define SV_RING_STUPIDITY 3
560-#define SV_RING_TELEPORTATION 4
561-#define SV_RING_SLOW_DIGESTION 6
562-#define SV_RING_LEVITATION_FALL 7
563-#define SV_RING_RESIST_FIRE 8
564-#define SV_RING_RESIST_COLD 9
565-#define SV_RING_SUSTAIN_STR 10
566-#define SV_RING_SUSTAIN_INT 11
567-#define SV_RING_SUSTAIN_WIS 12
568-#define SV_RING_SUSTAIN_CON 13
569-#define SV_RING_SUSTAIN_DEX 14
570-#define SV_RING_SUSTAIN_CHR 15
571-#define SV_RING_PROTECTION 16
572-#define SV_RING_ACID 17
573-#define SV_RING_FLAMES 18
574-#define SV_RING_ICE 19
575-#define SV_RING_RESIST_POIS 20
576-#define SV_RING_FREE_ACTION 21
577-#define SV_RING_SEE_INVIS 22
578-#define SV_RING_SEARCHING 23
579-#define SV_RING_STR 24
580-#define SV_RING_ELEC 25
581-#define SV_RING_DEX 26
582-#define SV_RING_CON 27
583-#define SV_RING_ACCURACY 28
584-#define SV_RING_DAMAGE 29
585-#define SV_RING_SLAYING 30
586-#define SV_RING_SPEED 31
587-#define SV_RING_FRAKIR 32
588-#define SV_RING_TULKAS 33
589-#define SV_RING_NARYA 34
590-#define SV_RING_NENYA 35
591-#define SV_RING_VILYA 36
592-#define SV_RING_POWER 37
593-#define SV_RING_RES_FEAR 38
594-#define SV_RING_RES_LD 39
595-#define SV_RING_RES_NETHER 40
596-#define SV_RING_RES_NEXUS 41
597-#define SV_RING_RES_SOUND 42
598-#define SV_RING_RES_CONFUSION 43
599-#define SV_RING_RES_SHARDS 44
600-#define SV_RING_RES_DISENCHANT 45
601-#define SV_RING_RES_CHAOS 46
602-#define SV_RING_RES_BLINDNESS 47
603-#define SV_RING_LORDLY 48
604-#define SV_RING_ATTACKS 49
605-#define SV_RING_AHO 50
606-#define SV_RING_SHOTS 51
607-#define SV_RING_SUSTAIN 52
608-#define SV_RING_DEC_MANA 53
609-#define SV_RING_WARNING 54
610-#define SV_RING_MUSCLE 55
611-
612-#define SV_EXPRESS_CARD 0
613-
614-/* The "sval" codes for TV_STAFF */
615-#define SV_STAFF_DARKNESS 0
616-#define SV_STAFF_SLOWNESS 1
617-#define SV_STAFF_HASTE_MONSTERS 2
618-#define SV_STAFF_SUMMONING 3
619-#define SV_STAFF_TELEPORTATION 4
620-#define SV_STAFF_IDENTIFY 5
621-#define SV_STAFF_REMOVE_CURSE 6
622-#define SV_STAFF_STARLITE 7
623-#define SV_STAFF_LITE 8
624-#define SV_STAFF_MAPPING 9
625-#define SV_STAFF_DETECT_GOLD 10
626-#define SV_STAFF_DETECT_ITEM 11
627-#define SV_STAFF_DETECT_TRAP 12
628-#define SV_STAFF_DETECT_DOOR 13
629-#define SV_STAFF_DETECT_INVIS 14
630-#define SV_STAFF_DETECT_EVIL 15
631-#define SV_STAFF_CURE_LIGHT 16
632-#define SV_STAFF_CURING 17
633-#define SV_STAFF_HEALING 18
634-#define SV_STAFF_THE_MAGI 19
635-#define SV_STAFF_SLEEP_MONSTERS 20
636-#define SV_STAFF_SLOW_MONSTERS 21
637-#define SV_STAFF_SPEED 22
638-#define SV_STAFF_PROBING 23
639-#define SV_STAFF_DISPEL_EVIL 24
640-#define SV_STAFF_POWER 25
641-#define SV_STAFF_HOLINESS 26
642-#define SV_STAFF_GENOCIDE 27
643-#define SV_STAFF_EARTHQUAKES 28
644-#define SV_STAFF_DESTRUCTION 29
645-#define SV_STAFF_ANIMATE_DEAD 30
646-#define SV_STAFF_MSTORM 31
647-#define SV_STAFF_NOTHING 32
648-
649-
650-/* The "sval" codes for TV_WAND */
651-#define SV_WAND_HEAL_MONSTER 0
652-#define SV_WAND_HASTE_MONSTER 1
653-#define SV_WAND_CLONE_MONSTER 2
654-#define SV_WAND_TELEPORT_AWAY 3
655-#define SV_WAND_DISARMING 4
656-#define SV_WAND_TRAP_DOOR_DEST 5
657-#define SV_WAND_STONE_TO_MUD 6
658-#define SV_WAND_LITE 7
659-#define SV_WAND_SLEEP_MONSTER 8
660-#define SV_WAND_SLOW_MONSTER 9
661-#define SV_WAND_CONFUSE_MONSTER 10
662-#define SV_WAND_FEAR_MONSTER 11
663-#define SV_WAND_HYPODYNAMIA 12
664-#define SV_WAND_POLYMORPH 13
665-#define SV_WAND_STINKING_CLOUD 14
666-#define SV_WAND_MAGIC_MISSILE 15
667-#define SV_WAND_ACID_BOLT 16
668-#define SV_WAND_CHARM_MONSTER 17
669-#define SV_WAND_FIRE_BOLT 18
670-#define SV_WAND_COLD_BOLT 19
671-#define SV_WAND_ACID_BALL 20
672-#define SV_WAND_ELEC_BALL 21
673-#define SV_WAND_FIRE_BALL 22
674-#define SV_WAND_COLD_BALL 23
675-#define SV_WAND_WONDER 24
676-#define SV_WAND_DISINTEGRATE 25
677-#define SV_WAND_DRAGON_FIRE 26
678-#define SV_WAND_DRAGON_COLD 27
679-#define SV_WAND_DRAGON_BREATH 28
680-#define SV_WAND_ROCKETS 29
681-#define SV_WAND_STRIKING 30
682-#define SV_WAND_GENOCIDE 31
683-
684-/* The "sval" codes for TV_ROD */
685-#define SV_ROD_DETECT_TRAP 0
686-#define SV_ROD_DETECT_DOOR 1
687-#define SV_ROD_IDENTIFY 2
688-#define SV_ROD_RECALL 3
689-#define SV_ROD_ILLUMINATION 4
690-#define SV_ROD_MAPPING 5
691-#define SV_ROD_DETECTION 6
692-#define SV_ROD_PROBING 7
693-#define SV_ROD_CURING 8
694-#define SV_ROD_HEALING 9
695-#define SV_ROD_RESTORATION 10
696-#define SV_ROD_SPEED 11
697-#define SV_ROD_PESTICIDE 12
698-#define SV_ROD_TELEPORT_AWAY 13
699-#define SV_ROD_DISARMING 14
700-#define SV_ROD_LITE 15
701-#define SV_ROD_SLEEP_MONSTER 16
702-#define SV_ROD_SLOW_MONSTER 17
703-#define SV_ROD_HYPODYNAMIA 18
704-#define SV_ROD_POLYMORPH 19
705-#define SV_ROD_ACID_BOLT 20
706-#define SV_ROD_ELEC_BOLT 21
707-#define SV_ROD_FIRE_BOLT 22
708-#define SV_ROD_COLD_BOLT 23
709-#define SV_ROD_ACID_BALL 24
710-#define SV_ROD_ELEC_BALL 25
711-#define SV_ROD_FIRE_BALL 26
712-#define SV_ROD_COLD_BALL 27
713-#define SV_ROD_HAVOC 28
714-#define SV_ROD_STONE_TO_MUD 29
715-#define SV_ROD_AGGRAVATE 30
716-
717-
718-/* The "sval" codes for TV_SCROLL */
719-
720-#define SV_SCROLL_DARKNESS 0
721-#define SV_SCROLL_AGGRAVATE_MONSTER 1
722-#define SV_SCROLL_CURSE_ARMOR 2
723-#define SV_SCROLL_CURSE_WEAPON 3
724-#define SV_SCROLL_SUMMON_MONSTER 4
725-#define SV_SCROLL_SUMMON_UNDEAD 5
726-#define SV_SCROLL_SUMMON_PET 6
727-#define SV_SCROLL_TRAP_CREATION 7
728-#define SV_SCROLL_PHASE_DOOR 8
729-#define SV_SCROLL_TELEPORT 9
730-#define SV_SCROLL_TELEPORT_LEVEL 10
731-#define SV_SCROLL_WORD_OF_RECALL 11
732-#define SV_SCROLL_IDENTIFY 12
733-#define SV_SCROLL_STAR_IDENTIFY 13
734-#define SV_SCROLL_REMOVE_CURSE 14
735-#define SV_SCROLL_STAR_REMOVE_CURSE 15
736-#define SV_SCROLL_ENCHANT_ARMOR 16
737-#define SV_SCROLL_ENCHANT_WEAPON_TO_HIT 17
738-#define SV_SCROLL_ENCHANT_WEAPON_TO_DAM 18
739-/* xxx enchant missile? */
740-#define SV_SCROLL_STAR_ENCHANT_ARMOR 20
741-#define SV_SCROLL_STAR_ENCHANT_WEAPON 21
742-#define SV_SCROLL_RECHARGING 22
743-#define SV_SCROLL_MUNDANITY 23
744-#define SV_SCROLL_LIGHT 24
745-#define SV_SCROLL_MAPPING 25
746-#define SV_SCROLL_DETECT_GOLD 26
747-#define SV_SCROLL_DETECT_ITEM 27
748-#define SV_SCROLL_DETECT_TRAP 28
749-#define SV_SCROLL_DETECT_DOOR 29
750-#define SV_SCROLL_DETECT_INVIS 30
751-/* xxx (detect evil?) */
752-#define SV_SCROLL_SATISFY_HUNGER 32
753-#define SV_SCROLL_BLESSING 33
754-#define SV_SCROLL_HOLY_CHANT 34
755-#define SV_SCROLL_HOLY_PRAYER 35
756-#define SV_SCROLL_MONSTER_CONFUSION 36
757-#define SV_SCROLL_PROTECTION_FROM_EVIL 37
758-#define SV_SCROLL_RUNE_OF_PROTECTION 38
759-#define SV_SCROLL_TRAP_DOOR_DESTRUCTION 39
760-/* xxx */
761-#define SV_SCROLL_STAR_DESTRUCTION 41
762-#define SV_SCROLL_DISPEL_UNDEAD 42
763-#define SV_SCROLL_SPELL 43
764-#define SV_SCROLL_GENOCIDE 44
765-#define SV_SCROLL_MASS_GENOCIDE 45
766-#define SV_SCROLL_ACQUIREMENT 46
767-#define SV_SCROLL_STAR_ACQUIREMENT 47
768-#define SV_SCROLL_FIRE 48
769-#define SV_SCROLL_ICE 49
770-#define SV_SCROLL_CHAOS 50
771-#define SV_SCROLL_RUMOR 51
772-#define SV_SCROLL_ARTIFACT 52
773-#define SV_SCROLL_RESET_RECALL 53
774-#define SV_SCROLL_SUMMON_KIN 54
775-#define SV_SCROLL_AMUSEMENT 55
776-#define SV_SCROLL_STAR_AMUSEMENT 56
777-
778-/* The "sval" codes for TV_POTION */
779-#define SV_POTION_WATER 0
780-#define SV_POTION_APPLE_JUICE 1
781-#define SV_POTION_SLIME_MOLD 2
782-/* xxx (fixed color) */
783-#define SV_POTION_SLOWNESS 4
784-#define SV_POTION_SALT_WATER 5
785-#define SV_POTION_POISON 6
786-#define SV_POTION_BLINDNESS 7
787-/* xxx */
788-#define SV_POTION_BOOZE 9
789-/* xxx */
790-#define SV_POTION_SLEEP 11
791-/* xxx */
792-#define SV_POTION_LOSE_MEMORIES 13
793-/* xxx */
794-#define SV_POTION_RUINATION 15
795-#define SV_POTION_DEC_STR 16
796-#define SV_POTION_DEC_INT 17
797-#define SV_POTION_DEC_WIS 18
798-#define SV_POTION_DEC_DEX 19
799-#define SV_POTION_DEC_CON 20
800-#define SV_POTION_DEC_CHR 21
801-#define SV_POTION_DETONATIONS 22
802-#define SV_POTION_DEATH 23
803-#define SV_POTION_INFRAVISION 24
804-#define SV_POTION_DETECT_INVIS 25
805-#define SV_POTION_SLOW_POISON 26
806-#define SV_POTION_CURE_POISON 27
807-#define SV_POTION_BOLDNESS 28
808-#define SV_POTION_SPEED 29
809-#define SV_POTION_RESIST_HEAT 30
810-#define SV_POTION_RESIST_COLD 31
811-#define SV_POTION_HEROISM 32
812-#define SV_POTION_BESERK_STRENGTH 33
813-#define SV_POTION_CURE_LIGHT 34
814-#define SV_POTION_CURE_SERIOUS 35
815-#define SV_POTION_CURE_CRITICAL 36
816-#define SV_POTION_HEALING 37
817-#define SV_POTION_STAR_HEALING 38
818-#define SV_POTION_LIFE 39
819-#define SV_POTION_RESTORE_MANA 40
820-#define SV_POTION_RESTORE_EXP 41
821-#define SV_POTION_RES_STR 42
822-#define SV_POTION_RES_INT 43
823-#define SV_POTION_RES_WIS 44
824-#define SV_POTION_RES_DEX 45
825-#define SV_POTION_RES_CON 46
826-#define SV_POTION_RES_CHR 47
827-#define SV_POTION_INC_STR 48
828-#define SV_POTION_INC_INT 49
829-#define SV_POTION_INC_WIS 50
830-#define SV_POTION_INC_DEX 51
831-#define SV_POTION_INC_CON 52
832-#define SV_POTION_INC_CHR 53
833-/* xxx */
834-#define SV_POTION_AUGMENTATION 55
835-#define SV_POTION_ENLIGHTENMENT 56
836-#define SV_POTION_STAR_ENLIGHTENMENT 57
837-#define SV_POTION_SELF_KNOWLEDGE 58
838-#define SV_POTION_EXPERIENCE 59
839-#define SV_POTION_RESISTANCE 60
840-#define SV_POTION_CURING 61
841-#define SV_POTION_INVULNERABILITY 62
842-#define SV_POTION_NEW_LIFE 63
843-#define SV_POTION_NEO_TSUYOSHI 64
844-#define SV_POTION_TSUYOSHI 65
845-#define SV_POTION_POLYMORPH 66
846-
847-/* The "sval" codes for TV_FLASK */
848-#define SV_FLASK_OIL 0
849-
850-/* The "sval" codes for TV_FOOD */
851-#define SV_FOOD_POISON 0
852-#define SV_FOOD_BLINDNESS 1
853-#define SV_FOOD_PARANOIA 2
854-#define SV_FOOD_CONFUSION 3
855-#define SV_FOOD_HALLUCINATION 4
856-#define SV_FOOD_PARALYSIS 5
857-#define SV_FOOD_WEAKNESS 6
858-#define SV_FOOD_SICKNESS 7
859-#define SV_FOOD_STUPIDITY 8
860-#define SV_FOOD_NAIVETY 9
861-#define SV_FOOD_UNHEALTH 10
862-#define SV_FOOD_DISEASE 11
863-#define SV_FOOD_CURE_POISON 12
864-#define SV_FOOD_CURE_BLINDNESS 13
865-#define SV_FOOD_CURE_PARANOIA 14
866-#define SV_FOOD_CURE_CONFUSION 15
867-#define SV_FOOD_CURE_SERIOUS 16
868-#define SV_FOOD_RESTORE_STR 17
869-#define SV_FOOD_RESTORE_CON 18
870-#define SV_FOOD_RESTORING 19
871-/* many missing mushrooms */
872-#define SV_FOOD_BISCUIT 32
873-#define SV_FOOD_JERKY 33
874-#define SV_FOOD_RATION 35
875-#define SV_FOOD_SLIME_MOLD 36
876-#define SV_FOOD_WAYBREAD 37
877-#define SV_FOOD_PINT_OF_ALE 38
878-#define SV_FOOD_PINT_OF_WINE 39
879-
880-
881-#define SV_ROD_MIN_DIRECTION 12 /*!< この値以降の小項目IDを持ったロッドは使用時にターゲットを要求する / Special "sval" limit -- first "aimed" rod */
882-
883-#define SV_CHEST_MIN_LARGE 4 /*!< この値以降の小項目IDを持った箱は大型の箱としてドロップ数を増やす / Special "sval" limit -- first "large" chest */
884-#define SV_CHEST_KANDUME 50 /*!< 箱アイテムの小項目ID: おもちゃのカンヅメ */
885-
886-/*
887- * Special "sval" limit -- first "good" magic/prayer book
888- */
889-#define SV_BOOK_MIN_GOOD 2
890-
891280
892281 #define OBJ_GOLD_LIST 480 /* First "gold" entry */
893282 #define MAX_GOLD 18 /* Number of "gold" entries */
--- a/src/object.h
+++ b/src/object.h
@@ -487,3 +487,615 @@ extern void py_pickup_floor(bool pickup);
487487 (k_info[(T)->k_idx].x_attr != TERM_DARK)) ? \
488488 (k_info[(T)->k_idx].x_attr) : (r_info[(T)->pval].x_attr)))
489489
490+
491+ /*** Object "sval" codes ***/
492+
493+ /* Any subvalue */
494+#define SV_ANY 255
495+
496+/* The "sval" codes for TV_FIGURINE */
497+#define SV_FIGURINE_NORMAL 0
498+
499+#define SV_CAPTURE_NONE 0
500+
501+/* The "sval" codes for TV_STATUE */
502+#define SV_WOODEN_STATUE 0
503+#define SV_CLAY_STATUE 1
504+#define SV_STONE_STATUE 2
505+#define SV_IRON_STATUE 3
506+#define SV_COPPER_STATUE 4
507+#define SV_SILVER_STATUE 5
508+#define SV_GOLDEN_STATUE 6
509+#define SV_IVORY_STATUE 7
510+#define SV_MITHRIL_STATUE 8
511+#define SV_ORNATE_STATUE 9
512+#define SV_PHOTO 50
513+
514+/* The "sval" codes for TV_CORPSE */
515+#define SV_SKELETON 0
516+#define SV_CORPSE 1
517+
518+/* The "sval" codes for TV_SHOT/TV_ARROW/TV_BOLT */
519+#define SV_AMMO_LIGHT 0 /* pebbles */
520+#define SV_AMMO_NORMAL 1 /* shots, arrows, bolts */
521+#define SV_AMMO_HEAVY 2 /* seeker arrows and bolts, mithril shots */
522+
523+/* The "sval" codes for TV_BOW (note information in "sval") */
524+#define SV_SLING 2 /* (x2) */
525+#define SV_SHORT_BOW 12 /* (x2) */
526+#define SV_LONG_BOW 13 /* (x3) */
527+#define SV_LIGHT_XBOW 23 /* (x3) */
528+#define SV_HEAVY_XBOW 24 /* (x4) */
529+#define SV_CRIMSON 50 /* (x0) */
530+#define SV_HARP 51 /* (x0) */
531+#define SV_NAMAKE_BOW 63 /* (x3) */
532+
533+/* The "sval" codes for TV_DIGGING */
534+#define SV_SHOVEL 1
535+#define SV_GNOMISH_SHOVEL 2
536+#define SV_DWARVEN_SHOVEL 3
537+#define SV_PICK 4
538+#define SV_ORCISH_PICK 5
539+#define SV_DWARVEN_PICK 6
540+#define SV_MATTOCK 7
541+
542+/* The "sval" values for TV_HAFTED */
543+#define SV_CLUB 1 /* 1d4 */
544+#define SV_WHIP 2 /* 1d6 */
545+#define SV_QUARTERSTAFF 3 /* 1d9 */
546+#define SV_NUNCHAKU 4 /* 2d3 */
547+#define SV_MACE 5 /* 2d4 */
548+#define SV_BALL_AND_CHAIN 6 /* 2d4 */
549+#define SV_JO_STAFF 7 /* 1d7 */
550+#define SV_WAR_HAMMER 8 /* 3d3 */
551+#define SV_THREE_PIECE_ROD 11 /* 3d3 */
552+#define SV_MORNING_STAR 12 /* 2d6 */
553+#define SV_FLAIL 13 /* 2d6 */
554+#define SV_BO_STAFF 14 /* 1d11 */
555+#define SV_LEAD_FILLED_MACE 15 /* 3d4 */
556+#define SV_TETSUBO 16 /* 2d7 */
557+#define SV_TWO_HANDED_FLAIL 18 /* 3d6 */
558+#define SV_GREAT_HAMMER 19 /* 4d6 */
559+#define SV_MACE_OF_DISRUPTION 20 /* 5d8 */
560+#define SV_WIZSTAFF 21 /* 1d2 */
561+#define SV_GROND 50 /* 3d9 */
562+#define SV_NAMAKE_HAMMER 63 /* 1d77 */
563+
564+/* The "sval" values for TV_POLEARM */
565+#define SV_HATCHET 1 /* 1d5 */
566+#define SV_SPEAR 2 /* 1d6 */
567+#define SV_SICKLE 3 /* 2d3 */
568+#define SV_AWL_PIKE 4 /* 1d8 */
569+#define SV_TRIDENT 5 /* 1d9 */
570+#define SV_FAUCHARD 6 /* 1d10 */
571+#define SV_BROAD_SPEAR 7 /* 1d9 */
572+#define SV_PIKE 8 /* 2d5 */
573+#define SV_NAGINATA 9 /* 2d6 */
574+#define SV_BEAKED_AXE 10 /* 2d6 */
575+#define SV_BROAD_AXE 11 /* 2d6 */
576+#define SV_LUCERNE_HAMMER 12 /* 2d5 */
577+#define SV_GLAIVE 13 /* 2d6 */
578+#define SV_LAJATANG 14 /* 2d7 */
579+#define SV_HALBERD 15 /* 3d4 */
580+#define SV_GUISARME 16 /* 2d5 */
581+#define SV_SCYTHE 17 /* 5d3 */
582+#define SV_LANCE 20 /* 2d8 */
583+#define SV_BATTLE_AXE 22 /* 2d8 */
584+#define SV_GREAT_AXE 25 /* 4d4 */
585+#define SV_TRIFURCATE_SPEAR 26 /* 2d9 */
586+#define SV_LOCHABER_AXE 28 /* 3d8 */
587+#define SV_HEAVY_LANCE 29 /* 4d8 */
588+#define SV_SCYTHE_OF_SLICING 30 /* 8d4 */
589+#define SV_TSURIZAO 40 /* 1d1 */
590+#define SV_DEATH_SCYTHE 50 /* 10d10 */
591+
592+/* The "sval" codes for TV_SWORD */
593+#define SV_BROKEN_DAGGER 1 /* 1d1 */
594+#define SV_BROKEN_SWORD 2 /* 1d2 */
595+#define SV_DAGGER 4 /* 1d4 */
596+#define SV_MAIN_GAUCHE 5 /* 1d5 */
597+#define SV_TANTO 6 /* 1d5 */
598+#define SV_RAPIER 7 /* 1d6 */
599+#define SV_SMALL_SWORD 8 /* 1d6 */
600+#define SV_BASILLARD 9 /* 1d8 */
601+#define SV_SHORT_SWORD 10 /* 1d7 */
602+#define SV_SABRE 11 /* 1d7 */
603+#define SV_CUTLASS 12 /* 1d7 */
604+#define SV_WAKIZASHI 13 /* 2d4 */
605+#define SV_KHOPESH 14 /* 2d4 */
606+#define SV_TULWAR 15 /* 2d4 */
607+#define SV_BROAD_SWORD 16 /* 2d5 */
608+#define SV_LONG_SWORD 17 /* 2d5 */
609+#define SV_SCIMITAR 18 /* 2d5 */
610+#define SV_NINJATO 19 /* 1d9 */
611+#define SV_KATANA 20 /* 3d4 */
612+#define SV_BASTARD_SWORD 21 /* 3d4 */
613+#define SV_GREAT_SCIMITAR 22 /* 4d5 */
614+#define SV_CLAYMORE 23 /* 2d8 */
615+#define SV_ESPADON 24 /* 2d9 */
616+#define SV_TWO_HANDED_SWORD 25 /* 3d6 */
617+#define SV_FLAMBERGE 26 /* 3d7 */
618+#define SV_NO_DACHI 27 /* 5d4 */
619+#define SV_EXECUTIONERS_SWORD 28 /* 4d5 */
620+#define SV_ZWEIHANDER 29 /* 4d6 */
621+#define SV_BLADE_OF_CHAOS 30 /* 6d5 */
622+#define SV_DIAMOND_EDGE 31 /* 7d5 */
623+#define SV_DOKUBARI 32 /* 1d1 */
624+#define SV_HAYABUSA 33 /* 1d6 */
625+
626+/* The "sval" codes for TV_SHIELD */
627+#define SV_SMALL_LEATHER_SHIELD 2
628+#define SV_SMALL_METAL_SHIELD 3
629+#define SV_LARGE_LEATHER_SHIELD 4
630+#define SV_LARGE_METAL_SHIELD 5
631+#define SV_DRAGON_SHIELD 6
632+#define SV_KNIGHT_SHIELD 7
633+#define SV_MIRROR_SHIELD 10
634+#define SV_YATA_MIRROR 50
635+
636+/* The "sval" codes for TV_HELM */
637+#define SV_HARD_LEATHER_CAP 2
638+#define SV_METAL_CAP 3
639+#define SV_JINGASA 4 /* 4 */
640+#define SV_IRON_HELM 5
641+#define SV_STEEL_HELM 6
642+#define SV_DRAGON_HELM 7
643+#define SV_KABUTO 8 /* 7 */
644+
645+/* The "sval" codes for TV_CROWN */
646+#define SV_IRON_CROWN 10
647+#define SV_GOLDEN_CROWN 11
648+#define SV_JEWELED_CROWN 12
649+#define SV_CHAOS 50
650+
651+/* The "sval" codes for TV_BOOTS */
652+#define SV_PAIR_OF_SOFT_LEATHER_BOOTS 2
653+#define SV_PAIR_OF_HARD_LEATHER_BOOTS 3
654+#define SV_PAIR_OF_DRAGON_GREAVE 4
655+#define SV_PAIR_OF_METAL_SHOD_BOOTS 6
656+
657+/* The "sval" codes for TV_CLOAK */
658+#define SV_CLOAK 1
659+#define SV_ELVEN_CLOAK 2
660+#define SV_FUR_CLOAK 3
661+#define SV_ETHEREAL_CLOAK 5
662+#define SV_SHADOW_CLOAK 6
663+
664+/* The "sval" codes for TV_GLOVES */
665+#define SV_SET_OF_LEATHER_GLOVES 1
666+#define SV_SET_OF_GAUNTLETS 2
667+#define SV_SET_OF_DRAGON_GLOVES 3
668+#define SV_SET_OF_CESTI 5
669+
670+/* The "sval" codes for TV_SOFT_ARMOR */
671+#define SV_T_SHIRT 0
672+#define SV_FILTHY_RAG 1
673+#define SV_ROBE 2
674+#define SV_PAPER_ARMOR 3 /* 4 */
675+#define SV_SOFT_LEATHER_ARMOR 4
676+#define SV_SOFT_STUDDED_LEATHER 5
677+#define SV_HARD_LEATHER_ARMOR 6
678+#define SV_HARD_STUDDED_LEATHER 7
679+#define SV_RHINO_HIDE_ARMOR 8
680+#define SV_CORD_ARMOR 9 /* 6 */
681+#define SV_PADDED_ARMOR 10 /* 4 */
682+#define SV_LEATHER_SCALE_MAIL 11
683+#define SV_LEATHER_JACK 12
684+#define SV_KUROSHOUZOKU 13
685+#define SV_STONE_AND_HIDE_ARMOR 15 /* 15 */
686+#define SV_ABUNAI_MIZUGI 50
687+#define SV_YOIYAMI_ROBE 60
688+#define SV_NAMAKE_ARMOR 63
689+
690+/* The "sval" codes for TV_HARD_ARMOR */
691+#define SV_RUSTY_CHAIN_MAIL 1 /* 14- */
692+#define SV_RING_MAIL 2 /* 12 */
693+#define SV_METAL_SCALE_MAIL 3 /* 13 */
694+#define SV_CHAIN_MAIL 4 /* 14 */
695+#define SV_DOUBLE_RING_MAIL 5 /* 15 */
696+#define SV_AUGMENTED_CHAIN_MAIL 6 /* 16 */
697+#define SV_DOUBLE_CHAIN_MAIL 7 /* 16 */
698+#define SV_BAR_CHAIN_MAIL 8 /* 18 */
699+#define SV_METAL_BRIGANDINE_ARMOUR 9 /* 19 */
700+#define SV_SPLINT_MAIL 10 /* 19 */
701+#define SV_DO_MARU 11 /* 20 */
702+#define SV_PARTIAL_PLATE_ARMOUR 12 /* 22 */
703+#define SV_METAL_LAMELLAR_ARMOUR 13 /* 23 */
704+#define SV_HARAMAKIDO 14 /* 17 */
705+#define SV_FULL_PLATE_ARMOUR 15 /* 25 */
706+#define SV_O_YOROI 16 /* 24 */
707+#define SV_RIBBED_PLATE_ARMOUR 18 /* 28 */
708+#define SV_MITHRIL_CHAIN_MAIL 20 /* 28+ */
709+#define SV_MITHRIL_PLATE_MAIL 25 /* 35+ */
710+#define SV_ADAMANTITE_PLATE_MAIL 30 /* 40+ */
711+
712+/* The "sval" codes for TV_DRAG_ARMOR */
713+#define SV_DRAGON_BLACK 1
714+#define SV_DRAGON_BLUE 2
715+#define SV_DRAGON_WHITE 3
716+#define SV_DRAGON_RED 4
717+#define SV_DRAGON_GREEN 5
718+#define SV_DRAGON_MULTIHUED 6
719+#define SV_DRAGON_SHINING 10
720+#define SV_DRAGON_LAW 12
721+#define SV_DRAGON_BRONZE 14
722+#define SV_DRAGON_GOLD 16
723+#define SV_DRAGON_CHAOS 18
724+#define SV_DRAGON_BALANCE 20
725+#define SV_DRAGON_POWER 30
726+
727+/* The sval codes for TV_LITE */
728+#define SV_LITE_TORCH 0
729+#define SV_LITE_LANTERN 1
730+#define SV_LITE_FEANOR 2
731+#define SV_LITE_EDISON 3
732+#define SV_LITE_GALADRIEL 4
733+#define SV_LITE_ELENDIL 5
734+#define SV_LITE_JUDGE 6
735+#define SV_LITE_LORE 7
736+#define SV_LITE_PALANTIR 8
737+#define SV_LITE_FLY_STONE 9
738+
739+/* The "sval" codes for TV_AMULET */
740+#define SV_AMULET_DOOM 0
741+#define SV_AMULET_TELEPORT 1
742+#define SV_AMULET_ADORNMENT 2
743+#define SV_AMULET_SLOW_DIGEST 3
744+#define SV_AMULET_RESIST_ACID 4
745+#define SV_AMULET_SEARCHING 5
746+#define SV_AMULET_BRILLIANCE 6
747+#define SV_AMULET_CHARISMA 7
748+#define SV_AMULET_THE_MAGI 8
749+#define SV_AMULET_REFLECTION 9
750+#define SV_AMULET_CARLAMMAS 10
751+#define SV_AMULET_INGWE 11
752+#define SV_AMULET_DWARVES 12
753+#define SV_AMULET_NO_MAGIC 13
754+#define SV_AMULET_NO_TELE 14
755+#define SV_AMULET_RESISTANCE 15
756+#define SV_AMULET_TELEPATHY 16
757+#define SV_AMULET_FARAMIR 17
758+#define SV_AMULET_BOROMIR 18
759+#define SV_AMULET_MAGATAMA 19
760+#define SV_AMULET_INROU 20
761+#define SV_AMULET_INTELLIGENCE 21
762+#define SV_AMULET_WISDOM 22
763+#define SV_AMULET_MAGIC_MASTERY 23
764+#define SV_AMULET_NIGHT 24
765+
766+/* The sval codes for TV_RING */
767+#define SV_RING_WOE 0
768+#define SV_RING_AGGRAVATION 1
769+#define SV_RING_WEAKNESS 2
770+#define SV_RING_STUPIDITY 3
771+#define SV_RING_TELEPORTATION 4
772+#define SV_RING_SLOW_DIGESTION 6
773+#define SV_RING_LEVITATION_FALL 7
774+#define SV_RING_RESIST_FIRE 8
775+#define SV_RING_RESIST_COLD 9
776+#define SV_RING_SUSTAIN_STR 10
777+#define SV_RING_SUSTAIN_INT 11
778+#define SV_RING_SUSTAIN_WIS 12
779+#define SV_RING_SUSTAIN_CON 13
780+#define SV_RING_SUSTAIN_DEX 14
781+#define SV_RING_SUSTAIN_CHR 15
782+#define SV_RING_PROTECTION 16
783+#define SV_RING_ACID 17
784+#define SV_RING_FLAMES 18
785+#define SV_RING_ICE 19
786+#define SV_RING_RESIST_POIS 20
787+#define SV_RING_FREE_ACTION 21
788+#define SV_RING_SEE_INVIS 22
789+#define SV_RING_SEARCHING 23
790+#define SV_RING_STR 24
791+#define SV_RING_ELEC 25
792+#define SV_RING_DEX 26
793+#define SV_RING_CON 27
794+#define SV_RING_ACCURACY 28
795+#define SV_RING_DAMAGE 29
796+#define SV_RING_SLAYING 30
797+#define SV_RING_SPEED 31
798+#define SV_RING_FRAKIR 32
799+#define SV_RING_TULKAS 33
800+#define SV_RING_NARYA 34
801+#define SV_RING_NENYA 35
802+#define SV_RING_VILYA 36
803+#define SV_RING_POWER 37
804+#define SV_RING_RES_FEAR 38
805+#define SV_RING_RES_LD 39
806+#define SV_RING_RES_NETHER 40
807+#define SV_RING_RES_NEXUS 41
808+#define SV_RING_RES_SOUND 42
809+#define SV_RING_RES_CONFUSION 43
810+#define SV_RING_RES_SHARDS 44
811+#define SV_RING_RES_DISENCHANT 45
812+#define SV_RING_RES_CHAOS 46
813+#define SV_RING_RES_BLINDNESS 47
814+#define SV_RING_LORDLY 48
815+#define SV_RING_ATTACKS 49
816+#define SV_RING_AHO 50
817+#define SV_RING_SHOTS 51
818+#define SV_RING_SUSTAIN 52
819+#define SV_RING_DEC_MANA 53
820+#define SV_RING_WARNING 54
821+#define SV_RING_MUSCLE 55
822+
823+#define SV_EXPRESS_CARD 0
824+
825+/* The "sval" codes for TV_STAFF */
826+#define SV_STAFF_DARKNESS 0
827+#define SV_STAFF_SLOWNESS 1
828+#define SV_STAFF_HASTE_MONSTERS 2
829+#define SV_STAFF_SUMMONING 3
830+#define SV_STAFF_TELEPORTATION 4
831+#define SV_STAFF_IDENTIFY 5
832+#define SV_STAFF_REMOVE_CURSE 6
833+#define SV_STAFF_STARLITE 7
834+#define SV_STAFF_LITE 8
835+#define SV_STAFF_MAPPING 9
836+#define SV_STAFF_DETECT_GOLD 10
837+#define SV_STAFF_DETECT_ITEM 11
838+#define SV_STAFF_DETECT_TRAP 12
839+#define SV_STAFF_DETECT_DOOR 13
840+#define SV_STAFF_DETECT_INVIS 14
841+#define SV_STAFF_DETECT_EVIL 15
842+#define SV_STAFF_CURE_LIGHT 16
843+#define SV_STAFF_CURING 17
844+#define SV_STAFF_HEALING 18
845+#define SV_STAFF_THE_MAGI 19
846+#define SV_STAFF_SLEEP_MONSTERS 20
847+#define SV_STAFF_SLOW_MONSTERS 21
848+#define SV_STAFF_SPEED 22
849+#define SV_STAFF_PROBING 23
850+#define SV_STAFF_DISPEL_EVIL 24
851+#define SV_STAFF_POWER 25
852+#define SV_STAFF_HOLINESS 26
853+#define SV_STAFF_GENOCIDE 27
854+#define SV_STAFF_EARTHQUAKES 28
855+#define SV_STAFF_DESTRUCTION 29
856+#define SV_STAFF_ANIMATE_DEAD 30
857+#define SV_STAFF_MSTORM 31
858+#define SV_STAFF_NOTHING 32
859+
860+
861+/* The "sval" codes for TV_WAND */
862+#define SV_WAND_HEAL_MONSTER 0
863+#define SV_WAND_HASTE_MONSTER 1
864+#define SV_WAND_CLONE_MONSTER 2
865+#define SV_WAND_TELEPORT_AWAY 3
866+#define SV_WAND_DISARMING 4
867+#define SV_WAND_TRAP_DOOR_DEST 5
868+#define SV_WAND_STONE_TO_MUD 6
869+#define SV_WAND_LITE 7
870+#define SV_WAND_SLEEP_MONSTER 8
871+#define SV_WAND_SLOW_MONSTER 9
872+#define SV_WAND_CONFUSE_MONSTER 10
873+#define SV_WAND_FEAR_MONSTER 11
874+#define SV_WAND_HYPODYNAMIA 12
875+#define SV_WAND_POLYMORPH 13
876+#define SV_WAND_STINKING_CLOUD 14
877+#define SV_WAND_MAGIC_MISSILE 15
878+#define SV_WAND_ACID_BOLT 16
879+#define SV_WAND_CHARM_MONSTER 17
880+#define SV_WAND_FIRE_BOLT 18
881+#define SV_WAND_COLD_BOLT 19
882+#define SV_WAND_ACID_BALL 20
883+#define SV_WAND_ELEC_BALL 21
884+#define SV_WAND_FIRE_BALL 22
885+#define SV_WAND_COLD_BALL 23
886+#define SV_WAND_WONDER 24
887+#define SV_WAND_DISINTEGRATE 25
888+#define SV_WAND_DRAGON_FIRE 26
889+#define SV_WAND_DRAGON_COLD 27
890+#define SV_WAND_DRAGON_BREATH 28
891+#define SV_WAND_ROCKETS 29
892+#define SV_WAND_STRIKING 30
893+#define SV_WAND_GENOCIDE 31
894+
895+/* The "sval" codes for TV_ROD */
896+#define SV_ROD_DETECT_TRAP 0
897+#define SV_ROD_DETECT_DOOR 1
898+#define SV_ROD_IDENTIFY 2
899+#define SV_ROD_RECALL 3
900+#define SV_ROD_ILLUMINATION 4
901+#define SV_ROD_MAPPING 5
902+#define SV_ROD_DETECTION 6
903+#define SV_ROD_PROBING 7
904+#define SV_ROD_CURING 8
905+#define SV_ROD_HEALING 9
906+#define SV_ROD_RESTORATION 10
907+#define SV_ROD_SPEED 11
908+#define SV_ROD_PESTICIDE 12
909+#define SV_ROD_TELEPORT_AWAY 13
910+#define SV_ROD_DISARMING 14
911+#define SV_ROD_LITE 15
912+#define SV_ROD_SLEEP_MONSTER 16
913+#define SV_ROD_SLOW_MONSTER 17
914+#define SV_ROD_HYPODYNAMIA 18
915+#define SV_ROD_POLYMORPH 19
916+#define SV_ROD_ACID_BOLT 20
917+#define SV_ROD_ELEC_BOLT 21
918+#define SV_ROD_FIRE_BOLT 22
919+#define SV_ROD_COLD_BOLT 23
920+#define SV_ROD_ACID_BALL 24
921+#define SV_ROD_ELEC_BALL 25
922+#define SV_ROD_FIRE_BALL 26
923+#define SV_ROD_COLD_BALL 27
924+#define SV_ROD_HAVOC 28
925+#define SV_ROD_STONE_TO_MUD 29
926+#define SV_ROD_AGGRAVATE 30
927+
928+
929+/* The "sval" codes for TV_SCROLL */
930+
931+#define SV_SCROLL_DARKNESS 0
932+#define SV_SCROLL_AGGRAVATE_MONSTER 1
933+#define SV_SCROLL_CURSE_ARMOR 2
934+#define SV_SCROLL_CURSE_WEAPON 3
935+#define SV_SCROLL_SUMMON_MONSTER 4
936+#define SV_SCROLL_SUMMON_UNDEAD 5
937+#define SV_SCROLL_SUMMON_PET 6
938+#define SV_SCROLL_TRAP_CREATION 7
939+#define SV_SCROLL_PHASE_DOOR 8
940+#define SV_SCROLL_TELEPORT 9
941+#define SV_SCROLL_TELEPORT_LEVEL 10
942+#define SV_SCROLL_WORD_OF_RECALL 11
943+#define SV_SCROLL_IDENTIFY 12
944+#define SV_SCROLL_STAR_IDENTIFY 13
945+#define SV_SCROLL_REMOVE_CURSE 14
946+#define SV_SCROLL_STAR_REMOVE_CURSE 15
947+#define SV_SCROLL_ENCHANT_ARMOR 16
948+#define SV_SCROLL_ENCHANT_WEAPON_TO_HIT 17
949+#define SV_SCROLL_ENCHANT_WEAPON_TO_DAM 18
950+/* xxx enchant missile? */
951+#define SV_SCROLL_STAR_ENCHANT_ARMOR 20
952+#define SV_SCROLL_STAR_ENCHANT_WEAPON 21
953+#define SV_SCROLL_RECHARGING 22
954+#define SV_SCROLL_MUNDANITY 23
955+#define SV_SCROLL_LIGHT 24
956+#define SV_SCROLL_MAPPING 25
957+#define SV_SCROLL_DETECT_GOLD 26
958+#define SV_SCROLL_DETECT_ITEM 27
959+#define SV_SCROLL_DETECT_TRAP 28
960+#define SV_SCROLL_DETECT_DOOR 29
961+#define SV_SCROLL_DETECT_INVIS 30
962+/* xxx (detect evil?) */
963+#define SV_SCROLL_SATISFY_HUNGER 32
964+#define SV_SCROLL_BLESSING 33
965+#define SV_SCROLL_HOLY_CHANT 34
966+#define SV_SCROLL_HOLY_PRAYER 35
967+#define SV_SCROLL_MONSTER_CONFUSION 36
968+#define SV_SCROLL_PROTECTION_FROM_EVIL 37
969+#define SV_SCROLL_RUNE_OF_PROTECTION 38
970+#define SV_SCROLL_TRAP_DOOR_DESTRUCTION 39
971+/* xxx */
972+#define SV_SCROLL_STAR_DESTRUCTION 41
973+#define SV_SCROLL_DISPEL_UNDEAD 42
974+#define SV_SCROLL_SPELL 43
975+#define SV_SCROLL_GENOCIDE 44
976+#define SV_SCROLL_MASS_GENOCIDE 45
977+#define SV_SCROLL_ACQUIREMENT 46
978+#define SV_SCROLL_STAR_ACQUIREMENT 47
979+#define SV_SCROLL_FIRE 48
980+#define SV_SCROLL_ICE 49
981+#define SV_SCROLL_CHAOS 50
982+#define SV_SCROLL_RUMOR 51
983+#define SV_SCROLL_ARTIFACT 52
984+#define SV_SCROLL_RESET_RECALL 53
985+#define SV_SCROLL_SUMMON_KIN 54
986+#define SV_SCROLL_AMUSEMENT 55
987+#define SV_SCROLL_STAR_AMUSEMENT 56
988+
989+/* The "sval" codes for TV_POTION */
990+#define SV_POTION_WATER 0
991+#define SV_POTION_APPLE_JUICE 1
992+#define SV_POTION_SLIME_MOLD 2
993+/* xxx (fixed color) */
994+#define SV_POTION_SLOWNESS 4
995+#define SV_POTION_SALT_WATER 5
996+#define SV_POTION_POISON 6
997+#define SV_POTION_BLINDNESS 7
998+/* xxx */
999+#define SV_POTION_BOOZE 9
1000+/* xxx */
1001+#define SV_POTION_SLEEP 11
1002+/* xxx */
1003+#define SV_POTION_LOSE_MEMORIES 13
1004+/* xxx */
1005+#define SV_POTION_RUINATION 15
1006+#define SV_POTION_DEC_STR 16
1007+#define SV_POTION_DEC_INT 17
1008+#define SV_POTION_DEC_WIS 18
1009+#define SV_POTION_DEC_DEX 19
1010+#define SV_POTION_DEC_CON 20
1011+#define SV_POTION_DEC_CHR 21
1012+#define SV_POTION_DETONATIONS 22
1013+#define SV_POTION_DEATH 23
1014+#define SV_POTION_INFRAVISION 24
1015+#define SV_POTION_DETECT_INVIS 25
1016+#define SV_POTION_SLOW_POISON 26
1017+#define SV_POTION_CURE_POISON 27
1018+#define SV_POTION_BOLDNESS 28
1019+#define SV_POTION_SPEED 29
1020+#define SV_POTION_RESIST_HEAT 30
1021+#define SV_POTION_RESIST_COLD 31
1022+#define SV_POTION_HEROISM 32
1023+#define SV_POTION_BESERK_STRENGTH 33
1024+#define SV_POTION_CURE_LIGHT 34
1025+#define SV_POTION_CURE_SERIOUS 35
1026+#define SV_POTION_CURE_CRITICAL 36
1027+#define SV_POTION_HEALING 37
1028+#define SV_POTION_STAR_HEALING 38
1029+#define SV_POTION_LIFE 39
1030+#define SV_POTION_RESTORE_MANA 40
1031+#define SV_POTION_RESTORE_EXP 41
1032+#define SV_POTION_RES_STR 42
1033+#define SV_POTION_RES_INT 43
1034+#define SV_POTION_RES_WIS 44
1035+#define SV_POTION_RES_DEX 45
1036+#define SV_POTION_RES_CON 46
1037+#define SV_POTION_RES_CHR 47
1038+#define SV_POTION_INC_STR 48
1039+#define SV_POTION_INC_INT 49
1040+#define SV_POTION_INC_WIS 50
1041+#define SV_POTION_INC_DEX 51
1042+#define SV_POTION_INC_CON 52
1043+#define SV_POTION_INC_CHR 53
1044+/* xxx */
1045+#define SV_POTION_AUGMENTATION 55
1046+#define SV_POTION_ENLIGHTENMENT 56
1047+#define SV_POTION_STAR_ENLIGHTENMENT 57
1048+#define SV_POTION_SELF_KNOWLEDGE 58
1049+#define SV_POTION_EXPERIENCE 59
1050+#define SV_POTION_RESISTANCE 60
1051+#define SV_POTION_CURING 61
1052+#define SV_POTION_INVULNERABILITY 62
1053+#define SV_POTION_NEW_LIFE 63
1054+#define SV_POTION_NEO_TSUYOSHI 64
1055+#define SV_POTION_TSUYOSHI 65
1056+#define SV_POTION_POLYMORPH 66
1057+
1058+/* The "sval" codes for TV_FLASK */
1059+#define SV_FLASK_OIL 0
1060+
1061+/* The "sval" codes for TV_FOOD */
1062+#define SV_FOOD_POISON 0
1063+#define SV_FOOD_BLINDNESS 1
1064+#define SV_FOOD_PARANOIA 2
1065+#define SV_FOOD_CONFUSION 3
1066+#define SV_FOOD_HALLUCINATION 4
1067+#define SV_FOOD_PARALYSIS 5
1068+#define SV_FOOD_WEAKNESS 6
1069+#define SV_FOOD_SICKNESS 7
1070+#define SV_FOOD_STUPIDITY 8
1071+#define SV_FOOD_NAIVETY 9
1072+#define SV_FOOD_UNHEALTH 10
1073+#define SV_FOOD_DISEASE 11
1074+#define SV_FOOD_CURE_POISON 12
1075+#define SV_FOOD_CURE_BLINDNESS 13
1076+#define SV_FOOD_CURE_PARANOIA 14
1077+#define SV_FOOD_CURE_CONFUSION 15
1078+#define SV_FOOD_CURE_SERIOUS 16
1079+#define SV_FOOD_RESTORE_STR 17
1080+#define SV_FOOD_RESTORE_CON 18
1081+#define SV_FOOD_RESTORING 19
1082+/* many missing mushrooms */
1083+#define SV_FOOD_BISCUIT 32
1084+#define SV_FOOD_JERKY 33
1085+#define SV_FOOD_RATION 35
1086+#define SV_FOOD_SLIME_MOLD 36
1087+#define SV_FOOD_WAYBREAD 37
1088+#define SV_FOOD_PINT_OF_ALE 38
1089+#define SV_FOOD_PINT_OF_WINE 39
1090+
1091+
1092+#define SV_ROD_MIN_DIRECTION 12 /*!< この値以降の小項目IDを持ったロッドは使用時にターゲットを要求する / Special "sval" limit -- first "aimed" rod */
1093+
1094+#define SV_CHEST_MIN_LARGE 4 /*!< この値以降の小項目IDを持った箱は大型の箱としてドロップ数を増やす / Special "sval" limit -- first "large" chest */
1095+#define SV_CHEST_KANDUME 50 /*!< 箱アイテムの小項目ID: おもちゃのカンヅメ */
1096+
1097+/*
1098+ * Special "sval" limit -- first "good" magic/prayer book
1099+ */
1100+#define SV_BOOK_MIN_GOOD 2
1101+
Show on old repository browser