diff --git a/src/class.c b/src/class.c index 6efd9da..5d06ffa 100644 --- a/src/class.c +++ b/src/class.c @@ -147,45 +147,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 70; - case 2: return 69; - case 3: return 68; - case 4: return 67; - case 5: return 66; - case 6: return 65; - case 7: return 63; - case 8: return 61; - case 9: return 60; - case 10: return 59; - case 11: return 57; - case 12: return 55; - case 13: return 54; - case 14: return 53; - case 15: return 53; - case 16: return 52; - case 17: return 51; - case 18: return 50; - case 19: return 48; - case 20: return 46; - case 21: return 45; - case 22: return 44; - case 23: return 42; - case 24: return 40; - case 25: return 38; - case 26: return 36; - case 27: return 34; - case 28: return 32; - case 29: return 30; - case 30: return 28; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for mage paralyzation saving throw."); break; @@ -194,45 +159,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 55; - case 2: return 53; - case 3: return 51; - case 4: return 49; - case 5: return 47; - case 6: return 45; - case 7: return 43; - case 8: return 41; - case 9: return 40; - case 10: return 39; - case 11: return 37; - case 12: return 35; - case 13: return 33; - case 14: return 31; - case 15: return 30; - case 16: return 29; - case 17: return 27; - case 18: return 25; - case 19: return 23; - case 20: return 21; - case 21: return 20; - case 22: return 19; - case 23: return 17; - case 24: return 15; - case 25: return 14; - case 26: return 13; - case 27: return 12; - case 28: return 11; - case 29: return 10; - case 30: return 9; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for mage rod saving throw."); break; @@ -241,45 +171,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 65; - case 2: return 63; - case 3: return 61; - case 4: return 59; - case 5: return 57; - case 6: return 55; - case 7: return 53; - case 8: return 51; - case 9: return 50; - case 10: return 49; - case 11: return 47; - case 12: return 45; - case 13: return 43; - case 14: return 41; - case 15: return 40; - case 16: return 39; - case 17: return 37; - case 18: return 35; - case 19: return 33; - case 20: return 31; - case 21: return 30; - case 22: return 29; - case 23: return 27; - case 24: return 25; - case 25: return 23; - case 26: return 21; - case 27: return 19; - case 28: return 17; - case 29: return 15; - case 30: return 13; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for mage petrification saving throw."); break; @@ -288,45 +183,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 75; - case 2: return 73; - case 3: return 71; - case 4: return 69; - case 5: return 67; - case 6: return 65; - case 7: return 63; - case 8: return 61; - case 9: return 60; - case 10: return 59; - case 11: return 57; - case 12: return 55; - case 13: return 53; - case 14: return 51; - case 15: return 50; - case 16: return 49; - case 17: return 47; - case 18: return 45; - case 19: return 43; - case 20: return 41; - case 21: return 40; - case 22: return 39; - case 23: return 37; - case 24: return 35; - case 25: return 33; - case 26: return 31; - case 27: return 29; - case 28: return 27; - case 29: return 25; - case 30: return 23; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for mage breath saving throw."); break; @@ -335,45 +195,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 60; - case 2: return 58; - case 3: return 56; - case 4: return 54; - case 5: return 52; - case 6: return 50; - case 7: return 48; - case 8: return 46; - case 9: return 45; - case 10: return 44; - case 11: return 42; - case 12: return 40; - case 13: return 38; - case 14: return 36; - case 15: return 35; - case 16: return 34; - case 17: return 32; - case 18: return 30; - case 19: return 28; - case 20: return 26; - case 21: return 25; - case 22: return 24; - case 23: return 22; - case 24: return 20; - case 25: return 18; - case 26: return 16; - case 27: return 14; - case 28: return 12; - case 29: return 10; - case 30: return 8; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for mage spell saving throw."); break; @@ -389,45 +214,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 60; - case 2: return 59; - case 3: return 48; - case 4: return 46; - case 5: return 45; - case 6: return 43; - case 7: return 40; - case 8: return 37; - case 9: return 35; - case 10: return 34; - case 11: return 33; - case 12: return 31; - case 13: return 30; - case 14: return 29; - case 15: return 27; - case 16: return 26; - case 17: return 25; - case 18: return 24; - case 19: return 23; - case 20: return 22; - case 21: return 21; - case 22: return 20; - case 23: return 18; - case 24: return 15; - case 25: return 14; - case 26: return 12; - case 27: return 10; - case 28: return 9; - case 29: return 8; - case 30: return 7; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for cleric paralyzation saving throw."); break; @@ -436,45 +226,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 70; - case 2: return 69; - case 3: return 68; - case 4: return 66; - case 5: return 65; - case 6: return 63; - case 7: return 60; - case 8: return 57; - case 9: return 55; - case 10: return 54; - case 11: return 53; - case 12: return 51; - case 13: return 50; - case 14: return 49; - case 15: return 47; - case 16: return 46; - case 17: return 45; - case 18: return 44; - case 19: return 43; - case 20: return 42; - case 21: return 41; - case 22: return 40; - case 23: return 38; - case 24: return 35; - case 25: return 34; - case 26: return 32; - case 27: return 30; - case 28: return 29; - case 29: return 28; - case 30: return 27; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for cleric rod saving throw."); break; @@ -483,45 +238,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 65; - case 2: return 64; - case 3: return 63; - case 4: return 61; - case 5: return 60; - case 6: return 58; - case 7: return 55; - case 8: return 53; - case 9: return 50; - case 10: return 49; - case 11: return 48; - case 12: return 46; - case 13: return 45; - case 14: return 44; - case 15: return 43; - case 16: return 41; - case 17: return 40; - case 18: return 39; - case 19: return 38; - case 20: return 37; - case 21: return 36; - case 22: return 35; - case 23: return 33; - case 24: return 31; - case 25: return 29; - case 26: return 27; - case 27: return 25; - case 28: return 24; - case 29: return 23; - case 30: return 22; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for cleric petrification saving throw."); break; @@ -530,45 +250,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 80; - case 2: return 79; - case 3: return 78; - case 4: return 76; - case 5: return 75; - case 6: return 73; - case 7: return 70; - case 8: return 67; - case 9: return 65; - case 10: return 64; - case 11: return 63; - case 12: return 61; - case 13: return 60; - case 14: return 59; - case 15: return 57; - case 16: return 56; - case 17: return 55; - case 18: return 54; - case 19: return 53; - case 20: return 52; - case 21: return 51; - case 22: return 50; - case 23: return 48; - case 24: return 45; - case 25: return 44; - case 26: return 42; - case 27: return 40; - case 28: return 39; - case 29: return 38; - case 30: return 37; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for cleric breath saving throw."); break; @@ -577,45 +262,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 75; - case 2: return 74; - case 3: return 73; - case 4: return 71; - case 5: return 70; - case 6: return 68; - case 7: return 65; - case 8: return 63; - case 9: return 60; - case 10: return 59; - case 11: return 58; - case 12: return 56; - case 13: return 55; - case 14: return 54; - case 15: return 53; - case 16: return 51; - case 17: return 50; - case 18: return 49; - case 19: return 48; - case 20: return 47; - case 21: return 46; - case 22: return 45; - case 23: return 43; - case 24: return 41; - case 25: return 39; - case 26: return 37; - case 27: return 35; - case 28: return 34; - case 29: return 33; - case 30: return 32; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for cleric spell saving throw."); break; @@ -631,45 +281,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 65; - case 2: return 64; - case 3: return 63; - case 4: return 62; - case 5: return 61; - case 6: return 60; - case 7: return 59; - case 8: return 58; - case 9: return 57; - case 10: return 56; - case 11: return 55; - case 12: return 54; - case 13: return 53; - case 14: return 52; - case 15: return 51; - case 16: return 50; - case 17: return 49; - case 18: return 48; - case 19: return 47; - case 20: return 46; - case 21: return 45; - case 22: return 44; - case 23: return 43; - case 24: return 42; - case 25: return 41; - case 26: return 40; - case 27: return 39; - case 28: return 38; - case 29: return 37; - case 30: return 36; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for thief paralyzation saving throw."); break; @@ -678,45 +293,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 70; - case 2: return 68; - case 3: return 66; - case 4: return 64; - case 5: return 62; - case 6: return 60; - case 7: return 58; - case 8: return 56; - case 9: return 54; - case 10: return 52; - case 11: return 50; - case 12: return 48; - case 13: return 46; - case 14: return 44; - case 15: return 42; - case 16: return 40; - case 17: return 38; - case 18: return 36; - case 19: return 34; - case 20: return 32; - case 21: return 30; - case 22: return 28; - case 23: return 26; - case 24: return 24; - case 25: return 22; - case 26: return 20; - case 27: return 18; - case 28: return 16; - case 29: return 14; - case 30: return 13; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for thief rod saving throw."); break; @@ -725,45 +305,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 60; - case 2: return 59; - case 3: return 58; - case 4: return 58; - case 5: return 56; - case 6: return 55; - case 7: return 54; - case 8: return 53; - case 9: return 52; - case 10: return 51; - case 11: return 50; - case 12: return 49; - case 13: return 48; - case 14: return 47; - case 15: return 46; - case 16: return 45; - case 17: return 44; - case 18: return 43; - case 19: return 42; - case 20: return 41; - case 21: return 40; - case 22: return 39; - case 23: return 38; - case 24: return 37; - case 25: return 36; - case 26: return 35; - case 27: return 34; - case 28: return 33; - case 29: return 32; - case 30: return 31; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for thief petrification saving throw."); break; @@ -772,45 +317,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 80; - case 2: return 79; - case 3: return 78; - case 4: return 77; - case 5: return 76; - case 6: return 75; - case 7: return 74; - case 8: return 73; - case 9: return 72; - case 10: return 71; - case 11: return 70; - case 12: return 69; - case 13: return 68; - case 14: return 67; - case 15: return 66; - case 16: return 65; - case 17: return 64; - case 18: return 63; - case 19: return 62; - case 20: return 61; - case 21: return 60; - case 22: return 59; - case 23: return 58; - case 24: return 57; - case 25: return 56; - case 26: return 55; - case 27: return 54; - case 28: return 53; - case 29: return 52; - case 30: return 51; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for thief breath saving throw."); break; @@ -819,45 +329,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 75; - case 2: return 73; - case 3: return 71; - case 4: return 69; - case 5: return 67; - case 6: return 65; - case 7: return 63; - case 8: return 61; - case 9: return 59; - case 10: return 57; - case 11: return 55; - case 12: return 53; - case 13: return 51; - case 14: return 49; - case 15: return 47; - case 16: return 45; - case 17: return 43; - case 18: return 41; - case 19: return 39; - case 20: return 37; - case 21: return 35; - case 22: return 33; - case 23: return 31; - case 24: return 29; - case 25: return 27; - case 26: return 25; - case 27: return 23; - case 28: return 21; - case 29: return 19; - case 30: return 17; - case 31: return 0; - case 32: return 0; - case 33: return 0; - case 34: return 0; - case 35: return 0; - case 36: return 0; - case 37: return 0; - case 38: return 0; - case 39: return 0; - case 40: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for thief spell saving throw."); break; @@ -873,55 +348,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 70; - case 2: return 68; - case 3: return 67; - case 4: return 65; - case 5: return 62; - case 6: return 58; - case 7: return 55; - case 8: return 53; - case 9: return 52; - case 10: return 50; - case 11: return 47; - case 12: return 43; - case 13: return 40; - case 14: return 38; - case 15: return 37; - case 16: return 35; - case 17: return 32; - case 18: return 28; - case 19: return 25; - case 20: return 24; - case 21: return 23; - case 22: return 22; - case 23: return 20; - case 24: return 19; - case 25: return 17; - case 26: return 16; - case 27: return 15; - case 28: return 14; - case 29: return 13; - case 30: return 12; - case 31: return 11; - case 32: return 10; - case 33: return 9; - case 34: return 8; - case 35: return 7; - case 36: return 6; - case 37: return 5; - case 38: return 4; - case 39: return 3; - case 40: return 2; - case 41: return 1; /* Some mobiles. */ - case 42: return 0; - case 43: return 0; - case 44: return 0; - case 45: return 0; - case 46: return 0; - case 47: return 0; - case 48: return 0; - case 49: return 0; - case 50: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for warrior paralyzation saving throw."); break; @@ -930,55 +360,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 80; - case 2: return 78; - case 3: return 77; - case 4: return 75; - case 5: return 72; - case 6: return 68; - case 7: return 65; - case 8: return 63; - case 9: return 62; - case 10: return 60; - case 11: return 57; - case 12: return 53; - case 13: return 50; - case 14: return 48; - case 15: return 47; - case 16: return 45; - case 17: return 42; - case 18: return 38; - case 19: return 35; - case 20: return 34; - case 21: return 33; - case 22: return 32; - case 23: return 30; - case 24: return 29; - case 25: return 27; - case 26: return 26; - case 27: return 25; - case 28: return 24; - case 29: return 23; - case 30: return 22; - case 31: return 20; - case 32: return 18; - case 33: return 16; - case 34: return 14; - case 35: return 12; - case 36: return 10; - case 37: return 8; - case 38: return 6; - case 39: return 5; - case 40: return 4; - case 41: return 3; - case 42: return 2; - case 43: return 1; - case 44: return 0; - case 45: return 0; - case 46: return 0; - case 47: return 0; - case 48: return 0; - case 49: return 0; - case 50: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for warrior rod saving throw."); break; @@ -987,55 +372,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 75; - case 2: return 73; - case 3: return 72; - case 4: return 70; - case 5: return 67; - case 6: return 63; - case 7: return 60; - case 8: return 58; - case 9: return 57; - case 10: return 55; - case 11: return 52; - case 12: return 48; - case 13: return 45; - case 14: return 43; - case 15: return 42; - case 16: return 40; - case 17: return 37; - case 18: return 33; - case 19: return 30; - case 20: return 29; - case 21: return 28; - case 22: return 26; - case 23: return 25; - case 24: return 24; - case 25: return 23; - case 26: return 21; - case 27: return 20; - case 28: return 19; - case 29: return 18; - case 30: return 17; - case 31: return 16; - case 32: return 15; - case 33: return 14; - case 34: return 13; - case 35: return 12; - case 36: return 11; - case 37: return 10; - case 38: return 9; - case 39: return 8; - case 40: return 7; - case 41: return 6; - case 42: return 5; - case 43: return 4; - case 44: return 3; - case 45: return 2; - case 46: return 1; - case 47: return 0; - case 48: return 0; - case 49: return 0; - case 50: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for warrior petrification saving throw."); break; @@ -1044,55 +384,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 85; - case 2: return 83; - case 3: return 82; - case 4: return 80; - case 5: return 75; - case 6: return 70; - case 7: return 65; - case 8: return 63; - case 9: return 62; - case 10: return 60; - case 11: return 55; - case 12: return 50; - case 13: return 45; - case 14: return 43; - case 15: return 42; - case 16: return 40; - case 17: return 37; - case 18: return 33; - case 19: return 30; - case 20: return 29; - case 21: return 28; - case 22: return 26; - case 23: return 25; - case 24: return 24; - case 25: return 23; - case 26: return 21; - case 27: return 20; - case 28: return 19; - case 29: return 18; - case 30: return 17; - case 31: return 16; - case 32: return 15; - case 33: return 14; - case 34: return 13; - case 35: return 12; - case 36: return 11; - case 37: return 10; - case 38: return 9; - case 39: return 8; - case 40: return 7; - case 41: return 6; - case 42: return 5; - case 43: return 4; - case 44: return 3; - case 45: return 2; - case 46: return 1; - case 47: return 0; - case 48: return 0; - case 49: return 0; - case 50: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for warrior breath saving throw."); break; @@ -1101,55 +396,10 @@ byte saving_throws(int class_num, int type, int level) switch (level) { case 0: return 90; case 1: return 85; - case 2: return 83; - case 3: return 82; - case 4: return 80; - case 5: return 77; - case 6: return 73; - case 7: return 70; - case 8: return 68; - case 9: return 67; - case 10: return 65; - case 11: return 62; - case 12: return 58; - case 13: return 55; - case 14: return 53; - case 15: return 52; - case 16: return 50; - case 17: return 47; - case 18: return 43; - case 19: return 40; - case 20: return 39; - case 21: return 38; - case 22: return 36; - case 23: return 35; - case 24: return 34; - case 25: return 33; - case 26: return 31; - case 27: return 30; - case 28: return 29; - case 29: return 28; - case 30: return 27; - case 31: return 25; - case 32: return 23; - case 33: return 21; - case 34: return 19; - case 35: return 17; - case 36: return 15; - case 37: return 13; - case 38: return 11; - case 39: return 9; - case 40: return 7; - case 41: return 6; - case 42: return 5; - case 43: return 4; - case 44: return 3; - case 45: return 2; - case 46: return 1; - case 47: return 0; - case 48: return 0; - case 49: return 0; - case 50: return 0; + case 2: return 0; + case 3: return 0; + case 4: return 0; + case 5: return 0; default: log("SYSERR: Missing level for warrior spell saving throw."); break; @@ -1179,35 +429,6 @@ int thaco(int class_num, int level) case 3: return 20; case 4: return 19; case 5: return 19; - case 6: return 19; - case 7: return 18; - case 8: return 18; - case 9: return 18; - case 10: return 17; - case 11: return 17; - case 12: return 17; - case 13: return 16; - case 14: return 16; - case 15: return 16; - case 16: return 15; - case 17: return 15; - case 18: return 15; - case 19: return 14; - case 20: return 14; - case 21: return 14; - case 22: return 13; - case 23: return 13; - case 24: return 13; - case 25: return 12; - case 26: return 12; - case 27: return 12; - case 28: return 11; - case 29: return 11; - case 30: return 11; - case 31: return 10; - case 32: return 10; - case 33: return 10; - case 34: return 9; default: log("SYSERR: Missing level for mage thac0."); } @@ -1219,35 +440,6 @@ int thaco(int class_num, int level) case 3: return 20; case 4: return 18; case 5: return 18; - case 6: return 18; - case 7: return 16; - case 8: return 16; - case 9: return 16; - case 10: return 14; - case 11: return 14; - case 12: return 14; - case 13: return 12; - case 14: return 12; - case 15: return 12; - case 16: return 10; - case 17: return 10; - case 18: return 10; - case 19: return 8; - case 20: return 8; - case 21: return 8; - case 22: return 6; - case 23: return 6; - case 24: return 6; - case 25: return 4; - case 26: return 4; - case 27: return 4; - case 28: return 2; - case 29: return 2; - case 30: return 2; - case 31: return 1; - case 32: return 1; - case 33: return 1; - case 34: return 1; default: log("SYSERR: Missing level for cleric thac0."); } @@ -1259,35 +451,6 @@ int thaco(int class_num, int level) case 3: return 19; case 4: return 19; case 5: return 18; - case 6: return 18; - case 7: return 17; - case 8: return 17; - case 9: return 16; - case 10: return 16; - case 11: return 15; - case 12: return 15; - case 13: return 14; - case 14: return 14; - case 15: return 13; - case 16: return 13; - case 17: return 12; - case 18: return 12; - case 19: return 11; - case 20: return 11; - case 21: return 10; - case 22: return 10; - case 23: return 9; - case 24: return 9; - case 25: return 8; - case 26: return 8; - case 27: return 7; - case 28: return 7; - case 29: return 6; - case 30: return 6; - case 31: return 5; - case 32: return 5; - case 33: return 4; - case 34: return 4; default: log("SYSERR: Missing level for thief thac0."); } @@ -1299,35 +462,6 @@ int thaco(int class_num, int level) case 3: return 18; case 4: return 17; case 5: return 16; - case 6: return 15; - case 7: return 14; - case 8: return 14; - case 9: return 13; - case 10: return 12; - case 11: return 11; - case 12: return 10; - case 13: return 9; - case 14: return 8; - case 15: return 7; - case 16: return 6; - case 17: return 5; - case 18: return 4; - case 19: return 3; - case 20: return 2; - case 21: return 1; - case 22: return 1; - case 23: return 1; - case 24: return 1; - case 25: return 1; - case 26: return 1; - case 27: return 1; - case 28: return 1; - case 29: return 1; - case 30: return 1; - case 31: return 1; - case 32: return 1; - case 33: return 1; - case 34: return 1; default: log("SYSERR: Missing level for warrior thac0."); } @@ -1521,16 +655,8 @@ void advance_level(struct char_data *ch) * performance hit because it's not used very often. */ int backstab_mult(int level) { - if (level <= 7) - return 2; /* level 1 - 7 */ - else if (level <= 13) - return 3; /* level 8 - 13 */ - else if (level <= 20) - return 4; /* level 14 - 20 */ - else if (level <= 28) - return 5; /* level 21 - 28 */ - else if (level < LVL_IMMORT) - return 6; /* all remaining mortal levels */ + if (level < LVL_IMMORT) + return 2; /* mortal levels */ else return 20; /* immortals */ } @@ -1661,36 +787,6 @@ int level_exp(int chclass, int level) switch (level) { case 0: return 0; case 1: return 1; - case 2: return 2500; - case 3: return 5000; - case 4: return 10000; - case 5: return 20000; - case 6: return 40000; - case 7: return 60000; - case 8: return 90000; - case 9: return 135000; - case 10: return 250000; - case 11: return 375000; - case 12: return 750000; - case 13: return 1125000; - case 14: return 1500000; - case 15: return 1875000; - case 16: return 2250000; - case 17: return 2625000; - case 18: return 3000000; - case 19: return 3375000; - case 20: return 3750000; - case 21: return 4000000; - case 22: return 4300000; - case 23: return 4600000; - case 24: return 4900000; - case 25: return 5200000; - case 26: return 5500000; - case 27: return 5950000; - case 28: return 6400000; - case 29: return 6850000; - case 30: return 7400000; - /* add new levels here */ case LVL_IMMORT: return 8000000; } break; @@ -1699,36 +795,6 @@ int level_exp(int chclass, int level) switch (level) { case 0: return 0; case 1: return 1; - case 2: return 1500; - case 3: return 3000; - case 4: return 6000; - case 5: return 13000; - case 6: return 27500; - case 7: return 55000; - case 8: return 110000; - case 9: return 225000; - case 10: return 450000; - case 11: return 675000; - case 12: return 900000; - case 13: return 1125000; - case 14: return 1350000; - case 15: return 1575000; - case 16: return 1800000; - case 17: return 2100000; - case 18: return 2400000; - case 19: return 2700000; - case 20: return 3000000; - case 21: return 3250000; - case 22: return 3500000; - case 23: return 3800000; - case 24: return 4100000; - case 25: return 4400000; - case 26: return 4800000; - case 27: return 5200000; - case 28: return 5600000; - case 29: return 6000000; - case 30: return 6400000; - /* add new levels here */ case LVL_IMMORT: return 7000000; } break; @@ -1737,36 +803,6 @@ int level_exp(int chclass, int level) switch (level) { case 0: return 0; case 1: return 1; - case 2: return 1250; - case 3: return 2500; - case 4: return 5000; - case 5: return 10000; - case 6: return 20000; - case 7: return 40000; - case 8: return 70000; - case 9: return 110000; - case 10: return 160000; - case 11: return 220000; - case 12: return 440000; - case 13: return 660000; - case 14: return 880000; - case 15: return 1100000; - case 16: return 1500000; - case 17: return 2000000; - case 18: return 2500000; - case 19: return 3000000; - case 20: return 3500000; - case 21: return 3650000; - case 22: return 3800000; - case 23: return 4100000; - case 24: return 4400000; - case 25: return 4700000; - case 26: return 5100000; - case 27: return 5500000; - case 28: return 5900000; - case 29: return 6300000; - case 30: return 6650000; - /* add new levels here */ case LVL_IMMORT: return 7000000; } break; @@ -1775,36 +811,6 @@ int level_exp(int chclass, int level) switch (level) { case 0: return 0; case 1: return 1; - case 2: return 2000; - case 3: return 4000; - case 4: return 8000; - case 5: return 16000; - case 6: return 32000; - case 7: return 64000; - case 8: return 125000; - case 9: return 250000; - case 10: return 500000; - case 11: return 750000; - case 12: return 1000000; - case 13: return 1250000; - case 14: return 1500000; - case 15: return 1850000; - case 16: return 2200000; - case 17: return 2550000; - case 18: return 2900000; - case 19: return 3250000; - case 20: return 3600000; - case 21: return 3900000; - case 22: return 4200000; - case 23: return 4500000; - case 24: return 4800000; - case 25: return 5150000; - case 26: return 5500000; - case 27: return 5950000; - case 28: return 6400000; - case 29: return 6850000; - case 30: return 7400000; - /* add new levels here */ case LVL_IMMORT: return 8000000; } break; @@ -1830,35 +836,6 @@ const char *title_male(int chclass, int level) case CLASS_MAGIC_USER: switch (level) { case 1: return "the Apprentice of Magic"; - case 2: return "the Spell Student"; - case 3: return "the Scholar of Magic"; - case 4: return "the Delver in Spells"; - case 5: return "the Medium of Magic"; - case 6: return "the Scribe of Magic"; - case 7: return "the Seer"; - case 8: return "the Sage"; - case 9: return "the Illusionist"; - case 10: return "the Abjurer"; - case 11: return "the Invoker"; - case 12: return "the Enchanter"; - case 13: return "the Conjurer"; - case 14: return "the Magician"; - case 15: return "the Creator"; - case 16: return "the Savant"; - case 17: return "the Magus"; - case 18: return "the Wizard"; - case 19: return "the Warlock"; - case 20: return "the Sorcerer"; - case 21: return "the Necromancer"; - case 22: return "the Thaumaturge"; - case 23: return "the Student of the Occult"; - case 24: return "the Disciple of the Uncanny"; - case 25: return "the Minor Elemental"; - case 26: return "the Greater Elemental"; - case 27: return "the Crafter of Magics"; - case 28: return "the Shaman"; - case 29: return "the Keeper of Talismans"; - case 30: return "the Archmage"; case LVL_IMMORT: return "the Immortal Warlock"; case LVL_GOD: return "the Avatar of Magic"; case LVL_GRGOD: return "the God of Magic"; @@ -1868,26 +845,6 @@ const char *title_male(int chclass, int level) case CLASS_CLERIC: switch (level) { case 1: return "the Believer"; - case 2: return "the Attendant"; - case 3: return "the Acolyte"; - case 4: return "the Novice"; - case 5: return "the Missionary"; - case 6: return "the Adept"; - case 7: return "the Deacon"; - case 8: return "the Vicar"; - case 9: return "the Priest"; - case 10: return "the Minister"; - case 11: return "the Canon"; - case 12: return "the Levite"; - case 13: return "the Curate"; - case 14: return "the Monk"; - case 15: return "the Healer"; - case 16: return "the Chaplain"; - case 17: return "the Expositor"; - case 18: return "the Bishop"; - case 19: return "the Arch Bishop"; - case 20: return "the Patriarch"; - /* no one ever thought up these titles 21-30 */ case LVL_IMMORT: return "the Immortal Cardinal"; case LVL_GOD: return "the Inquisitor"; case LVL_GRGOD: return "the God of Good and Evil"; @@ -1897,26 +854,6 @@ const char *title_male(int chclass, int level) case CLASS_THIEF: switch (level) { case 1: return "the Pilferer"; - case 2: return "the Footpad"; - case 3: return "the Filcher"; - case 4: return "the Pick-Pocket"; - case 5: return "the Sneak"; - case 6: return "the Pincher"; - case 7: return "the Cut-Purse"; - case 8: return "the Snatcher"; - case 9: return "the Sharper"; - case 10: return "the Rogue"; - case 11: return "the Robber"; - case 12: return "the Magsman"; - case 13: return "the Highwayman"; - case 14: return "the Burglar"; - case 15: return "the Thief"; - case 16: return "the Knifer"; - case 17: return "the Quick-Blade"; - case 18: return "the Killer"; - case 19: return "the Brigand"; - case 20: return "the Cut-Throat"; - /* no one ever thought up these titles 21-30 */ case LVL_IMMORT: return "the Immortal Assassin"; case LVL_GOD: return "the Demi God of Thieves"; case LVL_GRGOD: return "the God of Thieves and Tradesmen"; @@ -1926,26 +863,6 @@ const char *title_male(int chclass, int level) case CLASS_WARRIOR: switch(level) { case 1: return "the Swordpupil"; - case 2: return "the Recruit"; - case 3: return "the Sentry"; - case 4: return "the Fighter"; - case 5: return "the Soldier"; - case 6: return "the Warrior"; - case 7: return "the Veteran"; - case 8: return "the Swordsman"; - case 9: return "the Fencer"; - case 10: return "the Combatant"; - case 11: return "the Hero"; - case 12: return "the Myrmidon"; - case 13: return "the Swashbuckler"; - case 14: return "the Mercenary"; - case 15: return "the Swordmaster"; - case 16: return "the Lieutenant"; - case 17: return "the Champion"; - case 18: return "the Dragoon"; - case 19: return "the Cavalier"; - case 20: return "the Knight"; - /* no one ever thought up these titles 21-30 */ case LVL_IMMORT: return "the Immortal Warlord"; case LVL_GOD: return "the Extirpator"; case LVL_GRGOD: return "the God of War"; @@ -1970,35 +887,6 @@ const char *title_female(int chclass, int level) case CLASS_MAGIC_USER: switch (level) { case 1: return "the Apprentice of Magic"; - case 2: return "the Spell Student"; - case 3: return "the Scholar of Magic"; - case 4: return "the Delveress in Spells"; - case 5: return "the Medium of Magic"; - case 6: return "the Scribess of Magic"; - case 7: return "the Seeress"; - case 8: return "the Sage"; - case 9: return "the Illusionist"; - case 10: return "the Abjuress"; - case 11: return "the Invoker"; - case 12: return "the Enchantress"; - case 13: return "the Conjuress"; - case 14: return "the Witch"; - case 15: return "the Creator"; - case 16: return "the Savant"; - case 17: return "the Craftess"; - case 18: return "the Wizard"; - case 19: return "the War Witch"; - case 20: return "the Sorceress"; - case 21: return "the Necromancress"; - case 22: return "the Thaumaturgess"; - case 23: return "the Student of the Occult"; - case 24: return "the Disciple of the Uncanny"; - case 25: return "the Minor Elementress"; - case 26: return "the Greater Elementress"; - case 27: return "the Crafter of Magics"; - case 28: return "Shaman"; - case 29: return "the Keeper of Talismans"; - case 30: return "Archwitch"; case LVL_IMMORT: return "the Immortal Enchantress"; case LVL_GOD: return "the Empress of Magic"; case LVL_GRGOD: return "the Goddess of Magic"; @@ -2008,26 +896,6 @@ const char *title_female(int chclass, int level) case CLASS_CLERIC: switch (level) { case 1: return "the Believer"; - case 2: return "the Attendant"; - case 3: return "the Acolyte"; - case 4: return "the Novice"; - case 5: return "the Missionary"; - case 6: return "the Adept"; - case 7: return "the Deaconess"; - case 8: return "the Vicaress"; - case 9: return "the Priestess"; - case 10: return "the Lady Minister"; - case 11: return "the Canon"; - case 12: return "the Levitess"; - case 13: return "the Curess"; - case 14: return "the Nunne"; - case 15: return "the Healess"; - case 16: return "the Chaplain"; - case 17: return "the Expositress"; - case 18: return "the Bishop"; - case 19: return "the Arch Lady of the Church"; - case 20: return "the Matriarch"; - /* no one ever thought up these titles 21-30 */ case LVL_IMMORT: return "the Immortal Priestess"; case LVL_GOD: return "the Inquisitress"; case LVL_GRGOD: return "the Goddess of Good and Evil"; @@ -2037,26 +905,6 @@ const char *title_female(int chclass, int level) case CLASS_THIEF: switch (level) { case 1: return "the Pilferess"; - case 2: return "the Footpad"; - case 3: return "the Filcheress"; - case 4: return "the Pick-Pocket"; - case 5: return "the Sneak"; - case 6: return "the Pincheress"; - case 7: return "the Cut-Purse"; - case 8: return "the Snatcheress"; - case 9: return "the Sharpress"; - case 10: return "the Rogue"; - case 11: return "the Robber"; - case 12: return "the Magswoman"; - case 13: return "the Highwaywoman"; - case 14: return "the Burglaress"; - case 15: return "the Thief"; - case 16: return "the Knifer"; - case 17: return "the Quick-Blade"; - case 18: return "the Murderess"; - case 19: return "the Brigand"; - case 20: return "the Cut-Throat"; - /* no one ever thought up these titles 21-30 */ case LVL_IMMORT: return "the Immortal Assassin"; case LVL_GOD: return "the Demi Goddess of Thieves"; case LVL_GRGOD: return "the Goddess of Thieves and Tradesmen"; @@ -2066,26 +914,6 @@ const char *title_female(int chclass, int level) case CLASS_WARRIOR: switch(level) { case 1: return "the Swordpupil"; - case 2: return "the Recruit"; - case 3: return "the Sentress"; - case 4: return "the Fighter"; - case 5: return "the Soldier"; - case 6: return "the Warrior"; - case 7: return "the Veteran"; - case 8: return "the Swordswoman"; - case 9: return "the Fenceress"; - case 10: return "the Combatess"; - case 11: return "the Heroine"; - case 12: return "the Myrmidon"; - case 13: return "the Swashbuckleress"; - case 14: return "the Mercenaress"; - case 15: return "the Swordmistress"; - case 16: return "the Lieutenant"; - case 17: return "the Lady Champion"; - case 18: return "the Lady Dragoon"; - case 19: return "the Cavalier"; - case 20: return "the Lady Knight"; - /* no one ever thought up these titles 21-30 */ case LVL_IMMORT: return "the Immortal Lady of War"; case LVL_GOD: return "the Queen of Destruction"; case LVL_GRGOD: return "the Goddess of War"; diff --git a/src/structs.h b/src/structs.h index 4a6aa86..410d2c8 100644 --- a/src/structs.h +++ b/src/structs.h @@ -530,10 +530,10 @@ * LVL_IMPL should always be the HIGHEST possible immortal level, and * LVL_IMMORT should always be the LOWEST immortal level. The number of * mortal levels will always be LVL_IMMORT - 1. */ -#define LVL_IMPL 34 /**< Level of Implementors */ -#define LVL_GRGOD 33 /**< Level of Greater Gods */ -#define LVL_GOD 32 /**< Level of Gods */ -#define LVL_IMMORT 31 /**< Level of Immortals */ +#define LVL_IMPL 5 /**< Level of Implementors */ +#define LVL_GRGOD 4 /**< Level of Greater Gods */ +#define LVL_GOD 3 /**< Level of Gods */ +#define LVL_IMMORT 2 /**< Level of Immortals */ /** Minimum level to build and to run the saveall command */ #define LVL_BUILDER LVL_IMMORT