Commit Graph

10348 Commits

Author SHA1 Message Date
1bb3438450 Add missing round to cf04bad4bc, refs #3841.
This was SVN commit r18537.
2016-07-20 23:55:25 +00:00
ec3200dfee Session and lobby cleanup.
Remove unused variable label and rating.
Remove hardcoded group limit of 10.
Inline pointless constant guiName.

This was SVN commit r18535.
2016-07-20 16:21:42 +00:00
d7d0a7f869 Submit and display more information about matches in the lobby. Patch by Imarok, refs #3476.
Includes team numbers, online/offline- and won/defeated state, AI type
and difficulty for running games and
only the playernames with observer-player distinction in the gamesetup.
Use JSON format inside the XML stanza and minimize traffic by packing
teams.

Use the observer distinction to correctly apply the "full games" trigger
in the lobby, fixes #3143.

XPartaMupp patch applied by scythetwirler.
unescapeText function by sanderd17, refs #3409.

This was SVN commit r18534.
2016-07-20 16:04:23 +00:00
cf04bad4bc Ingame summary screen and allied resource / population tooltips for active players. Patch by Imarok, also reviewed by fatherbushido and discussed with mimo, fixes #3841.
Shows (only) the stats of the current player in the summary screen while
playing.
Also shows those of mutual allies too if the shared vision tech is
researched.
Display the resources and population counts of allies in the tooltips of
the top panel.
Use a sprintf for the pop / limit ratio and remove hardcoded resource
strings in the XML, refs #3934.

This was SVN commit r18533.
2016-07-20 01:22:07 +00:00
fa7e0c10ba fix a call to DeleteEntityAndReturn with undefined arguments, + some cleanup, refs #2706
This was SVN commit r18532.
2016-07-19 18:25:31 +00:00
01ff2fb0e0 petra: reset some collections only if needed
This was SVN commit r18531.
2016-07-19 17:26:03 +00:00
a498d18738 Fix a stronghold placement bug. Patch by _kali, fixes #4088.
Furthermore add two TODOs about other known placement bugs and
don't enforce close player placement if the team consists of only two
players,
since controlling much territory is more important than having a
neighboring allied CC close by.

This was SVN commit r18530.
2016-07-19 15:33:05 +00:00
2feeda802d Show the garrisoned healrate in tooltips, revealing not necessarily intuitive rates for special buildings and ships.
This was SVN commit r18529.
2016-07-19 13:19:37 +00:00
d0639c4df6 Ram garrison balancing.
Garrison up to 10 men in rams and 12 in persian ones, in order to
have a greater chance of attacking enemies with many melee champs
defending,
since the new balancing in alpha 21 requires siege engines to destroy
buildings, see d38adc7cd0 and 27c46a0a68.

Remove undocumented garrisoned healrate of rams introduced in
d1ed264c9b.
That commit introduced it in many places, which were removed in later
commits.

Leave the positive garrisoned healrate of ships and special buildings
for now,
assuming that there are supplies on ships (but not in rams).

Add garrisoned healrate tooltips in the following commit.

This was SVN commit r18528.
2016-07-19 13:17:02 +00:00
9132fd4406 petra: try to improve detection of inaccessible targets
This was SVN commit r18526.
2016-07-17 18:28:20 +00:00
df55f73894 ai: remove a useless argument
This was SVN commit r18525.
2016-07-17 17:10:01 +00:00
ea3492a9a5 Fix averaging of heightmaps which broke on giant mapsizes. Thanks Sandarac for reporting.
This was SVN commit r18524.
2016-07-17 12:59:10 +00:00
33e3e6c2ab Three new random map scripts by _kali showing actual geographical regions: Amazon, Mediterranean and Red Sea.
Includes a water and skyset fix by niektb. Partially reviewed by FeXoR.
Like last time, commits can be found at
https://github.com/0ADMods/maps_random_by_kali

