From d0708b44729e518513fb9ae8bad599dcd8c238a5 Mon Sep 17 00:00:00 2001 From: kinther Date: Sat, 11 Oct 2025 08:26:27 -0700 Subject: [PATCH] Rename thief class to rogue --- src/act.informative.c | 2 +- src/act.wizard.c | 2 +- src/class.c | 54 +++++++++++++++++++++---------------------- src/constants.c | 2 +- src/shop.c | 4 ++-- src/shop.h | 4 ++-- src/structs.h | 4 ++-- src/utils.h | 6 ++--- 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/act.informative.c b/src/act.informative.c index b5389cb..54ff881 100644 --- a/src/act.informative.c +++ b/src/act.informative.c @@ -345,7 +345,7 @@ static void look_at_char(struct char_data *i, struct char_data *ch) show_obj_to_char(GET_EQ(i, j), ch, SHOW_OBJ_SHORT); } } - if (ch != i && (IS_THIEF(ch) || GET_LEVEL(ch) >= LVL_IMMORT)) { + if (ch != i && (IS_ROGUE(ch) || GET_LEVEL(ch) >= LVL_IMMORT)) { act("\r\nYou attempt to peek at $s inventory:", FALSE, i, 0, ch, TO_VICT); list_obj_to_char(i->carrying, ch, SHOW_OBJ_SHORT, TRUE); } diff --git a/src/act.wizard.c b/src/act.wizard.c index ebee5af..cfc7f62 100644 --- a/src/act.wizard.c +++ b/src/act.wizard.c @@ -3177,7 +3177,7 @@ ACMD(do_show) nlen = snprintf(buf + len, sizeof(buf) - len, "%-3d - %-6d %-6d %-6d %-6d %-6d %-6d %-6d %-6d\r\n", i, level_exp(CLASS_SORCEROR, i) - level_exp(CLASS_SORCEROR, i - 1), level_exp(CLASS_CLERIC, i) - level_exp(CLASS_CLERIC, i - 1), - level_exp(CLASS_THIEF, i) - level_exp(CLASS_THIEF, i - 1), + level_exp(CLASS_ROGUE, i) - level_exp(CLASS_ROGUE, i - 1), level_exp(CLASS_FIGHTER, i) - level_exp(CLASS_FIGHTER, i - 1), level_exp(CLASS_BARBARIAN, i) - level_exp(CLASS_BARBARIAN, i - 1), level_exp(CLASS_RANGER, i) - level_exp(CLASS_RANGER, i - 1), diff --git a/src/class.c b/src/class.c index 1b47826..4647b8a 100644 --- a/src/class.c +++ b/src/class.c @@ -28,7 +28,7 @@ const char *class_abbrevs[] = { "Mu", "Cl", - "Th", + "Ro", "Wa", "Ba", "Ra", @@ -40,7 +40,7 @@ const char *class_abbrevs[] = { const char *pc_class_types[] = { "Sorceror", "Cleric", - "Thief", + "Rogue", "Fighter", "Barbarian", "Ranger", @@ -54,12 +54,12 @@ const char *class_menu = "\r\n" "Select a class:\r\n" " [\t(C\t)]leric\r\n" -" [\t(T\t)]hief\r\n" +" R[\t(o\t)]gue\r\n" " [\t(F\t)]ighter\r\n" " [\t(S\t)]orceror\r\n" " [\t(B\t)]arbarian\r\n" " [\t(R\t)]anger\r\n" -" B[\t(A\t)]rd\r\n" +" B[\t(a\t)]rd\r\n" " [\t(D\t)]ruid\r\n"; /* The code to interpret a class letter -- used in interpreter.c when a new @@ -72,7 +72,7 @@ int parse_class(char arg) case 's': return CLASS_SORCEROR; case 'c': return CLASS_CLERIC; case 'f': return CLASS_FIGHTER; - case 't': return CLASS_THIEF; + case 'o': return CLASS_ROGUE; case 'b': return CLASS_BARBARIAN; case 'r': return CLASS_RANGER; case 'a': return CLASS_BARD; @@ -143,7 +143,7 @@ struct guild_info_type guild_info[] = { /* Midgaard */ { CLASS_SORCEROR, 3017, SOUTH }, { CLASS_CLERIC, 3004, NORTH }, - { CLASS_THIEF, 3027, EAST }, + { CLASS_ROGUE, 3027, EAST }, { CLASS_FIGHTER, 3021, EAST }, { CLASS_BARBARIAN, 3021, EAST }, { CLASS_RANGER, 3021, EAST }, @@ -162,7 +162,7 @@ bool has_save_proficiency(int class_num, int ability) { switch (class_num) { case CLASS_SORCEROR: return (ability == ABIL_CON || ability == ABIL_CHA); case CLASS_CLERIC: return (ability == ABIL_WIS || ability == ABIL_CHA); - case CLASS_THIEF: return (ability == ABIL_DEX || ability == ABIL_INT); + case CLASS_ROGUE: return (ability == ABIL_DEX || ability == ABIL_INT); case CLASS_FIGHTER: return (ability == ABIL_STR || ability == ABIL_CON); case CLASS_BARBARIAN: return (ability == ABIL_STR || ability == ABIL_CON); case CLASS_RANGER: return (ability == ABIL_STR || ability == ABIL_DEX); @@ -219,7 +219,7 @@ void roll_real_abils(struct char_data *ch) ch->real_abils.con = table[4]; ch->real_abils.cha = table[5]; break; - case CLASS_THIEF: + case CLASS_ROGUE: ch->real_abils.dex = table[0]; ch->real_abils.str = table[1]; ch->real_abils.con = table[2]; @@ -352,7 +352,7 @@ void do_start(struct char_data *ch) SET_SKILL(ch, SKILL_SHIELD_USE, 5); break; - case CLASS_THIEF: + case CLASS_ROGUE: SET_SKILL(ch, SKILL_SNEAK, 5); SET_SKILL(ch, SKILL_HIDE, 5); SET_SKILL(ch, SKILL_TRACK, 5); @@ -465,7 +465,7 @@ void advance_level(struct char_data *ch) add_move = rand_number(0, 2); break; - case CLASS_THIEF: + case CLASS_ROGUE: add_hp += rand_number(7, 13); add_mana = 0; add_move = rand_number(1, 3); @@ -545,7 +545,7 @@ int invalid_class(struct char_data *ch, struct obj_data *obj) if (OBJ_FLAGGED(obj, ITEM_ANTI_FIGHTER) && IS_FIGHTER(ch)) return TRUE; - if (OBJ_FLAGGED(obj, ITEM_ANTI_THIEF) && IS_THIEF(ch)) + if (OBJ_FLAGGED(obj, ITEM_ANTI_ROGUE) && IS_ROGUE(ch)) return TRUE; if (OBJ_FLAGGED(obj, ITEM_ANTI_BARBARIAN) && IS_BARBARIAN(ch)) @@ -630,17 +630,17 @@ void init_spell_levels(void) spell_level(SPELL_REMOVE_CURSE, CLASS_CLERIC, 1); spell_level(SKILL_SHIELD_USE, CLASS_CLERIC, 1); - /* THIEVES */ - spell_level(SKILL_SNEAK, CLASS_THIEF, 1); - spell_level(SKILL_PICK_LOCK, CLASS_THIEF, 1); - spell_level(SKILL_BACKSTAB, CLASS_THIEF, 1); - spell_level(SKILL_STEAL, CLASS_THIEF, 1); - spell_level(SKILL_HIDE, CLASS_THIEF, 1); - spell_level(SKILL_TRACK, CLASS_THIEF, 1); - spell_level(SKILL_UNARMED, CLASS_THIEF, 1); - spell_level(SKILL_PIERCING_WEAPONS, CLASS_THIEF, 1); - spell_level(SKILL_SHIELD_USE, CLASS_THIEF, 1); - spell_level(SKILL_PERCEPTION, CLASS_THIEF, 1); + /* ROGUES */ + spell_level(SKILL_SNEAK, CLASS_ROGUE, 1); + spell_level(SKILL_PICK_LOCK, CLASS_ROGUE, 1); + spell_level(SKILL_BACKSTAB, CLASS_ROGUE, 1); + spell_level(SKILL_STEAL, CLASS_ROGUE, 1); + spell_level(SKILL_HIDE, CLASS_ROGUE, 1); + spell_level(SKILL_TRACK, CLASS_ROGUE, 1); + spell_level(SKILL_UNARMED, CLASS_ROGUE, 1); + spell_level(SKILL_PIERCING_WEAPONS, CLASS_ROGUE, 1); + spell_level(SKILL_SHIELD_USE, CLASS_ROGUE, 1); + spell_level(SKILL_PERCEPTION, CLASS_ROGUE, 1); /* FIGHTERS */ spell_level(SKILL_KICK, CLASS_FIGHTER, 1); @@ -736,7 +736,7 @@ int level_exp(int chclass, int level) } break; - case CLASS_THIEF: + case CLASS_ROGUE: switch (level) { case 0: return 0; case 1: return 1; @@ -820,13 +820,13 @@ const char *title_male(int chclass, int level) default: return "the Cleric"; } - case CLASS_THIEF: + case CLASS_ROGUE: switch (level) { case 1: return "the Pilferer"; 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"; - default: return "the Thief"; + default: return "the Rogue"; } case CLASS_FIGHTER: @@ -907,13 +907,13 @@ const char *title_female(int chclass, int level) default: return "the Cleric"; } - case CLASS_THIEF: + case CLASS_ROGUE: switch (level) { case 1: return "the Pilferess"; 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"; - default: return "the Thief"; + default: return "the Rogue"; } case CLASS_FIGHTER: diff --git a/src/constants.c b/src/constants.c index 4f4536e..9657d92 100644 --- a/src/constants.c +++ b/src/constants.c @@ -477,7 +477,7 @@ const char *extra_bits[] = { "ANTI_NEUTRAL", "ANTI_SORCEROR", "ANTI_CLERIC", - "ANTI_THIEF", + "ANTI_ROGUE", "ANTI_FIGHTER", "ANTI_BARBARIAN", "ANTI_RANGER", diff --git a/src/shop.c b/src/shop.c index 37300d6..650501a 100644 --- a/src/shop.c +++ b/src/shop.c @@ -34,7 +34,7 @@ const char *trade_letters[] = { "Neutral", "Sorceror", /* Then the class based ones */ "Cleric", - "Thief", + "Rogue", "Fighter", "Barbarian", "Ranger", @@ -131,7 +131,7 @@ static int is_ok_char(struct char_data *keeper, struct char_data *ch, int shop_n if ((IS_SORCEROR(ch) && NOTRADE_SORCEROR(shop_nr)) || (IS_CLERIC(ch) && NOTRADE_CLERIC(shop_nr)) || - (IS_THIEF(ch) && NOTRADE_THIEF(shop_nr)) || + (IS_ROGUE(ch) && NOTRADE_ROGUE(shop_nr)) || (IS_FIGHTER(ch) && NOTRADE_FIGHTER(shop_nr)) || (IS_BARBARIAN(ch) && NOTRADE_BARBARIAN(shop_nr)) || (IS_RANGER(ch) && NOTRADE_RANGER(shop_nr)) || diff --git a/src/shop.h b/src/shop.h index 46b58d2..e7372ed 100644 --- a/src/shop.h +++ b/src/shop.h @@ -79,7 +79,7 @@ struct shop_data { #define TRADE_NONEUTRAL (1 << 2) #define TRADE_NOSORCEROR (1 << 3) #define TRADE_NOCLERIC (1 << 4) -#define TRADE_NOTHIEF (1 << 5) +#define TRADE_NOROGUE (1 << 5) #define TRADE_NOFIGHTER (1 << 6) #define TRADE_NOBARBARIAN (1 << 7) #define TRADE_NORANGER (1 << 8) @@ -128,7 +128,7 @@ struct stack_data { #define NOTRADE_NEUTRAL(i) (IS_SET(SHOP_TRADE_WITH((i)), TRADE_NONEUTRAL)) #define NOTRADE_SORCEROR(i) (IS_SET(SHOP_TRADE_WITH((i)), TRADE_NOSORCEROR)) #define NOTRADE_CLERIC(i) (IS_SET(SHOP_TRADE_WITH((i)), TRADE_NOCLERIC)) -#define NOTRADE_THIEF(i) (IS_SET(SHOP_TRADE_WITH((i)), TRADE_NOTHIEF)) +#define NOTRADE_ROGUE(i) (IS_SET(SHOP_TRADE_WITH((i)), TRADE_NOROGUE)) #define NOTRADE_FIGHTER(i) (IS_SET(SHOP_TRADE_WITH((i)), TRADE_NOFIGHTER)) #define NOTRADE_BARBARIAN(i) (IS_SET(SHOP_TRADE_WITH((i)), TRADE_NOBARBARIAN)) #define NOTRADE_RANGER(i) (IS_SET(SHOP_TRADE_WITH((i)), TRADE_NORANGER)) diff --git a/src/structs.h b/src/structs.h index bf4a683..8a1b368 100644 --- a/src/structs.h +++ b/src/structs.h @@ -155,7 +155,7 @@ #define CLASS_UNDEFINED (-1) /**< PC Class undefined */ #define CLASS_SORCEROR 0 /**< PC Class Sorceror */ #define CLASS_CLERIC 1 /**< PC Class Cleric */ -#define CLASS_THIEF 2 /**< PC Class Thief */ +#define CLASS_ROGUE 2 /**< PC Class Rogue */ #define CLASS_FIGHTER 3 /**< PC Class Fighter */ #define CLASS_BARBARIAN 4 /**< PC Class Barbarian */ #define CLASS_RANGER 5 /**< PC Class Ranger */ @@ -433,7 +433,7 @@ #define ITEM_ANTI_NEUTRAL 11 /**< Not usable by neutral people */ #define ITEM_ANTI_SORCEROR 12 /**< Not usable by sorcerors */ #define ITEM_ANTI_CLERIC 13 /**< Not usable by clerics */ -#define ITEM_ANTI_THIEF 14 /**< Not usable by thieves */ +#define ITEM_ANTI_ROGUE 14 /**< Not usable by rogues */ #define ITEM_ANTI_FIGHTER 15 /**< Not usable by fighters */ #define ITEM_ANTI_BARBARIAN 16 /**< Not usable by barbarians */ #define ITEM_ANTI_RANGER 17 /**< Not usable by rangers */ diff --git a/src/utils.h b/src/utils.h index 5c52dd0..5f680b1 100644 --- a/src/utils.h +++ b/src/utils.h @@ -914,9 +914,9 @@ do \ /** 1 if ch is cleric class, 0 if not. */ #define IS_CLERIC(ch) (!IS_NPC(ch) && \ (GET_CLASS(ch) == CLASS_CLERIC)) -/** 1 if ch is thief class, 0 if not. */ -#define IS_THIEF(ch) (!IS_NPC(ch) && \ - (GET_CLASS(ch) == CLASS_THIEF)) +/** 1 if ch is rogue class, 0 if not. */ +#define IS_ROGUE(ch) (!IS_NPC(ch) && \ + (GET_CLASS(ch) == CLASS_ROGUE)) /** 1 if ch is fighter class, 0 if not. */ #define IS_FIGHTER(ch) (!IS_NPC(ch) && \ (GET_CLASS(ch) == CLASS_FIGHTER))