Zukero
f8fd6888d7
No more hard-coded fixed size TileCollection. No more crashes because
...
you used a new tile.
2017-08-09 18:07:01 +02:00
Zukero
45d3ab9fb5
Merge branch 'master' into stoutford_tests
...
Conflicts:
AndorsTrail/res/values/loadresources.xml
2017-07-25 21:33:55 +02:00
Zukero
ee838d67c8
Merge pull request #30 from dacmot/end_round_at_end_of_combat
...
End round at end of combat
2017-07-25 21:07:01 +02:00
dacmot
a3a043b993
Add myself to authors
2017-07-25 14:55:25 -04:00
Dacmot
2c95d0b88d
Add back round counters reset and move a function call to put it with similar functions
2017-05-22 22:37:14 -04:00
Dacmot
a8a1b13d49
Perform end-of-round in combatExit() and remove resetRoundTimers()
2017-05-22 13:20:27 -04:00
Dacmot
fedff3eca1
Revert change in newPlayerTurn() which did not work
2017-05-21 16:38:14 -04:00
Dacmot
45d90689f8
Ensure turn ends at the end of combat
2017-05-16 22:57:32 -04:00
Zukero
bda232cbc1
Merge pull request #29 from Rijackson/master
...
Minor changes to Mikhail's dialog
2017-05-11 23:38:02 +02:00
Rijackson
477f1d9326
Minor changes to Mikhail's dialog from Tom, that give a little information about raw meat and food poisoning.
2017-05-11 17:10:01 -04:00
Zukero
ef856c7891
Merge pull request #28 from HummusSamurai/master
...
Fixed incorrect selection of inventory item when long-pressed.
2017-04-06 17:26:24 +02:00
HummusSamurai
1677c30292
Fixed incorrect selection on item's long-press.
2017-04-06 16:16:34 +03:00
Zukero
da0663bea6
Preparatory commit for the stoutford_roots_love ATCS project
2017-03-31 09:26:07 +02:00
Zukero
aa49668008
Merge pull request #27 from Rijackson/master
...
Added myself to authors.
2017-03-26 18:08:34 +02:00
Rijackson
6b599977e7
Added myself to authors.
2017-03-26 11:57:29 -04:00
Zukero
8b06f6c65a
Merge pull request #25 from Rijackson/master
...
Fix for problem where if you kill Toszylae and walk away without the …
2017-03-26 16:21:22 +02:00
Zukero
52f091d206
Update conversationlist_blackwater_harlenn.json
...
Removed a leading space.
2017-03-26 16:05:26 +02:00
Zukero
40da3e5dec
Merge branch 'master' into master
2017-03-26 16:02:59 +02:00
Rijackson
808bb090fc
Fix for IsStacking and IsPositive problems
2017-03-19 16:02:31 -04:00
Zukero
f9e472291b
Merge pull request #26 from HummusSamurai/bugfix-skills-sort
...
Fixed bug where game crashed if some skills had no requirements when sorted.
2017-03-01 17:06:44 +01:00
HummusSamurai
6fec8de9be
Fixed bug where game crashed if some skills had no requirements when sorted.
2017-03-01 16:47:18 +02:00
Zukero
74ac7127b4
Merge branch 'master' into stoutford_tests
2017-02-23 18:10:42 +01:00
Zukero
1ac48619ca
Flag changed.
2017-02-23 18:10:26 +01:00
Zukero
c667305f25
Merge branch 'master' of https://github.com/Zukero/andors-trail
2017-02-22 22:42:01 +01:00
Zukero
088b2061f3
Merge branch 'master' into stoutford_tests
2017-02-22 15:32:10 +01:00
Zukero
8c0dd7cb6c
More bugfix for actorConditions (used iStacking instead of isStacking in
...
last fix batch o.O)
2017-02-22 15:31:03 +01:00
Zukero
efcf683adf
Merge pull request #22 from HummusSamurai/feature/SortingAndCategories
...
Feature/sorting and categories
Inventory, skills and shoplists can now be filtered and sorted !
Thank you M.H. Alkotob.
2017-02-22 14:13:24 +01:00
M.H. Alkotob
4eff7a97c9
Changed layout_height(s) to "wrap_content"
2017-02-22 14:40:13 +02:00
Zukero
dde191b6da
Restored isPositive and isStacking values in actor conditions, destroyed
...
due to a bug in ATCS.
2017-02-21 19:20:23 +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
Zukero
5aeca2a1eb
New Script reward type: "changeMapFilter", needs a mapName and effectID.
...
Works on currentmap too.
2017-01-25 18:50:16 +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
