OSDN > ソフトウェアを探す > ゲーム/エンターテイメント > ファーストパーソンシューティング(FPS) > Marathon JP > SCM > SVN > コミット

Marathon JP
Fork
Aorta
ShapeFusion

R/O
SSH
HTTPS

marathon: コミット

コミットメタ情報

リビジョン	234 (tree)
日時	2007-02-15 01:21:57
作者	hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

modified: marathon/trunk/PhysicsEditorWS/src/MainWindow.h (diff)
modified: marathon/trunk/PhysicsEditorWS/src/MainInitFunc.cpp (diff)
modified: marathon/trunk/PhysicsEditorWS/src/MainWindow.win (diff)
modified: marathon/trunk/PhysicsEditorWS/src/PhysicsEditorWS.exe (diff)
modified: marathon/trunk/PhysicsEditorWS/src/MainWindow.cpp (diff)
modified: marathon/trunk/PhysicsEditorWS/src/General.h (diff)

差分

--- marathon/trunk/PhysicsEditorWS/src/MainWindow.h (revision 233)

+++ marathon/trunk/PhysicsEditorWS/src/MainWindow.h (revision 234)

		@@ -56,17 +56,17 @@
56	56	extern WSCvlabel* Maivlab_043;
57	57	extern WSCvlabel* Maivlab_044;
58	58	extern WSCvlabel* Maivlab_045;
59		-extern WSCvifield* Maivifi_000;
	59	+extern WSCvifield* SeqStationaly;
60	60	extern WSCvlabel* Maivlab_001;
61	61	extern WSCvlabel* Maivlab_002;
62		-extern WSCvifield* Maivifi_003;
63		-extern WSCvifield* Maivifi_004;
64		-extern WSCvifield* Maivifi_005;
65		-extern WSCvifield* Maivifi_006;
66		-extern WSCvifield* Maivifi_007;
67		-extern WSCvifield* Maivifi_008;
68		-extern WSCvifield* Maivifi_009;
69		-extern WSCvifield* Maivifi_010;
	62	+extern WSCvifield* SeqMoving;
	63	+extern WSCvifield* SeqHitting;
	64	+extern WSCvifield* SeqSoftDying;
	65	+extern WSCvifield* SeqSoftDead;
	66	+extern WSCvifield* SeqHardDying;
	67	+extern WSCvifield* SeqHardDead;
	68	+extern WSCvifield* SeqTeleportIn;
	69	+extern WSCvifield* SeqTeleportOut;
70	70	extern WSCvlabel* Maivlab_005;
71	71	extern WSCvlabel* Maivlab_006;
72	72	extern WSCvlabel* Maivlab_007;

		@@ -104,7 +104,7 @@
104	104	extern WSCoption* SpeedCombo;
105	105	extern WSCoption* IntelligenceCombo;
106	106	extern WSCvbtn* CollectionBtn;
107		-extern WSCvbtn* Maivbtn_022;
	107	+extern WSCvbtn* CarryItemBtn;
108	108	extern WSCvbtn* Maivbtn_023;
109	109	extern WSCvbtn* Maivbtn_024;
110	110	extern WSCvbtn* Maivbtn_025;

		@@ -114,6 +114,9 @@
114	114	extern WSCvbtn* Maivbtn_029;
115	115	extern WSCvbtn* Maivbtn_030;
116	116	extern WSCoption* ClassCombo;
	117	+extern WSCvbtn* Maivbtn_000;
	118	+extern WSCvbtn* Maivbtn_001;
	119	+extern WSCvbtn* Maivbtn_002;
117	120	extern WSClist* ListMonsterType;
118	121	extern WSCwindow* WndEffect;
119	122	extern WSCwindow* WndProjectile;

--- marathon/trunk/PhysicsEditorWS/src/MainInitFunc.cpp (revision 233)

+++ marathon/trunk/PhysicsEditorWS/src/MainInitFunc.cpp (revision 234)

		@@ -24,13 +24,115 @@
24	24	struct weapon_definition weapon_default_definitions[MAXIMUM_NUMBER_OF_WEAPONS];
25	25
26	26	std::vector<std::string> stockCollections;
	27	+std::vector<std::string> stockMonsterClasses;
27	28	std::vector<std::string> stockSpeeds;
28		-std::vector<std::string> stockMonsterClasses;
29	29	std::vector<std::string> stockItemTypes;
	30	+std::vector<std::string> stockEffects;
	31	+std::vector<std::string> stockProjectiles;
	32	+std::vector<std::string> stockSounds;
	33	+std::vector<std::string> stockDamages;
	34	+std::vector<std::string> stockMonsterActivates;
	35	+std::vector<std::string> stockMonsterDoorRetryMasks;
	36	+std::vector<std::string> stockWeaponClasses;
	37	+std::vector<std::string> stockShellCasingTypes;
	38	+std::vector<std::string> stockPhysicsTypes;
30	39
31		-int valueSpeed[NUMBER_OF_SPEED_INFORMATIONS];
32		-int valueMonsterClasses[NUMBER_OF_CLASS_INFORMATIONS];
33	40
	41	+int valueMonsterClasses[NUMBER_OF_CLASS_INFORMATIONS]={
	42	+ _class_player, _class_human_civilian, _class_madd, _class_possessed_hummer,
	43	+ _class_defender,
	44	+ _class_fighter, _class_trooper, _class_hunter, _class_enforcer, _class_juggernaut,
	45	+ _class_compiler, _class_cyborg, _class_assimilated_civilian,
	46	+ _class_hummer, _class_tick, _class_yeti
	47	+};
	48	+int valueSpeed[NUMBER_OF_SPEED_INFORMATIONS]={
	49	+ _speed_slow, _speed_medium, _speed_almost_fast, _speed_fast,
	50	+ _speed_superfast1, _speed_superfast2, _speed_superfast3,
	51	+ _speed_superfast4, _speed_superfast5,
	52	+ _speed_blinding, _speed_insane
	53	+};
	54	+int valueIntelligences[NUMBER_OF_MONSTER_INTELLIGENCE_INFORMATIONS]={
	55	+ _intelligence_low, _intelligence_average, _intelligence_high
	56	+};
	57	+int valueMonsterDoorRetryMask[NUMBER_OF_MONSTER_DOOR_RETRY_MASK_INFORMATIONS]={
	58	+ _slow_door_retry_mask, _normal_door_retry_mask,
	59	+ _fast_door_retry_mask, _vidmaster_door_retry_mask
	60	+};
	61	+int valueMonsterFlags[NUMBER_OF_MONSTER_FLAG_INFORMATIONS]={
	62	+ _monster_is_omniscent,
	63	+ _monster_flys,
	64	+ _monster_is_alien,
	65	+ _monster_major,
	66	+ _monster_minor,
	67	+ _monster_cannot_be_dropped,
	68	+ _monster_floats,
	69	+ _monster_cannot_attack,
	70	+ _monster_uses_sniper_ledges,
	71	+ _monster_is_invisible,
	72	+ _monster_is_subtly_invisible,
	73	+ _monster_is_kamakazi,
	74	+ _monster_is_berserker,
	75	+ _monster_is_enlarged,
	76	+ _monster_has_delayed_hard_death,
	77	+ _monster_fires_symmetrically,
	78	+ _monster_has_nuclear_hard_death,
	79	+ _monster_cant_fire_backwards,
	80	+ _monster_can_die_in_flames,
	81	+ _monster_waits_with_clear_shot,
	82	+ _monster_is_tiny,
	83	+ _monster_attacks_immediately,
	84	+ _monster_is_not_afraid_of_water,
	85	+ _monster_is_not_afraid_of_sewage,
	86	+ _monster_is_not_afraid_of_lava,
	87	+ _monster_is_not_afraid_of_goo,
	88	+ _monster_can_teleport_under_media,
	89	+ _monster_chooses_weapons_randomly
	90	+};
	91	+int valueEffectFlags[NUMBER_OF_EFFECT_FLAG_INFORMATIONS]={
	92	+ _end_when_animation_loops,
	93	+ _end_when_transfer_animation_loops,
	94	+ _sound_only,
	95	+ _make_twin_visible,
	96	+ _media_effect
	97	+};
	98	+int valueWeaponFlags[NUMBER_OF_WEAPON_FLAG_INFORMATIONS]={
	99	+ _weapon_is_automatic,
	100	+ _weapon_disappears_after_use,
	101	+ _weapon_plays_instant_shell_casing_sound,
	102	+ _weapon_overloads,
	103	+ _weapon_has_random_ammo_on_pickup,
	104	+ _powerup_is_temporary,
	105	+ _weapon_reloads_in_one_hand,
	106	+ _weapon_fires_out_of_phase,
	107	+ _weapon_fires_under_media,
	108	+ _weapon_triggers_share_ammo,
	109	+ _weapon_secondary_has_angular_flipping
	110	+};
	111	+int valueProjectileFlags[NUMBER_OF_PROJECTILE_FLAG_INFORMATIONS]={
	112	+ _guided,
	113	+ _stop_when_animation_loops,
	114	+ _persistent,
	115	+ _alien_projectile,
	116	+ _affected_by_gravity,
	117	+ _no_horizontal_error,
	118	+ _no_vertical_error,
	119	+ _can_toggle_control_panels,
	120	+ _positive_vertical_error,
	121	+ _melee_projectile,
	122	+ _persistent_and_virulent,
	123	+ _usually_pass_transparent_side,
	124	+ _sometimes_pass_transparent_side,
	125	+ _doubly_affected_by_gravity,
	126	+ _rebounds_from_floor,
	127	+ _penetrates_media,
	128	+ _becomes_item_on_detonation,
	129	+ _bleeding_projectile,
	130	+ _horizontal_wander,
	131	+ _vertical_wander,
	132	+ _affected_by_half_gravity,
	133	+ _penetrates_media_boundary
	134	+};
	135	+
