ygocore 建主完善 显示房间信息优化 去除cardcreater

lib/action.rb

@@ -556,7 +556,7 @@ class Action
           player_field.field[@from_pos]
         else
           $log.warn('攻击宣言'){'似乎凭空产生了卡片' + self.inspect}
-          player_field[@from_pos] = Card.new(@card)
+          player_field[@from_pos] = Game_Card.new(@card)
         end
       end
       $log.info('攻击宣言'){self.inspect}

lib/card.rb

@@ -19,6 +19,7 @@ class Card
   CardBack_Small = Surface.load("graphics/field/card_small.gif").display_format
 	class << self
 		def find(id, order_by=nil)
+      $log.debug('查找卡片'){id.inspect}
       case id
 			when Integer
         @all[id] || old_new(@db.get_first_row("select * from `yu-gi-oh` where id = #{id}"))
@@ -203,5 +204,4 @@ class Card
   Unknown = Card.new('id' => 0, 'number' => :"00000000", 'attribute' => :暗, 'level' => 1, 'name' => "", 'lore' => '', 'card_type' => :通常怪兽, 'stats' => "", 'archettypes' => "", 'mediums' => "")
   Unknown.instance_eval{@image = CardBack; @image_small = CardBack_Small}
 end
-require_relative 'cardcreater'
 #Card.load_from_ycff3
\ No newline at end of file

lib/cardcreater.rb

