Skip to content

Commit

Permalink
Auto Run Mode and space for ignoring current monsters
Browse files Browse the repository at this point in the history
  • Loading branch information
Madrawn committed Oct 2, 2011
1 parent 533442d commit 0e2dca2
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 35 deletions.
5 changes: 0 additions & 5 deletions crafting.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,6 @@ void game::init_recipes()
TOOL(itm_pan, -1, itm_pot, -1, NULL);
COMP(itm_meat, 1, NULL);

RECIPE(itm_dogfood, CC_FOOD, sk_cooking, sk_null, 0, 5000);
TOOL(itm_hotplate, 4, NULL);
TOOL(itm_pot, -1, NULL);
COMP(itm_meat, 1, NULL);

RECIPE(itm_veggy_cooked, CC_FOOD, sk_cooking, sk_null, 0, 4000);
TOOL(itm_hotplate, 5, NULL);
TOOL(itm_pan, -1, itm_pot, -1, NULL);
Expand Down
2 changes: 1 addition & 1 deletion itype.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ itm_apple, itm_orange, itm_lemon, itm_chips, itm_pretzels, itm_chocolate,
itm_can_spam, itm_can_pineapple, itm_can_coconut, itm_can_sardine,
itm_can_tuna, itm_can_catfood, itm_honeycomb, itm_royal_jelly, itm_fetus,
itm_arm, itm_leg, itm_ant_egg, itm_marloss_berry, itm_flour, itm_sugar,
itm_salt, itm_potato_raw, itm_potato_baked, itm_bread, itm_pie, itm_pizza, itm_dogfood,
itm_salt, itm_potato_raw, itm_potato_baked, itm_bread, itm_pie, itm_pizza,
// Medication
itm_bandages, itm_1st_aid, itm_vitamins, itm_aspirin, itm_caffeine,
itm_pills_sleep, itm_iodine, itm_dayquil, itm_nyquil, itm_inhaler, itm_codeine,
Expand Down
4 changes: 0 additions & 4 deletions itypedef.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,6 @@ FOOD("chunk of meat", 50, 50, c_red, FLESH, itm_null,
1, 2, 0, 20, 24, 0, -1, 0, 1,-10, &iuse::none, ADD_NULL, "\
Freshly butchered meat. You could eat it raw, but cooking it is better.");

FOOD("dogfood", 50,60,c_red, FLESH, itm_null,
1, 2, 0, 20, 24, 0, 0, 0, 1,-10, &iuse::dogfood, ADD_NULL, "\
Food for dogs. It smells strange, but dogs love it.")

FOOD("chunk of veggy", 30, 60, c_green, VEGGY, itm_null,
1, 2, 0, 20, 80, 0, 1, 0, 1, 0, &iuse::none, ADD_NULL, "\
A raw chunk of vegetable. Fine for eating raw, tastier when cooked.");
Expand Down
23 changes: 0 additions & 23 deletions iuse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -582,29 +582,6 @@ void iuse::marloss(game *g, player *p, item *it, bool t)
if (effect == 6)
p->radiation = 0;
}

void iuse::dogfood(game *g, player *p, item *it, bool t)
{
int dirx, diry;
g->draw();
mvprintw(0, 0, "Which direction?");
get_direction(dirx, diry, input());
if (dirx == -2) {
g->add_msg("Invalid direction.");
return;
}
p->moves -= 15;
dirx += p->posx;
diry += p->posy;
int mon_dex = g->mon_at(dirx,diry);
if(g->z[mon_dex].type->id == mon_dog){
g->add_msg("The dog seems to like you!");
g->z[mon_dex].friendly = -1;
} else {
g->add_msg("The %s seems quit unimpressed!",g->z[mon_dex].type->name.c_str());
}

}



Expand Down
2 changes: 0 additions & 2 deletions iuse.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ class iuse
void mutagen (game *g, player *p, item *it, bool t);
void purifier (game *g, player *p, item *it, bool t);
void marloss (game *g, player *p, item *it, bool t);
void dogfood (game *g, player *p, item *it, bool t);

// TOOLS
void lighter (game *g, player *p, item *it, bool t);
void sew (game *g, player *p, item *it, bool t);
Expand Down

0 comments on commit 0e2dca2

Please sign in to comment.