Skip to content

Remove ammo from non-combat merchants #4613

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

Open
chief-turkler wants to merge 1 commit into
base: Development
Choose a base branch
from
Open

Remove ammo from non-combat merchants #4613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 0 additions & 33 deletions ...roid Tiers Reforged/Patches/Android Tiers Reforged/TraderKindDefs/Android_TraderKinds.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,39 +104,6 @@
<Operation Class="PatchOperationAdd">
<xpath>Defs/TraderKindDef[defName="ATR_Caravan_AndroidCollective_BulkGoods" or defName="Caravan_AndroidCollective_AndroidMerchant" or defName="Caravan_AndroidCollective_HighTech"]/stockGenerators</xpath>
<value>
<li Class="StockGenerator_Tag">
<tradeTag>CE_Ammo</tradeTag>
<countRange>
<min>200</min>
<max>400</max>
</countRange>
<thingDefCountRange>
<min>1</min>
<max>4</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_MediumAmmo</tradeTag>
<countRange>
<min>20</min>
<max>40</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>6</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_HeavyAmmo</tradeTag>
<countRange>
<min>5</min>
<max>10</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>4</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Category">
<categoryDef>Ammo</categoryDef>
<thingDefCountRange>
Expand Down
6 changes: 3 additions & 3 deletions ...tches/K4G Rimworld War 2/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,12 +218,12 @@
<li Class="StockGenerator_Tag">
<tradeTag>CE_Ammo</tradeTag>
<countRange>
<min>100</min>
<max>250</max>
<min>120</min>
<max>240</max>
</countRange>
<thingDefCountRange>
<min>0</min>
<max>4</max>
<max>2</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Category">
Expand Down
96 changes: 3 additions & 93 deletions ...n - Mort's Factions/Patches/The Corporation - Mort's Factions/Corporation_TraderKinds.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,39 +102,6 @@
<Operation Class="PatchOperationAdd">
<xpath>Defs/TraderKindDef[defName="MF_Corporate_Caravan_BulkGoods"]/stockGenerators</xpath>
<value>
<li Class="StockGenerator_Tag">
<tradeTag>CE_Ammo</tradeTag>
<countRange>
<min>200</min>
<max>400</max>
</countRange>
<thingDefCountRange>
<min>1</min>
<max>4</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_MediumAmmo</tradeTag>
<countRange>
<min>20</min>
<max>40</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>6</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_HeavyAmmo</tradeTag>
<countRange>
<min>5</min>
<max>10</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>4</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Category">
<categoryDef>Ammo</categoryDef>
<thingDefCountRange>
Expand Down Expand Up @@ -168,39 +135,18 @@
<Operation Class="PatchOperationAdd">
<xpath>Defs/TraderKindDef[defName="MF_Corporate_Caravan_Slaver"]/stockGenerators</xpath>
<value>
<!-- A limited amount of ammo added, as I believe slavers would generally be involved in violence and thus always carry some small-arms ammo around -->
<li Class="StockGenerator_Tag">
<tradeTag>CE_Ammo</tradeTag>
<countRange>
<min>100</min>
<max>300</max>
<min>120</min>
<max>240</max>
</countRange>
<thingDefCountRange>
<min>1</min>
<max>3</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_MediumAmmo</tradeTag>
<countRange>
<min>5</min>
<max>20</max>
</countRange>
<thingDefCountRange>
<min>1</min>
<max>4</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_HeavyAmmo</tradeTag>
<countRange>
<min>5</min>
<max>10</max>
</countRange>
<thingDefCountRange>
<min>1</min>
<max>2</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Category">
<categoryDef>Ammo</categoryDef>
<thingDefCountRange>
Expand Down Expand Up @@ -230,42 +176,6 @@
<max>40</max>
</countRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_Ammo</tradeTag>
<countRange>
<min>400</min>
<max>1000</max>
</countRange>
<price>Cheap</price>
<thingDefCountRange>
<min>3</min>
<max>8</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_MediumAmmo</tradeTag>
<countRange>
<min>30</min>
<max>60</max>
</countRange>
<price>Cheap</price>
<thingDefCountRange>
<min>3</min>
<max>6</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_HeavyAmmo</tradeTag>
<countRange>
<min>10</min>
<max>15</max>
</countRange>
<price>Cheap</price>
<thingDefCountRange>
<min>4</min>
<max>6</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Category">
<categoryDef>Ammo</categoryDef>
<thingDefCountRange>
Expand Down
30 changes: 4 additions & 26 deletions ModPatches/VRE Android Factions/Patches/VRE Android Factions/Factions_Misc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,12 @@
<li Class="StockGenerator_Tag">
<tradeTag>CE_Ammo</tradeTag>
<countRange>
<min>200</min>
<max>500</max>
<min>120</min>
<max>240</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>4</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_MediumAmmo</tradeTag>
<countRange>
<min>20</min>
<max>50</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>6</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_HeavyAmmo</tradeTag>
<countRange>
<min>5</min>
<max>10</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>4</max>
<min>1</min>
<max>2</max>
</thingDefCountRange>
</li>
</value>
Expand Down
90 changes: 1 addition & 89 deletions Patches/Core/TraderKindDefs/TraderKinds.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,6 @@
<max>40</max>
</countRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_PreIndustrialAmmo</tradeTag>
<countRange>
<min>30</min>
<max>100</max>
</countRange>
<thingDefCountRange>
<min>0</min>
<max>3</max>
</thingDefCountRange>
</li>
</value>
</Operation>

