-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #103 from jakobharder/devel/6.4b
Devel/6.4b
- Loading branch information
Showing
29 changed files
with
666 additions
and
227 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| # Progression | ||
|
|
||
| ## Old World Needs | ||
|
|
||
| ### Pescatarians I | ||
|
|
||
| Need | Consumption | Residents | Coins | Required | Unlock | ||
| --- | --- | --- | --- | --- | --- | ||
| Market | | 3 | ||
| Fish | 0.0006 | 4 | | ||
| Vegetables | 0.0006 | 6 | | 150 | | ||
| Library | | 4 | | 200 | ||
| Cheese | 0.00044 | 7 | | 300 | ||
| Bread | 0.0003 | 6 | | 300 | ||
| --- | Luxury | --- | --- | --- | --- | ||
| Church | | 5 | ||
| Olive Soap | 0.0003 | 5 | ||
| Tools | 0.0002 | 5 | | 1000 | ||
|
|
||
| ### Pescatarians II | ||
|
|
||
| Need | Consumption | Residents | Coins | Required | Unlock | ||
| --- | --- | --- | --- | --- | --- | ||
| Market | | 3 | ||
| Library | | 4 | | 200 | ||
| Cheese | 0.00044 | 7 | | 300 | ||
| Bread | 0.0003 | 6 | | 300 | ||
| Suits | 0.0008 | 7 | | 500 | ||
| Pickles | 0.0004 | 6 | | 1000 | ||
| Sardines | 0.0004 | 7 | | 1000 | ||
| Music School | | 5 | | 1500 | ||
| --- | Luxury | --- | --- | --- | --- | ||
| Church | | 5 | ||
| Olive Soap | 0.0003 | 5 | ||
| Theater | | 5 | | 2000 | ||
| --- | Converts | --- | --- | --- | --- | ||
| University | | 1 | | 4000 | ||
| Sewing Machines | 0.0003 | 1 | ||
|
|
||
| ### Terraced Workers | ||
|
|
||
| Need | Consumption | Residents | Coins | Required | Unlock | ||
| --- | --- | --- | --- | --- | --- | ||
| Tea | 0.00026 | 4 | | 800 | ||
| Tools | 0.0004166 | 4 | | 1000 | ||
| Electricity | | 2 | | 1200 | | ||
| --- | Level II | --- | --- | --- | --- | ||
| Suits | 0.0004166 | 5 | | 1500 | ||
| Sardines | 0.0004166 | 5 | | 1500 | ||
|
|
||
| ### Terraced Artisans | ||
|
|
||
| Need | Consumption | Residents | Coins | Required | Unlock | ||
| --- | --- | --- | --- | --- | --- | ||
| Tea | 0.00052 | 7 | | 800 | ||
| Gramophones | 0.000027775 | 7 | | 800 | 3000 investors | ||
| Electricity | | 6 | | 1000 | | ||
| --- | Level II | --- | --- | --- | --- | ||
| Bombins | 0.00005555 | 6 | | 1500 | ||
| Typewriters | 0.000027775 | 7 | | 1500 | ||
| Violins | 0.000027775 | 7 | | 2000 | ||
|
|
||
| ## New World Needs | ||
|
|
||
| ### Jornaleros | ||
|
|
||
| Need | Consumption | Residents | Coins | ||
| --- | --- | --- | --- | ||
| Tortillas | 0.000238095 | 5 | 5 | ||
| Bread | 0.000238095 | 5 | 5 | ||
| Cheese | 0.000238095 | 5 | 5 | ||
|
|
||
| ### Obreros | ||
|
|
||
| Need | Consumption | Residents | Coins | ||
| --- | --- | --- | --- | ||
| (Tortillas) | 0.00047619 | 4 | 2 | ||
| Bread | 0.00047619 | 5 | 5 | ||
| Cheese | 0.00047619 | 5 | 5 | ||
| Electricity | - | 5 | 2 | ||
|
|
||
| ### Artistas | ||
|
|
||
| Need | Consumption | Residents | Coins | ||
| --- | --- | --- | --- | ||
| (Tortillas) | 0.00047619 | 5 | (10) 15 | ||
| (Scooter) | 0.00002898 | 5 | (45) 67 | ||
| Bread | 0.00047619 | 5 | 45 | ||
| Electricity | - | (20) | (45) | ||
| Gramophones | 0.00011905 | 5 | 48 | ||
| Sardines | 0.00011905 | 10 | 60 | ||
| Violins | 0.000053 | 10 | 75 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 62 additions & 0 deletions
62
mods/addon-new-world-cities/data/config/export/main/asset/electricity-anker.include.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <ModOps> | ||
| <!-- | ||
| Unlock anker asset with either DLC12 or other mods that unlock this anker (i.e. NW Cities). | ||
| That way we can check whether electricity is available in the NW. | ||
| --> | ||
| <ModOp Type="addNextSibling" GUID="100780"> | ||
| <Asset> | ||
| <Template>UnlockableAsset</Template> | ||
| <Values> | ||
| <Standard> | ||
| <GUID>1500010552</GUID> | ||
| <Name>Electricity Unlock Anker</Name> | ||
| </Standard> | ||
| <Locked /> | ||
| </Values> | ||
| </Asset> | ||
| <Asset> | ||
| <Template>FeatureUnlock</Template> | ||
| <Values> | ||
| <Standard> | ||
| <GUID>1500010553</GUID> | ||
| <Name>@ DLC 12</Name> | ||
| </Standard> | ||
| <Trigger> | ||
| <TriggerCondition> | ||
| <Template>ConditionIsDLCActive</Template> | ||
| <Values> | ||
| <Condition /> | ||
| <ConditionIsDLCActive> | ||
| <DLCAssetList> | ||
| <Item> | ||
| <DLCAsset>24963</DLCAsset> | ||
| </Item> | ||
| </DLCAssetList> | ||
| </ConditionIsDLCActive> | ||
| </Values> | ||
| </TriggerCondition> | ||
| <TriggerActions> | ||
| <Item> | ||
| <TriggerAction> | ||
| <Template>ActionUnlockAsset</Template> | ||
| <Values> | ||
| <Action /> | ||
| <ActionUnlockAsset> | ||
| <UnlockAssets> | ||
| <Item> | ||
| <Asset>1500010552</Asset> | ||
| </Item> | ||
| </UnlockAssets> | ||
| </ActionUnlockAsset> | ||
| </Values> | ||
| </TriggerAction> | ||
| </Item> | ||
| </TriggerActions> | ||
| </Trigger> | ||
| <TriggerSetup> | ||
| <UsedBySecondParties>0</UsedBySecondParties> | ||
| </TriggerSetup> | ||
| </Values> | ||
| </Asset> | ||
| </ModOp> | ||
| </ModOps> |
Oops, something went wrong.