upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-14 21:55:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,706 Commits 60 Branches 374 Tags
Commit Graph

65706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gregory A Lundberg
4c88b78af4 TGS S05 Fix bug: Linger on the lich 
A 1/2 second flicker to the lich really doesn't show anything. Instead, scroll to it and stay there for the comment so the player can actually see the lich and study the area.
 2016-09-02 13:11:29 -05:00
Gregory A Lundberg
757e25b978 TSG S05 Fix bug: Don't give away the bandits 
Sighting the lich should not imply sighting the bandits.
 2016-09-02 13:11:28 -05:00
Gregory A Lundberg
316c0dbb4b TSG S04 Adjust objectives 
Show the current (remaining) objectives when the player asks for them.
 2016-09-02 13:11:28 -05:00
Gregory A Lundberg
dae4df3bef TSG S04 Fix bug: No bodyguards AT ALL!!! 
Bad loop logic. Tested with Ethiliel in the middle of the lake and .. oopsie!
 2016-09-02 13:11:28 -05:00
Gregory A Lundberg
403f70d954 TSG S04 Fix bug: No bodyguards for hero deaths 
We're about to lose anyway. No need for the bodyguards to appear.
 2016-09-02 13:11:27 -05:00
Gregory A Lundberg
1f3ee030cd TSG S04 Fix bug: Separate undead comments 
Deoran and Ethiliel's comments should apply when there are undead remaining. This is separate to a general command about arrows (pierce attacks) not working on skeletons.
 2016-09-02 13:11:27 -05:00
Gregory A Lundberg
2ffaaac50b TSG S04 Fix bug: Jera Ilras is team Bandits 2016-09-02 13:11:27 -05:00
Gregory A Lundberg
29d58a2614 TSG S03 Fix bug: Use best speaker 
Include all advancements, prefer the lower level units, and only search on the map.
 2016-09-02 13:03:13 -05:00
Gregory A Lundberg
8fa8fdf4cd TSG S03 Fix bug: Use id= 
Be consistent. Besides, I know the wiki says it's an alias, but speaker= has special semantics and is not really an alias.
 2016-09-02 13:03:13 -05:00
Gregory A Lundberg
9814931a02 TSG S02 Capture village 
EASY adds a village. This detracts one of Urza Nalmeth's units. Capture it so they stay on task. If it had been there all along, he's already have it.
 2016-09-02 13:03:12 -05:00
Gregory A Lundberg
b0f7e65073 TSG S02 Hide implementation details 
Make the bandits on side 3 appear to be on the same side as Urza Nalmath. They are on side 3 as an implementation detail so the AI will handle them separetely from his other units.
 2016-09-02 13:03:12 -05:00
Gregory A Lundberg
9c18c815f7 TSG S02 Adjust turns to reality 
If the user only has 9 turns let's show that everywhere.
 2016-09-02 13:03:11 -05:00
Gregory A Lundberg
065f6847fa TSG S02 Impove instruction 
'Occupy' is a better word than 'take'
 2016-09-02 13:03:11 -05:00
Gregory A Lundberg
6536fb89e0 TSG S02 Why wait? 
If we're losing, no need to wait for the AI to move.
 2016-09-02 13:03:10 -05:00
Gregory A Lundberg
38eae999c1 TSG S02 Fix bug: Consistent name 
Everywhere else it's the 'Citadel of Westin'
 2016-09-02 13:03:10 -05:00
Gregory A Lundberg
0356f95b9a TSG S02 Fix bug: No victory if no Minister Hylas 
The objective is, first, to find Minister Hylas and, then, later, to kill Urza Nalmath. Handle the (unlikely) case where the player kills Urza Nalmath BEFORE going to the citadel to find Minister Hy
las.
 2016-09-02 13:03:10 -05:00
Gregory A Lundberg
97a3aca98b TSG S02 Fix bug: Where is 'here'? 
Show the player where 'here' is.
 2016-09-02 11:56:47 -05:00
Gregory A Lundberg
e3430d21ef TSG S02 Fix bug: Anyone will do 
Any unit will do to secure the citadel, not just Deoran.
 2016-09-02 11:56:47 -05:00
Gregory A Lundberg
b84ae1a620 TSG S02 Fix bug: Warning is a turn late 
Turns over is at turn 9, so need to warn on turn 8 for 'next turn'.
 2016-09-02 11:56:47 -05:00
