diff options
-rw-r--r-- | lib/edit/s_info.txt | 58 | ||||
-rw-r--r-- | lib/mods/theme/edit/s_info.txt | 58 | ||||
-rw-r--r-- | src/init1.cc | 18 | ||||
-rw-r--r-- | src/skill_type.hpp | 1 | ||||
-rw-r--r-- | src/skills.cc | 3 |
5 files changed, 0 insertions, 138 deletions
diff --git a/lib/edit/s_info.txt b/lib/edit/s_info.txt index 1e1d7a07..87251694 100644 --- a/lib/edit/s_info.txt +++ b/lib/edit/s_info.txt @@ -14,7 +14,6 @@ # N:idx:name # D:desc # A:action mkey:action desc -# I:rate # E:exclusive skill:exclusive skill # O:skill:opposing skill%percent @@ -27,107 +26,90 @@ N:56:Magic-Device D:Eases the use of magical devices, such as wands, staves and rods D:It also helps pseudo-id of magic objects -I:1000 F:RANDOM_GAIN N:54:Spell-learning D:You should not see that ! that is a BUG! #A:18:Learn a spell from a realm -I:1000 F:HIDDEN N:41:Sorcery D:Ability to use all the magic schools as if their skill was sorcery D:But the price to channel that much magic is your health A:17:Cast a spell -I:1000 N:1:Conveyance D:Ability to learn and use spells from the Conveyance school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 F:RANDOM_GAIN N:2:Mana D:Ability to learn and use spells from the Mana school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:3:Fire D:Ability to learn and use spells from the Fire school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:4:Air D:Ability to learn and use spells from the Air school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:5:Water D:Ability to learn and use spells from the Water school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:6:Nature D:Ability to learn and use spells from the Nature school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:7:Earth D:Ability to learn and use spells from the Earth school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:10:Divination D:Ability to learn and use spells from the Divination school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 F:RANDOM_GAIN N:11:Temporal D:Ability to learn and use spells from the Temporal school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:14:Meta D:Ability to learn and use spells from the Meta school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:51:Mind D:Ability to learn and use spells from the Mind school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:55:Udun D:Ability to learn and use spells from the Udun school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 F:HIDDEN N:13:Demonology D:Ability to use incantations from the Demonblades D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:31:Necromancy D:Ability to harness the powers of the dead D:Spells use the intelligence stat A:7:Use Necromancy -I:1000 F:RANDOM_GAIN G:60 @@ -135,31 +117,26 @@ N:34:Runecraft D:Ability to combine magic runes to create your own spells D:Runespells use the dexterity stat A:9:Use Runespells -I:1000 N:43:Thaumaturgy D:Ability to gain and cast innate spells D:Spells use the intelligence stat A:8:Cast a thaumaturgy spell -I:1000 F:RANDOM_GAIN N:15:Magic D:General ability to do magic, also affects mana reserves and D:magic device ability. Helps pseudo-id of magic objects A:19:Copy a spell -I:1000 F:RANDOM_GAIN N:45:Spell-power D:Ability to increase the power of spells -I:1000 N:59:Geomancy D:Ability to understand the raw elemental forces of nature and use D:them to your advantage. Most spells need Fire/Water/Earth/Air skills A:101:Use Geomancy -I:1000 # All magic skills affect magic skill f:Magic-Device:Magic%7 @@ -193,82 +170,65 @@ f:Thaumaturgy:Magic%6 N:16:Combat D:General ability to fight and to pseudo-id armour and weapons D:It also allows the use of heavier armour without penalties -I:1000 F:RANDOM_GAIN N:17:Weaponmastery D:General ability to use melee weapons -I:1000 F:RANDOM_GAIN N:18:Sword-mastery D:Ability to use swords -I:1000 N:19:Axe-mastery D:Ability to use axes -I:1000 N:20:Polearm-mastery D:Ability to use polearms -I:1000 N:21:Hafted-mastery D:Ability to use hafted weapons -I:1000 N:22:Backstab D:Ability to backstab fleeing and sleeping monsters to increase damage -I:1000 N:23:Archery D:General ability to use ranged weapons -I:1000 F:RANDOM_GAIN N:24:Sling-mastery D:Ability to use slings A:23:Fire piercing shots -I:1000 N:25:Bow-mastery D:Ability to use bows A:23:Fire piercing shots -I:1000 N:26:Crossbow-mastery D:Ability to use crossbows A:23:Fire piercing shots -I:1000 N:27:Boomerang-mastery D:Ability to use boomerangs -I:1000 N:58:Boulder-throwing D:Ability to make and throw boulders A:21:Tear down a wall to create boulders -I:1000 N:42:Barehand-combat D:Ability to fight barehanded -I:1000 F:RANDOM_GAIN G:70 N:47:Bearform-combat D:Ability to fight in bear form -I:1000 F:AUTO_HIDE F:HIDDEN N:52:Critical-hits D:Ability to deal critical hits with swords < 5lb -I:1000 N:57:Stunning-blows D:Ability to stun opponents when doing critical hits with hafted weapons > 5 lb -I:1000 # List of combat friendly skills @@ -315,26 +275,22 @@ f:Boulder-throwing:Combat%40 N:28:Spirituality D:General ability to use spiritual skills and also influence your Saving Throw -I:1000 F:RANDOM_GAIN N:53:Prayer D:Ability to learn and use spells from the gods' schools D:Spells use the wisdom stat and cost piety instead of mana A:17:Cast a spell -I:1000 N:12:Druidistic D:Ability to learn and use prayers from the Druidistic realm D:Nature powers use the wisdom stat A:1:Cast a druidistic spell -I:1000 N:29:Mindcraft D:Ability to focus the powers of the mind D:Mindpowers use the wisdom stat A:2:Use Mindcraft -I:1000 F:RANDOM_GAIN G:50 @@ -342,7 +298,6 @@ N:9:Music D:Ability to learn and sing songs D:Songs use the charisma stat A:17:Cast a spell -I:1000 f:Prayer:Spirituality%10 f:Druidistic:Spirituality%10 @@ -359,12 +314,10 @@ f:Music:Magic%10 N:30:Misc D:Not a real skill, it is only used to regroup some skills -I:0 N:33:Antimagic D:Ability to generate an antimagic field A:3:Use antimagic -I:1000 F:RANDOM_GAIN G:80 @@ -398,28 +351,23 @@ E:Thaumaturgy:Antimagic N:35:Sneakiness D:General ability at the sneakiness skills. D:It also affects the searching abilities -I:0 F:RANDOM_GAIN N:36:Stealth D:Ability to move unnoticed, silently -I:0 F:RANDOM_GAIN N:37:Disarming D:Ability to disarm the various traps -I:0 F:RANDOM_GAIN N:40:Stealing D:Ability to steal objects A:15:Steal object -I:0 N:46:Dodging D:Ability to dodge blows and bolts A:16:Check dodge chance -I:0 f:Stealth:Sneakiness%15 f:Disarming:Sneakiness%10 @@ -433,38 +381,32 @@ f:Dodging:Sneakiness%10 N:48:Monster-lore D:General ability at the monster related skills, ability to gain experience D:from friendly kills. It also affects the number of companions you can have -I:0 A:22:Turn pet into companion F:RANDOM_GAIN N:44:Summoning D:Ability to create totems from monsters and use them to summon monsters A:13:Manipulate totems -I:1000 F:RANDOM_GAIN G:60 N:49:Corpse-preservation D:Ability not to destroy the monsters' corpses when killing them -I:0 N:50:Possession D:Ability to incarnate into monsters A:11:Use the possession skill -I:0 N:8:Symbiosis D:Ability to enter in symbiosis with monsters unable to move by themselves D:Spells use the intelligence stat A:20:Use symbiotic powers -I:1000 F:RANDOM_GAIN G:70 N:32:Mimicry D:Ability to use cloaks of mimicry to change form A:6:Use Mimicry -I:1000 F:RANDOM_GAIN G:80 diff --git a/lib/mods/theme/edit/s_info.txt b/lib/mods/theme/edit/s_info.txt index b3d8e485..2d42bf4a 100644 --- a/lib/mods/theme/edit/s_info.txt +++ b/lib/mods/theme/edit/s_info.txt @@ -14,7 +14,6 @@ # N:idx:name # D:desc # A:action mkey:action desc -# I:rate # E:exclusive skill:exclusive skill # O:skill:opposing skill%percent @@ -27,108 +26,91 @@ N:56:Magic-Device D:Eases the use of magical devices, such as wands, staves and rods D:It also helps pseudo-id of magic objects -I:1000 F:RANDOM_GAIN N:54:Spell-learning D:You should not see that ! that is a BUG! #A:18:Learn a spell from a realm -I:1000 F:HIDDEN N:41:Sorcery D:Ability to use all the magic schools as if their skill was sorcery D:But the price to channel that much magic is your health A:17:Cast a spell -I:1000 N:1:Conveyance D:Ability to learn and use spells from the Conveyance school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 F:RANDOM_GAIN N:2:Mana D:Ability to learn and use spells from the Mana school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:3:Fire D:Ability to learn and use spells from the Fire school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:4:Air D:Ability to learn and use spells from the Air school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:5:Water D:Ability to learn and use spells from the Water school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:6:Nature D:Ability to learn and use spells from the Nature school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 F:RANDOM_GAIN N:7:Earth D:Ability to learn and use spells from the Earth school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:10:Divination D:Ability to learn and use spells from the Divination school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 F:RANDOM_GAIN N:11:Temporal D:Ability to learn and use spells from the Temporal school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:14:Meta D:Ability to learn and use spells from the Meta school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:51:Mind D:Ability to learn and use spells from the Mind school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:55:Udun D:Ability to learn and use spells from the Udun school D:Spells use the intelligence stat A:17:Cast a spell -I:1000 F:HIDDEN N:13:Demonology D:Ability to use incantations from the Demonblades D:Spells use the intelligence stat A:17:Cast a spell -I:1000 N:31:Necromancy D:Ability to harness the powers of the dead D:Spells use the intelligence stat A:7:Use Necromancy -I:1000 F:RANDOM_GAIN G:60 @@ -136,31 +118,26 @@ N:34:Runecraft D:Ability to combine magic runes to create your own spells D:Runespells use the dexterity stat A:9:Use Runespells -I:1000 N:43:Thaumaturgy D:Ability to gain and cast innate spells D:Spells use the intelligence stat A:8:Cast a thaumaturgy spell -I:1000 F:RANDOM_GAIN N:15:Magic D:General ability to do magic, also affects mana reserves and D:magic device ability. Helps pseudo-id of magic objects A:19:Copy a spell -I:1000 F:RANDOM_GAIN N:45:Spell-power D:Ability to increase the power of spells -I:1000 N:59:Geomancy D:Ability to understand the raw elemental forces of nature and use D:them to your advantage. Most spells need Fire/Water/Earth/Air skills A:101:Use Geomancy -I:1000 # All magic skills affect magic skill f:Magic-Device:Magic%7 @@ -194,83 +171,66 @@ f:Thaumaturgy:Magic%6 N:16:Combat D:General ability to fight and to pseudo-id armour and weapons D:It also allows the use of heavier armour without penalties -I:1000 F:RANDOM_GAIN N:17:Weaponmastery D:General ability to use melee weapons -I:1000 F:RANDOM_GAIN N:18:Sword-mastery D:Ability to use swords -I:1000 N:19:Axe-mastery D:Ability to use axes -I:1000 N:20:Polearm-mastery D:Ability to use polearms -I:1000 N:21:Hafted-mastery D:Ability to use hafted weapons -I:1000 N:22:Backstab D:Ability to backstab fleeing and sleeping monsters to increase damage -I:1000 N:23:Archery D:General ability to use ranged weapons -I:1000 F:RANDOM_GAIN N:24:Sling-mastery D:Ability to use slings A:23:Fire piercing shots -I:1000 N:25:Bow-mastery D:Ability to use bows A:23:Fire piercing shots -I:1000 N:26:Crossbow-mastery D:Ability to use crossbows A:23:Fire piercing shots -I:1000 N:27:Boomerang-mastery D:Ability to use boomerangs -I:1000 N:58:Boulder-throwing D:Ability to make and throw boulders A:21:Tear down a wall to create boulders -I:1000 F:RANDOM_GAIN N:42:Barehand-combat D:Ability to fight barehanded -I:1000 F:RANDOM_GAIN G:70 N:47:Bearform-combat D:Ability to fight in bear form -I:1000 F:AUTO_HIDE F:HIDDEN N:52:Critical-hits D:Ability to deal critical hits with swords < 5lb -I:1000 N:57:Stunning-blows D:Ability to stun opponents when doing critical hits with hafted weapons > 5 lb -I:1000 # List of combat friendly skills @@ -317,26 +277,22 @@ f:Boulder-throwing:Combat%40 N:28:Spirituality D:General ability to use spiritual skills and also influence your Saving Throw -I:1000 F:RANDOM_GAIN N:53:Prayer D:Ability to learn and use spells from the gods' schools D:Spells use the wisdom stat and cost piety instead of mana A:17:Cast a spell -I:1000 N:12:Druidistic D:Ability to learn and use prayers from the Druidistic realm D:Nature powers use the wisdom stat A:1:Cast a druidistic spell -I:1000 N:29:Mindcraft D:Ability to focus the powers of the mind D:Mindpowers use the wisdom stat A:2:Use Mindcraft -I:1000 F:RANDOM_GAIN G:50 @@ -344,7 +300,6 @@ N:9:Music D:Ability to learn and sing songs D:Songs use the charisma stat A:17:Cast a spell -I:1000 f:Prayer:Spirituality%10 f:Druidistic:Spirituality%10 @@ -361,12 +316,10 @@ f:Music:Magic%10 N:30:Misc D:Not a real skill, it is only used to regroup some skills -I:0 N:33:Antimagic D:Ability to generate an antimagic field A:3:Use antimagic -I:1000 F:RANDOM_GAIN G:80 @@ -400,28 +353,23 @@ E:Thaumaturgy:Antimagic N:35:Sneakiness D:General ability at the sneakiness skills. D:It also affects the searching abilities -I:0 F:RANDOM_GAIN N:36:Stealth D:Ability to move unnoticed, silently -I:0 F:RANDOM_GAIN N:37:Disarming D:Ability to disarm the various traps -I:0 F:RANDOM_GAIN N:40:Stealing D:Ability to steal objects A:15:Steal object -I:0 N:46:Dodging D:Ability to dodge blows and bolts A:16:Check dodge chance -I:0 f:Stealth:Sneakiness%15 f:Disarming:Sneakiness%10 @@ -435,38 +383,32 @@ f:Dodging:Sneakiness%10 N:48:Monster-lore D:General ability at the monster related skills, ability to gain experience D:from friendly kills. It also affects the number of companions you can have -I:0 A:22:Turn pet into companion F:RANDOM_GAIN N:44:Summoning D:Ability to create totems from monsters and use them to summon monsters A:13:Manipulate totems -I:1000 F:RANDOM_GAIN G:60 N:49:Corpse-preservation D:Ability not to destroy the monsters' corpses when killing them -I:0 N:50:Possession D:Ability to incarnate into monsters A:11:Use the possession skill -I:0 N:8:Symbiosis D:Ability to enter in symbiosis with monsters unable to move by themselves D:Spells use the intelligence stat A:20:Use symbiotic powers -I:1000 F:RANDOM_GAIN G:70 N:32:Mimicry D:Ability to use cloaks of mimicry to change form A:6:Use Mimicry -I:1000 F:RANDOM_GAIN G:80 diff --git a/src/init1.cc b/src/init1.cc index 37cc9de3..ba13cfae 100644 --- a/src/init1.cc +++ b/src/init1.cc @@ -3569,24 +3569,6 @@ errr init_s_info_txt(FILE *fp) continue; } - /* Process 'I' for "Info" (one line only) */ - if (buf[0] == 'I') - { - int rate; - - /* Scan for the values */ - if (1 != sscanf(buf + 2, "%d", &rate)) - { - return (1); - } - - /* Save the values */ - s_ptr->rate = rate; - - /* Next... */ - continue; - } - /* Process 'G' for "random Gain" (one line only) */ if (buf[0] == 'G') { diff --git a/src/skill_type.hpp b/src/skill_type.hpp index c6de1dc1..5b29d1ac 100644 --- a/src/skill_type.hpp +++ b/src/skill_type.hpp @@ -20,7 +20,6 @@ struct skill_type s32b value; /* Actual value */ s32b mod; /* Modifier(1 skill point = modifier skill) */ - s16b rate; /* Modifier decreasing rate */ u32b uses; /* Number of times used */ diff --git a/src/skills.cc b/src/skills.cc index eef3b77c..4a56de05 100644 --- a/src/skills.cc +++ b/src/skills.cc @@ -487,7 +487,6 @@ void do_cmd_skill() /* Allocate arrays to save skill values */ std::unique_ptr<s32b[]> skill_values_save(new s32b[MAX_SKILLS]); std::unique_ptr<s32b[]> skill_mods_save(new s32b[MAX_SKILLS]); - std::unique_ptr<s16b[]> skill_rates_save(new s16b[MAX_SKILLS]); std::unique_ptr<s16b[]> skill_invest(new s16b[MAX_SKILLS]); std::unique_ptr<s32b[]> skill_bonus(new s32b[MAX_SKILLS]); @@ -501,7 +500,6 @@ void do_cmd_skill() skill_values_save[i] = s_ptr->value; skill_mods_save[i] = s_ptr->mod; - skill_rates_save[i] = s_ptr->rate; skill_invest[i] = 0; skill_bonus[i] = 0; } @@ -615,7 +613,6 @@ void do_cmd_skill() s_ptr->value = skill_values_save[i]; s_ptr->mod = skill_mods_save[i]; - s_ptr->rate = skill_rates_save[i]; } } } |