Skip to content

Commit 6d16a6b

Browse files
author
Tommy
committed
Fuck tabs.
1 parent 0bec53b commit 6d16a6b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+4788
-4878
lines changed

‎addiction.cpp

+31-31
Original file line numberDiff line numberDiff line change
@@ -160,32 +160,32 @@ void addict_effect(game *g, addiction &add)
160160
*/
161161
std::string addiction_type_name(add_type cur)
162162
{
163-
switch(cur) {
164-
case ADD_CIG: return _("nicotine");
165-
case ADD_CAFFEINE: return _("caffeine");
166-
case ADD_ALCOHOL: return _("alcohol");
167-
case ADD_SLEEP: return _("sleeping pills");
168-
case ADD_PKILLER: return _("opiates");
169-
case ADD_SPEED: return _("amphetamine");
170-
case ADD_COKE: return _("cocaine");
171-
case ADD_CRACK: return _("crack cocaine");
172-
default: return "bugs in addiction.cpp";
173-
}
163+
switch(cur) {
164+
case ADD_CIG: return _("nicotine");
165+
case ADD_CAFFEINE: return _("caffeine");
166+
case ADD_ALCOHOL: return _("alcohol");
167+
case ADD_SLEEP: return _("sleeping pills");
168+
case ADD_PKILLER: return _("opiates");
169+
case ADD_SPEED: return _("amphetamine");
170+
case ADD_COKE: return _("cocaine");
171+
case ADD_CRACK: return _("crack cocaine");
172+
default: return "bugs in addiction.cpp";
173+
}
174174
}
175175

176176
std::string addiction_name(addiction cur)
177177
{
178-
switch (cur.type) {
179-
case ADD_CIG: return _("Nicotine Withdrawal");
180-
case ADD_CAFFEINE: return _("Caffeine Withdrawal");
181-
case ADD_ALCOHOL: return _("Alcohol Withdrawal");
182-
case ADD_SLEEP: return _("Sleeping Pill Dependance");
183-
case ADD_PKILLER: return _("Opiate Withdrawal");
184-
case ADD_SPEED: return _("Amphetamine Withdrawal");
185-
case ADD_COKE: return _("Cocaine Withdrawal");
186-
case ADD_CRACK: return _("Crack Cocaine Withdrawal");
187-
default: return "Erroneous addiction";
188-
}
178+
switch (cur.type) {
179+
case ADD_CIG: return _("Nicotine Withdrawal");
180+
case ADD_CAFFEINE: return _("Caffeine Withdrawal");
181+
case ADD_ALCOHOL: return _("Alcohol Withdrawal");
182+
case ADD_SLEEP: return _("Sleeping Pill Dependance");
183+
case ADD_PKILLER: return _("Opiate Withdrawal");
184+
case ADD_SPEED: return _("Amphetamine Withdrawal");
185+
case ADD_COKE: return _("Cocaine Withdrawal");
186+
case ADD_CRACK: return _("Crack Cocaine Withdrawal");
187+
default: return "Erroneous addiction";
188+
}
189189
}
190190

191191
morale_type addiction_craving(add_type cur)
@@ -205,23 +205,23 @@ morale_type addiction_craving(add_type cur)
205205
add_type addiction_type(std::string name)
206206
{
207207
if (name == "nicotine")
208-
return ADD_CIG;
208+
return ADD_CIG;
209209
else if (name == "caffeine")
210-
return ADD_CAFFEINE;
210+
return ADD_CAFFEINE;
211211
else if (name == "alcohol")
212-
return ADD_ALCOHOL;
212+
return ADD_ALCOHOL;
213213
else if (name == "sleeping pill")
214-
return ADD_SLEEP;
214+
return ADD_SLEEP;
215215
else if (name == "opiate")
216-
return ADD_PKILLER;
216+
return ADD_PKILLER;
217217
else if (name == "amphetamine")
218-
return ADD_SPEED;
218+
return ADD_SPEED;
219219
else if (name == "cocaine")
220-
return ADD_COKE;
220+
return ADD_COKE;
221221
else if (name == "crack")
222-
return ADD_CRACK;
222+
return ADD_CRACK;
223223
else
224-
return ADD_NULL;
224+
return ADD_NULL;
225225
}
226226

227227
std::string addiction_text(addiction cur)

‎artifact.cpp

+48-53
Original file line numberDiff line numberDiff line change
@@ -10,47 +10,47 @@ std::vector<art_effect_active> fill_good_active();
1010
std::vector<art_effect_active> fill_bad_active();
1111

