Changeset 172

Timestamp:

12/15/09 18:08:17 (9 months ago)

Author:

sausage

Message:

Jukeboxes,
Fix hook functions with object handle arguments

Location:

eoserv/trunk

Files:

• config.extra.ini (modified) (1 diff)
• config.ini (modified) (1 diff)
• src/character.cpp (modified) (2 diffs)
• src/character.hpp (modified) (2 diffs)
• src/handlers/Jukebox.cpp (modified) (3 diffs)
• src/handlers/Walk.cpp (modified) (1 diff)
• src/hook.cpp (modified) (1 diff)
• src/hook.hpp (modified) (1 diff)
• src/main.cpp (modified) (1 diff)
• src/map.cpp (modified) (1 diff)
• src/map.hpp (modified) (2 diffs)

eoserv/trunk/config.extra.ini

@@ -74 +74 @@
 ## BankUpgradeStep (number)
 # Amount extra each upgrade costs
-BankUpgradeStep  = 1000
+BankUpgradeStep = 1000
+
+## JukeboxSongs (number)
+# Number of songs a jukebox has
+JukeboxSongs = 20
+
+## JukeboxPrice (number)
+# Cost to play a song on a jukebox
+JukeboxPrice = 25
 
 

eoserv/trunk/config.ini

@@ -480 +480 @@
 Deadly = no
 
+## JukeboxTimer (number)
+# Amount of time to lock a jukebox after a song is requested
+# 0 to disable
+JukeboxTimer = 1m30s
+
 
 ## RATES ##

eoserv/trunk/src/character.cpp

@@ -214 +214 @@
         this->party = 0;
         this->map = this->world->GetMap(0);
+
+        this->jukebox_open = false;
 }
 
@@ -733 +735 @@
         this->y = y;
         this->sitting = SIT_STAND;
+
+        this->shop_npc = 0;
+        this->bank_npc = 0;
+        this->jukebox_open = true;
 
         this->warp_anim = animation;

eoserv/trunk/src/character.hpp

@@ -111 +111 @@
                 NPC *shop_npc;
                 NPC *bank_npc;
+                bool jukebox_open;
 
                 WarpAnimation warp_anim;
@@ -250 +251 @@
                 SCRIPT_REGISTER_VARIABLE("NPC @", " shop_npc", shop_npc);
                 SCRIPT_REGISTER_VARIABLE("NPC @", " bank_npc", bank_npc);
+                SCRIPT_REGISTER_VARIABLE("bool", " jukebox_open", jukebox_open);
                 SCRIPT_REGISTER_VARIABLE("WarpAnimation", "warp_anim", warp_anim);
                 SCRIPT_REGISTER_VARIABLE("PtrList<Character_Item>", "inventory", inventory);

eoserv/trunk/src/handlers/Jukebox.cpp

@@ -6 +6 @@
 
 #include "handlers.h"
+
+#include "map.hpp"
 
 CLIENT_F_FUNC(Jukebox)
@@ -15 +17 @@
                 case PACKET_OPEN: // Opened the jukebox listing
                 {
+                        if (this->state < EOClient::PlayingModal) return false;
 
+                        unsigned char x = reader.GetChar();
+                        unsigned char y = reader.GetChar();
+
+                        if (!this->player->character->InRange(x, y)
+                         || this->player->character->map->GetSpec(x, y) != Map_Tile::Jukebox)
+                        {
+                                return true;
+                        }
+
+                        reply.SetID(PACKET_JUKEBOX, PACKET_OPEN);
+                        reply.AddShort(this->player->character->mapid);
+
+                        if (this->player->character->map->jukebox_protect > Timer::GetTime())
+                        {
+                                reply.AddString(this->player->character->map->jukebox_player);
+                        }
+
+                        this->player->character->jukebox_open = true;
+
+                        CLIENT_SEND(reply);
                 }
                 break;