-#encoding: UTF-8
-#== Card Creater
-#Author:: 忧雪の伤  (mailto:snow-heart@qq.com)
-class Card
-  Mark = Surface.load('graphics/cardcreater/mark.png').display_format
-  Name_Font = TTF.open("graphics/cardcreater/经典细隶书繁.ttf", 13)
-  Number_Font = TTF.open("graphics/cardcreater/arialbd.ttf", 7)
-  Lore_Font = TTF.open("graphics/cardcreater/经典细隶书繁.ttf", 6)
-  AtkDef_Font = TTF.open("graphics/cardcreater/Matrix.ttf", 8)
-  #AtkDef_Value_Font = TTF.open("graphics/cardcreater/Lucida Sans Unicode.ttf", 12)
-  AtkDef_Value_Font = TTF.open("graphics/cardcreater/Lucida Sans Unicode.ttf", 8)
-  def create_image
-    #载入背景图
-    result = if monster?
-      Surface.load "graphics/cardcreater/back/#{card_type}/#{attribute}_#{level}.jpg"
-    else 
-      Surface.load "graphics/cardcreater/back/#{card_type}.jpg"
-    end
-    
-    #描绘标记
-    result.put Mark, 148, 218
-    
-    #描绘卡名
-    Name_Font.draw_blended_utf8(result, name.to_s, 15, 10, *name_color)
-
-    #描绘编号
-    Number_Font.draw_blended_utf8(result, number.to_s, 6, 219, *number_color) unless diy?
-    
-    #描绘效果
-    line_height = 6
-    
-    width = 0
-    line = 0
-    str = ""
-    
-    lore.each_char do |char|
-      char_width = Lore_Font.text_size(char)[0]
-      if char_width + width > 124
-        break if line >= 4
-        Lore_Font.draw_blended_utf8(result, str, 14, 111 + (monster? ? 68 : 62)+line*line_height, *number_color)
-        width = 0
-        line += 1
-        str.clear
-      else
-        width += char_width
-        str << char
-      end
-    end
-    Lore_Font.draw_blended_utf8(result, str, 14, 111+(monster? ? 68 : 62)+line*line_height, *number_color) unless str.empty?   
-    
-    
-    if monster?
-      #描绘种族
-      if card_type.equal? :通常怪兽
-        if monster_type.equal? :调整
-          str = "【#{type}族·调整】" 
-        else 
-          str = "【#{type}族】"
-        end
-      elsif [:灵魂, :同盟, :卡通, :二重, :调整].include? monster_type
-        str = "【#{type}族·#{monster_type}】"
-      else
-        str = "【#{type}族·#{card_type.to_s.sub(/怪兽/, '')}】"
-      end
-      Lore_Font.style = TTF::STYLE_BOLD
-      Lore_Font.draw_blended_utf8(result, str, 11, 173, *number_color)
-      Lore_Font.style = TTF::STYLE_NORMAL
-      
-      #描绘攻防  
-      atkdef = 'ATK/          DEF/        '
-      #atkdef = "ATK/#{atk}    DEF/#{self.def}    "
-      x = 146-AtkDef_Font.text_size(atkdef)[0]
-      AtkDef_Font.draw_blended_utf8(result, atkdef, x, 209, *number_color)
-
-      #atkdef_value = "#{atk}          #{self.def}"
-      atkdef_value = "#{atk}       #{self.def}"
-      x = 146-AtkDef_Value_Font.text_size(atkdef_value)[0]
-      AtkDef_Value_Font.draw_blended_utf8(result, atkdef_value, x, 207, *number_color)
-    end
-    
-    result
-  end
-  def name_color
-    if [:通常怪兽, :效果怪兽, :融合怪兽, :仪式怪兽, :同调怪兽].include? card_type
-      [0, 0, 0]
-    else
-      [255, 255, 255]
-    end
-  end
-  def number_color
-    if [:超量怪兽].include? card_type
-      [255, 255, 255]
-    else
-      [0, 0, 0]
-    end
-  end
-end
-
-=begin
-#以下忧雪の伤的原版，for RPG Maker VX
-class String
-  
-  # Temp
-  def each_char
-    scan(/./).each {|char| yield char }
-  end
-  alias each each_char
-  include Enumerable
-  
-end
-
-class Card
-  
-  # Default
-  
-  attr_accessor :id 
-  attr_accessor :number
-  attr_accessor :name
-  attr_accessor :card_type
-  attr_accessor :monster_type
-  attr_accessor :atk 
-  attr_accessor :def
-  attr_accessor :attribute
-  attr_accessor :type
-  attr_accessor :level
-  attr_accessor :lore
-  attr_accessor :status
-  attr_accessor :stats 
-  attr_accessor :archettypes
-  attr_accessor :mediums
-  attr_accessor :tokens
-  
-  def image
-
-    # Result Create
-    result = Bitmap.new 160, 230
-    
-    # Mark & Image Create
-    mark = Bitmap.new 'Mark'
-    image = Bitmap.new "Image/#{id}"
-    
-    # Back Create
-    if monster?
-      back = Bitmap.new "Back/#{card_type}/#{attribute} #{level}"
-    else 
-      back = Bitmap.new "Back/#{card_type}"
-    end
-    
-    # Blt All
-    result.blt 0, 0, back, back.rect
-    result.blt 148, 218, mark, mark.rect
-    result.blt 21, 46, image, image.rect
-    
-    # Name Create
-    result.font.size = 13
-    result.font.name = '经典细隶书繁'
-    if [:通常怪兽, :效果怪兽, :融合怪兽, :仪式怪兽, :同调怪兽
-      ].include? card_type
-      result.font.color.set 0, 0, 0
-    else
-      result.font.color.set 255, 255, 255
-    end
-    src_bitmap = Bitmap.new [result.text_size(name).width, 108].max, 18
-    src_bitmap.font = result.font
-    src_bitmap.draw_text src_bitmap.rect, name
-    result.stretch_blt Rect.new(15, 10, 108, 18), src_bitmap, src_bitmap.rect
-    
-    # Number Create
-    result.font.size = 7    
-    result.font.bold = true
-    result.font.name = 'Arial'
-    if card_type.equal? :XYZ怪兽
-      result.font.color.set (255, 255, 255)
-    else
-      result.font.color.set (0, 0, 0) 
-    end
-    result.draw_text 6, 219, 160, 7, number
-    result.font.bold = false
-    
-    # Lore Create
-    src_bitmap = Bitmap.new 1280, 800
-    src_bitmap.font.size = 6
-    src_bitmap.font.color.set 0, 0, 0
-    src_bitmap.font.name = '经典细隶书繁'
-    height = src_bitmap.text_size(lore).height
-    inject = lore.inject([0, 0, 0]) {|array, char|
-      text_size = src_bitmap.text_size char
-      args = array[0], array[1], text_size.width, text_size.height, char
-      src_bitmap.draw_text *args
-      if array[0] < 124
-        [array[0] + text_size.width, array[1], array[2]]
-      else
-        [0, array[1] + height, array[2] + 1]
-      end
-    }
-    src_rect = Rect.new 0, 0, 133, (inject[2] + 1) * height
-    dest_rect = Rect.new 14, 111 + (monster? ? 68 : 62), 0, 0
-    dest_rect.width = [inject[1], 133].max
-    dest_rect.height = [(inject[2] + 1) * height, 30].min
-    result.stretch_blt dest_rect, src_bitmap, src_rect
-    
-    if monster?
-      
-      # Type Create
-      result.font = src_bitmap.font
-      if card_type.equal? :通常怪兽
-        if monster_type.equal? :调整
-          string = "【#{type}族·调整】" 
-        else 
-          string = "【#{type}族】"
-        end
-      elsif [:灵魂, :同盟, :卡通, :二重, :调整].include? monster_type
-        string = "【#{type}族·#{monster_type}】"
-      else
-        string = "【#{type}族·#{card_type.to_s.sub(/怪兽/, '')}】"
-      end
-      result.font.bold = true
-      result.draw_text 11, 173, 160, 6, string
-      result.font.bold = false
-      
-      # ATK & DEF Create
-      result.font.size = 8
-      result.font.name = 'Matrix'
-      result.draw_text -14, 209, 160, 8, 'ATK/          DEF/        ', 2
-      result.font.size = 12
-      result.font.name = 'Lucida Sans Unicode'
-      result.draw_text -14, 207, 160, 12, "#{atk}          #{self.def}", 2
-    
-    end
-      
-    # Return
-    result
-    
-  end
-  def monster? 
-    
-    # Temp
-    [:通常怪兽, :效果怪兽, :融合怪兽, :仪式怪兽, :同调怪兽, :XYZ怪兽
-      ].include? card_type
-  
-  end
-  def spell?
-    
-    # Temp
-    !monster?
-    
-  end
-  def trap?
-    
-    # Temp
-    !monster?
-    
-  end
-end
-=end
\ No newline at end of file

