Commit Graph

10388 Commits

Author SHA1 Message Date
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
d99c5ce064 Fix typo.
This was SVN commit r18479.
2016-07-03 11:25:59 +00:00
bbe75c14f8 Implements the ai changes from s0600204 resource-agnostic patch, refs #3934
This was SVN commit r18478.
2016-07-03 10:26:34 +00:00
22b72a362b Splash damage tooltip.
This was SVN commit r18477.
2016-07-03 04:08:52 +00:00
0624045e6c Train women from houses in village phase, as that's typically the only time when they are trained.
This was SVN commit r18476.
2016-07-03 03:13:50 +00:00
fe8b65b708 Show the actual walk speed in the ingame tooltip. Patch by fatherbushido.
This was SVN commit r18475.
2016-07-03 02:25:57 +00:00
0fd2c517f5 Lobby cleanup.
Cache the viewed profile directly.
Remove the rating check since it is always true ("-2" used if the rating
doesn't exist).

This was SVN commit r18474.
2016-07-03 02:14:03 +00:00
02f89aad41 Fix wrong variable declaration in 8d9255eaee and merge duplicate, as reported by mimo.
This was SVN commit r18473.
2016-07-03 02:01:00 +00:00
2a3d380e75 Upgrade component cleanup, refs #2706.
Use the cheat multiplier for upgrading and un/packing.
Remove if-statements that are always true.
Remove unused undefined "time" item from array in the selection panel.
Pass that object directly instead of copying each property explicitly.
Various indentation fixes in the selection panel code.

This was SVN commit r18472.
2016-07-03 01:50:55 +00:00
c24b6b582d Fix tests. Patch by fatherbushido, refs #2706.
Some simplifications and array functions.
Fix indentation, thanks pastebin.

This was SVN commit r18471.
2016-07-02 21:32:09 +00:00
f468ac936b Fix to the upgrade commit, including one by fatherbushido. Refs #2706
This was SVN commit r18470.
2016-07-02 16:05:56 +00:00
967a500d37 Fix Roman Siege Wall after b2f4b0f494. Patch by fatherbushido.
This was SVN commit r18469.
2016-07-02 08:35:31 +00:00
b2f4b0f494 Allow entities to upgrade into other entities.
This new components allows giving the upgrade a cost, required
technologies, and a required time.
Implement gates using this generic component.
Fixes #2706

This was SVN commit r18467.
2016-07-01 19:43:26 +00:00
1276b98965 Argh.
This was SVN commit r18466.
2016-07-01 15:18:09 +00:00
a09c59e044 Attack component cleanup.
Use .filter(), .every() and .some() to simplify, Math.max/min instead of
if-statements, inline functions, add newlines and allow attack orders
while flying.

This was SVN commit r18465.
2016-07-01 15:05:09 +00:00
9d20881ef4 Update healer tooltips to also show up in the selection details with actual values from the simulation. Based on patch by fatherbushido, fixes #4026.
Also clean up the Health component.
Rename healer to heal (as that is the actual component name).
Remove the structure tree code to replace a proper Templates.js
implementation.

This was SVN commit r18464.
2016-07-01 13:32:34 +00:00
bb69a6fb86 Tooltip cleanup.
Use toFixed instead of round hacks, refs #3395.
Show one more digit in the speed tooltip.

This was SVN commit r18463.
2016-07-01 10:37:01 +00:00
e611dd6993 Remove unneeded population bonus tooltip strings. Patch by fatherbushido, refs dde2cd38be.
This was SVN commit r18462.
2016-07-01 10:03:14 +00:00
1e5d67b6bb Fix missing replacement in 4d9565297d. Thanks Imarok for reporting.
This was SVN commit r18460.
2016-06-30 12:30:36 +00:00
b134047abe Also add a reset-teams button for consistency, refs #3805.
This was SVN commit r18459.
2016-06-30 12:03:37 +00:00
b642f0d876 Persist the the valid subset of chosen player settings when changing the skirmish map. Patch by Offensive ePeen, refs #3120.
This was SVN commit r18458.
2016-06-30 10:02:32 +00:00
e6e8efec1c Tooltip cleanup.
Remove duplicate arguments from the helper function to get the
template/entity data.

This was SVN commit r18457.
2016-06-30 02:12:26 +00:00
ef9eb787be Remove wrong space from 4d9565297d.
This was SVN commit r18456.
2016-06-30 02:11:30 +00:00
1114afa939 Garrison tooltips by fatherbushido.
Show how many units can be garrisoned, the number of arrows shot by
default, per unit and limit, fixes #3816.
Thus remove a lot of hardcoded numbers in the translated strings and
correct a wrong number for the mauryan ship, fixes #3904.

This was SVN commit r18455.
2016-06-30 01:31:40 +00:00
4d9565297d Tooltip overhaul.
Also contains a patch by fatherbushido for attackRateDetails and
getAttackTooltip to
not show something broken for buildingAI units that can capture, fixes
#4061 (see #4000).

Make tooltip functions uniform.
  Pass template everywhere
    instead of template.armour in getArmorTooltip
    rate in getRepairRateTooltip and getBuildRateTooltip and
    entState in attackRateDetails.
  Add an early return for every tooltip function.
    Use empty string instead of "Armor: (None)" for trees etc..
  Don't prefix tooltip return values with "\n", but let the user of that
function add them.
  Thus make tooltip concatenation much nicer (f.e. draw.js).

Use a loop instead of duplicating per damage type in damageTypesToText.
Add font functions to avoid duplicating tag code.
Merge sprintf's and inline variables.
Add few TODOs.

Fix some strings:
  Use "%(specificName)s %(fontStart)s(%(genericName)s)%(fontEnd)s")
