Skip to content

Commit

Permalink
Merge pull request #158 from SickBoySB/0.9.3
Browse files Browse the repository at this point in the history 
0.9.3
  • Loading branch information
SickBoySB authored Apr 7, 2017
2 parents 836098c + 8364777 commit 8a60a0d
Show file tree
Hide file tree
Showing 23 changed files with 5,888 additions and 655 deletions.
616 changes: 361 additions & 255 deletions game/buildings.xml
View file

Large diffs are not rendered by default.

396 changes: 214 additions & 182 deletions game/commands.xml
View file

Large diffs are not rendered by default.

292 changes: 256 additions & 36 deletions game/commodities.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1903,42 +1903,6 @@
</tags>
</commodity>

<commodity name="boxed_painting_uc" display_name="Upper-Class Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_uc_icon"/>
<description text="A boxed module, ready for setting up in an appropriate building." />
<gameplay_description text="Module used for scientific research." />
<tags>
<tag name="commodity"/>
<tag name="boxed"/>
<tag name="boxed_painting_uc"/>
<tag name="crate"/>
</tags>
</commodity>

<commodity name="boxed_painting_mc" display_name="Middle-Class Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_mc_icon"/>
<description text="A boxed module, ready for setting up in an appropriate building." />
<gameplay_description text="Module that isn't in this game." />
<tags>
<tag name="commodity"/>
<tag name="boxed"/>
<tag name="boxed_painting_mc"/>
<tag name="crate"/>
</tags>
</commodity>

<commodity name="boxed_painting_lc" display_name="Lower-Class Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_lc_icon"/>
<description text="A boxed module, ready for setting up in an appropriate building." />
<gameplay_description text="Module that isn't in this game." />
<tags>
<tag name="commodity"/>
<tag name="boxed"/>
<tag name="boxed_painting_lc"/>
<tag name="crate"/>
</tags>
</commodity>

<commodity name="boxed_loading_bay_door" display_name="Loading Bay Door" filter="finished">
<display skin="ui\orderIcons.xml" icon="icon_loadingbaywood"/>
<description text="A boxed module, ready for setting up in an appropriate building." />
Expand Down Expand Up @@ -2593,6 +2557,262 @@
</tags>
</commodity>

<commodity name="boxed_rare_painting_02" display_name="Exquisite Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_uc_icon"/>
<description text="An ostentatious painting by a certain famous artist - you've probably heard of them. Place this astonishing rarity in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_rare_painting_02"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_rare_painting_03" display_name="Aureate Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_uc_icon"/>
<description text="An ostentatious painting by a certain famous artist - you've probably heard of them. Place this astonishing rarity in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_rare_painting_03"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_rare_painting_04" display_name="Grandiloquent Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_uc_icon"/>
<description text="An ostentatious painting by a certain famous artist - you've probably heard of them. Place this astonishing rarity in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_rare_painting_04"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_rare_painting_05" display_name="Magisterial Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_uc_icon"/>
<description text="An ostentatious painting by a certain famous artist - you've probably heard of them. Place this astonishing rarity in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_rare_painting_05"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_uncommon_painting_01" display_name="Exceptional Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_mc_icon"/>
<description text="An stylish painting by a certain famous artist - you've probably heard of them. Place this in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_uncommon_painting_01"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_uncommon_painting_02" display_name="Remarkable Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_mc_icon"/>
<description text="An stylish painting by a certain famous artist - you've probably heard of them. Place this in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_uncommon_painting_02"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_uncommon_painting_03" display_name="Extraordinary Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_mc_icon"/>
<description text="An stylish painting by a certain famous artist - you've probably heard of them. Place this in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_uncommon_painting_03"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_uncommon_painting_04" display_name="Distinguished Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_mc_icon"/>
<description text="An stylish painting by a certain famous artist - you've probably heard of them. Place this in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_uncommon_painting_04"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_common_painting_01" display_name="Noteworthy Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_lc_icon"/>
<description text="A traditional painting by a certain famous artist - you've probably heard of them. Place this in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_common_painting_01"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_common_painting_02" display_name="Distinctive Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_lc_icon"/>
<description text="A traditional painting by a certain famous artist - you've probably heard of them. Place this in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_common_painting_02"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_common_painting_03" display_name="Singular Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_lc_icon"/>
<description text="A traditional painting by a certain famous artist - you've probably heard of them. Place this in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_common_painting_03"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_common_painting_04" display_name="Interesting Painting" filter="finished">
<display skin="ui\orderIcons.xml" icon="decor_lc_icon"/>
<description text="A traditional painting by a certain famous artist - you've probably heard of them. Place this in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_common_painting_04"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_uncommon_picture_01" display_name="Mediocre Pictures" filter="finished">
<display skin="ui\orderIcons2.xml" icon="mc_frame_cluster"/>
<description text="Practical imagery fit for the professional class - you've probably heard of them. Place this in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_uncommon_picture_01"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_uncommon_picture_02" display_name="Average Pictures" filter="finished">
<display skin="ui\orderIcons2.xml" icon="mc_frame_cluster"/>
<description text="Practical imagery fit for the professional class - you've probably heard of them. Place this in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_uncommon_picture_02"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_common_picture_01" display_name="Awful Pictures" filter="finished">
<display skin="ui\orderIcons2.xml" icon="lc_frame_cluster"/>
<description text="A rude piece of art fit for the lower classes - you've probably heard of them. Place this in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_common_picture_01"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_common_picture_02" display_name="Shoddy Pictures" filter="finished">
<display skin="ui\orderIcons2.xml" icon="lc_frame_cluster"/>
<description text="A rude piece of art fit for the lower classes - you've probably heard of them. Place this in a house to increase your population capacity." />
<gameplay_description text="Place in a house to increase population cap." />
<tags>
<tag name="commodity"/>
<tag name="painting"/>
<tag name="boxed"/>
<tag name="boxed_common_picture_02"/>
<tag name="crate"/>
<tag name="dramatic"/>
<tag name="cecomm_decor"/>
<tag name="cecomm_boxed"/>
</tags>
</commodity>

