Skip to content
This repository was archived by the owner on Aug 24, 2023. It is now read-only.

Commit

Permalink
Merge pull request CleverRaven#53432 from Hirmuolio/obs2
Browse files Browse the repository at this point in the history 
Remove code for obsolete lajatangs and mre
  • Loading branch information
@Rivet-the-Zombie
Rivet-the-Zombie authored Dec 14, 2021
2 parents 0f74ac7 + f321e2f commit c145d55
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 81 deletions.
20 changes: 0 additions & 20 deletions data/json/item_actions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,26 +409,6 @@
"id": "CONTACTS",
"name": { "str": "Put in eyes" }
},
{
"type": "item_action",
"id": "CS_LAJATANG_OFF",
"name": { "str": "Turn on" }
},
{
"type": "item_action",
"id": "CS_LAJATANG_ON",
"name": { "str": "Turn off" }
},
{
"type": "item_action",
"id": "ECS_LAJATANG_OFF",
"name": { "str": "Turn on" }
},
{
"type": "item_action",
"id": "ECS_LAJATANG_ON",
"name": { "str": "Turn off" }
},
{
"type": "item_action",
"id": "DATURA",
Expand Down
4 changes: 0 additions & 4 deletions src/item_factory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1200,10 +1200,6 @@ void Item_factory::init()
add_iuse( "E_COMBATSAW_ON", &iuse::e_combatsaw_on );
add_iuse( "CONTACTS", &iuse::contacts );
add_iuse( "CROWBAR", &iuse::crowbar );
add_iuse( "CS_LAJATANG_OFF", &iuse::cs_lajatang_off );
add_iuse( "CS_LAJATANG_ON", &iuse::cs_lajatang_on );
add_iuse( "ECS_LAJATANG_OFF", &iuse::ecs_lajatang_off );
add_iuse( "ECS_LAJATANG_ON", &iuse::ecs_lajatang_on );
add_iuse( "DATURA", &iuse::datura );
add_iuse( "DIG", &iuse::dig );
add_iuse( "DIVE_TANK", &iuse::dive_tank );
Expand Down
38 changes: 0 additions & 38 deletions src/iuse.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3026,24 +3026,6 @@ cata::optional<int> iuse::elec_chainsaw_off( Character *p, item *it, bool, const
_( "You flip the switch, but nothing happens." ) );
}

cata::optional<int> iuse::cs_lajatang_off( Character *p, item *it, bool, const tripoint & )
{
return toolweapon_off( *p, *it,
false,
rng( 0, 10 ) - it->damage_level() > 5 && it->ammo_remaining() > 1 && !p->is_underwater(),
40, _( "With a roar, the chainsaws scream to life!" ),
_( "You yank the cords, but nothing happens." ) );
}

cata::optional<int> iuse::ecs_lajatang_off( Character *p, item *it, bool, const tripoint & )
{
return toolweapon_off( *p, *it,
false,
rng( 0, 10 ) - it->damage_level() > 5 && it->ammo_remaining() > 1 && !p->is_underwater(),
40, _( "With a buzz, the chainsaws scream to life!" ),
_( "You flip the switch, but nothing happens." ) );
}

cata::optional<int> iuse::carver_off( Character *p, item *it, bool, const tripoint & )
{
return toolweapon_off( *p, *it,
Expand Down Expand Up @@ -3122,26 +3104,6 @@ cata::optional<int> iuse::elec_chainsaw_on( Character *p, item *it, bool t, cons
15, 12, _( "Your electric chainsaw rumbles." ) );
}

cata::optional<int> iuse::cs_lajatang_on( Character *p, item *it, bool t, const tripoint & )
{
return toolweapon_on( *p, *it, t, _( "chainsaw lajatang" ),
false,
15, 12, _( "Your chainsaws rumble." ),
true );
// The chainsaw lajatang drains 2 charges per turn, since
// there are two chainsaws.
}

cata::optional<int> iuse::ecs_lajatang_on( Character *p, item *it, bool t, const tripoint & )
{
return toolweapon_on( *p, *it, t, _( "electric chainsaw lajatang" ),
false,
15, 12, _( "Your chainsaws buzz." ),
true );
// The chainsaw lajatang drains 2 charges per turn, since
// there are two chainsaws.
}

cata::optional<int> iuse::carver_on( Character *p, item *it, bool t, const tripoint & )
{
return toolweapon_on( *p, *it, t, _( "electric carver" ),
Expand Down
4 changes: 0 additions & 4 deletions src/iuse.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ cata::optional<int> combatsaw_off( Character *, item *, bool, const tripoint & )
cata::optional<int> combatsaw_on( Character *, item *, bool, const tripoint & );
cata::optional<int> contacts( Character *, item *, bool, const tripoint & );
cata::optional<int> crowbar( Character *, item *, bool, const tripoint & );
cata::optional<int> cs_lajatang_off( Character *, item *, bool, const tripoint & );
cata::optional<int> cs_lajatang_on( Character *, item *, bool, const tripoint & );
cata::optional<int> dig( Character *, item *, bool, const tripoint & );
cata::optional<int> dig_channel( Character *, item *, bool, const tripoint & );
cata::optional<int> directional_antenna( Character *, item *, bool, const tripoint & );
Expand All @@ -105,8 +103,6 @@ cata::optional<int> dive_tank( Character *, item *, bool, const tripoint & );
cata::optional<int> dog_whistle( Character *, item *, bool, const tripoint & );
cata::optional<int> e_combatsaw_off( Character *, item *, bool, const tripoint & );
cata::optional<int> e_combatsaw_on( Character *, item *, bool, const tripoint & );
cata::optional<int> ecs_lajatang_off( Character *, item *, bool, const tripoint & );
cata::optional<int> ecs_lajatang_on( Character *, item *, bool, const tripoint & );
cata::optional<int> ehandcuffs( Character *, item *, bool, const tripoint & );
cata::optional<int> einktabletpc( Character *, item *, bool, const tripoint & );
cata::optional<int> elec_chainsaw_off( Character *, item *, bool, const tripoint & );
Expand Down
15 changes: 0 additions & 15 deletions tests/clzones_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

static const faction_id faction_your_followers( "your_followers" );

static const item_category_id item_category_food( "food" );

static const zone_type_id zone_type_LOOT_DRINK( "LOOT_DRINK" );
static const zone_type_id zone_type_LOOT_FOOD( "LOOT_FOOD" );
static const zone_type_id zone_type_LOOT_PDRINK( "LOOT_PDRINK" );
Expand Down Expand Up @@ -223,18 +221,5 @@ TEST_CASE( "zone sorting comestibles ", "[zones][items][food][activities]" )
}
}
}

// MREs are under the food category but are not directly edible.
GIVEN( "a non-comestible food" ) {
item noncomestible_food( "mre_dessert" );
REQUIRE( noncomestible_food.get_category_shallow().get_id() == item_category_food );
REQUIRE_FALSE( noncomestible_food.is_comestible() );

WHEN( "sorting" ) {
THEN( "should put in the food zone" ) {
CHECK( zm.get_near_zone_type_for_item( noncomestible_food, origin_pos ) == zone_type_LOOT_FOOD );
}
}
}
}
}

0 comments on commit c145d55

Please sign in to comment.