1212
int passive_effect_cost[NUM_AEPS] = {
13-
0, // AEP_NULL
14-
15-
3, // AEP_STR_UP
16-
3, // AEP_DEX_UP
17-
3, // AEP_PER_UP
18-
3, // AEP_INT_UP
19-
5, // AEP_ALL_UP
20-
4, // AEP_SPEED_UP
21-
2, // AEP_IODINE
22-
4, // AEP_SNAKES
23-
7, // AEP_INVISIBLE
24-
5, // AEP_CLAIRVOYANCE
25-
50, // AEP_SUPER_CLAIRVOYANCE
26-
2, // AEP_STEALTH
27-
2, // AEP_EXTINGUISH
28-
1, // AEP_GLOW
29-
1, // AEP_PSYSHIELD
30-
3, // AEP_RESIST_ELECTRICITY
31-
3, // AEP_CARRY_MORE
32-
5, // AEP_SAP_LIFE
33-
34-
0, // AEP_SPLIT
35-
36-
-2, // AEP_HUNGER
37-
-2, // AEP_THIRST
38-
-1, // AEP_SMOKE
39-
-5, // AEP_EVIL
40-
-3, // AEP_SCHIZO
41-
-5, // AEP_RADIOACTIVE
42-
-3, // AEP_MUTAGENIC
43-
-5, // AEP_ATTENTION
44-
-2, // AEP_STR_DOWN
45-
-2, // AEP_DEX_DOWN
46-
-2, // AEP_PER_DOWN
47-
-2, // AEP_INT_DOWN
48-
-5, // AEP_ALL_DOWN
49-
-4, // AEP_SPEED_DOWN
50-
-5, // AEP_FORCE_TELEPORT
51-
-3, // AEP_MOVEMENT_NOISE
52-
-2, // AEP_BAD_WEATHER
53-
-1 // AEP_SICK
13+
0, // AEP_NULL
14+
15+
3, // AEP_STR_UP
16+
3, // AEP_DEX_UP
17+
3, // AEP_PER_UP
18+
3, // AEP_INT_UP
19+
5, // AEP_ALL_UP
20+
4, // AEP_SPEED_UP
21+
2, // AEP_IODINE
22+
4, // AEP_SNAKES
23+
7, // AEP_INVISIBLE
24+
5, // AEP_CLAIRVOYANCE
25+
50,// AEP_SUPER_CLAIRVOYANCE
26+
2, // AEP_STEALTH
27+
2, // AEP_EXTINGUISH
28+
1, // AEP_GLOW
29+
1, // AEP_PSYSHIELD
30+
3, // AEP_RESIST_ELECTRICITY
31+
3, // AEP_CARRY_MORE
32+
5, // AEP_SAP_LIFE
33+
34+
0, // AEP_SPLIT
35+
36+
-2, // AEP_HUNGER
37+
-2, // AEP_THIRST
38+
-1, // AEP_SMOKE
39+
-5, // AEP_EVIL
40+
-3, // AEP_SCHIZO
41+
-5, // AEP_RADIOACTIVE
42+
-3, // AEP_MUTAGENIC
43+
-5, // AEP_ATTENTION
44+
-2, // AEP_STR_DOWN
45+
-2, // AEP_DEX_DOWN
46+
-2, // AEP_PER_DOWN
47+
-2, // AEP_INT_DOWN
48+
-5, // AEP_ALL_DOWN
49+
-4, // AEP_SPEED_DOWN
50+
-5, // AEP_FORCE_TELEPORT
51+
-3, // AEP_MOVEMENT_NOISE
52+
-2, // AEP_BAD_WEATHER
53+
-1 // AEP_SICK
5454
};
5555