<commodity name="boxed_power_core_dynamo" display_name="Power Core Dynamo" filter="finished">
<display skin="ui\orderIcons.xml" icon="turbine_icon"/>
<description text="A boxed module, ready for setting up in an appropriate building." />
Expand Down
4 changes: 2 additions & 2 deletions game/jobs/decision_tree_jobs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
must_lock_owner="1"
do_not_suspend_parent_assignment="0"
filter="">
<require_gameobject input="enemy" amount="1" tag="cecomm_prevent,hostile_agent" not_tag="alarm_waypoint_active" require_owned="0" tag_from_job="0" random="0" closest="0" useMultiplier="0" create_marker="0" in_party="0" range="15" unique="0" must_lock="0" must_unlock="1" must_test_lock="0" must_lock_ggp="0" civ_value_leq="-1" civ_value_geq="-1" />
<require_gameobject input="enemy" amount="1" tag="hostile_agent" not_tag="alarm_waypoint_active" require_owned="0" tag_from_job="0" random="0" closest="0" useMultiplier="0" create_marker="0" in_party="0" range="15" unique="0" must_lock="0" must_unlock="1" must_test_lock="0" must_lock_ggp="0" civ_value_leq="-1" civ_value_geq="-1" />
<fsm>
<create_alarm_waypoint input="enemy"/>
<set_tag_other input="enemy" name="alarm_waypoint_active"/>
Expand Down Expand Up @@ -486,7 +486,7 @@
must_lock_owner="1"
do_not_suspend_parent_assignment="0"
filter="">
<require_gameobject input="enemy" amount="1" tag="cecomm_prevent,hostile_agent" not_tag="alarm_waypoint_active" require_owned="0" tag_from_job="0" random="0" closest="0" useMultiplier="0" create_marker="0" in_party="0" range="15" unique="0" must_lock="0" must_unlock="1" must_test_lock="0" must_lock_ggp="0" civ_value_leq="-1" civ_value_geq="-1" />
<require_gameobject input="enemy" amount="1" tag="hostile_agent" not_tag="alarm_waypoint_active" require_owned="0" tag_from_job="0" random="0" closest="0" useMultiplier="0" create_marker="0" in_party="0" range="15" unique="0" must_lock="0" must_unlock="1" must_test_lock="0" must_lock_ggp="0" civ_value_leq="-1" civ_value_geq="-1" />
<fsm>
<create_alarm_waypoint input="enemy"/>
<set_tag_other input="enemy" name="alarm_waypoint_active"/>
Expand Down
Binary file added models/debris/craterBlastLarge00.upm
View file
Binary file not shown.
Binary file added models/debris/craterBlastLarge01.upm
View file
Binary file not shown.
Binary file added models/debris/craterBlastLarge02.upm
View file
Binary file not shown.
Binary file added models/debris/craterBlastMedium00.upm
View file
Binary file not shown.
Binary file added models/debris/craterBlastMedium01.upm
View file
Binary file not shown.
Binary file added models/debris/craterBlastMedium02.upm
View file
Binary file not shown.
Binary file added models/debris/craterBlastSmall00.upm
View file
Binary file not shown.
Binary file added models/debris/craterBlastSmall01.upm
View file
Binary file not shown.
Binary file added models/debris/craterBlastSmall02.upm
View file
Binary file not shown.
Loading

0 comments on commit 8a60a0d

Please sign in to comment.