Menu
▾
▴
[Gemrb-commits] SF.net SVN: gemrb:[7376] chitem/trunk
|
From: <ave...@us...> - 2009-10-06 21:37:37
|
Revision: 7376
http://gemrb.svn.sourceforge.net/gemrb/?rev=7376&view=rev
Author: avenger_teambg
Date: 2009-10-06 21:37:29 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
dltcep 7.2
Modified Paths:
--------------
chitem/trunk/ItemProperties.cpp
chitem/trunk/ItemProperties.h
chitem/trunk/SpellProperties.cpp
chitem/trunk/Structs.h
chitem/trunk/WedEdit.cpp
chitem/trunk/chitem.clw
chitem/trunk/chitem.rc
chitem/trunk/resource.h
chitem/trunk/seekers.cpp
Modified: chitem/trunk/ItemProperties.cpp
===================================================================
--- chitem/trunk/ItemProperties.cpp 2009-10-05 20:29:20 UTC (rev 7375)
+++ chitem/trunk/ItemProperties.cpp 2009-10-06 21:37:29 UTC (rev 7376)
@@ -2153,7 +2153,7 @@
static int forceidboxids[8]={IDC_ID, IDC_NOID,0,0,0,0,0,0};
static int keenboxids[32]={IDC_STRBONUS,IDC_BREAKABLE,0,0,0,0,0,0,
-0,0,0,IDC_RECHARGES,0,0,0,0,
+0,0,IDC_HOSTILE,IDC_RECHARGES,0,0,0,0,
IDC_FLAG1, IDC_FLAG2,0,0,0,0,0,0,
0,0,0,0,0,0,0,0};
@@ -2217,11 +2217,16 @@
DDX_Text(pDX, IDC_UNKNOWN1, the_item.extheaders[extheadnum].unknown03);
- DDX_Text(pDX, IDC_THAC0,the_item.extheaders[extheadnum].thaco);
- DDX_Text(pDX, IDC_ROLL,(short &) the_item.extheaders[extheadnum].dammult);
- DDX_Text(pDX, IDC_DIE,(short &) the_item.extheaders[extheadnum].damdice);
- DDX_Text(pDX, IDC_ADD,(short &) the_item.extheaders[extheadnum].damplus);
+ DDX_Text(pDX, IDC_THAC0, the_item.extheaders[extheadnum].thaco);
+ DDX_Text(pDX, IDC_ROLL, the_item.extheaders[extheadnum].dammult);
+ DDX_Text(pDX, IDC_DIE, the_item.extheaders[extheadnum].damdice);
+ DDX_Text(pDX, IDC_ADD, the_item.extheaders[extheadnum].damplus);
+ tmpstr=format_schooltype(the_item.extheaders[extheadnum].school);
+ DDX_Text(pDX, IDC_SCHOOL, tmpstr);
+ tmpstr=format_sectype(the_item.extheaders[extheadnum].sectype);
+ DDX_Text(pDX, IDC_SECTYPE, tmpstr);
+
tmpstr=get_damage_type(the_item.extheaders[extheadnum].damtype);
DDX_Text(pDX, IDC_DAMAGETYPE, tmpstr);
@@ -2296,10 +2301,15 @@
DDX_Text(pDX, IDC_UNKNOWN1, the_item.extheaders[extheadnum].unknown03);
DDX_Text(pDX, IDC_THAC0,the_item.extheaders[extheadnum].thaco);
- DDX_Text(pDX, IDC_ROLL,(short &) the_item.extheaders[extheadnum].dammult);
- DDX_Text(pDX, IDC_DIE,(short &) the_item.extheaders[extheadnum].damdice);
+ DDX_Text(pDX, IDC_ROLL, the_item.extheaders[extheadnum].dammult);
+ DDX_Text(pDX, IDC_DIE, the_item.extheaders[extheadnum].damdice);
DDX_Text(pDX, IDC_ADD,the_item.extheaders[extheadnum].damplus);
+ DDX_Text(pDX, IDC_SCHOOL, tmpstr);
+ the_item.extheaders[extheadnum].school=(unsigned char) strtonum(tmpstr);
+ DDX_Text(pDX, IDC_SECTYPE, tmpstr);
+ the_item.extheaders[extheadnum].sectype=(unsigned char) strtonum(tmpstr);
+
DDX_Text(pDX, IDC_DAMAGETYPE, tmpstr);
the_item.extheaders[extheadnum].damtype=(unsigned char) strtonum(tmpstr);
@@ -2367,6 +2377,8 @@
{
CPropertyPage::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CItemExtended)
+ DDX_Control(pDX, IDC_SECTYPE, m_sectype_control);
+ DDX_Control(pDX, IDC_SCHOOL, m_school_control);
DDX_Control(pDX, IDC_MELEE, m_melee_control);
DDX_Control(pDX, IDC_USEICON, m_useicon_control);
DDX_Control(pDX, IDC_PROJID, m_projid_control);
@@ -2452,7 +2464,9 @@
BOOL CItemExtended::OnInitDialog()
{
- int i;
+ CString tmpstr, tmpstr2;
+ POSITION pos;
+ int i, num;
CPropertyPage::OnInitDialog();
m_extheadnum_control.SetDroppedWidth(80);
@@ -2476,6 +2490,28 @@
{
m_projframe_control.AddString(ammo_types[i]);
}
+
+ pos=school_names.GetHeadPosition();
+ num=0;
+ while(pos)
+ {
+ tmpstr2=school_names.GetNext(pos);
+ if(tmpstr2.IsEmpty()) tmpstr2="Unknown";
+ tmpstr.Format("0x%02x-%s",num, tmpstr2);
+ m_school_control.AddString(tmpstr);
+ num++;
+ }
+
+ pos=sectype_names.GetHeadPosition();
+ num=0;
+ while(pos)
+ {
+ tmpstr2=sectype_names.GetNext(pos);
+ if(tmpstr2.IsEmpty()) tmpstr2="Unknown";
+ tmpstr.Format("0x%02x-%s",num, tmpstr2);
+ m_sectype_control.AddString(tmpstr);
+ num++;
+ }
for(i=0;i<NUM_DTYPE;i++)
{
@@ -2531,10 +2567,10 @@
IDC_EXTUSEICON, IDC_USEICON,
IDC_EXTHEADNUM, IDC_EXTTYPE, IDC_LOC, IDC_TARGETNUM, IDC_TARGET,
IDC_PROJFRAME, IDC_RANGE, IDC_SPEED, IDC_IDENTIFY, IDC_UNKNOWN1,
- IDC_THAC0, IDC_ROLL, IDC_DIE, IDC_ADD, IDC_DAMAGETYPE,
- IDC_BOW, IDC_XBOW, IDC_MISC, IDC_ANIM1, IDC_ANIM2, IDC_ANIM3,
- IDC_CHARGES, IDC_PERDAY,
- IDC_FLAGS, IDC_STRBONUS, IDC_BREAKABLE, IDC_RECHARGES,
+ IDC_THAC0, IDC_ROLL, IDC_DIE, IDC_ADD, IDC_SCHOOL, IDC_SECTYPE,
+ IDC_DAMAGETYPE, IDC_BOW, IDC_XBOW, IDC_MISC,
+ IDC_ANIM1, IDC_ANIM2, IDC_ANIM3, IDC_CHARGES, IDC_PERDAY,
+ IDC_FLAGS, IDC_STRBONUS, IDC_BREAKABLE, IDC_HOSTILE, IDC_RECHARGES,
IDC_FLAG1, IDC_FLAG2, IDC_PROJID, IDC_ID, IDC_NOID, IDC_MELEE,
//buttons
//last button really belongs here!
@@ -2594,9 +2630,11 @@
ON_CBN_SELCHANGE(IDC_MELEE, OnSelchangeMelee)
ON_BN_CLICKED(IDC_FLAG1, OnFlag1)
ON_BN_CLICKED(IDC_FLAG2, OnFlag2)
+ ON_BN_CLICKED(IDC_RECHARGES, OnRecharges)
ON_BN_CLICKED(IDC_STRBONUS, OnStrbonus)
ON_BN_CLICKED(IDC_BREAKABLE, OnBreakable)
- ON_BN_CLICKED(IDC_RECHARGES, OnRecharges)
+ ON_BN_CLICKED(IDC_HOSTILE, OnHostile)
+ ON_EN_KILLFOCUS(IDC_SECTYPE, OnKillfocusSectype)
ON_CBN_KILLFOCUS(IDC_LOC, OnDefaultKillfocus)
ON_CBN_KILLFOCUS(IDC_TARGET, OnDefaultKillfocus)
ON_EN_KILLFOCUS(IDC_RANGE, OnDefaultKillfocus)
@@ -2608,7 +2646,8 @@
ON_CBN_KILLFOCUS(IDC_PROJID, OnDefaultKillfocus)
ON_EN_KILLFOCUS(IDC_FLAGS, OnDefaultKillfocus)
ON_CBN_DBLCLK(IDC_EXTEFFNUM, OnEdit)
- ON_EN_KILLFOCUS(IDC_IDENTIFY, OnDefaultKillfocus)
+ ON_CBN_KILLFOCUS(IDC_IDENTIFY, OnDefaultKillfocus)
+ ON_CBN_KILLFOCUS(IDC_SCHOOL, OnKillfocusSchool)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -2685,6 +2724,13 @@
UpdateData(UD_DISPLAY);
}
+void CItemExtended::OnHostile()
+{
+ UpdateData(UD_RETRIEVE);
+ the_item.extheaders[extheadnum].flags^=4<<8;
+ UpdateData(UD_DISPLAY);
+}
+
void CItemExtended::OnRecharges()
{
UpdateData(UD_RETRIEVE);
@@ -2730,6 +2776,19 @@
UpdateData(UD_DISPLAY);
}
+
+void CItemExtended::OnKillfocusSectype()
+{
+ UpdateData(UD_RETRIEVE);
+ UpdateData(UD_DISPLAY);
+}
+
+void CItemExtended::OnKillfocusSchool()
+{
+ UpdateData(UD_RETRIEVE);
+ UpdateData(UD_DISPLAY);
+}
+
void CItemExtended::OnKillfocusAdd()
{
UpdateData(UD_RETRIEVE);
Modified: chitem/trunk/ItemProperties.h
===================================================================
--- chitem/trunk/ItemProperties.h 2009-10-05 20:29:20 UTC (rev 7375)
+++ chitem/trunk/ItemProperties.h 2009-10-06 21:37:29 UTC (rev 7376)
@@ -410,6 +410,8 @@
// Dialog Data
//{{AFX_DATA(CItemExtended)
enum { IDD = IDD_ITEMEFFECT };
+ CComboBox m_sectype_control;
+ CComboBox m_school_control;
CComboBox m_melee_control;
CStatic m_useicon_control;
CComboBox m_projid_control;
@@ -493,6 +495,9 @@
afx_msg void OnRecharges();
afx_msg void OnStrbonus();
afx_msg void OnBreakable();
+ afx_msg void OnHostile();
+ afx_msg void OnKillfocusSectype();
+ afx_msg void OnKillfocusSchool();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Modified: chitem/trunk/SpellProperties.cpp
===================================================================
--- chitem/trunk/SpellProperties.cpp 2009-10-05 20:29:20 UTC (rev 7375)
+++ chitem/trunk/SpellProperties.cpp 2009-10-06 21:37:29 UTC (rev 7376)
@@ -299,7 +299,7 @@
{
tmpstr2=school_names.GetNext(pos);
if(tmpstr2.IsEmpty()) tmpstr2="Unknown";
- tmpstr.Format("0x%0x-%s",num, tmpstr2);
+ tmpstr.Format("0x%02x-%s",num, tmpstr2);
m_school_control.AddString(tmpstr);
num++;
}
@@ -310,7 +310,7 @@
{
tmpstr2=sectype_names.GetNext(pos);
if(tmpstr2.IsEmpty()) tmpstr2="Unknown";
- tmpstr.Format("0x%0x-%s",num, tmpstr2);
+ tmpstr.Format("0x%02x-%s",num, tmpstr2);
m_sectype_control.AddString(tmpstr);
num++;
}
Modified: chitem/trunk/Structs.h
===================================================================
--- chitem/trunk/Structs.h 2009-10-05 20:29:20 UTC (rev 7375)
+++ chitem/trunk/Structs.h 2009-10-06 21:37:29 UTC (rev 7376)
@@ -425,8 +425,10 @@
unsigned short projectile;
unsigned short speed;
short thaco;
- unsigned short damdice;
- unsigned short dammult;
+ unsigned char damdice;
+ unsigned char school;
+ unsigned char dammult;
+ unsigned char sectype;
short damplus;
unsigned short damtype;
unsigned short fbcount;
Modified: chitem/trunk/WedEdit.cpp
===================================================================
--- chitem/trunk/WedEdit.cpp 2009-10-05 20:29:20 UTC (rev 7375)
+++ chitem/trunk/WedEdit.cpp 2009-10-06 21:37:29 UTC (rev 7376)
@@ -313,11 +313,28 @@
m_tooltip.AddTool(GetDlgItem(IDOK), IDS_CANCEL);
m_tooltip.AddTool(GetDlgItem(IDC_EDIT), IDS_TISEXTRACT);
- m_tooltip.AddTool(GetDlgItem(IDC_CLEAR), IDS_CLEANUP);
+ m_tooltip.AddTool(GetDlgItem(IDC_CLEANUP), IDS_CLEANUP);
m_tooltip.AddTool(GetDlgItem(IDC_NEW), IDS_OVERLAY);
m_tooltip.AddTool(GetDlgItem(IDC_REMOVE), IDS_DELOVER);
m_tooltip.AddTool(GetDlgItem(IDC_EDITTILE), IDS_TILES);
+ m_tooltip.AddTool(GetDlgItem(IDC_EDITTILE2), IDS_EDITTILE);
+ m_tooltip.AddTool(GetDlgItem(IDC_OPEN), IDS_OPEN);
+ m_tooltip.AddTool(GetDlgItem(IDC_DROP), IDS_REMOVEDOOR);
+ m_tooltip.AddTool(GetDlgItem(IDC_PASTE), IDS_PASTEPOLY);
+ m_tooltip.AddTool(GetDlgItem(IDC_ADD3), IDS_ADDPOLY);
+ m_tooltip.AddTool(GetDlgItem(IDC_REMOVE3), IDS_REMOVEPOLY);
+ m_tooltip.AddTool(GetDlgItem(IDC_SELECTION), IDS_SELECTPOLY);
+ m_tooltip.AddTool(GetDlgItem(IDC_EDITDOORPOLY), IDS_EDITPOLY);
+ m_tooltip.AddTool(GetDlgItem(IDC_COPY), IDS_COPYPOLY);
m_tooltip.AddTool(GetDlgItem(IDC_ORDER), IDS_ORDER);
+ m_tooltip.AddTool(GetDlgItem(IDC_TRANSPARENT), IDS_MAKEOVERLAY);
+ m_tooltip.AddTool(GetDlgItem(IDC_CLEAR), IDS_REMOVEOVERLAY);
+ m_tooltip.AddTool(GetDlgItem(IDC_COPY2), IDS_COPYPOLY);
+ m_tooltip.AddTool(GetDlgItem(IDC_PASTE2), IDS_PASTEPOLY);
+ m_tooltip.AddTool(GetDlgItem(IDC_ADD2), IDS_ADDPOLY);
+ m_tooltip.AddTool(GetDlgItem(IDC_REMOVE2), IDS_REMOVEPOLY);
+ m_tooltip.AddTool(GetDlgItem(IDC_SELECTION2), IDS_SELECTPOLY);
+ m_tooltip.AddTool(GetDlgItem(IDC_EDITWALLPOLY), IDS_EDITPOLY);
}
UpdateData(UD_DISPLAY);
return TRUE;
Modified: chitem/trunk/chitem.clw
===================================================================
--- chitem/trunk/chitem.clw 2009-10-05 20:29:20 UTC (rev 7375)
+++ chitem/trunk/chitem.clw 2009-10-06 21:37:29 UTC (rev 7376)
@@ -2,7 +2,7 @@
[General Info]
Version=1
-LastClass=CEffEdit
+LastClass=CChitemDlg
LastTemplate=CDialog
NewFileInclude1=#include "stdafx.h"
NewFileInclude2=#include "chitem.h"
@@ -232,142 +232,142 @@
Resource123=IDD_GAMEGENERAL
Class98=IcewindCre
Resource124=IDR_SHORTCUT
-Resource125=IDD_MAPLINK (English (U.S.))
-Resource126=IDD_STOREEXTRA (English (U.S.))
-Resource127=IDD_STOREDRINKS (English (U.S.))
-Resource128=IDD_SPELLEXTRA (English (U.S.))
-Resource129=IDR_IDS (English (U.S.))
-Resource130=IDD_CREATURESTRINGS (English (U.S.))
-Resource131=IDD_EDIT (English (U.S.))
-Resource132=IDR_WORLDMAP (English (U.S.))
-Resource133=IDR_AREA (English (U.S.))
-Resource134=IDD_KEYEDIT (English (U.S.))
-Resource135=IDR_TLKMENU (English (U.S.))
-Resource136=IDD_AREATRIGGER (English (U.S.))
-Resource137=IDD_EXTRACT2 (English (U.S.))
-Resource138=IDD_ABOUTBOX (English (U.S.))
-Resource139=IDD_PALETTE (English (U.S.))
-Resource140=IDD_IAPDIALOG (English (U.S.))
-Resource141=IDD_WEDEDIT (English (U.S.))
-Resource142=IDR_GAME (English (U.S.))
-Resource143=IDD_PROGRESS (English (U.S.))
-Resource144=IDD_PANICBUTTON (English (U.S.))
-Resource145=IDD_PROJEDIT (English (U.S.))
-Resource146=IDD_DIALOGEDIT (English (U.S.))
-Resource147=IDR_WEDMENU (English (U.S.))
-Resource148=IDD_CREATUREIWD2 (English (U.S.))
-Resource149=IDD_PROJAREAGEMRB (English (U.S.))
-Resource150=IDD_STOREGENERAL (English (U.S.))
-Resource151=IDD_SPELLEDIT (English (U.S.))
-Resource152=IDR_TREEMENU (English (U.S.))
-Resource153=IDD_VARIABLES (English (U.S.))
-Resource154=IDD_ADDLINK (English (U.S.))
-Resource155=IDD_TEXTVIEW (English (U.S.))
-Resource156=IDR_CREATURE (English (U.S.))
-Resource157=IDD_COLORPICKER (English (U.S.))
-Resource158=IDD_EFFEDIT (English (U.S.))
-Resource159=IDD_ITEMDESC (English (U.S.))
-Resource160=IDD_GAMEEDIT (English (U.S.))
-Resource161=IDD_IMAGEVIEW (English (U.S.))
-Resource162=IDR_BAMMENU (English (U.S.))
-Resource163=IDR_PROJECT (English (U.S.))
-Resource164=IDD_AREAEDIT (English (U.S.))
-Resource165=IDD_SHOWLOG (English (U.S.))
-Resource166=IDD_ITEMUSE (English (U.S.))
-Resource167=IDD_EXTRACT (English (U.S.))
-Resource168=IDD_CREATUREPST (English (U.S.))
-Resource169=IDD_ITEMEQUIP (English (U.S.))
-Resource170=IDD_CREATURERES (English (U.S.))
-Resource171=IDD_SAVHANDLE (English (U.S.))
-Resource172=IDD_CREATURELEVELS (English (U.S.))
-Resource173=IDD_AREASPAWN (English (U.S.))
-Resource174=IDD_CREATUREEFF (English (U.S.))
-Resource175=IDD_POLYGON (English (U.S.))
-Resource176=IDR_MUSIC (English (U.S.))
-Resource177=IDD_CFB (English (U.S.))
-Resource178=IDR_SPELL (English (U.S.))
-Resource179=IDD_MUSEDIT (English (U.S.))
-Resource180=IDD_IDSEDIT (English (U.S.))
-Resource181=IDD_WEDTILE (English (U.S.))
-Resource182=IDD_AREAVARIABLE (English (U.S.))
-Resource183=IDD_WEDPOLY (English (U.S.))
-Resource184=IDR_SRC (English (U.S.))
-Resource185=IDD_STOREEDIT (English (U.S.))
-Resource186=IDD_SCRIPTEDIT (English (U.S.))
-Resource187=IDR_CHITIN (English (U.S.))
-Resource188=IDD_AREAAMBIENT (English (U.S.))
-Resource189=IDD_SCHEDULE (English (U.S.))
-Resource190=IDD_AREAANIM (English (U.S.))
-Resource191=IDD_MAPEDIT (English (U.S.))
-Resource192=IDD_CREATUREUNKNOWN (English (U.S.))
-Resource193=IDR_2DA (English (U.S.))
-Resource194=IDD_AREAENTRANCE (English (U.S.))
-Resource195=IDD_AREACONTAINER (English (U.S.))
-Resource196=IDD_ITEMICONS (English (U.S.))
-Resource197=IDD_AREAACTOR (English (U.S.))
-Resource198=IDD_SPELLEFFECT (English (U.S.))
-Resource199=IDD_SPELLTOOL (English (U.S.))
-Resource200=IDD_CREATUREEDIT (English (U.S.))
-Resource201=IDD_STOREITEMS (English (U.S.))
-Resource202=IDD_COMPAT (English (U.S.))
-Resource203=IDD_BAMEDIT (English (U.S.))
-Resource204=IDD_AREASONGS (English (U.S.))
-Resource205=IDD_CHECK (English (U.S.))
-Resource206=IDD_AREATRIGGERSTRINGS (English (U.S.))
-Resource207=IDD_MASSCLEAR (English (U.S.))
-Resource208=IDD_AREAPROJ (English (U.S.))
-Resource209=IDD_ITEMPICKER (English (U.S.))
-Resource210=IDD_SPELLGENERAL (English (U.S.))
-Resource211=IDD_CHUIEDIT (English (U.S.))
-Resource212=IDD_TISDIALOG (English (U.S.))
-Resource213=IDD_STORERENTAL (English (U.S.))
-Resource214=IDD_AREAGENERAL (English (U.S.))
-Resource215=IDR_ITEM (English (U.S.))
-Resource216=IDR_MENUBAR (English (U.S.))
-Resource217=IDD_CREATURESKILLS (English (U.S.))
-Resource218=IDR_EFFECT (English (U.S.))
-Resource219=IDD_ITEMEDIT (English (U.S.))
-Resource220=IDD_VVCEDIT (English (U.S.))
-Resource221=IDD_ANIMDIALOG
-Resource222=IDD_CREATUREOVR (English (U.S.))
-Resource223=IDD_PROJEXT (English (U.S.))
-Resource224=IDD_MOSEDIT (English (U.S.))
-Resource225=IDD_CHITEM_DIALOG (English (U.S.))
-Resource226=IDD_CREATUREIWD (English (U.S.))
-Resource227=IDD_GAMEPCINFO (English (U.S.))
-Resource228=IDD_CREATUREITEMS (English (U.S.))
-Resource229=IDD_SEARCHNODE (English (U.S.))
-Resource230=IDD_SRCEDIT (English (U.S.))
-Resource231=IDD_ITEMEFFECT (English (U.S.))
-Resource232=IDD_SPELLDESC (English (U.S.))
-Resource233=IDD_WEIDU (English (U.S.))
-Resource234=IDD_SPELLEQUIP (English (U.S.))
-Resource235=IDD_AREAMAP (English (U.S.))
-Resource236=IDR_SCRIPT (English (U.S.))
-Resource237=IDD_AREADOOR (English (U.S.))
-Resource238=IDD_ITEMGENERAL (English (U.S.))
-Resource239=IDD_AREAINT (English (U.S.))
-Resource240=IDD_STRREFDLG (English (U.S.))
-Resource241=IDD_CREATUREICONS (English (U.S.))
-Resource242=IDD_GAMESTATS (English (U.S.))
-Resource243=IDR_STORE (English (U.S.))
-Resource244=IDD_FINDITEM (English (U.S.))
-Resource245=IDR_VVC (English (U.S.))
+Resource125=IDD_AREAINT (English (U.S.))
+Resource126=IDD_PALETTE (English (U.S.))
+Resource127=IDD_TEXTVIEW (English (U.S.))
+Resource128=IDD_DIALOGEDIT (English (U.S.))
+Resource129=IDR_TILE (English (U.S.))
+Resource130=IDD_SCHEDULE (English (U.S.))
+Resource131=IDD_COLORPICKER (English (U.S.))
+Resource132=IDD_ANIMDIALOG
+Resource133=IDD_STOREDRINKS (English (U.S.))
+Resource134=IDD_AREATRIGGERSTRINGS (English (U.S.))
+Resource135=IDR_VVC (English (U.S.))
+Resource136=IDD_CREATUREEDIT (English (U.S.))
+Resource137=IDD_AREAEDIT (English (U.S.))
+Resource138=IDD_CHECK (English (U.S.))
+Resource139=IDD_ITEMDESC (English (U.S.))
+Resource140=IDD_AREAANIM (English (U.S.))
+Resource141=IDD_MASSCLEAR (English (U.S.))
+Resource142=IDR_SCRIPT (English (U.S.))
+Resource143=IDD_ITEMEDIT (English (U.S.))
+Resource144=IDD_PROJGEMRB (English (U.S.))
+Resource145=IDD_AREATRIGGER (English (U.S.))
+Resource146=IDD_ADDLINK (English (U.S.))
+Resource147=IDR_TLKMENU (English (U.S.))
+Resource148=IDD_CREATURELEVELS (English (U.S.))
+Resource149=IDR_BAMMENU (English (U.S.))
+Resource150=IDD_EFFEDIT (English (U.S.))
+Resource151=IDD_AREAGENERAL (English (U.S.))
+Resource152=IDR_IDS (English (U.S.))
+Resource153=IDD_COMPAT (English (U.S.))
+Resource154=IDD_CREATURESTRINGS (English (U.S.))
+Resource155=IDD_GAMESTATS (English (U.S.))
+Resource156=IDR_GAME (English (U.S.))
+Resource157=IDD_CREATUREIWD (English (U.S.))
+Resource158=IDD_STORERENTAL (English (U.S.))
+Resource159=IDD_SPELLEQUIP (English (U.S.))
+Resource160=IDD_MAPLINK (English (U.S.))
+Resource161=IDD_CHITEM_DIALOG (English (U.S.))
+Resource162=IDD_ITEMEQUIP (English (U.S.))
+Resource163=IDR_SPELL (English (U.S.))
+Resource164=IDD_AREASONGS (English (U.S.))
+Resource165=IDD_SAVHANDLE (English (U.S.))
+Resource166=IDD_SPELLEXTRA (English (U.S.))
+Resource167=IDD_CFB (English (U.S.))
+Resource168=IDD_GAMEGENERAL (English (U.S.))
+Resource169=IDD_ITEMPICKER (English (U.S.))
+Resource170=IDD_CREATUREUNKNOWN (English (U.S.))
+Resource171=IDD_AREAPROJ (English (U.S.))
+Resource172=IDD_POLYGON (English (U.S.))
+Resource173=IDD_SPELLEFFECT (English (U.S.))
+Resource174=IDD_CREATUREPST (English (U.S.))
+Resource175=IDD_WEDPOLY (English (U.S.))
+Resource176=IDR_CHUI (English (U.S.))
+Resource177=IDD_STOREGENERAL (English (U.S.))
+Resource178=IDR_EFFECT (English (U.S.))
+Resource179=IDD_WEDEDIT (English (U.S.))
+Resource180=IDD_IAPDIALOG (English (U.S.))
+Resource181=IDD_CHUIEDIT (English (U.S.))
+Resource182=IDD_SEARCHNODE (English (U.S.))
+Resource183=IDD_TISDIALOG (English (U.S.))
+Resource184=IDR_CHITIN (English (U.S.))
+Resource185=IDD_STOREITEMS (English (U.S.))
+Resource186=IDD_MAPEDIT (English (U.S.))
+Resource187=IDD_WEIDU (English (U.S.))
+Resource188=IDD_2DAEDIT (English (U.S.))
+Resource189=IDD_AREAENTRANCE (English (U.S.))
+Resource190=IDD_SHOWLOG (English (U.S.))
+Resource191=IDD_AREAAMBIENT (English (U.S.))
+Resource192=IDD_CREATUREITEMS (English (U.S.))
+Resource193=IDR_MUSIC (English (U.S.))
+Resource194=IDD_AREASPAWN (English (U.S.))
+Resource195=IDD_AREAVARIABLE (English (U.S.))
+Resource196=IDD_ITEMEFFECT (English (U.S.))
+Resource197=IDD_PROJEDIT (English (U.S.))
+Resource198=IDD_EXTRACT2 (English (U.S.))
+Resource199=IDD_SRCEDIT (English (U.S.))
+Resource200=IDD_CREATUREICONS (English (U.S.))
+Resource201=IDD_VARIABLES (English (U.S.))
+Resource202=IDD_STOREEXTRA (English (U.S.))
+Resource203=IDD_SPELLGENERAL (English (U.S.))
+Resource204=IDD_MOSEDIT (English (U.S.))
+Resource205=IDD_FINDITEM (English (U.S.))
+Resource206=IDR_AREA (English (U.S.))
+Resource207=IDD_KEYEDIT (English (U.S.))
+Resource208=IDD_PROJAREAGEMRB (English (U.S.))
+Resource209=IDD_VVCEDIT (English (U.S.))
+Resource210=IDD_ITEMUSE (English (U.S.))
+Resource211=IDD_PANICBUTTON (English (U.S.))
+Resource212=IDD_SCRIPTEDIT (English (U.S.))
+Resource213=IDD_ITEMEXTRA (English (U.S.))
+Resource214=IDD_AREAACTOR (English (U.S.))
+Resource215=IDR_STORE (English (U.S.))
+Resource216=IDR_TREEMENU (English (U.S.))
+Resource217=IDD_GAMEEDIT (English (U.S.))
+Resource218=IDR_CREATURE (English (U.S.))
+Resource219=IDD_ITEMICONS (English (U.S.))
+Resource220=IDD_STOREEDIT (English (U.S.))
+Resource221=IDD_EXTRACT (English (U.S.))
+Resource222=IDR_WORLDMAP (English (U.S.))
+Resource223=IDD_STRREFDLG (English (U.S.))
+Resource224=IDD_AREADOOR (English (U.S.))
+Resource225=IDD_PROGRESS (English (U.S.))
+Resource226=IDD_CREATUREIWD2 (English (U.S.))
+Resource227=IDD_SPELLTOOL (English (U.S.))
+Resource228=IDD_AREACONTAINER (English (U.S.))
+Resource229=IDD_PROJEXT (English (U.S.))
+Resource230=IDR_WEDMENU (English (U.S.))
+Resource231=IDD_IMAGEVIEW (English (U.S.))
+Resource232=IDD_SPELLEDIT (English (U.S.))
+Resource233=IDR_PROJECT (English (U.S.))
+Resource234=IDD_SPELLDESC (English (U.S.))
+Resource235=IDD_CREATUREEFF (English (U.S.))
+Resource236=IDD_ABOUTBOX (English (U.S.))
+Resource237=IDD_CREATUREGENERAL (English (U.S.))
+Resource238=IDD_GAMEPCINFO (English (U.S.))
+Resource239=IDD_IDSEDIT (English (U.S.))
+Resource240=IDD_AREAMAP (English (U.S.))
+Resource241=IDD_CREATURERES (English (U.S.))
+Resource242=IDR_ITEM (English (U.S.))
+Resource243=IDD_CREATUREOVR (English (U.S.))
+Resource244=IDD_ITEMGENERAL (English (U.S.))
+Resource245=IDR_2DA (English (U.S.))
Class99=CAreaTriggerString
Class100=CPCInfo
-Resource246=IDD_GAMEGENERAL (English (U.S.))
+Resource246=IDD_WEDTILE (English (U.S.))
Class101=CCreatureOverlay
-Resource247=IDD_CREATUREGENERAL (English (U.S.))
+Resource247=IDD_CREATURESKILLS (English (U.S.))
Class102=IWD2Creature
-Resource248=IDD_2DAEDIT (English (U.S.))
+Resource248=IDD_EDIT (English (U.S.))
Class103=CAnimDialog
-Resource249=IDR_TILE (English (U.S.))
+Resource249=IDR_SRC (English (U.S.))
Class104=CCreatureLevels
-Resource250=IDD_ITEMEXTRA (English (U.S.))
+Resource250=IDD_BAMEDIT (English (U.S.))
Class105=CAreaProj
-Resource251=IDR_CHUI (English (U.S.))
+Resource251=IDD_MUSEDIT (English (U.S.))
Class106=CProjGemRB
-Resource252=IDD_PROJGEMRB (English (U.S.))
+Resource252=IDR_MENUBAR (English (U.S.))
Class107=CProjAreaGemRB
Resource253=IDR_SHORTCUT (English (U.S.))
@@ -385,7 +385,7 @@
Filter=D
BaseClass=CDialog
VirtualFilter=dWC
-LastObject=ID_SEARCH_BAM
+LastObject=ID_CHECK_ITEM
[CLS:CAboutDlg]
Type=0
@@ -713,7 +713,7 @@
HeaderFile=ItemProperties.h
ImplementationFile=ItemProperties.cpp
BaseClass=CPropertyPage
-LastObject=IDC_FLAGS
+LastObject=IDC_LOC
Filter=D
VirtualFilter=idWC
@@ -5963,7 +5963,7 @@
[DLG:IDD_ITEMEFFECT (English (U.S.))]
Type=1
Class=CItemExtended
-ControlCount=77
+ControlCount=82
Control1=IDC_EXTHEADNUM,combobox,1344339970
Control2=IDC_EXTUSEICON,edit,1350631560
Control3=IDC_USEICON,static,1350570254
@@ -5974,48 +5974,48 @@
Control8=IDC_EXTTYPE,combobox,1344340034
Control9=IDC_LOC,combobox,1344340034
Control10=IDC_TARGETNUM,edit,1350639744
-Control11=IDC_TARGET,combobox,1344340290
+Control11=IDC_TARGET,combobox,1344340034
Control12=IDC_PROJFRAME,combobox,1344340034
Control13=IDC_RANGE,edit,1350639744
Control14=IDC_SPEED,edit,1350639744
Control15=IDC_UNKNOWN1,edit,1350639744
Control16=IDC_THAC0,edit,1350631552
Control17=IDC_ROLL,edit,1350639744
-Control18=IDC_STATIC,static,1342308352
-Control19=IDC_DIE,edit,1350639744
-Control20=IDC_ADD,edit,1350631552
-Control21=IDC_DAMAGETYPE,combobox,1344340290
-Control22=IDC_IDENTIFY,edit,1350631552
-Control23=IDC_ID,button,1342242819
-Control24=IDC_STRBONUS,button,1342242819
-Control25=IDC_BREAKABLE,button,1342242819
-Control26=IDC_NOID,button,1342242819
-Control27=IDC_RECHARGES,button,1342242819
-Control28=IDC_FLAG1,button,1342242819
-Control29=IDC_TOOLTIPTEXT,edit,1350631552
-Control30=IDC_TOOLTIPREF,edit,1350631552
-Control31=IDC_CHARGES,edit,1350639744
-Control32=IDC_PERDAY,combobox,1344339970
-Control33=IDC_FLAGS,edit,1350631552
-Control34=IDC_FLAG2,button,1342242819
-Control35=IDC_BOW,button,1342242819
-Control36=IDC_XBOW,button,1342242819
-Control37=IDC_MISC,button,1342242819
-Control38=IDC_MELEE,combobox,1344340035
-Control39=IDC_ANIM1,edit,1350639744
-Control40=IDC_ANIM2,edit,1350639744
-Control41=IDC_ANIM3,edit,1350639744
-Control42=IDC_PROJID,combobox,1344340034
-Control43=IDC_EXTEFFNUM,combobox,1344339971
-Control44=IDC_STATIC,static,1342308352
-Control45=IDC_EDIT,button,1342242816
-Control46=IDC_EXTEFFREMOVE,button,1342242816
-Control47=IDC_EXTEFFADD,button,1342242816
-Control48=IDC_EXTEFFCOPY,button,1342242816
-Control49=IDC_EXTEFFPASTE,button,1342242816
-Control50=IDC_STATIC,static,1342308352
-Control51=IDC_STATIC,static,1342308352
-Control52=IDC_STATIC,static,1342308352
+Control18=IDC_DIE,edit,1350639744
+Control19=IDC_ADD,edit,1350631552
+Control20=IDC_DAMAGETYPE,combobox,1344340034
+Control21=IDC_SCHOOL,combobox,1344340034
+Control22=IDC_SECTYPE,combobox,1344340034
+Control23=IDC_IDENTIFY,edit,1350631552
+Control24=IDC_ID,button,1342242819
+Control25=IDC_NOID,button,1342242819
+Control26=IDC_FLAGS,edit,1350631552
+Control27=IDC_STRBONUS,button,1342242819
+Control28=IDC_BREAKABLE,button,1342242819
+Control29=IDC_HOSTILE,button,1342242819
+Control30=IDC_RECHARGES,button,1342242819
+Control31=IDC_FLAG1,button,1342242819
+Control32=IDC_FLAG2,button,1342242819
+Control33=IDC_TOOLTIPTEXT,edit,1350631552
+Control34=IDC_TOOLTIPREF,edit,1350631552
+Control35=IDC_CHARGES,edit,1350639744
+Control36=IDC_PERDAY,combobox,1344339970
+Control37=IDC_BOW,button,1342242819
+Control38=IDC_XBOW,button,1342242819
+Control39=IDC_MISC,button,1342242819
+Control40=IDC_MELEE,combobox,1344340035
+Control41=IDC_ANIM1,edit,1350639744
+Control42=IDC_ANIM2,edit,1350639744
+Control43=IDC_ANIM3,edit,1350639744
+Control44=IDC_PROJID,combobox,1344340034
+Control45=IDC_EXTEFFNUM,combobox,1344339971
+Control46=IDC_STATIC,static,1342308352
+Control47=IDC_STATIC,static,1342308352
+Control48=IDC_EDIT,button,1342242816
+Control49=IDC_EXTEFFREMOVE,button,1342242816
+Control50=IDC_EXTEFFADD,button,1342242816
+Control51=IDC_EXTEFFCOPY,button,1342242816
+Control52=IDC_EXTEFFPASTE,button,1342242816
Control53=IDC_STATIC,static,1342308352
Control54=IDC_STATIC,static,1342308352
Control55=IDC_STATIC,static,1342308352
@@ -6027,12 +6027,12 @@
Control61=IDC_STATIC,static,1342308352
Control62=IDC_STATIC,static,1342308352
Control63=IDC_STATIC,static,1342308352
-Control64=IDC_EFFNUM,static,1342308352
+Control64=IDC_STATIC,static,1342308352
Control65=IDC_STATIC,static,1342308352
-Control66=IDC_HEADNUM,static,1342308352
-Control67=IDC_STATIC,static,1342308352
+Control66=IDC_STATIC,static,1342308352
+Control67=IDC_EFFNUM,static,1342308352
Control68=IDC_STATIC,static,1342308352
-Control69=IDC_STATIC,static,1342308352
+Control69=IDC_HEADNUM,static,1342308352
Control70=IDC_STATIC,static,1342308352
Control71=IDC_STATIC,static,1342308352
Control72=IDC_STATIC,static,1342308352
@@ -6041,6 +6041,11 @@
Control75=IDC_STATIC,static,1342308352
Control76=IDC_STATIC,static,1342308352
Control77=IDC_STATIC,static,1342308352
+Control78=IDC_STATIC,static,1342308352
+Control79=IDC_STATIC,static,1342308352
+Control80=IDC_STATIC,static,1342308352
+Control81=IDC_STATIC,static,1342308352
+Control82=IDC_STATIC,static,1342308352
[DLG:IDD_ITEMPICKER (English (U.S.))]
Type=1
Modified: chitem/trunk/chitem.rc
===================================================================
--- chitem/trunk/chitem.rc 2009-10-05 20:29:20 UTC (rev 7375)
+++ chitem/trunk/chitem.rc 2009-10-06 21:37:29 UTC (rev 7376)
@@ -540,7 +540,7 @@
CAPTION "Extended Effects"
FONT 8, "MS Sans Serif"
BEGIN
- COMBOBOX IDC_EXTHEADNUM,68,14,27,126,CBS_DROPDOWN | WS_VSCROLL |
+ COMBOBOX IDC_EXTHEADNUM,68,14,32,126,CBS_DROPDOWN | WS_VSCROLL |
WS_TABSTOP
EDITTEXT IDC_EXTUSEICON,133,14,51,14,ES_UPPERCASE |
ES_AUTOHSCROLL
@@ -556,7 +556,7 @@
WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_TARGETNUM,123,42,17,12,ES_AUTOHSCROLL | ES_NUMBER
COMBOBOX IDC_TARGET,142,42,73,105,CBS_DROPDOWN | CBS_AUTOHSCROLL |
- CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_PROJFRAME,217,42,73,105,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_RANGE,292,43,30,12,ES_AUTOHSCROLL | ES_NUMBER
@@ -564,59 +564,65 @@
EDITTEXT IDC_UNKNOWN1,356,43,30,12,ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_THAC0,7,68,40,12,ES_AUTOHSCROLL
EDITTEXT IDC_ROLL,50,68,18,12,ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "d",IDC_STATIC,71,69,8,8
EDITTEXT IDC_DIE,82,68,18,12,ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_ADD,112,68,17,12,ES_AUTOHSCROLL
- COMBOBOX IDC_DAMAGETYPE,131,68,74,107,CBS_DROPDOWN |
- CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- EDITTEXT IDC_IDENTIFY,209,68,30,12,ES_AUTOHSCROLL
+ COMBOBOX IDC_DAMAGETYPE,136,68,99,107,CBS_DROPDOWN |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_SCHOOL,237,68,74,123,CBS_DROPDOWN | CBS_AUTOHSCROLL |
+ WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_SECTYPE,315,68,78,123,CBS_DROPDOWN | CBS_AUTOHSCROLL |
+ WS_VSCROLL | WS_TABSTOP
+ EDITTEXT IDC_IDENTIFY,37,89,30,12,ES_AUTOHSCROLL
CONTROL "Need ID",IDC_ID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
- 242,60,43,10
+ 77,89,43,10
+ CONTROL "Mustn't ID",IDC_NOID,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,122,89,48,10
+ EDITTEXT IDC_FLAGS,261,89,43,12,ES_AUTOHSCROLL
CONTROL "Use strength",IDC_STRBONUS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,288,60,56,10
+ WS_TABSTOP,315,83,56,10
CONTROL "Breakable",IDC_BREAKABLE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,343,60,48,10
- CONTROL "Mustn't ID",IDC_NOID,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,242,72,48,10
+ WS_TABSTOP,315,95,48,10
+ CONTROL "Hostile",IDC_HOSTILE,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,262,107,37,10
CONTROL "Recharges",IDC_RECHARGES,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,319,72,51,10
+ WS_TABSTOP,262,119,51,10
CONTROL "Ignore shield (IWD2)",IDC_FLAG1,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,319,83,81,10
- EDITTEXT IDC_TOOLTIPTEXT,7,95,93,12,ES_AUTOHSCROLL
- EDITTEXT IDC_TOOLTIPREF,106,95,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_CHARGES,149,94,30,12,ES_AUTOHSCROLL | ES_NUMBER
- COMBOBOX IDC_PERDAY,183,94,77,123,CBS_DROPDOWN | WS_VSCROLL |
+ BS_AUTOCHECKBOX | WS_TABSTOP,315,107,81,10
+ CONTROL "Keen (IWD2)",IDC_FLAG2,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,315,119,57,9
+ EDITTEXT IDC_TOOLTIPTEXT,7,116,93,12,ES_AUTOHSCROLL
+ EDITTEXT IDC_TOOLTIPREF,106,116,39,12,ES_AUTOHSCROLL
+ EDITTEXT IDC_CHARGES,149,115,30,12,ES_AUTOHSCROLL | ES_NUMBER
+ COMBOBOX IDC_PERDAY,183,115,77,123,CBS_DROPDOWN | WS_VSCROLL |
WS_TABSTOP
- EDITTEXT IDC_FLAGS,264,94,43,12,ES_AUTOHSCROLL
- CONTROL "Keen (IWD2)",IDC_FLAG2,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,319,96,57,10
CONTROL "Bow",IDC_BOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 112,30,10
+ 132,30,10
CONTROL "Xbow",IDC_XBOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 122,34,10
+ 142,34,10
CONTROL "Sling",IDC_MISC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 132,31,10
- COMBOBOX IDC_MELEE,44,122,109,69,CBS_DROPDOWNLIST |
+ 152,31,10
+ COMBOBOX IDC_MELEE,44,142,109,69,CBS_DROPDOWNLIST |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- EDITTEXT IDC_ANIM1,162,122,30,12,ES_AUTOHSCROLL | ES_NUMBER
- EDITTEXT IDC_ANIM2,201,122,30,12,ES_AUTOHSCROLL | ES_NUMBER
- EDITTEXT IDC_ANIM3,240,122,30,12,ES_AUTOHSCROLL | ES_NUMBER
- COMBOBOX IDC_PROJID,279,122,114,137,CBS_DROPDOWN |
+ EDITTEXT IDC_ANIM1,162,142,30,12,ES_AUTOHSCROLL | ES_NUMBER
+ EDITTEXT IDC_ANIM2,201,142,30,12,ES_AUTOHSCROLL | ES_NUMBER
+ EDITTEXT IDC_ANIM3,240,142,30,12,ES_AUTOHSCROLL | ES_NUMBER
+ COMBOBOX IDC_PROJID,279,142,114,137,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_EXTEFFNUM,44,145,319,121,CBS_DROPDOWNLIST |
+ COMBOBOX IDC_EXTEFFNUM,44,162,319,121,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- LTEXT "/",IDC_STATIC,368,146,8,8
+ LTEXT "d",IDC_STATIC,71,69,8,8
+ LTEXT "/",IDC_STATIC,368,163,8,8
PUSHBUTTON "Edit",IDC_EDIT,183,177,35,14
PUSHBUTTON "Remove",IDC_EXTEFFREMOVE,226,177,35,14
PUSHBUTTON "Add",IDC_EXTEFFADD,269,177,35,14
PUSHBUTTON "Copy",IDC_EXTEFFCOPY,312,177,35,14
PUSHBUTTON "Paste",IDC_EXTEFFPASTE,355,177,35,14
LTEXT "Extended header:",IDC_STATIC,7,16,57,8
- LTEXT "Effect #",IDC_STATIC,7,147,26,8
- LTEXT "Tooltip:",IDC_STATIC,7,84,24,8
+ LTEXT "Effect #",IDC_STATIC,7,164,26,8
+ LTEXT "Tooltip:",IDC_STATIC,7,105,24,8
LTEXT "Attack type:",IDC_STATIC,7,31,39,8
LTEXT "Use location:",IDC_STATIC,66,31,42,8
- LTEXT "ID flags",IDC_STATIC,208,58,25,8
+ LTEXT "ID flags",IDC_STATIC,7,89,25,8
LTEXT "Speed",IDC_STATIC,324,32,22,8
LTEXT "Range",IDC_STATIC,292,32,22,8
LTEXT "Target number && type",IDC_STATIC,123,31,68,8
@@ -624,21 +630,23 @@
LTEXT "+",IDC_STATIC,104,69,8,8
LTEXT "Damage rolls",IDC_STATIC,57,58,42,8
LTEXT "Thac0 +",IDC_STATIC,7,58,28,8
- LTEXT "Damage type",IDC_STATIC,131,58,43,8
- LTEXT "00",IDC_EFFNUM,377,146,9,8
- LTEXT "/",IDC_STATIC,99,16,8,8
- LTEXT "0",IDC_HEADNUM,109,16,8,8
- LTEXT "Charges",IDC_STATIC,149,84,27,8
- LTEXT "Melee animation:",IDC_STATIC,44,112,54,8
- LTEXT "Projectile animation:",IDC_STATIC,279,112,64,8
+ LTEXT "Damage type",IDC_STATIC,136,58,43,8
+ LTEXT "00",IDC_EFFNUM,377,163,9,8
+ LTEXT "/",IDC_STATIC,103,16,8,8
+ LTEXT "0",IDC_HEADNUM,113,16,8,8
+ LTEXT "Charges",IDC_STATIC,149,105,27,8
+ LTEXT "Melee animation:",IDC_STATIC,44,132,54,8
+ LTEXT "Projectile animation:",IDC_STATIC,279,132,64,8
LTEXT "0x3",IDC_STATIC,356,32,12,8
- LTEXT "Tooltip strref",IDC_STATIC,106,84,40,8
- LTEXT "Charge removal",IDC_STATIC,183,84,50,8
+ LTEXT "Tooltip strref",IDC_STATIC,106,105,40,8
+ LTEXT "Charge removal",IDC_STATIC,183,105,50,8
LTEXT "Use icon",IDC_STATIC,134,4,29,8
- LTEXT "Overhand",IDC_STATIC,162,112,32,8
- LTEXT "Backhand",IDC_STATIC,201,112,34,8
- LTEXT "Thrust",IDC_STATIC,240,112,21,8
- LTEXT "Functional flags",IDC_STATIC,264,84,52,8
+ LTEXT "Overhand",IDC_STATIC,162,132,32,8
+ LTEXT "Backhand",IDC_STATIC,201,132,34,8
+ LTEXT "Thrust",IDC_STATIC,240,132,21,8
+ LTEXT "Functional flags",IDC_STATIC,204,89,52,8
+ LTEXT "School",IDC_STATIC,240,58,23,8
+ LTEXT "Secondary type",IDC_STATIC,315,58,50,8
END
IDD_ITEMPICKER DIALOG DISCARDABLE 0, 0, 160, 217
@@ -7792,6 +7800,17 @@
IDS_GROUND "The animation is covered by actors."
IDS_ATTR7_IWD2 "Simplified duration"
IDS_ATTR7_BG2 "No failure"
+ IDS_MAKEOVERLAY "Merge this polygon into an overlay. (The polygon will be removed)."
+ IDS_REMOVEOVERLAY "Remove this polygon from an overlay. (The polygon will be removed.)"
+ IDS_COPYPOLY "Copy this polygon."
+ IDS_PASTEPOLY "Paste in a previously copied polygon."
+ IDS_REMOVEPOLY "Remove the selected polygon."
+ IDS_ADDPOLY "Add a new polygon."
+ IDS_SELECTPOLY "Select a polygon interactively from the area."
+ IDS_EDITPOLY "Edit the selected polygon."
+ IDS_EDITTILE "Edit tiles and overlays of the selected door."
+ IDS_REMOVEDOOR "Delete the selected door."
+ IDS_OPEN "Select between open and closed door polygons."
END
#endif // English (U.S.) resources
Modified: chitem/trunk/resource.h
===================================================================
--- chitem/trunk/resource.h 2009-10-05 20:29:20 UTC (rev 7375)
+++ chitem/trunk/resource.h 2009-10-06 21:37:29 UTC (rev 7376)
@@ -326,6 +326,17 @@
#define IDS_GROUND 288
#define IDS_ATTR7_IWD2 289
#define IDS_ATTR7_BG2 290
+#define IDS_MAKEOVERLAY 291
+#define IDS_REMOVEOVERLAY 292
+#define IDS_COPYPOLY 293
+#define IDS_PASTEPOLY 294
+#define IDS_REMOVEPOLY 295
+#define IDS_ADDPOLY 296
+#define IDS_SELECTPOLY 297
+#define IDS_EDITPOLY 298
+#define IDS_EDITTILE 299
+#define IDS_REMOVEDOOR 300
+#define IDS_OPEN 301
#define IDC_RESCAN 1000
#define IDC_RESCAN2 1001
#define IDC_ICONCHK 1002
@@ -1654,6 +1665,7 @@
#define IDC_FACTION 2362
#define IDC_TEAM 2363
#define IDC_HEXADECIMAL 2363
+#define IDC_HOSTILE 2367
#define ID_RESCAN 32771
#define ID_RESCAN2 32772
#define ID_EDIT_ITEM 32773
@@ -1879,7 +1891,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 233
#define _APS_NEXT_COMMAND_VALUE 33051
-#define _APS_NEXT_CONTROL_VALUE 2366
+#define _APS_NEXT_CONTROL_VALUE 2372
#define _APS_NEXT_SYMED_VALUE 120
#endif
#endif
Modified: chitem/trunk/seekers.cpp
===================================================================
--- chitem/trunk/seekers.cpp 2009-10-05 20:29:20 UTC (rev 7375)
+++ chitem/trunk/seekers.cpp 2009-10-06 21:37:29 UTC (rev 7376)
@@ -1134,7 +1134,34 @@
log("The THAC0 is bigger than 20 in extended header #%d.",i+1);
ret|=BAD_EXTHEAD;
}
+
+ switch(atype)
+ {
+ case 1:
+ tmp=0xfffffffc;
+ break;
+ case 2:
+ tmp=0xfffffffc;
+ break;
+ case 3:
+ tmp=0xfffff3ff;
+ break;
+ case 4:
+ tmp=0xfffffffc;
+ break;
+ default:
+ tmp=0xffffffff;
+ }
+ if (iwd2_structures()) {
+ tmp&=0xfffcffff; //Keen and ignore armor
+ }
+
+ if(the_item.extheaders[i].flags&tmp) {
+ log("Unusual item flags: %08x for %s in extended header #%d.", the_item.extheaders[i].flags, get_attack_type(atype), i+1);
+ ret|=BAD_EXTHEAD;
+ }
+
tmp=the_item.extheaders[i].proref;
if(check_pro_num(tmp) )
{
@@ -1352,7 +1379,8 @@
}
break;
case 3:
- if(recharge&(~2049)) //add iwd2 flags too
+ //2049
+ if(recharge&(~3072)) //add iwd2 flags too
{
log("Extended header #%d has unknown recharge flag: %8x.",i+1,recharge);
ret|=BAD_EXTHEAD;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|