Commit Graph

6398 Commits

Author SHA1 Message Date
Olivier Dragon
d43eaa4bf9 Translated using Weblate (French)
Currently translated at 73.0% (4657 of 6378 strings)
2017-02-13 06:44:57 +01:00
Sebastian Hainke
423299ab46 Translated using Weblate (German)
Currently translated at 100.0% (458 of 458 strings)
2017-02-07 00:45:01 +01:00
Daniel Stasiak
e8ae841347 Translated using Weblate (Polish)
Currently translated at 100.0% (6378 of 6378 strings)
2017-02-03 15:46:03 +01:00
Daniel Stasiak
bb1c1adc88 Translated using Weblate (Polish)
Currently translated at 99.3% (455 of 458 strings)
2017-02-03 15:46:02 +01:00
M.H. Alkotob
afaf284a59 request changes 2017-01-31 10:21:41 +02:00
Rijackson
fc7e47b109 Also left some debug stuff in one file. This fixes it. 2017-01-29 20:41:52 -05:00
Rijackson
0838d20128 It was not my intention to make the Corrosive slime condition non-stacking, only to fix the capitilization. This fixes the error. 2017-01-29 20:34:06 -05:00
Rijackson
cf4a381f06 Fix for problem where if you kill Toszylae and walk away without the helmet, you are doomed. There is nothing in any subsequent dialogue to give you a hint to go and look for something where you killed the lich, and in fact Talion's dialogue tree is simply wrong. The only way to get past talion_demon_1 is to have darkprotector:10. If you don't have that, the only available reply is "No, I have not killed it yet", even though you have. The only thing you can do with Urlifendor is go through a long dialogue sequence that arrives at the selector ulifendor_infected_18_s. That has two replies, but one requires toszylae:70, which you can't get until you have darkprotector:10, so of course you don't have it. So the only available reply is "OK. I will defeat the lich first. Goobye", even though you have already defeated it.
The helmet is now on the shrine behind the lich. When you pick it up, it disappears (mapchange). If you try to leave without it, you get a very big hint.

This is still not perfect. I could not figure out any way to change Talion's or Ulifendor's dialogue without a huge amount of work (the logic in the dialogues and the three interleaved quests is very bad, and in some cases only works because one mistake cancels another. I do not want to mess with it). This means that if the player kills the lich and still leaves without the helmet, despite the hint, the dialogues still make no sense. That is much less likely to happen now though.

I have tested this, and everything seems to work as desired.

