[Arianne-commits] jmapacman/games/mapacman/common ScoreSign.java,NONE,1.1 Common.java,NONE,1.1 Sign.

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/arianne/jmapacman/games/mapacman/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19963/games/mapacman/common

Modified Files:
	Fruit.java Powerpill.java Dot.java ZoneChangePoint.java 
	Superdot.java EatenSign.java 
Added Files:
	ScoreSign.java Common.java Sign.java Constants.java 
Removed Files:
	consts.java common.java 
Log Message:
added ScoreSign
eating Ghost gives Score
refactoring

--- consts.java DELETED ---

Index: ZoneChangePoint.java
===================================================================
RCS file: /cvsroot/arianne/jmapacman/games/mapacman/common/ZoneChangePoint.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ZoneChangePoint.java	22 Jun 2005 19:45:45 -0000	1.3
--- ZoneChangePoint.java	13 Sep 2005 11:03:36 -0000	1.4
***************
*** 23,27 ****
  		this.y = ypos;
  		zoneChange = new RPObject(RPObject.INVALID_ID);
! 		zoneChange.put("type",consts.TYPE_ZONECHANGE);
  		zoneChange.put("newzone",newzone);
  		zoneChange.put("zoneid",zone.getName());
--- 23,27 ----
  		this.y = ypos;
  		zoneChange = new RPObject(RPObject.INVALID_ID);
! 		zoneChange.put("type",Constants.TYPE_ZONECHANGE);
  		zoneChange.put("newzone",newzone);
  		zoneChange.put("zoneid",zone.getName());