lib/game.rb

@@ -16,7 +16,7 @@ class Game
   end
   def refresh
   end
-  def host
+  def host(room_name, room_config)
   end
   def join(room)
   end

lib/room.rb

@@ -27,6 +27,9 @@ class Room
   def include?(user)
     @player1 == user or @player2 == user
   end
+  def extra
+    {}
+  end
   alias full? player2
   alias private? private
 end
\ No newline at end of file

lib/scene_lobby.rb

@@ -11,6 +11,7 @@ class Scene_Lobby < Scene
   require_relative 'window_roomlist'
   require_relative 'window_chat'
   require_relative 'window_host'
+  require_relative 'window_lobbybuttons'
   require_relative 'chatmessage'
   require_relative 'scene_duel'
   attr_reader :chat_window
@@ -23,7 +24,7 @@ class Scene_Lobby < Scene
 		@userlist = Window_UserList.new(24,204,$game.users)
     @roomlist = Window_RoomList.new(320,50,$game.rooms)
 		@userinfo = Window_UserInfo.new(24,24, $game.user)
-		@host_window = Window_Host.new(900,16)
+		@host_window = Window_LobbyButtons.new(900,16)
     @active_window = @roomlist
 		@chat_window = Window_Chat.new(313,543,698,212)
     @count = 0
@@ -47,14 +48,14 @@ class Scene_Lobby < Scene
         #@joinroom_msgbox = Widget_Msgbox.new("加入房间", "正在加入房间")
         #$game.join 'localhost'
       when Key::F5
-        if @roomlist.items and room = @roomlist.items.find{|room|room.player1 == $game.user or room.player2 == $game.user}
-          $game.qroom room
-        end
+#        if @roomlist.items and room = @roomlist.items.find{|room|room.player1 == $game.user or room.player2 == $game.user}
+#          $game.qroom room
+#        end
         $game.refresh
       when Key::F12
-        if @roomlist.items and room = @roomlist.items.find{|room|room.player1 == $game.user or room.player2 == $game.user}
-          $game.qroom room
-        end
+#        if @roomlist.items and room = @roomlist.items.find{|room|room.player1 == $game.user or room.player2 == $game.user}
+#          $game.qroom room
+#        end
         $game.exit
         $scene = Scene_Login.new
       end

lib/window.rb

 class Window
   WLH = 24
-  attr_accessor :x, :y, :width, :height, :z, :contents, :visible, :viewport
+  attr_accessor :x, :y, :width, :height, :z, :contents, :visible, :viewport, :background
   alias visible? visible
   def initialize(x, y, width, height, z=200)
     @x = x

lib/window_host.rb

 #encoding: UTF-8
-class Window_Host < Window_List
+class Window_Host < Window
+  attr_reader :index
   def initialize(x,y)
-    super(x,y,86,30)
-    @items = ["新房间"]
-    @button = Surface.load("graphics/lobby/button.png")
+    super(x,y,300,150,300)
+    @items = {:ok => [116,114,100,20]}
+    @buttons = {:ok => "确定"}
+    @background = Surface.load('graphics/system/msgbox.png').display_format
+    @button = Surface.load("graphics/system/button.png")
     @font = TTF.open("fonts/WenQuanYi Micro Hei.ttf", 16)
+    @title_color = [0xFF, 0xFF, 0xFF]
+    @color = [0x04, 0x47, 0x7c]
+    @roomname_inputbox = Widget_InputBox.new(@x+96, @y+41, 165, WLH){clicked;false}
+    @roomname_inputbox.value = $game.user.name
+    @pvp = Widget_Checkbox.new(self, 33+@x,70+@y,120,24,false,"竞技场")
+    @pvp.background = @background.copy_rect(33,70,120,24)
+    @match = Widget_Checkbox.new(self, 120+@x,70+@y,120,24,true,"三回决斗")
+    @match.background = @background.copy_rect(120,70,120,24)
+    @pvp.refresh
+    @match.refresh
     refresh
   end
+  def refresh
+    clear
+    @font.draw_blended_utf8(@contents, "新房间", (@width-@font.text_size("新房间")[0])/2, 2, *@title_color)
+    @font.draw_blended_utf8(@contents, "房间名", 33,43, *@color)
+    draw_item(:ok, self.index==:ok ? 1 : 0)
+  end
   def draw_item(index, status=0)
-    Surface.blit(@button, status*@button.w/3,0,@button.w/3,@button.h, @contents, 0, 0)
-    @font.draw_blended_utf8(@contents,"新房间",16,5,20,10,180)
+    Surface.blit(@button,@button.w/3*status,0,@button.w/3,@button.h,@contents,@items[index][0],@items[index][1])
+    text_size = @font.text_size(@buttons[index])
+    @font.draw_blended_utf8(@contents, @buttons[index], @items[index][0]+(@button.w/3-text_size[0])/2, @items[index][1]+(@button.h-text_size[1])/2, 0xFF, 0xFF, 0xFF)
   end
   def mousemoved(x,y)
-    self.index = 0
+    if (x - @x).between?(@items[:ok][0], @items[:ok][0]+@items[:ok][2]) and (y-@y).between?(@items[:ok][1], @items[:ok][1]+@items[:ok][3])
+      self.index = :ok
+    else
+      self.index = nil
+    end
   end
-  def lostfocus(active_window = nil)
-    self.index = nil
+  def index=(index)
+    return if index == @index
+    
+    if @index
+      #clear(*item_rect(@index))
+      draw_item(@index, 0) 
+    end
+    if index.nil? or !@items.include? index
+      @index = nil
+    else
+      @index = index
+      draw_item(@index, 1)
+    end
   end
   def clicked
-    $game.join Room.new(0, $game.user.name)
+    case self.index
+    when :ok
+      return if @roomname_inputbox.value.empty?
+      $game.host(@roomname_inputbox.value, :pvp => @pvp.checked?, :match => @match.checked?)
+      @roomname_inputbox.destroy
+      @pvp.destroy
+      @match.destroy
+      self.destroy
+    end
   end
-end
+end
\ No newline at end of file

lib/window_lobbybuttons.rb

+#encoding: UTF-8
+require_relative 'window_host'
+class Window_LobbyButtons < Window_List
+  def initialize(x,y)
+    super(x,y,86,30)
+    @items = ["新房间"]
+    @button = Surface.load("graphics/lobby/button.png")
+    @font = TTF.open("fonts/WenQuanYi Micro Hei.ttf", 16)
+    refresh
+  end
+  def draw_item(index, status=0)
+    Surface.blit(@button, status*@button.w/3,0,@button.w/3,@button.h, @contents, 0, 0)
+    @font.draw_blended_utf8(@contents,"新房间",16,5,20,10,180)
+  end
+  def mousemoved(x,y)
+    self.index = 0
+  end
+  def lostfocus(active_window = nil)
+    self.index = nil
+  end
+  def clicked
+    Window_Host.new(300,200)
+  end
+end

lib/window_roomlist.rb

@@ -28,9 +28,13 @@ class Window_RoomList < Window_Scrollable
     @font.draw_blended_utf8(@contents, "R-#{room.id}", 24, y+8, *@color)
     @font.draw_blended_utf8(@contents, room.full? ? "【决斗中】" : room.private? ? "【私密房】" : "【等待中】", 8, y+24, *@color)
     @font.draw_blended_utf8(@contents, room.name, 128, y+8, *room.color) unless room.name.empty? or room.name.size > 100
-    p room.name if room.name.size > 100
+    $log.error('标题过长') {room.name} if room.name.size > 100
     @font.draw_blended_utf8(@contents, room.player1.name, 128, y+24, *room.player1.color) if room.player1
     @font.draw_blended_utf8(@contents, room.player2.name, 256, y+24, *room.player2.color) if room.player2
+    room.extra.each_with_index do |extra, index|
+      str, color = extra
+      @font.draw_blended_utf8(@contents, str, 300+index*96, y+8, *color)
+    end
   end
   
   def mousemoved(x,y)

lib/ygocore/event.rb

@@ -15,6 +15,10 @@ class Game_Event
           end
         end
         room = Room.new(id.to_i, name, player1, player2, false, status["等待"] ? [0,0,255] : [255,0,0])
+        room.name =~ /^(P)?(M)?\#?(.*)$/
+        room.name = $3
+        room.pvp = !!$1
+        room.match = !!$2
         if status["等待"]
           @rooms.unshift room
         else

lib/ygocore/game.rb

@@ -2,9 +2,11 @@
 load File.expand_path('window_login.rb', File.dirname(__FILE__))
 require 'open-uri'
 class Ygocore < Game
-  Register_Url = 'http://140.113.242.65/register.html'
-  Port = 7911
-  Server = '140.113.242.65'
+  Register_Url = 'http://card.touhou.cc/register' #用户点击注册时打开的地址
+  Port = 7911 #加入房间时填写到ygocore的服务器端口
+  Server = '140.113.242.65'  #加入房间时填写到ygocore的服务器IP
+  API_Url = 'http://card.touhou.cc:7922/'  #获取房间列表和公告的地址
+  Index_Url = 'http://card.touhou.cc/' #用户点击公告之后打开的地址
   
   WM_LBUTTONDOWN = 0x201
   WM_LBUTTONUP = 0x202
