--- Log opened Fri Nov 30 00:00:21 2018 20181130 00:17:24< irker903> wesnoth/wesnoth:master newfrenchy83 88faf45d37 Update attack.cpp AppVeyor: All builds passed 20181130 00:57:06-!- celmin|away is now known as celticminstrel 20181130 00:58:10-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection] 20181130 03:15:51< celticminstrel> Sooo, anyone decided when 1.14.6 is yet? 20181130 03:17:25-!- irker903 [~irker@wesnoth/umc-dev/bot/shikadibot] has quit [Quit: transmission timeout] 20181130 04:21:49< celticminstrel> Considering how best to expose the API hooks. Currently they're just dumped right under the "wesnoth" module, but maybe it would be nice to put them under a submodule? 20181130 04:22:03< celticminstrel> (FTR, I mean the things that are basically a table where you register things, like wesnoth.wml_actions) 20181130 04:24:36< celticminstrel> Full list: custom_synced_commands, theme_items, wml_actions, wml_conditionals, micro_ais, effects, game_events, persistent_tags. 20181130 04:24:58< celticminstrel> Most of those register tag handlers for specific contexts... or partial tag handlers (effects, micro_ais). 20181130 04:25:14< celticminstrel> Can't remember which of the two categories custom_synced_commands is. 20181130 04:25:21< celticminstrel> Only exception then is game_events. 20181130 04:32:13< celticminstrel> on_event() should also be replaced by something here. 20181130 05:09:09< celticminstrel> Documented the new WML parsing functions: https://wiki.wesnoth.org/LuaAPI/wml#wml.clone 20181130 05:11:05< celticminstrel> Thoughts: maybe I should add a second return value for load that returns defined macros. Also maybe I should add a function that takes a string, preprocesses it, and outputs the result as a string (possibly along with the defined macros). 20181130 05:17:25-!- celticminstrel is now known as celmin|sleep 20181130 07:06:46< Ravana> why wml.load has "The second parameter can either be a boolean specifying whether or not to preprocess the file" when there is wml.parse for not preprocessing? 20181130 09:16:35-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20181130 10:10:12-!- valdar [~atarocch@81.128.178.178] has joined #wesnoth-dev 20181130 10:33:22-!- valdar [~atarocch@81.128.178.178] has quit [Ping timeout: 246 seconds] 20181130 13:32:24-!- celmin|sleep is now known as celmin|away 20181130 13:33:39< celmin|away> Ravana: I guess it's a good question... wml.load uses a file while wml.parse uses a string, but IIRC there's a function to load a file as a string, so maybe that option isn't really necessary in wml.load. 20181130 13:35:32<+wesdiscordbot> wesnoth.read_file 20181130 13:35:47< celmin|away> Yeah, that, exactly. 20181130 16:32:31<+wesdiscordbot> Are any of the changes in https://github.com/wesnoth/wesnoth/pull/3711/files problematic for 1.14? 20181130 16:34:50-!- irker909 [~irker@wesnoth/umc-dev/bot/shikadibot] has joined #wesnoth-dev 20181130 16:34:50< irker909> wesnoth: josteph wesnoth:master a59095b822e3 / data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg: DiD S1: Instead of killing the loyals, just assign them to the ally. https://github.com/wesnoth/wesnoth/commit/a59095b822e3a311003c4730cf9dd6e55f579c7f 20181130 16:34:50< irker909> wesnoth: josteph wesnoth:master 39f26950c3a3 / data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg: DiD S1: Add a dialog hint about the loyals staying behind. https://github.com/wesnoth/wesnoth/commit/39f26950c3a30f449e7c378dc94ebb26cc992cfb 20181130 16:34:51< irker909> wesnoth: josteph wesnoth:master 23cffd22d10e / data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg: DiD S8: Clarify objectives https://github.com/wesnoth/wesnoth/commit/23cffd22d10eb96474bb5d33de7be691e1df1cb7 20181130 16:34:52< irker909> wesnoth: josteph wesnoth:master 7bb74ee1e36e / data/campaigns/Descent_Into_Darkness/ (scenarios/07_A_Small_Favor.cfg scenarios/08_A_Small_Favor2.cfg utils/macros.cfg): DiD S8,S9: Carry over units created via plague https://github.com/wesnoth/wesnoth/commit/7bb74ee1e36e64b6ed82451e48ed85ba2ca956bc 20181130 16:34:53< irker909> wesnoth: josteph wesnoth:master 2552e3301add / data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg: DiD S9: Clarify objectives https://github.com/wesnoth/wesnoth/commit/2552e3301add963777676be0506ad65c302fefb8 20181130 16:34:54< irker909> wesnoth: josteph wesnoth:master 5ab1bac38ca5 / data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg: DiD S12: Typo https://github.com/wesnoth/wesnoth/commit/5ab1bac38ca512069a00632ba4c18497455f6c44 20181130 16:39:57< irker909> wesnoth: josteph wesnoth:master 526d22648eb9 / src/units/abilities.cpp: Attack Enemy: Don't show "poison" in the attacks list if the enemy is unpoisonab https://github.com/wesnoth/wesnoth/commit/526d22648eb91abb91526fefd856d68b5e82f284 20181130 16:39:59< irker909> wesnoth: josteph wesnoth:master e569d896d8ee / src/units/abilities.cpp: Refine unplagueable/unpoisonable checks as in battle_context_unit_stats. https://github.com/wesnoth/wesnoth/commit/e569d896d8ee8ee28e303949e71f498cb5ea6c2c 20181130 16:40:01< irker909> wesnoth: josteph wesnoth:master 3c9f425a6cb0 / src/units/abilities.cpp: Attack Enemy: Inactive weapon specials are now shown muted, rather than elided a https://github.com/wesnoth/wesnoth/commit/3c9f425a6cb05f0ab545915032346903330965db 20181130 16:40:10< irker909> wesnoth/wesnoth:master newfrenchy83 ac5df2c5fc Update heal.cpp AppVeyor: All builds passed 20181130 16:42:18< irker909> wesnoth: josteph wesnoth:master 4f07276a8894 / data/tips.cfg: Tips: Incorporate suggestion from #3683 https://github.com/wesnoth/wesnoth/commit/4f07276a8894abde1d621c7726134793d519714c 20181130 16:43:53< Soliton> if we don't mind the string changes then it doesn't look like those changes can break anything. 20181130 16:47:50< irker909> wesnoth: josteph wesnoth:master 56979f915350 / changelog.md: Update changelog for DiD (#3711) https://github.com/wesnoth/wesnoth/commit/56979f915350cedfaac86c32cdc2aa865aced250 20181130 16:47:59< irker909> wesnoth: josteph wesnoth:1.14 2928b4b73189 / src/units/abilities.cpp: Attack Enemy: Don't show "poison" in the attacks list if the enemy is unpoisonab https://github.com/wesnoth/wesnoth/commit/2928b4b7318962aaff0d443d28800d916c1884b4 20181130 16:48:01< irker909> wesnoth: josteph wesnoth:1.14 2ccc17e6df0c / src/units/abilities.cpp: Refine unplagueable/unpoisonable checks as in battle_context_unit_stats. https://github.com/wesnoth/wesnoth/commit/2ccc17e6df0c4ee1e5962497d063a34326338d9a 20181130 16:48:03< irker909> wesnoth: josteph wesnoth:1.14 9abb55a7b75f / src/units/abilities.cpp: Attack Enemy: Inactive weapon specials are now shown muted, rather than elided a https://github.com/wesnoth/wesnoth/commit/9abb55a7b75f5395b8073efe58c94897bc9919ff 20181130 16:48:05< irker909> wesnoth: josteph wesnoth:1.14 76eee6783e8e / data/tips.cfg: Tips: Incorporate suggestion from #3683 https://github.com/wesnoth/wesnoth/commit/76eee6783e8e4a480ff566fe089aa5ac23eb8149 20181130 16:48:07< irker909> wesnoth: josteph wesnoth:1.14 b1910a5280c5 / changelog.md: Update changelog for #3686 https://github.com/wesnoth/wesnoth/commit/b1910a5280c5133a3ec617edd3ad0aa93198b49d 20181130 16:48:58<+wesdiscordbot> Soliton, thanks 20181130 16:49:10<+wesdiscordbot> I assume the string changes are fine, we aren't in string freeze are we? 20181130 16:52:11< zookeeper> i'd imagine that "Goodbye, commander." is more confusing than anything. the only one who is obviously a commander there is drogan. 20181130 16:53:35<+wesdiscordbot> Malin was the commander of the outpost 20181130 16:53:44<+wesdiscordbot> can change the line... 20181130 16:54:17<+wesdiscordbot> "Goodbye, Malin"? 20181130 16:58:19< zookeeper> was there a particular reason you felt a hint was needed? i mean, i see nothing that hints at malin being a commander of anything, he gets to control a couple human units pretty much for gameplay reasons only, so when he got banished did you feel it was weird that those guys didn't go with him? 20181130 17:00:20<+wesdiscordbot> gameplay wise, in S1 the player has three loyal units, in S2 they're gone 20181130 17:00:31<+wesdiscordbot> I thought that should be indicated by dialog 20181130 17:01:18<+wesdiscordbot> lore wise, the dialog in S1 has Drogan ordering Malin to hold the orcs back.. but yeah, there's no indication that Malin has army training or anything of the sort 20181130 17:01:38< zookeeper> ok, well, if you think it should be, then i'd rather suggest not making them sound like they're fond of malin (because no one is), but simply resent ever following his orders in the first place 20181130 17:02:10<+wesdiscordbot> shouldn't that depend on whether malin used_necromancy ? 20181130 17:03:36-!- travis-ci [~travis-ci@ec2-54-224-59-255.compute-1.amazonaws.com] has joined #wesnoth-dev 20181130 17:03:37< travis-ci> wesnoth/wesnoth#20289 (master - 5ab1bac : josteph): The build is still failing. 20181130 17:03:37< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/461864835 20181130 17:03:37-!- travis-ci [~travis-ci@ec2-54-224-59-255.compute-1.amazonaws.com] has left #wesnoth-dev [] 20181130 17:03:40< zookeeper> sure, just the way it does now 20181130 17:04:21<+wesdiscordbot> ah, right, the PR touches just one of the codepaths, sorry 20181130 17:04:41<+wesdiscordbot> yeah, we're talking about the used_necromancy case 20181130 17:05:03<+wesdiscordbot> 🤔 20181130 17:09:31<+wesdiscordbot> "Begone, necromancer. I am ashamed to have fought by your side, even if the town was spared." ? 20181130 17:10:02<+wesdiscordbot> to be spoken by a side 1 loyal, not by Drogan 20181130 17:10:28< zookeeper> "Begone, necromancer" seems redundant, and repeats the "begone" that drogan just used, but otherwise sounds good. 20181130 17:11:15<+wesdiscordbot> "We should all be glad to see you gone, necromancer. I am ashamed to have fought by your side, even if the town was spared." ? 20181130 17:12:04<+wesdiscordbot> having someone else echo Drogan helps create an atmosphere that the entire town is against Malin - that's good for the rest of the story 20181130 17:18:21< zookeeper> yeah, but they don't need to say more than just express their resentment, since it's clear what the reason for that is 20181130 17:18:27< irker909> wesnoth: josteph wesnoth:master 5d175eb493a4 / src/ (actions/heal.cpp units/udisplay.cpp): Healing: Display healing animation if the healer is visible but the patient is n https://github.com/wesnoth/wesnoth/commit/5d175eb493a413ac5c1afa5ed19262d14537e1a7 20181130 17:19:37< zookeeper> in any case, i'd also suggest moving the line _before_ drogan's line, as to leave drogan's ultimatum as the last line of dialogue. 20181130 17:21:29-!- travis-ci [~travis-ci@ec2-54-160-242-160.compute-1.amazonaws.com] has joined #wesnoth-dev 20181130 17:21:30< travis-ci> wesnoth/wesnoth#20292 (master - 56979f9 : josteph): The build failed. 20181130 17:21:30< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/461870665 20181130 17:21:30-!- travis-ci [~travis-ci@ec2-54-160-242-160.compute-1.amazonaws.com] has left #wesnoth-dev [] 20181130 17:22:15<+wesdiscordbot> zookeeper, http://sprunge.us/O6714g ? 20181130 17:26:16< zookeeper> i don't think the "Begone, now"->"Begone, Malin" change is necessary, and i'd actually avoid the use of the word "necromancer" because drogan specifically doesn't refer to malin as one, but yes, otherwise that seems good to me. 20181130 17:28:21<+wesdiscordbot> I changed "now" to "Malin" because now the order of speakers is Malin, loyal, Drogan, to clarify Drogan is addressing Malin 20181130 17:28:25< zookeeper> (drogan just says he let the necromancer corrupt malin, so having someone call malin a necromancer immediately afterwards can come off a bit contradictory in text only. 20181130 17:28:33<+wesdiscordbot> what would you suggest instead of necromancer ? 20181130 17:29:19< zookeeper> i don't think anything needs to replace it, really, it seems fairly clear they're all talking to/about malin 20181130 17:29:41<+wesdiscordbot> I can see how it can be contradictory. Does it matter that it's just a common soldier using that name? Maybe the common soldiers aren't as precise in their terminology? 20181130 17:30:10<+wesdiscordbot> it's clear, yes, but I think stylistically they would use some term of address there, wouldn't they? 20181130 17:32:22< irker909> wesnoth: josteph wesnoth:master c59da1611898 / changelog.md: Update changelog for #3643 https://github.com/wesnoth/wesnoth/commit/c59da1611898b81a19b1acc929ad76f485147322 20181130 17:32:43< zookeeper> would they? i'd think that if you're basically disowning someone but don't resort to slurs, you wouldn't use an address? 20181130 17:34:33< zookeeper> personally i'd just go with "We should all be glad to see you gone. I regret ever fighting by your side." ("regret" as to avoid repeating "ashamed") 20181130 17:36:37<+wesdiscordbot> in S10, Dela and Darken both address Malin - line 590 and on 20181130 17:37:17<+wesdiscordbot> I agree we shouldn't repeat "ashamed" but I don't know if the solder regrets fighting by Malin's side 20181130 17:37:35<+wesdiscordbot> the soldier would've fought the orcs regardless of Malin 20181130 17:40:33< zookeeper> well, yeah. inserting extra dialogue in the middle of existing one is often surprisingly tricky. 20181130 17:41:45<+wesdiscordbot> message= "We should all be glad to see you gone, necromancer. I am ashamed to have fought by your side." message= "Begone, now. I’ve no wish to be forced to send the soldiers after you. Your father would disbelieve the end to which you’ve come." 20181130 17:42:14<+wesdiscordbot> that's still with the address, though we could tone it down to "corpse-raiser" or something 20181130 17:45:40< zookeeper> "disbelieve" has a lot less punch than "ashemed of", so, uh, let's see... 20181130 17:46:58<+wesdiscordbot> "be chagrined"? 20181130 17:47:21 * zookeeper has to look in a dictionary 20181130 17:48:38<+wesdiscordbot> I picked that from a thesaurus... 20181130 17:56:11< zookeeper> i guess the best i can do right now is simply "We should all be glad to see you gone. I detest having fought by your side." (assuming "detest having fought" is grammatically correct) 20181130 17:59:32< Soliton> perhaps the father would "turn in his grave"? 20181130 17:59:41<+wesdiscordbot> zookeeper, sounds grammatical to me 20181130 18:00:02<+wesdiscordbot> both of these suggestions sound good to me, though I still prefer to see it with an address 20181130 18:00:27<+wesdiscordbot> "necromancer", "corpse raiser", "desecrater of the dead", something 20181130 18:12:50-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20181130 18:17:43-!- travis-ci [~travis-ci@ec2-54-159-151-250.compute-1.amazonaws.com] has joined #wesnoth-dev 20181130 18:17:44< travis-ci> wesnoth/wesnoth#20297 (master - c59da16 : josteph): The build is still failing. 20181130 18:17:44< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/461889161 20181130 18:17:44-!- travis-ci [~travis-ci@ec2-54-159-151-250.compute-1.amazonaws.com] has left #wesnoth-dev [] 20181130 19:28:45< irker909> wesnoth/wesnoth:1.14 josteph b1910a5280 Update changelog for #3686 AppVeyor: vs2015/Release Failed 20181130 19:28:46< irker909> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/builds/20681947 20181130 20:09:14< irker909> wesnoth/wesnoth:master newfrenchy83 44881ea5dd Update attack.cpp AppVeyor: All builds passed 20181130 21:06:54-!- valdar [~atarocch@93.56.172.28] has joined #wesnoth-dev 20181130 21:10:44-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [] 20181130 22:21:28-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20181130 23:10:01-!- irker909 [~irker@wesnoth/umc-dev/bot/shikadibot] has quit [Quit: transmission timeout] 20181130 23:17:03-!- grzywacz [~karol@wesnoth/developer/grzywacz] has joined #wesnoth-dev 20181130 23:21:20-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Quit: wedge009] 20181130 23:22:55-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev 20181130 23:24:26<+wesdiscordbot> Corpse defiler 20181130 23:24:53-!- grzywacz [~karol@wesnoth/developer/grzywacz] has quit [Ping timeout: 268 seconds] 20181130 23:28:39-!- irker776 [~irker@wesnoth/umc-dev/bot/shikadibot] has joined #wesnoth-dev 20181130 23:28:39< irker776> wesnoth/wesnoth:1.14 josteph b1910a5280 Update changelog for #3686 AppVeyor: 1/4 builds failed 20181130 23:28:39< irker776> Details vs2015/Release: https://ci.appveyor.com/project/wesnoth/wesnoth-7lnpw/builds/20681947 20181130 23:42:24-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] --- Log closed Sat Dec 01 00:00:23 2018