Skip to content

Commit

Permalink
Merge pull request OpenApoc#1188 from kgd192/cityRepair
Browse files Browse the repository at this point in the history 
Add a system for Incremental City Repair OpenApoc#1141 that can be updated in the future to match Original Game systems
  • Loading branch information
@FilmBoy84
FilmBoy84 authored Jan 28, 2024
2 parents d102d38 + 5330688 commit a016802
Show file tree
Hide file tree
Showing 8 changed files with 217 additions and 105 deletions.
48 changes: 27 additions & 21 deletions data/forms/city/debugoverlay_city.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,128 +41,134 @@
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="B" text="B = Spawn UFO on Assualt Mission">
<label id="ShiftR" text="Shift+R = Repair Scenery (Single Story Mode)">
<position x="left" y="84"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="U" text="U = Spawn Three Crashed UFOs">
<label id="B" text="B = Spawn UFO on Assualt Mission">
<position x="left" y="98"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="X" text="X = Crash All Vehicles">
<label id="U" text="U = Spawn Three Crashed UFOs">
<position x="left" y="112"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="PgUpPgDn" text="PgUp / PgDown = Display One Map Layer">
<label id="X" text="X = Crash All Vehicles">
<position x="left" y="126"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="F2" text="F2 = Show Road Pathfinding">
<label id="PgUpPgDn" text="PgUp / PgDown = Display One Map Layer">
<position x="left" y="140"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="F3" text="F3 = Highlight Walkmode, Collapsing Tiles, Basement Tiles">
<label id="F2" text="F2 = Show Road Pathfinding">
<position x="left" y="154"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="F3" text="F3 = Highlight Walkmode, Collapsing Tiles, Basement Tiles">
<position x="left" y="168"/>
<size width="400" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="F4" text="F4 = Show Aliens on Strategy Map">
<position x="left" y="168"/>
<position x="left" y="182"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="F5" text="F5 = Show Vehicles Paths">
<position x="left" y="182"/>
<position x="left" y="196"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="F6" text="F6 = Dump Voxelmap LOS">
<position x="left" y="196"/>
<position x="left" y="210"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="F7" text="F7 = Dump Voxelmap LOS (Fast)">
<position x="left" y="210"/>
<position x="left" y="224"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="F8" text="F8 = Dump Voxelmap LOF">
<position x="left" y="224"/>
<position x="left" y="238"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="F9" text="F9 = Dump Voxelmap LOF (Fast)">
<position x="left" y="238"/>
<position x="left" y="252"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="F10" text="F10 = Highlight Tubes">
<position x="left" y="252"/>
<position x="left" y="266"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="F11" text="F11 = Highlight Roads">
<position x="left" y="266"/>
<position x="left" y="280"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="F12" text="F12 = Highlight Hills">
<position x="left" y="280"/>
<position x="left" y="294"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="Num" text="Show Roads / Tubes Num1379 = Direction, Num28 = Up / Down, Num0 = Show All, Num5 = Switch Views">
<position x="left" y="294"/>
<position x="left" y="308"/>
<size width="640" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="VClick" text="V+LeftClick = Fix Stuck Vehicle in CityScape (Deprecated)">
<position x="left" y="308"/>
<position x="left" y="322"/>
<size width="350" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="P" text="P = Show Vehicle Targets">
<position x="left" y="322"/>
<position x="left" y="336"/>
<size width="350" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="MINUS" text="MINUS = Clear Space Liners (If game is running slowly)">
<position x="left" y="336"/>
<position x="left" y="350"/>
<size width="350" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="Base" text="Base Screen - F10 = Finish All Facilities">
<position x="left" y="350"/>
<position x="left" y="364"/>
<size width="250" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
</label>
<label id="Research" text="Research Screen - F10 = Complete Project at Next Update (With at least two Scientists Assigned)">
<position x="left" y="364"/>
<position x="left" y="378"/>
<size width="640" height="14"/>
<alignment horizontal="left" vertical="top"/>
<font>smalfont</font>
Expand Down
11 changes: 10 additions & 1 deletion framework/options.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ void dumpOptionsToLog()
dumpOption(optionBattlescapeVertScroll);
dumpOption(optionSingleSquadSelect);
dumpOption(optionATVUFOMission);
dumpOption(optionMaxTileRepair);
dumpOption(optionSceneryRepairCostFactor);

dumpOption(optionStunHostileAction);
dumpOption(optionRaidHostileAction);
Expand Down Expand Up @@ -337,7 +339,6 @@ ConfigOptionBool optionPauseOnAgentPsiControlled("Notifications.Battle", "AgentP
"Unit under Psionic control", true);
ConfigOptionBool optionPauseOnAgentPsiOver("Notifications.Battle", "AgentPsiOver",
"Unit freed from Psionic control", true);

ConfigOptionBool optionDebugCommandsVisible("OpenApoc.NewFeature", "DebugCommandsVisible",
"Show the debug commands on screen", true);
ConfigOptionBool optionUFODamageModel("OpenApoc.NewFeature", "UFODamageModel",
Expand Down Expand Up @@ -428,6 +429,14 @@ ConfigOptionBool
optionATVUFOMission("OpenApoc.NewFeature", "ATVUFOMission",
"Allow ATV vehicles to initiate UFO missions (and recover vehicles)",
false);
ConfigOptionInt
optionMaxTileRepair("OpenApoc.Mod", "MaxTileRepair",
"Construction Vehicles will repair a maximum of X Tiles per night", 5);
ConfigOptionFloat
optionSceneryRepairCostFactor("OpenApoc.Mod", "SceneryRepairCostFactor",
"Determines the percentage of the original Price ORGs have to "
"pay for a Scenery Tile to be repaired",
10.0f);

ConfigOptionBool optionStunHostileAction("OpenApoc.Mod", "StunHostileAction",
"Stunning hurts relationships", false);
Expand Down
2 changes: 2 additions & 0 deletions framework/options.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ extern ConfigOptionBool optionLeftClickIcon;
extern ConfigOptionBool optionBattlescapeVertScroll;
extern ConfigOptionBool optionSingleSquadSelect;
extern ConfigOptionBool optionATVUFOMission;
extern ConfigOptionInt optionMaxTileRepair;
extern ConfigOptionFloat optionSceneryRepairCostFactor;

extern ConfigOptionBool optionStunHostileAction;
extern ConfigOptionBool optionRaidHostileAction;
Expand Down
Loading

0 comments on commit a016802

Please sign in to comment.