smagacor 0.0.1 → 0.0.2

data/ChangeLog

@@ -1,4 +1,66 @@
 ------------------------------------------------------------------------
+r363 | thomas | 2005-11-26 19:16:30 +0100 (Sat, 26 Nov 2005) | 2 lines
+Changed paths:
+   D /trunk/smagacor/data/smagacor/sokoban/levels/sokoban_levels.txt
+   M /trunk/smagacor/data/smagacor/sokoban/sokobanui.rb
+
+* removed old levels
+* added credits for sokoban levels
+------------------------------------------------------------------------
+r362 | thomas | 2005-11-26 18:56:46 +0100 (Sat, 26 Nov 2005) | 4 lines
+Changed paths:
+   M /trunk/smagacor/Rakefile
+   M /trunk/smagacor/TODO
+   A /trunk/smagacor/data/smagacor/smagacor-logo.png
+   A /trunk/smagacor/data/smagacor/sokoban
+   A /trunk/smagacor/data/smagacor/sokoban/game.info
+   A /trunk/smagacor/data/smagacor/sokoban/levels
+   A /trunk/smagacor/data/smagacor/sokoban/levels/loma.lvl
+   A /trunk/smagacor/data/smagacor/sokoban/levels/mas_microban.lvl
+   A /trunk/smagacor/data/smagacor/sokoban/levels/mas_sasquatch.lvl
+   A /trunk/smagacor/data/smagacor/sokoban/levels/microban.lvl
+   A /trunk/smagacor/data/smagacor/sokoban/levels/sasquatch.lvl
+   A /trunk/smagacor/data/smagacor/sokoban/levels/sasquatch_III.lvl
+   A /trunk/smagacor/data/smagacor/sokoban/levels/sasquatch_IV.lvl
+   A /trunk/smagacor/data/smagacor/sokoban/levels/sasquatch_V.lvl
+   A /trunk/smagacor/data/smagacor/sokoban/levels/sasquatch_VI.lvl
+   A /trunk/smagacor/data/smagacor/sokoban/levels/sasquatch_VII.lvl
+   A /trunk/smagacor/data/smagacor/sokoban/levels/sokoban_levels.txt
+   A /trunk/smagacor/data/smagacor/sokoban/sokobanui.rb
+   M /trunk/smagacor/data/smagacor/tictactoe/game.info
+   D /trunk/smagacor/data/smagacor/tictactoe/tictactoe.png
+   M /trunk/smagacor/data/smagacor/tictactoe/tictactoe.rb
+   D /trunk/smagacor/lib/smagacor/controller.rb
+   A /trunk/smagacor/lib/smagacor/listener.rb
+   M /trunk/smagacor/lib/smagacor/smagacor-ui.rb
+   A /trunk/smagacor/lib/smagacor/util.rb
+   A /trunk/smagacor/otherdata/sokoban
+   A /trunk/smagacor/otherdata/sokoban/common.inc
+   A /trunk/smagacor/otherdata/sokoban/crate.pov
+   A /trunk/smagacor/otherdata/sokoban/floor.pov
+   A /trunk/smagacor/otherdata/sokoban/man.pov
+   A /trunk/smagacor/otherdata/sokoban/storage.pov
+   A /trunk/smagacor/otherdata/sokoban/wall.pov
+   A /trunk/smagacor/otherdata/tictactoe
+   A /trunk/smagacor/otherdata/tictactoe/o.svg
+   A /trunk/smagacor/otherdata/tictactoe/tictactoe.svg (from /trunk/smagacor/otherdata/tictactoe.svg:340)
+   A /trunk/smagacor/otherdata/tictactoe/x.svg
+   D /trunk/smagacor/otherdata/tictactoe.svg
+
+* added the game of Sokoban
+* change from Fox-GUI to Qt
+* added UndoManager
+* all graphics are now generated from source files
+------------------------------------------------------------------------
+r358 | thomas | 2005-09-14 15:58:21 +0200 (Wed, 14 Sep 2005) | 1 line
+Changed paths:
+   M /trunk/smagacor/TODO
+   M /trunk/smagacor/data/smagacor/tictactoe/tictactoe.rb
+   M /trunk/smagacor/lib/smagacor/controller.rb
+   M /trunk/smagacor/lib/smagacor/smagacor-ui.rb
+
+* updated to fox version 1.2.0
+------------------------------------------------------------------------
 r197 | thomas | 2005-02-09 14:42:17 +0100 (Wed, 09 Feb 2005) | 1 line
 Changed paths:
    M /trunk/smagacor/Rakefile

data/Rakefile

@@ -33,7 +33,7 @@ require 'rake/testtask'
 # General actions  ##############################################################
 
 $:.push "lib"
