Преглед изворни кода

* Merged changes up to eAthena 15086.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15926 54d463be-8e91-2dee-dedb-b68131a5f0ec
eathenabot пре 13 година
родитељ
комит
490bd54958
3 измењених фајлова са 11 додато и 3 уклоњено
  1. 1 1
      sql-files/logs.sql
  2. 3 0
      sql-files/upgrade_svn15926_log.sql
  3. 7 2
      src/map/pc.c

+ 1 - 1
sql-files/logs.sql

@@ -31,7 +31,7 @@ CREATE TABLE `zenylog` (
   `time` datetime NOT NULL default '0000-00-00 00:00:00',
   `char_id` int(11) NOT NULL default '0',
   `src_id` int(11) NOT NULL default '0',
-  `type` enum('M','T','V','S','N','A','E','B','I') NOT NULL default 'S',
+  `type` enum('M','T','V','S','N','A','E','B','I','D') NOT NULL default 'S',
   `amount` int(11) NOT NULL default '0',
   `map` varchar(11) NOT NULL default '',
   PRIMARY KEY  (`id`),

+ 3 - 0
sql-files/upgrade_svn15926_log.sql

@@ -0,0 +1,3 @@
+-- Adds 'D' to `type` in `zenylog`
+
+ALTER TABLE `zenylog` MODIFY `type` ENUM('M','T','V','S','N','A','E','B','I','D') NOT NULL DEFAULT 'S';

+ 7 - 2
src/map/pc.c

@@ -4368,10 +4368,15 @@ int pc_steal_coin(struct map_session_data *sd,struct block_list *target)
 	if( (md->class_ >= 1324 && md->class_ < 1364) || (md->class_ >= 1938 && md->class_ < 1946) )
 		return 0;
 
+	// FIXME: This formula is either custom or outdated.
 	skill = pc_checkskill(sd,RG_STEALCOIN)*10;
 	rate = skill + (sd->status.base_level - md->level)*3 + sd->battle_status.dex*2 + sd->battle_status.luk*2;
-	if(rnd()%1000 < rate) {
-		pc_getzeny(sd,md->level*10 + rnd()%100);
+	if(rnd()%1000 < rate)
+	{
+		int amount = md->level*10 + rand()%100;
+
+		log_zeny(sd, LOG_TYPE_STEAL, sd, amount);
+		pc_getzeny(sd, amount);
 		md->state.steal_coin_flag = 1;
 		return 1;
 	}