Skip to content

Commit 28791d8

Browse files
committed
EQ held fix on mobs, added coords to edit room, added checkbox for isMobScript
1 parent f5861af commit 28791d8

9 files changed

Lines changed: 65 additions & 1 deletion

File tree

src/app/World/rooms/edit-room/edit-room.component.html

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,43 @@ <h2>Room Information:</h2>
3131
</div>
3232
</div>
3333
</div>
34+
<div class="section">
35+
<h2>Coords:</h2>
36+
<p>
37+
Edit coords to move room
38+
</p>
39+
</div>
40+
<div class="section">
41+
<div class="row">
42+
<div class="col">
43+
<mat-form-field appearance="outline" class="form-control">
44+
<mat-label>X</mat-label>
45+
<input matInput placeholder="X" value="" required formControlName="CoordX" />
46+
<mat-error *ngIf="addRoomForm.get('CoordX').hasError('required')">
47+
Coord X is required.
48+
</mat-error>
49+
</mat-form-field>
50+
</div>
51+
<div class="col">
52+
<mat-form-field appearance="outline" class="form-control">
53+
<mat-label>Y</mat-label>
54+
<input matInput placeholder="Y" value="" required formControlName="CoordY" />
55+
<mat-error *ngIf="addRoomForm.get('CoordY').hasError('required')">
56+
Coord Y is required.
57+
</mat-error>
58+
</mat-form-field>
59+
</div>
60+
<div class="col">
61+
<mat-form-field appearance="outline" class="form-control">
62+
<mat-label>Z</mat-label>
63+
<input matInput placeholder="Z" value="" required formControlName="CoordZ" />
64+
<mat-error *ngIf="addRoomForm.get('CoordZ').hasError('required')">
65+
Coord Z is required.
66+
</mat-error>
67+
</mat-form-field>
68+
</div>
69+
</div>
70+
</div>
3471
<div class="section">
3572
<h2>Room Objects:</h2>
3673
<p>

src/app/characters/equipment/equipment.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ <h2>Equipment</h2>
199199
</mat-select>
200200
</mat-form-field>
201201
</div> -->
202-
<div class="col" *ngIf="heldItems.length">
202+
<div class="col">
203203
<mat-form-field appearance="outline" class="form-control">
204204
<mat-label>Held</mat-label>
205205
<mat-select formControlName="heldEq" placeholder="Held" (selectionChange)="heldChange($event)"

src/app/characters/interfaces/characters.interface.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export interface Character {
5151
trainer?: boolean;
5252
events?: Events;
5353
isMount?: Mount;
54+
isHiddenScriptMob?: boolean;
5455
spellList?: SpellList[];
5556
practices?: number;
5657
mobKills?: number;

src/app/mobs/add-mob.component.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,7 @@ <h2>Options</h2>
583583

584584

585585
</div>
586+
586587
<div class="col">
587588

588589

@@ -600,6 +601,16 @@ <h2>Options</h2>
600601
</mat-checkbox>
601602

602603

604+
</div>
605+
606+
<div class="col">
607+
608+
609+
<mat-checkbox title="Allows scripts in rooms that have no mobs" formControlName="isHiddenScriptMob">Is
610+
Hidden script mob
611+
</mat-checkbox>
612+
613+
603614
</div>
604615

605616
<div class="col">

src/app/mobs/add-mob.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ export class AddMobComponent implements OnInit {
305305
shopkeeper: this.addMobForm.get('shopkeeper').value,
306306
trainer: this.addMobForm.get('trainer').value,
307307
isMount: this.addMobForm.get('isMount').value,
308+
isHiddenScriptMob: this.addMobForm.get('isHiddenScriptMob').value,
308309
spellList: []
309310
};
310311

src/app/mobs/add-mob.service.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ export class AddMobService {
9494
shopkeeper: [false],
9595
trainer: [false],
9696
isMount: [false],
97+
isHiddenScriptMob: [false],
9798
events: new FormGroup({
9899
enter: new FormControl(''),
99100
leave: new FormControl(''),

src/app/mobs/edit-mob/edit-mob.component.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,16 @@ <h2>Options</h2>
555555
</mat-checkbox>
556556

557557

558+
</div>
559+
560+
<div class="col">
561+
562+
563+
<mat-checkbox title="Allows scripts in rooms that have no mobs" formControlName="isHiddenScriptMob">Is
564+
Hidden script mob
565+
</mat-checkbox>
566+
567+
558568
</div>
559569

560570
<div class="col">

src/app/mobs/edit-mob/edit-mob.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ export class EditMobComponent extends OnDestroyMixin implements OnInit, OnDestro
192192
shopkeeper: mob.shopkeeper,
193193
trainer: mob.trainer,
194194
isMount: mob?.isMount,
195+
isHiddenScriptMob: mob?.isHiddenScriptMob,
195196
enterEmote: mob.enterEmote,
196197
leaveEmote: mob.leaveEmote,
197198

@@ -463,6 +464,7 @@ export class EditMobComponent extends OnDestroyMixin implements OnInit, OnDestro
463464
shopkeeper: this.addMobForm.get('shopkeeper').value,
464465
trainer: this.addMobForm.get('trainer').value,
465466
isMount: this.addMobForm.get('isMount').value || false,
467+
isHiddenScriptMob: this.addMobForm.get('isHiddenScriptMob').value || false,
466468
enterEmote: this.addMobForm.get('enterEmote').value || "",
467469
leaveEmote: this.addMobForm.get('leaveEmote').value || "",
468470
spellList: []

src/app/mobs/edit-mob/edit-mob.service.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ export class EditMobService {
9696
shopkeeper: new FormControl(false),
9797
trainer: new FormControl(false),
9898
isMount: new FormControl(false),
99+
isHiddenScriptMob: new FormControl(false),
99100
enterEmote: [''],
100101
leaveEmote: [''],
101102

0 commit comments

Comments
 (0)