34	136	std::string getOptionItemListFromVectorString(std::vector<std::string>& stocks)
35	137	{
36	138	std::string itemList;

		@@ -104,6 +206,20 @@
104	206	}
105	207	}
106	208	*/
	209	+
	210	+/*
	211	+ @return -1 when not found
	212	+*/
	213	+int getIndexFromValueArray(int *arr, int max, int target)
	214	+{
	215	+ for(int i = 0; i < max; i ++){
	216	+ if(arr[i] == target){
	217	+ return i;
	218	+ }
	219	+ }
	220	+ return -1;
	221	+}
	222	+
107	223	void setupDialog(WSCbase* object)
108	224	{
109	225	if(windowType == Windows::Monster){

		@@ -110,62 +226,108 @@
110	226	//window
111	227	WSCwindow* wnd = (WSCwindow*)getObject("WSCwindow", "WndMonster");
112	228	int type = selectedMonsterType;
113		-
114		- //設定
115		- int16 collection = monster_definitions[type].collection;
116		- int16 col = GET_COLLECTION(collection);
117		- int16 clut = GET_COLLECTION_CLUT(collection);
118		-
119		- //index
120		- WSCindexForm* indextab = (WSCindexForm*)wnd->getChildInstance("Maiinde_012");
121		- //clut
122		- WSCvifield* clutField = (WSCvifield*)indextab->getChildInstance("PalletEdit");
123		- clutField->setProperty(WSNlabelString, (long)clut);
124		- //collection
125		- indextab->getChildInstance("CollectionBtn")->setProperty(WSNlabelString,
126		- stockCollections[col].c_str());
127		-
128		- //vitality
129		- setInteger(indextab->getChildInstance("VitalityEdit"), monster_definitions[type].vitality);
130		- //class
131		- indextab->getChildInstance("ClassCombo")->setProperty(WSNvalue,
132		- (monster_definitions[type]._class));
133		- //setSelectedValue((WSCoption*)indextab->getChildInstance("ClassCombo"),
134		- // (monster_definitions[type]._class));
135		- //radius
136		- setInteger(indextab->getChildInstance("RadiusEdit"), monster_definitions[type].radius);
137		- //height
138		- setInteger(indextab->getChildInstance("HeightEdit"), monster_definitions[type].height);
139		- //hover
140		- setInteger(indextab->getChildInstance("HoverEdit"), monster_definitions[type].preferred_hover_height);
141		- //minledge
142		- setInteger(indextab->getChildInstance("MinLedgeEdit"), monster_definitions[type].minimum_ledge_delta);
143		- //maxledge
144		- setInteger(indextab->getChildInstance("MaxLedgeEdit"), monster_definitions[type].maximum_ledge_delta);
145		- //extvelscale
146		- setInteger(indextab->getChildInstance("ExtVelScaleEdit"), monster_definitions[type].external_velocity_scale);
147		- //carryitem
148		- //halfvisualarc
149		- setInteger(indextab->getChildInstance("HalfVisualArc"), monster_definitions[type].half_visual_arc);
150		- //vertvisualarc
151		- setInteger(indextab->getChildInstance("VertVisualArc"), monster_definitions[type].half_vertical_visual_arc);
152		- //interlligence
153		- WSCoption* opt = (WSCoption*)indextab->getChildInstance("IntelligenceCombo");
154		- long num = monster_definitions[type].intelligence;
155		-// opt->onValueChange(num);
156		-// opt->setProperty(WSNvalue, num);
157		- char* intelligences[10]={"Low", "Average", "High"};
158		- indextab->getChildInstance("IntelligenceCombo")->setProperty(WSNvalue, num);//WSNlabelString
159		-// indextab->getChildInstance("IntelligenceCombo")->setProperty(WSNlabelString, intelligences[num-1]);//WSNlabelString
160		-
161		- //opt->update();
162		- //setSelectedValue((WSCoption*)indextab->getChildInstance("IntelligenceCombo"),
163		- // monster_definitions[type].intelligence);
164		- //speed
165		- setInteger(indextab->getChildInstance("SpeedEdit"), monster_definitions[type].half_vertical_visual_arc);
166		- //indextab->getChildInstance("SpeedCombo")->setProperty(WSNvalue, );
167		- //gravity
168		- setInteger(indextab->getChildInstance("GravityEdit"), monster_definitions[type].gravity);
	229	+ if(type >= 0 && type < NUMBER_OF_MONSTER_TYPES){
	230	+ //設定
	231	+ int16 collection = monster_definitions[type].collection;
	232	+ int16 col = GET_COLLECTION(collection);
	233	+ int16 clut = GET_COLLECTION_CLUT(collection);
	234	+
	235	+ //index
	236	+ WSCindexForm* indextab = (WSCindexForm*)wnd->getChildInstance("Maiinde_012");
	237	+ //clut
	238	+ WSCvifield* clutField = (WSCvifield*)indextab->getChildInstance("PalletEdit");
	239	+ clutField->setProperty(WSNlabelString, (long)clut);
	240	+ //collection
	241	+ indextab->getChildInstance("CollectionBtn")->setProperty(WSNlabelString,
	242	+ stockCollections[col].c_str());
	243	+
	244	+ //vitality
	245	+ char buf[256];
	246	+ setInteger(indextab->getChildInstance("VitalityEdit"), monster_definitions[type].vitality);
	247	+ //class
	248	+ int classIndex = getIndexFromValueArray(valueMonsterClasses, NUMBER_OF_CLASS_INFORMATIONS,
	249	+ monster_definitions[type]._class);
	250	+ if(classIndex > 0){
	251	+ WSCbase* opt = indextab->getChildInstance("ClassCombo");
	252	+ opt->setProperty(WSNvalue, (classIndex));
	253	+ opt->setProperty(WSNlabelString, stockMonsterClasses[classIndex].c_str());
	254	+ }else{
	255	+ sprintf(buf, "class combo failure:%d", monster_definitions[type]._class);
	256	+ MessageBox(NULL, buf, "", MB_OK);
	257	+ }
	258	+ //setSelectedValue((WSCoption*)indextab->getChildInstance("ClassCombo"),
	259	+ // (monster_definitions[type]._class));
	260	+ //radius
	261	+ setInteger(indextab->getChildInstance("RadiusEdit"), monster_definitions[type].radius);
	262	+ //height
	263	+ setInteger(indextab->getChildInstance("HeightEdit"), monster_definitions[type].height);
	264	+ //hover
	265	+ setInteger(indextab->getChildInstance("HoverEdit"), monster_definitions[type].preferred_hover_height);
	266	+ //minledge
	267	+ setInteger(indextab->getChildInstance("MinLedgeEdit"), monster_definitions[type].minimum_ledge_delta);
	268	+ //maxledge
	269	+ setInteger(indextab->getChildInstance("MaxLedgeEdit"), monster_definitions[type].maximum_ledge_delta);
	270	+ //extvelscale
	271	+ setInteger(indextab->getChildInstance("ExtVelScaleEdit"), monster_definitions[type].external_velocity_scale);
	272	+
	273	+ // sprintf(buf, "carry item:%d", monster_definitions[type].carrying_item_type);
	274	+ // MessageBox(NULL, buf, "", MB_OK);
	275	+ //carryitem
	276	+ int carryIndex = monster_definitions[type].carrying_item_type;
	277	+ if(carryIndex < 0){
	278	+ carryIndex = stockItemTypes.size() -1;
	279	+ }
	280	+ indextab->getChildInstance("CarryItemBtn")->setProperty(WSNlabelString,
	281	+ stockItemTypes[carryIndex].c_str());
	282	+ //halfvisualarc
	283	+ setInteger(indextab->getChildInstance("HalfVisualArc"), monster_definitions[type].half_visual_arc);
	284	+ //vertvisualarc
	285	+ setInteger(indextab->getChildInstance("VertVisualArc"), monster_definitions[type].half_vertical_visual_arc);
	286	+ //interlligence
	287	+ WSCoption* opt = (WSCoption*)indextab->getChildInstance("IntelligenceCombo");
	288	+ long intelli = monster_definitions[type].intelligence;
	289	+ // opt->onValueChange(num);
	290	+ // opt->setProperty(WSNvalue, num);
	291	+ char* intelligences[10]={"Low", "Average", "High"};
	292	+ int intelliIndex = getIndexFromValueArray(valueIntelligences, NUMBER_OF_MONSTER_INTELLIGENCE_INFORMATIONS,
	293	+ intelli);
	294	+ if(intelliIndex > 0){
	295	+ indextab->getChildInstance("IntelligenceCombo")->setProperty(WSNvalue, intelliIndex);//WSNlabelString
	296	+ indextab->getChildInstance("IntelligenceCombo")->setProperty(WSNlabelString,
	297	+ intelligences[intelliIndex]);//WSNlabelString
	298	+ }else{
	299	+ }
	300	+
	301	+ //opt->update();
	302	+ //setSelectedValue((WSCoption*)indextab->getChildInstance("IntelligenceCombo"),
	303	+ // monster_definitions[type].intelligence);
	304	+ //speed
	305	+ setInteger(indextab->getChildInstance("SpeedEdit"), monster_definitions[type].half_vertical_visual_arc);
	306	+ //indextab->getChildInstance("SpeedCombo")->setProperty(WSNvalue, );
	307	+ //gravity
	308	+ setInteger(indextab->getChildInstance("GravityEdit"), monster_definitions[type].gravity);
	309	+
	310	+ ////////////
	311	+ //sequences
	312	+ setInteger(indextab->getChildInstance("SeqStationaly"),
	313	+ monster_definitions[type].stationary_shape);
	314	+ setInteger(indextab->getChildInstance("SeqMoving"),
	315	+ monster_definitions[type].moving_shape);
	316	+ setInteger(indextab->getChildInstance("SeqSoftDying"),
	317	+ monster_definitions[type].soft_dying_shape);
	318	+ setInteger(indextab->getChildInstance("SeqSoftDead"),
	319	+ monster_definitions[type].soft_dead_shapes);
	320	+ setInteger(indextab->getChildInstance("SeqHardDying"),
	321	+ monster_definitions[type].hard_dying_shape);
	322	+ setInteger(indextab->getChildInstance("SeqHardDead"),
	323	+ monster_definitions[type].hard_dead_shapes);
	324	+ setInteger(indextab->getChildInstance("SeqHitting"),
	325	+ monster_definitions[type].hit_shapes);
	326	+ setInteger(indextab->getChildInstance("SeqTeleportIn"),
	327	+ monster_definitions[type].teleport_in_shape);
	328	+ setInteger(indextab->getChildInstance("SeqTeleportOut"),
	329	+ monster_definitions[type].teleport_out_shape);
	330	+ }
169	331	}
170	332	object->update();
171	333	}

		@@ -189,14 +351,24 @@