5656
int active_effect_cost[NUM_AEAS] = {
@@ -261,18 +261,13 @@ void game::init_artifacts()
261261
for(int i=0;i<NUM_ARTTOOLFORMS;i++) {artifact_tool_form_data[i]=tmp_artifact_tool_form_data[i];}
262262

263263
artifact_weapon_datum tmp_artifact_weapon_data[NUM_ARTWEAPS] = {
264-
{"", 0, 0, 0, 0, 0, 0, 0, 0, ""},
265-
// Adjective Vol,wgt Bash Cut To-Hit tags
266-
{_("Heavy"), 0,1400, 10, 20, 0, 0, -2, 0,
267-
""},
268-
{_("Knobbed"), 1,250, 14, 30, 0, 0, -1, 1,
269-
""},
270-
{_("Spiked"), 1,100, 0, 0, 20, 40, -1, 1,
271-
"SPEAR"},
272-
{_("Edged"), 2,450, 0, 0, 20, 50, -1, 2,
273-
""},
274-
{_("Bladed"), 1,2250, 0, 0, 12, 30, -1, 1,
275-
"STAB"}
264+
{"", 0, 0, 0, 0, 0, 0, 0, 0, ""},
265+
// Adjective Vol,wgt Bash Cut To-Hit tags
266+
{_("Heavy"), 0,1400, 10, 20, 0, 0, -2, 0, ""},
267+
{_("Knobbed"), 1,250, 14, 30, 0, 0, -1, 1, ""},
268+
{_("Spiked"), 1,100, 0, 0, 20, 40, -1, 1, "SPEAR"},
269+
{_("Edged"), 2,450, 0, 0, 20, 50, -1, 2, ""},
270+
{_("Bladed"), 1,2250, 0, 0, 12, 30, -1, 1, "STAB"}
276271
};
277272
for(int i=0;i<NUM_ARTWEAPS;i++) {artifact_weapon_data[i]=tmp_artifact_weapon_data[i];}
278273

‎basecamp.cpp

+14-18
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,38 @@
44
#include "basecamp.h"
55

66
basecamp::basecamp()
7-
: name()
8-
, posx(0), posy(0)
7+
: name(), posx(0), posy(0)
98
{
10-
119
}
1210

1311
basecamp::basecamp(std::string const& name_, int const posx_, int const posy_)
14-
: name(name_)
15-
, posx(posx_), posy(posy_)
12+
: name(name_), posx(posx_), posy(posy_)
1613
{
17-
1814
}
1915

2016
std::string basecamp::board_name() const
2117
{
22-
return name + " Board";
18+
return name + " Board";
2319
}
2420

2521
std::string basecamp::save_data() const
2622
{
27-
std::stringstream data;
23+
std::stringstream data;
2824

29-
// TODO: This will lose underscores, is that a problem?
30-
// strip spaces from name
31-
std::string savename = name;
32-
replace(savename.begin(), savename.end(), ' ', '_');
25+
// TODO: This will lose underscores, is that a problem?
26+
// strip spaces from name
27+
std::string savename = name;
28+
replace(savename.begin(), savename.end(), ' ', '_');
3329

34-
data << savename << " " << posx << " " << posy;
35-
return data.str();
30+
data << savename << " " << posx << " " << posy;
31+
return data.str();
3632
}
3733

3834
void basecamp::load_data(std::string const& data)
3935
{
40-
std::stringstream stream(data);
41-
stream >> name >> posx >> posy;
36+
std::stringstream stream(data);
37+
stream >> name >> posx >> posy;
4238

43-
// add space to name
44-
replace(name.begin(), name.end(), '_', ' ');
39+
// add space to name
40+
replace(name.begin(), name.end(), '_', ' ');
4541
}

‎basecamp.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
class basecamp
77
{
88
public:
9-
basecamp();
10-
basecamp(std::string const& name_, int const posx_, int const posy_);
9+
basecamp();
10+
basecamp(std::string const& name_, int const posx_, int const posy_);
1111

12-
inline bool is_valid() const { return !name.empty(); }
13-
inline int board_x() const { return posx; }
14-
inline int board_y() const { return posy; }
15-
inline std::string const& camp_name() const { return name; }
12+
inline bool is_valid() const { return !name.empty(); }
13+
inline int board_x() const { return posx; }
14+
inline int board_y() const { return posy; }
15+
inline std::string const& camp_name() const { return name; }
1616

17-
std::string board_name() const;
17+
std::string board_name() const;
1818

19-
// Save/load
20-
std::string save_data() const;
21-
void load_data(std::string const& data);
19+
// Save/load
20+
std::string save_data() const;
21+
void load_data(std::string const& data);
2222

2323
private:
24-
std::string name;
25-
int posx, posy; // location of associated bulletin board
24+
std::string name;
25+
int posx, posy; // location of associated bulletin board
2626
};
2727

2828

‎bionics.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void player::power_bionics(game *g)
162162
You can not activate %s! To read a description of \
163163
%s, press '!', then '%c'."), bionics[tmp->id]->name.c_str(),
164164
bionics[tmp->id]->name.c_str(), tmp->invlet);
165-
} else { // Describing bionics, not activating them!
165+
} else { // Describing bionics, not activating them!
166166
// Clear the lines first
167167
ch = 0;
168168
werase(w_description);
@@ -233,7 +233,7 @@ void player::activate_bionic(int b, game *g)
233233
for (int i = posx - 1; i <= posx + 1; i++) {
234234
for (int j = posy - 1; j <= posy + 1; j++) {
235235
g->m.bash(i, j, 40, junk);
236-
g->m.bash(i, j, 40, junk); // Multibash effect, so that doors &c will fall
236+
g->m.bash(i, j, 40, junk); // Multibash effect, so that doors &c will fall
237237
g->m.bash(i, j, 40, junk);
238238
if (g->m.is_destructable(i, j) && rng(1, 10) >= 4)
239239
g->m.ter_set(i, j, t_rubble);

‎bionics.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ class bionic_data {
1616

1717
std::string name;
1818
bool power_source;
19-
bool activated; // If true, then the below function only happens when
20-
// activated; otherwise, it happens every turn
19+
bool activated; // If true, then the below function only happens when
20+
// activated; otherwise, it happens every turn
2121
int power_cost;
22-
int charge_time; // How long, when activated, between drawing power_cost
23-
// If 0, it draws power once
22+
int charge_time; // How long, when activated, between drawing power_cost
23+
// If 0, it draws power once
2424
std::string description;
2525
bool faulty; // Whether or not the bionic is faulty
2626
};

0 commit comments

Comments
 (0)