There are also a number of other typo fixes, as reported on the forums, and I made the GoW extraordinary (as also reported on the forums).
2017-01-29 20:18:34 -05:00
Igor
b0fb6d8561 Translated using Weblate (Russian)
Currently translated at 100.0% (6378 of 6378 strings)
2017-01-26 15:47:14 +01:00
Igor
27bd1d3f5f Translated using Weblate (Russian)
Currently translated at 26.2% (120 of 458 strings)
2017-01-26 15:47:13 +01:00
Zukero
5aeca2a1eb New Script reward type: "changeMapFilter", needs a mapName and effectID.
Works on currentmap too.
2017-01-25 18:50:16 +01:00
Olivier Dragon
aed6d774a8 Translated using Weblate (French)
Currently translated at 72.8% (4644 of 6378 strings)
2017-01-24 21:44:52 +01:00
Zukero
751972451f Merge branch 'master' into stoutford_tests 2017-01-24 13:14:30 +01:00
Zukero
8f7352db33 Fixed an issue that prevented quickslots quantities from being updated
when you loot an item that goes there. (Reapplied changes in commit
missed during quickslots_custom_ui merge)
2017-01-24 12:59:38 +01:00
Zukero
ac850f953e Merge branch 'master' into stoutford_tests 2017-01-23 17:55:33 +01:00
Zukero
f10d3f70af Fixed large monsters movement (not used yet, but it bothered me). They
couldn't move because there always was a monster in the way: themselves.
And redrawing area wasn't computed correctly.
2017-01-23 17:55:00 +01:00
Zukero
79ab254f9b Merge branch 'master' into stoutford_tests 2017-01-23 17:04:38 +01:00
Zukero
e8ace3666d EOL restoration 2017-01-23 16:44:26 +01:00
Zukero
17e10ae369 Added items_rijackson_1 to the loaded tilesets. 2017-01-22 22:42:54 +01:00
Zukero
0f187e08d9 Merge pull request #24 from Rijackson/stoutford_tests
Changes to dialogues and questlogs in new material in stoutford_tests
2017-01-22 22:36:16 +01:00
Rijackson
6eeff75134 Clean up the strange unicode stuff. 2017-01-22 12:02:02 -05:00
Rijackson
653648e65c Clean up a few mistakes and the strange negated requirments 2017-01-22 11:24:52 -05:00
Rijackson
725d0ed632 More sprites added in items_rijackson_1.png. Clean up punctuation, typos etc. in dialogues, Change dialogue so that it is Andor's companion, not Andor himself, that persuades Glasforn to imprison the hero with the lich. 2017-01-21 17:24:11 -05:00
Zukero
ef2af81e87 Quickslots assignment UI - now it's looking better. 2017-01-21 00:34:50 +01:00
Zukero
941b8332e5 Redesign of quickbuttons assignment UI. 2017-01-20 18:36:19 +01:00
Zukero
fd21fd62ec Merge branch 'master' into stoutford_tests
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonFieldNames.java
2017-01-20 16:56:27 +01:00
Zukero
6d77d8806b Fixed large monster issuem introduced with content reordering, but
solved by adding more flexibility and removing the "size" field in
monsters.
2017-01-20 15:07:05 +01:00
Zukero
322e176be9 Fixed large monster issuem introduced with content reordering, but
solved by adding more flexibility and removing the "size" field in
monsters.
2017-01-20 15:04:17 +01:00
Nut Andor
d0baee2b90 Translated using Weblate (German)
Currently translated at 99.9% (6377 of 6378 strings)
2017-01-16 12:45:19 +01:00
Olivier Dragon
16265689d5 Translated using Weblate (French)
Currently translated at 72.5% (4625 of 6378 strings)
2017-01-15 03:44:53 +01:00
Mohamad Alkotob
7c61ad5f81 extra newlines 2017-01-13 16:52:17 +02:00
Mohamad Alkotob
7afe881ead extra newlines 2017-01-13 16:51:39 +02:00
HummusSamurai
0a8259d5a8 Merge remote-tracking branch 'origin/feature/SortingAndCategories' into feature/SortingAndCategories 2017-01-13 16:50:14 +02:00
HummusSamurai
a60e2ab4c5 The sorting/category buttons in the inventory are now above the inventory list directly. 2017-01-13 16:49:43 +02:00
Christa Sorenson
d2204367a2 Translated using Weblate (Swedish)
Currently translated at 6.3% (405 of 6378 strings)
2017-01-12 15:46:35 +01:00
Christa Sorenson
c485690c45 Translated using Weblate (Swedish)
Currently translated at 13.7% (63 of 458 strings)
2017-01-09 18:46:33 +01:00
Christa Sorenson
950cbe6794 Added translation using Weblate (Swedish) 2017-01-07 17:44:12 +01:00
Mohamad Alkotob
ffd37a709b Added name under "Additional programming"
Initials before surname due to ethnic saltiness
2017-01-06 16:04:44 +02:00
Mohamad Alkotob
410f796c31 Update HeroinfoActivity_Inventory.java 2017-01-05 09:26:37 +02:00
Mohamad Alkotob
4b58722b05 end already 2017-01-05 09:23:57 +02:00
Mohamad Alkotob
2b6ce058b6 guess what more tabs 2017-01-05 09:23:09 +02:00
Mohamad Alkotob
6c9fcd5b46 tabs 2017-01-05 09:20:48 +02:00
Mohamad Alkotob
998c56d8ab excess tabs 2017-01-05 09:17:34 +02:00
Vinicius Veroneze
d0c7dc7843 Translated using Weblate (Portuguese (Brazil))
Currently translated at 98.2% (450 of 458 strings)
2017-01-04 21:45:52 +01:00
HummusSamurai
a119fde366 un-used import 2017-01-04 19:59:59 +02:00
HummusSamurai
544ecd1c49 Merge remote-tracking branch 'origin/feature/SortingAndCategories' into feature/SortingAndCategories
# Conflicts:
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
2017-01-04 19:51:25 +02:00
Mohamad Alkotob
a186715eab almost 2017-01-04 19:38:17 +02:00
Mohamad Alkotob
7ea485f8ca please 2017-01-04 19:36:47 +02:00
Mohamad Alkotob
988e94f62f yup that happened 2017-01-04 19:24:20 +02:00
Mohamad Alkotob
7936a223f5 lord 2017-01-04 19:23:14 +02:00