189	351
190	352	//load
191	353	stockCollections = hpl::string::loadFromFile("data/Collections.txt");
	354	+ stockMonsterClasses = hpl::string::loadFromFile("data/MonsterClasses.txt");
192	355	stockSpeeds = hpl::string::loadFromFile("data/Speeds.txt");
193		- stockMonsterClasses = hpl::string::loadFromFile("data/MonsterClasses.txt");
	356	+ stockSpeeds.push_back("other");
194	357	stockItemTypes = hpl::string::loadFromFile("data/DefinedItems.txt");
	358	+ stockItemTypes.push_back("none");
	359	+ stockEffects = hpl::string::loadFromFile("data/Effects.txt");
	360	+ stockEffects.push_back("none");
	361	+ stockProjectiles = hpl::string::loadFromFile("data/Projectiles.txt");
	362	+ stockSounds = hpl::string::loadFromFile("data/Sounds.txt");
	363	+ stockSounds.push_back("none");
	364	+ stockDamages = hpl::string::loadFromFile("data/Damages.txt");
	365	+ stockMonsterActivates = hpl::string::loadFromFile("data/MonsterActivates.txt");
	366	+ stockMonsterDoorRetryMasks = hpl::string::loadFromFile("data/MonsterDoorRetryMasks.txt");
	367	+ stockWeaponClasses = hpl::string::loadFromFile("data/WeaponClasses.txt");
	368	+ stockShellCasingTypes = hpl::string::loadFromFile("data/ShellCasingTypes.txt");
	369	+ stockPhysicsTypes = hpl::string::loadFromFile("data/PhysicsTypes.txt");
195	370
196		- //index setup
197		- // speed
198		- valueSpeed[0] = 0;
199		-
	371	+
200	372	//setup window's combo
201	373	//object->getChildInstance("WndMonster")->
202	374	//getChildInstance("Maiinde_012")->getChildInstance("CollectionCombo")->setProperty(WSNmenuItems, itemList.c_str());

--- marathon/trunk/PhysicsEditorWS/src/MainWindow.cpp (revision 233)

+++ marathon/trunk/PhysicsEditorWS/src/MainWindow.cpp (revision 234)

		@@ -54,17 +54,17 @@
54	54	WSCvlabel* Maivlab_043 = NULL;
55	55	WSCvlabel* Maivlab_044 = NULL;
56	56	WSCvlabel* Maivlab_045 = NULL;
57		-WSCvifield* Maivifi_000 = NULL;
	57	+WSCvifield* SeqStationaly = NULL;
58	58	WSCvlabel* Maivlab_001 = NULL;
59	59	WSCvlabel* Maivlab_002 = NULL;
60		-WSCvifield* Maivifi_003 = NULL;
61		-WSCvifield* Maivifi_004 = NULL;
62		-WSCvifield* Maivifi_005 = NULL;
63		-WSCvifield* Maivifi_006 = NULL;
64		-WSCvifield* Maivifi_007 = NULL;
65		-WSCvifield* Maivifi_008 = NULL;
66		-WSCvifield* Maivifi_009 = NULL;
67		-WSCvifield* Maivifi_010 = NULL;
	60	+WSCvifield* SeqMoving = NULL;
	61	+WSCvifield* SeqHitting = NULL;
	62	+WSCvifield* SeqSoftDying = NULL;
	63	+WSCvifield* SeqSoftDead = NULL;
	64	+WSCvifield* SeqHardDying = NULL;
	65	+WSCvifield* SeqHardDead = NULL;
	66	+WSCvifield* SeqTeleportIn = NULL;
	67	+WSCvifield* SeqTeleportOut = NULL;
