Skip to content

Commit

Permalink
40.07, fixes #68, custom prof name
Browse files Browse the repository at this point in the history
- added 40.07 mem layouts for win/linux
- updated the game_data.ini with the new labors
- updated the default gridviews to add discipline to military views, and
new labors to full labor view
- removed global weights from weak lawdwarf role
- added a context menu item to clear only the custom profession name
- added a check for a bad health address when a unit has no health
issues
  • Loading branch information
splintermind committed Aug 11, 2014
1 parent 1de3d2d commit 7205c3c
Show file tree
Hide file tree
Showing 12 changed files with 889 additions and 111 deletions.
118 changes: 70 additions & 48 deletions default_gridviews.dtg
Expand Up @@ -720,7 +720,7 @@ size=11
3\sets\17\columns\2\labor_id=72
3\sets\18\name=Hauling
3\sets\18\bg_color=0xffffffff
3\sets\18\columns\size=8
3\sets\18\columns\size=12
3\sets\18\columns\1\name=Animal Hauling
3\sets\18\columns\1\type=LABOR
3\sets\18\columns\1\skill_id=-1
Expand All @@ -745,14 +745,30 @@ size=11
3\sets\18\columns\6\type=LABOR
3\sets\18\columns\6\skill_id=-1
3\sets\18\columns\6\labor_id=1
3\sets\18\columns\7\name=Wood Hauling
3\sets\18\columns\7\name=Trade Goods Hauling
3\sets\18\columns\7\type=LABOR
3\sets\18\columns\7\skill_id=-1
3\sets\18\columns\7\labor_id=2
3\sets\18\columns\8\name=Cleaning
3\sets\18\columns\7\labor_id=74
3\sets\18\columns\8\name=Water Hauling
3\sets\18\columns\8\type=LABOR
3\sets\18\columns\8\skill_id=-1
3\sets\18\columns\8\labor_id=9
3\sets\18\columns\8\labor_id=77
3\sets\18\columns\9\name=Wood Hauling
3\sets\18\columns\9\type=LABOR
3\sets\18\columns\9\skill_id=-1
3\sets\18\columns\9\labor_id=2
3\sets\18\columns\10\name=Cleaning
3\sets\18\columns\10\type=LABOR
3\sets\18\columns\10\skill_id=-1
3\sets\18\columns\10\labor_id=9
3\sets\18\columns\11\name=Deconstruction
3\sets\18\columns\11\type=LABOR
3\sets\18\columns\11\skill_id=-1
3\sets\18\columns\11\labor_id=76
3\sets\18\columns\12\name=Levers
3\sets\18\columns\12\type=LABOR
3\sets\18\columns\12\skill_id=-1
3\sets\18\columns\12\labor_id=75
4\name=Military
4\active=true
4\animals=false
Expand Down Expand Up @@ -792,20 +808,38 @@ size=11
4\sets\2\columns\8\type=SKILL
4\sets\3\name=Unarmed
4\sets\3\bg_color=0xa4cbcfff
4\sets\3\columns\size=8
4\sets\3\columns\size=9
4\sets\3\columns\1\name=SPACER
4\sets\3\columns\1\type=SPACER
4\sets\3\columns\1\override_color=true
4\sets\3\columns\1\bg_color=0x688284ff
4\sets\3\columns\1\width=4
4\sets\3\columns\2\name=Biter
4\sets\3\columns\2\name=Discipline
4\sets\3\columns\2\type=SKILL
4\sets\3\columns\2\skill_id=102
4\sets\3\columns\3\name=Dodger
4\sets\3\columns\2\skill_id=88
4\sets\3\columns\3\name=Biter
4\sets\3\columns\3\type=SKILL
4\sets\3\columns\3\skill_id=105
4\sets\3\columns\4\name=Fighter
4\sets\3\columns\3\skill_id=102
4\sets\3\columns\4\name=Dodger
4\sets\3\columns\4\type=SKILL
4\sets\3\columns\4\skill_id=105
4\sets\3\columns\5\name=Fighter
4\sets\3\columns\5\type=SKILL
4\sets\3\columns\5\skill_id=99
4\sets\3\columns\6\name=Kicker
4\sets\3\columns\6\type=SKILL
4\sets\3\columns\6\skill_id=104
4\sets\3\columns\7\name=Striker
4\sets\3\columns\7\type=SKILL
4\sets\3\columns\7\skill_id=103
4\sets\3\columns\8\name=Wrestler
4\sets\3\columns\8\type=SKILL
4\sets\3\columns\8\skill_id=101
4\sets\3\columns\9\name=SPACER 1
4\sets\3\columns\9\type=SPACER
4\sets\3\columns\9\override_color=true
4\sets\3\columns\9\bg_color=0x688284ff
4\sets\3\columns\9\width=4
4\sets\4\name=Armor
4\sets\4\bg_color=0x808080ff
4\sets\4\columns\size=4
Expand Down Expand Up @@ -884,21 +918,6 @@ size=11
4\sets\2\columns\10\override_color=true
4\sets\2\columns\10\bg_color=0x7e7d6dff
4\sets\2\columns\10\width=4
4\sets\3\columns\4\skill_id=99
4\sets\3\columns\5\name=Kicker
4\sets\3\columns\5\type=SKILL
4\sets\3\columns\5\skill_id=104
4\sets\3\columns\6\name=Striker
4\sets\3\columns\6\type=SKILL
4\sets\3\columns\6\skill_id=103
4\sets\3\columns\7\name=Wrestler
4\sets\3\columns\7\type=SKILL
4\sets\3\columns\7\skill_id=101
4\sets\3\columns\8\name=SPACER 1
4\sets\3\columns\8\type=SPACER
4\sets\3\columns\8\override_color=true
4\sets\3\columns\8\bg_color=0x688284ff
4\sets\3\columns\8\width=4
4\sets\4\columns\4\override_color=true
4\sets\4\columns\4\bg_color=0x535353ff
4\sets\4\columns\4\width=4
Expand Down Expand Up @@ -927,7 +946,7 @@ size=11
4\sets\7\columns\8\name=SPACER 2
4\sets\7\columns\8\type=SPACER
4\sets\7\columns\8\width=4
4\sets\8\name=Misc Skills
4\sets\8\name=Military Roles
4\sets\8\bg_color=0xffffffff
4\sets\8\columns\size=6
4\sets\8\columns\1\name=SPACER
Expand Down Expand Up @@ -1425,20 +1444,38 @@ size=11
8\sets\2\columns\8\type=SKILL
8\sets\3\name=Unarmed
8\sets\3\bg_color=0xa4cbcfff
8\sets\3\columns\size=8
8\sets\3\columns\size=9
8\sets\3\columns\1\name=SPACER
8\sets\3\columns\1\type=SPACER
8\sets\3\columns\1\override_color=true
8\sets\3\columns\1\bg_color=0x688284ff
8\sets\3\columns\1\width=4
8\sets\3\columns\2\name=Biter
8\sets\3\columns\2\name=Discipline
8\sets\3\columns\2\type=SKILL
8\sets\3\columns\2\skill_id=102
8\sets\3\columns\3\name=Dodger
8\sets\3\columns\2\skill_id=88
8\sets\3\columns\3\name=Biter
8\sets\3\columns\3\type=SKILL
8\sets\3\columns\3\skill_id=105
8\sets\3\columns\4\name=Fighter
8\sets\3\columns\3\skill_id=102
8\sets\3\columns\4\name=Dodger
8\sets\3\columns\4\type=SKILL
8\sets\3\columns\4\skill_id=105
8\sets\3\columns\5\name=Fighter
8\sets\3\columns\5\type=SKILL
8\sets\3\columns\5\skill_id=99
8\sets\3\columns\6\name=Kicker
8\sets\3\columns\6\type=SKILL
8\sets\3\columns\6\skill_id=104
8\sets\3\columns\7\name=Striker
8\sets\3\columns\7\type=SKILL
8\sets\3\columns\7\skill_id=103
8\sets\3\columns\8\name=Wrestler
8\sets\3\columns\8\type=SKILL
8\sets\3\columns\8\skill_id=101
8\sets\3\columns\9\name=SPACER 1
8\sets\3\columns\9\type=SPACER
8\sets\3\columns\9\override_color=true
8\sets\3\columns\9\bg_color=0x688284ff
8\sets\3\columns\9\width=4
8\sets\4\name=Armor
8\sets\4\bg_color=0x808080ff
8\sets\4\columns\size=4
Expand Down Expand Up @@ -1549,21 +1586,6 @@ size=11
8\sets\2\columns\10\override_color=true
8\sets\2\columns\10\bg_color=0x7e7d6dff
8\sets\2\columns\10\width=4
8\sets\3\columns\4\skill_id=99
8\sets\3\columns\5\name=Kicker
8\sets\3\columns\5\type=SKILL
8\sets\3\columns\5\skill_id=104
8\sets\3\columns\6\name=Striker
8\sets\3\columns\6\type=SKILL
8\sets\3\columns\6\skill_id=103
8\sets\3\columns\7\name=Wrestler
8\sets\3\columns\7\type=SKILL
8\sets\3\columns\7\skill_id=101
8\sets\3\columns\8\name=SPACER 1
8\sets\3\columns\8\type=SPACER
8\sets\3\columns\8\override_color=true
8\sets\3\columns\8\bg_color=0x688284ff
8\sets\3\columns\8\width=4
8\sets\4\columns\4\override_color=true
8\sets\4\columns\4\bg_color=0x535353ff
8\sets\4\columns\4\width=4
Expand Down
24 changes: 21 additions & 3 deletions etc/game_data.ini
Expand Up @@ -676,7 +676,7 @@ size = 19
19/levels/9/level_name = "An unbreakable will"

[labors]
size = 74
size = 78

1/name = Mining
1/id = 0
Expand Down Expand Up @@ -998,6 +998,26 @@ size = 74
74/skill = -1
74/hauling = 1

75/name = Haul Trade Goods
75/id = 74
75/skill = -1
75/hauling = 1

76/name = Lever Operation
76/id = 75
76/skill = -1
76/hauling = 1

77/name = Construction Removal
77/id = 76
77/skill = -1
77/hauling = 1

78/name = Haul Water
78/id = 77
78/skill = -1
78/hauling = 1

[skill_names]
0 = Miner
1 = Wood Cutter
Expand Down Expand Up @@ -5436,8 +5456,6 @@ size = 88
71\skills\size = 1
71\skills\1\id = 105
72\name = Lawdwarf (Weak)
72\attributes_weight = 0.8
72\traits_weight = 0.2
72\attributes\size = 3
72\attributes\1\id = -strength
72\attributes\2\id = -agility
Expand Down

0 comments on commit 7205c3c

Please sign in to comment.