mirror of
https://github.com/2revoemag/PSF-BotServer.git
synced 2026-07-09 21:44:41 +00:00
Unique Number System Operations (#906)
* propagation of the ask pattern into the unique number actor * TaskWorkflow as a replacement for TaskResolver; includes working tests * AvailabilityPolicy has been changed slightly; number source restriction mechanic has been completely removed * TaskResolver is gone and done and TaskWorkflow replaces it * number pool variety * every zone gets a custom tailored 'environment' number pool, as well as all other number pools; uns involves many more static functions and hard-defined variables * repairs to uns and guidtask tests; worked uns into unops, an actorless version, but did not integrate into server * shuffled around files in the guid package, causing import threshing; wrote extensive comments; repaired tests; classes related to the old unique number system have been removed * created straightforward tasks; simplified number pool actor calls; repaired tests due to modifications to generic pool * bad merge recovery
This commit is contained in:
parent
ce2a3f5422
commit
9841b7e97d
114 changed files with 2323 additions and 3374 deletions
|
|
@ -46,11 +46,6 @@ akka.actor.deployment {
|
|||
dispatcher = galaxy-service
|
||||
}
|
||||
|
||||
# Isolate tasks
|
||||
"/service/taskResolver*" {
|
||||
dispatcher = task-dispatcher
|
||||
}
|
||||
|
||||
# Bottleneck (dedicated thread)
|
||||
"/service/cluster" {
|
||||
dispatcher = interstellar-cluster-service
|
||||
|
|
|
|||
8
src/main/resources/guid-pools/c1.json
Normal file
8
src/main/resources/guid-pools/c1.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 937,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/c2.json
Normal file
8
src/main/resources/guid-pools/c2.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 1615,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/c3.json
Normal file
8
src/main/resources/guid-pools/c3.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 1128,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/c4.json
Normal file
8
src/main/resources/guid-pools/c4.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 904,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/c5.json
Normal file
8
src/main/resources/guid-pools/c5.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 635,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/c6.json
Normal file
8
src/main/resources/guid-pools/c6.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 908,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
74
src/main/resources/guid-pools/default.json
Normal file
74
src/main/resources/guid-pools/default.json
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 3000,
|
||||
"Selector": "specific"
|
||||
},
|
||||
{
|
||||
"Name": "players",
|
||||
"Start": 3001,
|
||||
"Max": 4500,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "lockers",
|
||||
"Start": 4501,
|
||||
"Max": 5000,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "tools",
|
||||
"Start": 5001,
|
||||
"Max": 9500,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "ammo",
|
||||
"Start": 9501,
|
||||
"Max": 23000,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "kits",
|
||||
"Start": 23001,
|
||||
"Max": 36500,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "items",
|
||||
"Start": 36501,
|
||||
"Max": 39500,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "projectiles",
|
||||
"Start": 40100,
|
||||
"Max": 40149,
|
||||
"Selector": "specific"
|
||||
},
|
||||
{
|
||||
"Name": "locker-contents",
|
||||
"Start": 40150,
|
||||
"Max": 40450,
|
||||
"Selector": "specific"
|
||||
},
|
||||
{
|
||||
"Name": "vehicles",
|
||||
"Start": 45001,
|
||||
"Max": 47000,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "terminals",
|
||||
"Start": 47001,
|
||||
"Max": 48000,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "deployables",
|
||||
"Start": 48001,
|
||||
"Max": 64000,
|
||||
"Selector": "random"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/home1.json
Normal file
8
src/main/resources/guid-pools/home1.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 1161,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/home2.json
Normal file
8
src/main/resources/guid-pools/home2.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 1096,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/home3.json
Normal file
8
src/main/resources/guid-pools/home3.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 1074,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/i1.json
Normal file
8
src/main/resources/guid-pools/i1.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 778,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/i2.json
Normal file
8
src/main/resources/guid-pools/i2.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 918,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/i3.json
Normal file
8
src/main/resources/guid-pools/i3.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 699,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/i4.json
Normal file
8
src/main/resources/guid-pools/i4.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 318,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/z1.json
Normal file
8
src/main/resources/guid-pools/z1.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 2088,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/z10.json
Normal file
8
src/main/resources/guid-pools/z10.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 2657,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/z2.json
Normal file
8
src/main/resources/guid-pools/z2.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 2515,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
44
src/main/resources/guid-pools/z3.json
Normal file
44
src/main/resources/guid-pools/z3.json
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 3732,
|
||||
"Selector": "specific"
|
||||
},
|
||||
{
|
||||
"Name": "players",
|
||||
"Start": 4001,
|
||||
"Max": 5500,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "lockers",
|
||||
"Start": 5501,
|
||||
"Max": 6000,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "tools",
|
||||
"Start": 6001,
|
||||
"Max": 10500,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "ammo",
|
||||
"Start": 10501,
|
||||
"Max": 24000,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "kits",
|
||||
"Start": 24001,
|
||||
"Max": 37500,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "items",
|
||||
"Start": 37501,
|
||||
"Max": 40099,
|
||||
"Selector": "random"
|
||||
}
|
||||
]
|
||||
44
src/main/resources/guid-pools/z4.json
Normal file
44
src/main/resources/guid-pools/z4.json
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 3076,
|
||||
"Selector": "specific"
|
||||
},
|
||||
{
|
||||
"Name": "players",
|
||||
"Start": 3101,
|
||||
"Max": 4600,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "lockers",
|
||||
"Start": 4601,
|
||||
"Max": 5100,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "tools",
|
||||
"Start": 5101,
|
||||
"Max": 9600,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "ammo",
|
||||
"Start": 9601,
|
||||
"Max": 23100,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "kits",
|
||||
"Start": 23101,
|
||||
"Max": 36600,
|
||||
"Selector": "random"
|
||||
},
|
||||
{
|
||||
"Name": "items",
|
||||
"Start": 36601,
|
||||
"Max": 39600,
|
||||
"Selector": "random"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/z5.json
Normal file
8
src/main/resources/guid-pools/z5.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 2112,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/z6.json
Normal file
8
src/main/resources/guid-pools/z6.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 2422,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/z7.json
Normal file
8
src/main/resources/guid-pools/z7.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 2816,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/z8.json
Normal file
8
src/main/resources/guid-pools/z8.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 2139,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
8
src/main/resources/guid-pools/z9.json
Normal file
8
src/main/resources/guid-pools/z9.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[
|
||||
{
|
||||
"Name": "environment",
|
||||
"Start": 0,
|
||||
"Max": 2921,
|
||||
"Selector": "specific"
|
||||
}
|
||||
]
|
||||
Loading…
Add table
Add a link
Reference in a new issue