adding economy on castle

rathena · Nov 23, 2023 · 87c7b7c · 87c7b7c
1 parent e6ca3bd
commit 87c7b7c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/modules/castle/index.php b/modules/castle/index.php
@@ -6,7 +6,7 @@
 $castleNames = Flux::config('CastleNames')->toArray();
 $ids = implode(',', array_fill(0, count($castleNames), '?'));
 
-$sql  = "SELECT castles.castle_id, castles.guild_id, guild.name AS guild_name, guild.emblem_id as emblem ";
+$sql  = "SELECT castles.castle_id, castles.guild_id, castles.economy, guild.name AS guild_name, guild.emblem_id as emblem ";
 $sql .= "FROM {$server->charMapDatabase}.guild_castle AS castles ";
 $sql .= "LEFT JOIN guild ON guild.guild_id = castles.guild_id ";
 $sql .= "WHERE castles.castle_id IN ($ids)";
@@ -16,4 +16,4 @@
 
 $castles = $sth->fetchAll();
 
-?>
+?>
diff --git a/themes/default/castle/index.php b/themes/default/castle/index.php
@@ -7,6 +7,7 @@
 		<th>Castle ID</th>
 		<th>Castle</th>
 		<th colspan="2">Guild</th>
+		<th>Economy</th>
 	</tr>
 	<?php foreach ($castles as $castle): ?>
 		<tr>
@@ -18,8 +19,10 @@
 					<td>
 						<?php if ($auth->actionAllowed('guild', 'view') && $auth->allowedToViewGuild): ?>
 							<?php echo $this->linkToGuild($castle->guild_id, $castle->guild_name) ?>
+							<td><?php echo htmlspecialchars($castle->economy); ?></td>
 						<?php else: ?>
 							<?php echo htmlspecialchars($castle->guild_name) ?>
+
 						<?php endif ?>
 					</td>
 				<?php else: ?>
@@ -29,6 +32,7 @@
 				<td colspan="2"><span class="not-applicable"><?php echo htmlspecialchars(Flux::message('NoneLabel')) ?></span></td>
 			<?php endif ?>
 		</tr>
+
 	<?php endforeach ?>
 </table>
 <?php else: ?>