New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wizardry Refined from Pyramid 3/60, plus some small Magic prereq fixes #2

Merged
merged 2 commits into from Nov 13, 2016

Conversation

2 participants
@dripton
Contributor

dripton commented Nov 12, 2016

Wizardry Refined is some tweaks to the spells for Dungeon Fantasy. I put it in a new file rather than modifying the existing Magic.spl and Dungeon Fantasy.spl, so players have options.

Also found a few little errors in Magic.spl while I was doing this.

dripton added some commits Nov 12, 2016

Fix some spell prerequisites
We need to be careful when the prereq list is "spell s (which is in
college c) plus n other spells from college c".  In that case, the
count needs to be n+1, not n, because spell s is in that college,
and gcs does not have special logic to avoid counting it.

Alter Terrain
Choke
Ethereal Body
False Memory
Great Geas
Lesser Geas
Paralyze Limb
Wizardry Refined, from Pyramid 3/60
These are changes for Dungeon Fantasy, mostly to remove spells
from non-Wizard colleges from the Wizard spell list, and add
alternate prereqs to avoid needing spells from non-Wizard colleges.

Clerics and Druids should continue using Dungeon Fantasy.spl as
those spells are not duplicated in this list.
@richardwilkes

This comment has been minimized.

Show comment
Hide comment
@richardwilkes

richardwilkes Nov 12, 2016

Owner

There seems to be some confusion in bef2ea6 -- in particular, you state that GCS doesn't count x spells in college prerequisites correctly if the spell with the prerequisite is also in the college. That was the case a release or two ago, but it has since been fixed. I verified this just now using release 4.6. What is interesting is that some of your fixes use the correct number, while others have the number + 1 (as described by your comment). They should all now just be the number as listed in the books. If I'm mistaken on this, please give me an example where it fails to do the correct thing.

Owner

richardwilkes commented Nov 12, 2016

There seems to be some confusion in bef2ea6 -- in particular, you state that GCS doesn't count x spells in college prerequisites correctly if the spell with the prerequisite is also in the college. That was the case a release or two ago, but it has since been fixed. I verified this just now using release 4.6. What is interesting is that some of your fixes use the correct number, while others have the number + 1 (as described by your comment). They should all now just be the number as listed in the books. If I'm mistaken on this, please give me an example where it fails to do the correct thing.

@dripton

This comment has been minimized.

Show comment
Hide comment
@dripton

dripton Nov 12, 2016

Contributor

I tested a bunch of these with 4.5.1. I will test again with 4.6.

Contributor

dripton commented Nov 12, 2016

I tested a bunch of these with 4.5.1. I will test again with 4.6.

@dripton

This comment has been minimized.

Show comment
Hide comment
@dripton

dripton Nov 13, 2016

Contributor

Alter Terrain was requiring Shape Stone. But Magic says it only requires the "all 4 elemental Shape spells". That would be Earth, Fire, Air, and Water, but not Stone.

I just checked Choke, with gcs 4.6.0. (With java 1.8.0_101 on 64-bit Ubuntu 16.04, though I doubt it matters with Java.) Magic says "Magery 1 and at least five Body Control spells, including Spasm." With the original version of Magic.spl, Choke turned from red (prereqs not met) to black (legal) with only 4 Body Control spells, including Spasm. With my version, it changed at 5. So I believe my Choke change is correct.

For Ethereal Body, Magic says "Magery 3 and either Body of Air or six Movement spells." I read that as (Magery 3) and (Body of Air or 6 Movement spells). I made it work that way. Before, it worked like (Magery 3 and Body of Air) or (6 Movement spells.).

For False Memory, Magic says "Forgetfulness and six other Mind Control spells." With my change (to require Forgetfulness and 7 Mind Control spells", False Memory turns black when I have 7 Mind Control spells including Forgetfulness. Without my change, it turns black at only 6 Mind Control spells including Forgetfulness.

Great Geas and Lesser Geas and Paralyze Limb are just like Choke and False Memory.

I think these changes are good. There might be other spells with the same problem that I missed, though.

Contributor

dripton commented Nov 13, 2016

Alter Terrain was requiring Shape Stone. But Magic says it only requires the "all 4 elemental Shape spells". That would be Earth, Fire, Air, and Water, but not Stone.

I just checked Choke, with gcs 4.6.0. (With java 1.8.0_101 on 64-bit Ubuntu 16.04, though I doubt it matters with Java.) Magic says "Magery 1 and at least five Body Control spells, including Spasm." With the original version of Magic.spl, Choke turned from red (prereqs not met) to black (legal) with only 4 Body Control spells, including Spasm. With my version, it changed at 5. So I believe my Choke change is correct.

For Ethereal Body, Magic says "Magery 3 and either Body of Air or six Movement spells." I read that as (Magery 3) and (Body of Air or 6 Movement spells). I made it work that way. Before, it worked like (Magery 3 and Body of Air) or (6 Movement spells.).

For False Memory, Magic says "Forgetfulness and six other Mind Control spells." With my change (to require Forgetfulness and 7 Mind Control spells", False Memory turns black when I have 7 Mind Control spells including Forgetfulness. Without my change, it turns black at only 6 Mind Control spells including Forgetfulness.

Great Geas and Lesser Geas and Paralyze Limb are just like Choke and False Memory.

I think these changes are good. There might be other spells with the same problem that I missed, though.

@richardwilkes

This comment has been minimized.

Show comment
Hide comment
@richardwilkes

richardwilkes Nov 13, 2016

Owner

Hmm... maybe I was looking at the wrong thing somehow. I'll check again when I get some time tonight or tomorrow and assuming I was wrong I'll merge the changes. Thanks!

Owner

richardwilkes commented Nov 13, 2016

Hmm... maybe I was looking at the wrong thing somehow. I'll check again when I get some time tonight or tomorrow and assuming I was wrong I'll merge the changes. Thanks!

@richardwilkes

This comment has been minimized.

Show comment
Hide comment
@richardwilkes

richardwilkes Nov 13, 2016

Owner

OK, reviewing the changes again, they do look good. What threw me off was your comment about needing x+1 to satisfy x, which is not the case. You do need that when certain wording is present (i.e. "Forgetfulness and six other Mind Control spells", but not in the general case.

Anyway, thanks again.

Owner

richardwilkes commented Nov 13, 2016

OK, reviewing the changes again, they do look good. What threw me off was your comment about needing x+1 to satisfy x, which is not the case. You do need that when certain wording is present (i.e. "Forgetfulness and six other Mind Control spells", but not in the general case.

Anyway, thanks again.

@richardwilkes richardwilkes merged commit 5622df1 into richardwilkes:master Nov 13, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment