[Pythianproject-cvsmail] CVS: PythianProject/Source/Conversation/Editor mainWin.dfm,1.5,1.6 mainWin.pas,1.5,1.6

[Michael H. <mh...@us...>]

Update of /cvsroot/pythianproject/PythianProject/Source/Conversation/Editor
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5988/Source/Conversation/Editor

Modified Files:
	mainWin.dfm mainWin.pas 
Log Message:
renamed AI designer form file. Conversation editor mods. -mike

Index: mainWin.dfm
===================================================================
RCS file: /cvsroot/pythianproject/PythianProject/Source/Conversation/Editor/mainWin.dfm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
Binary files /tmp/cvsuyg2nL and /tmp/cvsOcfAvm differ

Index: mainWin.pas
===================================================================
RCS file: /cvsroot/pythianproject/PythianProject/Source/Conversation/Editor/mainWin.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** mainWin.pas	2000/09/15 17:06:17	1.5
--- mainWin.pas	2000/09/17 10:46:17	1.6
***************
*** 51,57 ****
      CommandScriptSheet: TTabSheet;
      CommandScriptMemo: TMemo;
!     CommandEnableGroupSheet: TTabSheet;
      Label8: TLabel;
!     CommandDisableGroupSheet: TTabSheet;
      Label9: TLabel;
      CommandJumpSheet: TTabSheet;
--- 51,57 ----
      CommandScriptSheet: TTabSheet;
      CommandScriptMemo: TMemo;
!     CommandEnableSheet: TTabSheet;
      Label8: TLabel;
!     CommandDisableSheet: TTabSheet;
      Label9: TLabel;
      CommandJumpSheet: TTabSheet;
***************
*** 70,78 ****
      ConfirmDelete1: TMenuItem;
      Script1: TMenuItem;
!     EnableGroup1: TMenuItem;
!     DisableGroup1: TMenuItem;
      Jumptopoint1: TMenuItem;
      CommandJumpTargetBut: TButton;
!     GroupEnableTargetBut: TButton;
      GroupDisableTargetBut: TButton;
      DomImplementation1: TDomImplementation;
--- 70,78 ----
      ConfirmDelete1: TMenuItem;
      Script1: TMenuItem;
!     Enable1: TMenuItem;
!     Disable1: TMenuItem;
      Jumptopoint1: TMenuItem;
      CommandJumpTargetBut: TButton;
!     EnableTargetBut: TButton;
      GroupDisableTargetBut: TButton;
      DomImplementation1: TDomImplementation;
***************
*** 121,127 ****
      procedure Jumptopoint1Click(Sender: TObject);
      procedure CommandJumpTargetButClick(Sender: TObject);
!     procedure GroupEnableTargetButClick(Sender: TObject);
!     procedure EnableGroup1Click(Sender: TObject);
!     procedure DisableGroup1Click(Sender: TObject);
      procedure GroupDisableTargetButClick(Sender: TObject);
      procedure GenXMLButClick(Sender: TObject);
--- 121,127 ----
      procedure Jumptopoint1Click(Sender: TObject);
      procedure CommandJumpTargetButClick(Sender: TObject);
!     procedure EnableTargetButClick(Sender: TObject);
!     procedure Enable1Click(Sender: TObject);
!     procedure Disable1Click(Sender: TObject);
      procedure GroupDisableTargetButClick(Sender: TObject);
      procedure GenXMLButClick(Sender: TObject);
***************
*** 147,152 ****
      LastNode :TTreeNode;
      jumpSelect:boolean;
!     groupTargetEnable:boolean;
!     groupTargetDisable:boolean;
      tmpLastNode :TTreeNode;
      currentXMLDoc :TdomDocument;
--- 147,152 ----
      LastNode :TTreeNode;
      jumpSelect:boolean;
!     TargetEnable:boolean;
!     TargetDisable:boolean;
      tmpLastNode :TTreeNode;
      currentXMLDoc :TdomDocument;
***************
*** 172,176 ****
  
      procedure OnJumpSelect(newNode:TTreeNode); virtual ;
!     procedure OnGroupSelect(newNode:TTreeNode); virtual ;
  
      procedure LoadXML(filename:string); virtual ;
--- 172,176 ----
  
      procedure OnJumpSelect(newNode:TTreeNode); virtual ;
!     procedure OnObjectSelect(newNode:TTreeNode); virtual ;
  
      procedure LoadXML(filename:string); virtual ;
***************
*** 352,368 ****
        CommandTypeRadios.ItemIndex := 0;
      end else
