huntforgold-commit Mailing List for Hunt for Gold
Status: Alpha
Brought to you by:
jews
Menu
▾
▴
huntforgold-commit — The CVS commit mailing list
This list is closed, nobody may subscribe to it.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(19) |
May
(47) |
Jun
(29) |
Jul
(33) |
Aug
(56) |
Sep
(111) |
Oct
(120) |
Nov
(104) |
Dec
(58) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(98) |
Feb
(51) |
Mar
(18) |
Apr
|
May
(2) |
Jun
(26) |
Jul
(58) |
Aug
(54) |
Sep
(43) |
Oct
(16) |
Nov
(22) |
Dec
(36) |
| 2004 |
Jan
(90) |
Feb
(18) |
Mar
(13) |
Apr
(52) |
May
(29) |
Jun
(26) |
Jul
(37) |
Aug
(1) |
Sep
(2) |
Oct
(3) |
Nov
(1) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2011 |
Jan
(1) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Missy M. <bil...@pa...> - 2007-02-12 11:47:56
|
Hi, V / A G R A V A L / U M C / A L / S http://www.tedrx .com Remove space in the above link. discuss their argument. They were being quite friendly to each other, though oddly formal. Ron and Harry wasted no time in telling Hermione about the conversation they had overheard between Madame Maxime and |
|
From: Romey L. <ma...@ma...> - 2007-02-07 15:18:38
|
Hi, Viuagra - 3.35 Vaulium - 1.25 Ciualis - 3.75 Amabien - 2.90 Souma - 1.15 http://www.zodr!x.com Important: Remove "!" in the above link |
|
From: Lakisha L. <vil...@ma...> - 2007-02-01 18:11:08
|
Good day, Vi_gra $1, 80 Ci_lis $3, 00 Lev_tra $3, 35 http://www.progenyid%.com ( Important Remove "%" ) -- easy to bend to my will... he brought me back to this country, and after a while, I took possession of his body, to supervise him closely as he carried out my orders. But my plan failed. I did not manage to steal the |
|
From: Jesper P. <je...@us...> - 2006-10-11 19:38:33
|
Update of /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/model In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12403/src/net/sourceforge/huntforgold/model Modified Files: Position.java Log Message: Added patch from Amoroso Giacomo (gia...@gm...), Basil Gasser (ba...@st...), Michael Haenni (hae...@st...) and Anglo Rosenfelder (an...@ro...) to fix angle math and tile mask lookup Index: Position.java =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/model/Position.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Position.java 1 Jul 2004 06:31:42 -0000 1.16 +++ Position.java 11 Oct 2006 19:38:27 -0000 1.17 @@ -116,16 +116,7 @@ public double getAngle(Position position) { double dy = position.getY() - this.y; double dx = position.getX() - this.x; - double angle = Math.atan(dy / dx); - if (dx > 0) { - if (dy > 0) { - return angle; - } else { - return angle + 2 * Math.PI; - } - } else { - return angle + Math.PI; - } + return Math.atan2(dy, dx); } /** |
|
From: Jesper P. <je...@us...> - 2006-10-11 19:38:33
|
Update of /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/model/map In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12403/src/net/sourceforge/huntforgold/model/map Modified Files: MapManager.java Log Message: Added patch from Amoroso Giacomo (gia...@gm...), Basil Gasser (ba...@st...), Michael Haenni (hae...@st...) and Anglo Rosenfelder (an...@ro...) to fix angle math and tile mask lookup Index: MapManager.java =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/model/map/MapManager.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- MapManager.java 28 Apr 2004 17:50:15 -0000 1.21 +++ MapManager.java 11 Oct 2006 19:38:27 -0000 1.22 @@ -351,7 +351,8 @@ int testY = CoordinateTransform.convertLatitudeToPixels(position.getY()); byte tileIndex = getTile(testY / pixelsPerTile, testX / pixelsPerTile); LandTile landTile = landTileSet.getLandTile(tileIndex); - return landTile.getTileMaskRGB(testX % pixelsPerTile, testY % pixelsPerTile); + return landTile.getTileMaskRGB((testX < 0) ? 0 : (testX % pixelsPerTile), + (testY < 0) ? 0 : (testY % pixelsPerTile)); } /** |
|
From: Jesper P. <je...@us...> - 2004-11-17 15:44:25
|
Update of /cvsroot/huntforgold/tools/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10678 Modified Files: checkstyle.jar Log Message: Checkstyle 3.5 Index: checkstyle.jar =================================================================== RCS file: /cvsroot/huntforgold/tools/lib/checkstyle.jar,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 Binary files /tmp/cvshql9wt and /tmp/cvsln8Mgs differ |
|
From: Jesper P. <je...@us...> - 2004-10-31 11:21:27
|
Update of /cvsroot/huntforgold/editors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17576 Modified Files: build.xml Log Message: Version 0.2 Index: build.xml =================================================================== RCS file: /cvsroot/huntforgold/editors/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- build.xml 11 Dec 2003 18:32:10 -0000 1.6 +++ build.xml 31 Oct 2004 11:21:12 -0000 1.7 @@ -1,7 +1,7 @@ <project name="editors" default="compile" basedir="."> <target name="init"> <property name="name" value="editors"/> - <property name="version" value="0.1"/> + <property name="version" value="0.2"/> <property name="huntforgold.dir" value="${basedir}/../huntforgold"/> <property name="tools.dir" value="${basedir}/../tools"/> |
|
From: Jesper P. <je...@us...> - 2004-10-31 11:21:05
|
Update of /cvsroot/huntforgold/editors/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17497 Modified Files: README Log Message: Added route editor info Index: README =================================================================== RCS file: /cvsroot/huntforgold/editors/doc/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- README 10 Dec 2003 13:22:01 -0000 1.1 +++ README 31 Oct 2004 11:20:54 -0000 1.2 @@ -12,6 +12,10 @@ windeditor.bat (Windows) windeditor.sh (Unix) +Starting the route editor: + routeeditor.bat (Windows) + routeeditor.sh (Unix) + The developers of Hunt for Gold can be reached at: hun...@li... |
|
From: Jesper P. <je...@us...> - 2004-10-31 10:52:12
|
Update of /cvsroot/huntforgold/huntforgold/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12959 Modified Files: HISTORY Log Message: Added info for WeNeedEyes Index: HISTORY =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/doc/HISTORY,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- HISTORY 12 Feb 2004 21:21:52 -0000 1.7 +++ HISTORY 31 Oct 2004 10:52:03 -0000 1.8 @@ -1,3 +1,36 @@ +2004/10/31: Version 0.5.8 aka WeNeedEyes +---------------------------------------- + Sea to land battle + Initial version of fencing + Ships now sails along a route + Enhancements to the map editor (brush, copy/paste) + Initial version of the route editor + +IMPORTANT: +---------- +This release contains a bug when attacking a town with forts - +the game crashes with + +WARN [net.sourceforge.huntforgold.model.map.DataMap] (main) Getting tile outside map: (-3, 6) +Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: -26 + at net.sourceforge.huntforgold.graphics.LandTile.getTileMaskRGB(LandTile.java:121) + at net.sourceforge.huntforgold.model.map.MapManager.getTerrainType(MapManager.java:354) + at net.sourceforge.huntforgold.logic.BattleSeaLandState.update(BattleSeaLandState.java:328) + at net.sourceforge.huntforgold.logic.Game.update(Game.java:146) + at net.sourceforge.huntforgold.Main.runGame(Main.java:514) + at net.sourceforge.huntforgold.Main.main(Main.java:258) + +We simply needs more eyes on this bug to track it down and kill it. + +See the DEVELOPERS file on the website on how to check out our code +(http://huntforgold.sourceforge.net/development.html). + +If *you* can provide us with the magic patch which solves this problem you'll get +a developer account for the project. + +Happy hunting ! + The Hunt for Gold team + 2004/02/12: Version 0.5 aka LordoftheCaribbean ---------------------------------------------- The map now contains pirates |
|
From: frank b. <be...@us...> - 2004-09-17 18:45:47
|
Update of /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27470/src/net/sourceforge/huntforgold Modified Files: Main.java Log Message: Fixed soundserver bug: memoryleak when soundserver disabld |
|
From: frank b. <be...@us...> - 2004-09-17 18:45:46
|
Update of /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/sound In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27470/src/net/sourceforge/huntforgold/sound Modified Files: SndServer.java Log Message: Fixed soundserver bug: memoryleak when soundserver disabld Index: SndServer.java =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/sound/SndServer.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- SndServer.java 9 Jan 2004 23:07:51 -0000 1.11 +++ SndServer.java 17 Sep 2004 18:45:35 -0000 1.12 @@ -118,6 +118,9 @@ /** The intro sound */ public static final String INTRO = "sound/intro.mp3"; + /** Soundserver enabled/disabled when starting game */ + private boolean soundServerEnabled = false; + /** * Constructor */ @@ -157,6 +160,8 @@ public void startSndServer(boolean enableSound) { sndServerSM = new SoundServerStateMachine(); + soundServerEnabled = enableSound; + if (enableSound) { soundThread = new Thread(this); soundThread.setName("SoundServer"); @@ -169,16 +174,20 @@ */ public void pause() { + if (soundServerEnabled) { + sndServerSM.setNextEvent(PAUSE_MUSICLIST); + } log.debug("pause musiclist command recieved."); - sndServerSM.setNextEvent(PAUSE_MUSICLIST); - } /** * Signals the server to stop playing music */ public void stop() { - sndServerSM.setNextEvent(STOP_PLAYER); + + if (soundServerEnabled) { + sndServerSM.setNextEvent(STOP_PLAYER); + } log.debug("stop musiclist command recieved."); } @@ -187,7 +196,10 @@ * Signals the server to start playing music */ public void play() { - sndServerSM.setNextEvent(PLAY_MUSICLIST); + + if (soundServerEnabled) { + sndServerSM.setNextEvent(PLAY_MUSICLIST); + } log.debug("start musiclist command recieved."); } @@ -196,15 +208,20 @@ * @param actionFile The action sound */ public void addToActionPlaylist(String actionFile) { - playList.addAction(actionFile); - sndServerSM.setNextEvent(PLAY_ACTIONLIST); + + if (soundServerEnabled) { + playList.addAction(actionFile); + sndServerSM.setNextEvent(PLAY_ACTIONLIST); + } } /** * Resume Musicplaylist after playing the actionplaylist. */ public void resumeMusicPlaylist() { - sndServerSM.setNextEvent(RESUME_MUSICLIST); + if (soundServerEnabled) { + sndServerSM.setNextEvent(RESUME_MUSICLIST); + } } /** @@ -212,7 +229,9 @@ * @param file The music file */ public void addToMusicPlaylist(String file) { - playList.addMusic(file); + if (soundServerEnabled) { + playList.addMusic(file); + } } /** @@ -229,28 +248,38 @@ * @param file The file that should be removed from the play list */ public void removeFromMusicPlaylist(String file) { - playList.removeMusicFromList(file); + if (soundServerEnabled) { + playList.removeMusicFromList(file); + } } /** * Clear the entire Musicplaylist. */ public void clear() { - playList.clearMusicPlayList(); + if (soundServerEnabled) { + playList.clearMusicPlayList(); + } } /** * Skip currently playing music clip and play next music clip in playlist. */ public void next() { - sndServerSM.setNextEvent(PLAY_NEXT); + + if (soundServerEnabled) { + sndServerSM.setNextEvent(PLAY_NEXT); + } } /** * Skip currently playing music clip and play previous music clip in playlist. */ public void previous() { - sndServerSM.setNextEvent(PLAY_PREVIOUS); + + if (soundServerEnabled) { + sndServerSM.setNextEvent(PLAY_PREVIOUS); + } } /** @@ -258,21 +287,31 @@ * @param musicGain the music volume [0.0001 -> 5] 0.0001 = -80dB, 5 = 14dB */ public void setMusicGain(double musicGain) { -// TODO ? this.gain = musicGain; + + if (soundServerEnabled) { + // TODO ? this.gain = musicGain; + } + } /** * Mute the soundserver */ public void mute() { - sndServerSM.setNextEvent(MUTE); + + if (soundServerEnabled) { + sndServerSM.setNextEvent(MUTE); + } } /** * Stop the soundserver */ public void stopSoundServer() { - sndServerSM.setNextEvent(STOP_SNDSERVER); + + if (soundServerEnabled) { + sndServerSM.setNextEvent(STOP_SNDSERVER); + } log.debug("Soundserver stopped."); } |
|
From: Jesper P. <je...@us...> - 2004-08-25 05:46:17
|
Update of /cvsroot/huntforgold/huntforgold/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24177 Modified Files: DEVELOPERS Log Message: Corrected CVSROOTs Index: DEVELOPERS =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/doc/DEVELOPERS,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- DEVELOPERS 21 Jan 2004 17:04:39 -0000 1.8 +++ DEVELOPERS 25 Aug 2004 05:46:08 -0000 1.9 @@ -90,8 +90,8 @@ --------------------- Non-developers can access the repository via anonymous CVS: - cvs -d:pserver:ano...@cv...:/cvsroot/huntforgold login - cvs -z3 -d:pserver:ano...@cv...:/cvsroot/huntforgold co modulename + cvs -d:pserver:ano...@cv...:/cvsroot/huntforgold login + cvs -z3 -d:pserver:ano...@cv...:/cvsroot/huntforgold co modulename when prompted for a password for anonymous, simply press the 'Enter' key. @@ -100,7 +100,7 @@ Developers accesses the repository via SSH: export CVS_RSH=ssh - cvs -z3 -d:ext:dev...@cv...:/cvsroot/huntforgold co modulename + cvs -z3 -d:ext:dev...@cv...:/cvsroot/huntforgold co modulename Enter your site password when prompted. @@ -289,7 +289,7 @@ -------------- Quick start guide anonymous CVS users: - export CVSROOT=:pserver:ano...@cv...:/cvsroot/huntforgold + export CVSROOT=:pserver:ano...@cv...:/cvsroot/huntforgold cvs login cvs co tools cvs co huntforgold |
|
From: Jesper P. <je...@us...> - 2004-07-13 12:29:37
|
Update of /cvsroot/huntforgold/editors/src/net/sourceforge/huntforgold/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29564 Added Files: XMLIndentation.java Log Message: Initial import --- NEW FILE: XMLIndentation.java --- //--------------------------------------------------------------------------------- // $Id: XMLIndentation.java,v 1.1 2004/07/13 12:29:26 jews Exp $ // // Copyright (c) 2002-2004 Hunt for Gold Team (http://huntforgold.sourceforge.net) // All rights reserved //--------------------------------------------------------------------------------- package net.sourceforge.huntforgold.util; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; import java.io.FileReader; import java.io.FileWriter; /** * This class can indent an XML file */ public class XMLIndentation { /** * The main method * @param args The arguments */ public static void main(String[] args) { if (args.length != 3) { System.out.println("Usage: XMLIndentation spaces inputfile outputfile"); System.exit(1); } try { int indent = Integer.parseInt(args[0]); File input = new File(args[1]); File output = new File(args[2]); int currentIndent = 0; FileReader reader = new FileReader(input); BufferedReader fin = new BufferedReader(reader); FileWriter writer = new FileWriter(output); BufferedWriter fout = new BufferedWriter(writer); String s = null; s = fin.readLine(); while (s != null && !s.equals("")) { s = s.trim(); boolean increase = false; if (s.indexOf("/") == -1) { increase = true; } else { if (s.indexOf("<") == s.lastIndexOf("<")) { currentIndent -= indent; } } for (int i = 0; i < currentIndent; i++) { fout.write(" "); } fout.write(s); fout.newLine(); if (increase) { currentIndent += indent; } s = fin.readLine(); } fout.flush(); fout.close(); fin.close(); } catch (Exception e) { System.err.println(e.getMessage()); System.exit(1); } } } |
|
From: Jesper P. <je...@us...> - 2004-07-13 11:41:21
|
Update of /cvsroot/huntforgold/editors/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20749 Added Files: routeeditor.bat routeeditor.sh Log Message: Initial import --- NEW FILE: routeeditor.bat --- @echo off if "%JAVA_HOME%" == "" goto error "%JAVA_HOME%\bin\java" -classpath "%CD%\editors.jar;%CD%\hfg-lite.jar;%CD%\log4j.jar;%CD%\jaxb.jar" net.sourceforge.huntforgold.routeeditor.RouteEditor %1 %2 %3 %4 %5 %6 %7 %8 %9 goto end :error echo "You'll need to set the JAVA_HOME variable to point to your Java installation" echo "F.ex: set JAVA_HOME=c:\j2sdk1.4.2_02" :end --- NEW FILE: routeeditor.sh --- #!/bin/sh D=`dirname $0` CLASSPATH=.:$D/editors.jar:$D/hfg-lite.jar:$D/log4j.jar:$D/jaxb.jar $JAVA_HOME/bin/java -client -classpath $CLASSPATH net.sourceforge.huntforgold.routeeditor.RouteEditor $* |
|
From: Jesper P. <je...@us...> - 2004-07-13 11:34:15
|
Update of /cvsroot/huntforgold/huntforgold/src/etc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19443 Modified Files: caribbean.map Log Message: Small changes such that all towns are on land Index: caribbean.map =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/etc/caribbean.map,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 Binary files /tmp/cvsu4t836 and /tmp/cvso7k7kA differ |
|
From: Jesper P. <je...@us...> - 2004-07-12 15:24:16
|
Update of /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6137/gui Modified Files: FencingGUI.java Log Message: Load fencing: alley, fort and governor graphics Index: FencingGUI.java =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/gui/FencingGUI.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- FencingGUI.java 28 Jun 2004 18:25:07 -0000 1.7 +++ FencingGUI.java 12 Jul 2004 15:23:56 -0000 1.8 @@ -146,6 +146,12 @@ subRenders.clear(); if (mode == FencingState.SHIP) { subRenders.add(new ImageRenderer(0, 0, "fencing.ship")); + } else if (mode == FencingState.FORT) { + subRenders.add(new ImageRenderer(0, 0, "fencing.fort")); + } else if (mode == FencingState.GOVERNOR) { + subRenders.add(new ImageRenderer(0, 0, "fencing.governor")); + } else if (mode == FencingState.ALLEY) { + subRenders.add(new ImageRenderer(0, 0, "fencing.alley")); } else { subRenders.add(new BackgroundRenderer(Color.blue)); } |
|
From: Jesper P. <je...@us...> - 2004-07-12 15:22:26
|
Update of /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/logic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5785 Modified Files: BattleSeaLandState.java DaughterFianceeState.java NearTownState.java Log Message: Use new mode names in fencing Index: BattleSeaLandState.java =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/logic/BattleSeaLandState.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- BattleSeaLandState.java 29 May 2004 09:16:21 -0000 1.2 +++ BattleSeaLandState.java 12 Jul 2004 15:22:13 -0000 1.3 @@ -178,7 +178,7 @@ if (continueFlag && mapManager.getTerrainType(newPosition) == LandTile.LAND_MASK) { double distance = Distance.getDistance(newPosition, fort.getPosition(), Distance.DISTANCE_KM); if (distance < 5) { - FencingState.getFencingState().setMode(FencingState.TOWN); + FencingState.getFencingState().setMode(FencingState.FORT); addValue(new Integer(playerShip.getCrew())); addValue("Enemy captain"); addValue(new Integer(fort.getMen())); Index: DaughterFianceeState.java =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/logic/DaughterFianceeState.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- DaughterFianceeState.java 29 May 2004 09:17:00 -0000 1.1 +++ DaughterFianceeState.java 12 Jul 2004 15:22:13 -0000 1.2 @@ -44,7 +44,7 @@ */ public void nextState(int state) { if (state == 0) { - FencingState.getFencingState().setMode(FencingState.MARRIAGE); + FencingState.getFencingState().setMode(FencingState.GOVERNOR); addValue(new Integer(0)); addValue(name); addValue(new Integer(0)); Index: NearTownState.java =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/logic/NearTownState.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- NearTownState.java 29 May 2004 09:13:10 -0000 1.14 +++ NearTownState.java 12 Jul 2004 15:22:13 -0000 1.15 @@ -95,7 +95,7 @@ game.setCurrentState(BATTLE_SEA_LAND); } } else { - FencingState.getFencingState().setMode(FencingState.TOWN); + FencingState.getFencingState().setMode(FencingState.FORT); addValue(new Integer(player.getCrewNumber())); addValue("Enemy captain"); addValue(new Integer(player.getCurrentTown().getNumberOfMen())); |
|
From: Jesper P. <je...@us...> - 2004-07-12 15:21:52
|
Update of /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/logic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5688 Modified Files: FencingState.java Log Message: Changed mode names Index: FencingState.java =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/logic/FencingState.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- FencingState.java 6 Jul 2004 18:30:15 -0000 1.11 +++ FencingState.java 12 Jul 2004 15:21:44 -0000 1.12 @@ -28,11 +28,14 @@ /** SHIP mode */ public static final int SHIP = 0; - /** TOWN mode */ - public static final int TOWN = 1; + /** FORT mode */ + public static final int FORT = 1; - /** MARRIAGE mode */ - public static final int MARRIAGE = 2; + /** GOVERNOR mode */ + public static final int GOVERNOR = 2; + + /** ALLEY mode */ + public static final int ALLEY = 3; /** Delta value */ public static final long DELTA = 150; @@ -219,9 +222,9 @@ if (enemy.getHitPoints() == 0) { if (mode == SHIP) { game.setCurrentState(CAPTURED_SHIP); - } else if (mode == TOWN) { + } else if (mode == FORT) { game.setCurrentState(TOWN_VICTORY); - } else if (mode == MARRIAGE) { + } else if (mode == GOVERNOR) { game.setCurrentState(DAUGHTER_MARRIAGE); } } @@ -229,9 +232,9 @@ if (pf.getHitPoints() == 0) { if (mode == SHIP) { game.setCurrentState(JAIL); - } else if (mode == TOWN) { + } else if (mode == FORT) { game.setCurrentState(JAIL); - } else if (mode == MARRIAGE) { + } else if (mode == GOVERNOR) { game.setCurrentState(DAUGHTER_LOST_FIGHT); } } |
|
From: Jesper P. <je...@us...> - 2004-07-12 15:19:34
|
Update of /cvsroot/huntforgold/huntforgold/src/etc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5237 Modified Files: caribbean_en.properties Log Message: Added graphics for fencing: alley, fort and governor Index: caribbean_en.properties =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/etc/caribbean_en.properties,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- caribbean_en.properties 6 Jul 2004 18:32:18 -0000 1.12 +++ caribbean_en.properties 12 Jul 2004 15:19:25 -0000 1.13 @@ -78,9 +78,9 @@ fencing.player.walk1=gfx/fencing/playerwalk1.png fencing.player.walk2=gfx/fencing/playerwalk2.png fencing.player.walk3=gfx/fencing/playerwalk3.png -fencing.alley= -fencing.fort= -fencing.governor= +fencing.alley=gfx/fencing/alley.png +fencing.fort=gfx/fencing/fort.png +fencing.governor=gfx/fencing/governor.png fencing.ship=gfx/fencing/ship.png fencing.status=gfx/fencing/status.png fencing.status.x=0 |
|
From: Mads P. H. <ma...@us...> - 2004-07-09 12:44:36
|
Update of /cvsroot/huntforgold/huntforgold/src/etc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22096 Modified Files: caribbean.xml Log Message: Added routes and routeconfigs for all Index: caribbean.xml =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/etc/caribbean.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- caribbean.xml 29 Jun 2004 06:33:04 -0000 1.13 +++ caribbean.xml 9 Jul 2004 12:44:21 -0000 1.14 @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <huntforgold> <configuration> <map> @@ -56,30 +56,438 @@ <shipstrength> <ship>2</ship> <number>0.1</number> + <routeconfig> + <routename>Santa Marta - Rio de la Hacha</routename> [...19959 lines suppressed...] + <longitude>69.540625</longitude> + </node> + <node> + <name>helpBelize-Campeche#208</name> + <latitude>19.940625</latitude> + <longitude>90.28875</longitude> + </node> + <node> + <name>helpMartinique-Guadeloupe#38</name> + <latitude>15.660625</latitude> + <longitude>61.300625</longitude> + </node> + <node> + <name>helpMargarita-Grenada#1</name> + <latitude>10.676874999999999</latitude> + <longitude>63.248125</longitude> + </node> + </routes> </huntforgold> + |
|
From: Jesper P. <je...@us...> - 2004-07-09 09:02:09
|
Update of /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18260 Modified Files: Main.java Log Message: Added check for if town is in water Index: Main.java =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/Main.java,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- Main.java 6 Jul 2004 18:31:48 -0000 1.71 +++ Main.java 9 Jul 2004 09:02:00 -0000 1.72 @@ -307,6 +307,10 @@ numberOfMen, merchant, tavern, bank, shipyard, governor, brothel); world.insertTown(town); + + if (MapManager.getMapManager().isInWater(townPosition)) { + log.warn(key + " is in water"); + } } log.info("Towns initialized"); } catch (Exception e) { |
|
From: Mads P. H. <ma...@us...> - 2004-07-09 06:14:09
|
Update of /cvsroot/huntforgold/editors/src/net/sourceforge/huntforgold/routeeditor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14342 Modified Files: RouteEditor.java Log Message: Fixed bug and enhanced configure routes feature Index: RouteEditor.java =================================================================== RCS file: /cvsroot/huntforgold/editors/src/net/sourceforge/huntforgold/routeeditor/RouteEditor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- RouteEditor.java 1 Jul 2004 09:23:03 -0000 1.2 +++ RouteEditor.java 9 Jul 2004 06:14:00 -0000 1.3 @@ -36,7 +36,7 @@ import net.sourceforge.huntforgold.xml.Routeconfig; import net.sourceforge.huntforgold.xml.impl.RouteTypeImpl; import net.sourceforge.huntforgold.xml.impl.NodeTypeImpl; -import net.sourceforge.huntforgold.xml.impl.RouteconfigTypeImpl; +import net.sourceforge.huntforgold.xml.impl.RouteconfigImpl; import java.awt.BorderLayout; import java.awt.Color; @@ -57,15 +57,17 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import java.util.HashMap; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeEvent; import java.util.Iterator; import java.util.Map; -import java.util.StringTokenizer; +import java.util.HashMap; import java.util.List; -import java.util.ArrayList; +import java.util.StringTokenizer; import java.util.Collection; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeEvent; +import java.util.ArrayList; +import java.util.Set; +import java.util.HashSet; import org.apache.log4j.Logger; @@ -1245,7 +1247,7 @@ } - getContentPane().add(inputPanel); + getContentPane().add(new JScrollPane(inputPanel)); JPanel buttonPane = new JPanel(); JButton doneButton = new JButton("Done"); buttonPane.add(doneButton); @@ -1259,7 +1261,35 @@ new ConfigureRoutesDialog(parent, title, nationalityName, yearName); } }); - getContentPane().add(buttonPane, BorderLayout.SOUTH); + JButton randomizeButton = new JButton("Randomize"); + buttonPane.add(randomizeButton); + randomizeButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + int noOfRoutes = (int) (routeWeights.length * Math.random()); + double sum = 0; + Set usedIndicies = new HashSet(noOfRoutes); + for (int i = 0; i <= noOfRoutes; i++) { + double fraction = Math.random(); + routeWeights[i].setText(Double.toString(fraction)); + sum += fraction; + int selectedIndex = 0; + while (true) { + selectedIndex = (int) (routeWeights.length * Math.random()); + if (!usedIndicies.contains(new Integer(selectedIndex))) { + usedIndicies.add(new Integer(selectedIndex)); + break; + } + } + routeBoxs[i].setSelectedIndex(selectedIndex); + } + for (int i = 0; i <= noOfRoutes; i++) { + double fraction = Double.valueOf(routeWeights[i].getText()).doubleValue() / sum; + fraction = (double) ((int) (fraction * 100)) / 100; + routeWeights[i].setText(Double.toString(fraction)); + } + } + }); + getContentPane().add(buttonPane, BorderLayout.NORTH); setDefaultCloseOperation(DISPOSE_ON_CLOSE); pack(); setVisible(true); @@ -1296,10 +1326,10 @@ routeconfig.clear(); for (int i = 0; i < routeWeights.length; i++) { if (routeWeights[i].getText().length() > 0) { - RouteconfigTypeImpl routeconfigType = new RouteconfigTypeImpl(); - routeconfigType.setFraction(Double.parseDouble(routeWeights[i].getText())); - routeconfigType.setRoutename(routeBoxs[i].getSelectedItem().toString()); - routeconfig.add(routeconfigType); + RouteconfigImpl routeconfigImpl = new RouteconfigImpl(); + routeconfigImpl.setFraction(Double.parseDouble(routeWeights[i].getText())); + routeconfigImpl.setRoutename(routeBoxs[i].getSelectedItem().toString()); + routeconfig.add(routeconfigImpl); } } new ConfigureRoutesDialog(parentFrame, dialogTitle, nationalityName, yearName); |
|
From: Jesper P. <je...@us...> - 2004-07-07 07:33:44
|
Update of /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3759/src/net/sourceforge/huntforgold/model Modified Files: ShipFactory.java Log Message: Set default name for captain Index: ShipFactory.java =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/model/ShipFactory.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ShipFactory.java 7 Jan 2004 16:55:52 -0000 1.18 +++ ShipFactory.java 7 Jul 2004 07:33:32 -0000 1.19 @@ -128,6 +128,8 @@ crew = 8; } ship.setCrew(crew); + ship.setCaptain("Enemy captain"); + ship.setFood(0); ship.setGoods(0); ship.setSugar(0); |
|
From: Jesper P. <je...@us...> - 2004-07-06 18:32:28
|
Update of /cvsroot/huntforgold/huntforgold/src/etc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1714 Modified Files: caribbean_en.properties Log Message: Added DAUGHTER_LOST_FIGHT and JAIL Index: caribbean_en.properties =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/etc/caribbean_en.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- caribbean_en.properties 28 Jun 2004 18:27:26 -0000 1.11 +++ caribbean_en.properties 6 Jul 2004 18:32:18 -0000 1.12 @@ -49,6 +49,9 @@ daughterfiancee.fiancee= daughterfiancee.fiancee.x= daughterfiancee.fiancee.y= +daughterlostfight.battle= +daughterlostfight.battle.x= +daughterlostfight.battle.y= daughtermarriage.daughter= daughtermarriage.daughter.x= daughtermarriage.daughter.y= @@ -113,6 +116,9 @@ investigateship.outlook=gfx/outlook.png investigateship.outlook.x=150 investigateship.outlook.y=150 +jail.jail= +jail.jail.x= +jail.jail.y= lookingfor.man= lookingfor.man.x= lookingfor.man.y= |
|
From: Jesper P. <je...@us...> - 2004-07-06 18:31:57
|
Update of /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1589 Modified Files: Main.java Log Message: Added DAUGHTER_LOST_FIGHT and JAIL Index: Main.java =================================================================== RCS file: /cvsroot/huntforgold/huntforgold/src/net/sourceforge/huntforgold/Main.java,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- Main.java 29 May 2004 09:19:38 -0000 1.70 +++ Main.java 6 Jul 2004 18:31:48 -0000 1.71 @@ -27,6 +27,7 @@ import net.sourceforge.huntforgold.logic.CreditThanksToState; import net.sourceforge.huntforgold.logic.DaughterConversationState; import net.sourceforge.huntforgold.logic.DaughterFianceeState; +import net.sourceforge.huntforgold.logic.DaughterLostFightState; import net.sourceforge.huntforgold.logic.DaughterMarriageState; import net.sourceforge.huntforgold.logic.DividePlunderState; import net.sourceforge.huntforgold.logic.FencingState; @@ -40,6 +41,7 @@ import net.sourceforge.huntforgold.logic.InsideTownState; import net.sourceforge.huntforgold.logic.InvestigateColorsState; import net.sourceforge.huntforgold.logic.InvestigateShipState; +import net.sourceforge.huntforgold.logic.JailState; import net.sourceforge.huntforgold.logic.LandState; import net.sourceforge.huntforgold.logic.LevelMenuState; import net.sourceforge.huntforgold.logic.LookingForState; @@ -440,6 +442,8 @@ game.addState(daughterConversationState); GameState daughterFianceeState = new DaughterFianceeState(); game.addState(daughterFianceeState); + GameState daughterLostFightState = new DaughterLostFightState(); + game.addState(daughterLostFightState); GameState daughterMarriageState = new DaughterMarriageState(); game.addState(daughterMarriageState); GameState dividePlunderState = new DividePlunderState(); @@ -454,6 +458,8 @@ game.addState(investigateShipState); GameState investigateColorsState = new InvestigateColorsState(); game.addState(investigateColorsState); + GameState jailState = new JailState(); + game.addState(jailState); GameState landState = new LandState(); game.addState(landState); GameState levelMenuState = new LevelMenuState(); |
5 messages has been excluded from this view by a project administrator.