Merge branch 'develop'

Havana-Server/src/main/java/org/alexdev/havana/util/config/writer/GameConfigWriter.java

@@ -65,7 +65,7 @@ public class GameConfigWriter implements ConfigWriter {
         config.put("battleball.ticket.charge", "2");
         config.put("battleball.increase.points", "true");
 
-        config.put("snowstorm.create.game.enabled", "false");
+        config.put("snowstorm.create.game.enabled", "true");
         config.put("snowstorm.start.minimum.active.teams", "2");
         config.put("snowstorm.preparing.game.seconds", "10"); // 5, 4, 3, 2, 1 - then destruction of 1
         config.put("snowstorm.game.lifetime.seconds", "0");

Havana-Web/src/main/java/org/alexdev/http/util/config/WebServerConfigWriter.java

@@ -26,7 +26,7 @@ public class WebServerConfigWriter implements ConfigWriter {
         config.put("mysql.database", "havana");
 
         config.put("template.directory", "tools/www-tpl");
-        config.put("template.name", "default");
+        config.put("template.name", "default-en");
         return config;
     }
 

tools/havana.sql

@@ -56040,7 +56040,7 @@ DELETE FROM `rooms`;
 /*!40000 ALTER TABLE `rooms` DISABLE KEYS */;
 INSERT INTO `rooms` (`id`, `owner_id`, `category`, `name`, `description`, `model`, `ccts`, `wallpaper`, `floor`, `landscape`, `showname`, `superusers`, `accesstype`, `password`, `visitors_now`, `visitors_max`, `rating`, `icon_data`, `group_id`, `is_hidden`, `created_at`, `updated_at`) VALUES
 	(1, '0', 3, 'Welcome Lounge', 'welcome_lounge', 'newbie_lobby', 'hh_room_nlobby', 0, 0, '0.0', 0, 0, 0, '', 0, 40, 0, '0|0|', 1000, 0, '2018-08-11 07:54:01', '2021-11-02 11:13:09'),
-	(2, '0', 5, 'Theatredome', 'theatredrome', 'theater', 'hh_room_theater_carneval', 0, 0, '0.0', 0, 0, 0, '', 0, 100, 0, '0|0|', 2398, 0, '2018-08-11 07:54:01', '2022-09-03 12:32:33'),
+	(2, '0', 5, 'Theatredome', 'theatredrome', 'theater', 'hh_room_theater', 0, 0, '0.0', 0, 0, 0, '', 0, 100, 0, '0|0|', 2398, 0, '2018-08-11 07:54:01', '2022-09-03 12:32:33'),
 	(3, '0', 5, 'Library', 'library', 'library', 'hh_room_library', 0, 0, '0.0', 0, 0, 0, '', 0, 30, 0, '0|0|', 6645, 0, '2018-08-11 07:54:01', '2021-11-02 11:13:32'),
 	(4, '0', 5, 'TV Studio', 'tv_studio', 'tv_studio', 'hh_room_tv_studio_general', 0, 0, '0.0', 0, 0, 0, '', 0, 20, 0, '0|0|', 0, 0, '2018-08-11 07:54:01', '2021-11-02 10:55:29'),
 	(5, '0', 5, 'Cinema', 'habbo_cinema', 'cinema_a', 'hh_room_cinema', 0, 0, '0.0', 0, 0, 0, '', 0, 50, 0, '0|0|', 0, 0, '2018-08-11 07:54:01', '2022-09-03 12:32:42'),

tools/www-tpl/default-en/base/tag_search.tpl

@@ -29,7 +29,7 @@
 					{% if habboTag.getUserId() > 0 %}
 					{% set player = habboTag.getUserData() %}
 					<td class="image" style="width:39px;">
-						<img src="https://cdn.classichabbo.com/habbo-imaging/avatarimage?figure={{ player.figure }}&size=s" alt="" align="left"/>
+						<img src="{{ site.habboImagingPath }}/habbo-imaging/avatarimage?figure={{ player.figure }}&size=s" alt="" align="left"/>
 					</td>
 					<td class="text">
 						<a href="{{ site.sitePath }}/home/{{ player.getName() }}" class="result-title">{{ player.getName() }}</a><br/>

tools/www-tpl/default-en/community.tpl

@@ -326,7 +326,7 @@ var discussionMoreDataHelper = new MoreDataHelper("discussions-toggle-more-data-
                     </div>
                 </div>
                 <input type="hidden" id="active-habbo-url-{{ num }}" value="{{ site.sitePath }}/home/{{ habbo.getName() }}"/>
-                <input type="hidden" id="active-habbo-image-{{ num }}" class="active-habbo-image" value="https://cdn.classichabbo.com/habbo-imaging/avatarimage?figure={{ habbo.getFigure() }}&size=b&direction=4&head_direction=4&crr=0&gesture=sml&frame=1
+                <input type="hidden" id="active-habbo-image-{{ num }}" class="active-habbo-image" value="{{ site.habboImagingPath }}/habbo-imaging/avatarimage?figure={{ habbo.getFigure() }}&size=b&direction=4&head_direction=4&crr=0&gesture=sml&frame=1
 " />
 {% set num = num + 1 %}
 {% endfor %}

tools/www-tpl/default-en/games.tpl

@@ -8,9 +8,9 @@
 <script type="text/javascript">
 var andSoItBegins = (new Date()).getTime();
 </script>
-    <link rel="shortcut icon" href="https://cdn.classichabbo.com/web-gallery/v2/favicon.ico" type="image/vnd.microsoft.icon" />
+    <link rel="shortcut icon" href="{{ site.staticContentPath }}/web-gallery/v2/favicon.ico" type="image/vnd.microsoft.icon" />
     <link rel="alternate" type="application/rss+xml" title="Habbo: RSS" href="https://classichabbo.com/articles/rss.xml" />
-<script src="https://cdn.classichabbo.com/web-gallery/static/js/libs2.js" type="text/javascript"></script>
+<script src="{{ site.staticContentPath }}/web-gallery/static/js/libs2.js" type="text/javascript"></script>
 <script src="{{ site.staticContentPath }}/web-gallery/static/js/visual.js" type="text/javascript"></script>
 <script src="{{ site.staticContentPath }}/web-gallery/static/js/libs.js" type="text/javascript"></script>
 <script src="{{ site.staticContentPath }}/web-gallery/static/js/common.js" type="text/javascript"></script>

tools/www-tpl/default-en/groups/discussion_replies.tpl

@@ -94,7 +94,7 @@
 		{% endif %}
 		<div class="post-list-posts post-list-creator-info">Messages: {{ reply.getForumMessages() }}</div>
 		<div class="clearfix">
-            <div class="post-list-creator-avatar"><img src="https://cdn.classichabbo.com/habbo-imaging/avatarimage?figure={{ reply.getFigure() }}&size=b&direction=2&head_direction=2&crr=0&gesture=&frame=1" alt="" /></div>
+            <div class="post-list-creator-avatar"><img src="{{ site.habboImagingPath }}/habbo-imaging/avatarimage?figure={{ reply.getFigure() }}&size=b&direction=2&head_direction=2&crr=0&gesture=&frame=1" alt="" /></div>
             <div class="post-list-group-badge">
 			{% if reply.hasGroupBadge() %}
 			<a href="{{ site.sitePath }}/groups/{{ reply.getGroupId() }}/id">

tools/www-tpl/default-en/groups/discussions/previewpost.tpl

@@ -10,7 +10,7 @@
 		<div class="post-list-posts post-list-creator-info">Messages: {{ userReplies }}</div>
 		<div class="clearfix">
             <div class="post-list-creator-avatar">
-			<img src="https://cdn.classichabbo.com/habbo-imaging/avatarimage?figure={{ playerDetails.figure }}&size=b&direction=2&head_direction=2&crr=0&gesture=&frame=1" alt="" />
+			<img src="{{ site.habboImagingPath }}/habbo-imaging/avatarimage?figure={{ playerDetails.figure }}&size=b&direction=2&head_direction=2&crr=0&gesture=&frame=1" alt="" />
 			</div>
 			{% if hasGroup %}
             <div class="post-list-group-badge">

tools/www-tpl/default-en/groups/discussions/previewtopic.tpl

@@ -10,7 +10,7 @@
 		<div class="post-list-posts post-list-creator-info">Messages: {{ userReplies }}</div>
 		<div class="clearfix">
             <div class="post-list-creator-avatar">
-			<img src="https://cdn.classichabbo.com/habbo-imaging/avatarimage?figure={{ playerDetails.figure }}&size=b&direction=2&head_direction=2&crr=0&gesture=&frame=1" alt="" />
+			<img src="{{ site.habboImagingPath }}/habbo-imaging/avatarimage?figure={{ playerDetails.figure }}&size=b&direction=2&head_direction=2&crr=0&gesture=&frame=1" alt="" />
 			</div>
 			{% if hasGroup %}
             <div class="post-list-group-badge">

tools/www-tpl/default-en/habblet/invite_searchContent.tpl

@@ -2,7 +2,7 @@
 <ul class="habblet-list">
 				{% set num = 0 %}
 					{% for details in searchResults %}
-						{% if num % 2 == 0 %}<li class="even {% else %}<li class="odd{% endif %} offline" homeurl="{{ site.sitePath }}/home/{{ details.getName() }}" style="background-image: url(https://cdn.classichabbo.com/habbo-imaging/avatarimage?figure={{ details.figure }}&size=s&direction=2&head_direction=2&crr=0&gesture=sml&frame=1)">
+						{% if num % 2 == 0 %}<li class="even {% else %}<li class="odd{% endif %} offline" homeurl="{{ site.sitePath }}/home/{{ details.getName() }}" style="background-image: url({{ site.habboImagingPath }}/habbo-imaging/avatarimage?figure={{ details.figure }}&size=s&direction=2&head_direction=2&crr=0&gesture=sml&frame=1)">
 	            	    <div class="item">
 	            		    <b>{{ details.getName() }}</b><br />
 

tools/www-tpl/default-en/habblet/minimail/minimail_messages.tpl

@@ -56,7 +56,7 @@
 				<span class="message-tstamp" isotime="{{ minimailMessage.getIsoDate() }}" title="{{ minimailMessage.getDate() }}">
 					{{ minimailMessage.getDate() }}
 				</span>
-				<img src="https://cdn.classichabbo.com/habbo-imaging/avatarimage?figure={{ minimailMessage.getAuthor().getFigure() }}&size=s&direction=9&head_direction=2&crr=0&gesture=sml&frame=1" />
+				<img src="{{ site.habboImagingPath }}/habbo-imaging/avatarimage?figure={{ minimailMessage.getAuthor().getFigure() }}&size=s&direction=9&head_direction=2&crr=0&gesture=sml&frame=1" />
 				{% if minimailLabel == "sent" %}
 				<span class="message-sender" title="To: {{ minimailMessage.getTarget().getName() }}">To: {{ minimailMessage.getTarget().getName() }}</span>
 				{% elseif minimailLabel == "inbox" %}