!     if ConvObj is TConversationGroupEnable then
      begin
        CommandTypeRadios.ItemIndex := 1;
!       if TConversationGroupEnable(convObj).TargetGroup <> nil then
!         GroupEnableTargetBut.Caption := TConversationGroupEnable(convObj).TargetGroup.Name
        else
!         GroupEnableTargetBut.Caption := 'no target';
      end
!     else if ConvObj is TConversationGroupDisable then
      begin
        CommandTypeRadios.ItemIndex := 2;
!       if TConversationGroupDisable(convObj).TargetGroup <> nil then
!         GroupDisableTargetBut.Caption := TConversationGroupDisable(convObj).TargetGroup.Name
        else
          GroupDisableTargetBut.Caption := 'no target';
--- 352,368 ----
        CommandTypeRadios.ItemIndex := 0;
      end else
!     if ConvObj is TConversationEnable then
      begin
        CommandTypeRadios.ItemIndex := 1;
!       if TConversationEnable(convObj).Target <> nil then
!         EnableTargetBut.Caption := TConversationEnable(convObj).Target.ReturnStrRepr
        else
!         EnableTargetBut.Caption := 'no target';
      end
!     else if ConvObj is TConversationDisable then
      begin
        CommandTypeRadios.ItemIndex := 2;
!       if TConversationDisable(convObj).Target <> nil then
!         GroupDisableTargetBut.Caption := TConversationDisable(convObj).Target.ReturnStrRepr
        else
          GroupDisableTargetBut.Caption := 'no target';
***************
*** 408,421 ****
      TreeView1.Selected := tmpLastNode;
    end else
!   if groupTargetEnable then
    begin
!     OnGroupSelect(Node);
!     groupTargetEnable := false;
      TreeView1.Selected := tmpLastnode;
    end else
!   if groupTargetDisable then
    begin
!     OnGroupSelect(Node);
!     groupTargetDisable := false;
      TreeView1.Selected := tmpLastNode;
    end else
--- 408,421 ----
      TreeView1.Selected := tmpLastNode;
    end else
!   if TargetEnable then
    begin
!     OnObjectSelect(Node);
!     TargetEnable := false;
      TreeView1.Selected := tmpLastnode;
    end else
!   if TargetDisable then
    begin
!     OnObjectSelect(Node);
!     TargetDisable := false;
      TreeView1.Selected := tmpLastNode;
    end else
***************
*** 464,468 ****
      TNPCSpeech(LastObj).Text.Assign(NPCSpeechMemo.Lines);
      LastNode.Text := TNPCSpeech(LastObj).ReturnStrRepr;
!     RefreshNames;
    end;
  end;
--- 464,468 ----
      TNPCSpeech(LastObj).Text.Assign(NPCSpeechMemo.Lines);
      LastNode.Text := TNPCSpeech(LastObj).ReturnStrRepr;
! //@@    RefreshNames;
    end;
  end;
***************
*** 485,490 ****
      -1: CommandPages.ActivePage := CommandBlankSheet;
      0:  CommandPages.ActivePage := CommandScriptSheet;
!     1: CommandPages.ActivePage := CommandEnableGroupSheet;
!     2: CommandPages.ActivePage := CommandDisableGroupSheet;
      3: CommandPages.ActivePage := CommandJumpSheet;
    end;
--- 485,490 ----
      -1: CommandPages.ActivePage := CommandBlankSheet;
      0:  CommandPages.ActivePage := CommandScriptSheet;
!     1: CommandPages.ActivePage := CommandEnableSheet;
!     2: CommandPages.ActivePage := CommandDisableSheet;
      3: CommandPages.ActivePage := CommandJumpSheet;
    end;
***************
*** 664,714 ****
  end;
  
! procedure TMainForm.OnGroupSelect(newNode: TTreeNode);
  begin
!   if groupTargetEnable then
    begin
!     if not (LastObj is TConversationGroupEnable) then
!       raise Exception.Create('LastObj not GroupEnable!!!');
!     if not (TObject(newNode.Data) is TConvGroup) then
      begin
-       ShowMessage('Must select a group!');
        Screen.Cursor := crDefault;
      end else
      begin
!       TConversationGroupEnable(LastObj).TargetGroup := newNode.Data;
!       CommandNameEdit.Text := TConversationGroupEnable(LastObj).ReturnStrRepr;
        Screen.Cursor := crDefault;
