summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/edit/s_info.txt10
-rw-r--r--lib/mods/theme/edit/s_info.txt10
-rw-r--r--src/init1.cc32
3 files changed, 0 insertions, 52 deletions
diff --git a/lib/edit/s_info.txt b/lib/edit/s_info.txt
index 87251694..b6c195dc 100644
--- a/lib/edit/s_info.txt
+++ b/lib/edit/s_info.txt
@@ -16,7 +16,6 @@
# A:action mkey:action desc
# E:exclusive skill:exclusive skill
-# O:skill:opposing skill%percent
# A:skill:friendly skill%percent
# T:father:child
@@ -260,15 +259,6 @@ f:Boomerang-mastery:Combat%7
f:Barehand-combat:Combat%50
f:Boulder-throwing:Combat%40
-# No more, let's see how it turns out
-# Sorcery and Weaponmastery aren't exactly friendly to each other
-#O:Sorcery:Weaponmastery%100
-#O:Sorcery:Archery%100
-#O:Sorcery:Barehand-combat%100
-#O:Weaponmastery:Sorcery%100
-#O:Archery:Sorcery%100
-#O:Barehand-combat:Sorcery%100
-
############################### SPIRITUALITY SKILLS ###########################
diff --git a/lib/mods/theme/edit/s_info.txt b/lib/mods/theme/edit/s_info.txt
index 2d42bf4a..5d57dbe6 100644
--- a/lib/mods/theme/edit/s_info.txt
+++ b/lib/mods/theme/edit/s_info.txt
@@ -16,7 +16,6 @@
# A:action mkey:action desc
# E:exclusive skill:exclusive skill
-# O:skill:opposing skill%percent
# A:skill:friendly skill%percent
# T:father:child
@@ -262,15 +261,6 @@ f:Boomerang-mastery:Combat%7
f:Barehand-combat:Combat%50
f:Boulder-throwing:Combat%40
-# No more, let's see how it turns out
-# Sorcery and Weaponmastery aren't exactly friendly to each other
-#O:Sorcery:Weaponmastery%100
-#O:Sorcery:Archery%100
-#O:Sorcery:Barehand-combat%100
-#O:Weaponmastery:Sorcery%100
-#O:Archery:Sorcery%100
-#O:Barehand-combat:Sorcery%100
-
############################### SPIRITUALITY SKILLS ###########################
diff --git a/src/init1.cc b/src/init1.cc
index a6376090..29f63ac7 100644
--- a/src/init1.cc
+++ b/src/init1.cc
@@ -3091,38 +3091,6 @@ errr init_s_info_txt(FILE *fp)
}
- /* Process 'O' for "Opposite" */
- if (buf[0] == 'O')
- {
- char *sec, *cval;
- s16b s1, s2;
-
- /* Scan for the values */
- if (NULL == (sec = strchr(buf + 2, ':')))
- {
- return (1);
- }
- *sec = '\0';
- sec++;
- if (!*sec) return (1);
- if (NULL == (cval = strchr(sec, '%')))
- {
- return (1);
- }
- *cval = '\0';
- cval++;
- if (!*cval) return (1);
-
- s1 = find_skill(buf + 2);
- s2 = find_skill(sec);
- if ((s1 == -1) || (s2 == -1)) return (1);
-
- s_descriptors[s1].action[s2] = -atoi(cval);
-
- /* Next... */
- continue;
- }
-
/* Process 'A' for "Amical/friendly" */
if (buf[0] == 'f')
{