OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-06 19:50:01 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
3,336 Commits 46 Branches 0 Tags
2a10a2dfd03ea0bacbec04a0bf36db652fae97c6
Commit Graph

59 Commits

Author SHA1 Message Date
Nut
2a10a2dfd0 Building v079 from ATCS v079 2020-02-23 16:30:49 +01:00
Nut
d2ccb9b118 v078 (yet without translations) 2020-01-09 23:23:21 +01:00
Nut
46af6d3c4c Revert "v078" 
This reverts commit 4cff325789.
 2020-01-09 22:08:02 +01:00
Nut
4cff325789 v078 2020-01-09 00:25:33 +01:00
Nut
93ba6ee4ac release build v0.7.6.1 before compression 2019-10-20 23:18:02 +02:00
Nut
837e54c33e preparation for release build 2019-10-03 21:43:25 +02:00
Nut
18099e016b merge of 0_7_6_ATCS and omicronrg9 2019-06-20 19:12:47 +02:00
Peter Anderson
65d2a73efa Removed 'guynmart_main_3' duplicate 2019-03-15 22:15:05 +02:00
Zukero
1df0534dc8 Merged ATCS project bugfix_0_7_4 (from rijackson's github repo) 2019-01-08 15:25:47 +01:00
Rijackson
7b6ff3e22f Removed map fields11a.tmx, which was causing conflicts with existing map fields11.tmx. fields11.tmx has been replaced with fields11a.tmx in bugfix project. 2018-08-04 18:09:50 -04:00
Zukero
4ab509aead ATCS Project stoutford_combined finally integrated! 2018-07-08 15:54:47 +02:00
Zukero
ce0e1871ab Merge branch 'master' into stoutford_tests 
# Conflicts:
#	AndorsTrail/res/raw/conversationlist_fallhaven_south.json
#	AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
#	AndorsTrail/res/raw/questlist_pathway_fallhaven.json
 2018-07-08 15:41:51 +02:00
Rijackson
60e9fa7073 Initial Teksin commit 2018-06-13 18:20:49 -04:00
NutAndor
e00ec840a1 Merge pull request #5 from Zukero/master 
merge zukeros master into nuts stoutford_tests
 2018-06-07 23:04:45 +02:00
Nut
28ddc13217 adds to guynmart_merge 
I forgot loadresources.xml :(
and added me to authors.xml
 2018-06-04 01:22:59 +02:00
Nut
9992948740 Guynmart merge 
next try
 2018-06-03 15:39:33 +02:00
Zukero
520074bd12 Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/res/drawable/map_fence_4.png
	AndorsTrail/res/values/loadresources.xml
 2018-05-15 10:55:11 +02:00
Rijackson
e29bc07150 The graveyard and waterwaycave material from Gulisano and me. 2018-04-23 18:18:57 -04:00
Zukero
98ac4ba6ef Merge branch 'master' into stoutford_tests 2017-08-18 11:54:41 +02:00
Carceris Magister
101d722ae6 Fixed dangling reference in Mikhail's conversation list. 2017-08-17 09:16:36 -04:00
Zukero
45d3ab9fb5 Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/res/values/loadresources.xml
 2017-07-25 21:33:55 +02:00
Zukero
da0663bea6 Preparatory commit for the stoutford_roots_love ATCS project 2017-03-31 09:26:07 +02: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
7c97448d12 New spritesheets by JapoZero and Enterbrain 
(http://xxjapozeroxx.deviantart.com). Was originally 24x24, upscaled to
32x32, doesn't look too blurred to me. 
New content for Stoutford, especially Kayla's shop and dialogues.
 2016-08-12 15:30:41 +02:00
Zukero
c277ff4266 Stoutford's main quest done, but needs testing. 
Some crash points exists (don't trade with the thief)
 2016-07-21 16:23:32 +02:00
Zukero
6ca4786e6a First content for Stoutford. Minimalistic, should-not-crash-the-game 
kind of content.
 2016-01-07 18:24:58 +01:00
Zukero
b0061ee736 City of Stoutford added, and integrated. Now it needs people... 2016-01-06 23:18:52 +01:00
Zukero
268d8f3023 First merge of Halvor's "Surprise !" quest. 2015-12-08 15:08:56 +01:00
Zukero
b98ff6f601 Included new quest: pathway_fallhaven (Duleian road shortcut) 2015-08-13 16:33:51 +02:00
Zukero
903564a037 Fixed blocking & crashing bugs in shortcut_lodar. 
Boosted debug values to cope with swarm of Hirathils.
 2015-08-10 17:25:04 +02:00
Zukero
84f152683e Some dialogue fixes 2015-08-10 16:54:54 +02:00
Zukero
46ae78b8d9 Added missing BWM map (39a) to resource list. 
Added limit to 32x32 bitmap loading (<32x32px for density <1, ==32x32px
for density >=1).
 2015-04-29 18:18:08 +02:00
Zukero
348c9d215d Fixed bugs introduced by new BWM maps. 2015-04-13 17:23:37 +02:00
Oskar Wiksten
83d2a8bde0 Convert all code spaces to tabs. 
* Yay for spaces-vs-tabs flamewar!
* Also removes trailing whitespaces in code
 2013-07-23 16:36:26 +02:00
Oskar Wiksten
f5dc0c877b Add quest "Taste is everything" for making antidotes 2013-07-15 10:44:52 +02:00
Oskar Wiksten
32df0fd717 Finishing up Charwood and Lodar quests. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
7088faaf8a Populating lostmine* maps with monsters. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
33b8d4fe3a Populating charwood* and lodar* maps with monsters. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
dcd8337ff3 Added conversations, monsters, quests for v070. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
58a14d3e58 Added tradehouse0a map (basement in Charwood cabin). 2013-06-27 20:45:17 +02:00
Oskar Wiksten
8cdcbdc75d Updated lostmine* maps. 
Added tradehouse* maps to loadresources.
Made all tiles of all mapchange areas walkable.
 2013-06-27 20:45:16 +02:00
Oskar Wiksten
ac42088c03 New maps for v0.6.12 from Ian Haase. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
68de0fc9a9 Added items for v0.7.0 2013-06-27 20:45:15 +02:00
Oskar Wiksten
348b74ad7b Added worldmap alignment maps (thanks to Tomcat!) 2013-05-06 23:34:53 +02:00
Oskar Wiksten
52a5b8f387 Converted all resource files to json instead of our previous custom format. 2013-02-09 12:34:03 +01:00
Oskar Wiksten
7c38e0337d Changed all food to slowly heal over time instead of healing instantaneously. 2013-02-03 15:54:15 +01:00
Oskar Wiksten
2d8e4eefbf Added sign areas to all graves, with a short message describing each tombstone/cross. 2012-10-13 21:39:04 +02:00
Oskar Wiksten
2bd3016904 Initial work on item categorization. 2012-10-07 16:09:27 +02:00
oskar.wiksten
b184b3404b Updated version number to v0.6.11a1. 
Enabled all resources for v0.6.11.
Fixed issue with splatter effects not being redrawn properly when using "optimized drawing".
Fixed issue with HP bar not being updated by the regeneration skill on maps without monsters.

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@248 08aca716-68be-ccc6-4d58-36f5abd142ac
 2012-05-16 15:02:17 +00:00
oskar.wiksten
53d8f93a71 Added 78 new monsters for v0.6.11. 
Populated monsters on 33 new maps.
Started adding new actor conditions for v0.6.11.
Combine visual effect values for effects that are caused every turn, such as poison (issue 268)


git-svn-id: https://andors-trail.googlecode.com/svn/trunk@206 08aca716-68be-ccc6-4d58-36f5abd142ac
 2011-11-20 20:20:40 +00:00