@@ -1,4 +1,6 @@ Things that I'd like to do in the near future: + Include game_id param when creating new turns + Put in check for game file name on turn creation Email games to the repo straight from Civ4 Specify ruler in addition to civilization Keep track of game results TODO @@ -24,12 +24,24 @@ class Turn < ActiveRecord::Base TurnNotification.deliver_turn_notification(player.game.next_player, game_file) end - def year - begin - game_file_file_name.split("_")[1].split("-").last.to_i - rescue - "?" + def full_year + "#{year} #{ce}" rescue "?" + end + + def year_index + year_index = 0 + game_file_file_name.split("-").each_with_index do |item, index| + year_index = index if ["AD", "BC"].include?(item.slice(-2..-1)) end + year_index + end + + def year + game_file_file_name.split("-")[year_index+1].split("_").first.to_i rescue 0 + end + + def ce #Calendar Era + game_file_file_name.split("-")[year_index].slice(-2..-1) rescue "BC" end def round app/models/turn.rb @@ -17,7 +17,7 @@ <td><%= link_to game.name, game %> (<%= game.expansion %>)</td> <td><%= game.players.count %></td> <td><%= game.turns.size %></td> - <td><%= game.turns.size == 0 ? "Beginning" : game.turns.last.year %></td> + <td><%= game.turns.size == 0 ? "Beginning" : game.turns.last.full_year %></td> <td><%= timeago game.created_at %></td> <% lastplayer = game.turns.size == 0 ? game.players.first : game.turns.last.player %> <td><%= link_to lastplayer.user.name, lastplayer.user %> (<%= timeago game.turns.size == 0 ? game.created_at : game.turns.last.created_at %>)</td> app/views/games/index.html.erb @@ -53,7 +53,7 @@ <% if @game.turns_in_current_round > 0 %> <td rowspan="<%= @game.turns_in_current_round + 1 %>"><%= @game.turns.last.year %></td> <% else -%> - <td><%= @game.turns.last.nil? ? "4000" : @game.turns.last.year - 40 %> + <td><%= @game.turns.last.nil? ? "4000 BC" : "#{@game.turns.last.year - 40} #{@game.turns.last.ce}" %> <% end -%> <td><%= @game.turns.size %></td> <% if @game.next_player.user.id == current_user.id -%> @@ -68,7 +68,7 @@ <tr <%= "class=\"yearboundary\"" if turn.next && turn.next.year != turn.year %>> <% if (turn.next.nil? && @game.turns_in_current_round == 0) || (turn.next && turn.next.round != turn.round) -%> <td rowspan="<%= @game.players.size %>" class="round"><%= turn.round %></td> - <td rowspan="<%= @game.players.size %>" class="round"><%= turn.year %></td> + <td rowspan="<%= @game.players.size %>" class="round"><%= turn.full_year %></td> <% end -%> <td><%= link_to turn.position, turn.game_file.url(nil, false) %></td> <td><%= link_to turn.player.user.name, turn.player.user %></td> app/views/games/show.html.erb @@ -19,7 +19,7 @@ <td><%= link_to game.name, game %> (<%= game.expansion %>)</td> <td><%= game.players.count %></td> <td><%= game.turns.size %></td> - <td><%= game.turns.size == 0 ? "Beginning" : game.turns.last.year %></td> + <td><%= game.turns.size == 0 ? "Beginning" : game.turns.last.full_year %></td> <td><%= timeago game.created_at %></td> <% lastplayer = game.turns.size == 0 ? game.players.first : game.turns.last.player %> <td><%= link_to lastplayer.user.name, lastplayer.user %> (<%= timeago game.turns.size == 0 ? game.created_at : game.turns.last.created_at %>)</td> app/views/users/_my_games.html.erb 6b1215b3a7f7c51223888fc5ee42c970e204963d Erik Peterson erik@subwindow.com http://github.com/subwindow/Civ4-Game-Repo/commit/8c7ffc02d551806b6d9dafd4872075be63781324 8c7ffc02d551806b6d9dafd4872075be63781324 2009-05-17T18:23:00-07:00 2009-05-17T18:23:00-07:00 year parsing improvements d33f4493177c333c65a0a7d66dd8557793445a6a Erik Peterson erik@subwindow.com