diff --git a/scripts/data/road_edges.srz b/scripts/data/road_edges.srz index bfa876531381af88d8f45faf8bd0100fab20b31a..eada2d42dfba9a232aec49b71b05f7937abbb5ec 100644 Binary files a/scripts/data/road_edges.srz and b/scripts/data/road_edges.srz differ diff --git a/scripts/data/road_edges.txt b/scripts/data/road_edges.txt index 89d0e2955f34bfe9c9aef6105c4e2a78bb544f67..0ab11a436676d8ab726f1289ed198d7d9c7c7019 100644 --- a/scripts/data/road_edges.txt +++ b/scripts/data/road_edges.txt @@ -64,7 +64,7 @@ ROUTE62 INTERSECTION33 INTERSECTION40 ROUTE63 INTERSECTION40 INTERSECTION39 ROUTE64 INTERSECTION43 INTERSECTION42 ROUTE65 INTERSECTION42 INTERSECTION40 -ROUTE66 INTERSECTION23 INTERSECTION43 +ROUTE66 INTERSECTION43 INTERSECTION23 ROUTE67 INTERSECTION23 INTERSECTION45 ROUTE68 INTERSECTION45 INTERSECTION31 ROUTE69 INTERSECTION31 INTERSECTION47 @@ -72,12 +72,12 @@ ROUTE70 INTERSECTION45 INTERSECTION46 ROUTE71 INTERSECTION46 INTERSECTION47 ROUTE72 INTERSECTION31 INTERSECTION51 ROUTE73 INTERSECTION51 INTERSECTION30 -ROUTE74 INTERSECTION50 INTERSECTION51 -ROUTE75 INTERSECTION47 INTERSECTION50 +ROUTE74 INTERSECTION51 INTERSECTION50 +ROUTE75 INTERSECTION50 INTERSECTION47 ROUTE76 INTERSECTION46 INTERSECTION48 ROUTE77 INTERSECTION48 INTERSECTION49 ROUTE78 INTERSECTION48 INTERSECTION47 -ROUTE79 INTERSECTION50 INTERSECTION49 +ROUTE79 INTERSECTION49 INTERSECTION50 ROUTE80 INTERSECTION42 INTERSECTION52 ROUTE81 INTERSECTION49 INTERSECTION56 ROUTE85 INTERSECTION101 INTERSECTION102 @@ -140,7 +140,7 @@ ROUTE148 INTERSECTION142 INTERSECTION143 ROUTE149 INTERSECTION141 INTERSECTION54 ROUTE150 INTERSECTION54 INTERSECTION144 ROUTE151 INTERSECTION144 INTERSECTION145 -ROUTE152 INTERSECTION137 INTERSECTION145 +ROUTE152 INTERSECTION137 INTERSECTION146 ROUTE153 INTERSECTION58 INTERSECTION55 ROUTE154 INTERSECTION55 INTERSECTION152 ROUTE155 INTERSECTION152 INTERSECTION153 @@ -211,7 +211,7 @@ ROUTE219 INTERSECTION182 INTERSECTION183 ROUTE220 INTERSECTION183 INTERSECTION184 ROUTE221 INTERSECTION184 INTERSECTION185 ROUTE222 INTERSECTION179 INTERSECTION186 -ROUTE223 INTERSECTION175 INTERSECTION183 +ROUTE223 INTERSECTION175 INTERSECTION180 ROUTE224 INTERSECTION167 INTERSECTION172 ROUTE225 INTERSECTION172 INTERSECTION173 ROUTE226 INTERSECTION172 INTERSECTION174 @@ -228,8 +228,7 @@ ROUTE236 INTERSECTION192 INTERSECTION193 ROUTE237 INTERSECTION193 INTERSECTION194 ROUTE238 INTERSECTION194 INTERSECTION196 ROUTE239 INTERSECTION196 INTERSECTION197 -ROUTE239 INTERSECTION197 INTERSECTION198 -ROUTE240 INTERSECTION115 INTERSECTION120 +ROUTE240 INTERSECTION197 INTERSECTION198 ROUTE241 INTERSECTION120 INTERSECTION116 ROUTE242 INTERSECTION115 INTERSECTION127 ROUTE243 INTERSECTION52 INTERSECTION132 @@ -262,7 +261,7 @@ ROUTE269 INTERSECTION256 INTERSECTION111 ROUTE270 INTERSECTION135 INTERSECTION223 ROUTE271 INTERSECTION223 INTERSECTION224 ROUTE272 INTERSECTION224 INTERSECTION236 -ROUTE273 INTERSECTION221 INTERSECTION236 +ROUTE273 INTERSECTION221 INTERSECTION223 ROUTE274 INTERSECTION228 INTERSECTION229 ROUTE275 INTERSECTION229 INTERSECTION230 ROUTE276 INTERSECTION230 INTERSECTION236 @@ -278,7 +277,7 @@ ROUTE285 INTERSECTION245 INTERSECTION247 ROUTE286 INTERSECTION247 INTERSECTION248 ROUTE287 INTERSECTION248 INTERSECTION118 ROUTE288 INTERSECTION248 INTERSECTION249 -ROUTE289 INTERSECTION236 INTERSECTION53 +ROUTE289 INTERSECTION236 INTERSECTION234 ROUTE290 INTERSECTION53 INTERSECTION237 ROUTE291 INTERSECTION258 INTERSECTION259 ROUTE292 INTERSECTION259 INTERSECTION260 diff --git a/scripts/jump_start.py b/scripts/jump_start.py index 959e12c3aa90595f35ed6593a784cb96d3bb56ba..115d8c771c8b558a5c8c937e248ecf01512c4dcd 100644 --- a/scripts/jump_start.py +++ b/scripts/jump_start.py @@ -34,7 +34,7 @@ borg.goalPath = "HTN/Trees/" # Scenario Parameters ################################################################################################################################################################# # will the entities move to attack positions at the end of training? -borg.isAttackRun = True +borg.isAttackRun = False # attack time after which all vehicles will go to attack positions # note: This is not an interrupt, convoys will finish what they were doing first # also note: This doesn't matter if the 'isAttackRun' is False @@ -75,8 +75,8 @@ borg.params_randSpdOverride = -1 # be sent to attack positions at the end of a scenario # regardless of this flag borg.params_activateConvoyOne = True -borg.params_activateConvoyTwo = False -borg.params_activateConvoyThree = False +borg.params_activateConvoyTwo = True +borg.params_activateConvoyThree = True # use a background traffic pattern used to add confusion about # what groups of vehicles are actually convoys. Usually left off @@ -94,7 +94,7 @@ borg.params_redWaitAtBaseForVar = 0 # this lets you set the number of destinations to use # if 0 it will be determined randomly how many to use # between 1 and 3 -borg.params_overrideNumDests = 2 # ignored if 0 +borg.params_overrideNumDests = 3 # ignored if 0 ################################################################################################################################################################# # #################################################################################################################################################################