68	68	WSCvlabel* Maivlab_005 = NULL;
69	69	WSCvlabel* Maivlab_006 = NULL;
70	70	WSCvlabel* Maivlab_007 = NULL;

		@@ -102,7 +102,7 @@
102	102	WSCoption* SpeedCombo = NULL;
103	103	WSCoption* IntelligenceCombo = NULL;
104	104	WSCvbtn* CollectionBtn = NULL;
105		-WSCvbtn* Maivbtn_022 = NULL;
	105	+WSCvbtn* CarryItemBtn = NULL;
106	106	WSCvbtn* Maivbtn_023 = NULL;
107	107	WSCvbtn* Maivbtn_024 = NULL;
108	108	WSCvbtn* Maivbtn_025 = NULL;

		@@ -112,6 +112,9 @@
112	112	WSCvbtn* Maivbtn_029 = NULL;
113	113	WSCvbtn* Maivbtn_030 = NULL;
114	114	WSCoption* ClassCombo = NULL;
	115	+WSCvbtn* Maivbtn_000 = NULL;
	116	+WSCvbtn* Maivbtn_001 = NULL;
	117	+WSCvbtn* Maivbtn_002 = NULL;
115	118	WSClist* ListMonsterType = NULL;
116	119	WSCwindow* WndEffect = NULL;
117	120	WSCwindow* WndProjectile = NULL;

		@@ -233,7 +236,7 @@
233	236	WndMonster->setPropertyV(WSNx,(short)272);
234	237	WndMonster->setPropertyV(WSNy,(short)159);
235	238	WndMonster->setPropertyV(WSNwidth,(unsigned short)678);
236		- WndMonster->setPropertyV(WSNheight,(unsigned short)463);
	239	+ WndMonster->setPropertyV(WSNheight,(unsigned short)464);
237	240	WndMonster->setPropertyV(WSNshadowThickness,(unsigned char)2);
238	241	WndMonster->setPropertyV(WSNtitleBar,(char)2);
239	242	WndMonster->setPropertyV(WSNshadowType,(char)-1);

		@@ -459,7 +462,7 @@
459	462	Maivlab_039->setPropertyV(WSNlabelString,"Stationaly");
460	463	Maivlab_039->setPropertyV(WSNname,"Maivlab_039");
461	464	Maivlab_039->setPropertyV(WSNvis,(WSCbool)1);
462		- Maivlab_039->setPropertyV(WSNx,(short)180);
	465	+ Maivlab_039->setPropertyV(WSNx,(short)205);
463	466	Maivlab_039->setPropertyV(WSNy,(short)30);
464	467	Maivlab_039->setPropertyV(WSNwidth,(unsigned short)90);
465	468	Maivlab_039->setPropertyV(WSNheight,(unsigned short)25);

		@@ -470,7 +473,7 @@
470	473	Maivlab_040->setPropertyV(WSNlabelString,"Moving");
471	474	Maivlab_040->setPropertyV(WSNname,"Maivlab_040");
472	475	Maivlab_040->setPropertyV(WSNvis,(WSCbool)1);
473		- Maivlab_040->setPropertyV(WSNx,(short)180);
	476	+ Maivlab_040->setPropertyV(WSNx,(short)205);
474	477	Maivlab_040->setPropertyV(WSNy,(short)55);
475	478	Maivlab_040->setPropertyV(WSNwidth,(unsigned short)90);
476	479	Maivlab_040->setPropertyV(WSNheight,(unsigned short)25);

		@@ -481,7 +484,7 @@
481	484	Maivlab_041->setPropertyV(WSNlabelString,"Hitting");
482	485	Maivlab_041->setPropertyV(WSNname,"Maivlab_041");
483	486	Maivlab_041->setPropertyV(WSNvis,(WSCbool)1);
484		- Maivlab_041->setPropertyV(WSNx,(short)180);
	487	+ Maivlab_041->setPropertyV(WSNx,(short)205);
485	488	Maivlab_041->setPropertyV(WSNy,(short)80);
486	489	Maivlab_041->setPropertyV(WSNwidth,(unsigned short)90);
487	490	Maivlab_041->setPropertyV(WSNheight,(unsigned short)25);

		@@ -492,7 +495,7 @@
492	495	Maivlab_042->setPropertyV(WSNlabelString,"Soft Dying");
493	496	Maivlab_042->setPropertyV(WSNname,"Maivlab_042");
494	497	Maivlab_042->setPropertyV(WSNvis,(WSCbool)1);
495		- Maivlab_042->setPropertyV(WSNx,(short)180);
	498	+ Maivlab_042->setPropertyV(WSNx,(short)205);
496	499	Maivlab_042->setPropertyV(WSNy,(short)105);
497	500	Maivlab_042->setPropertyV(WSNwidth,(unsigned short)90);
498	501	Maivlab_042->setPropertyV(WSNheight,(unsigned short)25);

		@@ -503,7 +506,7 @@
503	506	Maivlab_043->setPropertyV(WSNlabelString,"Soft Dead");
504	507	Maivlab_043->setPropertyV(WSNname,"Maivlab_043");
505	508	Maivlab_043->setPropertyV(WSNvis,(WSCbool)1);
506		- Maivlab_043->setPropertyV(WSNx,(short)180);
	509	+ Maivlab_043->setPropertyV(WSNx,(short)205);
507	510	Maivlab_043->setPropertyV(WSNy,(short)130);
508	511	Maivlab_043->setPropertyV(WSNwidth,(unsigned short)90);
509	512	Maivlab_043->setPropertyV(WSNheight,(unsigned short)25);

		@@ -514,7 +517,7 @@
514	517	Maivlab_044->setPropertyV(WSNlabelString,"Hard Dying");
515	518	Maivlab_044->setPropertyV(WSNname,"Maivlab_044");
516	519	Maivlab_044->setPropertyV(WSNvis,(WSCbool)1);
517		- Maivlab_044->setPropertyV(WSNx,(short)180);
	520	+ Maivlab_044->setPropertyV(WSNx,(short)205);
518	521	Maivlab_044->setPropertyV(WSNy,(short)155);
519	522	Maivlab_044->setPropertyV(WSNwidth,(unsigned short)90);
520	523	Maivlab_044->setPropertyV(WSNheight,(unsigned short)25);

		@@ -525,20 +528,20 @@
525	528	Maivlab_045->setPropertyV(WSNlabelString,"Hard Dead");
526	529	Maivlab_045->setPropertyV(WSNname,"Maivlab_045");
527	530	Maivlab_045->setPropertyV(WSNvis,(WSCbool)1);
528		- Maivlab_045->setPropertyV(WSNx,(short)180);
	531	+ Maivlab_045->setPropertyV(WSNx,(short)205);
529	532	Maivlab_045->setPropertyV(WSNy,(short)180);
530	533	Maivlab_045->setPropertyV(WSNwidth,(unsigned short)90);
531	534	Maivlab_045->setPropertyV(WSNheight,(unsigned short)25);
532	535
533		- Maivifi_000 = new WSCvifield(Maiinde_012,"Maivifi_000");
534		- Maivifi_000->initialize();
535		- Maivifi_000->setPropertyV(WSNuserValue,(long)1);
536		- Maivifi_000->setPropertyV(WSNname,"Maivifi_000");
537		- Maivifi_000->setPropertyV(WSNvis,(WSCbool)1);
538		- Maivifi_000->setPropertyV(WSNx,(short)270);
539		- Maivifi_000->setPropertyV(WSNy,(short)30);
540		- Maivifi_000->setPropertyV(WSNwidth,(unsigned short)80);
541		- Maivifi_000->setPropertyV(WSNheight,(unsigned short)25);
	536	+ SeqStationaly = new WSCvifield(Maiinde_012,"SeqStationaly");
	537	+ SeqStationaly->initialize();
	538	+ SeqStationaly->setPropertyV(WSNuserValue,(long)1);
	539	+ SeqStationaly->setPropertyV(WSNname,"SeqStationaly");
	540	+ SeqStationaly->setPropertyV(WSNvis,(WSCbool)1);
	541	+ SeqStationaly->setPropertyV(WSNx,(short)295);
	542	+ SeqStationaly->setPropertyV(WSNy,(short)30);
	543	+ SeqStationaly->setPropertyV(WSNwidth,(unsigned short)55);
	544	+ SeqStationaly->setPropertyV(WSNheight,(unsigned short)25);
