monkeymusic 0.0.5 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTBjY2IwY2ZiYTBkOGU3ZWExYzM1NmRiZjU3OGE4N2NkMTY4Y2FjYw==
+    NDEzMGMzYWVjZjkzYzdkMzk1YTZiYWZjMzViZjM3ZTJkODk5MzViNw==
   data.tar.gz: !binary |-
-    MDZiMDI1YjFmMmRmOWZmYjI3NDlhNzNjNjlhZWFkZTk3ZDM4ZGIxNQ==
+    YWRmOGVmMWFlOTQ5NWQxMWY1N2ViYzE4ZjQ3ZGQ2NGJjZDFlZDRhNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGIzYmE3NDExNGFjYzUxMmZlNzAzMTJkNDk3NjA2OTk2ZTlkNWFjZDk1OWY4
-    MmY4NTgxMTBlOTI2ZTIwNmUyYjk5YjE0NzIzYWViMzJiN2FjMjZjYmY3Yzhh
-    OTE0NDg1ZjEwMGJjMWYxY2VjYTE3OWExMDIwYjBhYjNhNzA0Yjg=
+    NzM1MmQ0MzAyZGViMzNlNDUzMGQzNmE3OWViOTM3NmE3NjI4MzQzYjhhMWJj
+    YjI0NDM4ZjU2YzU4YzYwMmU5NmYxYWU5NmViYzhkYmFkZGExYzY4ZmM0NzFl
+    MGE1MDkwOWE1MWZhNDM2YWM0YmZlZjhjYTgzOWE1MzViMzFjMTc=
   data.tar.gz: !binary |-
-    MDZiMTRlOGE3MWE4NGJjNGI2YWNlOTcyODM5ZDM0YjM5NzBhZmJiOWZlNWNh
-    ZmQ4YWVkZDI2OGE4YmNmNjM3OWM1MDE3ZjBiMmJmYTk1N2RjNWE0MTgyYjJl
-    ZWVmNjJlMGEyMTRlMGMwYjNkM2ZiNTMzMmI0NjE3OGJmODQxZGI=
+    NGE5YWRjMmY5NDRmNDg2ZTUwOGUxZWE3ZWMyNjIwZmFiOGJiZjI4OWE5OTNm
+    YWNhYTU5ZmJmZGVlNGU2ZjQ5NjBjMmNkNGU0NGQyNTRlZmEyNTI0NjBlZjMx
+    YmYwZmE1MzkxOGM2ZGY2MzNlNjQzNDcyY2JhOTM0MTc0OGE2ZWE=

data/demo_player

@@ -0,0 +1,93 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+
+@type = gets.chomp
+
+if @type == "INIT"
+  @cache = {}
+  @cache[:monkey] = gets.chomp
+  @cache[:width] = Integer(gets.chomp)
+  @cache[:height] = Integer(gets.chomp)
+  @cache[:turn_limit] = Integer(gets.chomp)
+  [:top_tracks, :top_albums, :top_artists, :disliked_artists].each do |toplist|
+    @cache[toplist] = []
+    n = Integer(gets.chomp)
+    n.times { @cache[toplist] << gets.chomp }
+  @cache[:uris] = {}
+  end
+  File.open(File.join(Dir.getwd, "cache_p1"), "w+") {|f| f.write YAML::dump(@cache)}
+  exit
+end
+
+@cache = YAML::load(IO.read "cache_p1")
+
+# Read indata
+@turn = Integer(gets.chomp)
+@remaining_capacity = Integer(gets.chomp)
+@remaining_time = Integer(gets.chomp)
+
+@unknown = []
+
+# Read level
+@tracks = []
+@cache[:height].times do |y|
+  row = gets.chomp.split(',')
+  @cache[:width].times do |x|
+    thing = row[x]
+    if thing == @cache[:monkey]
+      @x, @y = x, y
+    elsif /spotify:track/.match(thing)
+      @unknown << thing unless @cache[:uris][thing]
+      @tracks << [x, y]
+    elsif thing == "U"
+      @user = [x, y]
+    end
+  end
+end
+
+#if uri = @unknown.pop
+  #puts uri
+  #$stdout.flush
+  #n = Integer(gets.chomp)
+  #if n == 1
+    #@cache[:uris][uri] = gets.chomp
+  #end
+  #File.open(File.join(Dir.getwd, "cache_p1"), "w+") {|f| f.write YAML::dump(@cache)}
+  #exit
+#end
+
+def move_toward(x, y)
+  if @x < x
+    "E"
+  elsif @x > x
+    "W"
+  elsif @y < y
+    "S"
+  elsif @y > y
+    "N"
+  end
+end
+
+def closest_track
+  curr_closest = @tracks.pop()
+  curr_smallest_distance = distance_to(*curr_closest)
+  @tracks.each do |track|
+    curr_distance = distance_to(*track)
+    if curr_distance < curr_smallest_distance
+      curr_closest = track
+      curr_smallest_distance = curr_distance
+    end
+  end
+  curr_closest
+end
+
+def distance_to(x, y)
+  (@x - x).abs + (@y - y).abs
+end
+
+if (@remaining_capacity > 0) && (not @tracks.empty?)
+  puts move_toward(*closest_track())
+else
+  puts move_toward(*@user)
+end