!       GroupEnableTargetBut.Caption := TConversationGroupEnable(LastObj).TargetGroup.Name;
      end;
    end else
!   if groupTargetDisable then
    begin
!     if not (LastObj is TConversationGroupDisable) then
!       raise Exception.Create('LastObj not GroupDisable!!!');
!     if not (TObject(newNode.Data) is TConvGroup) then
!       ShowMessage('Must select a group!')
!     else
      begin
-       TConversationGroupDisable(LastObj).TargetGroup := newNode.Data;
-       CommandNameEdit.Text := TConversationGroupDisable(LastObj).ReturnStrRepr;
        Screen.Cursor := crDefault;
!       GroupDisableTargetBut.Caption := TConversationGroupDisable(LastObj).TargetGroup.Name;
      end;
    end;
  end;
  
! procedure TMainForm.GroupEnableTargetButClick(Sender: TObject);
  begin
!   groupTargetEnable := true;
    TmpLastNode := TreeView1.Selected;
!   GroupEnableTargetBut.Caption := 'please select target from tree...';
    Screen.Cursor := crCross;
  end;
  
  procedure TMainForm.AddCommandGroupEnable;
! var e:TConversationGroupEnable;
      n:TTreeNode;
  begin
!   e := TConversationGroupEnable.Create(nil);
    TConversationGroup(LastObj).AddChild(e);
    n := TreeView1.Items.AddChildObject(LastNode,e.ReturnStrRepr,e);
--- 664,711 ----
  end;
  
! procedure TMainForm.OnObjectSelect(newNode: TTreeNode);
  begin
!   if TargetEnable then
    begin
!     if not (LastObj is TConversationEnable) then
      begin
        Screen.Cursor := crDefault;
+       raise Exception.Create('LastObj not Enable!!!');
      end else
      begin
!       TConversationEnable(LastObj).Target := newNode.Data;
!       CommandNameEdit.Text := TConversationEnable(LastObj).ReturnStrRepr;
        Screen.Cursor := crDefault;
!       EnableTargetBut.Caption := TConversationEnable(LastObj).Target.ReturnStrRepr;
      end;
    end else
!   if TargetDisable then
    begin
!     if not (LastObj is TConversationDisable) then
      begin
        Screen.Cursor := crDefault;
!       raise Exception.Create('LastObj not Disable!!!');
!     end else begin
!       TConversationDisable(LastObj).Target := newNode.Data;
!       CommandNameEdit.Text := TConversationDisable(LastObj).ReturnStrRepr;
!       Screen.Cursor := crDefault;
!       GroupDisableTargetBut.Caption := TConversationDisable(LastObj).Target.ReturnStrRepr;
      end;
    end;
  end;
  
! procedure TMainForm.EnableTargetButClick(Sender: TObject);
  begin
!   TargetEnable := true;
    TmpLastNode := TreeView1.Selected;
!   EnableTargetBut.Caption := 'please select target from tree...';
    Screen.Cursor := crCross;
  end;
  
  procedure TMainForm.AddCommandGroupEnable;
! var e:TConversationEnable;
      n:TTreeNode;
  begin
!   e := TConversationEnable.Create(nil);
    TConversationGroup(LastObj).AddChild(e);
    n := TreeView1.Items.AddChildObject(LastNode,e.ReturnStrRepr,e);
***************
*** 718,727 ****
  end;
  
! procedure TMainForm.EnableGroup1Click(Sender: TObject);
  begin
    AddCommandGroupEnable;
  end;
  
! procedure TMainForm.DisableGroup1Click(Sender: TObject);
  begin
    AddCommandGroupDisable;
--- 715,724 ----
  end;
  
! procedure TMainForm.Enable1Click(Sender: TObject);
  begin
    AddCommandGroupEnable;
  end;
  
! procedure TMainForm.Disable1Click(Sender: TObject);
  begin
    AddCommandGroupDisable;
***************
*** 729,736 ****
  
  procedure TMainForm.AddCommandGroupDisable;
! var d:TConversationGroupDisable;
      n:TTreeNode;
  begin
!   d := TConversationGroupDisable.Create(nil);
    TConversationGroup(LastObj).AddChild(d);
    n := TreeView1.Items.AddChildObject(LastNode,d.ReturnStrRepr,d);
--- 726,733 ----
  
  procedure TMainForm.AddCommandGroupDisable;
! var d:TConversationDisable;
      n:TTreeNode;
  begin
!   d := TConversationDisable.Create(nil);
    TConversationGroup(LastObj).AddChild(d);
    n := TreeView1.Items.AddChildObject(LastNode,d.ReturnStrRepr,d);