instead of "(" + foo + ")" ...
  Use existing "%(percentage)s%%" instead of foo + "%" in
armorLevelToPercentageString.

Remove
 duplication by calling/introducing shared functions (getEntityTooltip,
getHealthTooltip, getGatherTooltip, getVisibleEntityClassesFormatted),
 unused function damageTypeDetails which was also a duplicate of
damageTypesToText,
 unused function damageValues,
 some warns that are equivalent to errors they attempt to cover up
(getAttackTypeLabel, getCostComponentDisplayIcon, getEntityNames,
getEntityNamesFormatted),
 some unused variables,
 "???" and translate("???").

Don't fix translate("Foo:") strings to avoid a lot of translation work.

This was SVN commit r18454.
2016-06-30 01:16:09 +00:00
30c7a2ef18 Remove gathering capacity from elephant archers as they are way too clumsy for that (as they would use the melee/slaughter attack too).
It might be unexpected in the first place to let them gather.
(However that is not really weirder than having cavalry hunt sheep.)

This was SVN commit r18453.
2016-06-29 13:35:20 +00:00
a23884d79a Cache gameAttributes in the session. Patch by Imarok, refs #3143, #3263.
This was SVN commit r18452.
2016-06-29 01:45:20 +00:00
d30ee0292b Fixes a bug in random map library placer.js function SimpleObject.place() that placed entities outside of the playable map area. Add a constant MAP_BORDER_WIDTH to remove magic numbers. Also removed some unneeded brackets in the changed files. Fixes 4012
This was SVN commit r18450.
2016-06-28 11:37:56 +00:00
0f1cef8766 Code cleanup of random map lib map.js.
This was SVN commit r18449.
2016-06-27 22:42:12 +00:00
9b3ec336fe Make non-refraction water less transparent.
This was SVN commit r18448.
2016-06-27 13:50:54 +00:00
d60d7d7da6 pow is behaving in undefined ways for negative numbers and this lead to issues on nvidia and amd. Fix this and comment for future reference. Thanks to fatherbushido for the debugging help.
This was SVN commit r18447.
2016-06-27 11:36:10 +00:00
e782e23ff9 Fix 8da8d28102 as it didn't update the ingame summary screen and did a wrong inline. Reported by Imarok.
This was SVN commit r18446.
2016-06-27 11:18:56 +00:00
307ed87829 petra: fix some rare case trying to attack an ally
This was SVN commit r18444.
2016-06-26 18:18:29 +00:00