[9752] Add storage for min/maxgold of gameobject

Signed-off-by: NoFantasy <nofantasy@nf.no>
mangos · Apr 16, 2010 · eeb51e5 · eeb51e5 · waza123 · Apr 16, 2010
1 parent 087eded
commit eeb51e5
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 5 deletions.
diff --git a/sql/mangos.sql b/sql/mangos.sql
@@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
   `cache_id` int(10) default '0',
-  `required_9747_01_mangos_battleground_template` bit(1) default NULL
+  `required_9752_01_mangos_gameobject_template` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -1902,6 +1902,8 @@ CREATE TABLE `gameobject_template` (
   `data21` int(10) unsigned NOT NULL default '0',
   `data22` int(10) unsigned NOT NULL default '0',
   `data23` int(10) unsigned NOT NULL default '0',
+  `mingold` mediumint(8) unsigned NOT NULL default '0',
+  `maxgold` mediumint(8) unsigned NOT NULL default '0',
   `ScriptName` varchar(64) NOT NULL default '',
   PRIMARY KEY  (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Gameobject System';

diff --git a/sql/updates/9752_01_mangos_gameobject_template.sql b/sql/updates/9752_01_mangos_gameobject_template.sql
@@ -0,0 +1,4 @@
+ALTER TABLE db_version CHANGE COLUMN required_9747_01_mangos_battleground_template required_9752_01_mangos_gameobject_template bit;
+
+ALTER TABLE gameobject_template ADD COLUMN mingold MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER data23;
+ALTER TABLE gameobject_template ADD COLUMN maxgold MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER mingold;
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
@@ -122,6 +122,7 @@ pkgdata_DATA = \
 	9747_01_mangos_battleground_template.sql \
 	9748_01_realmd_realmlist.sql \
 	9751_01_characters.sql \
+	9752_01_mangos_gameobject_template.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -224,4 +225,5 @@ EXTRA_DIST = \
 	9747_01_mangos_battleground_template.sql \
 	9748_01_realmd_realmlist.sql \
 	9751_01_characters.sql \
+	9752_01_mangos_gameobject_template.sql \
 	README
diff --git a/src/game/GameObject.h b/src/game/GameObject.h
@@ -396,6 +396,9 @@ struct GameObjectInfo
             uint32 data[24];
         } raw;
     };
+
+    uint32 MinMoneyLoot;
+    uint32 MaxMoneyLoot;
     uint32 ScriptId;
 
     // helpers

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
@@ -7652,6 +7652,7 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type)
                     sLog.outDebug("       if(lootid)");
                     loot->clear();
                     loot->FillLoot(lootid, LootTemplates_Gameobject, this, false);
+                    loot->generateMoneyLoot(go->GetGOInfo()->MinMoneyLoot, go->GetGOInfo()->MaxMoneyLoot);
                 }
 
                 if (loot_type == LOOT_FISHING)

diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp
@@ -31,8 +31,8 @@ const char CreatureDataAddonInfofmt[]="iiiiiis";
 const char CreatureModelfmt[]="iffbi";
 const char CreatureInfoAddonInfofmt[]="iiiiiis";
 const char EquipmentInfofmt[]="iiii";
-const char GameObjectInfosrcfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiis";
-const char GameObjectInfodstfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii";
+const char GameObjectInfosrcfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiis";
+const char GameObjectInfodstfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii";
 const char ItemPrototypesrcfmt[]="iiiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiiifiiisiiiii";
 const char ItemPrototypedstfmt[]="iiiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiiifiiiiiiiii";
 const char PageTextfmt[]="isi";

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9751"
+ #define REVISION_NR "9752"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h
@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
  #define REVISION_DB_CHARACTERS "required_9751_01_characters"
- #define REVISION_DB_MANGOS "required_9747_01_mangos_battleground_template"
+ #define REVISION_DB_MANGOS "required_9752_01_mangos_gameobject_template"
  #define REVISION_DB_REALMD "required_9748_01_realmd_realmlist"
 #endif // __REVISION_SQL_H__