Fixed tileset naming on waterway- and pwcave maps.

Applied patch from issue 246. (Thanks Samuel)
Added start of Hebrew translation. (Thanks eitanbm)

git-svn-id: https://andors-trail.googlecode.com/svn/trunk@168 08aca716-68be-ccc6-4d58-36f5abd142ac

diff --git a/AndorsTrail/res/values-iw/strings.xml b/AndorsTrail/res/values-iw/strings.xml
new file mode 100644 (file)
index 0000000..a201c74
--- /dev/null
+++ b/AndorsTrail/res/values-iw/strings.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+       <string name="exit">יציאה</string>
+       <string name="exit_to_menu">יציאה לתפריט ראשי</string>
+       <string name="menu_pause">עצור</string>
+       <string name="menu_settings">העדפות</string>
+       <string name="menu_save">שמור</string>
+       <string name="menu_load">טען</string>
+       <string name="menu_save_gamesaved">המשחק נשמר לתא %1$d</string>
+       <string name="menu_save_failed">לא הצליח לשמור! Is the SD card mounted and writable?</string>
+
+       <string name="loadsave_title_save">שמור משחק</string>
+       <string name="loadsave_title_load">טען משחק שמור</string>
+       <string name="loadsave_selectslot">בחר תא</string>
+       <string name="loadsave_slot_empty">(פנוי)</string>
+       <string name="savegame_currenthero_displayinfo">דרגה %1$d, %2$d נסיון, %3$d זהב</string>
+       
+       <string name="dialog_loading_message">טוען משאבם...</string>
+       <string name="dialog_loading_failed_title">נכשל בטעינה</string>
+       <string name="dialog_loading_failed_message">המשחק לא הצליח לטעון שמירה.\n\n:(\n\nהקובץ עשוי להיות פגום או לא שלם.</string>
+       <string name="dialog_loading_failed_incorrectversion">המשחק לא הצליח לטעון שמירה. השמירה נעשתה בגרסא חדשה יותר של המשחק מזו שרצה.</string>
+       
+       <string name="dialog_close">סגור</string>
+       
+       <string name="dialog_confirmexit_title">יציאה</string>
+       <string name="dialog_confirmexit_message">בטוח שברצונך לצאת?</string>
+       
+       <string name="dialog_paused_title">עצור</string>
+       <string name="dialog_paused_message">המשחק נעצר</string>
+       <string name="dialog_paused_resume">המשך</string>
+
+       <string name="dialog_monsterencounter_title">מפגש</string>
+       <string name="dialog_monsterencounter_message">האם ברצונך לתקוף?\nדרגת קושי: %1$s</string>
+       <string name="dialog_monsterencounter_info">מידע</string>
+
+       <string name="status_hp">חיים:</string>
+       <string name="status_mp">קסם:</string>
+       <string name="status_ap">פעילות:</string>
+       <string name="status_exp">דרגה:</string>
+
+       <string name="heroinfo_char">מבט כולל</string>
+       <string name="heroinfo_inv">מלאי</string>
+       <string name="heroinfo_wear">מצוייד</string>
+       <string name="heroinfo_skill">מיומנויות</string>
+       <string name="heroinfo_spell">קסמים</string>
+       <string name="heroinfo_levelup">עלייה בדרגה</string>
+       <string name="heroinfo_level">דרגה</string>
+       <string name="heroinfo_totalexperience">נסיון כולל</string>    
+       <string name="heroinfo_wornequipment">Worn equipment</string>
+       <string name="heroinfo_inventory">ציוד</string>
+       <string name="heroinfo_gold">זהב: %1$d</string>
+       <string name="heroinfo_actionpoints">נקודות פעילות (פעילות):</string>
+       <string name="heroinfo_quests">Quests</string>
+       
+       <string name="combat_attack">תקיפה (%1$d פעילות)</string>
+       <string name="combat_move">תנועה (%1$d פעילות)</string>
+       <string name="combat_use">השתמש בחפץ</string>
+       <string name="combat_spell">קסם</string>
+       <string name="combat_endturn">סוף תור</string>
+       <string name="combat_flee">ברח</string>
+       <string name="combat_begin_flee">אתה יכול כעת לברוח מהקרב על ידי לחיצה בכיוון הרצוי.</string>
+       <string name="combat_flee_failed">לא הצלחת לברוח!</string>
+       <string name="combat_status_ap">פעילות: %1$d</string>
+       <string name="combat_monsterhealth">חיים:</string>
+       <string name="combat_monsteraction">%1$s תוקף.</string>
+       <string name="combat_result_monstermiss">%1$s מחטיא!</string>
+       <string name="combat_result_monsterhit">%1$s פגע בך עם נזק של %2$d חיים!</string>
+       <string name="combat_result_monsterhitcritical">%1$s פגע באופן קריטי עם נזק של %2$d חיים!</string>
+       <string name="combat_result_heromiss">התקפתך החטיאה.</string>
+       <string name="combat_result_herohit">פגעת %1$s בנזק של %2$d חיים!</string>
+       <string name="combat_result_herohitcritical">פגעת באופן קריטיב %1$s וגרמת לנזק של %2$d חיים!</string>
+       <string name="combat_result_herokillsmonster">%1$s מת!</string>
+       <string name="combat_not_enough_ap">לא מספיק נקודות פעילות בסיבוב זה.</string>
+       <string name="combat_hero_dies">אתה מאבד את ההכרה ובמזל מתעורר בחיים. הפסדת %1$d נסיון.</string>
+               
+       <string name="inventory_info">מידע</string>
+       <string name="inventory_equip">צייד</string>
+       <string name="inventory_unequip">הסר ציוד</string>
+       <string name="inventory_use">השתמש</string>
+       <string name="inventory_drop">תפיל</string>
+       <string name="inventory_item_used">השתמשת ב %1$s.</string>
+       <string name="inventory_item_dropped">%1$s נפל.</string>
+       <string name="inventory_item_equipped">הציידת ב %1$s.</string>
+
+       <string name="dialog_loot_pickall">אסוף הכל</string>
+       <string name="dialog_loot_foundgold">מצאת %1$d זהב. </string>
+       <string name="dialog_loot_pickedupitems">הרמת %1$d חפצים.</string>
+       <string name="dialog_groundloot_title">חפצים</string>
+       <string name="dialog_groundloot_message">מצאת כמה חפצים. </string>
+       <string name="dialog_monsterloot_title">ניצחון</string>
+       <string name="dialog_monsterloot_message">שרדת את המפגש. </string>
+       <string name="dialog_monsterloot_gainedexp">צברת %1$d נסיון. </string>
+    
+    <string name="monster_difficulty_veryeasy">קל מאוד</string>
+    <string name="monster_difficulty_easy">קל</string>
+    <string name="monster_difficulty_normal">רגיל</string>
+    <string name="monster_difficulty_hard">קשה</string>
+    <string name="monster_difficulty_veryhard">קשה מאוד</string>
+    <string name="monster_difficulty_impossible">בלתי אפשרי</string>
+
+    <string name="actorinfo_class">סוג:</string>
+    <string name="actorinfo_difficulty">קושי:</string>
+    <string name="actorinfo_health">בריאות:</string>
+    <string name="actorinfo_attacksperturn">תקיפות/סיבוב:</string>
+    <string name="actorinfo_movesperturn">תנועה/סיבוב:</string>
+    <string name="actorinfo_attack">תקיפה:</string>
+    <string name="actorinfo_criticalhit">תקיפה קריטית:</string>
+    <string name="actorinfo_defense">הגנה:</string>
+    <string name="actorinfo_movecost">עלות תנועה (פעילות):</string>
+
+</resources>

diff --git a/AndorsTrail/res/values/authors.xml b/AndorsTrail/res/values/authors.xml
index adf30d9c5524e8f73c3ce2db45e585f1952db5b6..f097a29a1a4e6e554317d61479746900c6ccc504 100644 (file)
--- a/AndorsTrail/res/values/authors.xml
+++ b/AndorsTrail/res/values/authors.xml
@@ -26,6 +26,7 @@
                French translation by LeSanglier and Misty Soul<br />
                German translation by Bomber and Samuel Plentz<br />
                English proofreading by taws34<br />
+               Hebrew translation by eitanbm<br />
                Forum moderated by Tim Davis<br />
                Forum moderated by Josh Kloos<br />
                Forum moderated by Travis Miller<br />

diff --git a/AndorsTrail/res/xml/pwcave0.tmx b/AndorsTrail/res/xml/pwcave0.tmx
index f02406854b2bc48ec5dc303c42d6387cb60574a6..654ae080e00176574e2df6da2eb2f3a1d97f390d 100644 (file)
--- a/AndorsTrail/res/xml/pwcave0.tmx
+++ b/AndorsTrail/res/xml/pwcave0.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">

diff --git a/AndorsTrail/res/xml/pwcave1.tmx b/AndorsTrail/res/xml/pwcave1.tmx
index 51d94c5b2ef91e114d526efd8cd48e5a46f7a18e..41c11e1f3100977c869019480102257cfa707c47 100644 (file)
--- a/AndorsTrail/res/xml/pwcave1.tmx
+++ b/AndorsTrail/res/xml/pwcave1.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">

diff --git a/AndorsTrail/res/xml/pwcave2.tmx b/AndorsTrail/res/xml/pwcave2.tmx
index 57f9f724cd93c10c1d7e60a157227f401c64c4dd..4fdddbee8d0049a400b17b14a2d863a3262d30de 100644 (file)
--- a/AndorsTrail/res/xml/pwcave2.tmx
+++ b/AndorsTrail/res/xml/pwcave2.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">

diff --git a/AndorsTrail/res/xml/pwcave2a.tmx b/AndorsTrail/res/xml/pwcave2a.tmx
index 2b6a4d6f22f6aba5e4dc709e5edeb392bb89dbe5..73d609e6aecb41a02b2b50b8351fee7f566b6e5e 100644 (file)
--- a/AndorsTrail/res/xml/pwcave2a.tmx
+++ b/AndorsTrail/res/xml/pwcave2a.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">

diff --git a/AndorsTrail/res/xml/pwcave3.tmx b/AndorsTrail/res/xml/pwcave3.tmx
index 844a7e73717d2182ffe6e60f6084b01f87f1a4e4..6c3609039ffb04e6e47cd3e52e448076fa51001d 100644 (file)
--- a/AndorsTrail/res/xml/pwcave3.tmx
+++ b/AndorsTrail/res/xml/pwcave3.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">

diff --git a/AndorsTrail/res/xml/pwcave4.tmx b/AndorsTrail/res/xml/pwcave4.tmx
index 9e7f5d178ce1a2b50c300daad6f19166b4571ace..bcee6a84fcb686e07ce7fe78012af125fa16c0ce 100644 (file)
--- a/AndorsTrail/res/xml/pwcave4.tmx
+++ b/AndorsTrail/res/xml/pwcave4.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">

diff --git a/AndorsTrail/res/xml/waterway0.tmx b/AndorsTrail/res/xml/waterway0.tmx
index 6dbd790180d6329fb30aabc5c77d11e13a820430..708b192a02cd5b422c8fc82e748bb6cea25fb246 100644 (file)
--- a/AndorsTrail/res/xml/waterway0.tmx
+++ b/AndorsTrail/res/xml/waterway0.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">

diff --git a/AndorsTrail/res/xml/waterway1.tmx b/AndorsTrail/res/xml/waterway1.tmx
index a8df87fbd069f6515a5a5202573655cce70a55c7..8f032cefa16e8751fc96bd032b0814f7cbb96583 100644 (file)
--- a/AndorsTrail/res/xml/waterway1.tmx
+++ b/AndorsTrail/res/xml/waterway1.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">

diff --git a/AndorsTrail/res/xml/waterway2.tmx b/AndorsTrail/res/xml/waterway2.tmx
index 5a932742a2dbc40f11724dd434cbc465f78182ba..baab82187f123c32aa7d47687d9ec3f6f8bb7122 100644 (file)
--- a/AndorsTrail/res/xml/waterway2.tmx
+++ b/AndorsTrail/res/xml/waterway2.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">

diff --git a/AndorsTrail/res/xml/waterway3.tmx b/AndorsTrail/res/xml/waterway3.tmx
index 5b3a1e33c6c42fb20664ef2b5361daf65fcb089f..5296a8cb4609ccdc0d45b1cccc33faa3419c0944 100644 (file)
--- a/AndorsTrail/res/xml/waterway3.tmx
+++ b/AndorsTrail/res/xml/waterway3.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">

diff --git a/AndorsTrail/res/xml/waterwayextention.tmx b/AndorsTrail/res/xml/waterwayextention.tmx
index 82cd154221fc873d40106b976d8b1c0bf8552f3d..02696872ea533701c144a106281dda2f38b15743 100644 (file)
--- a/AndorsTrail/res/xml/waterwayextention.tmx
+++ b/AndorsTrail/res/xml/waterwayextention.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">

diff --git a/AndorsTrail/res/xml/waterwayhouse.tmx b/AndorsTrail/res/xml/waterwayhouse.tmx
index efb258bdb261453ef877a0b62bd851f910b3f828..bda242e09b5ff05c88b910d756c5251119d3c0fc 100644 (file)
--- a/AndorsTrail/res/xml/waterwayhouse.tmx
+++ b/AndorsTrail/res/xml/waterwayhouse.tmx
@@ -36,7 +36,7 @@
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_2_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
index 3b9befccb9c85043ac205d6fa12eda694c59f8d9..0a5c25f30eda812ebef9be54ac14eb457423edce 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
@@ -148,6 +148,18 @@ public final class DebugInterface {
                                viewContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "loneford9", "south", 0, 0);
                                }
                        })
