]> www.infradead.org Git - users/mchehab/andors-trail.git/commitdiff
Merge branch 'worldmap'
authorOskar Wiksten <oskar.wiksten@gmail.com>
Sun, 7 Oct 2012 16:17:53 +0000 (18:17 +0200)
committerOskar Wiksten <oskar.wiksten@gmail.com>
Sun, 7 Oct 2012 16:17:53 +0000 (18:17 +0200)
Conflicts:
AndorsTrail/res/values/strings.xml
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java

1  2 
AndorsTrail/res/layout/main.xml
AndorsTrail/res/values/strings.xml
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java

index 9be5d0193f8831cbcc0ad34153d891871cdd67da,7f48aa52c0255d4e5c8af243993822eca56c84fb..feb25065f24aec5202c6688e081247a1485a6053
                android:shadowDx="1"
                android:shadowDy="1"
                android:shadowRadius="1"
-               android:shadowColor="#000"      
+               android:shadowColor="#000"
                />
        
 -      <LinearLayout 
 +      <RelativeLayout 
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_above="@id/main_statusview"
index c8a2de4290af06e7f8f0dfa3d462d631101cf423,407bfbac133f0e0f5bc7b10f8d18c59f54016ef0..067a55646a2ac0a6b6e9181f50e551b7379cf23a
      <string name="skill_longdescription_concussion">When making an attack on a target whose block chance (BC) is at least %1$d lower than your attack chance (AC), there is a %2$d %% chance that the hit will cause a concussion on the target. A concussion will severely lower the target\'s offensive combat abilities, making the target less able to land successful attacks.</string>
  
      <string name="about_button4">About</string>
 +    <string name="preferences_ui_category">Interface</string>
 +    <string name="preferences_ui_enable_animations_title">Enable animations</string>
 +    <string name="preferences_ui_enable_animations">Show animations for various interface elements, such as the combat bar.</string>
+     <string name="menu_button_worldmap">Map</string>
+     <string name="menu_button_worldmap_failed">Map cannot be displayed.</string>
+     <string name="display_worldmap_not_available">The map cannot be displayed from this location.</string>
+     <string name="display_worldmap_title">Map</string>
      
  </resources>
index 0f70c143dc40b198d631575efb36bf0057bf61f6,1dc7ed54b382a5ef17c35034405b4e357d404284..e51f74adcf8686955a03f53f93bd2c20d71bd687
@@@ -16,8 -16,8 +16,9 @@@ import com.gpl.rpg.AndorsTrail.model.ac
  import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
  import com.gpl.rpg.AndorsTrail.util.Coord;
  import com.gpl.rpg.AndorsTrail.view.CombatView;
 +import com.gpl.rpg.AndorsTrail.view.DisplayActiveActorConditionIcons;
  import com.gpl.rpg.AndorsTrail.view.MainView;
+ import com.gpl.rpg.AndorsTrail.view.ToolboxView;
  import com.gpl.rpg.AndorsTrail.view.VirtualDpadView;
  import com.gpl.rpg.AndorsTrail.view.QuickButton.QuickButtonContextMenuInfo;
  import com.gpl.rpg.AndorsTrail.view.QuickitemView;
@@@ -60,7 -59,8 +60,8 @@@ public final class MainActivity extend
      public StatusView statusview;
      public CombatView combatview;
      public QuickitemView quickitemview;
 -    private LinearLayout activeConditions;
 +    private DisplayActiveActorConditionIcons activeConditions;
+     private ToolboxView toolboxview;
      private VirtualDpadView dpad;
        
        private static final int NUM_MESSAGES = 3;
          statusview = (StatusView) findViewById(R.id.main_statusview);
          combatview = (CombatView) findViewById(R.id.main_combatview);
          quickitemview = (QuickitemView) findViewById(R.id.main_quickitemview);
 -        activeConditions = (LinearLayout) findViewById(R.id.statusview_activeconditions);
 +        activeConditions = new DisplayActiveActorConditionIcons(app.preferences, world.tileManager, this, (RelativeLayout) findViewById(R.id.statusview_activeconditions));
          dpad = (VirtualDpadView) findViewById(R.id.main_virtual_dpad);