Gregory A Lundberg
64843c07f2 TSG S01 Capture village 
On EASY a new village appears. If it had been there all along, the bandits would own it. Capture it for consistency.
 2016-09-02 11:56:47 -05:00
Gregory A Lundberg
623fe1e5bb TSG S01 Fix bug: Deoran is encamped 
For EASY, when Sir Gerrick appears, a hint appears telling Deoran to return to camp and recruit. But, it's possible Deoran is already at the camp. So, rather than make the player step off and back on, simply do the recruitment hinting right away. It just flows better.
 2016-09-02 11:56:47 -05:00
Gregory A Lundberg
c3c622447e TSG S01 Fix bug: Urza Mathin may die first 
In the unlikely event the player manages to kill Urza Mathin before visiting the river fort, Sir Gerrick will not appear. This is bad for the victory conversation and worse for the rest of the campaign.

I thought long and hard about how to fix this and decided to take my cue from the initial objectives which show two items. So, I made it so you have to do BOTH to win the scenario. If you kill Urza Mathin first, you still need to go find Sir Gerrick. I only needed to adjust one line to make it make sense, and it works better than simply having Sir Gerrick pop up out of nowhere.
 2016-09-02 11:56:46 -05:00
Gregory A Lundberg
222d9ec0d1 TSG S01 Fix bug: We came from Weldyn 
Sir Gerrick knows King Haldric sent us (from Weldyn) so why is he asking if we came from Westin? Let's be more generic.
 2016-09-02 11:56:46 -05:00
Gregory A Lundberg
be440df638 TSG S01 Fix bug: Remove target before talking 
When Deoran moves to the camp, the EASY hints about recruitment should clean up the target before talking. It just looks better.
 2016-09-02 11:56:46 -05:00
Gregory A Lundberg
439ec667e7 TSG S01 Fix bug: Only Deoran can recruit 
The EASY hints on recruiting should only appear once Deoran moves to the camp; not when any unit does.
 2016-09-02 11:56:46 -05:00
Gregory A Lundberg
a9041151dc TSG S01 Fix bug: Show target first 
Scroll to the camp and show the target before referring to it.
 2016-09-02 11:56:46 -05:00
Gregory A Lundberg
c1f77f34d7 TSG S01 Fix bug: Anyone to fort 
Any unit can move to the River Fort and trigger the apperance of Sir Gerrick. Change Moreth's comment to indicate this.
 2016-09-02 11:56:46 -05:00
Gregory A Lundberg
84e462e1ef TSG Remove variable artifacts 2016-09-02 11:56:46 -05:00
Gregory A Lundberg
a0af7e035e TSG [then] cannot be empty 
Cute attempt to get around [if] must have [then]
 2016-09-02 11:56:46 -05:00
Gregory A Lundberg
691de88d0c TSG [else][if] should be [elseif] 2016-09-02 11:56:46 -05:00
Gregory A Lundberg
efe1812a73 TSG Remove macro artifacts 2016-09-02 11:56:46 -05:00
Charles Dang
09a095b8b1 Preferences: refactored handling of initial page specification 2016-09-03 02:28:44 +11:00
Charles Dang
2c5c3f5600 Game Stats: forgot return type on execute function 2016-09-03 00:49:29 +11:00
Charles Dang
b2cd7fa1df Unit List + Game Stats: don't show dialogs if nothing to show 2016-09-02 15:51:44 +11:00
Celtic Minstrel
ac7508d427 Revert "XCode: Use address sanitizer in debug builds" 
This reverts commit 60d543cf3beb2a3d07b2231778de5d33edace6fc.

Unfortunately, it seems that the address sanitizer cannot find its lib,
and I am not sure how to fix that, so I will have to revisit this at
a later time.
 2016-09-01 23:17:56 -04:00
Celtic Minstrel
3ca997db1b Merge pull request #763 from GregoryLundberg/GL_role_missing_role 
[role] always error on missing role=
 2016-09-01 22:26:35 -04:00
Charles Dang
601f217ca2 SP Configure Options: increase max height 2016-09-02 13:17:29 +11:00
Charles Dang
19c13cf7d6 MP Options Helper: minor cleanup 2016-09-02 13:01:54 +11:00
Charles Dang
4bacb417f2 SP Options Configure: only show dialog if there is at least one active mod with options 2016-09-02 12:55:46 +11:00
Charles Dang
8b60904074 Create Engine: added method to get active mod data 2016-09-02 12:53:50 +11:00