Remove traps

Credit goes mostly to "miramor" <danlev@norwoodlight.com> who did most
of the actual work. I just did a few minor tweaks and fixes + rebased
onto master.

1 files changed, 0 insertions, 35 deletions

diff --git a/src/birth.cc b/src/birth.cc
index b18a4b9a..c6e1d922 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -48,7 +48,6 @@
 #include "store.hpp"
 #include "tables.hpp"
 #include "town_type.hpp"
-#include "trap_type.hpp"
 #include "util.hpp"
 #include "util.h"
 #include "variable.h"
@@ -723,7 +722,6 @@ static void player_wipe(void)
 	auto &r_info = game->edit_data.r_info;
 	auto &k_info = game->edit_data.k_info;
 	auto &a_info = game->edit_data.a_info;
-	auto &t_info = game->edit_data.t_info;
 
 	/* Wipe special levels */
 	wipe_saved();
@@ -882,13 +880,6 @@ static void player_wipe(void)
 		inscription_known = false;
 	}
 
-	/* Wipe the known traps list */
-	for (auto &t_ref: t_info)
-	{
-		t_ref.known = 0;
-		t_ref.ident = FALSE;
-	}
-
 	/* Reset wild_mode to FALSE */
 	p_ptr->wild_mode = FALSE;
 	p_ptr->old_wild_mode = FALSE;
@@ -986,8 +977,6 @@ static void player_outfit_spellbook(cptr spell_name)
  */
 static void player_outfit(void)
 {
-	auto &t_info = game->edit_data.t_info;
-
 	// Shorthand names for convenience
 	cptr class_name = spp_ptr->title;
 	auto const &subrace_name = rmp_ptr->title;
@@ -1152,30 +1141,6 @@ static void player_outfit(void)
 		(void)inven_carry(q_ptr, FALSE);
 	}
 
-	/* Rogues have a better knowledge of traps */
-	if (p_ptr->has_ability(AB_TRAPPING))
-	{
-		t_info[TRAP_OF_DAGGER_I].known = randint(50) + 50;
-		t_info[TRAP_OF_POISON_NEEDLE].known = randint(50) + 50;
-		t_info[TRAP_OF_FIRE_BOLT].known = randint(50) + 50;
-		t_info[TRAP_OF_DAGGER_I].ident = TRUE;
-		t_info[TRAP_OF_POISON_NEEDLE].ident = TRUE;
-		t_info[TRAP_OF_FIRE_BOLT].ident = TRUE;
-
-		/* Hack -- Give the player a some ammo for the traps */
-		object_type forge;
-		object_type *q_ptr = &forge;
-		object_prep(q_ptr, lookup_kind(TV_SHOT, SV_AMMO_NORMAL));
-		q_ptr->number = (byte)rand_range(5, 15);
-		object_aware(q_ptr);
-		object_known(q_ptr);
-
-		/* These objects are "storebought" */
-		q_ptr->ident |= IDENT_MENTAL;
-
-		(void)inven_carry(q_ptr, FALSE);
-	}
-
 	/* Outfit the player with starting items */
 	outfit_objs(rp_ptr->object_protos);
 	outfit_objs(rmp_ptr->object_protos);