Compare commits

..

404 Commits

Author SHA1 Message Date
Zukero
4a4cf36c02 New game objects methods available in scripting language. 2013-12-15 23:17:27 +01:00
Zukero
5886e746b5 Added player.base.ac & player.base.bc variables in scripting language. 2013-12-01 15:59:59 +01:00
Zukero
fc97efdf75 Engine updates.
New in-game hooks : item.onEquip & item.onUnequip
Many new variables accessible in scripting language :
- player.base.[maxAP, maxHP, ad.min, ad.max, equipCost, moveCost,
useCost]
- actor.[hp.cur, hp.max, ap.cur, ap.max, ad.min, ad.max]
2013-12-01 15:56:44 +01:00
Zukero
0d7ab1a710 Forgot to include new package to index in last commit... 2013-11-20 23:21:15 +01:00
Zukero
43e374e5d3 Items usage effects can be impacted (AP, HP), need to add some kind of
array support in the scripting language to add impact on actor
conditions.
ActorConditions can have scripted effects.
New values in the debug data to test it all ! An actor condition makes
your potions give twice as much HP !
2013-11-19 23:54:28 +01:00
Zukero
05dae1bc74 New primitive operator : '%' used for string concatenation. Works using
.toString(), so it's rather type independant.
New in-game hook : item.onUse. Unfinished because it can't impact te
effects of the item, only add more effects (positive or negative)
New local variable scope awareness system. No-more "all-purpose"
Hashmap, but a dedicated object.
2013-11-18 23:26:13 +01:00
Zukero
f592207470 New in-game hook : player.statsUpdated to be used by Actor Conditions,
items (and skills in the future) to impact player's stats (AC, BC, AD,
HP...)
Enhanced local variables handling by script parser. Now scope-aware.
Implemented the public vs private scripts system : some game objects
have private scripts, that get executed only when the object itself is
the cause of the event. Included example is a special case :
player.statsUpdated runs the player's actor condtion and equiped items
private scripts that trigger on plyaer.statsUpdated.
Added scripts reference parsing in JSON parsers, hooked to items and
actor conditions.
2013-11-16 17:19:05 +01:00
Zukero
8a62fb847f Rebased on latest upstream master 2013-11-04 20:49:56 +01:00
Zukero
0028d361c6 Almost full engine rewrite. Only grammar & in-game hooking system kept.
* No script text interpreter anymore
* Scripts are statically compiled to an object AST
* Engine can evaluate the script's AST without reflection, and minimum
casting
* Script local variables are preallocated, but without scope awareness
yet (declare them all at top level scope for max efficiency)
* While loop added
* Boolean AND and OR added.
* Boolean constants true & false added.
* String constants can be used as local variables.
2013-11-04 20:47:50 +01:00
Zukero
57a88f437f Engine updates
* Slightly more efficient interpreter
* ScriptEngine now implements existing listener interface instead of
in-code hooks
Language updates :
* actor references now expose the addActorCondition &
clearActorCondition methods
2013-11-04 20:47:49 +01:00
Zukero
9a8e7d3cb7 First working version of my scripting engine.
* Only two trigger types : map.onEnter & map.onLeave
* Very limited field access : player.ac; player.bc & map.outdoor
However, it is integrated & tested.
2013-11-04 20:44:12 +01:00
Oskar Wiksten
c002405008 Updated translations (thanks Marwane K. & Andrej Znidarsic) 2013-11-03 16:24:38 +01:00
Oskar Wiksten
d4ff63d456 Merge branch 'reduce-warnings' 2013-11-03 15:07:13 +01:00
Oskar Wiksten
e8d0162ceb Refactor: Reduce warnings / reduce scope 2013-11-03 15:05:27 +01:00
Oskar Wiksten
eba387159e Refactor: Use enum instead of int for result of loading a savegame 2013-11-03 15:05:21 +01:00
Oskar Wiksten
6006fe1eb5 Refactor: Don't use hardcoded text for placeholders 2013-11-03 14:57:07 +01:00
Oskar Wiksten
f6559cac31 Refactor: remove unused resources 2013-11-03 14:55:59 +01:00
Oskar Wiksten
9405ad323a Bugfix: do not hardcode map names when upgrading savegame 2013-11-03 12:40:13 +01:00
Oskar Wiksten
b0f9ba9abe Bugfix: Do not assume that all saved maps are visited
* Maps that have deactivated spawn areas should be saved, but does not neccessarily have to be visited.
2013-11-03 10:22:05 +01:00
Oskar Wiksten
086fb199cf Remove Fallhaven prisoner when reaching quest farrik:70 2013-11-03 09:35:21 +01:00
Oskar Wiksten
b898cf7f7c Rename TMX property "outside" to "outdoors".
* Outdoors is a better name for this, because that's what we actually mean by it. Outside is ambiguous in this context. Outside is what it's called in Swedish :)
2013-11-03 08:20:00 +01:00
Oskar Wiksten
aacf97e274 Add requirement type: "hasActorCondition"
* Enables scripts and conversations to choose options based on whether the player has a certain actor condition or not.
2013-11-02 10:24:07 +01:00
Oskar Wiksten
d58db6efc4 Merge branch 'activate-spawnareas' 2013-11-02 09:27:11 +01:00
Oskar Wiksten
4a1c6779cf Enable scripts to activate/deactivate spawn areas & mapobjects
Renames "isActive" on spawnareas to "isSpawning" - so that a spawn area can be non-spawning but still have monsters left in it.
Adds new scripteffect types:
* "spawnAll" = sets  spawn area to spawning and spawns all monsters
* "removeSpawnArea" = sets a spawn area to non-spawning and removes all mobs
* "deactivateSpawnArea" = sets a spawn area to non-spawning
* "activateMapChangeArea" = sets a mapchange area to non-active
* "deactivateMapChangeArea" = sets a mapchange area to non-active (so that it does not teleport the player)
Adds new property "active" to spawn- and mapchange areas in tmx files, that determines whether the areas are active when starting a new game.
2013-11-02 09:26:04 +01:00
Oskar Wiksten
a2caea0a83 Refactor: Flatten some forward-arrow-pattern ifs to vertical code 2013-10-27 15:29:27 +01:00
Oskar Wiksten
4209f91d00 Bugfix: also save maps that use non-default values
* For example, maps that have had some spawn area deactivated should be saved in the savegame.
2013-10-27 14:17:40 +01:00
Oskar Wiksten
88f15b9099 Merge pull request #10 from oskarwiksten/persist-isactive-on-mapobjects-in-savegames
Save 'isActive' for MapObjects & SpawnArea in savegames
2013-10-27 05:55:42 -07:00
Oskar Wiksten
20ed608523 Save 'isActive' for MapObjects & SpawnArea in savegames
* Stores the "isActive" boolean in savegames for map objects and spawn areas
* Adds functions in MapController to activate and deactivate MapObject areas
* Adds functions in MonsterSpawnController to activate and deactivate MonsterSpawnAreas
* When a spawn area is deactivated, all monsters should be removed, since the spawn area is considered to be non-existant.
* Adds boolean "isActiveForNewGame" to map objects and spawn areas, that specify what "isActive" should be set to when starting a game. (Initially, all of these are true)
* This commit does not add any way to actually activate or deactive areas. That can come as a later commit (possibly using script effects to do that).
2013-10-27 13:04:09 +01:00
Oskar Wiksten
c001532106 Merge branch 'rename-phrase-reward-to-script-effect' 2013-10-27 10:59:56 +01:00
Oskar Wiksten
a8ad00c21c Refactor: Rename PhraseReward -> ScriptEffect
* This commit does not contain changes to json field names when parsing phrases though.
2013-10-27 10:59:21 +01:00
Oskar Wiksten
079511a30c Rename file Reward.java -> ScriptEffect.java 2013-10-27 10:52:11 +01:00
Oskar Wiksten
6fce649cbb Always deny monster movement on mapchange,keyarea,rest - regardless of isActive 2013-10-27 10:12:27 +01:00
Oskar Wiksten
d2c3eb9106 Refactor: rename functions for saving PredefinedMap data 2013-10-27 09:33:24 +01:00
Oskar Wiksten
53331aef1b Code reformat: Ctor arguments should be one arg per line
* Vertical list makes it easier to version control additions and removals of single parameters
2013-10-27 09:09:09 +01:00
Oskar Wiksten
0570589ecc Refactor: Rename reset() -> resetForNewGame() on map data classes 2013-10-27 08:38:27 +01:00
Oskar Wiksten
9af062e36e Updated PO translations from launchpad 2013-10-26 11:39:19 +02:00
Oskar Wiksten
9fc23ca1fc Add "translator-credits" to english POT file
* Used by Launchpad translations for maintaining list of translators.
2013-10-26 10:23:12 +02:00
Oskar Wiksten
e509b1d75f Update english.pot, reformat all PO files (sort by source location) 2013-10-26 09:50:18 +02:00
Oskar Wiksten
339c3ee7b2 Renamed Brazilian Portuguese translation file: pt-rBR.po -> pt_BR.po 2013-10-26 09:44:40 +02:00
Oskar Wiksten
0c3b4bded9 Merge pull request #9 from Zukero/requirements_negation
Added requirement negation capability :
2013-10-23 09:22:22 -07:00
Zukero
c06dba6b7d Factorized the checkbox definition in content editor. 2013-10-23 18:08:09 +02:00
Zukero
707940aa14 Added requirement negation capability :
- Use "requireNegation" property in Tiled map object
- Checkbox for require.negate added in Content Editor
2013-10-22 23:10:24 +02:00
Oskar Wiksten
bdde9cefba Merge branch 'activable_map_objects' 2013-10-22 18:06:23 +02:00
Zukero
26c412f7f1 MapObject & MonsterSpawnArea can be activated/deactivated using theisActive boolean.
No handle exist yet to deactivate these areas.
Deactivated areas are never returned by PredefinedMap API.
Inactive container areas' Loot are not created on
createAllContainerLoot() calls. Think of creating it on area activation
when implemented (TODO label placed in the code to never forget :p)
Updated comment; fixed old, one-object processing to better match the
List type.
2013-10-22 18:05:51 +02:00
Oskar Wiksten
159d977187 Merge pull request #7 from Zukero/debug_resources_bugfix
Fixed deprecated use of "consumedMore" instead of "spentGold" in
2013-10-22 06:38:27 -07:00
Zukero
e33ac42c1c Fixed deprecated use of "consumedMore" instead of "spentGold" in
conversationlist_debug.json
2013-10-22 15:18:44 +02:00
Oskar Wiksten
76720094c1 Merge pull request #6 from Zukero/map_object_group_data_kept
MapObject & MonsterSpawnArea now keep track of their Tiled group's name.
2013-10-20 23:39:38 -07:00
Zukero
c4896aaab3 Tiled group name also in ReplaceableMapSection 2013-10-20 22:18:42 +02:00
Zukero
bddb3e2a8c MapObject & MonsterSpawnArea now keep track of their Tiled group's name. 2013-10-20 22:14:35 +02:00
Oskar Wiksten
7f2388904b Minor gfx update to tiling pine trees 2013-10-20 10:30:01 +02:00
Oskar Wiksten
73e8851f27 Bugfix: Redraw whole screen if double-buffer is not pre-filled
* Fixes issue where the screen was only partially drawn after having entered heroinfoactivity before starting combat.
* lockCanvas() changes the supplied Rect object occasionally, to indicate that the double buffer has not been filled. In those cases, you need to redraw the whole rect.
2013-10-20 10:00:20 +02:00
Oskar Wiksten
a0f943994f Bugfix: Continue combat after having seen the combat log
* Previously, combat was stopped when entering the combat log. This commit makes the combat continue after having been stopped.
2013-10-20 09:03:53 +02:00
Oskar Wiksten
518934751b Merge branch 'new_tilesets_20131005' 2013-10-05 17:56:12 +02:00
Ian Haase
36da967dbe updated tilesets + template.tmx and authors.xml 2013-10-05 17:55:57 +02:00
Oskar Wiksten
9812dc6344 Merge pull request #5 from Zukero/master
Egocentric commit. Added my name in the authors...
2013-10-03 13:32:43 -07:00
Zukero
5daf70e739 Egocentric commit. Added my name in the authors... 2013-10-03 22:27:11 +02:00
Oskar Wiksten
0a8859b304 Add explicit quest stages to existing key areas 2013-10-03 08:27:11 +02:00
Oskar Wiksten
3cee7e95d2 Merge branch 'key_area_use_requirements' 2013-10-03 08:26:26 +02:00
Zukero
140dd16408 Key Area now use Requirement, instead of QuestProgress
* Requirement class moved from model.conversation to model.script
* Added requirement questLatestProgress : quest stage must be reached, but no stage with superior ID must be reached.
* New key requirements conditions type (item/gold/bonemeals) consumption (more or less than value, never strict checking, either <= or >=).
2013-10-02 18:21:14 +02:00
Oskar Wiksten
9af294932f Remove unused code 2013-09-25 22:30:10 +02:00
Oskar Wiksten
5136a7cab0 Merge branch 'headless-scripts' 2013-09-25 17:55:25 +02:00
Oskar Wiksten
b41fffee44 Content editor: Add support for giveItem,createTimer and timerElapsed in convs 2013-09-25 17:54:08 +02:00
Oskar Wiksten
0212dd6bbc Add world timers and world time (counted in number of rounds)
* Increase world time each round.
* Add script reward "createTimer"
* Add script requirement "timerElapsed"
2013-09-25 17:54:08 +02:00
Oskar Wiksten
d6583a4e33 Add reward type "giveItem", for quest rewards that do not need full droplists. 2013-09-25 17:54:08 +02:00
Oskar Wiksten
02bfeb5625 Enable map scripts to run on every round or tick 2013-09-25 17:54:08 +02:00
Oskar Wiksten
dc278fb5da First attempt at scripted map areas 2013-09-25 17:54:08 +02:00
Ian Haase
8d91c7375d recolored dirt transitions 2013-09-25 17:47:10 +02:00
Oskar Wiksten
d13cd4c02a Add preference "use localization", to allow disabling partial translations 2013-09-08 16:56:03 +02:00
Oskar Wiksten
787fcc0a65 Rearrange worldmap.xml (sort by name) 2013-09-02 20:45:53 +02:00
Oskar Wiksten
d29218c7c3 Prepare data placeholder "worldData". 2013-08-31 19:28:09 +02:00
Oskar Wiksten
9c78b6a2ec Refactor player combat round methods 2013-08-31 19:21:37 +02:00
Oskar Wiksten
96d451ffbe Worldmap tile alignment (awesome work by Tomcat!) 2013-08-30 21:04:08 +02:00
Oskar Wiksten
2dfed6847c Content editor: Display phrase rewards and replies as divs instead of table 2013-08-27 22:54:23 +02:00
Oskar Wiksten
0992053a72 Bugfix: Realign tiles in Fallhaven (thanks Mayweed & Tomcat) 2013-08-24 17:05:38 +02:00
Oskar Wiksten
a1da45ce3f Refactor: Changed namespaces, reorganized imports. 2013-08-24 13:51:59 +02:00
Oskar Wiksten
89a64bbdea Content editor: Add support for switching active NPC in dialogue 2013-08-20 20:42:12 +02:00
Oskar Wiksten
06feff98c1 Update Elwyl/Elwel conversation to switch active NPC 2013-08-20 20:42:12 +02:00
Oskar Wiksten
8611148530 Conversations with more than one NPC
* Add "switchToNPC" property on phrases, that should contain the monsterTypeID of the NPC that should tak over the dialogue.
2013-08-20 20:42:12 +02:00
Oskar Wiksten
126eb49e10 Use long param names when starting local Content Editor 2013-08-20 20:41:34 +02:00
Oskar Wiksten
f620ca924e Bugfix: Exclude hidden quests from completed quests statistics (thanks jlhromeo!) 2013-08-20 19:45:39 +02:00
Oskar Wiksten
fb1782bb7e Conversation spelling corrections (thanks LoveToFlyGuy!) 2013-08-19 20:06:13 +02:00
Oskar Wiksten
a87605661b Merge branch 'master' of https://code.google.com/p/andors-trail 2013-08-19 20:01:52 +02:00
Oskar Wiksten
0bcd41b2ef Waterfall tiles (thanks red hatter!) 2013-08-19 20:01:04 +02:00
Ian Haase
73894752f2 added a new tutorial called "Advanced Mapmaking". 2013-08-17 13:13:01 +02:00
Ian Haase
32a3d9c964 Updated map editor tutorial 2013-08-16 12:28:23 +02:00
Ian Haase
5bff7c79d2 Revert "Update on the Map Editor wiki: http://andorstrail.com/wiki/doku.php?id=andors_trail_wiki:developer_section:map_editor"
This reverts commit dd6431cb1b.
2013-08-16 12:05:15 +02:00
Ian Haase
dd6431cb1b Update on the Map Editor wiki: http://andorstrail.com/wiki/doku.php?id=andors_trail_wiki:developer_section:map_editor 2013-08-16 12:02:16 +02:00
Oskar Wiksten
b810a6e91e Add monster movement type 'wholeMap'.
* Monsters with this movement type can even move outside their own spawn areas.
2013-08-08 17:14:48 +02:00
Oskar Wiksten
16e8a5fdbe Bugfix: only use pathfinder for monsters that are aggressive 2013-08-08 11:31:06 +02:00
Oskar Wiksten
a83271c3a9 Bugfix: Show correct ingreds for Lodar def pot in the quest log (Thanks jamnjim358) 2013-08-05 10:54:27 +02:00
Oskar Wiksten
b6c2beb348 Bugfix: Clear temporay combat state when loading game
Fixes issue with not being able to attack in combat after having exited combat during monster's attack animation.
2013-08-05 10:27:17 +02:00
Oskar Wiksten
3b938c3a0a Refactor: Use more enums instead of const ints 2013-08-05 10:17:14 +02:00
Oskar Wiksten
98f6cd0f97 Bugfix: Redraw everything once initially
* Fixes issue with black screen during combat on Android >= 4.2
2013-08-05 09:32:03 +02:00
Ian Haase
fcabb356ce Updated scarydungeon1. 2013-08-04 10:48:48 +02:00
Oskar Wiksten
7486e130f8 Renamed mapmaking tutorial map 2013-08-03 11:58:05 +02:00
Oskar Wiksten
8bb663a739 Update version to v0.7.1dev 2013-08-03 11:56:49 +02:00
ian.haase2
784df46fb5 Updated scarydungeon1 map. 2013-07-29 17:43:01 +00:00
Oskar Wiksten
918aeaedb3 Bump version to v0.7.0 (versioncode 39) 2013-07-23 18:12:42 +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
a54d0fd6e8 Bugfix: Load all icons for monsters spawned on maps, even when they're not part of the list of monsters that may spawn on maps 2013-07-23 13:46:10 +02:00
Oskar Wiksten
3523d0105c Update quest to state animal 'hair' instead of 'fur' (Thanks Sarumar) 2013-07-23 13:10:14 +02:00
Oskar Wiksten
8d719b4083 Update v070 maps/conversations after the Hirazinn has been killed 2013-07-23 13:04:51 +02:00
Oskar Wiksten
a2d9e20d3d Map tile alignment tweaking (thanks Tomcat!) 2013-07-23 11:51:17 +02:00
Oskar Wiksten
1b995e7af4 Bump version to v0.7.0a5 2013-07-20 11:54:06 +02:00
Oskar Wiksten
0bd2a820c7 Add % or "percentage points" to some skill descriptions (thanks Antison!) 2013-07-18 17:11:21 +02:00
Oskar Wiksten
a87629c925 Allow Charwood quest to progress without choosing skills 2013-07-18 16:53:36 +02:00
Oskar Wiksten
1baa787533 Minor tile changes to BWM maps 2013-07-18 15:35:36 +02:00
Oskar Wiksten
b28d896600 Add bars to the Charwood mine entrance when the player first visits 2013-07-18 14:05:37 +02:00
Oskar Wiksten
9fab58f239 Slightly shorter setting names for "Show loot dialog" (thanks Tomcat!) 2013-07-18 13:50:29 +02:00
Oskar Wiksten
656dd23407 Provide explicit buffer size when reading huge translation files 2013-07-18 13:14:19 +02:00
Oskar Wiksten
24e1aab8be Minor fix for Portuguese(BR) translation. 2013-07-18 10:15:41 +02:00
Oskar Wiksten
b13caa40b0 Bugfix: Update "attack" button to "move" when fleeing. 2013-07-16 23:13:50 +02:00
Oskar Wiksten
3f9cf63463 Bump version to v0.7.0a4 2013-07-16 10:45:25 +02:00
Oskar Wiksten
c24c264f1e Bugfix: auto-hide quickslots when displaying worldmap and preferences.showQuickslotsWhenToolboxIsVisible = true 2013-07-16 10:45:15 +02:00
Oskar Wiksten
919132a564 Minor stats change to v070 mobs 2013-07-16 10:39:32 +02:00
Oskar Wiksten
c7cd8e6d17 Map tile alignment tweaking (thanks Tomcat!) 2013-07-16 09:39:53 +02:00
Oskar Wiksten
5e1f91bad4 Changing all const ints to enums, making the json resource files much easier to read
* Though, the json files will get a bit larger.
2013-07-16 02:35:59 +02:00
Oskar Wiksten
b4f7d1fe42 Add more requirement types to phrase replies: "killed monster" & "skill level" 2013-07-15 20:52:00 +02:00
Oskar Wiksten
3b70013a98 Provide options of mixing potions in x5 and x10 quantities at Lodar and the Fallhaven potion maker 2013-07-15 20:25:27 +02:00
Oskar Wiksten
2002b1a668 Update conversations to make use of the multiple requirements per reply
* Some previous conversations used several scripted phrases to remove more than one item type. Now that we can remove multiple item types with one phrase, we can just combine all those.
2013-07-15 19:59:47 +02:00
Oskar Wiksten
d05baa266e Update conversations with requirements into using the array-based requirements 2013-07-15 18:36:40 +02:00
Oskar Wiksten
cf9b485971 Modify Reply quest- & item requirements into an array of requirements 2013-07-15 18:36:05 +02:00
Oskar Wiksten
dfe7fde7e3 Refactor JSON array parser to not create as many "new ArrayList<>" instances 2013-07-15 16:38:28 +02:00
Oskar Wiksten
9dafe1f410 Change hard hit to 0-2 dmg instead of 1-1. 2013-07-15 15:24:10 +02:00
Oskar Wiksten
f207ad3990 Bugfix: Only decrease HP by 1 (and not 3) when full health and having sustenance+food poison
* Apply negative effects first (for example, food poison), so that the positive effect (for example, sustenance) can have some effect.
2013-07-15 13:49:47 +02:00
Oskar Wiksten
44511650a1 Map tile alignment tweaking (thanks Tomcat!) 2013-07-15 11:33:01 +02:00
Oskar Wiksten
7b1980a8e3 Minor change to dialogue of Umar in Fallhaven thieves guild. 2013-07-15 10:53:49 +02:00
Oskar Wiksten
f5dc0c877b Add quest "Taste is everything" for making antidotes 2013-07-15 10:44:52 +02:00
Oskar Wiksten
66efb43925 Spelling corrections (Thanks Pyrizzle) 2013-07-14 18:41:29 +02:00
Oskar Wiksten
815dd91219 Map tile alignments (thanks Tomcat!) 2013-07-13 16:06:03 +02:00
Oskar Wiksten
ad041e0b01 Bugfix: Do not redraw tiles outside mapview area when running visual effects 2013-07-13 13:31:55 +02:00
Oskar Wiksten
ac90febeb1 Add setting "Show quickslots when toolbox is opened" 2013-07-13 13:00:14 +02:00
Oskar Wiksten
11c154f5df Only reset timers for rounds after combat ends, and not when changing maps.
* Previously, if you started conversation, entered some other activity or dialog, the round timers were reset each time, making the rounds less likely to happen.
2013-07-13 11:35:03 +02:00
Oskar Wiksten
f9902799f9 Map tile alignment tweaking (thanks Tomcat!) 2013-07-11 21:39:42 +02:00
Oskar Wiksten
afb7f1e12d Fix warning about leaked window from LoadingActivity
* Removes this warning: "WindowLeaked: Activity com.gpl.rpg.AndorsTrail.activity.LoadingActivity has leaked window com.android.internal.policy.impl.PhoneWindow$DecorView"
2013-07-10 21:23:08 +02:00
Oskar Wiksten
10f95613e2 Updated translations with missing strings from questlist.json 2013-07-09 19:30:27 +02:00
Oskar Wiksten
c51952186c Possible bugfix for NPE on hero&shop screens on droid2.1 (thanks Mayweed!) 2013-07-08 23:33:17 +02:00
Oskar Wiksten
3061b9a333 Remove crit. hit immunity from undead. Add crit. hit immunity to constructs. 2013-07-07 18:12:20 +02:00
Oskar Wiksten
41e9c747f1 Bump version to v0.7.0a3 2013-07-07 16:23:15 +02:00
Oskar Wiksten
b0e37131dc Add description to RoLS 2013-07-07 16:23:06 +02:00
Oskar Wiksten
649eac87c7 Add CS to 2handed weapons with CM 2013-07-07 16:22:46 +02:00
Oskar Wiksten
100f091ea9 Updated english.pot 2013-07-07 15:50:48 +02:00
Oskar Wiksten
f797a5bb32 Map alignment tweaks (thanks Tomcat!) 2013-07-07 15:26:55 +02:00
Oskar Wiksten
d0f387268e Slight bump to heavy armor skill 2013-07-07 14:42:57 +02:00
Oskar Wiksten
b3784b6b4b Bugfix: Show loot dialog box even if no monsters dropped anything 2013-07-06 16:46:47 +02:00
Oskar Wiksten
bf94eee299 Changed all <string-array> into referencing @string/ values
* Will make translation easier when adding new items in existing string arrays.
2013-07-06 16:19:24 +02:00
Oskar Wiksten
a0b31542e4 Add more settings to control how loot bags are presented 2013-07-06 15:09:46 +02:00
Oskar Wiksten
8db91f0970 Minor content fixes to v070 content
* Thanks to only1doug, Antison, sorrow, Mety, SkrikRunkarN, Sarumar, Mayweed
2013-07-06 12:59:47 +02:00
Oskar Wiksten
146c4b795a Bugfix: Only remove one item per click when picking up single items from ground bags 2013-07-06 12:05:03 +02:00
Oskar Wiksten
daec6ee814 Basic UI styling for game statistics 2013-07-06 11:02:13 +02:00
Oskar Wiksten
4ead45744e Added game statistics to hero overview screen 2013-07-06 01:01:49 +02:00
Oskar Wiksten
f16149bccb Start using FragmentActivity & FragmentTabHost for tabs instead of TabHost. 2013-07-05 22:26:15 +02:00
Oskar Wiksten
3dcc608cc1 Add rapier item category to 1h sword proficiency skill 2013-07-02 22:02:21 +02:00
Oskar Wiksten
65419b40b1 Bump version to 0.7.0a2 (versioncode 38). 2013-07-02 01:03:59 +02:00
Oskar Wiksten
45b7a0e9a8 Minor cosmetic changes to v070 maps and content.
* Thanks Mayweed!
2013-07-02 00:58:16 +02:00
Oskar Wiksten
07ad3b37b7 Fix newlines in po translation files. 2013-07-02 00:40:14 +02:00
Oskar Wiksten
81aebe0ba9 Updated english.pot according to v0.7.0 minor changes. 2013-07-02 00:40:00 +02:00
Oskar Wiksten
f0b7d78df1 Slight bump to Hira'zinn stats. 2013-07-01 23:18:21 +02:00
Oskar Wiksten
26ccfee924 Bugfix: Do not set a new combat target after running animation when combat has ended. 2013-07-01 23:00:39 +02:00
Oskar Wiksten
fd2014a697 Add warning on the startscreen about savegames in alpha- and beta version. 2013-07-01 20:09:00 +02:00
Oskar Wiksten
c4908630c3 Change "weapon proficiency"-skills to adding %ac,%bc,%cs instead of fixed values
* Also, lower "weapon and shield" and "2hand style" slightly.
2013-07-01 19:15:38 +02:00
Oskar Wiksten
2deb8ee7ac Bugfix: Save spawned monsters on current map after having rested there. 2013-06-30 16:37:36 +02:00
Oskar Wiksten
341f27351a Remove quest "lodar13_rest" from questlog if player attacks both parties 2013-06-30 14:39:54 +02:00
Oskar Wiksten
d5acf6b842 Make Charwood goblins more visible. 2013-06-30 13:53:39 +02:00
Oskar Wiksten
6aa8eeb760 Bugfix: Do not display double loot msgs about picked up gold.
* Also, refactor the loot popups to display toast even when the monster does not drop anything. (Should still display the exp)
2013-06-30 13:24:25 +02:00
Oskar Wiksten
aa6a0baec6 Nerfing the Xul'viir. 2013-06-30 01:00:01 +02:00
Oskar Wiksten
9f412d02d4 Spelling corrections for v0.7.0. 2013-06-29 23:45:23 +02:00
Oskar Wiksten
08aa1b041b Bugfix: Correctly restore conversation history after rotating device 2013-06-29 19:43:11 +02:00
Oskar Wiksten
8527b3a7c0 Fall back to using old worldmap filenames when displaying worldmap and new filenames does not exist. 2013-06-29 18:41:21 +02:00
Oskar Wiksten
8ac12ac960 Add preferences for setting position of quickslots 2013-06-29 18:11:07 +02:00
Oskar Wiksten
7eeab282b7 Bugfix: Do not emit onActorConditionRoundEffectApplied when an actor condition doesn't have any effect. 2013-06-29 17:28:11 +02:00
Oskar Wiksten
0bcf9730e2 Bugfix: Allow returning to conversation with Maevalia after giving Thukuzun quest item. 2013-06-29 17:24:23 +02:00
Oskar Wiksten
23d8cafad2 Bugfix: Dual-wielding negative effects & atk cost
* Dual-wielding items with negative effects should give 100% of the negative effect.
* Also apply atk cost effects of other items when dual-wielding.
2013-06-29 16:25:25 +02:00
Oskar Wiksten
db6539744b Add wild14_clearing to worldmap (thanks TomCat!) 2013-06-29 11:58:04 +02:00
Oskar Wiksten
25beb2638e Bump version to v070a1 2013-06-27 21:15:00 +02:00
Oskar Wiksten
7b136560e9 Converted all translated resources to .po format. 2013-06-27 21:02:42 +02:00
Oskar Wiksten
c6b57db426 Merge branch 'v070content' into v070 2013-06-27 20:45:29 +02:00
Oskar Wiksten
b95011b5d4 Minor fixes to v070 content. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
3776b33deb Minor fixes to v0.7.0 content after gameplay feedback. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
7d386240a1 Make tradehouse0 use replacement area instead of key area. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
0d3efd84ed Minor fixes to v070 content. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
f4d2438a2e Minor fixes for v070 content. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
91c22586a1 Spelling corrections for v070 quests. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
94b778af2b Populating shops for v070. 2013-06-27 20:45:17 +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
53fbe550aa Align mapchange areas roadbeforecrossroads1->roadbeforecrossroads2. 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
3a67a6af6a Updated lodar* maps with signs needed for the Lodar quest. 2013-06-27 20:45:17 +02:00
Oskar Wiksten
bda06f990b Update roadbeforecrossroads1 to match the description Ogam gives 2013-06-27 20:45:17 +02:00
Oskar Wiksten
c49bedb7fd Updated worldmap.xml according to lodar* maps. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
3df824bfb2 Updated lodar* maps with new tileset. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
df02938766 Spelling correction "Foaming Flask Tavern". 2013-06-27 20:45:16 +02:00
Oskar Wiksten
15cf74359e Moved a lot of tiles to the correct layers and updated tile walkable state on a lot of tiles. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
158d015f1e Updated worldmap.xml 2013-06-27 20:45:16 +02:00
Oskar Wiksten
c87d31ec9c Added worldmap.xml 2013-06-27 20:45:16 +02:00
Oskar Wiksten
6649754e1f Cosmetic mapchanges. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
c1ed9d2ffa Minor changes to lodarhouse map. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
3d8090ad13 Make lodar* maps outdoor maps. Align lodar* and roadbeforecrossroads* maps to worldmap. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
d62d2e6603 Updated lodarcave* maps (thanks Ian Hasse). 2013-06-27 20:45:16 +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
4aeb88bf9a Added tradehouse* maps for v0.6.12. 2013-06-27 20:45:16 +02:00
Oskar Wiksten
6dc31e42e9 Minor adjustments to maps for v0.6.12 2013-06-27 20:45:16 +02:00
Oskar Wiksten
96ddc508a3 Aligned lodar* and roadbeforecrossroads* maps to fit into worldmap. Updated sizes of mapchange areas.
Updated worldmap with new maps.
2013-06-27 20:45:16 +02:00
Oskar Wiksten
dca9117a3f Corrected misspelled monster ids on new maps for v0.6.12. 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
8a492fed92 Merge branch 'translate_gettext' into v070 2013-06-27 20:44:58 +02:00
Oskar Wiksten
adee44524f Fix Android Lint warnings. 2013-06-27 20:44:46 +02:00
Oskar Wiksten
96bc4ec59c Preparation for placing translation files in "assets/" 2013-06-27 20:44:46 +02:00
Oskar Wiksten
7672827d1f Update visibility of methods used in unit tests. 2013-06-27 20:44:46 +02:00
Oskar Wiksten
a74bef815c Updated translation MO-file parser to read the MO filename from strings.xml. 2013-06-27 20:44:46 +02:00
Oskar Wiksten
48d315300e Parse translations from MO files. 2013-06-27 20:44:46 +02:00
Oskar Wiksten
c33ec5133f Merge branch 'pathfinder' into v070 2013-06-27 20:42:58 +02:00
Oskar Wiksten
87fa73a2a0 Fix merge issues after rebase. 2013-06-27 20:42:42 +02:00
Oskar Wiksten
048ea6b356 Do not wait for combat turns when monsters want to move, but cannot find a path. 2013-06-27 20:42:42 +02:00
Oskar Wiksten
bc52d9b7af Redraw tiles when monsters move in combat. 2013-06-27 20:42:42 +02:00
Oskar Wiksten
9b66c604e6 Make monster aggression a property per monster type (instead of being derived from the monster class)
* Add property movementAggressionType on MonsterType, that gets read when deserializing monster types from json.
* Add dropdown in monster editor in content editor, to set the monster aggression type.
2013-06-27 20:42:42 +02:00
Oskar Wiksten
7476bb3432 POC monsters moving during combat - Fix merge issues from master. 2013-06-27 20:42:42 +02:00
Oskar Wiksten
578c4e55f2 Make monster movement aggression based on monster type. 2013-06-27 20:42:42 +02:00
Oskar Wiksten
d84d6e6c12 First try at a Pathfinder for moving monsters towards the player based on different aggression types. 2013-06-27 20:42:42 +02:00
Oskar Wiksten
93c8a098bd Merge branch 'fightstyles' into v070 2013-06-27 20:42:26 +02:00
Oskar Wiksten
9d1720e19d Change "fighting bare hands" to "fighting unarmed". 2013-06-27 20:40:55 +02:00
Oskar Wiksten
61cbd29878 Fightstyles: Fix merge issues from master. 2013-06-27 20:40:55 +02:00
Oskar Wiksten
8b6aafc5bd Added better descriptions for the new skills. 2013-06-27 20:40:55 +02:00
Oskar Wiksten
dfff586d7d Better descriptions for some of the new skills. 2013-06-27 20:40:55 +02:00
Oskar Wiksten
0c376442bb Armor proficiencies should not affect items with negative stats. 2013-06-27 20:40:55 +02:00
Oskar Wiksten
83af64b4a3 Fixed issue with critical multipliers from main-hand weapons.
Fixed issues with weapon proficiency being applied after dual wielding bonuses (should be before dual-wielding bonuses)
Fixed issues with negative AC in offhand weapons not being taken into account when dual-wielding.
Equipping a regular weapon should replace two-hand weapon.
2013-06-27 20:40:55 +02:00
Oskar Wiksten
1bd20564fd Added weapon proficiency & fighting style skills. 2013-06-27 20:40:55 +02:00
Oskar Wiksten
e560bba808 Bugfix: Store all visited maps in savegame
* Required for keeping the "lastSeenLayoutHash" between savegames.
2013-06-27 20:24:42 +02:00
Oskar Wiksten
98caa3295e Fix some Android Lint warnings. 2013-06-26 22:26:57 +02:00
Oskar Wiksten
8517fa3615 Update list of authors. 2013-06-26 20:17:33 +02:00
Oskar Wiksten
98d2c89fed Minor map fixes. 2013-06-25 01:02:37 +02:00
Oskar Wiksten
4d80f1b41d Minor refactoring: Move code that happens after loading a game into Savegames.onWorldLoaded. 2013-06-24 21:08:29 +02:00
Oskar Wiksten
3688cb0914 Minor fixes to dynamic map tiles. 2013-06-22 17:48:02 +02:00
Oskar Wiksten
4a97466d51 Merge branch 'dynamic-layeredtilemap' 2013-06-22 16:31:48 +02:00
Oskar Wiksten
95c4ba9396 Only store first 4 bytes of map hashes (instead of the full 16byte md5sum)
* To keep savegame sizes smaller.
2013-06-22 16:31:39 +02:00
Oskar Wiksten
6c03b40262 Updated template.tmx - added "Replace" layer. 2013-06-22 16:21:25 +02:00
Oskar Wiksten
e65492c837 Worldmap: PNG file names now contain the hash of the tiles that the map contains.
* This way, when a map has some replacements applied, the hash will change, thus making it possible to have several different PNG files for each map, each with its own combination of replacements.
* Only display maps on worldmap that are visited by the current player.
* Update worldmap after replacements have been applied.
2013-06-22 16:21:25 +02:00
Oskar Wiksten
c34614f09b First attempt at dynamic map tiles that change based on quest progress. 2013-06-22 16:21:25 +02:00
Oskar Wiksten
0a9da53930 Revamped looks of crossglen.tmx 2013-06-18 19:59:35 +02:00
Oskar Wiksten
3051d904bd Merge branch 'move-iswalkable-to-layermap' 2013-06-16 10:44:34 +02:00
Oskar Wiksten
f861529564 When entering map, move ground loot bags on unwalkable tiles. 2013-06-16 10:43:56 +02:00
Oskar Wiksten
b455bf2dbe Speed up game start by not loading map layers
* This can be done by making the assumption that all tiles from the maps tilesets will be used.
2013-06-16 10:43:56 +02:00
Oskar Wiksten
cab1185f14 Move isWalkable from PredefinedMap to LayeredTileMap
* In effect, this will lower the amount of memory being used while running the game.
* The walkable bitmap will now be loaded at the same time that the image tiles are loaded for maps, and not when starting the game.
2013-06-16 10:43:56 +02:00
Oskar Wiksten
25fe0441c6 Minor map fixes 2013-06-15 20:18:41 +02:00
Oskar Wiksten
4148ff46be Moved spawn areas away from map edges and mapchange areas. 2013-06-15 11:26:53 +02:00
Oskar Wiksten
fac19a1561 Remove "respawn: false" from all tmx files (it's replaced by a property on the monstertype instead). 2013-06-15 11:25:44 +02:00
Oskar Wiksten
f9979f32dc Show quest progress updates in conversation. 2013-06-15 10:16:27 +02:00
Oskar Wiksten
9b7c5207d0 Add toolbox button for displaying combat log. 2013-06-15 09:40:53 +02:00
Oskar Wiksten
52cec01ed2 Remove in-game menu.
* Move Save from menu to toolbox
* Move preferences to startscreen
* Remove exit on startscreen
2013-06-14 21:41:49 +02:00
Oskar Wiksten
540ac0e87f Correct sizes on map tiles map_wall_2 and map_wall_3. 2013-06-12 00:18:08 +02:00
Oskar Wiksten
01e42134e2 Content editor: Do not default items to type "other". 2013-06-05 23:25:04 +02:00
Oskar Wiksten
21fe350280 Better error messages when reading malformed conversations. 2013-06-05 22:12:39 +02:00
Oskar Wiksten
a8b0d5dc49 Add monsters_demon2 to resourceloader. 2013-06-05 22:12:02 +02:00
Oskar Wiksten
82d8ee6280 Content editor: Fix missing reward type when importing conversations. 2013-06-04 20:11:25 +02:00
Oskar Wiksten
3069ab4819 Add bash script for starting editor locally. 2013-06-02 19:59:08 +02:00
Oskar Wiksten
bb953f9512 Minor fixes for reading slightly borked resource files. 2013-05-29 22:04:39 +02:00
Oskar Wiksten
fa8c31e695 Store list of maps in savegames as map<string> instead of indexed list.
* Do not store maps that have been visited or that have been reset.
* Reduces savegame filesize from ~83k to ~30k.
* Removes dependency on loading maps in a certain order (better for future refactorings).
2013-05-26 13:40:57 +02:00
Oskar Wiksten
cb6f84d2df Bugfix: Allow conversation options for "Feygard errands" in Vilegard even when the Vilegard quest has not been completed. 2013-05-19 18:16:23 +02:00
Oskar Wiksten
1df5d183dc Bugfix: Apply checks for whether the player can select replies on single "next" replies as well. 2013-05-12 13:14:08 +02:00
Oskar Wiksten
348b74ad7b Added worldmap alignment maps (thanks to Tomcat!) 2013-05-06 23:34:53 +02:00
Oskar Wiksten
53e10680fa Teleports in Throdna's throne room are only accessible by one way.
* Force the player to step on the sign tile before accessing the teleporters in the BWM throne room.
2013-04-21 21:05:34 +02:00
Oskar Wiksten
52c7cc5acc Content editor: Add hierarcical view of conversation phrases and replies. 2013-04-06 12:30:07 +02:00
Oskar Wiksten
729a2c98b7 Content editor minor fixes. 2013-04-01 14:50:45 +02:00
Oskar Wiksten
50cd3c20af Content editor: add column to monster table editor to view hit effects. 2013-03-31 18:07:16 +02:00
Oskar Wiksten
a29ebb466b Bugfix: change combat selection when a monster dies from a condition in combat. (thanks to Fala from the forums for finding it!) 2013-03-29 22:55:53 +01:00
Oskar Wiksten
bb314eea66 Raise taunt chance to 75%. 2013-03-29 22:44:27 +01:00
Oskar Wiksten
c8de0c8f77 Minor bugfixes to resource loaders
* Fail harder when TileManager hasn't allocated enough tiles for the preloaded icons.
* Minor tweak to misplaced tile on hauntedhouse3
* Weaken "strength" condition (prefer to control effect through magnitude instead)
* Load icons for "items_weapons_2".
* Do not require items to have "base market cost" (for example, when they are automatically priced)
2013-03-29 20:03:33 +01:00
Oskar Wiksten
84d01e1aed Content editor: Add "previous"/"next" buttons in editors for items, monsters and actor conditions. 2013-03-27 20:15:02 +01:00
Oskar Wiksten
dd51f5de6c Updates to content editor
* Do not reset store prices on items when changing between manual and automatic pricing.
* Correct urls on import/export pages to where the files are placed.
* Show indications in item table editor on effects that cause actor conditions.
2013-03-27 19:35:56 +01:00
Oskar Wiksten
5cb762113d Added more monster icons from the TomeTik set. 2013-03-17 14:28:16 +01:00
Oskar Wiksten
993ec1d194 Conste editor: Add "Add" button at the bottom of the table editor. 2013-03-16 13:13:13 +01:00
Oskar Wiksten
11c301a24c Content editor: Remember displayed columns in table editors when changing pages. 2013-03-16 12:29:53 +01:00
Oskar Wiksten
9a5cf33108 Add automatic cost calculations for items that have hit- or kill-stats that affect HP or AP. 2013-03-16 10:38:19 +01:00
Oskar Wiksten
c2de054cf5 Add automatic cost calculations for items that have "increase use item cost" or "increase reequip cost"-stats. 2013-03-16 10:00:28 +01:00
Oskar Wiksten
bea69f06bf Content editor: Only enable item's "has equip effects" if the item category is wearable. 2013-03-16 09:45:15 +01:00
Oskar Wiksten
626c558335 Content editor: Move reusable logic functions for calculating item cost & monster exp to separate js file. 2013-03-16 09:45:14 +01:00
Oskar Wiksten
73efe5e62b Content editor: Change name of js libraries folder "inc"->"lib". Add favicon image. Close icon selector dialog by pressing escape button. 2013-03-16 09:45:13 +01:00
Oskar Wiksten
7d09202329 Bugfix content editor: treat number fields as numbers (and not strings) when calculating monster experience. 2013-03-10 13:40:42 +01:00
Oskar Wiksten
24c15a798a Bugfix: Read critical multiplier for weapons as float instead of int. 2013-03-10 13:18:18 +01:00
Oskar Wiksten
eb3f3f989d Bugfix: When exporting strings that start with a number (such as "2hsword"), only do integer conversion in the resulting JSON if the whole value is a number. 2013-03-09 23:45:38 +01:00
Oskar Wiksten
1cc20839ff Added some tiles for crates and stairs, from opengameart.org. 2013-02-24 18:18:37 +01:00
Oskar Wiksten
07bbe7dd9e Added lots of new tiles for monsters, items and effects from opengameart.org. 2013-02-24 17:25:23 +01:00
Oskar Wiksten
cc4827b1bd Refactor conversations to state machine - Move responsibility for starting combat & removing npcs from map from MainActivity into the ConversationController. 2013-02-22 14:10:05 +01:00
Oskar Wiksten
9fd5508070 Refactor conversations to state machine - minor bugfixes for "next" button disabling. 2013-02-22 14:09:31 +01:00
Oskar Wiksten
2da410118e Only notify rewards in conversation if there actually are any. 2013-02-22 12:14:59 +01:00
Oskar Wiksten
e965afc699 WIP move conversation logic to ConversationStatemachine - bugfix for selecting replies with requirements. 2013-02-21 14:29:25 +00:00
Oskar Wiksten
37ae3b6c69 WIP moving conversation flow logic from Activity to testable state machine. 2013-02-20 16:07:01 +00:00
Oskar Wiksten
6261c499ff Renamed "ViewContext" -> "ControllerContext" to better reflect its responsibility. 2013-02-20 15:30:53 +00:00
Oskar Wiksten
f5ff29a0fe Refactored results of phrase rewards, in preparation of displaying more results when gaining rewards. 2013-02-18 07:43:38 +00:00
Oskar Wiksten
24ab3b95f0 Updated IntelliJ Idea project file to work with any Android API version. 2013-02-15 15:14:49 +00:00
Oskar Wiksten
8575e89dee Update R.layout.inventoryitemview to a single TextView instead of a combined ImageView & TextView. 2013-02-15 12:04:05 +00:00
Oskar Wiksten
9bb1e73f07 Reduce compilation warnings from code inspection rules.
(Reduce visibilities to private, add final where applicable)
2013-02-15 09:59:57 +00:00
Oskar Wiksten
59df54f1bb Remove compilation warnings about showDialog() and removeDialog() being deprecated. 2013-02-15 07:50:45 +00:00
Oskar Wiksten
a8b21461de Minor refactoring CombatController. 2013-02-14 14:57:40 +00:00
Oskar Wiksten
f16cfa3ab0 Remove compilation warnings about "new BitmapDrawable(Bitmap)" being deprecated. 2013-02-14 14:57:00 +00:00
Oskar Wiksten
d2428ad36c Add IntelliJ Idea project file.
Add Android v4 support library.
2013-02-14 14:47:46 +00:00
Oskar Wiksten
91015e5ea7 Rearrange .gitignore. 2013-02-14 14:47:09 +00:00
Oskar Wiksten
668993c01b Add clear() method to event listener queues. 2013-02-13 15:31:11 +00:00
Oskar Wiksten
2bc06041ad Remove trailing spaces in some conversation phrase texts. 2013-02-12 13:58:46 +00:00
Oskar Wiksten
fb45d7e372 Add support for "description" field on items, for lore/background text that should be displayed on the item. 2013-02-11 11:10:00 +00:00
Oskar Wiksten
48d93fbbd0 Only apply "more criticals" skill if the player has CS>0. (Thanks to TriangleGM for reporting it!) 2013-02-09 17:02:33 +01:00
Oskar Wiksten
a32595c645 Refactor content editor - Correct spelling on tooltips. 2013-02-09 12:42:01 +01:00
Oskar Wiksten
370c62dc65 Merge branch 'revamped_editor' 2013-02-09 12:35:30 +01:00
Oskar Wiksten
4476d77a73 Refactor content editor - Added hints for most editable fields. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
cfeffe45f5 Refactor content editor - remove unused files. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
dadf68da42 Refactor content editor - Updated description for "isStacking" on actor conditions. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
059a68ddbe Refactor content editor - Minor layout issue on item table editor. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
7dbbcc45d0 Refactor content editor - Minor layout issue on item table editor. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
a3ff6fb722 Refactor content editor - Add table editor for items. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
09d4d39fe5 Refactor content editor - Provide table-based editor for monsters. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
7ef0152e4c Refactor content editor - Simplify item cost calculations. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
9f9d1ae5d5 Refactor content editor - Simplify monster exp calculation. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
d08af3a089 Refactor content editor - Removed old files. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
4a4450d20d Refactor content editor - Remove conversation tree. Provide links to follow conversation topics. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
8ec233096a Refactor content editor - Display (buggy) treeview for editing conversation phrases. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
f2b9e6a9f3 Refactor content editor - Reorganized files into separate directories. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
feb05838f8 Refactor content editor - work in progress on editor for dialogue. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
30d8cb3a0d Refactor content editor - Allow loading resources from existing json files. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
948bd2c215 Refactor content editor - Actually remove things from model when pressing "remove". 2013-02-09 12:35:17 +01:00
Oskar Wiksten
889c607f9a Refactor content editor - provide hovering hint on clickable icons. 2013-02-09 12:35:17 +01:00
Oskar Wiksten
bb33261d21 Refactor content editor - Enable popup to select icon for items, monsters and actor conditions. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
d1412d8c9d Refactor content editor - Handle unique monsters correctly. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
f9e0a3e591 Refactor content editor - display icons of items, monsters and actor conditions. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
cc0ff7bdb1 Refactor content editor - Remove unused files. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
3dfd070d0b Refactor content editor - More basic styling on import/export. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
5970a584f5 Refactor content editor - More baic styling 2013-02-09 12:35:16 +01:00
Oskar Wiksten
aa9480448d Refactor content editor - Basic ui styling 2013-02-09 12:35:16 +01:00
Oskar Wiksten
8f73b28979 Refactor content editor - Hide some item fields on standard layout. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
1d712006df Refactor content editor - Use default values correctly. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
d54c1ab6f8 Refactor content editor - Add support for loading actual content with http get. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
f80157a0d0 Refactor content editor - Add support for editing items and item categories. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
8570d4d760 Refactor content editor - Add support for editing droplists. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
c33cd6bd2a Refactor content editor - Added views for updating, exporting and importing quests and actor conditions. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
004a67f2c9 Refactor content editor - More work on default values for import/export. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
b9d36db162 Refactor content editor - Updated editor to use module pattern. Implemented import/export of json formats. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
6d05129384 Work in progress on updated Content editor that uses angular.js instead of jqueryui. 2013-02-09 12:35:16 +01:00
Oskar Wiksten
bc1fb7daa5 Merge branch 'resource_as_json' 2013-02-09 12:34:57 +01: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
76eaf13772 Minor fix to loading json files from raw/. 2013-02-09 11:10:30 +01:00
Oskar Wiksten
8e75512cfa Fixes to JSON parsing of resource files. 2013-02-09 11:10:30 +01:00
Oskar Wiksten
9ff01745d0 Read JSON resources from raw/ folder instead of encoded in string blocks from values/ folder. 2013-02-09 11:10:30 +01:00
Oskar Wiksten
89759f77f4 Updated parsers for reading resources as JSON. 2013-02-09 11:10:30 +01:00
Oskar Wiksten
81665520c0 WIP on parsing resource data as json instead of the old resource format. 2013-02-09 11:10:29 +01:00
Oskar Wiksten
4b8577e690 Increased exp reward for most quests tenfold. (Issue 283, thanks to jrozek!) 2013-02-09 11:08:27 +01:00
Oskar Wiksten
3bbd38548f Updated Polish translation by tobik9090siemens. 2013-02-09 09:10:46 +01:00
Oskar Wiksten
f358741d99 Merge branch 'healfood' 2013-02-06 07:54:22 +00:00
Oskar Wiksten
3da6d0808c Updated translations of itemlist with changes to how food is healing. 2013-02-06 07:53:37 +00:00
Oskar Wiksten
7a3e167bc5 Bugfix: Food poisoning should have an effect every round. 2013-02-03 15:54:15 +01:00
Oskar Wiksten
429429e63f Doubled the amount of health provided by all food items. 2013-02-03 15:54:15 +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
d0552dad83 Merge branch 'updated_tileset' 2013-02-03 10:37:45 +01:00
Oskar Wiksten
fbe7312e1c Updated maps from master. 2013-02-03 10:34:17 +01:00
Oskar Wiksten
278c605bdb Updated some map tiles. 2013-02-03 10:34:17 +01:00
Oskar Wiksten
eb8232af1f Updated tileset map_wall_1 2013-02-03 10:34:16 +01:00
Oskar Wiksten
ff3fb12a50 Updated tile size for cave walls. 2013-02-03 10:34:16 +01:00
Oskar Wiksten
91fc3a7745 Updated tmx files with new tileset files. 2013-02-03 10:34:16 +01:00
Oskar Wiksten
2ecd64c003 Updated map tileset image files. Updated template.tmx . 2013-02-03 10:31:50 +01:00
Oskar Wiksten
939a406b88 Realign waterway2 & waterway4 on worldmap. 2013-02-03 10:00:01 +01:00
Oskar Wiksten
3e5f77d891 Updated copyright notice to "2010-2013". 2013-02-02 13:56:26 +01:00
Oskar Wiksten
c4a10c5d7d Updated German translation from SamuelPlentz.
(From issue 331)
2013-02-02 13:25:29 +01:00
Oskar Wiksten
7d5084312a Updated list of authors with Polish translator tobik9090siemens. 2013-02-02 13:16:38 +01:00
Oskar Wiksten
8f5c35fabb Updated Russian translation from istasman.
Added istasman to list of authors for Russian translation.
(From issue 332 and issue 333)
2013-02-02 13:11:53 +01:00
Oskar Wiksten
8f3a22beb4 Changed visibility of methods used in unit tests. 2013-01-28 01:30:37 +01:00
Oskar Wiksten
109fb5ecfb Merge branch 'refactor_listener' 2013-01-28 01:27:31 +01:00
Oskar Wiksten
159bc8799f Merge branch 'actortraits_refactoring' 2013-01-28 01:27:20 +01:00
Oskar Wiksten
33345acabd Add public visibility for methods used in unit tests. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
215dd4e31f Updated .gitignore 2013-01-28 01:25:54 +01:00
Oskar Wiksten
be2e54978d Refactor: moved "Savegames" class into savegames package. Moved ListOfListeners into util package. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
16a69bf48c Bugfix: clone list of monster loot bags when picking up items (prevents double drops). 2013-01-28 01:25:54 +01:00
Oskar Wiksten
ad36da6418 Code cleanup: make classes final where possible. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
e3406df935 Emit "new map" events on calling thread, and not inside the async maploading handler. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
e2446d153e Only redraw game screen when something inside the view has actually changed. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
1032b2ee51 Provide reference to current map object when emitting monster spawned events. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
6a59f5d99e Use correct previousPosition when moving monsters. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
5d437db461 Use WeakReference<> for references to application instance. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
32e9a92fef Work in progress on moving ui dependencies away from model. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
e3ea3342c5 Work in progress on moving UI dependencies into being pubsub instead of direct calls from model->ui. 2013-01-28 01:25:54 +01:00
Oskar Wiksten
a99b0fc96f Initialize Player & Monster health correctly when respawning either one. 2013-01-28 01:01:29 +01:00
Oskar Wiksten
a50c1a1279 Actor traits refactoring - Reworked UI for displaying the actor stats tableview. 2013-01-28 01:01:29 +01:00
Oskar Wiksten
2ac6762f2f Actor traits refactoring - Remove ActorTraits & CombatTraits. 2013-01-28 01:01:29 +01:00
Oskar Wiksten
2770d2156f Actor traits refactoring - Make sure Monster and Player objects are serialized and deserialized correctly. Cleanup dead code. 2013-01-28 01:01:23 +01:00
Oskar Wiksten
ca4ad69f36 WIP 6 - Moved around lots of properties. 2013-01-28 01:01:23 +01:00
Oskar Wiksten
be5298c247 WIP 5 refactor actor traits - Moved name & tileSize from ActorTraits to Actor. 2013-01-28 00:59:23 +01:00
Oskar Wiksten
844afc2a95 WIP 4 actor traits refactoring - Created savegame loaders for pre-versioncode-33. 2013-01-28 00:59:23 +01:00
Oskar Wiksten
21fca91ca7 WIP 3 refactoring actor traits - moved iconID && tileSize to Actor. 2013-01-28 00:59:23 +01:00
Oskar Wiksten
bf809df44f WIP 2 moved fields from ActorTraits onto ActorTraits. 2013-01-28 00:59:22 +01:00
Oskar Wiksten
81c2c2bc40 WIP 1 renamed Actor.actorTraits -> Actor.baseTraits. Added BaseTraits to MonsterType. 2013-01-28 00:59:22 +01:00
Oskar Wiksten
ae99a66e28 Updated .gitignore with files produced by IntelliJ Idea. 2013-01-28 00:44:18 +01:00
Oskar Wiksten
e02e55d041 Merge branch 'production' 2013-01-28 00:42:17 +01:00
Oskar Wiksten
4af99e3d21 Merge branch 'master' of https://code.google.com/p/andors-trail 2013-01-28 00:41:38 +01:00
Oskar Wiksten
6d2b97d8d2 Bugfix - Prevent force-close when a monster dies from a lingering actor condition (issue 336). Thanks to Xero from the forums for finding the bug! 2013-01-28 00:39:49 +01:00
Scott Devaney
4ed1bcb445 Updated Polish translations by tobik9090siemens 2013-01-27 18:21:22 -05:00
unknown
61c3e65a76 New Polish translations by toudi5 2013-01-20 11:50:12 -05:00
unknown
fbb516e154 surgecurrent updated ja content_conversantionlist.xml 2013-01-03 2013-01-15 15:39:43 -05:00
Oskar Wiksten
f986391073 Add possibility of having skills that require a quest-level-up before the player can level them up. 2012-11-10 23:08:38 +01:00
Oskar Wiksten
76a3259b84 Bugfix - Disable input before the SurfaceView on MainView is created. 2012-11-10 20:54:17 +01:00
Oskar Wiksten
d375c1b4d8 Added link to Andor's Trail wiki in About/Help. 2012-11-10 16:58:44 +01:00
Oskar Wiksten
c018728197 Add a way to automatically in-game modify how bright maps are displayed, with a colorfilter. Will be used for dungeons that can get automatically darkened, without having to add that to the map files. 2012-11-10 16:33:56 +01:00
Oskar Wiksten
b85943fa80 Bump version number to v0.7.0dev 2012-11-10 13:19:13 +01:00
Oskar Wiksten
f20dc03775 Update .gitignore to exclude IntelliJ workspace files. 2012-11-10 13:17:32 +01:00
1171 changed files with 276428 additions and 52950 deletions

View File

@@ -4,5 +4,6 @@
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

View File

@@ -1,5 +1,16 @@
gen
bin
assets
# Android ignores
gen/
bin/
target/
local.properties
#IntelliJ
.idea/
out/production/
out/test/
*.iws
*.ipr
# Other
.metadata
.svn
.svn/

View File

@@ -1,4 +0,0 @@
gen
bin
.metadata
.git

View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="EclipseModuleManager" forced_jdk="true">
<conelement value="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK" />
<conelement value="com.android.ide.eclipse.adt.LIBRARIES" />
<src_description expected_position="1">
<src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
<src_folder value="file://$MODULE_DIR$/gen" expected_position="1" />
</src_description>
</component>
<component name="FacetManager">
<facet type="android" name="Android">
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/bin/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/libs/android-support-v4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

View File

@@ -3,13 +3,13 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gpl.rpg.AndorsTrail"
android:versionCode="33"
android:versionName="0.6.12"
android:versionCode="40"
android:versionName="0.7.1dev"
android:installLocation="auto"
>
<uses-sdk
android:minSdkVersion="4"
android:targetSdkVersion="10"
android:targetSdkVersion="17"
/>
<supports-screens
@@ -28,7 +28,8 @@
android:name=".AndorsTrailApplication"
android:label="@string/app_name"
android:icon="@drawable/icon"
android:description="@string/app_description"
android:description="@string/app_description"
android:allowBackup="true"
>
<activity
android:name=".activity.StartScreenActivity"
@@ -58,10 +59,6 @@
<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@android:style/Theme.Dialog" />
<activity android:name=".activity.BulkSelectionInterface" android:theme="@android:style/Theme.Dialog" />
<activity android:name=".activity.SkillInfoActivity" android:theme="@android:style/Theme.Dialog" />
<activity android:name=".activity.HeroinfoActivity_Quests" />
<activity android:name=".activity.HeroinfoActivity_Stats" />
<activity android:name=".activity.HeroinfoActivity_Skills" />
<activity android:name=".activity.HeroinfoActivity_Inventory" />
<activity android:name=".activity.DisplayWorldMapActivity" />
</application>

View File

@@ -0,0 +1 @@
*.mo

View File

@@ -0,0 +1,8 @@
#!/bin/sh
# Creates translation .mo files (binary) from the .po files (text).
# The game reads .mo files, so this needs to be run before building.
for i in *.po ; do
msgfmt "$i" -o $( basename $i .po ).mo
done

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,158 @@
# Spanish translation for andors-trail
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
# This file is distributed under the same license as the andors-trail package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: andors-trail\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: Sat Oct 26 09:46:51 CEST 2013\n"
"PO-Revision-Date: 2013-10-26 08:31+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Spanish <es@li.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-10-26 09:04+0000\n"
"X-Generator: Launchpad (build 16810)\n"
#: [none]
msgid "translator-credits"
msgstr ""
"Launchpad Contributions:\n"
" Julian Lamus https://launchpad.net/~lamusj\n"
" Miguel de Dios https://launchpad.net/~tres-14159"
#: actorconditions_v0611.json:contagion
msgid "Insect contagion"
msgstr "Insectos Contagioso"
#: actorconditions_v0611.json:stunned
msgid "Stunned"
msgstr "Aturdido"
#: actorconditions_v0611_2.json:concussion
msgid "Concussion"
msgstr "Conmoción cerebral"
#: actorconditions_v0611_2.json:crit1
msgid "Internal bleeding"
msgstr "Hemorragia interna"
#: actorconditions_v0611_2.json:crit2
msgid "Fracture"
msgstr "Fractura"
#: actorconditions_v0612_2.json:foodp
msgid "Food-poisoning"
msgstr "Comida Envenenada"
#: actorconditions_v069.json:bless
msgid "Bless"
msgstr "Bendecir"
#: actorconditions_v069.json:str
msgid "Strength"
msgstr "Fuerza"
#: actorconditions_v069_bwm.json:fatigue_minor
msgid "Minor fatigue"
msgstr "Fatiga Menor"
#: actorconditions_v070.json:regen2
msgid "Regeneration"
msgstr "Regeneración"
#: conversationlist_wrye.json:wrye_resolved_11
msgid "Oh my poor boy."
msgstr "Oh mi pobre niño"
#: itemcategories_1.json:2hsword
msgid "Two-handed sword"
msgstr "Espada de dos manos"
#: itemcategories_1.json:animal
msgid "Animal part"
msgstr "Partes de Animales"
#: itemcategories_1.json:axe
msgid "Axe"
msgstr "Hacha"
#: itemcategories_1.json:axe2h
msgid "Greataxe"
msgstr "Gran hacha"
#: itemcategories_1.json:bdy_hide
msgid "Hide armor"
msgstr "Ocultar armadura"
#: itemcategories_1.json:bsword
msgid "Broadsword"
msgstr "Sable"
#: itemcategories_1.json:buckler
msgid "Buckler"
msgstr "Escudo"
#: itemcategories_1.json:dagger
msgid "Dagger"
msgstr "Puñal"
#: itemcategories_1.json:drink
msgid "Drink"
msgstr "Bebida"
#: itemcategories_1.json:flask
msgid "Liquid container"
msgstr "Recipiente de líquido"
#: itemcategories_1.json:gem
msgid "Gem"
msgstr "Gemas"
#: itemcategories_1.json:hammer
msgid "Warhammer"
msgstr "Martillo de guerra"
#: itemcategories_1.json:hammer2h itemlist_weapons.json:hammer1
msgid "Giant hammer"
msgstr "Martillo Gigante"
#: itemcategories_1.json:lsword
msgid "Longsword"
msgstr "Espada Larga"
#: itemcategories_1.json:mace
msgid "Mace"
msgstr "Maza"
#: itemcategories_1.json:money
msgid "Money"
msgstr "Dinero"
#: itemcategories_1.json:pot
msgid "Potion"
msgstr "Poción"
#: itemcategories_1.json:rapier
msgid "Rapier"
msgstr "Estoque"
#: itemcategories_1.json:shld_mtl_hv
msgid "Shield, metal (heavy)"
msgstr "Escudo de Metal (Pesado)"
#: itemcategories_1.json:shld_mtl_li
msgid "Shield, metal (light)"
msgstr "Escudo, metal (ligero)"
#: itemcategories_1.json:shld_twr
msgid "Tower shield"
msgstr "Torre escudo"
#: itemcategories_1.json:ssword
msgid "Shortsword"
msgstr "Espada Corta"

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,97 @@
# Indonesian translation for andors-trail
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
# This file is distributed under the same license as the andors-trail package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: andors-trail\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: Sat Oct 26 09:46:51 CEST 2013\n"
"PO-Revision-Date: 2013-10-26 08:31+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Indonesian <id@li.org>\n"
"Language: id\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-10-26 09:06+0000\n"
"X-Generator: Launchpad (build 16810)\n"
#: [none]
msgid "translator-credits"
msgstr ""
"Launchpad Contributions:\n"
" Noza Putra Pratama https://launchpad.net/~mas-noza"
#: itemcategories_1.json:2hsword
msgid "Two-handed sword"
msgstr "Pedang dua tangan"
#: itemcategories_1.json:axe
msgid "Axe"
msgstr "Kapak"
#: itemcategories_1.json:bsword
msgid "Broadsword"
msgstr "Pedang"
#: itemcategories_1.json:buckler
msgid "Buckler"
msgstr "Pembelaan"
#: itemcategories_1.json:club
msgid "Club"
msgstr "Gada"
#: itemcategories_1.json:dagger
msgid "Dagger"
msgstr "Pisau belati"
#: itemcategories_1.json:hammer
msgid "Warhammer"
msgstr "Palu"
#: itemcategories_1.json:hammer2h itemlist_weapons.json:hammer1
msgid "Giant hammer"
msgstr "Palu Raksasa"
#: itemcategories_1.json:lsword
msgid "Longsword"
msgstr "Pedang panjang"
#: itemcategories_1.json:mace
msgid "Mace"
msgstr "Lawang"
#: itemcategories_1.json:rapier
msgid "Rapier"
msgstr "Pedang tipis"
#: itemcategories_1.json:scepter
msgid "Scepter"
msgstr "Tongkat kerajaan"
#: itemcategories_1.json:shld_mtl_hv
msgid "Shield, metal (heavy)"
msgstr "Tameng, logam (berat)"
#: itemcategories_1.json:shld_mtl_li
msgid "Shield, metal (light)"
msgstr "Tameng, logam (ringan)"
#: itemcategories_1.json:shld_twr
msgid "Tower shield"
msgstr "Pelindung istana"
#: itemcategories_1.json:shld_wd_hv
msgid "Shield, wood (heavy)"
msgstr "Tameng, kayu (berat)"
#: itemcategories_1.json:shld_wd_li
msgid "Shield, wood (light)"
msgstr "Tameng, kayu (ringan)"
#: itemcategories_1.json:ssword
msgid "Shortsword"
msgstr "Pedang pendek"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,49 @@
# Malay translation for andors-trail
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
# This file is distributed under the same license as the andors-trail package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: andors-trail\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: Sat Oct 26 09:46:51 CEST 2013\n"
"PO-Revision-Date: 2013-10-26 08:31+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Malay <ms@li.org>\n"
"Language: ms\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-10-26 09:05+0000\n"
"X-Generator: Launchpad (build 16810)\n"
#: [none]
msgid "translator-credits"
msgstr ""
"Launchpad Contributions:\n"
" abuyop https://launchpad.net/~abuyop"
#: itemcategories_1.json:axe
msgid "Axe"
msgstr "Kapak"
#: itemcategories_1.json:dagger
msgid "Dagger"
msgstr "Pisau"
#: itemcategories_1.json:shld_mtl_hv
msgid "Shield, metal (heavy)"
msgstr "Perisai, logam (berat)"
#: itemcategories_1.json:shld_mtl_li
msgid "Shield, metal (light)"
msgstr "Perisai, logam (ringan)"
#: itemcategories_1.json:shld_wd_hv
msgid "Shield, wood (heavy)"
msgstr "Perisai, kayu (berat)"
#: itemcategories_1.json:shld_wd_li
msgid "Shield, wood (light)"
msgstr "Perisai, kayu (ringan)"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,10 @@
#!/bin/sh
for i in *.po
do
echo "$i"
msgmerge --no-fuzzy-matching "${i}" english.pot \
| msgattrib --translated \
| msguniq --no-wrap --sort-by-file >"${i}.tmp1"
mv "${i}.tmp1" "$i"
done

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,205 @@
# Slovenian translation for andors-trail
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
# This file is distributed under the same license as the andors-trail package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: andors-trail\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: Sat Oct 26 09:46:51 CEST 2013\n"
"PO-Revision-Date: 2013-11-03 06:51+0000\n"
"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
"Language-Team: Slovenian <sl@li.org>\n"
"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-11-03 15:18+0000\n"
"X-Generator: Launchpad (build 16820)\n"
#: [none]
msgid "translator-credits"
msgstr ""
"Launchpad Contributions:\n"
" Andrej Znidarsic https://launchpad.net/~andrej.znidarsic"
#: actorconditions_v0610.json:chaotic_curse
msgid "Chaotic curse"
msgstr "Kaotično prekletsvo"
#: actorconditions_v0610.json:chaotic_grip
msgid "Chaotic grip"
msgstr "Kaotični prijem"
#: actorconditions_v0611.json:blister
msgid "Blistering skin"
msgstr "Mehurjasta koža"
#: actorconditions_v0611.json:contagion
msgid "Insect contagion"
msgstr "Okužba z insektom"
#: actorconditions_v0611.json:focus_ac
msgid "Focused accuracy"
msgstr "Osredotočena natančnost"
#: actorconditions_v0611.json:focus_dmg
msgid "Focused damage"
msgstr "Osredotočena škoda"
#: actorconditions_v0611.json:poison_irdegh
msgid "Irdegh poison"
msgstr "Strup Irdegha"
#: actorconditions_v0611.json:stunned
msgid "Stunned"
msgstr "Ohromljen"
#: actorconditions_v0611_2.json:concussion
msgid "Concussion"
msgstr "Pretres"
#: actorconditions_v0611_2.json:crit1
msgid "Internal bleeding"
msgstr "Notranja krvavitev"
#: actorconditions_v0611_2.json:crit2
msgid "Fracture"
msgstr "Zlom"
#: actorconditions_v0611_2.json:rotworm
msgid "Kazaul rotworms"
msgstr "Kazaulovi gnili črvi"
#: actorconditions_v0611_2.json:shadowbless_acc
msgid "Blessing of Shadow accuracy"
msgstr "Blagoslov natančnosti Sence"
#: actorconditions_v0611_2.json:shadowbless_guard
msgid "Shadow guardian blessing"
msgstr "Blagoslov varuha Sence"
#: actorconditions_v0611_2.json:shadowbless_heal
msgid "Blessing of Shadow regeneration"
msgstr "Blagoslov regeneracije Sence"
#: actorconditions_v0611_2.json:shadowbless_str
msgid "Blessing of Shadow strength"
msgstr "Blagoslov moči Sence"
#: actorconditions_v0612_2.json:food
msgid "Sustenance"
msgstr "Preživetje"
#: actorconditions_v0612_2.json:foodp
msgid "Food-poisoning"
msgstr "Zastrupitev s hrano"
#: actorconditions_v069.json:bless
msgid "Bless"
msgstr "Blagoslov"
#: actorconditions_v069.json:poison_weak
msgid "Weak Poison"
msgstr "Šibek strup"
#: actorconditions_v069.json:regen
msgid "Shadow Regeneration"
msgstr "Regeneracija Sence"
#: actorconditions_v069.json:str
msgid "Strength"
msgstr "Moč"
#: actorconditions_v069_bwm.json:bleeding_wound
msgid "Bleeding wound"
msgstr "Krvaveča rana"
#: actorconditions_v069_bwm.json:intoxicated
msgid "Intoxicated"
msgstr "Zastrupljen"
#: actorconditions_v069_bwm.json:speed_minor
msgid "Minor speed"
msgstr "Manjša hitrost"
#: itemcategories_1.json:2hsword
msgid "Two-handed sword"
msgstr "Dvoročni meč"
#: itemcategories_1.json:axe
msgid "Axe"
msgstr "Sekira"
#: itemcategories_1.json:axe2h
msgid "Greataxe"
msgstr "Velika sekira"
#: itemcategories_1.json:bsword
msgid "Broadsword"
msgstr "Široki meč"
#: itemcategories_1.json:buckler
msgid "Buckler"
msgstr "Okrogel ščit"
#: itemcategories_1.json:club
msgid "Club"
msgstr "Udrihač"
#: itemcategories_1.json:dagger
msgid "Dagger"
msgstr "Bodalo"
#: itemcategories_1.json:hammer
msgid "Warhammer"
msgstr "Vojno kladivo"
#: itemcategories_1.json:hammer2h itemlist_weapons.json:hammer1
msgid "Giant hammer"
msgstr "Veliko gladivo"
#: itemcategories_1.json:lsword
msgid "Longsword"
msgstr "Dolgi meč"
#: itemcategories_1.json:mace
msgid "Mace"
msgstr "Palica"
#: itemcategories_1.json:rapier
msgid "Rapier"
msgstr "Rapir"
#: itemcategories_1.json:scepter
msgid "Scepter"
msgstr "Žezlo"
#: itemcategories_1.json:shld_mtl_hv
msgid "Shield, metal (heavy)"
msgstr "Ščit, kovinski (težak)"
#: itemcategories_1.json:shld_mtl_li
msgid "Shield, metal (light)"
msgstr "Ščit, kovinski (lahek)"
#: itemcategories_1.json:shld_twr
msgid "Tower shield"
msgstr "Kvadratni ščit"
#: itemcategories_1.json:shld_wd_hv
msgid "Shield, wood (heavy)"
msgstr "Ščit, lesen (težak)"
#: itemcategories_1.json:shld_wd_li
msgid "Shield, wood (light)"
msgstr "Ščit, lesen (lahek)"
#: itemcategories_1.json:ssword
msgid "Shortsword"
msgstr "Kratki meč"
#: itemcategories_1.json:staff itemlist_v070.json:qtrstaff
msgid "Quarterstaff"
msgstr "Kratka palica"

View File

@@ -1,11 +0,0 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
# "build.properties", and override values to adapt the script to your
# project structure.
# Project target.
target=android-10

Binary file not shown.

View File

@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue id="MissingTranslation" severity="ignore" />
<issue id="StringFormatMatches" severity="ignore" />
<issue id="TypographyDashes" severity="ignore" />
<issue id="TypographyEllipsis" severity="ignore" />
<issue id="TypographyOther" severity="ignore" />
<issue id="ContentDescription" severity="ignore" />
<issue id="HardcodedText" severity="ignore" />
<issue id="IconLocation" severity="ignore" />
<issue id="UnusedResources" severity="ignore" />
<issue id="DefaultLocale" severity="ignore" />
<issue id="NewApi" severity="error" />
</lint>

View File

@@ -8,4 +8,4 @@
# project structure.
# Project target.
target=android-10
target=android-17

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<translate
<translate
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="300"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<translate
<translate
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="300"

View File

@@ -8,7 +8,7 @@
android:fromXScale="1.0"
android:fromYScale="1.0"
android:toXScale="1.1"
android:toYScale="1.1"
android:toYScale="1.1"
android:duration="100"
android:pivotX="50%"
android:pivotY="50%"
@@ -18,7 +18,7 @@
android:fromXScale="1.1"
android:fromYScale="1.1"
android:toXScale="1.0"
android:toYScale="1.0"
android:toYScale="1.0"
android:duration="100"
android:startOffset="100"
android:pivotX="50%"

View File

@@ -5,7 +5,7 @@
android:fromXScale="1.0"
android:fromYScale="1.0"
android:toXScale="0.0"
android:toYScale="0.0"
android:toYScale="0.0"
android:duration="300"
android:pivotX="50%"
android:pivotY="50%"

View File

@@ -5,7 +5,7 @@
android:fromXScale="0.0"
android:fromYScale="0.0"
android:toXScale="1.0"
android:toYScale="1.0"
android:toYScale="1.0"
android:duration="200"
android:pivotX="50%"
android:pivotY="50%"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<translate
<translate
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator"
android:duration="300"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<translate
<translate
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator"
android:duration="300"

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 162 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 154 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 164 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 209 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 221 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 301 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 239 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 270 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 284 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 201 KiB

Some files were not shown because too many files have changed in this diff Show More