***************
*** 32,36 ****
  	public static void initRPClass()
  	{
! 		RPClass zonechange = new RPClass(consts.TYPE_ZONECHANGE);
  		  zonechange.isA("position");
  		  zonechange.add("newzone",RPClass.STRING);
--- 32,36 ----
  	public static void initRPClass()
  	{
! 		RPClass zonechange = new RPClass(Constants.TYPE_ZONECHANGE);
  		  zonechange.isA("position");
  		  zonechange.add("newzone",RPClass.STRING);

--- NEW FILE: Common.java ---
package games.mapacman.common;

import marauroa.common.game.RPClass;

public class Common {

	public static void initRPClasses() {
		  RPClass pos=new RPClass("position");
		  pos.add("x",RPClass.INT);
		  pos.add("y",RPClass.INT);

		  RPClass player=new RPClass(Constants.TYPE_PLAYER);
		  player.isA("position");
		  player.add("text",RPClass.LONG_STRING, RPClass.VOLATILE);
		  player.add("score",RPClass.INT);
		  player.add("power",RPClass.INT);
		  player.add("name",RPClass.STRING);
		  player.add("dir",RPClass.BYTE,RPClass.VOLATILE);
		  player.add("nextdir",RPClass.BYTE,RPClass.VOLATILE);

		  RPClass ghost = new RPClass(Constants.TYPE_GHOST);
		  ghost.isA("position");
		  ghost.add("dir",RPClass.BYTE);
		  ghost.add("nextdir",RPClass.BYTE);
		  ghost.add("!changedir",RPClass.INT,RPClass.HIDDEN);
		  ghost.add("color",RPClass.BYTE);

		  RPClass wall = new RPClass(Constants.TYPE_WALL);
		  wall.isA("position");		

		  Dot.initRPClass();
		  Superdot.initRPClass();
		  Fruit.initRPClass();
		  Powerpill.initRPClass();
		  ZoneChangePoint.initRPClass();
		  EatenSign.initRPClass();
		  ScoreSign.initRPClass();

	}

}

--- NEW FILE: Constants.java ---
package games.mapacman.common;

public class Constants {
	public static final String VERSION = "0.3";
	public static final String GAMENAME = "jmapacman";

	public final static String CHANGEDIR="dir";
	public final static String CHATMESSAGE="text";
	public final static int DIR_NORTH=0;
	public final static int DIR_EAST=1;
	public final static int DIR_SOUTH=2;
	public final static int DIR_WEST=3;
	public static final String TYPE_WALL = "wall";
	public static final String TYPE_PLAYER = "player";
	public static final String TYPE_DOT = "dot";
	public static final String TYPE_SUPERDOT = "superdot";
	public static final String TYPE_ZONECHANGE = "zonechange";
	public static final String TYPE_FRUIT = "fruit";
	public static final String TYPE_POWERPILL = "powerpill";
	public static final String TYPE_EATENSIGN = "eatensign";
	public static final String TYPE_SCORESIGN = "scoresign";
	public static final int DIR_NONE = -1;
	public static final String TYPE_GHOST = "ghost";
	public static final int COLLISION_WALL = 1;
	public static final int COLLISION_PLAYER = 2;
	public static final int COLLISION_GHOST = 3;
	public static final int COLLISION_NONE = 0;
	public static final int  COLLISION_GHOSTBLOCK=4;
	public static final int SCORE_EATENGHOST = 25;

}

Index: Fruit.java
===================================================================
RCS file: /cvsroot/arianne/jmapacman/games/mapacman/common/Fruit.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Fruit.java	14 Aug 2005 12:50:36 -0000	1.3
--- Fruit.java	13 Sep 2005 11:03:36 -0000	1.4
***************
*** 15,19 ****
  	public Fruit(int x, int y, int dot_score, int fruit_score, int fruit_probability, MaPacmanZone zone) {
  		super(x,y,dot_score,zone);
! 		myObject.put("type",consts.TYPE_FRUIT);
  		myObject.put("fruitprob",fruit_probability);
  		myObject.put("score",fruit_score);
--- 15,19 ----
  	public Fruit(int x, int y, int dot_score, int fruit_score, int fruit_probability, MaPacmanZone zone) {
  		super(x,y,dot_score,zone);
! 		myObject.put("type",Constants.TYPE_FRUIT);
  		myObject.put("fruitprob",fruit_probability);
  		myObject.put("score",fruit_score);
***************
*** 32,37 ****
  	public static void initRPClass()
  	{
! 		RPClass fruit = new RPClass(consts.TYPE_FRUIT);
! 		fruit.isA(consts.TYPE_DOT);
  		fruit.add("dottype",RPClass.INT);
  		fruit.add("fruitprob",RPClass.INT);	
--- 32,37 ----
  	public static void initRPClass()
  	{
! 		RPClass fruit = new RPClass(Constants.TYPE_FRUIT);
! 		fruit.isA(Constants.TYPE_DOT);
  		fruit.add("dottype",RPClass.INT);
  		fruit.add("fruitprob",RPClass.INT);	

--- NEW FILE: Sign.java ---
package games.mapacman.common;

import games.mapacman.server.MaPacmanZone;
import marauroa.common.game.RPObject;

public abstract class Sign{

	protected int disappear;
	protected RPObject myObject;
	protected MaPacmanZone zone;

	public RPObject getRPObject() {
		return myObject;
	}

	public int getX() {
		return myObject.getInt("x");
	}
	public int getY() {
		return myObject.getInt("y");
	}

	public boolean checkDelete() {
		myObject.put("delete",myObject.getInt("delete")-1);
		zone.getWorld().modify(myObject);
		return (myObject.getInt("delete")<1);
	}

	public boolean valid()
	{
		return (disappear>0);
	}

}

--- NEW FILE: ScoreSign.java ---
package games.mapacman.common;

import games.mapacman.client.GameScreen;
import games.mapacman.server.MaPacmanZone;
import marauroa.common.game.RPClass;
import marauroa.common.game.RPObject;

public class ScoreSign extends Sign {

	protected int x,y,score;
	// Scrolls 30 pixel with 2pixels per frame
	private final int SCROLL_HEIGHT=30;
	private final int SCROLL_SPEED=2;

	public ScoreSign(int score,int x, int y, MaPacmanZone zone) {
		disappear=-1;
		myObject = new RPObject(RPObject.INVALID_ID);
		myObject.put("type",Constants.TYPE_SCORESIGN);
		myObject.put("x",x);
		myObject.put("y",y);
		myObject.put("score",score);
		myObject.put("delete",6);
		myObject.put("zoneid",zone.getName());
		this.x=x;
		this.y=y;
		this.score=score;
		this.zone=zone;
	}

	public ScoreSign(RPObject object)
	{
		disappear=SCROLL_HEIGHT/SCROLL_SPEED;
		myObject = object;
		x=object.getInt("x");
		y=object.getInt("y");
		score=object.getInt("score");
	}

	public static void initRPClass()
	{
		 RPClass sign = new RPClass(Constants.TYPE_SCORESIGN);
		 sign.isA("position");
		 sign.add("score",RPClass.INT);
		 sign.add("delete", RPClass.INT);
	}

	public void draw(GameScreen screen) {
		screen.drawString(""+score,x,y,5,0-(SCROLL_HEIGHT-(disappear*SCROLL_SPEED)));
		disappear--;
	}

}

Index: EatenSign.java
===================================================================
RCS file: /cvsroot/arianne/jmapacman/games/mapacman/common/EatenSign.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EatenSign.java	30 Jun 2005 20:27:50 -0000	1.1
--- EatenSign.java	13 Sep 2005 11:03:36 -0000	1.2
***************
*** 7,22 ****
  import marauroa.server.game.Statistics;

! public class EatenSign {

  	protected int x,y;
! 	private int disappear;
! 	protected MaPacmanZone zone;
! 	protected RPObject myObject;

  	public EatenSign(int x, int y, MaPacmanZone zone) {
  		disappear=-1;
  		myObject = new RPObject(RPObject.INVALID_ID);
! 		myObject.put("type",consts.TYPE_EATENSIGN);
  		myObject.put("x",x);
  		myObject.put("y",y);
--- 7,20 ----
  import marauroa.server.game.Statistics;

! public class EatenSign extends Sign {

  	protected int x,y;
! 

  	public EatenSign(int x, int y, MaPacmanZone zone) {
  		disappear=-1;
  		myObject = new RPObject(RPObject.INVALID_ID);
! 		myObject.put("type",Constants.TYPE_EATENSIGN);
  		myObject.put("x",x);
  		myObject.put("y",y);
***************
*** 38,62 ****
  	public static void initRPClass()
  	{
! 		 RPClass sign = new RPClass(consts.TYPE_EATENSIGN);
  		 sign.isA("position");
  		 sign.add("delete", RPClass.INT);
  	}

- 	public RPObject getRPObject() {
- 		return myObject;
- 	}

- 	public int getX() {
- 		return myObject.getInt("x");
- 	}
- 	public int getY() {
- 		return myObject.getInt("y");
- 	}

! 	public boolean checkDelete() {
! 		myObject.put("delete",myObject.getInt("delete")-1);
! 		zone.getWorld().modify(myObject);
! 		return (myObject.getInt("delete")<1);
! 	}

--- 36,48 ----
  	public static void initRPClass()
  	{
! 		 RPClass sign = new RPClass(Constants.TYPE_EATENSIGN);
  		 sign.isA("position");
  		 sign.add("delete", RPClass.INT);
  	}

! 
! 

***************
*** 75,82 ****
  	}

! 	public boolean valid()
! 	{
! 		return (disappear>0);
! 	}

--- 61,65 ----
  	}

! 

Index: Dot.java
===================================================================
RCS file: /cvsroot/arianne/jmapacman/games/mapacman/common/Dot.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Dot.java	1 Jul 2005 14:22:54 -0000	1.4
--- Dot.java	13 Sep 2005 11:03:36 -0000	1.5
***************
*** 23,27 ****
  	public Dot(int x, int y, int dot_score, MaPacmanZone zone) {
  		myObject = new RPObject(RPObject.INVALID_ID);
! 		myObject.put("type",consts.TYPE_DOT);
  		myObject.put("x",x);
  		myObject.put("y",y);
--- 23,27 ----
  	public Dot(int x, int y, int dot_score, MaPacmanZone zone) {
  		myObject = new RPObject(RPObject.INVALID_ID);
! 		myObject.put("type",Constants.TYPE_DOT);
  		myObject.put("x",x);
  		myObject.put("y",y);
***************
*** 44,48 ****
  	public static void initRPClass()
  	{
! 		 RPClass dot = new RPClass(consts.TYPE_DOT);
  		 dot.isA("position");
  		 dot.add("score",RPClass.BYTE,RPClass.VOLATILE);
--- 44,48 ----
  	public static void initRPClass()
  	{
! 		 RPClass dot = new RPClass(Constants.TYPE_DOT);
  		 dot.isA("position");
  		 dot.add("score",RPClass.BYTE,RPClass.VOLATILE);

--- common.java DELETED ---

Index: Powerpill.java
===================================================================
RCS file: /cvsroot/arianne/jmapacman/games/mapacman/common/Powerpill.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Powerpill.java	14 Aug 2005 12:50:36 -0000	1.5
--- Powerpill.java	13 Sep 2005 11:03:36 -0000	1.6
***************
*** 19,23 ****
  	public Powerpill(int x, int y, int dot_score, int power_score, int power_probability, MaPacmanZone zone) {
  		super(x,y,dot_score,zone);
! 		myObject.put("type",consts.TYPE_POWERPILL);
  		myObject.put("powerprob",power_probability);
  		myObject.put("score",power_score);
--- 19,23 ----
  	public Powerpill(int x, int y, int dot_score, int power_score, int power_probability, MaPacmanZone zone) {
  		super(x,y,dot_score,zone);
! 		myObject.put("type",Constants.TYPE_POWERPILL);
  		myObject.put("powerprob",power_probability);
  		myObject.put("score",power_score);
***************
*** 35,40 ****
  	public static void initRPClass()
  	{
! 		RPClass superdot = new RPClass(consts.TYPE_POWERPILL);
! 		superdot.isA(consts.TYPE_DOT);
  		superdot.add("dottype",RPClass.INT);
  		superdot.add("powerprob",RPClass.INT);	
--- 35,40 ----
  	public static void initRPClass()
  	{
! 		RPClass superdot = new RPClass(Constants.TYPE_POWERPILL);
! 		superdot.isA(Constants.TYPE_DOT);
  		superdot.add("dottype",RPClass.INT);
  		superdot.add("powerprob",RPClass.INT);	

Index: Superdot.java
===================================================================
RCS file: /cvsroot/arianne/jmapacman/games/mapacman/common/Superdot.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Superdot.java	14 Aug 2005 12:50:36 -0000	1.4
--- Superdot.java	13 Sep 2005 11:03:36 -0000	1.5
***************
*** 16,20 ****
  	public Superdot(int x, int y, int dot_score, int superdot_score, int superdot_probability, MaPacmanZone zone) {
  		super(x,y,dot_score,zone);
! 		myObject.put("type",consts.TYPE_SUPERDOT);
  		myObject.put("superprob",superdot_probability);
  		myObject.put("score",superdot_score);
--- 16,20 ----
  	public Superdot(int x, int y, int dot_score, int superdot_score, int superdot_probability, MaPacmanZone zone) {
  		super(x,y,dot_score,zone);
! 		myObject.put("type",Constants.TYPE_SUPERDOT);
  		myObject.put("superprob",superdot_probability);
  		myObject.put("score",superdot_score);
***************
*** 32,37 ****
  	public static void initRPClass()
  	{
! 		RPClass superdot = new RPClass(consts.TYPE_SUPERDOT);
! 		superdot.isA(consts.TYPE_DOT);
  		superdot.add("dottype",RPClass.INT);
  		superdot.add("superprob",RPClass.INT);	
--- 32,37 ----
  	public static void initRPClass()
  	{
! 		RPClass superdot = new RPClass(Constants.TYPE_SUPERDOT);
! 		superdot.isA(Constants.TYPE_DOT);
  		superdot.add("dottype",RPClass.INT);
  		superdot.add("superprob",RPClass.INT);	

[Arianne-commits] jmapacman/games/mapacman/common ScoreSign.java,NONE,1.1 Common.java,NONE,1.1 Sign.

Arianne is an engine to develop multiplayer online games like Stendhal