EQ held fix on mobs, added coords to edit room, added checkbox for is…

…MobScript
ArchaicQuest · Jul 3, 2022 · 520cc45 · 520cc45
1 parent 06dcf1d
commit 520cc45
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 1 deletion.
diff --git a/src/app/World/rooms/edit-room/edit-room.component.html b/src/app/World/rooms/edit-room/edit-room.component.html
@@ -31,6 +31,43 @@ <h2>Room Information:</h2>
                             </div>
                         </div>
                     </div>
+                    <div class="section">
+                        <h2>Coords:</h2>
+                        <p>
+                            Edit coords to move room
+                        </p>
+                    </div>
+                    <div class="section">
+                        <div class="row">
+                            <div class="col">
+                                <mat-form-field appearance="outline" class="form-control">
+                                    <mat-label>X</mat-label>
+                                    <input matInput placeholder="X" value="" required formControlName="CoordX" />
+                                    <mat-error *ngIf="addRoomForm.get('CoordX').hasError('required')">
+                                        Coord X is required.
+                                    </mat-error>
+                                </mat-form-field>
+                            </div>
+                            <div class="col">
+                                <mat-form-field appearance="outline" class="form-control">
+                                    <mat-label>Y</mat-label>
+                                    <input matInput placeholder="Y" value="" required formControlName="CoordY" />
+                                    <mat-error *ngIf="addRoomForm.get('CoordY').hasError('required')">
+                                        Coord Y is required.
+                                    </mat-error>
+                                </mat-form-field>
+                            </div>
+                            <div class="col">
+                                <mat-form-field appearance="outline" class="form-control">
+                                    <mat-label>Z</mat-label>
+                                    <input matInput placeholder="Z" value="" required formControlName="CoordZ" />
+                                    <mat-error *ngIf="addRoomForm.get('CoordZ').hasError('required')">
+                                        Coord Z is required.
+                                    </mat-error>
+                                </mat-form-field>
+                            </div>
+                        </div>
+                    </div>
                     <div class="section">
                         <h2>Room Objects:</h2>
                         <p>

diff --git a/src/app/characters/equipment/equipment.component.html b/src/app/characters/equipment/equipment.component.html
@@ -199,7 +199,7 @@ <h2>Equipment</h2>
                 </mat-select>
             </mat-form-field>
         </div> -->
-        <div class="col" *ngIf="heldItems.length">
+        <div class="col">
             <mat-form-field appearance="outline" class="form-control">
                 <mat-label>Held</mat-label>
                 <mat-select formControlName="heldEq" placeholder="Held" (selectionChange)="heldChange($event)"

diff --git a/src/app/characters/interfaces/characters.interface.ts b/src/app/characters/interfaces/characters.interface.ts
@@ -51,6 +51,7 @@ export interface Character {
     trainer?: boolean;
     events?: Events;
     isMount?: Mount;
+    isHiddenScriptMob?: boolean;
     spellList?: SpellList[];
     practices?: number;
     mobKills?: number;

diff --git a/src/app/mobs/add-mob.component.html b/src/app/mobs/add-mob.component.html
@@ -583,6 +583,7 @@ <h2>Options</h2>
 
 
                             </div>
+
                             <div class="col">
 
 
@@ -600,6 +601,16 @@ <h2>Options</h2>
                                 </mat-checkbox>
 
 
+                            </div>
+
+                            <div class="col">
+
+
+                                <mat-checkbox title="Allows scripts in rooms that have no mobs" formControlName="isHiddenScriptMob">Is
+                                    Hidden script mob
+                                </mat-checkbox>
+
+
                             </div>
 
                             <div class="col">

diff --git a/src/app/mobs/add-mob.component.ts b/src/app/mobs/add-mob.component.ts
@@ -305,6 +305,7 @@ export class AddMobComponent implements OnInit {
       shopkeeper: this.addMobForm.get('shopkeeper').value,
       trainer: this.addMobForm.get('trainer').value,
       isMount: this.addMobForm.get('isMount').value,
+      isHiddenScriptMob: this.addMobForm.get('isHiddenScriptMob').value,
       spellList: []
     };
 

diff --git a/src/app/mobs/add-mob.service.ts b/src/app/mobs/add-mob.service.ts
@@ -94,6 +94,7 @@ export class AddMobService {
         shopkeeper: [false],
         trainer: [false],
         isMount: [false],
+        isHiddenScriptMob: [false],
         events: new FormGroup({
             enter: new FormControl(''),
             leave: new FormControl(''),

diff --git a/src/app/mobs/edit-mob/edit-mob.component.html b/src/app/mobs/edit-mob/edit-mob.component.html
@@ -555,6 +555,16 @@ <h2>Options</h2>
                                 </mat-checkbox>
 
 
+                            </div>
+
+                            <div class="col">
+
+
+                                <mat-checkbox title="Allows scripts in rooms that have no mobs" formControlName="isHiddenScriptMob">Is
+                                    Hidden script mob
+                                </mat-checkbox>
+
+
                             </div>
 
                             <div class="col">

diff --git a/src/app/mobs/edit-mob/edit-mob.component.ts b/src/app/mobs/edit-mob/edit-mob.component.ts
@@ -192,6 +192,7 @@ export class EditMobComponent extends OnDestroyMixin implements OnInit, OnDestro
                     shopkeeper: mob.shopkeeper,
                     trainer: mob.trainer,
                     isMount: mob?.isMount,
+                    isHiddenScriptMob: mob?.isHiddenScriptMob,
                     enterEmote: mob.enterEmote,
                     leaveEmote: mob.leaveEmote,
 
@@ -463,6 +464,7 @@ export class EditMobComponent extends OnDestroyMixin implements OnInit, OnDestro
             shopkeeper: this.addMobForm.get('shopkeeper').value,
             trainer: this.addMobForm.get('trainer').value,
             isMount: this.addMobForm.get('isMount').value || false,
+            isHiddenScriptMob: this.addMobForm.get('isHiddenScriptMob').value || false,
             enterEmote: this.addMobForm.get('enterEmote').value || "",
             leaveEmote: this.addMobForm.get('leaveEmote').value || "",
             spellList: []

diff --git a/src/app/mobs/edit-mob/edit-mob.service.ts b/src/app/mobs/edit-mob/edit-mob.service.ts
@@ -96,6 +96,7 @@ export class EditMobService {
         shopkeeper: new FormControl(false),
         trainer: new FormControl(false),
         isMount: new FormControl(false),
+        isHiddenScriptMob: new FormControl(false),
         enterEmote: [''],
         leaveEmote: [''],