Expand Down Expand Up @@ -139,17 +128,6 @@
<max>0</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_PreIndustrialAmmo</tradeTag>
<countRange>
<min>30</min>
<max>100</max>
</countRange>
<thingDefCountRange>
<min>0</min>
<max>3</max>
</thingDefCountRange>
</li>
</value>
</Operation>

Expand Down Expand Up @@ -319,39 +297,6 @@
<Operation Class="PatchOperationAdd">
<xpath>Defs/TraderKindDef[defName="Caravan_Outlander_BulkGoods" or defName="Caravan_Outlander_PirateMerchant" or defName="Caravan_Outlander_Exotic"]/stockGenerators</xpath>
<value>
<li Class="StockGenerator_Tag">
<tradeTag>CE_Ammo</tradeTag>
<countRange>
<min>200</min>
<max>400</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>4</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_MediumAmmo</tradeTag>
<countRange>
<min>20</min>
<max>40</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>6</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_HeavyAmmo</tradeTag>
<countRange>
<min>5</min>
<max>10</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>4</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Category">
<categoryDef>Ammo</categoryDef>
<thingDefCountRange>
Expand Down Expand Up @@ -409,7 +354,7 @@
</countRange>
<price>Cheap</price>
<thingDefCountRange>
<min>3</min>
<min>4</min>
<max>8</max>
</thingDefCountRange>
</li>
Expand Down Expand Up @@ -488,39 +433,6 @@
<Operation Class="PatchOperationAdd">
<xpath>Defs/TraderKindDef[defName="Orbital_BulkGoods" or defName="Orbital_PirateMerchant" or defName="Orbital_Exotic"]/stockGenerators</xpath>
<value>
<li Class="StockGenerator_Tag">
<tradeTag>CE_Ammo</tradeTag>
<countRange>
<min>400</min>
<max>1000</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>4</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_MediumAmmo</tradeTag>
<countRange>
<min>60</min>
<max>120</max>
</countRange>
<thingDefCountRange>
<min>4</min>
<max>7</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_HeavyAmmo</tradeTag>
<countRange>
<min>15</min>
<max>50</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>4</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Category">
<categoryDef>Ammo</categoryDef>
<thingDefCountRange>
Expand Down
30 changes: 4 additions & 26 deletions Royalty/Patches/Royalty/TraderKindDefs/TraderKinds_Royalty.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@
<li Class="StockGenerator_Tag">
<tradeTag>CE_Ammo</tradeTag>
<countRange>
<min>200</min>
<max>400</max>
<min>120</min>
<max>240</max>
</countRange>
<thingDefCountRange>
<min>2</min>
<max>4</max>
<min>1</min>
<max>2</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Category">
Expand All @@ -120,28 +120,6 @@
<max>0</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_MediumAmmo</tradeTag>
<countRange>
<min>20</min>
<max>40</max>
</countRange>
<thingDefCountRange>
<min>3</min>
<max>6</max>
</thingDefCountRange>
</li>
<li Class="StockGenerator_Tag">
<tradeTag>CE_HeavyAmmo</tradeTag>
<countRange>
<min>5</min>
<max>10</max>
</countRange>
<thingDefCountRange>
<min>0</min>
<max>3</max>
</thingDefCountRange>
</li>
</value>
</Operation>

Expand Down
Loading