This was SVN commit r18523.
2016-07-15 19:39:42 +00:00
a83f2a376b Update the idle-worker hotkeys as they were changed in ff6b80305c. Patch by andy5995, reviewed by Itms, fixes #4089, see also 4eea798d79.
This was SVN commit r18521.
2016-07-14 02:09:35 +00:00
82f1987114 Clean an out-of-scope variable usage. Patch by Stan.
This was SVN commit r18520.
2016-07-14 01:58:05 +00:00
1459fe0f8e Nuke a confusing warning that is thrown everytime the host selects a map that the clients done have.
This was SVN commit r18519.
2016-07-13 23:09:29 +00:00
6ade29d0da Rename DeleteMessages to DeleteWonderVictoryMessages to help distinguish it from possible other trigger script methods (ced8ceed47).
This was SVN commit r18518.
2016-07-13 18:42:35 +00:00
df18564038 Merge duplicate big house templates. Patch by Sandarac, reviewed by mimo, fixes #4100.
While at it, remove the revert of the
civbonus_hellenic_architecture.json in the hellenic house templates
(1091 Health * 1,1 = 1200 Health),
since the templates should be independent from the number of the json
file (thus restore the missing 10% bonus for hellenic houses).
Construct big houses in 50 (respectively 55) seconds instead of 60
seconds for the same reason (and using a number that is more round than
53 without increasing the buildtime).

This was SVN commit r18517.
2016-07-13 18:09:08 +00:00
224fec3954 petra: techCostMultiplier applies only to techs and not to trained units
This was SVN commit r18516.
2016-07-13 13:28:53 +00:00
ec1de0eac1 Small fix to the previous commit. The variable was unused and overwritten, thus hiding the issue.
This was SVN commit r18515.
2016-07-13 07:03:47 +00:00
ced8ceed47 Properly handle wonder victory messages after a player has won.
Patch by Sandarac, reviewed by elexis, fixes #4010

This was SVN commit r18514.
2016-07-13 06:51:59 +00:00
d29806ff2d Structure tree cleanup.
Use Math.max/min and quote object keys for the wallpiece parsing.

This was SVN commit r18513.
2016-07-13 02:02:47 +00:00
92bf34d68d Fix duplicate lobby rating transfer due to the report being sent for every player instead of only the local player, refs 9f796068f8, #4013.
This is still a bug in XPartaMupp as that should in theory avoid
obviously invalid reports
(defeating players twice in the 'simulation' of the lobby bot).

This was SVN commit r18512.
2016-07-12 11:24:46 +00:00
4c0f12bce3 Fix autostart replays following a23884d79a by grabbing g_GameAttributes from the simulation instead of the GUI. Patch by Imarok, refs #3143.
Don't remove attribs from the init attributes as that is still used by
the loading screen to show the mapname.

This was SVN commit r18510.
2016-07-12 01:49:48 +00:00
cab6a8c633 Prevent fishing ships from trying to attack entities besides fauna, refs #4092.
This was SVN commit r18509.
2016-07-11 23:55:07 +00:00
c1eff53eab Complete the previous commit to account for both rmlib2 files.
This was SVN commit r18508.
2016-07-11 18:01:01 +00:00
2d3a9b1a55 Use var instead of const in rmgen2 and fix a typo. Reported by FeXoR, patch by elexis
This was SVN commit r18507.
2016-07-11 17:40:05 +00:00
3d7c6981ca Fix a too early return and a wrong negation in the attack component "cleanup" of a09c59e044 that broke RestrictedClasses, thus stopped violent animals from attacking. Remove an unneeded space. Slaughter two if-statements whose condition is never satisfied (due to GetAttackTypes never returning that item) introduced in 092206b12e and ef4a1e261c.
Patch by elexis

