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

Loadable skills #25

Merged
merged 29 commits into from
Jan 30, 2013
Merged

Loadable skills #25

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c3b1916
Loadable skills: Step one: Basic framework: The subtitle
wito Jan 12, 2013
929df3c
Loadable skills: Part Two: The kills.
wito Jan 12, 2013
a6f7e30
Loadable skills: Part three: skill_count()
wito Jan 12, 2013
f6e605a
Defines, operators, accessors.
wito Jan 13, 2013
211064d
New Skill array.
wito Jan 13, 2013
400e636
SkillLevel::comprehension()
wito Jan 13, 2013
230fc8e
Expanded comparators for SkillLevel
wito Jan 13, 2013
3f9b5f2
Significantly upped skill comprehension to better match old values.
wito Jan 13, 2013
8f6f3a6
Fixed an appearance of a ghost skill.
wito Jan 13, 2013
06ae5e8
exposed excercise through an accessor
wito Jan 13, 2013
3465194
display using new method, save and load
wito Jan 13, 2013
1a26777
final display fixes
wito Jan 13, 2013
85443e6
conversion: bionics, books, guns, melee
wito Jan 13, 2013
f965d7c
Merge branch 'master' into loadable-skills
wito Jan 13, 2013
14a1919
traps updated
wito Jan 13, 2013
a7fcaf6
odds and ends
wito Jan 13, 2013
93ffc17
items, melee
wito Jan 13, 2013
7796b11
driving, disarming traps
wito Jan 13, 2013
d7b2a59
savant handling
wito Jan 13, 2013
14e7d28
crafting
wito Jan 13, 2013
d9d9105
cleanup
wito Jan 13, 2013
34831c9
moved skills file into place.
wito Jan 13, 2013
7a51e26
Converted file format to JSON.
wito Jan 13, 2013
505d4a3
moved to references
wito Jan 13, 2013
4f78486
Fixed an off-by-one display error in the character screen.
wito Jan 13, 2013
067e550
Merge branch 'master' into loadable-skills
wito Jan 14, 2013
70051b9
merge branch master into loadable-skills
wito Jan 17, 2013
c1e0814
Further reworked Skill to use pointers.
wito Jan 17, 2013
f975638
Merge branch 'master' into loadable-skills
wito Jan 29, 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
Prev Previous commit
Next Next commit
Significantly upped skill comprehension to better match old values.
  • Loading branch information
@wito
wito committed Jan 13, 2013
commit 3f9b5f23d6360b8ad4c67fbc1354398f69ca38d2
4 changes: 2 additions & 2 deletions skill.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ uint32_t SkillLevel::comprehension(uint32_t intellect, bool fastLearner) {
uint32_t base_comprehension;

if (intellect <= 8) {
base_comprehension = intellect * 5;
base_comprehension = intellect * 10;
} else {
base_comprehension = 40 + (intellect - 8) * 3;
base_comprehension = 80 + (intellect - 8) * 8;
}

if (fastLearner) {
Expand Down