update: Make ships produce after eating and building
People in sectors first eat, then build the sector, then produce. People in ships produce, eat, then build. The starvation command can be off for fishing vessels, because it doesn't consider the food they produce. Change ships to match sectors. "Fixes" starvation. Fishing boats and oil derricks being repaired at sea become a bit more productive. Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
parent
da14a03231
commit
391778e09c
7 changed files with 88 additions and 77 deletions
|
|
@ -19,7 +19,7 @@ This document gives a rough order of events during the update.
|
|||
2) Then, in order of country #, deal with each country:
|
||||
a) pay for military reserves.
|
||||
b) ship maintenance
|
||||
pay maintenance, produce, then feed and plague people on board
|
||||
pay maintenance, then feed and plague people on board
|
||||
c) plane maintenance
|
||||
d) land unit maintenance
|
||||
pay maintenance, then feed and plague people on board
|
||||
|
|
@ -38,6 +38,7 @@ This document gives a rough order of events during the update.
|
|||
f) first increase eff
|
||||
g) then make things
|
||||
f) ship building
|
||||
first increase efficiency, then produce
|
||||
stopped ships are started, but not built (see info stop)
|
||||
g) plane building
|
||||
stopped planes are started, but not built (see info stop)
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@
|
|||
static void upd_ship(struct shpstr *, int, struct bp *, int);
|
||||
static void shiprepair(struct shpstr *, struct natstr *, struct bp *,
|
||||
int, struct budget *);
|
||||
static void ship_produce(struct shpstr *, int, struct budget *);
|
||||
static int feed_ship(struct shpstr *, int);
|
||||
|
||||
void
|
||||
|
|
@ -85,20 +86,14 @@ upd_ship(struct shpstr *sp, int etus, struct bp *bp, int build)
|
|||
struct budget *budget = &nat_budget[sp->shp_own];
|
||||
struct mchrstr *mp = &mchr[sp->shp_type];
|
||||
struct natstr *np = getnatp(sp->shp_own);
|
||||
struct sctstr *sectp;
|
||||
int pstage, ptime;
|
||||
int oil_gained;
|
||||
int max_oil;
|
||||
int max_food;
|
||||
struct pchrstr *product;
|
||||
unsigned char *resource;
|
||||
int dep;
|
||||
int n, mult, eff_lost;
|
||||
double cost;
|
||||
|
||||
if (build == 1) {
|
||||
if (!sp->shp_off && budget->money >= 0)
|
||||
shiprepair(sp, np, bp, etus, budget);
|
||||
ship_produce(sp, etus, budget);
|
||||
if (!player->simulation)
|
||||
sp->shp_off = 0;
|
||||
} else {
|
||||
|
|
@ -123,56 +118,12 @@ upd_ship(struct shpstr *sp, int etus, struct bp *bp, int build)
|
|||
}
|
||||
|
||||
if (!player->simulation) {
|
||||
sectp = getsectp(sp->shp_x, sp->shp_y);
|
||||
|
||||
/* produce oil */
|
||||
if (!sp->shp_off && budget->money >= 0
|
||||
&& (mp->m_flags & M_OIL) && sectp->sct_type == SCT_WATER) {
|
||||
product = &pchr[dchr[SCT_OIL].d_prd];
|
||||
oil_gained = roundavg(total_work(100, etus,
|
||||
sp->shp_item[I_CIVIL],
|
||||
sp->shp_item[I_MILIT],
|
||||
sp->shp_item[I_UW],
|
||||
ITEM_MAX)
|
||||
* sp->shp_effic / 100.0
|
||||
* sectp->sct_oil / 100.0
|
||||
* prod_eff(SCT_OIL, sp->shp_tech));
|
||||
max_oil = mp->m_item[I_OIL];
|
||||
if (sp->shp_item[I_OIL] + oil_gained > max_oil)
|
||||
oil_gained = max_oil - sp->shp_item[I_OIL];
|
||||
if (product->p_nrdep != 0 && oil_gained > 0) {
|
||||
resource = (unsigned char *)sectp + product->p_nrndx;
|
||||
if (*resource * 100 < product->p_nrdep * oil_gained)
|
||||
oil_gained = *resource * 100 / product->p_nrdep;
|
||||
dep = roundavg(oil_gained * product->p_nrdep / 100.0);
|
||||
if (CANT_HAPPEN(dep > *resource))
|
||||
dep = *resource;
|
||||
*resource -= dep;
|
||||
}
|
||||
sp->shp_item[I_OIL] += oil_gained;
|
||||
}
|
||||
/* produce fish */
|
||||
if (!sp->shp_off && budget->money >= 0
|
||||
&& (mp->m_flags & M_FOOD) && sectp->sct_type == SCT_WATER) {
|
||||
sp->shp_item[I_FOOD]
|
||||
+= roundavg(total_work(100, etus,
|
||||
sp->shp_item[I_CIVIL],
|
||||
sp->shp_item[I_MILIT],
|
||||
sp->shp_item[I_UW],
|
||||
ITEM_MAX)
|
||||
* sp->shp_effic / 100.0
|
||||
* sectp->sct_fertil / 100.0
|
||||
* prod_eff(SCT_AGRI, sp->shp_tech));
|
||||
}
|
||||
/* feed */
|
||||
if ((n = feed_ship(sp, etus)) > 0) {
|
||||
wu(0, sp->shp_own, "%d starved on %s\n", n, prship(sp));
|
||||
if (n > 10)
|
||||
nreport(sp->shp_own, N_DIE_FAMINE, 0, 1);
|
||||
}
|
||||
max_food = mp->m_item[I_FOOD];
|
||||
if (sp->shp_item[I_FOOD] > max_food)
|
||||
sp->shp_item[I_FOOD] = max_food;
|
||||
/*
|
||||
* do plague stuff. plague can't break out on ships,
|
||||
* but it can still kill people.
|
||||
|
|
@ -316,6 +267,65 @@ shiprepair(struct shpstr *ship, struct natstr *np, struct bp *bp, int etus,
|
|||
ship->shp_effic += (signed char)build;
|
||||
}
|
||||
|
||||
static void
|
||||
ship_produce(struct shpstr *sp, int etus, struct budget *budget)
|
||||
{
|
||||
struct mchrstr *mp = &mchr[sp->shp_type];
|
||||
struct sctstr *sectp = getsectp(sp->shp_x, sp->shp_y);
|
||||
int oil_gained;
|
||||
int max_oil;
|
||||
int max_food;
|
||||
struct pchrstr *product;
|
||||
unsigned char *resource;
|
||||
int dep;
|
||||
|
||||
if (player->simulation)
|
||||
return;
|
||||
|
||||
/* produce oil */
|
||||
if (!sp->shp_off && budget->money >= 0
|
||||
&& (mp->m_flags & M_OIL) && sectp->sct_type == SCT_WATER) {
|
||||
product = &pchr[dchr[SCT_OIL].d_prd];
|
||||
oil_gained = roundavg(total_work(100, etus,
|
||||
sp->shp_item[I_CIVIL],
|
||||
sp->shp_item[I_MILIT],
|
||||
sp->shp_item[I_UW],
|
||||
ITEM_MAX)
|
||||
* sp->shp_effic / 100.0
|
||||
* sectp->sct_oil / 100.0
|
||||
* prod_eff(SCT_OIL, sp->shp_tech));
|
||||
max_oil = mp->m_item[I_OIL];
|
||||
if (sp->shp_item[I_OIL] + oil_gained > max_oil)
|
||||
oil_gained = max_oil - sp->shp_item[I_OIL];
|
||||
if (product->p_nrdep != 0 && oil_gained > 0) {
|
||||
resource = (unsigned char *)sectp + product->p_nrndx;
|
||||
if (*resource * 100 < product->p_nrdep * oil_gained)
|
||||
oil_gained = *resource * 100 / product->p_nrdep;
|
||||
dep = roundavg(oil_gained * product->p_nrdep / 100.0);
|
||||
if (CANT_HAPPEN(dep > *resource))
|
||||
dep = *resource;
|
||||
*resource -= dep;
|
||||
}
|
||||
sp->shp_item[I_OIL] += oil_gained;
|
||||
}
|
||||
/* produce fish */
|
||||
if (!sp->shp_off && budget->money >= 0
|
||||
&& (mp->m_flags & M_FOOD) && sectp->sct_type == SCT_WATER) {
|
||||
sp->shp_item[I_FOOD]
|
||||
+= roundavg(total_work(100, etus,
|
||||
sp->shp_item[I_CIVIL],
|
||||
sp->shp_item[I_MILIT],
|
||||
sp->shp_item[I_UW],
|
||||
ITEM_MAX)
|
||||
* sp->shp_effic / 100.0
|
||||
* sectp->sct_fertil / 100.0
|
||||
* prod_eff(SCT_AGRI, sp->shp_tech));
|
||||
}
|
||||
max_food = mp->m_item[I_FOOD];
|
||||
if (sp->shp_item[I_FOOD] > max_food)
|
||||
sp->shp_item[I_FOOD] = max_food;
|
||||
}
|
||||
|
||||
/*
|
||||
* returns the number who starved, if any.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1030,7 +1030,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
|
|||
0 1 18 -12 6 100 127 0 0 0 0 none 0 "" 0 25 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 10 -14 1 () ""
|
||||
1 1 10 -14 2 100 127 0 31 0 0 none 0 "" 300 25 0 0 0 0 0 0 0 0 100 100 0 0 healthy 0 0 "" 10 -14 1 () ""
|
||||
2 1 10 -14 15 100 127 0 44 0 0 none 0 "" 30 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 10 -14 1 () ""
|
||||
3 1 11 -13 8 100 127 0 51 0 0 none 0 "" 990 0 0 0 0 0 0 0 0 450 0 0 0 0 healthy 0 0 "" 10 -14 1 () ""
|
||||
3 1 11 -13 8 100 127 0 51 0 0 none 0 "" 990 0 0 0 0 0 0 0 0 449 0 0 0 0 healthy 0 0 "" 10 -14 1 () ""
|
||||
4 1 11 -13 1 100 127 0 51 0 0 none 0 "" 300 0 0 0 0 0 0 0 900 0 0 0 0 0 healthy 0 0 "" 10 -14 1 () ""
|
||||
49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
|
||||
/config
|
||||
|
|
|
|||
|
|
@ -13946,7 +13946,7 @@
|
|||
Play#0 output Play#0 1 0 1 18 -12 6 100 127 0 0 0 0 0 0 "" 0 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 10 -14 1 0 ""
|
||||
Play#0 output Play#0 1 1 1 10 -14 2 100 127 0 31 0 0 0 0 "" 300 25 0 0 0 0 0 0 0 0 100 100 0 0 0 0 0 "" 10 -14 1 0 ""
|
||||
Play#0 output Play#0 1 2 1 10 -14 15 100 127 0 44 0 0 0 0 "" 30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 10 -14 1 0 ""
|
||||
Play#0 output Play#0 1 3 1 11 -13 8 100 127 0 51 0 0 0 0 "" 990 0 0 0 0 0 0 0 0 450 0 0 0 0 0 0 0 "" 10 -14 1 0 ""
|
||||
Play#0 output Play#0 1 3 1 11 -13 8 100 127 0 51 0 0 0 0 "" 990 0 0 0 0 0 0 0 0 449 0 0 0 0 0 0 0 "" 10 -14 1 0 ""
|
||||
Play#0 output Play#0 1 4 1 11 -13 1 100 127 0 51 0 0 0 0 "" 300 0 0 0 0 0 0 0 900 0 0 0 0 0 0 0 0 "" 10 -14 1 0 ""
|
||||
Play#0 output Play#0 1 /5
|
||||
Play#0 output Play#0 6 0 640
|
||||
|
|
@ -14096,7 +14096,7 @@
|
|||
Play#1 output Play#1 1 0 1 13 1 6 100 127 0 0 -5 13 0 0 "" 0 25 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 0 ""
|
||||
Play#1 output Play#1 1 1 1 5 -1 2 100 127 0 31 -5 13 0 0 "" 300 25 0 0 0 0 0 0 0 0 100 100 0 0 0 "" 0 ""
|
||||
Play#1 output Play#1 1 2 1 5 -1 15 100 127 0 44 -5 13 0 0 "" 30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 0 ""
|
||||
Play#1 output Play#1 1 3 1 6 0 8 100 127 0 51 -5 13 0 0 "" 990 0 0 0 0 0 0 0 0 450 0 0 0 0 0 "" 0 ""
|
||||
Play#1 output Play#1 1 3 1 6 0 8 100 127 0 51 -5 13 0 0 "" 990 0 0 0 0 0 0 0 0 449 0 0 0 0 0 "" 0 ""
|
||||
Play#1 output Play#1 1 4 1 6 0 1 100 127 0 51 -5 13 0 0 "" 300 0 0 0 0 0 0 0 900 0 0 0 0 0 0 "" 0 ""
|
||||
Play#1 output Play#1 1 /5
|
||||
Play#1 output Play#1 6 0 640
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
budget
|
||||
| BUG: fb#100 won't actually starve
|
||||
| Note: f1#100 not actually built (plague kills off mil)
|
||||
| TODO is it accurate?
|
||||
neweff * ?newd#-
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
config sect
|
||||
owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist ydist avail elev work coastal newdes min gold fert ocontent uran oldown civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad c_dist m_dist s_dist g_dist p_dist i_dist d_dist b_dist f_dist o_dist l_dist h_dist u_dist r_dist c_del m_del s_del g_del p_del i_del d_del b_del f_del o_del l_del h_del u_del r_del mines pstage ptime che che_target fallout access road rail dfense
|
||||
1 0 0 5 100 120 0 0 0 0 0 0 0 0 0 282 0 100 0 5 0 0 0 0 0 1 650 2 0 0 0 0 0 0 84 0 6 34 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
1 0 0 5 100 120 0 0 0 0 0 0 0 0 0 282 0 100 0 5 0 0 0 0 0 1 650 2 0 0 0 0 0 0 84 0 7 33 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
1 2 0 24 100 120 0 0 0 0 0 0 0 2 0 940 0 100 0 24 0 0 0 0 0 1 783 0 0 0 0 0 0 0 0 0 0 0 783 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
1 4 0 24 100 120 0 0 0 0 0 0 0 4 0 1002 0 100 0 24 0 0 0 0 0 1 866 0 0 0 0 0 0 0 0 0 0 0 805 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
1 6 0 24 100 120 0 0 0 0 0 0 0 6 0 1029 0 100 0 24 0 0 0 0 0 1 910 0 0 0 0 0 0 0 1 0 0 0 805 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
|
|
@ -73,7 +73,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
|
|||
1 12 4 4 39 120 0 0 0 0 0 0 0 12 4 39 0 100 0 4 0 0 0 0 0 1 130 0 0 0 0 0 0 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
1 14 4 4 39 120 0 0 0 0 0 0 0 14 4 39 0 100 1 4 0 0 0 0 0 1 130 0 0 0 0 0 0 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
0 16 4 0 0 0 0 0 0 0 0 0 0 16 4 0 0 100 1 0 0 0 10 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
0 18 4 0 0 0 0 0 0 0 0 0 0 18 4 0 0 100 1 0 0 0 100 91 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
0 18 4 0 0 0 0 0 0 0 0 0 0 18 4 0 0 100 1 0 0 0 100 90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
0 20 4 0 0 0 0 0 0 0 0 0 0 20 4 0 0 100 1 0 0 0 100 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
1 -16 4 10 100 120 0 0 0 0 0 0 0 -16 4 9 0 100 1 10 10 0 0 0 0 1 130 1 0 0 0 7 0 0 96 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
1 -14 4 10 100 120 0 0 0 0 0 0 0 -14 4 0 0 100 0 10 100 0 0 0 0 1 130 1 0 0 0 78 0 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
|
|
@ -134,14 +134,14 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
|
|||
6 0 8 5 100 120 0 0 0 0 0 0 0 0 8 395 0 100 1 5 0 0 0 0 0 6 650 20 0 0 0 0 0 0 84 0 400 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
6 2 8 4 100 120 0 0 0 0 0 0 0 2 8 295 0 100 1 4 0 0 0 0 0 6 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
6 4 8 19 100 120 0 0 0 0 0 0 0 4 8 444 0 100 1 19 0 0 0 0 0 6 650 20 0 0 0 0 0 0 83 0 391 396 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
6 6 8 14 100 120 0 0 0 0 0 0 0 6 8 444 0 100 1 14 0 0 0 0 0 6 650 19 0 0 0 0 0 0 84 0 385 396 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
6 6 8 14 100 120 0 0 0 0 0 0 0 6 8 444 0 100 1 14 0 0 0 0 0 6 650 18 0 0 0 0 0 0 84 0 385 396 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
6 8 8 12 100 120 0 0 0 0 0 0 0 8 8 445 0 100 1 12 0 0 0 0 0 6 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
6 10 8 26 100 120 0 0 0 0 0 0 0 10 8 394 0 100 1 26 0 0 0 0 0 6 650 20 0 0 0 0 0 0 84 0 400 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
6 12 8 14 100 120 0 0 0 0 0 0 0 12 8 395 0 100 1 14 0 0 0 0 0 6 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
6 14 8 12 100 120 0 0 0 0 0 0 0 14 8 395 0 100 1 12 0 0 0 0 0 6 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
7 -16 8 4 100 120 0 0 0 0 0 0 0 -16 8 295 0 100 1 4 0 0 0 0 0 7 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
7 -14 8 12 100 120 0 0 0 0 0 0 0 -14 8 395 0 100 1 12 0 0 0 0 0 7 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
7 -12 8 14 100 120 0 0 0 0 0 0 0 -12 8 394 0 100 1 14 0 0 0 0 0 7 650 19 0 0 0 0 0 0 83 0 399 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
7 -12 8 14 100 120 0 0 0 0 0 0 0 -12 8 394 0 100 1 14 0 0 0 0 0 7 650 19 0 0 0 0 0 0 83 0 397 399 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
7 -10 8 26 100 120 0 0 0 0 0 0 0 -10 8 395 0 100 1 26 0 0 0 0 0 7 650 20 0 0 0 0 0 0 84 0 400 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
7 -8 8 12 100 120 0 0 0 0 0 0 0 -8 8 445 0 100 1 12 0 0 0 0 0 7 650 20 0 0 0 0 0 0 83 0 352 368 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
7 -6 8 14 100 120 0 0 0 0 0 0 0 -6 8 445 0 100 1 14 0 0 0 0 0 7 650 20 0 0 0 0 0 0 83 0 400 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
|
||||
|
|
@ -317,16 +317,16 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
|
|||
95 1 14 6 2 100 90 0 200 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
96 7 14 6 2 20 90 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
97 1 14 6 2 40 90 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
100 1 16 4 0 100 90 0 20 0 0 none 0 "" 100 0 0 0 0 0 0 0 38 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
100 1 16 4 0 100 90 0 20 0 0 none 0 "" 50 0 0 0 0 0 0 0 20 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
101 1 18 4 0 100 90 0 20 0 0 none 0 "" 100 0 0 0 0 0 0 0 412 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
102 1 20 4 0 100 90 0 20 0 0 none 0 "" 100 0 0 0 0 0 0 0 7 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
103 1 18 4 0 73 90 0 20 0 0 none 0 "" 100 0 0 0 0 0 0 0 250 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
104 1 18 4 0 33 90 0 20 0 0 none 0 "" 100 0 0 0 0 0 0 0 88 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
103 1 18 4 0 73 90 0 20 0 0 none 0 "" 100 0 0 0 0 0 0 0 303 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
104 1 18 4 0 33 90 0 20 0 0 none 0 "" 100 0 0 0 0 0 0 0 141 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
110 1 16 4 8 100 90 0 50 0 0 none 0 "" 100 0 0 0 0 0 0 0 7 5 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
111 1 18 4 8 100 90 0 50 0 0 none 0 "" 100 0 0 0 0 0 0 0 7 51 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
112 1 20 4 8 100 90 0 50 0 0 none 0 "" 100 0 0 0 0 0 0 0 7 0 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
113 1 18 4 8 65 90 0 50 0 0 none 0 "" 100 0 0 0 0 0 0 0 7 30 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
114 1 18 4 8 25 90 0 50 0 0 none 0 "" 100 0 0 0 0 0 0 0 7 9 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
113 1 18 4 8 65 90 0 50 0 0 none 0 "" 100 0 0 0 0 0 0 0 7 32 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
114 1 18 4 8 25 90 0 50 0 0 none 0 "" 100 0 0 0 0 0 0 0 7 12 0 0 0 0 healthy 0 0 "" 14 6 1 () ""
|
||||
149 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
|
||||
/config
|
||||
config plane
|
||||
|
|
@ -403,7 +403,7 @@ config news
|
|||
actor action victim times duration time
|
||||
4 32 0 10 0 0
|
||||
4 31 0 12 0 0
|
||||
1 34 0 7 0 0
|
||||
1 34 0 8 0 0
|
||||
/config
|
||||
config trade
|
||||
uid owner type unitid price maxbidder markettime xloc yloc
|
||||
|
|
|
|||
|
|
@ -512,6 +512,7 @@
|
|||
Play#0 output Play#0 1 > Production Report dated Thu Jan 1 00:00:00 1970
|
||||
Play#0 output Play#0 1 25 starved on cs cargo ship (#42)
|
||||
Play#0 output Play#0 1 33 starved on cs cargo ship (#43)
|
||||
Play#0 output Play#0 1 50 starved on fb fishing boat (#100)
|
||||
Play#0 output Play#0 1 25 starved in inf infantry #42
|
||||
Play#0 output Play#0 1 33 starved in 1,1.
|
||||
Play#0 output Play#0 1 133 starved in 3,1.
|
||||
|
|
@ -593,7 +594,7 @@
|
|||
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
|
||||
Play#0 output Play#0 1 COMMODITIES deliver-- distribute
|
||||
Play#0 output Play#0 1 sect sgpidbolhr sgpidbolhr sh gun pet iron dust bar oil lcm hcm rad
|
||||
Play#0 output Play#0 1 1 0,0 c .......... .......... 0 0 0 0 0 0 0 6 34 0
|
||||
Play#0 output Play#0 1 1 0,0 c .......... .......... 0 0 0 0 0 0 0 7 33 0
|
||||
Play#0 output Play#0 1 1 2,0 + .......... .......... 0 0 0 0 0 0 0 0 0 0
|
||||
Play#0 output Play#0 1 1 4,0 + .......... .......... 0 0 0 0 0 0 0 0 0 0
|
||||
Play#0 output Play#0 1 1 6,0 + .......... .......... 0 0 0 0 0 0 0 0 0 0
|
||||
|
|
@ -792,11 +793,11 @@
|
|||
Play#0 output Play#0 1 1 95 cs cargo ship 14,6 100% 0 0 0 0 0 0 0 0 90 200
|
||||
Play#0 output Play#0 1 7 96 cs cargo ship 14,6 20% 0 0 0 0 0 0 0 0 90 20
|
||||
Play#0 output Play#0 1 1 97 cs cargo ship 14,6 40% 0 0 0 0 0 0 0 0 90 20
|
||||
Play#0 output Play#0 1 1 100 fb fishing boa 16,4 100% 100 0 0 38 0 0 0 0 90 20
|
||||
Play#0 output Play#0 1 1 100 fb fishing boa 16,4 100% 50 0 0 20 0 0 0 0 90 20
|
||||
Play#0 output Play#0 1 1 101 fb fishing boa 18,4 100% 100 0 0 412 0 0 0 0 90 20
|
||||
Play#0 output Play#0 1 1 102 fb fishing boa 20,4 100% 100 0 0 7 0 0 0 0 90 20
|
||||
Play#0 output Play#0 1 1 103 fb fishing boa 18,4 73% 100 0 0 250 0 0 0 0 90 20
|
||||
Play#0 output Play#0 1 1 104 fb fishing boa 18,4 33% 100 0 0 88 0 0 0 0 90 20
|
||||
Play#0 output Play#0 1 1 103 fb fishing boa 18,4 73% 100 0 0 303 0 0 0 0 90 20
|
||||
Play#0 output Play#0 1 1 104 fb fishing boa 18,4 33% 100 0 0 141 0 0 0 0 90 20
|
||||
Play#0 output Play#0 1 1 110 od oil derrick 16,4 100% 100 0 0 7 0 0 0 0 90 50
|
||||
Play#0 output Play#0 1 1 111 od oil derrick 18,4 100% 100 0 0 7 0 0 0 0 90 50
|
||||
Play#0 output Play#0 1 1 112 od oil derrick 20,4 100% 100 0 0 7 0 0 0 0 90 50
|
||||
|
|
@ -827,7 +828,7 @@
|
|||
Play#0 output Play#0 1 95 cs 14,6 100% 0 0 0 0 0 0 0 0 0 0 0 0 0
|
||||
Play#0 output Play#0 1 96 cs 14,6 20% 0 0 0 0 0 0 0 0 0 0 0 0 0
|
||||
Play#0 output Play#0 1 97 cs 14,6 40% 0 0 0 0 0 0 0 0 0 0 0 0 0
|
||||
Play#0 output Play#0 1 100 fb 16,4 100% 100 0 0 0 0 0 0 0 0 0 0 0 0
|
||||
Play#0 output Play#0 1 100 fb 16,4 100% 50 0 0 0 0 0 0 0 0 0 0 0 0
|
||||
Play#0 output Play#0 1 101 fb 18,4 100% 100 0 0 0 0 0 0 0 0 0 0 0 0
|
||||
Play#0 output Play#0 1 102 fb 20,4 100% 100 0 0 0 0 0 0 0 0 0 0 0 0
|
||||
Play#0 output Play#0 1 103 fb 18,4 73% 100 0 0 0 0 0 0 0 0 0 0 0 0
|
||||
|
|
@ -835,8 +836,8 @@
|
|||
Play#0 output Play#0 1 110 od 16,4 100% 100 0 0 0 0 0 0 0 0 5 0 0 0
|
||||
Play#0 output Play#0 1 111 od 18,4 100% 100 0 0 0 0 0 0 0 0 51 0 0 0
|
||||
Play#0 output Play#0 1 112 od 20,4 100% 100 0 0 0 0 0 0 0 0 0 0 0 0
|
||||
Play#0 output Play#0 1 113 od 18,4 65% 100 0 0 0 0 0 0 0 0 30 0 0 0
|
||||
Play#0 output Play#0 1 114 od 18,4 25% 100 0 0 0 0 0 0 0 0 9 0 0 0
|
||||
Play#0 output Play#0 1 113 od 18,4 65% 100 0 0 0 0 0 0 0 0 32 0 0 0
|
||||
Play#0 output Play#0 1 114 od 18,4 25% 100 0 0 0 0 0 0 0 0 12 0 0 0
|
||||
Play#0 output Play#0 1 30 ships
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input plane 0:31,0:15
|
||||
|
|
@ -1717,7 +1718,7 @@
|
|||
Play#0 output Play#0 1 6 0,8 c 100% 120 .. .. 650 20 0 84 100% 395 0 1
|
||||
Play#0 output Play#0 1 6 2,8 - 100% 120 .. .. 650 20 0 83 100% 295 0 1
|
||||
Play#0 output Play#0 1 6 4,8 f 100% 120 .. .. 650 20 0 83 100% 444 0 1
|
||||
Play#0 output Play#0 1 6 6,8 * 100% 120 .. .. 650 19 0 84 100% 444 0 1
|
||||
Play#0 output Play#0 1 6 6,8 * 100% 120 .. .. 650 18 0 84 100% 444 0 1
|
||||
Play#0 output Play#0 1 6 8,8 h 100% 120 .. .. 650 20 0 83 100% 445 0 1
|
||||
Play#0 output Play#0 1 6 10,8 ! 100% 120 .. .. 650 20 0 84 100% 394 0 1
|
||||
Play#0 output Play#0 1 6 12,8 * 100% 120 .. .. 650 20 0 83 100% 395 0 1
|
||||
|
|
@ -1786,7 +1787,7 @@
|
|||
Play#0 output Play#0 1 sect sgpidbolhr sgpidbolhr sh gun pet iron dust bar oil lcm hcm rad
|
||||
Play#0 output Play#0 1 7 -16,8 - .......... .......... 0 0 0 0 0 0 0 400 400 0
|
||||
Play#0 output Play#0 1 7 -14,8 h .......... .......... 0 0 0 0 0 0 0 400 400 0
|
||||
Play#0 output Play#0 1 7 -12,8 * .......... .......... 0 0 0 0 0 0 0 399 400 0
|
||||
Play#0 output Play#0 1 7 -12,8 * .......... .......... 0 0 0 0 0 0 0 397 399 0
|
||||
Play#0 output Play#0 1 7 -10,8 ! .......... .......... 0 0 0 0 0 0 0 400 400 0
|
||||
Play#0 output Play#0 1 7 -8,8 h .......... .......... 0 0 0 0 0 0 0 352 368 0
|
||||
Play#0 output Play#0 1 7 -6,8 * .......... .......... 0 0 0 0 0 0 0 400 400 0
|
||||
|
|
@ -1828,7 +1829,7 @@
|
|||
Play#0 output Play#0 1 1 2,4 a 100% 0 0 100 0 0
|
||||
Play#0 output Play#0 1 1 4,4 a 100% 0 0 100 0 0
|
||||
Play#0 output Play#0 1 0 16,4 . 0% 0 0 10 9 0
|
||||
Play#0 output Play#0 1 0 18,4 . 0% 0 0 100 91 0
|
||||
Play#0 output Play#0 1 0 18,4 . 0% 0 0 100 90 0
|
||||
Play#0 output Play#0 1 0 20,4 . 0% 0 0 100 100 0
|
||||
Play#0 output Play#0 1 8 sectors
|
||||
Play#0 output Play#0 6 0 640
|
||||
|
|
@ -1840,7 +1841,7 @@
|
|||
Play#0 output Play#0 1 1 8,4 o 100% 0 0 0 9 0
|
||||
Play#0 output Play#0 1 1 10,4 o 100% 0 0 0 92 0
|
||||
Play#0 output Play#0 1 0 16,4 . 0% 0 0 10 9 0
|
||||
Play#0 output Play#0 1 0 18,4 . 0% 0 0 100 91 0
|
||||
Play#0 output Play#0 1 0 18,4 . 0% 0 0 100 90 0
|
||||
Play#0 output Play#0 1 0 20,4 . 0% 0 0 100 100 0
|
||||
Play#0 output Play#0 1 5 sectors
|
||||
Play#0 output Play#0 6 0 640
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue