Skip to content

Commit

Permalink
Merge pull request #127 from SickBoySB/0.9.1
Browse files Browse the repository at this point in the history 
0.9.1
  • Loading branch information
SickBoySB authored Mar 26, 2017
2 parents 72c9bb1 + 11f4f59 commit e30f9c0
Show file tree
Hide file tree
Showing 10 changed files with 4,668 additions and 5 deletions.
64 changes: 62 additions & 2 deletions game/buildings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3205,6 +3205,66 @@ are already contained within other buildings. Consider those a placeholder for l
amount="1"/> <!--product commodity name; used for passing product to job.-->
</module_job>

<module_job name="Make Wall-Mounted Aurochs Head"
display_name="Wall-Mounted Aurochs Head"
icon_skin="ui\orderIcons2.xml"
icon="mounted_head_aurochs"
standing_order_display_name="Standing Order for Wall-Mounted Aurochs Heads"
product_name="Wall-Mounted Aurochs Head">
<visible>
<require_commodity_geq name="sulphur" amount="1" failure_reason="1x Sulphur needed." is_cost="1" />
<require_commodity_geq name="chalk" amount="1" failure_reason="1x Chalk needed." is_cost="2" />
<require_commodity_geq name="lacquered_planks" amount="1" failure_reason="1x Lacquered Plank needed." is_cost="3" />
<require_commodity_geq name="raw_aurochs_steak" amount="2" failure_reason="2x Raw Aurochs Steaks needed." is_cost="4" />
<require_commodity_geq name="bushel_of_bones" amount="2" failure_reason="2x Bones needed." is_cost="5" />
<require_commodity_geq name="glass_panes" amount="1" failure_reason="1x Glass Pane needed." is_cost="6" />
</visible>
<cost name="sulphur_lump" display_name="Sulphur"
amount="1"/>
<cost name="chalk_icon" display_name="Chalk"
amount="1"/>
<cost name="planks_lacquered" display_name="Lacquered Plank"
amount="1"/>
<cost name="icon_rawsteak" display_name="Raw Aurochs Steaks"
amount="2"/>
<cost name="icon_bushelbones" display_name="Bones"
amount="2"/>
<cost name="glass_panes_pallet_icon" display_name="Glass Pane"
amount="1"/><!-- only used for tooltip cost icon-->
<out product="boxed_wall-mounted_aurochs_head"
amount="1"/> <!--product commodity name; used for passing product to job.-->
</module_job>

<module_job name="Make Wall-Mounted Beetle Head"
display_name="Wall-Mounted Beetle Head"
icon_skin="ui\orderIcons2.xml"
icon="mounted_head_beetle"
standing_order_display_name="Standing Order for Wall-Mounted Beetle Heads"
product_name="Wall-Mounted Beetle Head">
<visible>
<require_commodity_geq name="sulphur" amount="1" failure_reason="1x Sulphur needed." is_cost="1" />
<require_commodity_geq name="chalk" amount="1" failure_reason="1x Chalk needed." is_cost="2" />
<require_commodity_geq name="lacquered_planks" amount="1" failure_reason="1x Lacquered Plank needed." is_cost="3" />
<require_commodity_geq name="raw_beetle_steak" amount="2" failure_reason="2x Raw Beetle Steaks needed." is_cost="4" />
<require_commodity_geq name="bushel_of_bones" amount="2" failure_reason="2x Bones needed." is_cost="5" />
<require_commodity_geq name="glass_panes" amount="1" failure_reason="1x Glass Pane needed." is_cost="6" />
</visible>
<cost name="sulphur_lump" display_name="Sulphur"
amount="1"/>
<cost name="chalk_icon" display_name="Chalk"
amount="1"/>
<cost name="planks_lacquered" display_name="Lacquered Plank"
amount="1"/>
<cost name="raw_beetlesteak" display_name="Raw Beetle Steaks"
amount="2"/>
<cost name="icon_bushelbones" display_name="Bones"
amount="2"/>
<cost name="glass_panes_pallet_icon" display_name="Glass Pane"
amount="1"/><!-- only used for tooltip cost icon-->
<out product="boxed_wall-mounted_beetle_head"
amount="1"/> <!--product commodity name; used for passing product to job.-->
</module_job>

<module_job name="Make Carpet"
display_name="Carpet"
icon_skin="ui\orderIcons.xml"
Expand Down Expand Up @@ -10717,7 +10777,7 @@ are already contained within other buildings. Consider those a placeholder for l
internal_wall="1"
decor="1"
short_description="Decor increases the Quality of your building, improving the mood of those who live and work there."
quality="1"
quality="3"
upkeep_type="-1"
upkeep_quantity="-1"
description="About as much of the Majestic Aurochs as one can reasonably put on display."
Expand All @@ -10740,7 +10800,7 @@ are already contained within other buildings. Consider those a placeholder for l
internal_wall="1"
decor="1"
short_description="Decor increases the Quality of your building, improving the mood of those who live and work there."
quality="1"
quality="3"
upkeep_type="-1"
upkeep_quantity="-1"
description="This massive beetle makes for an intimidating - and dangerous - wall decoration."
Expand Down
1 change: 1 addition & 0 deletions game/commodities.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@
<tags>
<tag name="commodity"/>
<tag name="fertiliser"/>
<tag name="bones"/>
<tag name="cecomm_foraged"/>
</tags>
</commodity>
Expand Down
110 changes: 110 additions & 0 deletions game/jobs/workshop_jobs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4441,6 +4441,116 @@
<history importance="10" />
</job>

<job name="Make Wall-Mounted Aurochs Head" display_name="Make Wall-Mounted Aurochs Head"
mandatory_eval="0"
icon_skin="ui\orderIcons2.xml" icon="mounted_head_aurochs"
must_lock_owner="0"
filter="workshop">

<require_character_on_shift/>
<require_empty_hands failure_reason="Character required to not be carrying stuff."/>
<require_multiple_gameobjects input="sulphur" amount="1" use_multiplier="1" range="100" tag="raw_sulphur" failure_reason="Requires available bricabrac." closest="1" require_owned="1"/>
<require_multiple_gameobjects input="chalk" amount="1" use_multiplier="1" range="100" tag="flux" failure_reason="Requires available bricabrac." closest="1" require_owned="1"/>
<require_multiple_gameobjects input="lacquered_planks" amount="1" use_multiplier="1" range="100" tag="lacquered_planks" failure_reason="Requires available bricabrac." closest="1" require_owned="1"/>
<require_multiple_gameobjects input="raw_aurochs_steak" amount="2" use_multiplier="1" range="100" tag="aurochs_meat" failure_reason="Requires available bricabrac." closest="1" require_owned="1"/>
<require_multiple_gameobjects input="bushel_of_bones" amount="2" use_multiplier="1" range="100" tag="bones" failure_reason="Requires available bricabrac." closest="1" require_owned="1"/>
<require_multiple_gameobjects input="glass_panes" amount="1" use_multiplier="1" range="100" tag="glass_panes" failure_reason="Requires available bricabrac." closest="1" require_owned="1"/>
<require_work_party_filter name="workshop"/>
<require_item_drop_location input="drop_location"/>

<utility>
<base_job_utility weight="1000"/>
</utility>

<fsm>
<walk_to_adjacent_position_and_pickup_things input="sulphur"/>
<walk_to_module input="workshop_module"/>
<building_cache_item input="workshop"/>

<walk_to_adjacent_position_and_pickup_things input="chalk"/>
<walk_to_module input="workshop_module"/>
<building_cache_item input="workshop"/>

<walk_to_adjacent_position_and_pickup_things input="lacquered_planks"/>
<walk_to_module input="workshop_module"/>
<building_cache_item input="workshop"/>

<walk_to_adjacent_position_and_pickup_things input="raw_aurochs_steak"/>
<walk_to_module input="workshop_module"/>
<building_cache_item input="workshop"/>

<walk_to_adjacent_position_and_pickup_things input="bushel_of_bones"/>
<walk_to_module input="workshop_module"/>
<building_cache_item input="workshop"/>

<walk_to_adjacent_position_and_pickup_things input="glass_panes"/>
<walk_to_module input="workshop_module"/>
<building_transform_item input="workshop_module" name="Assemble Module"/>

<complete_workshop_order input="workshop"/>
<increment_character_skill name="carpentry"/>
<fill_input_for_held_item name="drop_location"/>
<walk_to_adjacent_position_for_item_drop input="drop_location" />
<place_item_behaviour input="drop_location" />
</fsm>
<history importance="10" />
</job>

<job name="Make Wall-Mounted Beetle Head" display_name="Make Wall-Mounted Beetle Head"
mandatory_eval="0"
icon_skin="ui\orderIcons2.xml" icon="mounted_head_beetle"
must_lock_owner="0"
filter="workshop">

<require_character_on_shift/>
<require_empty_hands failure_reason="Character required to not be carrying stuff."/>
<require_multiple_gameobjects input="sulphur" amount="1" use_multiplier="1" range="100" tag="raw_sulphur" failure_reason="Requires available bricabrac." closest="1" require_owned="1"/>
<require_multiple_gameobjects input="chalk" amount="1" use_multiplier="1" range="100" tag="flux" failure_reason="Requires available bricabrac." closest="1" require_owned="1"/>
<require_multiple_gameobjects input="lacquered_planks" amount="1" use_multiplier="1" range="100" tag="lacquered_planks" failure_reason="Requires available bricabrac." closest="1" require_owned="1"/>
<require_multiple_gameobjects input="raw_beetle_steak" amount="2" use_multiplier="1" range="100" tag="beetle_meat" failure_reason="Requires available bricabrac." closest="1" require_owned="1"/>
<require_multiple_gameobjects input="bushel_of_bones" amount="2" use_multiplier="1" range="100" tag="bones" failure_reason="Requires available bricabrac." closest="1" require_owned="1"/>
<require_multiple_gameobjects input="glass_panes" amount="1" use_multiplier="1" range="100" tag="glass_panes" failure_reason="Requires available bricabrac." closest="1" require_owned="1"/>
<require_work_party_filter name="workshop"/>
<require_item_drop_location input="drop_location"/>

<utility>
<base_job_utility weight="1000"/>
</utility>

<fsm>
<walk_to_adjacent_position_and_pickup_things input="sulphur"/>
<walk_to_module input="workshop_module"/>
<building_cache_item input="workshop"/>

<walk_to_adjacent_position_and_pickup_things input="chalk"/>
<walk_to_module input="workshop_module"/>
<building_cache_item input="workshop"/>

<walk_to_adjacent_position_and_pickup_things input="lacquered_planks"/>
<walk_to_module input="workshop_module"/>
<building_cache_item input="workshop"/>

<walk_to_adjacent_position_and_pickup_things input="raw_beetle_steak"/>
<walk_to_module input="workshop_module"/>
<building_cache_item input="workshop"/>

<walk_to_adjacent_position_and_pickup_things input="bushel_of_bones"/>
<walk_to_module input="workshop_module"/>
<building_cache_item input="workshop"/>

<walk_to_adjacent_position_and_pickup_things input="glass_panes"/>
<walk_to_module input="workshop_module"/>
<building_transform_item input="workshop_module" name="Assemble Module"/>

<complete_workshop_order input="workshop"/>
<increment_character_skill name="carpentry"/>
<fill_input_for_held_item name="drop_location"/>
<walk_to_adjacent_position_for_item_drop input="drop_location" />
<place_item_behaviour input="drop_location" />
</fsm>
<history importance="10" />
</job>


<job name="Make Carpet" display_name="Make Carpet"
mandatory_eval="0"
Expand Down
7 changes: 6 additions & 1 deletion game/tagicons.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
visibility="0"
tags="copper_plates"
icon_skin="commodityIcons.xml" />

<tag icon_name="iron_ingots_icon"
display_name="An ingot of iron."
visibility="0"
tags="ingot_of_iron"
icon_skin="commodityIcons.xml" />

<!-- other UI stuff, flavor text, etc -->
<tag display_name="Harvest with 'Mine Surface Nodes'"
Expand Down Expand Up @@ -309,7 +315,6 @@
visibility="1"
tags="stolen"
icon_skin="orderIcons.xml" />


<!--
CECOMM NEW VISUAL-ONLY TAGS
Expand Down
Loading

0 comments on commit e30f9c0

Please sign in to comment.