summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-30 23:24:27 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-03-30 23:24:27 +0000
commit7403b1ec8ecf4ca40c5d8812330ec0ea9114b4c3 (patch)
tree216bcd825a9e2ca593f3484300db2b12a5898ec5 /src
parentda731af6a227b559fd128010f1f9b4da8e3f3c0c (diff)
downloadhercules-7403b1ec8ecf4ca40c5d8812330ec0ea9114b4c3.tar.gz
hercules-7403b1ec8ecf4ca40c5d8812330ec0ea9114b4c3.tar.bz2
hercules-7403b1ec8ecf4ca40c5d8812330ec0ea9114b4c3.tar.xz
hercules-7403b1ec8ecf4ca40c5d8812330ec0ea9114b4c3.zip
- Corrected damage of non-player casted Cart Revolution
- Removed enumeration item_group_list and replaced it by two defines, which is what the code really needs. Bumped the max number of item groups to 40. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10100 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/map.h41
2 files changed, 4 insertions, 39 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 715358142..596cdc55d 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1378,7 +1378,7 @@ static struct Damage battle_calc_weapon_attack(
if(sd && sd->cart_weight)
skillratio += 100*sd->cart_weight/battle_config.max_cart_weight; // +1% every 1% weight
else if (!sd)
- skillratio += 150; //Max damage for non players.
+ skillratio += 100; //Max damage for non players.
break;
case NPC_RANDOMATTACK:
skillratio += rand()%150-50;
diff --git a/src/map/map.h b/src/map/map.h
index 5765361fc..5e8b788bd 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -229,44 +229,9 @@ enum {
ELE_MAX
};
-enum {
- IG_BLUEBOX=1,
- IG_VIOLETBOX, //2
- IG_CARDALBUM, //3
- IG_GIFTBOX, //4
- IG_SCROLLBOX, //5
- IG_FINDINGORE, //6
- IG_COOKIEBAG, //7
- IG_POTION, //8
- IG_HERBS, //9
- IG_FRUITS, //10
- IG_MEAT, //11
- IG_CANDY, //12
- IG_JUICE, //13
- IG_FISH, //14
- IG_BOXES, //15
- IG_GEMSTONE, //16
- IG_JELLOPY, //17
- IG_ORE, //18
- IG_FOOD, //19
- IG_RECOVERY, //20
- IG_MINERALS, //21
- IG_TAMING, //22
- IG_SCROLLS, //23
- IG_QUIVERS, //24
- IG_MASKS, //25
- IG_ACCESORY, //26
- IG_JEWELS, //27
- IG_GIFTBOX_1, //28
- IG_GIFTBOX_2, //29
- IG_GIFTBOX_3, //30
- IG_GIFTBOX_4, //31
- IG_EGGBOY, //32
- IG_EGGGIRL, //33
- IG_GIFTBOXCHINA, //34
- IG_LOTTOBOX, //35
- MAX_ITEMGROUP,
-} item_group_list;
+//The onlu item group required by the code to be known.
+#define IG_FINDINGORE 6
+#define MAX_ITEMGROUP 40
enum {
ATF_SELF=0x01,