[Jcrossclient-cvs] jcrossclient CFclient.java,1.25,1.26 Changelog,1.29,1.30 PlayerStats.java,1.6,1.7 StatWin.java,1.3,1.4

[<jcr...@li...>]

Update of /cvsroot/jcrossclient/jcrossclient
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21640

Modified Files:
	CFclient.java Changelog PlayerStats.java StatWin.java 
Log Message:
make statwin display spellpaths, and not armour

Index: PlayerStats.java
===================================================================
RCS file: /cvsroot/jcrossclient/jcrossclient/PlayerStats.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PlayerStats.java	24 Jan 2006 18:56:31 -0000	1.6
--- PlayerStats.java	25 Jan 2006 02:57:58 -0000	1.7
***************
*** 87,91 ****
  	int maxhp, maxmana, maxgr;
  	int Str, Dex, Con, Int, Wis, Pow, Char;
! 	int Wc, Dam, Ac, Arm;
  	int food, weightlimit;
  	int attuned, repelled, denied;
--- 87,91 ----
  	int maxhp, maxmana, maxgr;
  	int Str, Dex, Con, Int, Wis, Pow, Char;
! 	int Wc, Dam, Ac;
  	int food, weightlimit;
  	int attuned, repelled, denied;
***************
*** 112,116 ****
  		Pow = 10 ; Char = 10;
   
! 		Wc=25; Dam = 0; Ac = 10; Arm = 0;
  		skills_updated=true;
   
--- 112,116 ----
  		Pow = 10 ; Char = 10;
   
! 		Wc=25; Dam = 0; Ac = 10;
  		skills_updated=true;
   
***************
*** 153,156 ****
--- 153,171 ----
  	}
  
+ 	/** returns a string containing a newline seperated list of all spell
+ 	 *  paths to which the player has status type (as defined by 
+ 	 *  get_path_status */
+ 	public String attunements_display(int type) {
+ 		StringBuffer buf = new StringBuffer();
+ 		int i;
+ 		spellpath path;
+ 		for (i = 0; i < spells.size(); i++) {
+ 			path  = (spellpath)spellpaths.get(i);
+ 			if (get_path_status(path.number) == type) 
+ 				buf.append(path.name + "\n");
+ 		}
+ 		return buf.toString();
+ 	}
+ 
  	static public void addSkill(int skillnumber, String skillname) {
  		if (skillnumber < minskillnum) minskillnum = skillnumber;
***************
*** 354,361 ****
  					scan	+=	3;
  					break;
- 				case 16: /*armor*/
- 					Arm	=	statsdata.readShort();
- 					scan	+=	3;
- 					break;
  				case 17: /*speed*/
  					tmpint	=	statsdata.readInt();
--- 369,372 ----

Index: CFclient.java
===================================================================
RCS file: /cvsroot/jcrossclient/jcrossclient/CFclient.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** CFclient.java	25 Jan 2006 01:35:40 -0000	1.25
--- CFclient.java	25 Jan 2006 02:57:58 -0000	1.26
***************
*** 1359,1363 ****
  		Panel topside  = new VertPanel();
  		Panel rightside = new VertPanel();
! 
  		Panel items = new VertPanel();
  		
--- 1359,1363 ----
  		Panel topside  = new VertPanel();
  		Panel rightside = new VertPanel();
! 		Panel viewpane = new Panel(new CardLayout());
  		Panel items = new VertPanel();
  		
***************
*** 1393,1398 ****
  		leftside.add("spells", spscrollp);
  		leftside.add("settings", settingswin);
! 		topside.add (mapwin);
! 		topside.add (miscwin);
  		rightside.add(talkwin);
  		placeWindow(parent, leftside,	0, 0, 1, 3);
--- 1393,1399 ----
  		leftside.add("spells", spscrollp);
  		leftside.add("settings", settingswin);
! 		viewpane.add("map", mapwin);
! 		topside.add(viewpane);
! 		topside.add(miscwin);
  		rightside.add(talkwin);
  		placeWindow(parent, leftside,	0, 0, 1, 3);

Index: StatWin.java
===================================================================
RCS file: /cvsroot/jcrossclient/jcrossclient/StatWin.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StatWin.java	23 Jan 2006 19:36:08 -0000	1.3
--- StatWin.java	25 Jan 2006 02:57:58 -0000	1.4
***************
*** 43,51 ****
  		newtext.append("Cha: "+playerstats.Char+"\n");
  		newtext.append(playerstats.rangeattack+"\n");
! 		newtext.append("Wc: "+playerstats.Wc+" Dam: "+playerstats.Dam+" Ac: "+playerstats.Ac+" Arm: "+playerstats.Arm+"\n");
  		newtext.append("Speed: "+playerstats.speed+" ("+playerstats.weapspeed+") Food: "+playerstats.food+"\n");
  		newtext.append("\n");
  		newtext.append("Resistances: \n");
  		newtext.append(playerstats.resistances_display());
  		setText(newtext.toString());
  	}
--- 43,63 ----
  		newtext.append("Cha: "+playerstats.Char+"\n");
  		newtext.append(playerstats.rangeattack+"\n");
! 		newtext.append("Wc: "+playerstats.Wc+" Dam: "+playerstats.Dam+" Ac: "+playerstats.Ac+"\n");
  		newtext.append("Speed: "+playerstats.speed+" ("+playerstats.weapspeed+") Food: "+playerstats.food+"\n");
  		newtext.append("\n");
  		newtext.append("Resistances: \n");
  		newtext.append(playerstats.resistances_display());
+ 		if (playerstats.attuned >0) {
+ 			newtext.append("\nAttuned spellpaths:\n");
+ 			newtext.append(playerstats.attunements_display(1));
+ 		}
+ 		if (playerstats.repelled >0) {
+ 			newtext.append("\nRepelled spellpaths:\n");
+ 			newtext.append(playerstats.attunements_display(-1));
+ 		}
+ 		if (playerstats.denied >0) {
+ 			newtext.append("\nDenied spellpaths:\n");
+ 			newtext.append(playerstats.attunements_display(-2));
+ 		}
  		setText(newtext.toString());
  	}

Index: Changelog
===================================================================
RCS file: /cvsroot/jcrossclient/jcrossclient/Changelog,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Changelog	25 Jan 2006 01:35:40 -0000	1.29
--- Changelog	25 Jan 2006 02:57:58 -0000	1.30
***************
*** 227,229 ****
--- 227,236 ----
  
  	     CFclient	- clarify some comments
+ 			- Add mapwin within a card layout panel
+ 
+ 	     PlayerStats - New function attunements_display()
+ 			- Stop parsing for obsolete armour stat
+ 
+ 	     Statwin	- No longer display armour
+ 			- display spell paths