X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fglobal%2Fland.c;h=e4d2051db2b9b161030fcf935bb5d9f715a5e265;hp=ec648201139ed959e8a0fda52919bf6dca4fc5b3;hb=9b7adfbe;hpb=5f263a7753dc728809ff85c993af975f6c76e61e diff --git a/src/lib/global/land.c b/src/lib/global/land.c index ec6482011..e4d2051db 100644 --- a/src/lib/global/land.c +++ b/src/lib/global/land.c @@ -37,7 +37,7 @@ #include "var.h" #include "land.h" -struct lchrstr lchr[] = { +struct lchrstr lchr[] = { /* name lcm, hcm, mil, gun, shell, tech, $, @@ -47,203 +47,205 @@ struct lchrstr lchr[] = { */ /* ((int)((ETUS*4)/(mil/1000)) is enough food for 3 updates */ -{ 2, - { V_FOOD, V_MILIT }, - { ((int)((ETUS*4)/20)), 20 }, -"cav cavalry", - 10, 5, 0, 0, 0, 30, 500, - 1.2, 0.5, 80, 32, 18, 4, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, - L_RECON|L_LIGHT, - }, + {2, + {V_FOOD, V_MILIT}, + {((int)((ETUS * 4) / 20)), 20}, + "cav cavalry", + 10, 5, 0, 0, 0, 30, 500, + 1.2, 0.5, 80, 32, 18, 4, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, + L_RECON | L_LIGHT, + }, -{ 3, - { V_FOOD, V_SHELL, V_MILIT }, - { ((int)((ETUS)/4)), 1, 25 }, -"linf light infantry", - 8, 4, 0, 0, 0, 40, 300, - 1.0, 1.5, 60, 28, 15, 2, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, - L_ASSAULT|L_LIGHT, -}, + {3, + {V_FOOD, V_SHELL, V_MILIT}, + {((int)((ETUS) / 4)), 1, 25}, + "linf light infantry", + 8, 4, 0, 0, 0, 40, 300, + 1.0, 1.5, 60, 28, 15, 2, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, + L_ASSAULT | L_LIGHT, + }, -{ 2, - { V_FOOD, V_MILIT }, - { ((int)((ETUS*4)/10)), 100 }, -"inf infantry", - 10, 5, 0, 0, 0, 50, 500, - 1.0, 1.5, 60, 25, 15, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - L_ASSAULT|L_LIGHT, -}, + {2, + {V_FOOD, V_MILIT}, + {((int)((ETUS * 4) / 10)), 100}, + "inf infantry", + 10, 5, 0, 0, 0, 50, 500, + 1.0, 1.5, 60, 25, 15, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, + L_ASSAULT | L_LIGHT, + }, -{ 3, - { V_FOOD, V_SHELL, V_MILIT }, - { ((int)((ETUS*5)/5)), 8, 100 }, -"mtif motor inf", - 15, 10, 0, 0, 0, 190, 400, - 1.2, 2.2, 60, 33, 17, 1, 3, 0, 0, 0, 2, 3, 13, 1, 0, 0, - L_LIGHT, -}, + {3, + {V_FOOD, V_SHELL, V_MILIT}, + {((int)((ETUS * 5) / 5)), 8, 100}, + "mtif motor inf", + 15, 10, 0, 0, 0, 190, 400, + 1.2, 2.2, 60, 33, 17, 1, 3, 0, 0, 0, 2, 3, 13, 1, 0, 0, + L_LIGHT, + }, -{ 3, - { V_FOOD, V_SHELL, V_MILIT }, - { ((int)((ETUS*5)/5)), 8, 100 }, -"mif mech inf", - 15, 10, 0, 0, 0, 190, 800, - 1.5, 2.5, 50, 33, 17, 1, 3, 0, 0, 0, 2, 3, 13, 1, 0, 0, - L_LIGHT, -}, + {3, + {V_FOOD, V_SHELL, V_MILIT}, + {((int)((ETUS * 5) / 5)), 8, 100}, + "mif mech inf", + 15, 10, 0, 0, 0, 190, 800, + 1.5, 2.5, 50, 33, 17, 1, 3, 0, 0, 0, 2, 3, 13, 1, 0, 0, + L_LIGHT, + }, -{ 3, - { V_FOOD, V_SHELL, V_MILIT }, - { ((int)((ETUS*5)/5)), 4, 100 }, -"mar marines", - 10, 5, 0, 0, 0, 140,1000, - 1.4, 2.4, 60, 25, 14, 2, 1, 0, 0, 0, 1, 2, 0, 0, 0, 0, - L_MARINE|L_ASSAULT|L_LIGHT, -}, + {3, + {V_FOOD, V_SHELL, V_MILIT}, + {((int)((ETUS * 5) / 5)), 4, 100}, + "mar marines", + 10, 5, 0, 0, 0, 140, 1000, + 1.4, 2.4, 60, 25, 14, 2, 1, 0, 0, 0, 1, 2, 0, 0, 0, 0, + L_MARINE | L_ASSAULT | L_LIGHT, + }, -{ 10, - { V_SHELL,V_GUN,V_FOOD,V_LCM,V_HCM,V_DUST,V_BAR,V_IRON,V_PETROL,V_MILIT}, - { 200, 10, 300, 200, 100, 100, 10, 100, 300, 25}, -"sup supply", - 10, 5, 0, 0, 0, 50, 500, - 0.1, 0.2, 80, 25, 20, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - L_LIGHT|L_SUPPLY, -}, + {10, + {V_SHELL, V_GUN, V_FOOD, V_LCM, V_HCM, V_DUST, V_BAR, V_IRON, + V_PETROL, V_MILIT}, + {200, 10, 300, 200, 100, 100, 10, 100, 300, 25}, + "sup supply", + 10, 5, 0, 0, 0, 50, 500, + 0.1, 0.2, 80, 25, 20, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + L_LIGHT | L_SUPPLY, + }, -{ 12, - { V_SHELL,V_GUN,V_FOOD,V_LCM,V_HCM,V_DUST,V_BAR,V_IRON,V_PETROL,V_MILIT,V_OIL,V_RAD}, - { 990, 200, 990, 990, 990, 500, 100, 500, 990, 990, 990, 150}, -"tra train", - 100, 50, 0, 0, 0, 40, 3500, - 0.0, 0.0, 120, 10, 25, 3, 0, 0, 0, 0, 0, 0, 0, 0, 5, 12, - L_XLIGHT|L_TRAIN|L_HEAVY|L_SUPPLY, -}, + {12, + {V_SHELL, V_GUN, V_FOOD, V_LCM, V_HCM, V_DUST, V_BAR, V_IRON, + V_PETROL, V_MILIT, V_OIL, V_RAD}, + {990, 200, 990, 990, 990, 500, 100, 500, 990, 990, 990, 150}, + "tra train", + 100, 50, 0, 0, 0, 40, 3500, + 0.0, 0.0, 120, 10, 25, 3, 0, 0, 0, 0, 0, 0, 0, 0, 5, 12, + L_XLIGHT | L_TRAIN | L_HEAVY | L_SUPPLY, + }, -{ 0, - { V_FOOD }, - { 0, }, -"spy infiltrator", - 10, 5, 0, 0, 0, 40, 750, - 0.0, 0.0, 80, 32, 18, 4, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, - L_ASSAULT|L_RECON|L_LIGHT|L_SPY, - }, + {0, + {V_FOOD}, + {0,}, + "spy infiltrator", + 10, 5, 0, 0, 0, 40, 750, + 0.0, 0.0, 80, 32, 18, 4, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, + L_ASSAULT | L_RECON | L_LIGHT | L_SPY, + }, -{ 1, - { V_SHELL }, - { 3, }, -"com commando", - 10, 5, 0, 0, 0, 55, 1500, - 0.0, 0.0, 80, 32, 18, 4, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, - L_ASSAULT|L_RECON|L_LIGHT|L_SPY, - }, + {1, + {V_SHELL}, + {3,}, + "com commando", + 10, 5, 0, 0, 0, 55, 1500, + 0.0, 0.0, 80, 32, 18, 4, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, + L_ASSAULT | L_RECON | L_LIGHT | L_SPY, + }, -{ 3, - { V_FOOD, V_SHELL, V_MILIT }, - { ((int)((ETUS)/5)), 5, 20 }, -"aau aa unit", - 20, 10, 0, 0, 0, 70, 500, - 0.5, 1.0, 60, 18, 20, 1, 1, 0, 0, 0, 1, 2, 0, 0, 0, 0, - L_FLAK|L_LIGHT, -}, + {3, + {V_FOOD, V_SHELL, V_MILIT}, + {((int)((ETUS) / 5)), 5, 20}, + "aau aa unit", + 20, 10, 0, 0, 0, 70, 500, + 0.5, 1.0, 60, 18, 20, 1, 1, 0, 0, 0, 1, 2, 0, 0, 0, 0, + L_FLAK | L_LIGHT, + }, -{ 4, - { V_FOOD, V_SHELL, V_MILIT, V_GUN}, - { ((int)((ETUS*4)/10)), 40, 25, 10 }, -"art artillery", - 20, 10, 0, 0, 0, 35, 800, - 0.1, 0.4, 70, 18, 20, 1, 0, 8, 50, 5, 2, 1, 0, 0, 0, 0, - L_LIGHT, -}, + {4, + {V_FOOD, V_SHELL, V_MILIT, V_GUN}, + {((int)((ETUS * 4) / 10)), 40, 25, 10}, + "art artillery", + 20, 10, 0, 0, 0, 35, 800, + 0.1, 0.4, 70, 18, 20, 1, 0, 8, 50, 5, 2, 1, 0, 0, 0, 0, + L_LIGHT, + }, -{ 4, - { V_FOOD, V_SHELL, V_MILIT, V_GUN }, - { ((int)((ETUS*4)/20)), 20, 25, 6 }, -"lat lt artillery", - 20, 10, 0, 0, 0, 70, 500, - 0.2, 0.6, 60, 30, 18, 1, 1, 5, 10, 3, 1, 1, 0, 0, 0, 0, - L_LIGHT, -}, + {4, + {V_FOOD, V_SHELL, V_MILIT, V_GUN}, + {((int)((ETUS * 4) / 20)), 20, 25, 6}, + "lat lt artillery", + 20, 10, 0, 0, 0, 70, 500, + 0.2, 0.6, 60, 30, 18, 1, 1, 5, 10, 3, 1, 1, 0, 0, 0, 0, + L_LIGHT, + }, -{ 4, - { V_FOOD, V_SHELL, V_MILIT, V_GUN }, - { ((int)((ETUS*4)/10)), 80, 25, 12 }, -"hat hvy artillery", - 40, 20, 0, 0, 0, 100, 800, - 0.0, 0.2, 60, 12, 20, 1, 0, 11, 99, 8, 4, 1, 0, 0, 0, 0, - 0, -}, + {4, + {V_FOOD, V_SHELL, V_MILIT, V_GUN}, + {((int)((ETUS * 4) / 10)), 80, 25, 12}, + "hat hvy artillery", + 40, 20, 0, 0, 0, 100, 800, + 0.0, 0.2, 60, 12, 20, 1, 0, 11, 99, 8, 4, 1, 0, 0, 0, 0, + 0, + }, -{ 4, - { V_FOOD, V_SHELL, V_MILIT, V_GUN }, - { ((int)((ETUS*5)/20)), 40, 25, 10 }, -"mat mech artillery", - 20, 10, 0, 0, 0, 200, 1000, - 0.2, 0.6, 50, 35, 17, 1, 1, 8, 35, 6, 3, 3, 13, 1, 0, 0, - L_LIGHT, -}, + {4, + {V_FOOD, V_SHELL, V_MILIT, V_GUN}, + {((int)((ETUS * 5) / 20)), 40, 25, 10}, + "mat mech artillery", + 20, 10, 0, 0, 0, 200, 1000, + 0.2, 0.6, 50, 35, 17, 1, 1, 8, 35, 6, 3, 3, 13, 1, 0, 0, + L_LIGHT, + }, -{ 3, - { V_FOOD, V_SHELL, V_MILIT }, - { ((int)((ETUS*4)/20)), 3, 20}, -"eng engineer", - 10, 5, 0, 0, 0, 130,3000, - 1.2, 2.4, 50, 25, 14, 2, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, - L_ENGINEER|L_ASSAULT|L_LIGHT, -}, + {3, + {V_FOOD, V_SHELL, V_MILIT}, + {((int)((ETUS * 4) / 20)), 3, 20}, + "eng engineer", + 10, 5, 0, 0, 0, 130, 3000, + 1.2, 2.4, 50, 25, 14, 2, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, + L_ENGINEER | L_ASSAULT | L_LIGHT, + }, -{ 3, - { V_FOOD, V_SHELL, V_MILIT }, - { ((int)((ETUS*5)/20)), 4, 20 }, -"meng mech engineer", - 10, 5, 0, 0, 0, 260,4500, - 1.8, 3.5, 45, 33, 15, 3, 3, 0, 0, 0, 1, 5, 25, 2, 0, 0, - L_ENGINEER|L_ASSAULT|L_LIGHT, -}, + {3, + {V_FOOD, V_SHELL, V_MILIT}, + {((int)((ETUS * 5) / 20)), 4, 20}, + "meng mech engineer", + 10, 5, 0, 0, 0, 260, 4500, + 1.8, 3.5, 45, 33, 15, 3, 3, 0, 0, 0, 1, 5, 25, 2, 0, 0, + L_ENGINEER | L_ASSAULT | L_LIGHT, + }, -{ 3, - { V_FOOD, V_SHELL,V_MILIT }, - { ((int)((ETUS*5)/10)), 4, 50}, -"lar lt armor", - 10, 5, 0, 0, 0, 150, 600, - 2.0, 1.0, 50, 42, 15, 4, 4, 0, 0, 0, 1, 2, 25, 1, 0, 0, - L_RECON|L_LIGHT, -}, + {3, + {V_FOOD, V_SHELL, V_MILIT}, + {((int)((ETUS * 5) / 10)), 4, 50}, + "lar lt armor", + 10, 5, 0, 0, 0, 150, 600, + 2.0, 1.0, 50, 42, 15, 4, 4, 0, 0, 0, 1, 2, 25, 1, 0, 0, + L_RECON | L_LIGHT, + }, -{ 3, - { V_FOOD, V_SHELL, V_MILIT }, - { ((int)((ETUS*4)/5)), 3, 100 }, -"har hvy armor", - 20, 10, 0, 0, 0, 120, 500, - 2.0, 0.8, 50, 18, 17, 1, 1, 0, 0, 0, 2, 1, 10, 2, 0, 0, - 0, -}, + {3, + {V_FOOD, V_SHELL, V_MILIT}, + {((int)((ETUS * 4) / 5)), 3, 100}, + "har hvy armor", + 20, 10, 0, 0, 0, 120, 500, + 2.0, 0.8, 50, 18, 17, 1, 1, 0, 0, 0, 2, 1, 10, 2, 0, 0, + 0, + }, -{ 3, - { V_FOOD, V_SHELL, V_MILIT}, - { ((int)((ETUS*5)/10)), 4, 50 }, -"arm armor", - 20, 10, 0, 0, 0, 170,1000, - 3.0, 1.5, 40, 33, 16, 2, 2, 0, 0, 0, 1, 2, 13, 1, 0, 0, - L_LIGHT, -}, + {3, + {V_FOOD, V_SHELL, V_MILIT}, + {((int)((ETUS * 5) / 10)), 4, 50}, + "arm armor", + 20, 10, 0, 0, 0, 170, 1000, + 3.0, 1.5, 40, 33, 16, 2, 2, 0, 0, 0, 1, 2, 13, 1, 0, 0, + L_LIGHT, + }, -{ 3, - { V_FOOD, V_SHELL, V_MILIT }, - { ((int)((ETUS*5)/10)), 4, 50 }, -"sec security", - 10, 5, 0, 0, 0, 170, 600, - 1.0, 2.0, 60, 25, 15, 2, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, - L_SECURITY|L_LIGHT, -}, + {3, + {V_FOOD, V_SHELL, V_MILIT}, + {((int)((ETUS * 5) / 10)), 4, 50}, + "sec security", + 10, 5, 0, 0, 0, 170, 600, + 1.0, 2.0, 60, 25, 15, 2, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, + L_SECURITY | L_LIGHT, + }, -{ 2, - { V_FOOD, V_MILIT }, - { ((int)((ETUS*5)/40)), 10 }, -"rad radar unit", - 10, 5, 0, 0, 0, 270,1000, - 0.0, 0.0, 50, 33, 15, 3, 0, 0, 0, 0, 0, 2, 25, 2, 1, 0, - L_XLIGHT|L_RADAR|L_LIGHT, -}, + {2, + {V_FOOD, V_MILIT}, + {((int)((ETUS * 5) / 40)), 10}, + "rad radar unit", + 10, 5, 0, 0, 0, 270, 1000, + 0.0, 0.0, 50, 33, 15, 3, 0, 0, 0, 0, 0, 2, 25, 2, 1, 0, + L_XLIGHT | L_RADAR | L_LIGHT, + }, /* name lcm, hcm, mil, gun, shell, tech, $, @@ -252,15 +254,14 @@ struct lchrstr lchr[] = { cargo */ -{ 0, - { 0 }, - { 0 }, -"", - 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -} + {0, + {0}, + {0}, + "", + 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, + } }; -int lnd_maxno = (sizeof(lchr) / sizeof(struct lchrstr)) - 1; - +int lnd_maxno = (sizeof(lchr) / sizeof(struct lchrstr)) - 1;