542	545
543	546	Maivlab_001 = new WSCvlabel(Maiinde_012,"Maivlab_001");
544	547	Maivlab_001->initialize();

		@@ -546,7 +549,7 @@
546	549	Maivlab_001->setPropertyV(WSNlabelString,"Teleport In");
547	550	Maivlab_001->setPropertyV(WSNname,"Maivlab_001");
548	551	Maivlab_001->setPropertyV(WSNvis,(WSCbool)1);
549		- Maivlab_001->setPropertyV(WSNx,(short)180);
	552	+ Maivlab_001->setPropertyV(WSNx,(short)205);
550	553	Maivlab_001->setPropertyV(WSNy,(short)205);
551	554	Maivlab_001->setPropertyV(WSNwidth,(unsigned short)90);
552	555	Maivlab_001->setPropertyV(WSNheight,(unsigned short)25);

		@@ -557,90 +560,90 @@
557	560	Maivlab_002->setPropertyV(WSNlabelString,"Teleport Out");
558	561	Maivlab_002->setPropertyV(WSNname,"Maivlab_002");
559	562	Maivlab_002->setPropertyV(WSNvis,(WSCbool)1);
560		- Maivlab_002->setPropertyV(WSNx,(short)180);
	563	+ Maivlab_002->setPropertyV(WSNx,(short)205);
561	564	Maivlab_002->setPropertyV(WSNy,(short)230);
562	565	Maivlab_002->setPropertyV(WSNwidth,(unsigned short)90);
563	566	Maivlab_002->setPropertyV(WSNheight,(unsigned short)25);
564	567
565		- Maivifi_003 = new WSCvifield(Maiinde_012,"Maivifi_003");
566		- Maivifi_003->initialize();
567		- Maivifi_003->setPropertyV(WSNuserValue,(long)1);
568		- Maivifi_003->setPropertyV(WSNname,"Maivifi_003");
569		- Maivifi_003->setPropertyV(WSNvis,(WSCbool)1);
570		- Maivifi_003->setPropertyV(WSNx,(short)270);
571		- Maivifi_003->setPropertyV(WSNy,(short)55);
572		- Maivifi_003->setPropertyV(WSNwidth,(unsigned short)80);
573		- Maivifi_003->setPropertyV(WSNheight,(unsigned short)25);
	568	+ SeqMoving = new WSCvifield(Maiinde_012,"SeqMoving");
	569	+ SeqMoving->initialize();
	570	+ SeqMoving->setPropertyV(WSNuserValue,(long)1);
	571	+ SeqMoving->setPropertyV(WSNname,"SeqMoving");
	572	+ SeqMoving->setPropertyV(WSNvis,(WSCbool)1);
	573	+ SeqMoving->setPropertyV(WSNx,(short)295);
	574	+ SeqMoving->setPropertyV(WSNy,(short)55);
	575	+ SeqMoving->setPropertyV(WSNwidth,(unsigned short)55);
	576	+ SeqMoving->setPropertyV(WSNheight,(unsigned short)25);
574	577
575		- Maivifi_004 = new WSCvifield(Maiinde_012,"Maivifi_004");
576		- Maivifi_004->initialize();
577		- Maivifi_004->setPropertyV(WSNuserValue,(long)1);
578		- Maivifi_004->setPropertyV(WSNname,"Maivifi_004");
579		- Maivifi_004->setPropertyV(WSNvis,(WSCbool)1);
580		- Maivifi_004->setPropertyV(WSNx,(short)270);
581		- Maivifi_004->setPropertyV(WSNy,(short)80);
582		- Maivifi_004->setPropertyV(WSNwidth,(unsigned short)80);
583		- Maivifi_004->setPropertyV(WSNheight,(unsigned short)25);
	578	+ SeqHitting = new WSCvifield(Maiinde_012,"SeqHitting");
	579	+ SeqHitting->initialize();
	580	+ SeqHitting->setPropertyV(WSNuserValue,(long)1);
	581	+ SeqHitting->setPropertyV(WSNname,"SeqHitting");
	582	+ SeqHitting->setPropertyV(WSNvis,(WSCbool)1);
	583	+ SeqHitting->setPropertyV(WSNx,(short)295);
	584	+ SeqHitting->setPropertyV(WSNy,(short)80);
	585	+ SeqHitting->setPropertyV(WSNwidth,(unsigned short)55);
	586	+ SeqHitting->setPropertyV(WSNheight,(unsigned short)25);
584	587
585		- Maivifi_005 = new WSCvifield(Maiinde_012,"Maivifi_005");
586		- Maivifi_005->initialize();
587		- Maivifi_005->setPropertyV(WSNuserValue,(long)1);
588		- Maivifi_005->setPropertyV(WSNname,"Maivifi_005");
589		- Maivifi_005->setPropertyV(WSNvis,(WSCbool)1);
590		- Maivifi_005->setPropertyV(WSNx,(short)270);
591		- Maivifi_005->setPropertyV(WSNy,(short)105);
592		- Maivifi_005->setPropertyV(WSNwidth,(unsigned short)80);
593		- Maivifi_005->setPropertyV(WSNheight,(unsigned short)25);
	588	+ SeqSoftDying = new WSCvifield(Maiinde_012,"SeqSoftDying");
	589	+ SeqSoftDying->initialize();
	590	+ SeqSoftDying->setPropertyV(WSNuserValue,(long)1);
	591	+ SeqSoftDying->setPropertyV(WSNname,"SeqSoftDying");
	592	+ SeqSoftDying->setPropertyV(WSNvis,(WSCbool)1);
	593	+ SeqSoftDying->setPropertyV(WSNx,(short)295);
	594	+ SeqSoftDying->setPropertyV(WSNy,(short)105);
	595	+ SeqSoftDying->setPropertyV(WSNwidth,(unsigned short)55);
	596	+ SeqSoftDying->setPropertyV(WSNheight,(unsigned short)25);
594	597
595		- Maivifi_006 = new WSCvifield(Maiinde_012,"Maivifi_006");
596		- Maivifi_006->initialize();
597		- Maivifi_006->setPropertyV(WSNuserValue,(long)1);
598		- Maivifi_006->setPropertyV(WSNname,"Maivifi_006");
599		- Maivifi_006->setPropertyV(WSNvis,(WSCbool)1);
600		- Maivifi_006->setPropertyV(WSNx,(short)270);
601		- Maivifi_006->setPropertyV(WSNy,(short)130);
602		- Maivifi_006->setPropertyV(WSNwidth,(unsigned short)80);
603		- Maivifi_006->setPropertyV(WSNheight,(unsigned short)25);
	598	+ SeqSoftDead = new WSCvifield(Maiinde_012,"SeqSoftDead");
	599	+ SeqSoftDead->initialize();
	600	+ SeqSoftDead->setPropertyV(WSNuserValue,(long)1);
	601	+ SeqSoftDead->setPropertyV(WSNname,"SeqSoftDead");
	602	+ SeqSoftDead->setPropertyV(WSNvis,(WSCbool)1);
	603	+ SeqSoftDead->setPropertyV(WSNx,(short)295);
	604	+ SeqSoftDead->setPropertyV(WSNy,(short)130);
	605	+ SeqSoftDead->setPropertyV(WSNwidth,(unsigned short)55);
	606	+ SeqSoftDead->setPropertyV(WSNheight,(unsigned short)25);