This was SVN commit r18506.
2016-07-11 17:25:19 +00:00
4eea798d79 Add descriptions for the Shift modifier. Patch by andy5995
This was SVN commit r18504.
2016-07-10 18:02:16 +00:00
73d62fb903 make the ai use allied dropsites when shared, fixes #4085
This was SVN commit r18503.
2016-07-10 17:44:48 +00:00
800662ec63 Walls templates cleanup. Use relative templates for Health. Let gates inherit the long wall template instead of the defensive structure template to reduce redundancy / duplicate entries. Remove unused costs as gate is a wall upgrade. Let a non zero cost build time to gate to fix infinite repair rate, ref #3707, #3811.
This was SVN commit r18502.
2016-07-09 21:50:25 +00:00
ca76fb5053 finetune the load savedgame layout of f7ff2f2e99
This was SVN commit r18501.
2016-07-09 18:24:00 +00:00
e38665d7a6 Use decimals instead of integers to allow relative templates for resource costs, as proposed by sanderd17, fixes #3818. Use relative templates following 68f87cb556.
This was SVN commit r18500.
2016-07-08 15:33:50 +00:00
ff4e751dce petra cleanup
This was SVN commit r18499.
2016-07-08 15:13:04 +00:00
84fae4baeb Fix lineendings for all map files.
This was SVN commit r18498.
2016-07-08 08:42:49 +00:00
c8c7dbc6a4 Fix missing actor.
This was SVN commit r18497.
2016-07-08 08:28:16 +00:00
90f0e32f84 Mauryan wall to gate conversion costs wood instead of stone as they are made of wood.
This was SVN commit r18495.
2016-07-07 10:28:31 +00:00
8f0439b016 Remove one array with hardcoded resources used for icons in tooltips. Patch by s0600204, refs #3934.
This was SVN commit r18494.
2016-07-07 01:32:41 +00:00
888a281552 Complete rename of 9d20881ef4.
This was SVN commit r18493.
2016-07-07 01:22:03 +00:00
275be69883 Fix missing this-reference in 9d20881ef4 and update gamesetup following a874b3c1c3.
This was SVN commit r18492.
2016-07-07 00:10:26 +00:00
20866bd9d8 petra cleanup
This was SVN commit r18491.
2016-07-06 18:51:43 +00:00
db3f332aa4 Stan's Ptolemaic military colony and a few updates I forgot to commit with the seleucid blacksmith
This was SVN commit r18490.
2016-07-06 14:49:07 +00:00
05195d0692 apply leaveFoundation to enemies when under ceaseFire, fixes #3667, patch by Sandarac
This was SVN commit r18488.
2016-07-05 17:13:35 +00:00
4fc8dc517f Delete command improvements and bugfixes.
Allow deleting of miraged foundations.
Add component method to set units undeletable. Based on patch by bb,
refs #3102.
If the control-all-units cheat is active, delete sheep, mostly captured
buildings and undeletable units.
Merge duplicate delete checks in the GUI. Thereby take into account the
control-all-units cheat and undeletability in all places.
Disable the delete button if the entity can't be deleted.
Add a tooltip for undeletability.
Don't colorize whitespace.
Remove unneeded comments.

This was SVN commit r18487.
2016-07-05 01:17:07 +00:00
5769321038 Show selection panels of other players in case the control-all-units cheat is active.
This was SVN commit r18486.
2016-07-05 00:51:15 +00:00
d9fa069ee7 Fix session implementation of the splash tooltip of 22b72a362b and related cleanup.
Add comments to document that GetEntityState and GetTemplateDataHelper
need to use the same object structure.
Remove four unneeded conditionals that are always true from
GetTemplateDataHelper.
Inline 3 splash damage variables in the attack component.

This was SVN commit r18485.
2016-07-04 22:16:35 +00:00
de8bb7fe28 Skirmish map "Dueling Cliffs" by scythetwirler, reworked by niektb.
This was SVN commit r18483.
2016-07-04 02:45:27 +00:00
afa4b0cba1 Fix autocomplete in gamesetup, see 09fdf716e9. Thanks echotangoecho for reporting.
This was SVN commit r18482.
2016-07-03 20:53:43 +00:00
437cc13b95 Make charge attack unavailable from the simulation.
The order change to GetAttackTypes in a09c59e044 revealed that it was
only the GUI not triggering the buggy code.
Eliminate for-each of UnitAI calling that function.

This was SVN commit r18481.
2016-07-03 20:41:03 +00:00
0f38095dfd Remove the outdated tooltip following 0624045e6c.
This was SVN commit r18480.
2016-07-03 20:40:19 +00:00