@@ -32,6 +34,16 @@ class Ygocore < Game
     @password = password
     Game_Event.push Game_Event::Login.new(User.new(username.to_sym, username))
   end
+  def host(room_name, room_config)
+    room = Room.new(0, room_name)
+    if room_config[:pvp]
+      room.pvp = true
+    end
+    if room_config[:match]
+      room.match = true
+    end
+    join room
+  end
   def watch(room)
     Widget_Msgbox.new("观战", "ygocore不支持加入已经开始游戏的房间", :ok => "确定")
   end
@@ -45,6 +57,15 @@ class Ygocore < Game
       save_config
       @last_clicked = Time.now
     end
+    room_name = if room.pvp? and room.match?
+      "PM#" + room.name
+    elsif room.pvp?
+      "P#" + room.name
+    elsif room.match?
+      "M#" + room.name
+    else
+      room.name
+    end
     if $config['ygocore']['path'] and File.file? $config['ygocore']['path']
       $scene.draw
       #写入配置文件并运行ygocore
@@ -95,17 +116,17 @@ class Ygocore < Game
         sleep 0.3
         if @@OpenClipboard.Call(0) != 0
           @@EmptyClipboard.Call();
-          len = @@lstrlen.Call(room.name.encode("GBK"));
+          len = @@lstrlen.Call(room_name.encode("GBK"));
           hmem = @@GlobalAlloc.Call(GMEM_DDESHARE, len+1);
           pmem = @@GlobalLock.Call(hmem);
-          @@lstrcpy.Call(pmem, room.name.encode("GBK"));
+          @@lstrcpy.Call(pmem, room_name.encode("GBK"));
           @@SetClipboardData.Call(CF_TEXT, hmem);
           @@GlobalUnlock.Call(hmem);
           @@CloseClipboard.Call;
         else
           return Widget_Msgbox.new("加入房间", '填写房间名失败 请把房间名手动填写到房间密码处', :ok => "确定")
         end
-        $log.debug('加入房间'){room.name}
+        $log.debug('加入房间'){room_name}
         @@SetForegroundWindow.call(hwnd)
         @@SendMessage.call(hwnd, WM_LBUTTONDOWN, 0, MAKELPARAM(380,500))
         @@SendMessage.call(hwnd, WM_LBUTTONUP, 0, MAKELPARAM(380,500))
@@ -128,7 +149,7 @@ class Ygocore < Game
   def refresh
     Thread.new do
       begin
-        open('http://140.113.242.65:7922/') do |file|
+        open(API_Url) do |file|
           file.set_encoding("GBK")
           info = file.read.encode("UTF-8")
           Game_Event.push Game_Event::AllUsers.parse info
@@ -149,11 +170,11 @@ class Ygocore < Game
     $config['ygocore']['announcements'] ||= [Announcement.new("正在读取公告...", nil, nil)]
     Thread.new do
       begin
-        open('http://140.113.242.65:7922/') do |file|
+        open(API_Url) do |file|
           file.set_encoding "GBK"
           announcements = []
           file.read.encode("UTF-8").scan(/<div style="color:red" >公告：(.*?)<\/div>/).each do |title,others|
-            announcements << Announcement.new(title, "http://140.113.242.65/", nil)
+            announcements << Announcement.new(title, Index_Url, nil)
           end
           $config['ygocore']['announcements'].replace announcements
           save_config

lib/ygocore/room.rb

@@ -2,7 +2,21 @@
 # and open the template in the editor.
 
 class Room
+  attr_accessor :pvp
+  attr_accessor :match
+  alias pvp? pvp
+  alias match? match
   def full?
     color == [255,0,0]  #方法不规范 凑合用
   end
+  def extra
+    result = {}
+    if pvp?
+      result["[竞技场]"] = [255,0,0]
+    end
+    if match?
+      result["[三回决斗]"] = [255,0,0]
+    end
+    result
+  end
 end