604	607
605		- Maivifi_007 = new WSCvifield(Maiinde_012,"Maivifi_007");
606		- Maivifi_007->initialize();
607		- Maivifi_007->setPropertyV(WSNuserValue,(long)1);
608		- Maivifi_007->setPropertyV(WSNname,"Maivifi_007");
609		- Maivifi_007->setPropertyV(WSNvis,(WSCbool)1);
610		- Maivifi_007->setPropertyV(WSNx,(short)270);
611		- Maivifi_007->setPropertyV(WSNy,(short)155);
612		- Maivifi_007->setPropertyV(WSNwidth,(unsigned short)80);
613		- Maivifi_007->setPropertyV(WSNheight,(unsigned short)25);
	608	+ SeqHardDying = new WSCvifield(Maiinde_012,"SeqHardDying");
	609	+ SeqHardDying->initialize();
	610	+ SeqHardDying->setPropertyV(WSNuserValue,(long)1);
	611	+ SeqHardDying->setPropertyV(WSNname,"SeqHardDying");
	612	+ SeqHardDying->setPropertyV(WSNvis,(WSCbool)1);
	613	+ SeqHardDying->setPropertyV(WSNx,(short)295);
	614	+ SeqHardDying->setPropertyV(WSNy,(short)155);
	615	+ SeqHardDying->setPropertyV(WSNwidth,(unsigned short)55);
	616	+ SeqHardDying->setPropertyV(WSNheight,(unsigned short)25);
614	617
615		- Maivifi_008 = new WSCvifield(Maiinde_012,"Maivifi_008");
616		- Maivifi_008->initialize();
617		- Maivifi_008->setPropertyV(WSNuserValue,(long)1);
618		- Maivifi_008->setPropertyV(WSNname,"Maivifi_008");
619		- Maivifi_008->setPropertyV(WSNvis,(WSCbool)1);
620		- Maivifi_008->setPropertyV(WSNx,(short)270);
621		- Maivifi_008->setPropertyV(WSNy,(short)180);
622		- Maivifi_008->setPropertyV(WSNwidth,(unsigned short)80);
623		- Maivifi_008->setPropertyV(WSNheight,(unsigned short)25);
	618	+ SeqHardDead = new WSCvifield(Maiinde_012,"SeqHardDead");
	619	+ SeqHardDead->initialize();
	620	+ SeqHardDead->setPropertyV(WSNuserValue,(long)1);
	621	+ SeqHardDead->setPropertyV(WSNname,"SeqHardDead");
	622	+ SeqHardDead->setPropertyV(WSNvis,(WSCbool)1);
	623	+ SeqHardDead->setPropertyV(WSNx,(short)295);
	624	+ SeqHardDead->setPropertyV(WSNy,(short)180);
	625	+ SeqHardDead->setPropertyV(WSNwidth,(unsigned short)55);
	626	+ SeqHardDead->setPropertyV(WSNheight,(unsigned short)25);
624	627
625		- Maivifi_009 = new WSCvifield(Maiinde_012,"Maivifi_009");
626		- Maivifi_009->initialize();
627		- Maivifi_009->setPropertyV(WSNuserValue,(long)1);
628		- Maivifi_009->setPropertyV(WSNname,"Maivifi_009");
629		- Maivifi_009->setPropertyV(WSNvis,(WSCbool)1);
630		- Maivifi_009->setPropertyV(WSNx,(short)270);
631		- Maivifi_009->setPropertyV(WSNy,(short)205);
632		- Maivifi_009->setPropertyV(WSNwidth,(unsigned short)80);
633		- Maivifi_009->setPropertyV(WSNheight,(unsigned short)25);
	628	+ SeqTeleportIn = new WSCvifield(Maiinde_012,"SeqTeleportIn");
	629	+ SeqTeleportIn->initialize();
	630	+ SeqTeleportIn->setPropertyV(WSNuserValue,(long)1);
	631	+ SeqTeleportIn->setPropertyV(WSNname,"SeqTeleportIn");
	632	+ SeqTeleportIn->setPropertyV(WSNvis,(WSCbool)1);
	633	+ SeqTeleportIn->setPropertyV(WSNx,(short)295);
	634	+ SeqTeleportIn->setPropertyV(WSNy,(short)205);
	635	+ SeqTeleportIn->setPropertyV(WSNwidth,(unsigned short)55);
	636	+ SeqTeleportIn->setPropertyV(WSNheight,(unsigned short)25);
634	637
635		- Maivifi_010 = new WSCvifield(Maiinde_012,"Maivifi_010");
636		- Maivifi_010->initialize();
637		- Maivifi_010->setPropertyV(WSNuserValue,(long)1);
638		- Maivifi_010->setPropertyV(WSNname,"Maivifi_010");
639		- Maivifi_010->setPropertyV(WSNvis,(WSCbool)1);
640		- Maivifi_010->setPropertyV(WSNx,(short)270);
641		- Maivifi_010->setPropertyV(WSNy,(short)230);
642		- Maivifi_010->setPropertyV(WSNwidth,(unsigned short)80);
643		- Maivifi_010->setPropertyV(WSNheight,(unsigned short)25);
	638	+ SeqTeleportOut = new WSCvifield(Maiinde_012,"SeqTeleportOut");
	639	+ SeqTeleportOut->initialize();
	640	+ SeqTeleportOut->setPropertyV(WSNuserValue,(long)1);
	641	+ SeqTeleportOut->setPropertyV(WSNname,"SeqTeleportOut");
	642	+ SeqTeleportOut->setPropertyV(WSNvis,(WSCbool)1);
	643	+ SeqTeleportOut->setPropertyV(WSNx,(short)295);
	644	+ SeqTeleportOut->setPropertyV(WSNy,(short)230);
	645	+ SeqTeleportOut->setPropertyV(WSNwidth,(unsigned short)55);
	646	+ SeqTeleportOut->setPropertyV(WSNheight,(unsigned short)25);
644	647
645	648	Maivlab_005 = new WSCvlabel(Maiinde_012,"Maivlab_005");
646	649	Maivlab_005->initialize();

		@@ -766,11 +769,11 @@
766	769	Maivlab_029 = new WSCvlabel(Maiinde_012,"Maivlab_029");
767	770	Maivlab_029->initialize();
768	771	Maivlab_029->setPropertyV(WSNuserValue,(long)1);
769		- Maivlab_029->setPropertyV(WSNlabelString,"Teleport Out");
	772	+ Maivlab_029->setPropertyV(WSNlabelString,"ImpactEffect");
770	773	Maivlab_029->setPropertyV(WSNname,"Maivlab_029");
771	774	Maivlab_029->setPropertyV(WSNvis,(WSCbool)1);
772		- Maivlab_029->setPropertyV(WSNx,(short)180);
773		- Maivlab_029->setPropertyV(WSNy,(short)255);
	775	+ Maivlab_029->setPropertyV(WSNx,(short)350);
	776	+ Maivlab_029->setPropertyV(WSNy,(short)280);
774	777	Maivlab_029->setPropertyV(WSNwidth,(unsigned short)90);
775	778	Maivlab_029->setPropertyV(WSNheight,(unsigned short)25);
776	779

		@@ -777,11 +780,11 @@
777	780	Maivlab_035 = new WSCvlabel(Maiinde_012,"Maivlab_035");
778	781	Maivlab_035->initialize();
779	782	Maivlab_035->setPropertyV(WSNuserValue,(long)1);
780		- Maivlab_035->setPropertyV(WSNlabelString,"Teleport Out");
	783	+ Maivlab_035->setPropertyV(WSNlabelString,"MeleeEffect");
781	784	Maivlab_035->setPropertyV(WSNname,"Maivlab_035");
782	785	Maivlab_035->setPropertyV(WSNvis,(WSCbool)1);
783		- Maivlab_035->setPropertyV(WSNx,(short)180);
784		- Maivlab_035->setPropertyV(WSNy,(short)280);
	786	+ Maivlab_035->setPropertyV(WSNx,(short)350);
	787	+ Maivlab_035->setPropertyV(WSNy,(short)305);
