Skip to content
This repository was archived by the owner on Jun 9, 2022. It is now read-only.

Commit 4aa48ca

Browse files
committed
Getting ready for Truice v2.1.1
+ Adding missing smart_targets and smart_actions + Getting rid of bad casts
1 parent 4c491d8 commit 4aa48ca

File tree

5 files changed

+273
-9
lines changed

5 files changed

+273
-9
lines changed

CSV/SAI_ActionType.csv

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,19 @@
110110
110;SMART_ACTION_REMOVE_POWER
111111
111;SMART_ACTION_GAME_EVENT_STOP
112112
112;SMART_ACTION_GAME_EVENT_START
113+
113;SMART_ACTION_START_CLOSEST_WAYPOINT
114+
114;SMART_ACTION_MOVE_OFFSET
115+
115;SMART_ACTION_RANDOM_SOUND
116+
116;SMART_ACTION_SET_CORPSE_DELAY
117+
117;SMART_ACTION_DISABLE_EVADE
118+
118;SMART_ACTION_GO_SET_GO_STATE
119+
119;SMART_ACTION_SET_CAN_FLY
120+
120;SMART_ACTION_REMOVE_AURAS_BY_TYPE
121+
121;SMART_ACTION_SET_SIGHT_DIST
122+
122;SMART_ACTION_FLEE
123+
123;SMART_ACTION_ADD_THREAT
124+
124;SMART_ACTION_LOAD_EQUIPMENT
125+
125;SMART_ACTION_TRIGGER_RANDOM_TIMED_EVENT
126+
126;SMART_ACTION_REMOVE_ALL_GAMEOBJECTS
127+
127;SMART_ACTION_STOP_MOTION
128+
128;SMART_ACTION_PLAY_ANIMKIT

CSV/SAI_CastFlags.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
3;CAST_FORCE_CAST (NYI)
44
4;CAST_NO_MELEE_IF_OOM (NYI)
55
5;CAST_FORCE_TARGET_SELF (NYI)
6-
6;CAST_AURA_NOT_PRESENT
6+
6;CAST_AURA_NOT_PRESENT
7+
7;SMARTCAST_COMBAT_MOVE

CSV/SAI_EventType.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,6 @@
7373
72;SMART_EVENT_ACTION_DONE
7474
73;SMART_EVENT_ON_SPELLCLICK
7575
74;SMART_EVENT_FRIENDLY_HEALTH_PCT
76+
75;SMART_EVENT_DISTANCE_CREATURE
77+
76;SMART_EVENT_DISTANCE_GAMEOBJECT
78+
77;SMART_EVENT_COUNTER_SET

CSV/SAI_TargetType.csv

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@
2424
23;SMART_TARGET_OWNER_OR_SUMMONER
2525
24;SMART_TARGET_THREAT_LIST
2626
25;SMART_TARGET_CLOSEST_ENEMY
27-
26;SMART_TARGET_CLOSEST_FRIENDLY
27+
26;SMART_TARGET_CLOSEST_FRIENDLY
28+
27;SMART_TARGET_LOOT_RECIPIENTS
29+
28;SMART_TARGET_FARTHEST
30+
29;SMART_TARGET_VEHICLE_ACCESSORY

MainUnit.pas

Lines changed: 248 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ interface
1515
const
1616
VERSION_1 = '2'; //*10000
1717
VERSION_2 = '1'; //*100
18-
VERSION_3 = '0';
18+
VERSION_3 = '1';
1919
VERSION_4 = '0';
2020
VERSION_EXE = VERSION_1 + '.' + VERSION_2 + '.' + VERSION_3 + '.' + VERSION_4;
2121

@@ -2730,7 +2730,7 @@ procedure TMainForm.tsScriptTabShow(Sender: TObject);
27302730

27312731
procedure TMainForm.UpdateCaption;
27322732
begin
2733-
Caption := Format('Truice - Connection: %s:%d / %s', [MyTrinityConnection.HostName, MyTrinityConnection.Port, GetDBVersion]);
2733+
Caption := Format('Truice %s - Connection: %s:%d / %s', [VERSION_EXE, MyTrinityConnection.HostName, MyTrinityConnection.Port, GetDBVersion]);
27342734
Application.Title := Caption;
27352735
end;
27362736