@@ -21 +44 @@
                 case PACKET_MSG: // Requested a song
                 {
+                        if (this->state < EOClient::PlayingModal) return false;
 
+                        reader.GetChar();
+                        reader.GetChar();
+                        short track = reader.GetShort();
+
+                        if (!this->player->character->jukebox_open
+                         || this->player->character->map->jukebox_protect > Timer::GetTime()
+                         || (track < 0 || track > static_cast<int>(this->server->world->config["JukeboxSongs"]))
+                         || this->player->character->HasItem(1) < static_cast<int>(this->server->world->config["JukeboxPrice"]))
+                        {
+                                return true;
+                        }
+
+                        this->player->character->DelItem(1, static_cast<int>(this->server->world->config["JukeboxPrice"]));
+
+                        this->player->character->map->jukebox_player = this->player->character->name;
+                        this->player->character->map->jukebox_protect = Timer::GetTime() + static_cast<int>(this->server->world->config["JukeboxTimer"]);
+
+                        reply.SetID(PACKET_JUKEBOX, PACKET_AGREE);
+                        reply.AddInt(this->player->character->HasItem(1));
+
+                        CLIENT_SEND(reply);
+
+                        PacketBuilder builder(PACKET_JUKEBOX, PACKET_USE);
+                        builder.AddShort(track + 1);
+                        UTIL_PTR_LIST_FOREACH(this->player->character->map->characters, Character, character)
+                        {
+                                character->player->client->SendBuilder(builder);
+                        }
                 }
                 break;

eoserv/trunk/src/handlers/Walk.cpp

@@ -52 +52 @@
                                         this->player->character->shop_npc = 0;
                                         this->player->character->bank_npc = 0;
+                                        this->player->character->jukebox_open = true;
                                         if (!this->player->character->Walk(direction))
                                         {

eoserv/trunk/src/hook.cpp

@@ -77 +77 @@
 #include <typeinfo>
 
-template <> void Hook_Call::SetArg<Shared *>(ScriptContext *ctx, int argc, Shared *arg) { printf("A %s [%i = %x]\n", typeid(arg).name(), argc, arg); ctx->as->SetArgAddress(argc, arg); }
 template <> void Hook_Call::SetArg<asBYTE>(ScriptContext *ctx, int argc, asBYTE arg)    { printf("A %s [%i = %i]\n", typeid(arg).name(), argc, arg); ctx->as->SetArgByte(argc, arg);    }
         template <> void Hook_Call::SetArg<char>(ScriptContext *ctx, int argc, char arg)      { return SetArg(ctx, argc, (asBYTE)arg); }

eoserv/trunk/src/hook.hpp

@@ -79 +79 @@
                 }
 
-                template <typename T> static void SetArg(ScriptContext *ctx, int argc, T arg) { ctx->as->SetArgObject(argc, &arg); }
+                template <typename T> static void SetArg(ScriptContext *ctx, int argc, T arg) { ctx->as->SetArgObject(argc, arg); }
 
                 template <typename T> Hook_Call &operator [](T arg)

eoserv/trunk/src/main.cpp

@@ -377 +377 @@
                 eoserv_config_default(config, "BankUpgradeBase"    , 1000);
                 eoserv_config_default(config, "BankUpgradeStep"    , 1000);
+                eoserv_config_default(config, "JukeboxSongs"       , 20);
+                eoserv_config_default(config, "JukeboxPrice"       , 25);
+                eoserv_config_default(config, "JukeboxTimer"       , 90);
                 eoserv_config_default(config, "MaxBankGold"        , 2000000000);
                 eoserv_config_default(config, "MaxItem"            , 10000000);

eoserv/trunk/src/map.cpp

@@ -213 +213 @@
         this->world = world;
         this->exists = false;
+        this->jukebox_protect = 0.0;
 
         if (world->arenas_config[util::to_string(id) + ".enabled"])

eoserv/trunk/src/map.hpp

@@ -279 +279 @@
                 PtrVector<PtrVector<Map_Tile> > tiles;
                 bool exists;
+                double jukebox_protect;
+                std::string jukebox_player;
 
                 Arena *arena;
@@ -357 +359 @@
                 SCRIPT_REGISTER_VARIABLE("PtrVector<PtrVector<Map_Tile>>", "tiles", tiles);
                 SCRIPT_REGISTER_VARIABLE("bool", "exists", exists);
+                SCRIPT_REGISTER_VARIABLE("double", "jukebox_protect", jukebox_protect);
+                SCRIPT_REGISTER_VARIABLE("string", "jukebox_player", jukebox_player);
                 SCRIPT_REGISTER_VARIABLE("Arena @", " arena", arena);
                 SCRIPT_REGISTER_FUNCTION("int GenerateItemID()", GenerateItemID);