785	788	Maivlab_035->setPropertyV(WSNwidth,(unsigned short)90);
786	789	Maivlab_035->setPropertyV(WSNheight,(unsigned short)25);
787	790

		@@ -788,11 +791,11 @@
788	791	Maivlab_036 = new WSCvlabel(Maiinde_012,"Maivlab_036");
789	792	Maivlab_036->initialize();
790	793	Maivlab_036->setPropertyV(WSNuserValue,(long)1);
791		- Maivlab_036->setPropertyV(WSNlabelString,"Teleport Out");
	794	+ Maivlab_036->setPropertyV(WSNlabelString,"ContrailEffect");
792	795	Maivlab_036->setPropertyV(WSNname,"Maivlab_036");
793	796	Maivlab_036->setPropertyV(WSNvis,(WSCbool)1);
794		- Maivlab_036->setPropertyV(WSNx,(short)180);
795		- Maivlab_036->setPropertyV(WSNy,(short)305);
	797	+ Maivlab_036->setPropertyV(WSNx,(short)350);
	798	+ Maivlab_036->setPropertyV(WSNy,(short)330);
796	799	Maivlab_036->setPropertyV(WSNwidth,(unsigned short)90);
797	800	Maivlab_036->setPropertyV(WSNheight,(unsigned short)25);
798	801

		@@ -1026,7 +1029,6 @@
1026	1029	SpeedCombo->setPropertyV(WSNvis,(WSCbool)1);
1027	1030	SpeedCombo->setPropertyV(WSNx,(short)175);
1028	1031	SpeedCombo->setPropertyV(WSNy,(short)380);
1029		- SpeedCombo->setPropertyV(WSNwidth,(unsigned short)80);
1030	1032	SpeedCombo->setPropertyV(WSNheight,(unsigned short)25);
1031	1033
1032	1034	IntelligenceCombo = new WSCoption(Maiinde_012,"IntelligenceCombo");

		@@ -1033,8 +1035,8 @@
1033	1035	IntelligenceCombo->initialize();
1034	1036	IntelligenceCombo->setPropertyV(WSNuserValue,(long)1);
1035	1037	IntelligenceCombo->setPropertyV(WSNmenuItems,"Low:1:ep1_name,Average:2:ep2_name,High:3:ep3_name");
1036		- IntelligenceCombo->setPropertyV(WSNvalue,(long)3);
1037		- IntelligenceCombo->setPropertyV(WSNlabelString,"High");
	1038	+ IntelligenceCombo->setPropertyV(WSNvalue,(long)1);
	1039	+ IntelligenceCombo->setPropertyV(WSNlabelString,"Low");
1038	1040	IntelligenceCombo->setPropertyV(WSNname,"IntelligenceCombo");
1039	1041	IntelligenceCombo->setPropertyV(WSNvis,(WSCbool)1);
1040	1042	IntelligenceCombo->setPropertyV(WSNx,(short)95);

		@@ -1054,15 +1056,15 @@
1054	1056	CollectionBtn->setPropertyV(WSNwidth,(unsigned short)80);
1055	1057	CollectionBtn->setPropertyV(WSNheight,(unsigned short)25);
1056	1058
1057		- Maivbtn_022 = new WSCvbtn(Maiinde_012,"Maivbtn_022");
1058		- Maivbtn_022->initialize();
1059		- Maivbtn_022->setPropertyV(WSNuserValue,(long)1);
1060		- Maivbtn_022->setPropertyV(WSNname,"Maivbtn_022");
1061		- Maivbtn_022->setPropertyV(WSNvis,(WSCbool)1);
1062		- Maivbtn_022->setPropertyV(WSNx,(short)95);
1063		- Maivbtn_022->setPropertyV(WSNy,(short)280);
1064		- Maivbtn_022->setPropertyV(WSNwidth,(unsigned short)80);
1065		- Maivbtn_022->setPropertyV(WSNheight,(unsigned short)25);
	1059	+ CarryItemBtn = new WSCvbtn(Maiinde_012,"CarryItemBtn");
	1060	+ CarryItemBtn->initialize();
	1061	+ CarryItemBtn->setPropertyV(WSNuserValue,(long)1);
	1062	+ CarryItemBtn->setPropertyV(WSNname,"CarryItemBtn");
	1063	+ CarryItemBtn->setPropertyV(WSNvis,(WSCbool)1);
	1064	+ CarryItemBtn->setPropertyV(WSNx,(short)95);
	1065	+ CarryItemBtn->setPropertyV(WSNy,(short)280);
	1066	+ CarryItemBtn->setPropertyV(WSNwidth,(unsigned short)110);
	1067	+ CarryItemBtn->setPropertyV(WSNheight,(unsigned short)25);
1066	1068
1067	1069	Maivbtn_023 = new WSCvbtn(Maiinde_012,"Maivbtn_023");
1068	1070	Maivbtn_023->initialize();

		@@ -1071,7 +1073,7 @@
1071	1073	Maivbtn_023->setPropertyV(WSNvis,(WSCbool)1);
1072	1074	Maivbtn_023->setPropertyV(WSNx,(short)450);
1073	1075	Maivbtn_023->setPropertyV(WSNy,(short)55);
1074		- Maivbtn_023->setPropertyV(WSNwidth,(unsigned short)80);
	1076	+ Maivbtn_023->setPropertyV(WSNwidth,(unsigned short)95);
1075	1077	Maivbtn_023->setPropertyV(WSNheight,(unsigned short)25);
1076	1078
1077	1079	Maivbtn_024 = new WSCvbtn(Maiinde_012,"Maivbtn_024");

		@@ -1081,7 +1083,7 @@
1081	1083	Maivbtn_024->setPropertyV(WSNvis,(WSCbool)1);
1082	1084	Maivbtn_024->setPropertyV(WSNx,(short)450);
1083	1085	Maivbtn_024->setPropertyV(WSNy,(short)80);
1084		- Maivbtn_024->setPropertyV(WSNwidth,(unsigned short)80);
	1086	+ Maivbtn_024->setPropertyV(WSNwidth,(unsigned short)95);
1085	1087	Maivbtn_024->setPropertyV(WSNheight,(unsigned short)25);
1086	1088
1087	1089	Maivbtn_025 = new WSCvbtn(Maiinde_012,"Maivbtn_025");

		@@ -1091,7 +1093,7 @@
1091	1093	Maivbtn_025->setPropertyV(WSNvis,(WSCbool)1);
1092	1094	Maivbtn_025->setPropertyV(WSNx,(short)450);
1093	1095	Maivbtn_025->setPropertyV(WSNy,(short)105);
1094		- Maivbtn_025->setPropertyV(WSNwidth,(unsigned short)80);
	1096	+ Maivbtn_025->setPropertyV(WSNwidth,(unsigned short)95);
1095	1097	Maivbtn_025->setPropertyV(WSNheight,(unsigned short)25);
1096	1098
1097	1099	Maivbtn_026 = new WSCvbtn(Maiinde_012,"Maivbtn_026");

		@@ -1101,7 +1103,7 @@
1101	1103	Maivbtn_026->setPropertyV(WSNvis,(WSCbool)1);
1102	1104	Maivbtn_026->setPropertyV(WSNx,(short)450);
1103	1105	Maivbtn_026->setPropertyV(WSNy,(short)130);
1104		- Maivbtn_026->setPropertyV(WSNwidth,(unsigned short)80);
	1106	+ Maivbtn_026->setPropertyV(WSNwidth,(unsigned short)95);
1105	1107	Maivbtn_026->setPropertyV(WSNheight,(unsigned short)25);
1106	1108
1107	1109	Maivbtn_027 = new WSCvbtn(Maiinde_012,"Maivbtn_027");

		@@ -1111,7 +1113,7 @@
1111	1113	Maivbtn_027->setPropertyV(WSNvis,(WSCbool)1);
1112	1114	Maivbtn_027->setPropertyV(WSNx,(short)450);
1113	1115	Maivbtn_027->setPropertyV(WSNy,(short)155);
1114		- Maivbtn_027->setPropertyV(WSNwidth,(unsigned short)80);
	1116	+ Maivbtn_027->setPropertyV(WSNwidth,(unsigned short)95);
