From 13435cf37fc90cf6240334477f439e85ac735224 Mon Sep 17 00:00:00 2001 From: SilicaAndPina Date: Wed, 10 Mar 2021 01:29:57 +1300 Subject: [PATCH] add some real time riddles text --- DataCollection/gamedata.json | 2 ++ Horse Isle Server/HorseIsleServer/Game/Messages.cs | 5 +++++ .../HorseIsleServer/Server/GameDataJson.cs | 10 ++++++++++ Horse Isle Server/HorseIsleServer/Server/GameServer.cs | 6 ++++++ 4 files changed, 23 insertions(+) diff --git a/DataCollection/gamedata.json b/DataCollection/gamedata.json index 25b3e0d..1355316 100755 --- a/DataCollection/gamedata.json +++ b/DataCollection/gamedata.json @@ -63,6 +63,8 @@ "events":{ "real_time_riddle":{ "event_start":"CHAT RIDDLE: %RIDDLETEXT% (answer first via any chat method)", + "event_end":"TIME IS UP: No one answered the Chat Riddle in time.", + "event_won":"RIDDLE SOLVED! By player %PLAYERNAME%!", } }, "horse_leaser":{ diff --git a/Horse Isle Server/HorseIsleServer/Game/Messages.cs b/Horse Isle Server/HorseIsleServer/Game/Messages.cs index 20982d9..afcb579 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Messages.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Messages.cs @@ -29,6 +29,11 @@ namespace HISP.Game public static string SocialTypeFormat; public static string SocialPlayerNoLongerNearby; + // Events : Real Time Riddles + public static string EventStartRealTimeRiddleFormat; + public static string EventEndRealTimeRiddle; + public static string EventWonRealTimeRiddleFormat; + // Trading public static string TradeWithPlayerFormat; diff --git a/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs b/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs index 550ea2c..37e9656 100755 --- a/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs +++ b/Horse Isle Server/HorseIsleServer/Server/GameDataJson.cs @@ -849,21 +849,31 @@ namespace HISP.Server Map.ModIsleY = gameData.messages.commands.mod_isle.y; // Tag + Messages.TagYourItFormat = gameData.messages.meta.player_interaction.tag.tag_player; Messages.TagOtherBuddiesOnlineFormat = gameData.messages.meta.player_interaction.tag.total_buddies; // Add Buddy + Messages.AddBuddyPending = gameData.messages.meta.player_interaction.add_buddy.add_pending; Messages.AddBuddyOtherPendingFormat = gameData.messages.meta.player_interaction.add_buddy.other_pending; Messages.AddBuddyYourNowBuddiesFormat = gameData.messages.meta.player_interaction.add_buddy.add_confirmed; Messages.AddBuddyDeleteBuddyFormat = gameData.messages.meta.player_interaction.add_buddy.deleted; // Socials + Messages.SocialButton = gameData.messages.meta.player_interaction.socials.socials_button; Messages.SocialMessageFormat = gameData.messages.meta.player_interaction.socials.socials_message; Messages.SocialTypeFormat = gameData.messages.meta.player_interaction.socials.socials_menu_type; Messages.SocialPlayerNoLongerNearby = gameData.messages.meta.player_interaction.socials.no_longer_nearby; + + // Events : Real Time Riddle + + Messages.EventStartRealTimeRiddleFormat = gameData.messages.events.real_time_riddle.event_start; + Messages.EventEndRealTimeRiddle = gameData.messages.events.real_time_riddle.event_end; + Messages.EventWonRealTimeRiddleFormat = gameData.messages.events.real_time_riddle.event_won; + // Trade Messages.TradeWithPlayerFormat = gameData.messages.meta.player_interaction.trade.trading_with; diff --git a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs index 6b8ab72..aabaf45 100755 --- a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs +++ b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs @@ -190,6 +190,12 @@ namespace HISP.Server } } + if (RandomNumberGenerator.Next(0, 100) == 59) // Real Time Riddle + { + + } + + Database.IncPlayerTirednessForOfflineUsers(); // Offline player handling w sql magic...