+                       ,new DebugButton("fh", new OnClickListener() {
+                       @Override
+                               public void onClick(View arg0) {
+                               viewContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "fallhaven_ne", "clothes", 0, 0);
+                               }
+                       })
+                       ,new DebugButton("rc", new OnClickListener() {
+                       @Override
+                               public void onClick(View arg0) {
+                               viewContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "roadtocarntower1", "left3", 0, 0);
+                               }
+                       })
        });
        }
 

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
index f67d85f1f9382ae9e39f60f8aef03eebdd9b7c2f..6f6b84d5a09b8d0f10bde8f5aaf5edee64fb9528 100644 (file)
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
@@ -81,7 +81,8 @@ public final class VirtualDpadView extends ImageView implements OnClickListener
                        if (y < one_third_height) lastTouchPosition_dy = -1;
                        else if (y >= two_thirds_height) lastTouchPosition_dy = 1;
                        
-                       if (lastTouchPosition_dx == 0 && lastTouchPosition_dy == 0) break;
+                       // Minimize the dpad if enabled in options - otherwise attack or move(0, 0)
+                       if (isMinimizeable && lastTouchPosition_dx == 0 && lastTouchPosition_dy == 0) break;
                        
                        this.inputController.onRelativeMovement(lastTouchPosition_dx, lastTouchPosition_dy);
                        return true;