diff --git a/devNotes/sugarcube stuff/building sugarcube.txt b/devNotes/sugarcube stuff/building sugarcube.txt index 477859eaa4dba29a9328a2777503ee55b1f22145..9e50431ee3875a1c2ea7db4d92756abda8187373 100644 --- a/devNotes/sugarcube stuff/building sugarcube.txt +++ b/devNotes/sugarcube stuff/building sugarcube.txt @@ -1,7 +1,6 @@ This brief how-to guides through patching and building sugarcube (https://github.com/tmedwards/sugarcube-2) for the Free Cities. Sugarcube sources can be obtained locally by cloning its Git repository. - Prerequisites (listed NOT in the installation order, please read the list to the end first): 1. Node.js with npm (https://nodejs.org). 2. To build some packages, Node.js requires python and a C/C++ compiler. On Windows you may want to @@ -54,13 +53,12 @@ CAUTION: Requited dependencies change during the project lifetime and vary from you may need to run npm install again after some time, or after branch/tag change. Try to run it in case of strange build errors. - The next is done in the directory where SC repo was cloned. Loop over required SugarCube versions: 1. git reset --hard to clean any local changes 2. (Optionally) git checkout v2.30.1 (any tag or head here, of course) -3. git apply ~/games/fc-pregmod/devNotes/sugarcube\ stuff/sugarcube-fc-changes.patch +3. git apply <full path to sugarcube-fc-changes.patch> 4. node build.js -b 2 to build release version 5. cp dist/twine2/sugarcube-2/format.js <whenever you want> 6. node build.js -b 2 -u -d to build debug version -7. cp dist/twine2/sugarcube-2/format.js <whenever you want to place the debug header> +7. cp dist/twine2/sugarcube-2/format.js <whenever you want to place the debug header> \ No newline at end of file diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/Mods/SecExp/SecExpBackwardCompatibility.tw similarity index 100% rename from src/SecExp/SecExpBackwardCompatibility.tw rename to src/Mods/SecExp/SecExpBackwardCompatibility.tw diff --git a/src/SecExp/attackGenerator.tw b/src/Mods/SecExp/attackGenerator.tw similarity index 100% rename from src/SecExp/attackGenerator.tw rename to src/Mods/SecExp/attackGenerator.tw diff --git a/src/SecExp/attackHandler.tw b/src/Mods/SecExp/attackHandler.tw similarity index 100% rename from src/SecExp/attackHandler.tw rename to src/Mods/SecExp/attackHandler.tw diff --git a/src/SecExp/attackOptions.tw b/src/Mods/SecExp/attackOptions.tw similarity index 100% rename from src/SecExp/attackOptions.tw rename to src/Mods/SecExp/attackOptions.tw diff --git a/src/SecExp/attackReport.tw b/src/Mods/SecExp/attackReport.tw similarity index 100% rename from src/SecExp/attackReport.tw rename to src/Mods/SecExp/attackReport.tw diff --git a/src/SecExp/authorityReport.tw b/src/Mods/SecExp/authorityReport.tw similarity index 100% rename from src/SecExp/authorityReport.tw rename to src/Mods/SecExp/authorityReport.tw diff --git a/src/SecExp/propagandaHub.tw b/src/Mods/SecExp/buildings/propagandaHub.tw similarity index 100% rename from src/SecExp/propagandaHub.tw rename to src/Mods/SecExp/buildings/propagandaHub.tw diff --git a/src/SecExp/riotControlCenter.tw b/src/Mods/SecExp/buildings/riotControlCenter.tw similarity index 100% rename from src/SecExp/riotControlCenter.tw rename to src/Mods/SecExp/buildings/riotControlCenter.tw diff --git a/src/SecExp/secBarracks.tw b/src/Mods/SecExp/buildings/secBarracks.tw similarity index 100% rename from src/SecExp/secBarracks.tw rename to src/Mods/SecExp/buildings/secBarracks.tw diff --git a/src/SecExp/securityHQ.tw b/src/Mods/SecExp/buildings/securityHQ.tw similarity index 100% rename from src/SecExp/securityHQ.tw rename to src/Mods/SecExp/buildings/securityHQ.tw diff --git a/src/SecExp/transportHub.tw b/src/Mods/SecExp/buildings/transportHub.tw similarity index 100% rename from src/SecExp/transportHub.tw rename to src/Mods/SecExp/buildings/transportHub.tw diff --git a/src/SecExp/weaponsManufacturing.tw b/src/Mods/SecExp/buildings/weaponsManufacturing.tw similarity index 98% rename from src/SecExp/weaponsManufacturing.tw rename to src/Mods/SecExp/buildings/weaponsManufacturing.tw index ff8d0e1711efd2430ffb154ba8c79bc224250f86..efe12683a7e18de5c9694f76ffea2b86e18ffb78 100644 --- a/src/SecExp/weaponsManufacturing.tw +++ b/src/Mods/SecExp/buildings/weaponsManufacturing.tw @@ -195,12 +195,12 @@ With our current industrial and research capabilities upgrades will be finished <<if $currentUpgrade.time <= 0>> <br>Security Drones: - <<if $secBotsBaseDefense <= 3 || $droneUpgrades >= 3>> + <<if $weapLab < 3>> Upgrade the research facility further to unlock more upgrades for the security drones. - <br><br> - <<else>> + <<elseif $completedUpgrades.containsAll(-1, -2, -3)>> You have fully upgraded the security drones. <</if>> + <<if !$completedUpgrades.containsAll(-1, -2, -3)>> <br> <</if>> /* Drones upgrades */ <<if !$completedUpgrades.includes(-1)>> <<link "Develop dynamic battle aware AI">> @@ -240,7 +240,7 @@ With our current industrial and research capabilities upgrades will be finished <</link>> <br>//Will take _time weeks, cost <<print cashFormat(30000)>> and will increase the base hp value of the security drones.// <</if>> - <<if $secBotsBaseDefense <= 3 || $droneUpgrades >= 3>> <br> <</if>> + <<if !$completedUpgrades.containsAll(-1, -2, -3)>> <br> <</if>> /* human troops upgrades */ <br>Troops: diff --git a/src/SecExp/edicts.tw b/src/Mods/SecExp/edicts.tw similarity index 100% rename from src/SecExp/edicts.tw rename to src/Mods/SecExp/edicts.tw diff --git a/src/SecExp/encyclopediaSecExpBattles.tw b/src/Mods/SecExp/encyclopediaSecExpBattles.tw similarity index 100% rename from src/SecExp/encyclopediaSecExpBattles.tw rename to src/Mods/SecExp/encyclopediaSecExpBattles.tw diff --git a/src/SecExp/encyclopediaSecExpMain.tw b/src/Mods/SecExp/encyclopediaSecExpMain.tw similarity index 100% rename from src/SecExp/encyclopediaSecExpMain.tw rename to src/Mods/SecExp/encyclopediaSecExpMain.tw diff --git a/src/SecExp/js/secExp.js b/src/Mods/SecExp/js/secExp.js similarity index 100% rename from src/SecExp/js/secExp.js rename to src/Mods/SecExp/js/secExp.js diff --git a/src/SecExp/js/secExpState.js b/src/Mods/SecExp/js/secExpState.js similarity index 100% rename from src/SecExp/js/secExpState.js rename to src/Mods/SecExp/js/secExpState.js diff --git a/src/SecExp/proclamations.tw b/src/Mods/SecExp/proclamations.tw similarity index 100% rename from src/SecExp/proclamations.tw rename to src/Mods/SecExp/proclamations.tw diff --git a/src/SecExp/rebellionEvents.tw b/src/Mods/SecExp/rebellionEvents.tw similarity index 100% rename from src/SecExp/rebellionEvents.tw rename to src/Mods/SecExp/rebellionEvents.tw diff --git a/src/SecExp/rebellionGenerator.tw b/src/Mods/SecExp/rebellionGenerator.tw similarity index 100% rename from src/SecExp/rebellionGenerator.tw rename to src/Mods/SecExp/rebellionGenerator.tw diff --git a/src/SecExp/rebellionHandler.tw b/src/Mods/SecExp/rebellionHandler.tw similarity index 100% rename from src/SecExp/rebellionHandler.tw rename to src/Mods/SecExp/rebellionHandler.tw diff --git a/src/SecExp/rebellionOptions.tw b/src/Mods/SecExp/rebellionOptions.tw similarity index 100% rename from src/SecExp/rebellionOptions.tw rename to src/Mods/SecExp/rebellionOptions.tw diff --git a/src/SecExp/rebellionReport.tw b/src/Mods/SecExp/rebellionReport.tw similarity index 100% rename from src/SecExp/rebellionReport.tw rename to src/Mods/SecExp/rebellionReport.tw diff --git a/src/SecExp/secExpSmilingMan.tw b/src/Mods/SecExp/secExpSmilingMan.tw similarity index 100% rename from src/SecExp/secExpSmilingMan.tw rename to src/Mods/SecExp/secExpSmilingMan.tw diff --git a/src/SecExp/securityReport.tw b/src/Mods/SecExp/securityReport.tw similarity index 100% rename from src/SecExp/securityReport.tw rename to src/Mods/SecExp/securityReport.tw diff --git a/src/SecExp/seeUnit.tw b/src/Mods/SecExp/seeUnit.tw similarity index 100% rename from src/SecExp/seeUnit.tw rename to src/Mods/SecExp/seeUnit.tw diff --git a/src/SecExp/tradeReport.tw b/src/Mods/SecExp/tradeReport.tw similarity index 100% rename from src/SecExp/tradeReport.tw rename to src/Mods/SecExp/tradeReport.tw diff --git a/src/SecExp/unitsBattleReport.tw b/src/Mods/SecExp/unitsBattleReport.tw similarity index 100% rename from src/SecExp/unitsBattleReport.tw rename to src/Mods/SecExp/unitsBattleReport.tw diff --git a/src/SecExp/unitsRebellionReport.tw b/src/Mods/SecExp/unitsRebellionReport.tw similarity index 100% rename from src/SecExp/unitsRebellionReport.tw rename to src/Mods/SecExp/unitsRebellionReport.tw diff --git a/src/SecExp/widgets/battleWidgets.js b/src/Mods/SecExp/widgets/battleWidgets.js similarity index 100% rename from src/SecExp/widgets/battleWidgets.js rename to src/Mods/SecExp/widgets/battleWidgets.js diff --git a/src/SecExp/widgets/miscSecExpWidgets.tw b/src/Mods/SecExp/widgets/miscSecExpWidgets.tw similarity index 100% rename from src/SecExp/widgets/miscSecExpWidgets.tw rename to src/Mods/SecExp/widgets/miscSecExpWidgets.tw diff --git a/src/SecExp/widgets/unitsWidgets.tw b/src/Mods/SecExp/widgets/unitsWidgets.tw similarity index 100% rename from src/SecExp/widgets/unitsWidgets.tw rename to src/Mods/SecExp/widgets/unitsWidgets.tw