• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン468 (tree)
日時2007-09-05 10:49:23
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAttackPanel.cpp (revision 467)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAttackPanel.cpp (revision 468)
@@ -1,5 +1,6 @@
11 #include "MonsterAttackPanel.h"
22 #include "../PhysicsEditorOneWX.h"
3+#include "../MonsterTypeSelectDialog.h"
34
45 enum{
56 ID_FREQUENCY,
@@ -177,62 +178,120 @@
177178 }
178179 void MonsterAttackPanel::OnFrequency(wxCommandEvent& ev)
179180 {
181+ int type = wxGetApp().getEditingMonsterIndex();
182+ monster_definitions[type].attack_frequency = getNumberFromTextCtrl(&ev);
180183 }
181184
182185 void MonsterAttackPanel::OnMeleeType(wxCommandEvent& ev)
183186 {
187+ int type = wxGetApp().getEditingMonsterIndex();
188+ monster_definitions[type].melee_attack.type = getChoice(&ev, NUMBER_OF_PROJECTILE_TYPES);
184189 }
185190 void MonsterAttackPanel::OnMeleeRep(wxCommandEvent& ev)
186191 {
192+ int type = wxGetApp().getEditingMonsterIndex();
193+ monster_definitions[type].melee_attack.repetitions = getNumberFromTextCtrl(&ev);
187194 }
188195 void MonsterAttackPanel::OnMeleeError(wxCommandEvent& ev)
189196 {
197+ int type = wxGetApp().getEditingMonsterIndex();
198+ monster_definitions[type].melee_attack.error = getNumberFromTextCtrl(&ev);
190199 }
191200 void MonsterAttackPanel::OnMeleeRange(wxCommandEvent& ev)
192201 {
202+ int type = wxGetApp().getEditingMonsterIndex();
203+ monster_definitions[type].melee_attack.range = getNumberFromTextCtrl(&ev);
193204 }
194205 void MonsterAttackPanel::OnMeleeSequence(wxCommandEvent& ev)
195206 {
207+ int type = wxGetApp().getEditingMonsterIndex();
208+ monster_definitions[type].melee_attack.attack_shape = getNumberFromTextCtrl(&ev);
196209 }
197210 void MonsterAttackPanel::OnMeleeDX(wxCommandEvent& ev)
198211 {
212+ int type = wxGetApp().getEditingMonsterIndex();
213+ monster_definitions[type].melee_attack.dx = getNumberFromTextCtrl(&ev);
199214 }
200215 void MonsterAttackPanel::OnMeleeDY(wxCommandEvent& ev)
201216 {
217+ int type = wxGetApp().getEditingMonsterIndex();
218+ monster_definitions[type].melee_attack.dy = getNumberFromTextCtrl(&ev);
202219 }
203220 void MonsterAttackPanel::OnMeleeDZ(wxCommandEvent& ev)
204221 {
222+ int type = wxGetApp().getEditingMonsterIndex();
223+ monster_definitions[type].melee_attack.dz = getNumberFromTextCtrl(&ev);
205224 }
206225 void MonsterAttackPanel::OnMeleeCopyFrom(wxCommandEvent& ev)
207226 {
227+ //TODO
228+ MonsterTypeSelectDialog* dlg = new MonsterTypeSelectDialog(this, wxID_ANY);
229+ if(dlg->ShowModal() == wxID_OK){
230+ int index = dlg->getIndex();
231+ //
232+ monster_definition* def = wxGetApp().getDefaultValues()->getMonsterDefinition(index);
233+ int type = wxGetApp().getEditingMonsterIndex();
234+ //関連だけコピー
235+ memcpy(&monster_definitions[type].melee_attack,
236+ &def->melee_attack, sizeof(attack_definition));
237+ setup();
238+ }
208239 }
209240
210241 void MonsterAttackPanel::OnRangedType(wxCommandEvent& ev)
211242 {
243+ int type = wxGetApp().getEditingMonsterIndex();
244+ monster_definitions[type].ranged_attack.type = getChoice(&ev, NUMBER_OF_PROJECTILE_TYPES);
212245 }
213246 void MonsterAttackPanel::OnRangedRep(wxCommandEvent& ev)
214247 {
248+ int type = wxGetApp().getEditingMonsterIndex();
249+ monster_definitions[type].ranged_attack.repetitions = getNumberFromTextCtrl(&ev);
215250 }
216251 void MonsterAttackPanel::OnRangedError(wxCommandEvent& ev)
217252 {
253+ int type = wxGetApp().getEditingMonsterIndex();
254+ monster_definitions[type].ranged_attack.error = getNumberFromTextCtrl(&ev);
218255 }
219256 void MonsterAttackPanel::OnRangedRange(wxCommandEvent& ev)
220257 {
258+ int type = wxGetApp().getEditingMonsterIndex();
259+ monster_definitions[type].ranged_attack.range = getNumberFromTextCtrl(&ev);
221260 }
222261 void MonsterAttackPanel::OnRangedSequence(wxCommandEvent& ev)
223262 {
263+ int type = wxGetApp().getEditingMonsterIndex();
264+ monster_definitions[type].ranged_attack.attack_shape = getNumberFromTextCtrl(&ev);
224265 }
225266 void MonsterAttackPanel::OnRangedDX(wxCommandEvent& ev)
226267 {
268+ int type = wxGetApp().getEditingMonsterIndex();
269+ monster_definitions[type].ranged_attack.dx = getNumberFromTextCtrl(&ev);
227270 }
228271 void MonsterAttackPanel::OnRangedDY(wxCommandEvent& ev)
229272 {
273+ int type = wxGetApp().getEditingMonsterIndex();
274+ monster_definitions[type].ranged_attack.dy = getNumberFromTextCtrl(&ev);
230275 }
231276 void MonsterAttackPanel::OnRangedDZ(wxCommandEvent& ev)
232277 {
278+ int type = wxGetApp().getEditingMonsterIndex();
279+ monster_definitions[type].ranged_attack.dz = getNumberFromTextCtrl(&ev);
233280 }
234281 void MonsterAttackPanel::OnRangedCopyFrom(wxCommandEvent& ev)
235282 {
283+ //TODO
284+ MonsterTypeSelectDialog* dlg = new MonsterTypeSelectDialog(this, wxID_ANY);
285+ if(dlg->ShowModal() == wxID_OK){
286+ int index = dlg->getIndex();
287+ //
288+ monster_definition* def = wxGetApp().getDefaultValues()->getMonsterDefinition(index);
289+ int type = wxGetApp().getEditingMonsterIndex();
290+ //関連だけコピー
291+ memcpy(&monster_definitions[type].ranged_attack,
292+ &def->ranged_attack, sizeof(attack_definition));
293+ setup();
294+ }
236295 }
237296
238297 void MonsterAttackPanel::setup()
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAppearancePanel.cpp (revision 467)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/panel/MonsterAppearancePanel.cpp (revision 468)
@@ -1,5 +1,6 @@
11 #include "MonsterAppearancePanel.h"
22 #include "../PhysicsEditorOneWX.h"
3+#include "../MonsterTypeSelectDialog.h"
34
45 enum{
56 ID_COLLECTION,
@@ -141,7 +142,7 @@
141142 this->speedText = new wxTextCtrl(this, ID_SPEED_TEXT);
142143 this->speedChoice = new wxChoice(this, ID_SPEED_CHOICE);
143144 this->gravityText = new wxTextCtrl(this, ID_GRAVITY);
144-
145+ this->paletteText->SetSize(wxSize(100,-1));
145146 //sequences
146147 this->stationalyText = new wxTextCtrl(this, ID_STATIONALY);
147148 this->movingText = new wxTextCtrl(this, ID_MOVING);
@@ -258,7 +259,7 @@
258259 infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Collection")));
259260 infoSizer->Add(this->collectionChoice);
260261 infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Palette")));
261- infoSizer->Add(this->paletteText);
262+ infoSizer->Add(this->paletteText,0,0,0,0);
262263 infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Vitality")));
263264 infoSizer->Add(this->vitalityText);
264265 infoSizer->Add(new wxStaticText(this, wxID_ANY, _T("Class")));
@@ -593,6 +594,68 @@
593594 void MonsterAppearancePanel::OnCopyFrom(wxCommandEvent& ev)
594595 {
595596 //TODO
597+ MonsterTypeSelectDialog* dlg = new MonsterTypeSelectDialog(this, wxID_ANY);
598+ if(dlg->ShowModal() == wxID_OK){
599+ int index = dlg->getIndex();
600+ //
601+ monster_definition* def = wxGetApp().getDefaultValues()->getMonsterDefinition(index);
602+ int type = wxGetApp().getEditingMonsterIndex();
603+ //アピアランス関連だけコピー
604+ monster_definitions[type].collection = def->collection;
605+ monster_definitions[type].vitality = def->vitality;
606+ monster_definitions[type]._class = def->_class;
607+ monster_definitions[type].radius = def->radius;
608+ monster_definitions[type].height = def->height;
609+ monster_definitions[type].preferred_hover_height = def->preferred_hover_height;
610+ monster_definitions[type].minimum_ledge_delta = def->minimum_ledge_delta;
611+ monster_definitions[type].maximum_ledge_delta = def->maximum_ledge_delta;
612+ monster_definitions[type].external_velocity_scale = def->external_velocity_scale;
613+ monster_definitions[type].carrying_item_type = def->carrying_item_type;
614+ monster_definitions[type].half_visual_arc = def->half_visual_arc;
615+ monster_definitions[type].half_vertical_visual_arc = def->half_vertical_visual_arc;
616+ monster_definitions[type].intelligence = def->intelligence;
617+ monster_definitions[type].speed = def->speed;
618+ monster_definitions[type].gravity = def->gravity;
619+
620+ monster_definitions[type].stationary_shape = def->stationary_shape;
621+ monster_definitions[type].moving_shape = def->moving_shape;
622+ monster_definitions[type].hit_shapes = def->hit_shapes;
623+ monster_definitions[type].soft_dying_shape = def->soft_dying_shape;
624+ monster_definitions[type].soft_dead_shapes = def->soft_dead_shapes;
625+ monster_definitions[type].hard_dying_shape = def->hard_dying_shape;
626+ monster_definitions[type].hard_dead_shapes = def->hard_dead_shapes;
627+ monster_definitions[type].teleport_in_shape = def->teleport_in_shape;
628+ monster_definitions[type].teleport_out_shape = def->teleport_out_shape;
629+
630+ monster_definitions[type].shrapnel_damage.type = def->shrapnel_damage.type;
631+ monster_definitions[type].shrapnel_damage.base = def->shrapnel_damage.base;
632+ monster_definitions[type].shrapnel_radius = def->shrapnel_radius;
633+ monster_definitions[type].shrapnel_damage.random = def->shrapnel_damage.random;
634+ monster_definitions[type].shrapnel_damage.scale = def->shrapnel_damage.scale;
635+ monster_definitions[type].shrapnel_damage.flags = def->shrapnel_damage.flags;
636+
637+ monster_definitions[type].sound_pitch = def->sound_pitch;
638+ monster_definitions[type].activation_sound = def->activation_sound;
639+ monster_definitions[type].friendly_activation_sound = def->friendly_activation_sound;
640+ monster_definitions[type].clear_sound = def->clear_sound;
641+ monster_definitions[type].kill_sound = def->kill_sound;
642+ monster_definitions[type].apology_sound = def->apology_sound;
643+ monster_definitions[type].friendly_fire_sound = def->friendly_fire_sound;
644+ monster_definitions[type].flaming_sound = def->flaming_sound;
645+ monster_definitions[type].random_sound = def->random_sound;
646+ monster_definitions[type].random_sound_mask = def->random_sound_mask;
647+
648+ monster_definitions[type].impact_effect = def->impact_effect;
649+ monster_definitions[type].melee_impact_effect = def->melee_impact_effect;
650+ monster_definitions[type].contrail_effect = def->contrail_effect;
651+
652+ monster_definitions[type].door_retry_mask = def->door_retry_mask;
653+ /* memcpy(&monster_definitions[wxGetApp().getEditingMonsterIndex()],
654+ wxGetApp().getDefaultValues()->getMonsterDefinition(index),
655+ sizeof(monster_definition));
656+ */
657+ setup();
658+ }
596659 }
597660
598661
@@ -749,7 +812,7 @@
749812 shrapnelIsAlienCheckbox->SetValue(monster_definitions[type].shrapnel_damage.flags != 0);
750813
751814 //sound
752- soundPitchText->SetValue(wx::string::getString("%d", monster_definitions[type].teleport_out_shape));
815+ soundPitchText->SetValue(wx::string::getString("%d", monster_definitions[type].sound_pitch));
753816 setChoice(soundActivationChoice, monster_definitions[type].activation_sound, NUMBER_OF_SOUND_DEFINITIONS);
754817 setChoice(soundFriendActChoice, monster_definitions[type].friendly_activation_sound, NUMBER_OF_SOUND_DEFINITIONS);
755818 setChoice(soundClearChoice, monster_definitions[type].clear_sound, NUMBER_OF_SOUND_DEFINITIONS);
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/MonsterTypeSelectDialog.h (nonexistent)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/MonsterTypeSelectDialog.h (revision 468)
@@ -0,0 +1,23 @@
1+#ifndef _MONSTER_TYPE_SELECT_DIALOG_
2+#define _MONSTER_TYPE_SELECT_DIALOG_
3+
4+#include "Common.h"
5+
6+class MonsterTypeSelectDialog:public wxDialog{
7+private:
8+ wxListBox* typeListBox;
9+ wxButton* okButton;
10+ wxButton* cancelButton;
11+private:
12+ MonsterTypeSelectDialog(){}
13+public:
14+ MonsterTypeSelectDialog(wxWindow* parent, wxWindowID id);
15+ virtual ~MonsterTypeSelectDialog();
16+ DECLARE_EVENT_TABLE()
17+ void OnOk(wxCommandEvent& ev);
18+ void OnCancel(wxCommandEvent& ev);
19+public:
20+ int getIndex();
21+};
22+
23+#endif
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/MonsterTypeSelectDialog.cpp (nonexistent)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/src/MonsterTypeSelectDialog.cpp (revision 468)
@@ -0,0 +1,61 @@
1+#include "MonsterTypeSelectDialog.h"
2+#include "PhysicsEditorOneWX.h"
3+
4+BEGIN_EVENT_TABLE(MonsterTypeSelectDialog, wxDialog)
5+ EVT_BUTTON(wxID_OK, MonsterTypeSelectDialog::OnOk)
6+ EVT_BUTTON(wxID_CANCEL, MonsterTypeSelectDialog::OnCancel)
7+END_EVENT_TABLE()
8+
9+wxString title = wxString(_T("Monster select"));
10+
11+MonsterTypeSelectDialog::MonsterTypeSelectDialog(wxWindow* parent, wxWindowID id):
12+wxDialog(parent, id, title)
13+{
14+ this->typeListBox = new wxListBox(this, wxID_ANY);
15+ this->okButton = new wxButton(this, wxID_OK, _T("OK"));
16+ this->cancelButton = new wxButton(this, wxID_CANCEL, _T("Cancel"));
17+
18+ //set/add
19+ for(int i = 0; i < NUMBER_OF_MONSTER_TYPES; i ++){
20+ this->typeListBox->Insert(wxConvertMB2WX(wxGetApp().monsterInfo[i].jname.c_str()), i);
21+ }
22+
23+ //layout
24+ wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL);
25+
26+ wxFlexGridSizer* allSizer = new wxFlexGridSizer(2,1,0,0);
27+ wxFlexGridSizer* buttonSizer = new wxFlexGridSizer(1,2,0,0);
28+ allSizer->Add(this->typeListBox,wxEXPAND,0,0);
29+ buttonSizer->Add(this->typeListBox,wxEXPAND,0,0);
30+ buttonSizer->Add(this->typeListBox,wxEXPAND,0,0);
31+ allSizer->Add(buttonSizer);
32+
33+ boxSizer->Add(allSizer);
34+ this->SetSizer(boxSizer);
35+ boxSizer->Fit(this);
36+ Layout();
37+}
38+MonsterTypeSelectDialog::~MonsterTypeSelectDialog()
39+{
40+}
41+void MonsterTypeSelectDialog::OnOk(wxCommandEvent& ev)
42+{
43+ int index = this->typeListBox->GetSelection();
44+ if(index >= 0 && index < NUMBER_OF_MONSTER_TYPES){
45+ SetReturnCode(wxID_OK);
46+ Destroy();
47+ }else{
48+ wxCommandEvent dummy;
49+ OnCancel(dummy);
50+ }
51+}
52+void MonsterTypeSelectDialog::OnCancel(wxCommandEvent& ev)
53+{
54+ SetReturnCode(wxID_CANCEL);
55+ Destroy();
56+}
57+
58+int MonsterTypeSelectDialog::getIndex()
59+{
60+ return this->typeListBox->GetSelection();
61+}
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/data/Sounds.txt (revision 467)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/data/Sounds.txt (revision 468)
@@ -1,180 +1,180 @@
11 startup
2-teleport_in
3-teleport_out
4-body_being_crunched
2+teleport in
3+teleport out
4+body being crunched
55 creak
66 absorbed
77
88 breathing
9-oxygen_warning
9+oxygen warning
1010 suffocation
1111
12-energy_refuel
13-oxygen_refuel
14-cant_toggle_switch
15-switch_on
16-switch_off
17-puzzle_switch
18-chip_insertion
19-pattern_buffer
20-destroy_control_panel
12+energy refuel
13+oxygen refuel
14+cant toggle switch
15+switch on
16+switch off
17+puzzle switch
18+chip insertion
19+pattern buffer
20+destroy control panel
2121
22-adjust_volume
23-got_powerup
24-got_item
22+adjust volume
23+got powerup
24+got item
2525
26-bullet_ricochet
27-metallic_ricochet
28-empty_gun
26+bullet ricochet
27+metallic ricochet
28+empty gun
2929
30-spht_door_opening
31-spht_door_closing
32-spht_door_obstructed
30+spht door opening
31+spht door closing
32+spht door obstructed
3333
34-spht_platform_starting
35-spht_platform_stopping
34+spht platform starting
35+spht platform stopping
3636
3737 owl
38-smg_firing
39-smg_reloading
38+smg firing
39+smg reloading
4040
41-heavy_spht_platform_starting
42-heavy_spht_platform_stopping
41+heavy spht platform starting
42+heavy spht platform stopping
4343
44-fist_hitting
44+fist hitting
4545
46-magnum_firing
47-magnum_reloading
46+magnum firing
47+magnum reloading
4848
49-assault_rifle_firing
50-grenade_launcher_firing
51-grenade_exploding
52-grenade_flyby
49+assault rifle firing
50+grenade launcher firing
51+grenade exploding
52+grenade flyby
5353
54-fusion_firing
55-fusion_exploding
56-fusion_flyby
57-fusion_charging
54+fusion firing
55+fusion exploding
56+fusion flyby
57+fusion charging
5858
59-rocket_exploding
60-rocket_flyby
61-rocket_firing
59+rocket exploding
60+rocket flyby
61+rocket firing
6262
6363 flamethrower
6464
65-body_falling
66-body_exploding
67-bullet_hitting_flesh
65+body falling
66+body exploding
67+bullet hitting flesh
6868
69-fighter_activate
70-fighter_wail
71-fighter_scream
72-fighter_chatter
73-fighter_attack
74-fighter_projectile_hit
75-fighter_projectile_flyby
69+fighter activate
70+fighter wail
71+fighter scream
72+fighter chatter
73+fighter attack
74+fighter projectile hit
75+fighter projectile flyby
7676
77-compiler_attack
78-compiler_death
79-compiler_hit
80-compiler_projectile_flyby
81-compiler_projectile_hit
77+compiler attack
78+compiler death
79+compiler hit
80+compiler projectile flyby
81+compiler projectile hit
8282
83-cyborg_moving
84-cyborg_attack
85-cyborg_hit
86-cyborg_death
87-cyborg_projectile_bounce
88-cyborg_projectile_hit
89-cyborg_projectile_flyby
83+cyborg moving
84+cyborg attack
85+cyborg hit
86+cyborg death
87+cyborg projectile bounce
88+cyborg projectile hit
89+cyborg projectile flyby
9090
91-hummer_activate
92-hummer_start_attack
93-hummer_attack
94-hummer_dying
95-hummer_death
96-hummer_projectile_hit
97-hummer_projectile_flyby
91+hummer activate
92+hummer start attack
93+hummer attack
94+hummer dying
95+hummer death
96+hummer projectile hit
97+hummer projectile flyby
9898
99-human_wail
100-human_scream
101-human_hit
102-human_chatter
103-assimilated_human_chatter
104-human_trash_talk
105-human_apology
106-human_activation
107-human_clear
108-human_stop_shooting_me_you_bastard
109-human_area_secure
110-kill_the_player
99+human wail
100+human scream
101+human hit
102+human chatter
103+assimilated human chatter
104+human trash talk
105+human apology
106+human activation
107+human clear
108+human stop shooting me
109+human area secure
110+kill the player
111111
112112 water
113113 sewage
114114 lava
115115 goo
116-under_media
116+under media
117117 wind
118118 waterfall
119119 siren
120120 fan
121-spht_door
122-spht_platform
123-alien_harmonics
124-heavy_spht_platform
125-light_machinery
126-heavy_machinery
121+spht door
122+spht platform
123+alien harmonics
124+heavy spht platform
125+light machinery
126+heavy machinery
127127 transformer
128-sparking_transformer
128+sparking transformer
129129
130-water_drip
130+water drip
131131
132-walking_in_water
133-exit_water
134-enter_water
135-small_water_splash
136-medium_water_splash
137-large_water_splash
132+walking in water
133+exit water
134+enter water
135+small water splash
136+medium water splash
137+large water splash
138138
139-walking_in_lava
140-enter_lava
141-exit_lava
142-small_lava_splash
143-medium_lava_splash
144-large_lava_splash
139+walking in lava
140+enter lava
141+exit lava
142+small lava splash
143+medium lava splash
144+large lava splash
145145
146-walking_in_sewage
147-exit_sewage
148-enter_sewage
149-small_sewage_splash
150-medium_sewage_splash
151-large_sewage_splash
146+walking in sewage
147+exit sewage
148+enter sewage
149+small sewage splash
150+medium sewage splash
151+large sewage splash
152152
153-walking_in_goo
154-exit_goo
155-enter_goo
156-small_goo_splash
157-medium_goo_splash
158-large_goo_splash
153+walking in goo
154+exit goo
155+enter goo
156+small goo splash
157+medium goo splash
158+large goo splash
159159
160-major_fusion_firing
161-major_fusion_charged
160+major fusion firing
161+major fusion charged
162162
163-assault_rifle_reloading
164-assault_rifle_shell_casings
163+assault rifle reloading
164+assault rifle shell casings
165165
166-shotgun_firing
167-shotgun_reloading
166+shotgun firing
167+shotgun reloading
168168
169-ball_bounce
170-you_are_it
171-got_ball
169+ball bounce
170+you are it
171+got ball
172172
173173 logon
174174 logout
175175 page
176176
177-heavy_spht_door
177+heavy spht door
178178 HeavySphtDoorOpening
179179 HeavySphtDoorClosing
180180 HeavySphtDoorOpen
@@ -181,82 +181,82 @@
181181 HeavySphtDoorClosed
182182 HeavySphtDoorObstructed
183183
184-hunter_activate
185-hunter_attack
186-hunter_dying
187-hunter_landing
188-hunter_exploding
189-hunter_projectile_hit
190-hunter_projectile_flyby
184+hunter activate
185+hunter attack
186+hunter dying
187+hunter landing
188+hunter exploding
189+hunter projectile hit
190+hunter projectile flyby
191191
192-enforcer_activate
193-enforcer_attack
194-enforcer_projectile_hit
195-enforcer_projectile_flyby
192+enforcer activate
193+enforcer attack
194+enforcer projectile hit
195+enforcer projectile flyby
196196
197-yeti_melee_attack
198-yeti_melee_attack_hit
199-yeti_attack
200-yeti_sewage_attack_hit
201-yeti_sewage_flyby
202-yeti_lava_attack_hit
203-yeti_lava_flyby
204-yeti_dying
197+yeti melee attack
198+yeti melee attack hit
199+yeti attack
200+yeti sewage attack hit
201+yeti sewage flyby
202+yeti lava attack hit
203+yeti lava flyby
204+yeti dying
205205
206-machine_binder
207-machine_bookpress
208-machine_puncher
206+machine binder
207+machine bookpress
208+machine puncher
209209 electric
210210 alarm
211-night_wind
211+night wind
212212
213-surface_explosion
214-underground_explosion
213+surface explosion
214+underground explosion
215215
216-defender_attack
217-defender_hit
218-defender_flyby
219-defender_being_hit
220-defender_exploding
216+defender attack
217+defender hit
218+defender flyby
219+defender being hit
220+defender exploding
221221
222-tick_chatter
223-tick_falling
224-tick_flapping
225-tick_exploding
222+tick chatter
223+tick falling
224+tick flapping
225+tick exploding
226226
227-ceiling_lamp_exploding
227+ceiling lamp exploding
228228
229-pfhor_platform_starting
230-pfhor_platform_stopping
231-pfhor_platform
229+pfhor platform starting
230+pfhor platform stopping
231+pfhor platform
232232
233-pfhor_door_opening
234-pfhor_door_closing
235-pfhor_door_obstructed
236-pfhor_door
233+pfhor door opening
234+pfhor door closing
235+pfhor door obstructed
236+pfhor door
237237
238-pfhor_switch_off
239-pfhor_switch_on
238+pfhor switch off
239+pfhor switch on
240240
241-juggernaut_firing
242-juggernaut_warning
243-juggernaut_exploding
244-juggernaut_preparing_to_fire
241+juggernaut firing
242+juggernaut warning
243+juggernaut exploding
244+juggernaut preparing to fire
245245
246-enforcer_exploding
246+enforcer exploding
247247
248-alien_noise1
249-alien_noise2
248+alien noise1
249+alien noise2
250250
251-civilian_fusion_wail
252-civilian_fusion_scream
253-civilian_fusion_hit
254-civilian_fusion_chatter
255-assimilated_civilian_fusion_chatter
256-civilian_fusion_trash_talk
257-civilian_fusion_apology
258-civilian_fusion_activation
259-civilian_fusion_clear
260-civilian_fusion_stop_shooting_me_you_bastard
261-civilian_fusion_area_secure
262-civilian_fusion_kill_the_player
251+fusion civ. wail
252+fusion civ. scream
253+fusion civ. hit
254+fusion civ. chatter
255+ass' fusion civ. chatter
256+fusion civ. trash talk
257+fusion civ. apology
258+fusion civ. activation
259+fusion civ. clear
260+fusion civ. stop shooting me
261+fusion civ. area secure
262+fusion civ. kill the player
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/data/Speeds.txt (revision 467)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/data/Speeds.txt (revision 468)
@@ -1,11 +1,11 @@
1-_speed_slow
2-_speed_medium
3-_speed_almost_fast
4-_speed_fast
5-_speed_superfast1
6-_speed_superfast2
7-_speed_superfast3
8-_speed_superfast4
9-_speed_superfast5
10-_speed_blinding
11-_speed_insane
1+slow
2+medium
3+almost_fast
4+fast
5+superfast1
6+superfast2
7+superfast3
8+superfast4
9+superfast5
10+blinding
11+insane
--- marathon/trunk/EditorOnes/PhysicsEditorOneWX/data/DefinedItems.txt (revision 467)
+++ marathon/trunk/EditorOnes/PhysicsEditorOneWX/data/DefinedItems.txt (revision 468)
@@ -1,38 +1,38 @@
11 knife
22 magnum
3-magnum_magazine
4-plasma_pistol
5-plasma_magazine
6-assault_rifle
7-assault_rifle_magazine
8-assault_grenade_magazine
9-missile_launcher
10-missile_launcher_magazine
11-invisibility_powerup
12-invincibility_powerup
13-infravision_powerup
14-alien_shotgun
15-alien_shotgun_magazine
3+magnum magazine
4+plasma pistol
5+plasma magazine
6+assault rifle
7+rifle magazine
8+grenade magazine
9+missile launcher
10+missile pack
11+invisibility
12+invincibility
13+infravision
14+alien shotgun
15+alien magazine
1616 flamethrower
17-flamethrower_canister
18-extravision_powerup
19-oxygen_powerup
20-energy_powerup
21-double_energy_powerup
22-triple_energy_powerup
17+flame canister
18+extravision
19+oxygen powerup
20+energy powerup
21+double energy powerup
22+triple energy powerup
2323 shotgun
24-shotgun_magazine
25-spht_door_key
26-uplink_chip
24+shotgun magazine
25+spht door key
26+uplink chip
2727
28-light_blue_ball
29-red_ball
30-violet_ball
31-yellow_ball
32-brown_ball
33-orange_ball
34-blue_ball
35-green_ball
28+light blue ball
29+red ball
30+violet ball
31+yellow ball
32+brown ball
33+orange ball
34+blue ball
35+green ball
3636
3737 smg
38-smg_ammo
38+smg ammo
旧リポジトリブラウザで表示