@@ -2940,7 +2940,7 @@ procedure TMainForm.GetItem(Sender: TObject);
29402940
if Sender is TJvComboEdit then
29412941
begin
29422942
edEdit := TJvComboEdit(Sender);
2943-
F := (Sender as TItemForm).Create(Self);
2943+
F := TItemForm.Create(Self);
29442944
try
29452945
if (edEdit.Text<>'') and (edEdit.Text<>'0') then F.Prepare(edEdit.Text);
29462946
if F.ShowModal=mrOk then edEdit.Text := F.lvItem.Selected.Caption;
@@ -2958,7 +2958,7 @@ procedure TMainForm.GetCreatureOrGO(Sender: TObject);
29582958
if Sender is TJvComboEdit then
29592959
begin
29602960
edEdit := TJvComboEdit(Sender);
2961-
F := (Sender as TCreatureOrGOForm).Create(Self);
2961+
F := TCreatureOrGOForm.Create(Self);
29622962
try
29632963
if (edEdit.Text<>'') and (edEdit.Text<>'0') then F.Prepare(edEdit.Text);
29642964
if F.ShowModal=mrOk then edEdit.Text := F.lvCreatureOrGO.Selected.Caption;
@@ -10397,6 +10397,33 @@ procedure TMainForm.SetSAIEvent(t: integer);
1039710397
lbcyevent_type.Hint := '';
1039810398
edcyevent_type.Hint := lbcyevent_type.Hint;
1039910399
end;
10400+
75: //SMART_EVENT_DISTANCE_CREATURE
10401+
begin
10402+
lbcyevent_param1.Caption := 'database guid';
10403+
lbcyevent_param2.Caption := 'database entry';
10404+
lbcyevent_param3.Caption := 'distance';
10405+
lbcyevent_param4.Caption := 'repeat interval (ms)';
10406+
lbcyevent_type.Hint := 'On creature guid OR any instance of creature entry is within distance.';
10407+
edcyevent_type.Hint := lbcyevent_type.Hint;
10408+
end;
10409+
76: //SMART_EVENT_DISTANCE_GAMEOBJECT
10410+
begin
10411+
lbcyevent_param1.Caption := 'database guid';
10412+
lbcyevent_param2.Caption := 'database entry';
10413+
lbcyevent_param3.Caption := 'distance';
10414+
lbcyevent_param4.Caption := 'repeat interval (ms)';
10415+
lbcyevent_type.Hint := 'On gameobject guid OR any instance of gameobject entry is within distance.';
10416+
edcyevent_type.Hint := lbcyevent_type.Hint;
10417+
end;
10418+
77: //SMART_EVENT_COUNTER_SET
10419+
begin
10420+
lbcyevent_param1.Caption := 'counterID';
10421+
lbcyevent_param2.Caption := 'value';
10422+
lbcyevent_param3.Caption := 'cooldownMin';
10423+
lbcyevent_param4.Caption := 'cooldownMax';
10424+
lbcyevent_type.Hint := 'If the value of specified counterID is equal to a specified value';
10425+
edcyevent_type.Hint := lbcyevent_type.Hint;
10426+
end;
1040010427
end;
1040110428
SAI_Event := t;
1040210429
end;
@@ -12002,7 +12029,7 @@ procedure TMainForm.SetSAIAction(t: integer);
1200212029
end;
1200312030
94: //SMART_ACTION_SET_DYNAMIC_FLAG
1200412031
begin
12005-
lbcyaction_param1.Caption := 'dynamicflag';
12032+
lbcyaction_param1.Caption := 'creature.dynamicflags';
1200612033
lbcyaction_param2.Caption := '';
1200712034
lbcyaction_param3.Caption := '';
1200812035
lbcyaction_param4.Caption := '';
@@ -12013,7 +12040,7 @@ procedure TMainForm.SetSAIAction(t: integer);
1201312040
end;
1201412041
95: //SMART_ACTION_ADD_DYNAMIC_FLAG
1201512042
begin
12016-
lbcyaction_param1.Caption := 'dynamicflag';
12043+
lbcyaction_param1.Caption := 'creature.dynamicflags';
1201712044
lbcyaction_param2.Caption := '';
1201812045
lbcyaction_param3.Caption := '';
1201912046
lbcyaction_param4.Caption := '';
@@ -12024,7 +12051,7 @@ procedure TMainForm.SetSAIAction(t: integer);
1202412051
end;
1202512052
96: //SMART_ACTION_REMOVE_DYNAMIC_FLAG
1202612053
begin
12027-
lbcyaction_param1.Caption := 'dynamicflag';
12054+
lbcyaction_param1.Caption := 'creature.dynamicflags';
1202812055
lbcyaction_param2.Caption := '';
1202912056
lbcyaction_param3.Caption := '';
1203012057
lbcyaction_param4.Caption := '';
@@ -12209,6 +12236,182 @@ procedure TMainForm.SetSAIAction(t: integer);
1220912236
lbcyaction_type.Hint := '';
1221012237
edcyaction_type.Hint := lbcyaction_type.Hint;
1221112238
end;
12239+
113: //SMART_ACTION_START_CLOSEST_WAYPOINT
12240+
begin
12241+
lbcyaction_param1.Caption := 'wp1';
12242+
lbcyaction_param2.Caption := 'wp2';
12243+
lbcyaction_param3.Caption := 'wp3';
12244+
lbcyaction_param4.Caption := 'wp4';
12245+
lbcyaction_param5.Caption := 'wp5';
12246+
lbcyaction_param6.Caption := 'wp6';
12247+
lbcyaction_type.Hint := 'Make target follow closest waypoint to its location';
12248+
edcyaction_type.Hint := lbcyaction_type.Hint;
12249+
end;
12250+
114: //SMART_ACTION_MOVE_OFFSET
12251+
begin
12252+
lbcyaction_param1.Caption := '';
12253+
lbcyaction_param2.Caption := '';
12254+
lbcyaction_param3.Caption := '';
12255+
lbcyaction_param4.Caption := '';
12256+
lbcyaction_param5.Caption := '';
12257+
lbcyaction_param6.Caption := '';
12258+
lbcyaction_type.Hint := 'With target_type=1, use target_x, target_y, target_z.';
12259+
edcyaction_type.Hint := lbcyaction_type.Hint;
12260+
end;
12261+
115: //SMART_ACTION_RANDOM_SOUND
12262+
begin
12263+
lbcyaction_param1.Caption := 'soundId1';
12264+
lbcyaction_param2.Caption := 'soundId2';
12265+
lbcyaction_param3.Caption := 'soundId3';
12266+
lbcyaction_param4.Caption := 'soundId4';
12267+
lbcyaction_param5.Caption := 'onlySelf (0/1)';
12268+
lbcyaction_param6.Caption := 'Distant Sound (0/1)';
12269+
lbcyaction_type.Hint := '';
12270+
edcyaction_type.Hint := lbcyaction_type.Hint;
12271+
end;
12272+
116: //SMART_ACTION_SET_CORPSE_DELAY
12273+
begin
12274+
lbcyaction_param1.Caption := 'timer';
12275+
lbcyaction_param2.Caption := '';
12276+
lbcyaction_param3.Caption := '';
12277+
lbcyaction_param4.Caption := '';
12278+
lbcyaction_param5.Caption := '';
12279+
lbcyaction_param6.Caption := '';
12280+
lbcyaction_type.Hint := '';
12281+
edcyaction_type.Hint := lbcyaction_type.Hint;
12282+
end;
12283+
117: //SMART_ACTION_DISABLE_EVADE
12284+
begin
12285+
lbcyaction_param1.Caption := 'disable evade (1) / re-enable (0)';
12286+
lbcyaction_param2.Caption := '';
12287+
lbcyaction_param3.Caption := '';
12288+
lbcyaction_param4.Caption := '';
12289+
lbcyaction_param5.Caption := '';
12290+
lbcyaction_param6.Caption := '';
12291+
lbcyaction_type.Hint := '';
12292+
edcyaction_type.Hint := lbcyaction_type.Hint;
12293+
end;
12294+
118: //SMART_ACTION_GO_SET_GO_STATE
12295+
begin
12296+
lbcyaction_param1.Caption := 'state';
12297+
lbcyaction_param2.Caption := '';
12298+
lbcyaction_param3.Caption := '';
12299+
lbcyaction_param4.Caption := '';
12300+
lbcyaction_param5.Caption := '';
12301+
lbcyaction_param6.Caption := '';
12302+
lbcyaction_type.Hint := '';
12303+
edcyaction_type.Hint := lbcyaction_type.Hint;
12304+
end;
12305+
119: //SMART_ACTION_SET_CAN_FLY
12306+
begin
12307+
lbcyaction_param1.Caption := '0/1';
12308+
lbcyaction_param2.Caption := '';
12309+
lbcyaction_param3.Caption := '';
12310+
lbcyaction_param4.Caption := '';
12311+
lbcyaction_param5.Caption := '';
12312+
lbcyaction_param6.Caption := '';
12313+
lbcyaction_type.Hint := '';
12314+
edcyaction_type.Hint := lbcyaction_type.Hint;
12315+
end;
12316+
120: //SMART_ACTION_REMOVE_AURAS_BY_TYPE
12317+
begin
12318+
lbcyaction_param1.Caption := 'Type';
12319+
lbcyaction_param2.Caption := '';
12320+
lbcyaction_param3.Caption := '';
12321+
lbcyaction_param4.Caption := '';
12322+
lbcyaction_param5.Caption := '';
12323+
lbcyaction_param6.Caption := '';
12324+
lbcyaction_type.Hint := '';
12325+
edcyaction_type.Hint := lbcyaction_type.Hint;
12326+
end;
12327+
121: //SMART_ACTION_SET_SIGHT_DIST
12328+
begin
12329+
lbcyaction_param1.Caption := 'SightDistance';
12330+
lbcyaction_param2.Caption := '';
12331+
lbcyaction_param3.Caption := '';
12332+
lbcyaction_param4.Caption := '';
12333+
lbcyaction_param5.Caption := '';
12334+
lbcyaction_param6.Caption := '';
12335+
lbcyaction_type.Hint := '';
12336+
edcyaction_type.Hint := lbcyaction_type.Hint;
12337+
end;
12338+
122: //SMART_ACTION_FLEE
12339+
begin
12340+
lbcyaction_param1.Caption := 'FleeTime';
12341+
lbcyaction_param2.Caption := '';
12342+
lbcyaction_param3.Caption := '';
12343+
lbcyaction_param4.Caption := '';
12344+
lbcyaction_param5.Caption := '';
12345+
lbcyaction_param6.Caption := '';
12346+
lbcyaction_type.Hint := '';
12347+
edcyaction_type.Hint := lbcyaction_type.Hint;
12348+
end;
12349+
123: //SMART_ACTION_ADD_THREAT
12350+
begin
12351+
lbcyaction_param1.Caption := '+threat';
12352+
lbcyaction_param2.Caption := '-threat';
12353+
lbcyaction_param3.Caption := '';
12354+
lbcyaction_param4.Caption := '';
12355+
lbcyaction_param5.Caption := '';
12356+
lbcyaction_param6.Caption := '';
12357+
lbcyaction_type.Hint := '';
12358+
edcyaction_type.Hint := lbcyaction_type.Hint;
12359+
end;
12360+
124: //SMART_ACTION_LOAD_EQUIPMENT
12361+
begin
12362+
lbcyaction_param1.Caption := 'Id';
12363+
lbcyaction_param2.Caption := '';
12364+
lbcyaction_param3.Caption := '';
12365+
lbcyaction_param4.Caption := '';
12366+
lbcyaction_param5.Caption := '';
12367+
lbcyaction_param6.Caption := '';
12368+
lbcyaction_type.Hint := '';
12369+
edcyaction_type.Hint := lbcyaction_type.Hint;
12370+
end;
12371+
125: //SMART_ACTION_TRIGGER_RANDOM_TIMED_EVENT
12372+
begin
12373+
lbcyaction_param1.Caption := 'id min range';
12374+
lbcyaction_param2.Caption := 'id max range';
12375+
lbcyaction_param3.Caption := '';
12376+
lbcyaction_param4.Caption := '';
12377+
lbcyaction_param5.Caption := '';
12378+
lbcyaction_param6.Caption := '';
12379+
lbcyaction_type.Hint := '';
12380+
edcyaction_type.Hint := lbcyaction_type.Hint;
12381+
end;
12382+
126: //SMART_ACTION_REMOVE_ALL_GAMEOBJECTS
12383+
begin
12384+
lbcyaction_param1.Caption := '';
12385+
lbcyaction_param2.Caption := '';
12386+
lbcyaction_param3.Caption := '';
12387+
lbcyaction_param4.Caption := '';
12388+
lbcyaction_param5.Caption := '';
12389+
lbcyaction_param6.Caption := '';
12390+
lbcyaction_type.Hint := '';
12391+
edcyaction_type.Hint := lbcyaction_type.Hint;
12392+
end;
12393+
127: //SMART_ACTION_STOP_MOTION
12394+
begin
12395+
lbcyaction_param1.Caption := 'StopMoving';
12396+
lbcyaction_param2.Caption := 'movementExpired';
12397+
lbcyaction_param3.Caption := '';
12398+
lbcyaction_param4.Caption := '';
12399+
lbcyaction_param5.Caption := '';
12400+
lbcyaction_param6.Caption := '';
12401+
lbcyaction_type.Hint := '';
12402+
edcyaction_type.Hint := lbcyaction_type.Hint;
12403+
end;
12404+
128: //SMART_ACTION_PLAY_ANIMKIT
12405+
begin
12406+
lbcyaction_param1.Caption := 'AnimKit ID';
12407+
lbcyaction_param2.Caption := '';
12408+
lbcyaction_param3.Caption := '';
12409+
lbcyaction_param4.Caption := '';
12410+
lbcyaction_param5.Caption := '';
12411+
lbcyaction_param6.Caption := '';
12412+
lbcyaction_type.Hint := 'dont use on 3.3.5a';
12413+
edcyaction_type.Hint := lbcyaction_type.Hint;
12414+
end;
1221212415
end;
1221312416
SAI_Action := t;
1221412417
end;
@@ -12549,6 +12752,44 @@ procedure TMainForm.SetSAITarget(t: integer);
1254912752
lbcytarget_type.Hint := '';
1255012753
edcytarget_type.Hint := lbcytarget_type.Hint;
1255112754
end;
12755+
27: //SMART_TARGET_LOOT_RECIPIENTS
12756+
begin
12757+
lbcytarget_param1.Caption := '';
12758+
lbcytarget_param2.Caption := '';
12759+
lbcytarget_param3.Caption := '';
12760+
lbcytarget_x.Caption := '';
12761+
lbcytarget_y.Caption := '';
12762+
lbcytarget_z.Caption := '';
12763+
lbcytarget_o.Caption := '';
12764+
lbcytarget_type.Hint := 'All tagging players';
12765+
edcytarget_type.Hint := lbcytarget_type.Hint;
12766+
end;
12767+
28: //SMART_TARGET_FARTHEST
12768+
begin
12769+
lbcytarget_param1.Caption := 'maxDist';
12770+
lbcytarget_param2.Caption := 'playerOnly';
12771+
lbcytarget_param3.Caption := 'isInLos (0/1)';
12772+
lbcytarget_x.Caption := '';
12773+
lbcytarget_y.Caption := '';
12774+
lbcytarget_z.Caption := '';
12775+
lbcytarget_o.Caption := '';
12776+
lbcytarget_type.Hint := 'Farthest unit on the threat list';
12777+
edcytarget_type.Hint := lbcytarget_type.Hint;
12778+
end;
12779+
29: //SMART_TARGET_VEHICLE_ACCESSORY
12780+
begin
12781+
lbcytarget_param1.Caption := 'seat';
12782+
lbcytarget_param2.Caption := '';
12783+
lbcytarget_param3.Caption := '';
12784+
lbcytarget_x.Caption := '';
12785+
lbcytarget_y.Caption := '';
12786+
lbcytarget_z.Caption := '';
12787+
lbcytarget_o.Caption := '';
12788+
lbcytarget_param1.Hint := 'Vehicle can target unit in given seat';
12789+
edcytarget_param1.Hint := lbcytarget_param1.Hint;
12790+
lbcytarget_type.Hint := '';
12791+
edcytarget_type.Hint := lbcytarget_type.Hint;
12792+
end;
1255212793
end;
1255312794
SAI_Target := t;
1255412795
end;

0 commit comments

Comments
 (0)