Commit graph

66063 commits

Author SHA1 Message Date
Charles Dang
4f95916bbf Updated Battle Princess attack animations by doofus-01
https://forums.wesnoth.org/viewtopic.php?p=601815#p601815
2016-09-04 14:54:05 +11:00
mattsc
d781e6263a High XP attacks: adapt other AIs to existence of new CA
This means:
1. Adding the new CA to AI configs
2. Removing it whenever the combat CA is removed
3. Preventing conflicts for AIs that previously used overlapping scores
2016-09-03 20:00:12 -07:00
mattsc
8e50c4ee06 SotBE: remove macros to force attacks on high-XP enemies
This is not needed any more with the new high XX attacks candidate
action.
2016-09-03 19:28:04 -07:00
Charles Dang
6c63762385 Editor: move editor side info into a struct to avoid huge parameter lists 2016-09-04 11:04:16 +11:00
mattsc
f76e2d0c59 High XP attack CA: remove a debug message
Also remove a related message from the test scenario.
2016-09-03 16:47:15 -07:00
Jyrki Vesterinen
357cbfe35a Update Visual Studio project 2016-09-03 18:08:00 +03:00
Jyrki Vesterinen
2c4d72f544 Fix multiplayer tests failing in Travis CI
It depends on timing whether or not the guest shows the wait dialog between
scenarios. If the second scenario has already started when the guest tries
to show the dialog, the dialog is skipped: otherwise it's shown and it
changes the plugin context.

The join.lua plugin assumed the change of plugin context to mean that the
test is over and that the plugin should quit the game. As a result, it
ended up quitting in the middle of the test if the second scenario hadn't
started yet.

Commit 6016bdf2 tried to fix the problem by allowing the plugin context to
change once during the test. It resulted in the opposite problem: if the
second scenario *had* started, the plugin context didn't change. When the
test ended and the guest was thrown into the lobby, then the plugin
assumed that it was just the scenario change and kept waiting for the next
scenario that wasn't coming.

This commit finally fixes the problem by explicitly polling the name of the
scenario being played. Now join.lua ignores plugin context changes as long
as the last scenario hasn't started, but starts waiting for the game to end
when the scenario starts.

I verified locally that, with these changes applied, the tests pass both
with an unmodified build and with a build that has an artificial delay to
simulate the timing in Travis.
2016-09-03 17:30:48 +03:00
mattsc
af0f49ae9a High XP CA: add missing braces to CA definition
This did not keep the AI from working correctly, it just made it
slightly less efficient.
2016-09-03 07:06:18 -07:00
mattsc
390d1fdc10 High XP CA: simplify attack conditions with 1.13 syntax 2016-09-03 07:03:00 -07:00
Charles Dang
74f1fe1e15 MP Create: fixed games list not function correctly if switching type with filter applied
When the type was changed, only the filtered games were printed to the list, meaning there was nothing
to make visible when the filter changed. This makes it so all games are printed, and the invalid ones
then hidden.
2016-09-03 23:36:06 +11:00
Charles Dang
a232b0c2cb MP Create: disable Settings button if generator doesn't allow settings 2016-09-03 16:47:53 +11:00
Celtic Minstrel
473076104c Update XCode project 2016-09-03 01:43:49 -04:00
Charles Dang
55cc688687 Mp Create: call set_current_level on game select instead of on updating details
This fixes an issue where any random map settings would immediately be lost upon clicking
Regenerate since set_current_level resets the generator, for some reason.
2016-09-03 16:29:36 +11:00
Charles Dang
501c50fcea Default Map Generator: some refactoring to fix issues with map generation introduced in 0d07c1a815
The cause was the data_ class member being modified every time the map was regenerated using itself
for the calculations, causing an eventually-fatal cumulative effect. This solves that by keeping a
temp copy of the data which is then modified and passed to the generator job.
2016-09-03 16:07:14 +11:00
Celtic Minstrel
e1e2d43b9e Merge pull request #765 from GregoryLundberg/GL_error_means_error
Fix bug: Error typically means error
2016-09-03 00:16:40 -04:00
Gregory A Lundberg
0696da44c9 Fix bug: Error typically means error
grep'd and didn't find any other places this massively stupid mistake appeared.

rather than change behavior, after correcting the definition, changed the calls.
2016-09-02 22:58:30 -05:00
mattsc
6950ee1dd0 New high_xp_attack candidate action for default AI
This CA performs attacks on enemy units so close to leveling that the
default AI's combat CA would not attack them (with some exceptions).
This is meant to keep players from being able to exploit this known
weakness of the default AI.
2016-09-02 20:22:17 -07:00
Charles Dang
8c65e49f7a Generator Settings: specify class name in bind 2016-09-03 13:22:05 +11:00
Charles Dang
50e09bab30 Default Map Generator: fixup 0d07c1a815 (island size not being considered) 2016-09-03 12:56:12 +11:00
Charles Dang
56e8222bb0 Converted Generator Settings dialog to GUI2 2016-09-03 12:41:29 +11:00
Charles Dang
42423a4a57 Slider: removed spurious calls to set_item_position when setting min/max value
This caused issues where the positioner would jump to end. The positioner gets updated
perfectly fine without these calls.
2016-09-03 12:41:27 +11:00
Charles Dang
0d07c1a815 Default Map Generator: refactored generator setting parameters into a struct 2016-09-03 12:41:26 +11:00
Charles Dang
f66884cf01 Edit Side: simplify group setup code 2016-09-03 12:41:26 +11:00
Lari Nieminen
f7d06f67c5 Merge pull request #703 from GregoryLundberg/GL_TSG_fixes
TSG Bug fixes
2016-09-02 21:55:31 +03:00
Gregory A Lundberg
c2270e5e31 TSG S04 Always give bodyguard
If we get to victory without anyone dieing (very unlikely) have Ethiliel call upon her bodyguard so we always have them.
2016-09-02 13:47:53 -05:00
Gregory A Lundberg
41246b155e TSG S09a Note no turn limit
I never spot it unless it's noted.
2016-09-02 13:11:37 -05:00
Gregory A Lundberg
1368a287ef TSG S09a Fix bug: Warn about killing
Added a warning to the player not to kill the elves.
2016-09-02 13:11:37 -05:00
Gregory A Lundberg
1c73934169 TSG S09a Fix bug: Sir Gerrick and Minister Hylas are loyal
They are no longer heroes, so need a normal ellipse and the loyal icon.
2016-09-02 13:11:37 -05:00
Gregory A Lundberg
20f3799b5c TSG S08b Ministers are loyal
Let's have all the Ministers be loyal.
2016-09-02 13:11:36 -05:00
Gregory A Lundberg
023526d24b TSG S08b Fix bug: Hylas is no longer a hero
Change his overlay and ellipse so he's just a loyal unit.
2016-09-02 13:11:36 -05:00
Gregory A Lundberg
81da109a85 TSG S08a Fix bug: Plynry may be dead
In fact, the entire garrison may be dead. The bandits need to get real lucky, but it could happen.

