Add civilian traffic variants, farm tractors and UI scaling; record Workshop 0.0.143

tests/test_garage_vehicle_rules.py

@@ -1,8 +1,9 @@
 """Run production garage filtering and vehicle-fit rules against unsafe inputs."""
 from policy_harness import ROOT, body, run
 p = ROOT/'addons/core/Scripts/Game/ERR/10_AI/ERR_GarageVehicles.c'
-rules = '\n'.join(body(p, s) for s in ('static bool Garage(', 'static bool Envelope(', 'static bool Yard(', 'static vector YardOffset('))
+rules = '\n'.join(body(p, s) for s in ('static bool Garage(', 'static bool Envelope(', 'static bool Yard(', 'static bool Farm(', 'static bool FarmEnvelope(', 'static vector YardOffset('))
 rules += '\n' + body(ROOT/'addons/core/Scripts/Game/ERR/10_AI/ERR_ParkedCarCatalog.c', 'static bool Candidate(')
+rules += '\n' + body(ROOT/'addons/core/Scripts/Game/ERR/10_AI/ERR_ParkedCarCatalog.c', 'static bool MovingCandidate(')
 rules = rules.replace('vector ', 'Vec ').replace('ERR_ForceRules.', 'ERR_ForceRules::')
 run(r'''
 #include <cassert>
@@ -32,12 +33,26 @@ int main(){
  assert(!Yard("Prefabs/Structures/Houses/Village/House_Village_E_1I06/House_Village_E_1I06_base.et"));
  assert(!Yard("Prefabs/Structures/Houses/Village/House_Village_E_1I06/Dst/House_Village_E_1I06_ruin.et"));
  assert(!Yard("Prefabs/Structures/Houses/Village/House_Village_E_1I06/Furniture/House_Village_E_1I06_furniture_01.et"));
+ assert(Farm("Prefabs/Structures/Agriculture/Barn/Barn_E_01/Barn_E_01_white.et"));
+ assert(Farm("Prefabs/Structures/Agriculture/CowShed/CowShed_E_01/CowShed_E_01_short.et"));
+ assert(!Farm("Prefabs/Structures/Agriculture/Barn/Barn_E_01/Dst/Barn_E_01_Ruin.et"));
+ assert(!Farm("Prefabs/Structures/Agriculture/Barn/Barn_E_01/Barn_E_01_Base.et"));
+ assert(!Farm("Prefabs/Structures/Agriculture/Barn/Barn_E_01/Furniture/Barn_E_01_furniture_01.et"));
+ assert(FarmEnvelope({{-1.4,-0.2,-2.9}},{{1.4,3,2.9}}));
+ assert(!FarmEnvelope({{-1.5,0,-2}},{{1,3,2}}));
+ assert(!FarmEnvelope({{-1,0,-2}},{{1,3.2,2}}));
+ assert(!FarmEnvelope({{-1,0,-3}},{{1,3,2}}));
+ assert(!FarmEnvelope({{-1,0,-2}},{{1,NAN,2}}));
  Vec low={{-4,-1,-6}},high={{6,8,8}};
  assert(YardOffset(low,high,0)[0]==-7 && YardOffset(low,high,0)[2]==1);
  assert(YardOffset(low,high,1)[0]==9 && YardOffset(low,high,1)[1]==0);
  assert(YardOffset(low,high,2)[2]==-9 && YardOffset(low,high,2)[0]==1);
  assert(YardOffset(low,high,3)[2]==11);
+ assert(YardOffset(low,high,0,4)[0]==-8 && YardOffset(low,high,3,4)[2]==12);
  assert(Candidate("{GUID}Prefabs/Vehicles/Wheeled/T601/T601_blue_twoTone.et",false));
+ assert(!MovingCandidate("{GUID}Prefabs/Vehicles/Wheeled/T601/T601_blue_twoTone.et"));
+ assert(MovingCandidate("{GUID}Prefabs/Vehicles/Wheeled/V2101/V2101_lightBlue.et"));
+ assert(!MovingCandidate("Prefabs/Vehicles/Wheeled/S105/S105_rally_08.et"));
  assert(Candidate("Prefabs/Vehicles/Wheeled/V2101/V2101_lightBlue.et",false));
  assert(Candidate("Prefabs/Vehicles/Wheeled/S105/S105_rally_08.et",true));
  assert(!Candidate("Prefabs/Vehicles/Wheeled/S105/S105_rally_08.et",false));
@@ -75,13 +90,13 @@ struct Vec {float v[3];float operator[](int i)const{return v[i];}
  Vec operator+(Vec b)const{return {{v[0]+b[0],v[1]+b[1],v[2]+b[2]}};}
  Vec operator*(float n)const{return {{v[0]*n,v[1]*n,v[2]*n}};}};
 bool worldAvailable=true,managerAvailable=true,hasRoad=true,wetEdge=false;
-float roadDistance=20,edgeHeight=0;
+float roadDistance=20,edgeHeight=0,waterBoundary=2;
 struct BaseRoad{float width=10;float GetWidth(){return width;}} roadInstance;
 struct Roads{void GetClosestRoad(Vec,BaseRoad*& road,float& distance,bool){road=hasRoad?&roadInstance:nullptr;distance=roadDistance;}} roads;
 struct SCR_AIWorld{Roads* GetRoadNetworkManager(){return managerAvailable?&roads:nullptr;}} nativeWorld;
 namespace ERR_ForceRules{bool Finite(float n){return std::isfinite(n);}}
 namespace SCR_TerrainHelper{float GetTerrainY(Vec p){return p[0]>.5f?edgeHeight:0;}}
-namespace ERR_Actors{bool DryGround(Vec p){return !(wetEdge&&p[2]>2)&&std::isfinite(SCR_TerrainHelper::GetTerrainY(p));}}
+namespace ERR_Actors{bool DryGround(Vec p){return !(wetEdge&&p[2]>waterBoundary)&&std::isfinite(SCR_TerrainHelper::GetTerrainY(p));}}
 namespace Math{float AbsFloat(float n){return std::abs(n);}}
 ''' + ground + r'''
 int main(){Vec p={{0,0,0}},matrix[4]={{{1,0,0}},{{0,1,0}},{{0,0,1}},{{0,0,0}}};
@@ -90,7 +105,7 @@ int main(){Vec p={{0,0,0}},matrix[4]={{{1,0,0}},{{0,1,0}},{{0,0,1}},{{0,0,0}}};
  hasRoad=false;assert(YardGround(p,matrix));hasRoad=true;
  worldAvailable=false;assert(!YardGround(p,matrix));worldAvailable=true;
  managerAvailable=false;assert(!YardGround(p,matrix));managerAvailable=true;
- wetEdge=true;assert(!YardGround(p,matrix));wetEdge=false;
+ wetEdge=true;assert(!YardGround(p,matrix));waterBoundary=2.75f;assert(YardGround(p,matrix)&&!YardGround(p,matrix,true));wetEdge=false;
  edgeHeight=.19f;assert(!YardGround(p,matrix));edgeHeight=.17f;assert(YardGround(p,matrix));
  edgeHeight=NAN;assert(!YardGround(p,matrix));edgeHeight=0;
  roadDistance=NAN;assert(!YardGround(p,matrix));