1115	1117	Maivbtn_027->setPropertyV(WSNheight,(unsigned short)25);
1116	1118
1117	1119	Maivbtn_028 = new WSCvbtn(Maiinde_012,"Maivbtn_028");

		@@ -1121,7 +1123,7 @@
1121	1123	Maivbtn_028->setPropertyV(WSNvis,(WSCbool)1);
1122	1124	Maivbtn_028->setPropertyV(WSNx,(short)450);
1123	1125	Maivbtn_028->setPropertyV(WSNy,(short)180);
1124		- Maivbtn_028->setPropertyV(WSNwidth,(unsigned short)80);
	1126	+ Maivbtn_028->setPropertyV(WSNwidth,(unsigned short)95);
1125	1127	Maivbtn_028->setPropertyV(WSNheight,(unsigned short)25);
1126	1128
1127	1129	Maivbtn_029 = new WSCvbtn(Maiinde_012,"Maivbtn_029");

		@@ -1131,7 +1133,7 @@
1131	1133	Maivbtn_029->setPropertyV(WSNvis,(WSCbool)1);
1132	1134	Maivbtn_029->setPropertyV(WSNx,(short)450);
1133	1135	Maivbtn_029->setPropertyV(WSNy,(short)205);
1134		- Maivbtn_029->setPropertyV(WSNwidth,(unsigned short)80);
	1136	+ Maivbtn_029->setPropertyV(WSNwidth,(unsigned short)95);
1135	1137	Maivbtn_029->setPropertyV(WSNheight,(unsigned short)25);
1136	1138
1137	1139	Maivbtn_030 = new WSCvbtn(Maiinde_012,"Maivbtn_030");

		@@ -1141,7 +1143,7 @@
1141	1143	Maivbtn_030->setPropertyV(WSNvis,(WSCbool)1);
1142	1144	Maivbtn_030->setPropertyV(WSNx,(short)450);
1143	1145	Maivbtn_030->setPropertyV(WSNy,(short)230);
1144		- Maivbtn_030->setPropertyV(WSNwidth,(unsigned short)80);
	1146	+ Maivbtn_030->setPropertyV(WSNwidth,(unsigned short)95);
1145	1147	Maivbtn_030->setPropertyV(WSNheight,(unsigned short)25);
1146	1148
1147	1149	ClassCombo = new WSCoption(Maiinde_012,"ClassCombo");

		@@ -1153,9 +1155,39 @@
1153	1155	ClassCombo->setPropertyV(WSNvis,(WSCbool)1);
1154	1156	ClassCombo->setPropertyV(WSNx,(short)95);
1155	1157	ClassCombo->setPropertyV(WSNy,(short)105);
1156		- ClassCombo->setPropertyV(WSNwidth,(unsigned short)80);
	1158	+ ClassCombo->setPropertyV(WSNwidth,(unsigned short)110);
1157	1159	ClassCombo->setPropertyV(WSNheight,(unsigned short)25);
1158	1160
	1161	+ Maivbtn_000 = new WSCvbtn(Maiinde_012,"Maivbtn_000");
	1162	+ Maivbtn_000->initialize();
	1163	+ Maivbtn_000->setPropertyV(WSNuserValue,(long)1);
	1164	+ Maivbtn_000->setPropertyV(WSNname,"Maivbtn_000");
	1165	+ Maivbtn_000->setPropertyV(WSNvis,(WSCbool)1);
	1166	+ Maivbtn_000->setPropertyV(WSNx,(short)440);
	1167	+ Maivbtn_000->setPropertyV(WSNy,(short)280);
	1168	+ Maivbtn_000->setPropertyV(WSNwidth,(unsigned short)90);
	1169	+ Maivbtn_000->setPropertyV(WSNheight,(unsigned short)25);
	1170	+
	1171	+ Maivbtn_001 = new WSCvbtn(Maiinde_012,"Maivbtn_001");
	1172	+ Maivbtn_001->initialize();
	1173	+ Maivbtn_001->setPropertyV(WSNuserValue,(long)1);
	1174	+ Maivbtn_001->setPropertyV(WSNname,"Maivbtn_001");
	1175	+ Maivbtn_001->setPropertyV(WSNvis,(WSCbool)1);
	1176	+ Maivbtn_001->setPropertyV(WSNx,(short)440);
	1177	+ Maivbtn_001->setPropertyV(WSNy,(short)305);
	1178	+ Maivbtn_001->setPropertyV(WSNwidth,(unsigned short)90);
	1179	+ Maivbtn_001->setPropertyV(WSNheight,(unsigned short)25);
	1180	+
	1181	+ Maivbtn_002 = new WSCvbtn(Maiinde_012,"Maivbtn_002");
	1182	+ Maivbtn_002->initialize();
	1183	+ Maivbtn_002->setPropertyV(WSNuserValue,(long)1);
	1184	+ Maivbtn_002->setPropertyV(WSNname,"Maivbtn_002");
	1185	+ Maivbtn_002->setPropertyV(WSNvis,(WSCbool)1);
	1186	+ Maivbtn_002->setPropertyV(WSNx,(short)440);
	1187	+ Maivbtn_002->setPropertyV(WSNy,(short)330);
	1188	+ Maivbtn_002->setPropertyV(WSNwidth,(unsigned short)90);
	1189	+ Maivbtn_002->setPropertyV(WSNheight,(unsigned short)25);
	1190	+
1159	1191	ListMonsterType = new WSClist(WndMonster,"ListMonsterType");
1160	1192	ListMonsterType->initialize();
1161	1193	ListMonsterType->setPropertyV(WSNtitleString,"");

--- marathon/trunk/PhysicsEditorWS/src/General.h (revision 233)

+++ marathon/trunk/PhysicsEditorWS/src/General.h (revision 234)

		@@ -64,13 +64,28 @@
64	64
65	65	//stock names
66	66	extern std::vector<std::string> stockCollections;
	67	+extern std::vector<std::string> stockMonsterClasses;
67	68	extern std::vector<std::string> stockSpeeds;
68		-extern std::vector<std::string> stockMonsterClasses;
69	69	extern std::vector<std::string> stockItemTypes;
	70	+extern std::vector<std::string> stockEffects;
	71	+extern std::vector<std::string> stockProjectiles;
	72	+extern std::vector<std::string> stockSounds;
	73	+extern std::vector<std::string> stockDamages;
	74	+extern std::vector<std::string> stockMonsterActivates;
	75	+extern std::vector<std::string> stockMonsterDoorRetryMasks;
	76	+extern std::vector<std::string> stockWeaponClasses;
	77	+extern std::vector<std::string> stockShellCasingTypes;
	78	+extern std::vector<std::string> stockPhysicsTypes;
70	79
71	80	//index-value
72	81	extern int valueSpeed[NUMBER_OF_SPEED_INFORMATIONS];
73	82	extern int valueMonsterClasses[NUMBER_OF_CLASS_INFORMATIONS];
	83	+extern int valueIntelligences[NUMBER_OF_MONSTER_INTELLIGENCE_INFORMATIONS];
	84	+extern int valueMonsterDoorRetryMask[NUMBER_OF_MONSTER_DOOR_RETRY_MASK_INFORMATIONS];
	85	+extern int valueMonsterFlags[NUMBER_OF_MONSTER_FLAG_INFORMATIONS];
	86	+extern int valueEffectFlags[NUMBER_OF_EFFECT_FLAG_INFORMATIONS];
	87	+extern int valueWeaponFlags[NUMBER_OF_WEAPON_FLAG_INFORMATIONS];
	88	+extern int valueProjectileFlags[NUMBER_OF_PROJECTILE_FLAG_INFORMATIONS];
74	89
75	90	void setDefinitionsToDefault();
76	91	void setupDialog(WSCbase* object);

旧リポジトリブラウザで表示

Marathon JP ForkAortaShapeFusion

marathon: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

Marathon JP
Fork
Aorta
ShapeFusion