Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configurable difficulty level, groundwork for a severe rewrite of how names are handled. #7

Merged
merged 7 commits into from
Jan 15, 2013
Merged

Configurable difficulty level, groundwork for a severe rewrite of how names are handled. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5162d2
picojson json library
wito Jan 14, 2013
df4b232
name generation reworked
wito Jan 14, 2013
dcfb92d
refactor
wito Jan 14, 2013
9cffcfb
name generation redone, final touches
wito Jan 14, 2013
4ca7b14
Made character generation points user-configurable.
wito Jan 14, 2013
14edde3
Improved RNG seeding.
wito Jan 15, 2013
3d86c51
Use or Apply Wielded, default key capital A.
wito Jan 15, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion action.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ std::string action_ident(action_id act)
return "organize";
case ACTION_USE:
return "apply";
case ACTION_USE_WIELDED:
return "apply_wielded";
case ACTION_WEAR:
return "wear";
case ACTION_TAKE_OFF:
Expand Down Expand Up @@ -172,7 +174,7 @@ std::string action_ident(action_id act)
case ACTION_CONSTRUCT:
return "construct";
case ACTION_DISASSEMBLE:
return "disassemble";
return "disassemble";
case ACTION_SLEEP:
return "sleep";
case ACTION_TOGGLE_SAFEMODE:
Expand Down Expand Up @@ -269,6 +271,8 @@ std::string action_name(action_id act)
return "Swap Inventory Letters";
case ACTION_USE:
return "Apply or Use Item";
case ACTION_USE_WIELDED:
return "Apply or Use Wielded Item";
case ACTION_WEAR:
return "Wear Item";
case ACTION_TAKE_OFF:
Expand Down
1 change: 1 addition & 0 deletions action.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ ACTION_PEEK,
ACTION_INVENTORY,
ACTION_ORGANIZE,
ACTION_USE,
ACTION_USE_WIELDED,
ACTION_WEAR,
ACTION_TAKE_OFF,
ACTION_EAT,
Expand Down
100 changes: 0 additions & 100 deletions data/NAMES_FEMALE
View file
Open in desktop

This file was deleted.

100 changes: 0 additions & 100 deletions data/NAMES_LAST
View file
Open in desktop

This file was deleted.

100 changes: 0 additions & 100 deletions data/NAMES_MALE
View file
Open in desktop

This file was deleted.

Loading