fiddlerwoaroof/crawl - Change IJ6KN5MQLEB7DR7NW2AYQNCVBV5IUKECUSECUMEJWOBRNJBAXHCQC

More streamlining, this time of code which shows power and spell failure.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@616 c06c8d41-db1a-0410-9941-cceddc491573

Created by haranp on December 11, 2006

IJ6KN5MQLEB7DR7NW2AYQNCVBV5IUKECUSECUMEJWOBRNJBAXHCQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.h at line 50 [3.291319]

[3.293025]

const char* failure_rate_to_string( int fail );
const char* spell_power_to_string( int power );

Replacement in crawl-ref/source/spl-cast.cc at line 177 [3.293070]

B:BD[2.124975] → [2.124975:125451]

	    int spell_p = calc_spell_power( spell, true );
	    cprintf( (spell_p > 100) ? "Enormous"   :
		     (spell_p >  90) ? "Huge"       :
		     (spell_p >  80) ? "Massive"    :
		     (spell_p >  70) ? "Major"      :
		     (spell_p >  60) ? "Impressive" :
		     (spell_p >  50) ? "Reasonable" :
		     (spell_p >  40) ? "Moderate"   :
		     (spell_p >  30) ? "Adequate"   :
		     (spell_p >  20) ? "Mediocre"   :
		     (spell_p >  10) ? "Minor"
		     : "Negligible");

[2.124975]

[2.125451]

	    cprintf("%s",spell_power_to_string(calc_spell_power(spell,true)));

Replacement in crawl-ref/source/spl-cast.cc at line 182 [3.293070]

B:BD[3.296876] → [3.296876:296923]

            int spell_f = spell_fail( spell );

[3.296876]

[3.296923]

            cprintf( "%s", failure_rate_to_string(spell_fail(spell)));

Deletion in crawl-ref/source/spl-cast.cc at line 184 [3.293070]

B:BD[3.296924] → [3.296924:297571]

            cprintf( (spell_f == 100) ? "Useless"   :
                     (spell_f >   90) ? "Terrible"  :
                     (spell_f >   80) ? "Cruddy"    :
                     (spell_f >   70) ? "Bad"       :
                     (spell_f >   60) ? "Very Poor" :
                     (spell_f >   50) ? "Poor"      :
                     (spell_f >   40) ? "Fair"      :
                     (spell_f >   30) ? "Good"      :
                     (spell_f >   20) ? "Very Good" :
                     (spell_f >   10) ? "Great"     :
                     (spell_f >    0) ? "Excellent" 
                                      : "Perfect" );

Insertion in crawl-ref/source/spl-cast.cc at line 3589 [3.293070]

[3.395634]


const char* failure_rate_to_string( int fail )
{
    return
        (fail == 100) ? "Useless"   :
        (fail >   90) ? "Terrible"  :
        (fail >   80) ? "Cruddy"    :
        (fail >   70) ? "Bad"       :
        (fail >   60) ? "Very Poor" :
        (fail >   50) ? "Poor"      :
        (fail >   40) ? "Fair"      :
        (fail >   30) ? "Good"      :
        (fail >   20) ? "Very Good" :
        (fail >   10) ? "Great"     :
        (fail >    0) ? "Excellent" 
        : "Perfect";
}
const char* spell_power_to_string( int power )
{
    return
        (power > 100) ? "Enormous"   :
        (power >  90) ? "Huge"       :
        (power >  80) ? "Massive"    :
        (power >  70) ? "Major"      :
        (power >  60) ? "Impressive" :
        (power >  50) ? "Reasonable" :
        (power >  40) ? "Moderate"   :
        (power >  30) ? "Adequate"   :
        (power >  20) ? "Mediocre"   :
        (power >  10) ? "Minor"
        : "Negligible";
}

Replacement in crawl-ref/source/chardump.cc at line 899 [3.4100336]

B:BD[2.1217038] → [2.1217038:1217485]

		int spell_p = calc_spell_power( spell, true );
		spell_line += ( (spell_p > 100) ? "Enormous"   :
				(spell_p >  90) ? "Huge"       :
				(spell_p >  80) ? "Massive"    :
				(spell_p >  70) ? "Major"      :
				(spell_p >  60) ? "Impressive" :
				(spell_p >  50) ? "Reasonable" :
				(spell_p >  40) ? "Moderate"   :
				(spell_p >  30) ? "Adequate"   :
				(spell_p >  20) ? "Mediocre"   :
				(spell_p >  10) ? "Minor"
				: "Negligible");

[2.1217038]

[2.1217485]

		spell_line += spell_power_to_string(calc_spell_power(spell,true));

Deletion in crawl-ref/source/chardump.cc at line 903 [3.4100336]
∅:D[2.1217561] → [3.4118766:4118820]
B:BD[3.4118766] → [3.4118766:4118820]
```
                int fail_rate = spell_fail( spell );
```

Replacement in crawl-ref/source/chardump.cc at line 904 [3.4100336]

B:BD[3.4118821] → [3.4118821:4119597]

                spell_line += (fail_rate == 100) ? "Useless"   :
                              (fail_rate >   90) ? "Terrible"  :
                              (fail_rate >   80) ? "Cruddy"    :
                              (fail_rate >   70) ? "Bad"       :
                              (fail_rate >   60) ? "Very Poor" :
                              (fail_rate >   50) ? "Poor"      :
                              (fail_rate >   40) ? "Fair"      :
                              (fail_rate >   30) ? "Good"      :
                              (fail_rate >   20) ? "Very Good" :
                              (fail_rate >   10) ? "Great"     :
                              (fail_rate >   0)  ? "Excellent" 
                                                 : "Perfect";

[3.4118821]

[3.4119597]

                spell_line += failure_rate_to_string(spell_fail(spell));

Replacement in crawl-ref/source/abl-show.cc at line 1382 [3.4494389]

B:BD[3.4533995] → [3.4533995:4534048]

                int spell_f = Curr_abil[loopy].fail;

[3.4533995]

[3.4534048]

                cprintf( "%s", failure_rate_to_string(Curr_abil[loopy].fail));

Deletion in crawl-ref/source/abl-show.cc at line 1384 [3.4494389]

B:BD[3.4534049] → [3.4534049:4534745]

                cprintf( (spell_f >= 100) ? "Useless"   :
                         (spell_f >   90) ? "Terrible"  :
                         (spell_f >   80) ? "Cruddy"    :
                         (spell_f >   70) ? "Bad"       :
                         (spell_f >   60) ? "Very Poor" :
                         (spell_f >   50) ? "Poor"      :
                         (spell_f >   40) ? "Fair"      :
                         (spell_f >   30) ? "Good"      :
                         (spell_f >   20) ? "Very Good" :
                         (spell_f >   10) ? "Great"     :
                         (spell_f >    0) ? "Excellent" :
                                            "Perfect" );

Deletion in crawl-ref/source/abl-show.cc at line 1425 [3.4494389]
B:BD[3.4535489] → [3.4535489:4535565]
```
    int ability = -1;                   // used with draconian checks {dlb}
```
Replacement in crawl-ref/source/abl-show.cc at line 1467 [3.4494389]
B:BD[3.4536850] → [3.4536850:4536874]
```
            ability = (
```
[3.4536850]
[3.4536874]
```
            const int ability = (
```
Deletion in crawl-ref/source/abl-show.cc at line 1477 [3.4494389]
B:BD[3.4537546] → [3.4537546:4537547]