data/lib/monkey_music/runner.rb

@@ -1,10 +1,12 @@
 require 'optparse'
+require 'fileutils'
 
 module MonkeyMusic
   class Runner
 
-    @@default_level = 'bomberman2.rb'
-    @@default_user = 'synth.yaml'
+    @@default_level = 'demo_level.rb'
+    @@default_user = 'demo_user.yaml'
+    @@default_player = 'demo_player'
 
     def initialize(arguments)
       @arguments = arguments
@@ -15,6 +17,36 @@ module MonkeyMusic
     end
 
     def run
+      if ARGV[0] == "demo"
+        puts "\tcreate ./#{@@default_level}"
+        FileUtils.cp(
+          File.join(
+            File.dirname(__FILE__), 
+            "../../levels", 
+            @@default_level
+          ),
+          Dir.getwd
+        )
+        puts "\tcreate ./#{@@default_user}"
+        FileUtils.cp(
+          File.join(
+            File.dirname(__FILE__), 
+            "../../users", 
+            @@default_user
+          ),
+          Dir.getwd
+        )
+        puts "\tcreate ./#{@@default_player}"
+        FileUtils.cp(
+          File.join(
+            File.dirname(__FILE__), 
+            "../../", 
+            @@default_player
+          ),
+          Dir.getwd
+        )
+        exit
+      end
       @opt_parser.parse!
       # Handle fallback to default level
       @level_file ||= File.join(
@@ -65,7 +97,7 @@ module MonkeyMusic
     end
 
     def init_parser(opts)
-      opts.banner = 'Usage: monkeymusic -p PLAYER_FILE -n PLAYER_NAME [-u USER_FILE] [-l LEVEL_FILE]'
+      opts.banner = "Usage: monkeymusic [demo] [-p PLAYER_FILE -n PLAYER_NAME [-u USER_FILE] [-l LEVEL_FILE]]"
 
       opts.on('-p',
               '--player FILE',
@@ -104,7 +136,7 @@ module MonkeyMusic
 
       opts.on('-v', '--version', 
               'Show the current version.') do |password|
-        puts '0.0.5' # TODO: Find out how to extract version from GemSpec
+        puts '0.0.7' # TODO: Find out how to extract version from GemSpec
         exit
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monkeymusic
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Oscar Soderlund
@@ -53,22 +53,22 @@ files:
 - lib/monkey_music/ui/browser.rb
 - lib/monkey_music/ui/console.rb
 - levels/testmaze_30.rb
-- levels/bomberman2.rb
 - levels/the_last_crusade.rb
 - levels/testlevel.rb
+- levels/demo_level.rb
 - levels/testmaze_10.rb
 - levels/testlevel_maze.rb
 - levels/travelling_salesmonkeys.rb
-- levels/demolevel.rb
 - levels/testmaze_20.rb
 - bin/monkeymusic-generate
 - bin/monkeymusic
-- users/synth.yaml
+- users/demo_user.yaml
 - users/synth.rb
 - Gemfile.lock
 - Gemfile
 - README.markdown
 - LICENSE
+- demo_player
 homepage: https://github.com/odsod/monkey-music
 licenses:
 - MIT

data/levels/demolevel.rb

@@ -1,23 +0,0 @@
-carrying_capacity 3
-metadata_requests_per_turn 2
-max_turns 100
-
-legend({ 
-  "1" => Monkey.player(1),
-  "2" => Monkey.player(2),
-  "X" => Track.worth(-2),
-  "x" => Track.worth(-1),
-  "l" => Track.worth(1),
-  "t" => Track.worth(2),
-  "T" => Track.worth(3),
-  "U" => User,
-  "#" => Wall,
-})
-
-layout <<LAYOUT
-....t..t...
-.#.......#.
-#..#1U2#..#
-.#X.....X#.
-.....t.....
-LAYOUT