-require 'smagacor/controller'
+require 'smagacor/util'
 
 PKG_NAME = "smagacor"
 PKG_VERSION = Smagacor::VERSION.join( '.' )
@@ -97,7 +97,6 @@ end
 
 PKG_FILES = FileList.new( [
                             'setup.rb',
-                            'install.rb',
                             'TODO',
                             'COPYING',
                             'README',
@@ -110,15 +109,9 @@ PKG_FILES = FileList.new( [
                             'test/**/*',
                             'data/**/*'
                           ]) do |fl|
-  fl.exclude( /\bsvn\b/ )
   fl.exclude( 'doc/output' )
 end
-
-task :package => [:gen_files] do
-  chdir 'pkg' do
-    sh "rpaadmin packport #{PKG_NAME}-#{PKG_VERSION}"
-  end
-end
+PKG_FILES_DUPPED = PKG_FILES.clone
 
 task :gen_changelog do
   sh "svn log -r HEAD:1 -v > ChangeLog"
@@ -129,34 +122,22 @@ task :gen_version do
   File.open( 'VERSION', 'w+' ) do |file| file.write( PKG_VERSION + "\n" ) end
 end
 
-task :gen_installrb do
-  puts "Generating install.rb file"
-  File.open( 'install.rb', 'w+' ) do |file|
-    file.write "
-require 'rpa/install'
-
-class Install_#{PKG_NAME} < RPA::Install::FullInstaller
-  name '#{PKG_NAME}'
-  version '#{PKG_VERSION}-1'
-  classification Application
-  build do
-    installdocs %w[COPYING ChangeLog TODO]
-    installdocs 'docs'
-    installrdoc %w[README] + Dir['lib/**/*.rb']
-    installdata
+task :gen_files => [:gen_changelog, :gen_version, :gen_otherdata]
+CLOBBER << "ChangeLog" << "VERSION"
+
+desc "Workaround because generated graphcis are not included"
+task :check_gen_included do
+  if !(PKG_FILES == PKG_FILES_DUPPED)
+    puts
+    puts
+    puts "!!! File list changed! You need to invoke the rake task again!"
+    puts
+    puts
+    exit
   end
-  description <<-EOF
-#{PKG_SUMMARY}
-
-#{PKG_DESCRIPTION}
-  EOF
-end
-"
-    end
 end
 
-task :gen_files => [:gen_changelog, :gen_version, :gen_installrb]
-CLOBBER << "ChangeLog" << "VERSION" << "install.rb"
+task :package => [:gen_files, :check_gen_included]
 
 Rake::PackageTask.new( PKG_NAME, PKG_VERSION ) do |p|
   p.need_tar = true
@@ -176,7 +157,7 @@ if defined? Gem
 
     #### Dependencies, requirements and files
 
-    s.files = PKG_FILES.to_a
+    s.files = PKG_FILES
 
     s.autorequire = nil
     s.executables = [ 'smagacor']
@@ -186,7 +167,7 @@ if defined? Gem
 
     s.has_rdoc = true
     s.extra_rdoc_files = rd.rdoc_files.reject do |fn| fn =~ /\.rb$/ end.to_a
-    s.rdoc_options = ['--line-numbers', '-m README']
+    s.rdoc_options = ['--line-numbers', '-m', 'README']
 
     #### Author and project details
 
@@ -202,15 +183,6 @@ if defined? Gem
   end
 end
 
-=begin
-desc "Creates a tag in the repository"
-task :tag do
-  repositoryPath = File.dirname( $1 ) if `svn info` =~ /^URL: (.*)$/
-  fail "Tag already created in repository " if /#{PKG_FULLNAME}/ =~ `svn ls #{repositoryPath}/versions`
-  sh "svn cp -m 'Created version #{PKG_FULLNAME}' #{repositoryPath}/trunk/#{PKG_NAME} #{repositoryPath}/versions/#{PKG_FULLNAME}"
-end
-=end
-
 desc "Upload documentation to homepage"
 task :uploaddoc => [:doc] do
   Dir.chdir('doc/output')
@@ -220,36 +192,79 @@ end
 
 # Misc tasks ###################################################################
 
+begin
+  require 'RMagick'
+  include Magick
 
-def count_lines( filename )
-  lines = 0
-  codelines = 0
-  open( filename ) do |f|
-    f.each do |line|
-      lines += 1
-      next if line =~ /^\s*$/
-      next if line =~ /^\s*#/
-      codelines += 1
-    end
+  ICON_SIZE=64
+
+  def data_path( game )
+    "data/smagacor/#{game}"
+  end
+
+  def src_newer?( src, dest )
+    !File.exists?( dest ) || File.mtime( src ) > File.mtime( dest )
   end
-  [lines, codelines]
-end
 
+  def inkscape_export_svg( svg, png, width )
+    sh "inkscape -z --export-png=#{png} -w #{width} -j -i layer1 #{svg}" if src_newer?( svg, png )
+  end
 
-def show_line( msg, lines, loc )
-  printf "%6s %6s   %s\n", lines.to_s, loc.to_s, msg
-end
+  def povray( pov, png, size )
+    sh "povray #{pov} -geometry #{size[0]}x#{size[1]} +Q9 +A +O'#{png}'" if src_newer?( pov, png )
+  end
 
-desc "Show statistics"
-task :statistics do
-  total_lines = 0
-  total_code = 0
-  show_line( "File Name", "Lines", "LOC" )
-  SRC_RB.each do |fn|
-    lines, codelines = count_lines fn
-    show_line( fn, lines, codelines )
-    total_lines += lines
-    total_code  += codelines
+  CLOBBER << File.join( data_path('tictactoe'), 'tictactoe.png' )
+  CLOBBER << File.join( data_path('tictactoe'), 'x.png' )
+  CLOBBER << File.join( data_path('tictactoe'), 'o.png' )
+  task :gen_game_tictactoe do
+    inkscape_export_svg( 'otherdata/tictactoe/tictactoe.svg', File.join( data_path('tictactoe'), 'tictactoe.png' ), ICON_SIZE )
+    inkscape_export_svg( 'otherdata/tictactoe/x.svg', File.join( data_path('tictactoe'), 'x.png' ), 100 )
+    inkscape_export_svg( 'otherdata/tictactoe/o.svg', File.join( data_path('tictactoe'), 'o.png' ), 100 )
   end
-  show_line( "Total", total_lines, total_code )
+
+  CLOBBER << File.join( data_path('sokoban'), 'sokoban.png' )
+  CLOBBER << File.join( data_path('sokoban'), 'crate.png' )
+  CLOBBER << File.join( data_path('sokoban'), 'storage.png' )
+  CLOBBER << File.join( data_path('sokoban'), 'floor.png' )
+  CLOBBER << File.join( data_path('sokoban'), 'wall.png' )
+  CLOBBER << File.join( data_path('sokoban'), 'man.png' )
+  task :gen_game_sokoban do
+    cd 'otherdata/sokoban' do
+      %w[crate storage floor wall man].each do |pov|
+        dest = File.join( '../../' + data_path('sokoban'), pov + '.png')
+        povray( pov + '.pov', dest, [128,128] )
+      end
+    end
+
+    # make crate.png, storage.png pixels transparent
+    ['crate.png', 'storage.png', 'man.png'].each do |png|
+      img = Image.read( File.join( data_path( 'sokoban'), png ) ).first
+      img.fuzz = 10
+      img = img.matte_replace( 0, 0 )
+      img.write( File.join( data_path( 'sokoban' ), png ) )
+    end
+
+    # create logo
+    w = ICON_SIZE/4
+    img = Image.new( ICON_SIZE, ICON_SIZE ) { self.background_color = 'white' }
+    tiles = ImageList.new( *%w[crate storage floor wall man].collect {|f| File.join( data_path( 'sokoban'), f+'.png' ) } )
+    tiles.each { |tile| tile.change_geometry!( "#{w}x#{w}" ) {|c,r,i| i.resize!(c,r)} }
+
+    lvl = "3333
+3013
+3243
+3333"
+    lvl.split( /\n/ ).each_with_index do |line, y|
+      line.unpack( 'C*' ).each_with_index do |c,x|
+        img.composite!( tiles[2], w*x, w*y, OverCompositeOp )
+        img.composite!( tiles[c.chr.to_i], w*x, w*y, OverCompositeOp )
+      end
+    end
+    img.write( File.join( data_path( 'sokoban' ), 'sokoban.png' ) )
+  end
+
+  task :gen_otherdata => [:gen_game_tictactoe, :gen_game_sokoban]
+
+rescue
 end

data/TODO

@@ -1,19 +1,36 @@
 ---- CURRENT ----
 
+-- GENERAL --
+
+* log window: remove blank line between log lines
+* implement load dialog when loading a game (e.g. for sokoban when creating level images)
+* implement networking ability
 * help -> help for current game
 * make splitter not moveable
 * make splitter hideable
 * implement Pong
 * implement UNDO mechanism
 * implement State saver
-* TicTacToe AI opponent (on base of mini-max, nega-max,...)
 * complete tests
 
+-- SOKOBAN --
+
+* BUG: sokoban man does not get drawn sometimes
+* move to next level when level finished
+* show moves and score
+
+-- TICTACTOE --
+
+* Undo does not work correctly (cur player does not get undone)
+* TicTacToe AI opponent (on base of mini-max, nega-max,...)
+
 ---- FUTURE ----
 
-* implement Sokoban
 
 ---- DONE ----
 
 * BUG: log window should stay behind main window
 * BUG: rake install broken on windows
+* create icon for window
+* implement Sokoban
+* implement undo mechanism for each game

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/data/smagacor/sokoban/game.info

@@ -0,0 +1,7 @@
+--- !thomasleitner,2004/gameinfo
+name: Sokoban
+icon: sokoban.png
+file: sokobanui.rb
+classname: Smagacor::Sokoban::SokobanGame
+description: This is the game of Sokoban.
+category: Strategy Games

data/data/smagacor/sokoban/levels/loma.lvl

@@ -0,0 +1,288 @@
+
+; 1
+'LOMA 1a'
+
+  #####
+ ##   ##
+### #  #
+###$.# #
+#  $.#@#
+# #$.# #
+# #    #
+#  # ###
+##   ##
+ #####
+
+; 2
+'LOMA 1b'
+
+########
+#      #
+# #$.@ #
+#  $.###
+# #$.#
+#   ##
+#####
+
+; 3
+'LOMA 1c'
+
+ #####
+ #   ####
+ #  $.  #
+ ## $.  #
+  ##$.###
+   #@ #
+   ####
+
+; 4
+'LOMA 2a'
+
+#####
+#   ####
+# #$.  #
+#  .$#@#
+###$.  #
+  #  ###
+  #  #
+  ####
+
+; 5
+'LOMA 2b'
+
+  ######
+###    #
+#   ## #
+# #$.  #
+#@#.$###
+# #$.##
+#     #
+###   #
+  #####
+
+; 6
+'LOMA 3a'
+
+  ####
+ ##  #
+ # . #
+ # * #
+## *###
+#  $ #
+#  @ #
+#  ###
+####
+
+; 7
+'LOMA 3b'
+
+####
+#  ####
+#     #
+#  .# #
+###*# ##
+ #@*   #
+ # $   #
+ ###  ##
+   ####
+
+; 8
+'LOMA 4a'
+
+###### #
+#   ## #
+#  . #
+#  $ ###
+## * @ #
+###$ # #
+  #.#  #
+# #   ##
+# ######
+
+; 9
+'LOMA 4b'
+
+#####
+#   ##
+# #. ###
+#  $ @ #
+###*   #
+#  $ ###
+# #.##
+#   #
+#####
+
+; 10
+'LOMA 5a'
+
+ ####
+ #  #
+ #  #
+ #  ####
+###$$  #
+#  $.  #
+# #..###
+# @# #
+##   #
+######
+
+; 11
+'LOMA 5b'
+
+#####
+#  @####
+# #$$  #
+#  $.# #
+###..  #
+  ##   #
+   #####
+
+; 12
+'LOMA 6a'
+
+  #####
+  ##  #
+###   #
+#  $  #
+# .*.##
+## $ #
+###@ #
+  ####
+
+; 13
+'LOMA 6b'
+
+  ####
+ ##  #
+###$ #
+# .*.#
+# #$ #
+#  @ #
+#   ##
+#####
+
+; 14
+'LOMA 7a'
+
+#####
+#   ##
+#  $ ##
+##$*. ##
+ # .@  #
+ #  #  #
+#####  #
+##  ####
+
+; 15
+'LOMA 7b'
+
+#####
+#   ####
+# #@$  #
+#  $*. #
+####. ##
+ #    #
+ #   ##
+ #####
+
+; 16
+'LOMA 7c'
+
+  ########
+  #      #
+### #### #
+#  @$  # #
+#  $*. # #
+#  #.### #
+#  #     #
+##########
+
+; 17
+'LOMA 8a'
+
+  #####
+ ##   #
+###   #
+#  * ##
+# .@$##
+#  * ##
+##  ##
+#####
+
+; 18
+'LOMA 8b'
+
+ ####
+ #  ##
+## * ##
+# .@$ #
+#  *  #
+#  #  #
+#######
+
+; 19
+'LOMA 9a'
+
+  ####
+  #  #
+###  ###
+## $*  #
+#  *. @#
+#   ####
+#  ##
+#####
+
+; 20
+'LOMA 9b'
+
+#####
+#   #####
+#   #   #
+## $*@  #
+ # *.  ##
+ #  ####
+ ####
+
+; 21
+'LOMA 10a'
+
+#### ###
+#@ ### #
+# $$ ###
+# $ .  #
+## ..  #
+ #######
+
+; 22
+'LOMA 10b'
+
+####
+#  #
+#@ ###
+# $$ ##
+# $ . #
+###.. #
+ #   ##
+ #   #
+ #####
+
+; 23
+'LOMA 10c'
+
+######
+#    #
+#    #
+## $$##
+ # $@.#
+ ## ..#
+  #####
+
+; 24
+'LOMA 10d'
+
+  #####
+###   #
+# $$# #
+# $@. #
+#  .. #
+#######