Differences

This shows you the differences between two versions of the page.

--- start [2020/03/23 23:40]
saph
+++ start [2022/03/30 17:56]
poldora added avatars
@@ Line 14: / Line 14: @@
 <center><h2><b>Welcome to the Official Wiki for Marosia.</b></h2></center>
+<center><p style="border:3px; border-style:solid; border-color:#286090; padding: 1em;"><b>NEW</b>: Marosia now has a new set of <a href="https://www.marosia.com/rules.php">Rules</a> and a brand new <a href="https://www.marosia.com/etiquette.php">Etiquette Guidelines</a>. Please check them out!</p></center>
 <table role="presentation" class="wikitable" style="width:100%;text-align:center;">
@@ Line 24: / Line 28: @@
                             <td width="25%;"><a rel="nofollow" target="_blank" class="external text" href="https://marosia.com/">Official Site</a>
                             </td>
-                            <td width="25%;"><a rel="nofollow" target="_blank" class="external text" href="https://discordapp.com/invite/ZezgVWg">Official Discord</a>
+                            <td width="25%;"><a rel="nofollow" target="_blank" class="external text" href="https://discord.gg/j5pVdZb8Rr">Official Discord Entry Server</a>
                             </td>
                             <td width="25%;"><a rel="nofollow" target="_blank" class="external text" href="https://www.patreon.com/Marosia">Patreon Support</a>
@@ Line 41: / Line 45: @@
                             </td>
                             <td width="25%;"><a rel="nofollow" target="_blank" class="external text" href="http://www.marosia.com/doku/doku.php?id=account_settings">Account Settings</a>
+                            </td>
+                        </tr></tbody>
+                    </table>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <p>
+                    <table role="presentation" class="plainlinkswhite" style="width:100%;">
+                        <tbody><tr>
+                            <td width="25%;"><a rel="nofollow" target="_blank" class="external text" href="https://www.marosia.com/etiquette.php">Etiquette Guidelines</a>
+                            </td>
+                            <td width="25%;"><a rel="nofollow" target="_blank" class="external text" href="https://www.marosia.com/doku/doku.php?id=staff">Staff</a>
+                            </td>
+                            <td width="25%;"><a rel="nofollow" target="_blank" class="external text" href="https://www.marosia.com/doku/doku.php?id=ban_list">Ban List</a>
                             </td>
                         </tr></tbody>
@@ Line 50: / Line 69: @@
     </td>
 </table>
-<p>
-<p style="text-align:center;"><a href="https://www.marosia.com/doku/doku.php?id=recent_changes">Recent Changes</a>
 <hr>
-<p style="text-align:center;"><a href="https://www.marosia.com/doku/doku.php?id=ban_list">Ban List</a></p>
 <table class="wikitable" style="width:100%; border: none;">
     <tbody>
@@ Line 61: / Line 77: @@
         </tr>
         <tr>
-            <td style="float:left;padding: 15px;border: none;">Marosia is a free text based roleplaying game (currently in testing). It is an RPG in a fantasy setting with open world society simulation mechanics. The player can create a character through instant spawning, or through the family system with a selection of different races. Once your character steps into the world, what you do is up to you, as the freedom to play whatever sort of character you want allows infinite possibilities.
+            <td style="float:left;padding: 15px;border: none;">Marosia is a free text based roleplaying game. It is an RPG in a fantasy setting with open world society simulation mechanics. The player can create a character through instant spawning, or through the family system with a selection of different races. Once your character steps into the world, what you do is up to you, as the freedom to play whatever sort of character you want allows infinite possibilities.
             </td>
         </tr>
@@ Line 80: / Line 96: @@
                                             <a href="http://www.marosia.com/doku/doku.php?id=stats">Stats</a><br>
                                             <a href="http://www.marosia.com/doku/doku.php?id=spawning">Spawning</a><br>
+                                            <a href="http://www.marosia.com/doku/doku.php?id=reincarnation">Reincarnation</a><br>
                                             <a href="http://www.marosia.com/doku/doku.php?id=communication">Communication</a><br>
                                             <a href="http://www.marosia.com/doku/doku.php?id=combat">Combat and Injury</a><br>
@@ Line 131: / Line 148: @@
                                             <a href="http://www.marosia.com/doku/doku.php?id=guards">Guards</a><br>
                                             <a href="http://www.marosia.com/doku/doku.php?id=groups">Groups</a><br>
-                                            <a href="http://www.marosia.com/doku/doku.php?id=religion">Religion</a><br>
+                                            <a href="http://www.marosia.com/doku/doku.php?id=religion">Religion - Gods</a><br>
+                                            <a href="https://www.marosia.com/doku/doku.php?id=avatars">Religion - Avatars</a><br>
                                             <a href="http://www.marosia.com/doku/doku.php?id=magic">Magic</a><br>
                                         </p>