Appoint a new commander from the survivors. Skip the conversation if it was a masacre.
2016-09-02 13:11:36 -05:00
Gregory A Lundberg
051e27f818 TSG S07b Fix bug: Wrong overlays
Sir Gerrick is not the leader, and Urza Afalas is just a loyal follower, neither are heros any longer. Update their overlays and ellipses to reflect their new status.
2016-09-02 13:11:35 -05:00
Gregory A Lundberg
c4d2ee85d6 TSG S07b Note no turn limit
As always, I miss it if it's not noted.
2016-09-02 13:11:35 -05:00
Gregory A Lundberg
64e152f29c TSG S07a Hide unused Troll side on status panel 2016-09-02 13:11:35 -05:00
Gregory A Lundberg
c248ce97e0 TSG S07a Fix bug: Where is 'here'?
Show the target before speaking of it, and don't pan away.
2016-09-02 13:11:34 -05:00
Gregory A Lundberg
101c26810e TSG S07a Fix bug: No deserters
All along we've been able to recruit Peasants. Admitedly, at this late date, they're not much good, but there is no reason for them to desert us.
2016-09-02 13:11:34 -05:00
Gregory A Lundberg
c38378fdf9 TSG S06a Can recruit mermen
I never understood the purpose of mermen. All they do is change what the Naga Queen has to say. Let's let Sir Gerrick recruit them here. It's really just about the only place in the entire campaign where they actually can do some good! Why limit him to just those Deoran had?
2016-09-02 13:11:34 -05:00
Gregory A Lundberg
3817814aae TSG S06a Hide side
No need to give away the fact there are enemies lurking. Not that it said much .. just "enemies" but still ..
2016-09-02 13:11:33 -05:00
Gregory A Lundberg
fc6c5fa3ad TSG S06a Clean up objectives 2016-09-02 13:11:33 -05:00
Gregory A Lundberg
f9b1ecefa5 TSG S06a Fix bug: Units in poor shape
When we next see Sir Gerrick and the units he has on the map will be in S09a. While Sir Gerrick will be fine, the units will appear to be in poor shape in the recall list. Let's heal everyone, first, so we're sure everyone is in fighting shape when they return.
2016-09-02 13:11:33 -05:00
Gregory A Lundberg
b46ff72fd4 TSG S06a Fix bug: Sir Gerrick is a leader
He needs the correct overlays.
2016-09-02 13:11:32 -05:00
Gregory A Lundberg
0247b6244f TSG S06a Fix bug: Made-up words
Use real words to make the meaning more clear.
2016-09-02 13:11:32 -05:00
Gregory A Lundberg
7fc2ac17a4 TSG S06a Fix bug: Target zone
Clean up the shroud.
2016-09-02 13:11:32 -05:00
Gregory A Lundberg
233bc3f3df TSG S06a Fix bug: No elf for line
Skipping the line makes the conversation suffer. Having whoever found the orge say the line actually makes it a bit funnier if they're NOT an elf.
2016-09-02 13:11:31 -05:00
Gregory A Lundberg
66a540c744 TSG S06a Fix bug: Deoran appears on the map
Simply put Deoran on the recall list to prepare for the next scenario, where he takes over as leader, again.
2016-09-02 13:11:31 -05:00
Gregory A Lundberg
790a6508fc TSG S05 Mer follow Sir Gerrick
This is the last point at which Deoran can recruit Mermen. Let's explain that they go with Sir Gerrick intead of into the caves with Deoran.
2016-09-02 13:11:31 -05:00
Gregory A Lundberg
0588ee1e3b TSG S05 Hide bandit side after subsumed 2016-09-02 13:11:30 -05:00
Gregory A Lundberg
d6d01004a7 TSG S05 Fix bug: Subsumed units can move
When Urza Afalas and his band join Deoran they should be able to move. But, since they're changing sides their movement won't have been reset, yet, so we have to do it by hand.
2016-09-02 13:11:30 -05:00
Gregory A Lundberg
24e60e91e2 TSG S05 Let Urza Afala roam free!
There is no reason to stop his moving about. Separating his sighted event and finding the bandit encampment eliminated any problems with his movement. This was a todo comment for when this was fixed. Actually, I think the real problem was the inapproriate sighting of the bandits when we found the lich.
2016-09-02 13:11:29 -05:00
Gregory A Lundberg
2322a3e3a0 TSG S05 Separate finding the camp
Finding the camp does not mean you've found Urza Afalas; but it *is* a good hint to look nearby!
2016-09-02 13:11:29 -05:00