+         toolboxview = (ToolboxView) findViewById(R.id.main_toolboxview);
+         statusview.registerToolboxViews(toolboxview, quickitemview);
          
                statusText = (TextView) findViewById(R.id.statusview_statustext);
                statusText.setOnClickListener(new OnClickListener() {
        
        public void updateStatus() {
                statusview.updateStatus();
 -              statusview.updateActiveConditions(this, activeConditions);
                quickitemview.refreshQuickitems();
                combatview.updateStatus();
+               toolboxview.updateIcons();
        }
        
        public void redrawAll(int why) {
index 3c27329d824cf4528a7641f051c7cdc80abbd83f,3c27329d824cf4528a7641f051c7cdc80abbd83f..930434df2ff69027566842146213f2d87f67d2ec
@@@ -3,7 -3,7 +3,6 @@@ package com.gpl.rpg.AndorsTrail.control
  import com.gpl.rpg.AndorsTrail.context.ViewContext;
  import com.gpl.rpg.AndorsTrail.context.WorldContext;
  import com.gpl.rpg.AndorsTrail.model.ModelContainer;
--import com.gpl.rpg.AndorsTrail.util.L;
  import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
  import com.gpl.rpg.AndorsTrail.view.MainView;
  
index f2897c781ab7662ba389a3885ad0e26af747b186,56575a14d50823ed98ebbbcae66779c221c62e3a..2a62015766ee982e17070aab3c56f8f9c3085595
@@@ -2,10 -2,9 +2,8 @@@ package com.gpl.rpg.AndorsTrail.view
  
  import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
  import com.gpl.rpg.AndorsTrail.R;
- import com.gpl.rpg.AndorsTrail.activity.MainActivity;
  import com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity;
- import com.gpl.rpg.AndorsTrail.context.ViewContext;
  import com.gpl.rpg.AndorsTrail.context.WorldContext;
 -import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
  import com.gpl.rpg.AndorsTrail.model.actor.Player;
  import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
  
@@@ -94,12 -99,50 +96,4 @@@ public final class StatusView extends R
                        world.tileManager.setImageViewTile(heroImage, player);                  
                }
        }
 -
 -      public void updateActiveConditions(Context androidContext, LinearLayout activeConditions) {
 -              GreedyImageViewAppender t = new GreedyImageViewAppender(androidContext, activeConditions);
 -              for (ActorCondition condition : player.conditions) {
 -                      ImageView iv = t.getNextImage();
 -                      world.tileManager.setImageViewTile(iv, condition.conditionType);
 -              }
 -              t.removeOtherImages();
 -      }
--      
-       public void updateQuickItemImage(boolean visible){
-               if(visible){
-                       world.tileManager.setImageViewTileForUIIcon(quickToggle, TileManager.iconID_boxopened);
-               } else {
-                       world.tileManager.setImageViewTileForUIIcon(quickToggle, TileManager.iconID_boxclosed);
 -      private static class GreedyImageViewAppender {
 -              private final LinearLayout container;
 -              private final Context context;
 -              private int currentChildIndex = 0;
 -              private final int previousChildCount;
 -              private final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
 -              
 -              public GreedyImageViewAppender(Context context, LinearLayout container) {
 -                      this.container = container;
 -                      this.context = context;
 -                      this.previousChildCount = container.getChildCount();
 -              }
 -              public ImageView getNextImage() {
 -                      // Since this is called a lot, we do not want to recreate the view objects every time.
 -                      // Therefore, we reuse existing ImageView:s if they are present, but just change the image on them.
 -                      ImageView iv;
 -                      if (currentChildIndex < previousChildCount) {
 -                              // There already is a created image on this position, reuse it.
 -                              iv = (ImageView) container.getChildAt(currentChildIndex);
 -                              iv.setVisibility(View.VISIBLE);
 -                      } else {
 -                              // The player has never had this many conditions, create a new ImageView to hold the condition image.
 -                              iv = new ImageView(context);
 -                              container.addView(iv, layoutParams);
 -                      }
 -                      ++currentChildIndex;
 -                      return iv;
 -              }
 -              public void removeOtherImages() {
 -                      for(int i = previousChildCount - 1; i >= currentChildIndex; --i) {
 -                              //container.removeViewAt(i);
 -                              // Don't actually remove them, just hide them (so we won't have to recreate them next time the player get a condition)
 -                              container.getChildAt(i).setVisibility(View.GONE);
 -                      }
--              }
--      }
  }