***************
*** 742,746 ****
  procedure TMainForm.GroupDisableTargetButClick(Sender: TObject);
  begin
!   groupTargetDisable := true;
    TmpLastNode := TreeView1.Selected;
    GroupDisableTargetBut.Caption := 'please select target from tree...';
--- 739,743 ----
  procedure TMainForm.GroupDisableTargetButClick(Sender: TObject);
  begin
!   TargetDisable := true;
    TmpLastNode := TreeView1.Selected;
    GroupDisableTargetBut.Caption := 'please select target from tree...';
***************
*** 778,782 ****
  begin
    SaveXML(CurfileName);
!   //DomImplementation1.FreeDocument(currentXMLdoc);
  end;
  
--- 775,779 ----
  begin
    SaveXML(CurfileName);
!   ConversationEngine.Free;
  end;
  
***************
*** 808,813 ****
    begin
      n := TreeView1.Items[a];
!     //if n.IsVisible then
!       n.Text := TConversationObject(n.Data).ReturnStrRepr;
    end;
  end;
--- 805,809 ----
    begin
      n := TreeView1.Items[a];
!     n.Text := TConversationObject(n.Data).ReturnStrRepr;
    end;
  end;
***************
*** 883,891 ****
  //      if TempObj is TConversationCommand then
  //    not all commands can be runned in editor (f.e. graphical scripts)...
!       if TempObj is TConversationGroupEnable then
          TConversationCommand(TempObj).Run
        else
!         if TempObj is TConversationGroupDisable then
!           TConversationCommand(TempObj).Run;
  
        TempObj := TempObj.Next;
--- 879,887 ----
  //      if TempObj is TConversationCommand then
  //    not all commands can be runned in editor (f.e. graphical scripts)...
!       {if TempObj is TConversationEnable then
          TConversationCommand(TempObj).Run
        else
!         if TempObj is TConversationDisable then
!           TConversationCommand(TempObj).Run;}
  
        TempObj := TempObj.Next;
***************
*** 946,950 ****
    Y: Integer);
  var
!   n,n2:TTreeNode;
    co:TConversationObject;
    i:integer;
--- 942,946 ----
    Y: Integer);
  var
!   n:TTreeNode;
    co:TConversationObject;
    i:integer;
***************
*** 971,980 ****
        co.Parent.DeleteChild(co);
        i := TConversationObject(n.Data).Parent.Children.IndexOf(n.data);
!       if i = TConversationObject(n.Data).Parent.Children.Count-1 then
        begin
          TConversationObject(n.Data).Parent.Children.Add(co);
          TreeView1.Selected.MoveTo(n,naInsert);
        end else begin
!         TConversationObject(n.Data).Parent.Children.Insert(i+1,co);
          TreeView1.Selected.MoveTo(n,naInsert);
        end;
--- 967,976 ----
        co.Parent.DeleteChild(co);
        i := TConversationObject(n.Data).Parent.Children.IndexOf(n.data);
!       if i = TConversationObject(n.Data).Parent.Children.Count then
        begin
          TConversationObject(n.Data).Parent.Children.Add(co);
          TreeView1.Selected.MoveTo(n,naInsert);
        end else begin
!         TConversationObject(n.Data).Parent.Children.Insert(i,co);
          TreeView1.Selected.MoveTo(n,naInsert);
        end;
***************
*** 984,993 ****
      co.Parent.DeleteChild(co);
      i := TConversationObject(n.Data).Parent.Children.IndexOf(n.data);
!     if i = TConversationObject(n.Data).Parent.Children.Count-1 then
      begin
        TConversationObject(n.Data).Parent.Children.Add(co);
        TreeView1.Selected.MoveTo(n,naInsert);
      end else begin
!       TConversationObject(n.Data).Parent.Children.Insert(i+1,co);
        TreeView1.Selected.MoveTo(n,naInsert);
      end;
--- 980,989 ----
      co.Parent.DeleteChild(co);
      i := TConversationObject(n.Data).Parent.Children.IndexOf(n.data);
!     if i = TConversationObject(n.Data).Parent.Children.Count then
      begin
        TConversationObject(n.Data).Parent.Children.Add(co);
        TreeView1.Selected.MoveTo(n,naInsert);
      end else begin
!       TConversationObject(n.Data).Parent.Children.Insert(i,co);
        TreeView1.Selected.MoveTo(n,naInsert);
      end;