summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-09-14 17:10:25 -0300
committerJesusaves <cpntb1@ymail.com>2019-09-14 17:10:25 -0300
commit461cfea13591b59d9ac900791e399f33d5359194 (patch)
treefff56730688732214dc19c685d6537753aa30aeb
parent97c7d8f3041ff10eff44933a3d16437dc7eaef54 (diff)
downloadserverdata-461cfea13591b59d9ac900791e399f33d5359194.tar.gz
serverdata-461cfea13591b59d9ac900791e399f33d5359194.tar.bz2
serverdata-461cfea13591b59d9ac900791e399f33d5359194.tar.xz
serverdata-461cfea13591b59d9ac900791e399f33d5359194.zip
Tabulation fixes
-rw-r--r--db/re/item_db.conf74
-rw-r--r--db/re/mob_db.conf22
2 files changed, 48 insertions, 48 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 62961b769..ff27d6da2 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -322,8 +322,8 @@ item_db: (
ViewSprite: 508
UseEffect: "EFFECT_HEAL"
Script: <"
- if (rand(10000) < 1000)
- sc_start SC_POISON, 7000, 0;
+ if (rand(10000) < 1000)
+ sc_start SC_POISON, 7000, 0;
@type = 1;
@rarity=2;
doevent "rand_sc_heal::OnUse";
@@ -993,11 +993,11 @@ item_db: (
Delay: 500
UseEffect: "EFFECT_HEAL"
Script: <"
- /*
+ /*
@type = 1;
@rarity=4;
doevent "rand_sc_heal::OnUse";
- */
+ */
@taste = 5;
@Alcohol = 7;
doevent "alcohol_sc::OnUse";
@@ -1501,10 +1501,10 @@ item_db: (
Script: <"
@type = 3;
@rarity=2;
- .@val=rand(32,96);
- // Re-roll
- if (.@val > 64)
- .@val=rand(32,96);
+ .@val=rand(32,96);
+ // Re-roll
+ if (.@val > 64)
+ .@val=rand(32,96);
itemheal 0, .@val;
sc_start SC_ATTHASTE_POTION1, 10000, 3;
doevent "rand_sc_heal::OnUse";
@@ -2226,7 +2226,7 @@ item_db: (
$REFERRAL_IDS[#REFERRAL_PROG]=$REFERRAL_IDS[#REFERRAL_PROG]+1;
// I can't warrant this won't break stuff so I left commented out
//message(#REFERRAL_PROG, strcharinfo(0)+" accepted your invite to play TMW2.");
- .@charid=callfunc("gf_charid", #REFERRAL_PROG);
+ .@charid=callfunc("gf_charid", #REFERRAL_PROG);
rodex_sendmail(.@charid, "TMW2 Team", "Invite Accepted", strcharinfo(0)+" accepted your invite and got level 5!\nAs they get stronger, more rewards will be sent to you!", rand(25,50));
}
">
@@ -2681,7 +2681,7 @@ item_db: (
Script: <"
// We would want warp to be delayed a bit but meh
sleep2(rand(1000,2500));
- @timer_navio_running=0;
+ @timer_navio_running=0;
warp "Save", 0, 0;
">
},
@@ -10738,8 +10738,8 @@ item_db: (
Script: <"
if (getskilllv(TF_STEAL)) {
addtoskill(TF_STEAL, 1, 2);
- bonus bAddStealRate,10;
- }
+ bonus bAddStealRate,10;
+ }
">
},
{
@@ -14404,22 +14404,22 @@ item_db: (
noauction: true
}
Script: <"
- if (BaseLevel >= 80)
- .@v1=50;
- if (BaseLevel >= 60)
- .@v2=250;
- else
- .@v2=BaseLevel*2;
- if (BaseLevel >= 40) {
- .@v3=1250;
- .@v4=5750;
- .@v5=4250;
- } else {
- .@v3=BaseLevel*3;
- .@v4=3750;
- .@v5=6250;
- }
- callfunc "merc_boxset", .@v1, .@v2, .@v3, .@v4, .@v5;
+ if (BaseLevel >= 80)
+ .@v1=50;
+ if (BaseLevel >= 60)
+ .@v2=250;
+ else
+ .@v2=BaseLevel*2;
+ if (BaseLevel >= 40) {
+ .@v3=1250;
+ .@v4=5750;
+ .@v5=4250;
+ } else {
+ .@v3=BaseLevel*3;
+ .@v4=3750;
+ .@v5=6250;
+ }
+ callfunc "merc_boxset", .@v1, .@v2, .@v3, .@v4, .@v5;
">
},
{
@@ -14440,7 +14440,7 @@ item_db: (
noauction: true
}
Script: <"
- callfunc "merc_boxset", 100, 600, 2100, 5600, 4400;
+ callfunc "merc_boxset", 100, 600, 2100, 5600, 4400;
">
},
{
@@ -14461,7 +14461,7 @@ item_db: (
noauction: true
}
Script: <"
- callfunc "merc_boxset", 200, 1200, 4200, 9200, 800;
+ callfunc "merc_boxset", 200, 1200, 4200, 9200, 800;
">
},
{
@@ -14482,7 +14482,7 @@ item_db: (
noauction: true
}
Script: <"
- callfunc "merc_boxset", 400, 1600, 5800, 7200, 600;
+ callfunc "merc_boxset", 400, 1600, 5800, 7200, 600;
">
},
{
@@ -14503,7 +14503,7 @@ item_db: (
noauction: true
}
Script: <"
- callfunc "merc_boxset", 1000, 5400, 5700, 3200, 300;
+ callfunc "merc_boxset", 1000, 5400, 5700, 3200, 300;
">
},
{
@@ -14524,7 +14524,7 @@ item_db: (
noauction: true
}
Script: <"
- callfunc "merc_boxset", BaseLevel/40, BaseLevel/20, BaseLevel, BaseLevel*2, 9000;
+ callfunc "merc_boxset", BaseLevel/40, BaseLevel/20, BaseLevel, BaseLevel*2, 9000;
">
},
{
@@ -14545,7 +14545,7 @@ item_db: (
noauction: true
}
Script: <"
- callfunc "merc_boxset", BaseLevel/40, BaseLevel/20, BaseLevel, 9000, BaseLevel*2;
+ callfunc "merc_boxset", BaseLevel/40, BaseLevel/20, BaseLevel, 9000, BaseLevel*2;
">
},
{
@@ -14566,7 +14566,7 @@ item_db: (
noauction: true
}
Script: <"
- callfunc "merc_boxset", BaseLevel/40, BaseLevel/20, 9000, BaseLevel, BaseLevel*2;
+ callfunc "merc_boxset", BaseLevel/40, BaseLevel/20, 9000, BaseLevel, BaseLevel*2;
">
},
{
@@ -14587,7 +14587,7 @@ item_db: (
noauction: true
}
Script: <"
- callfunc "merc_boxset", BaseLevel/40, 9000, BaseLevel/20, BaseLevel, BaseLevel*2;
+ callfunc "merc_boxset", BaseLevel/40, 9000, BaseLevel/20, BaseLevel, BaseLevel*2;
">
},
{
@@ -14608,7 +14608,7 @@ item_db: (
noauction: true
}
Script: <"
- callfunc "merc_boxset", 9000, BaseLevel/40, BaseLevel/20, BaseLevel, BaseLevel*2;
+ callfunc "merc_boxset", 9000, BaseLevel/40, BaseLevel/20, BaseLevel, BaseLevel*2;
">
},
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 6e90bb2d7..812effb65 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -86,7 +86,7 @@ mob_db: (
AttackDelay: attack delay (int, defaults to 4000)
AttackMotion: attack motion (int, defaults to 2000)
DamageMotion: damage motion (int, defaults to 0)
- // SpawnCollision - Support dropped (tmw2 dd7d9ed)
+ // SpawnCollision - Support dropped (tmw2 dd7d9ed)
//SpawnCollisionSize: collision size (int, defaults to -1)
//SpawnCollisionMask: collision mask (int, defaults to 1)
MvpExp: mvp experience (int, defaults to 0)
@@ -1954,8 +1954,8 @@ mob_db: (
CanAttack: false
}
Drops: {
- CobaltHerb: 1600
- ArtichokeHerb: 900
+ CobaltHerb: 1600
+ ArtichokeHerb: 900
Acorn: 750
MauveHerb: 600
GambogeHerb: 300
@@ -1986,12 +1986,12 @@ mob_db: (
CanAttack: false
}
Drops: {
- Acorn: 1800
- GambogeHerb: 1600
- Acorn: 1000
- ArtichokeHerb: 900
- MauveHerb: 600
- CobaltHerb: 300
+ Acorn: 1800
+ GambogeHerb: 1600
+ Acorn: 1000
+ ArtichokeHerb: 900
+ MauveHerb: 600
+ CobaltHerb: 300
SquirrelPelt: 160
AlizarinHerb: 100
ShadowHerb: 25
@@ -8941,11 +8941,11 @@ mob_db: (
WarlordHelmet: 1
WarlordPlate: 1
}
- // Good defense against all type of weapons
+ // Good defense against all type of weapons
WeaponAttacks: {
All: 7500
}
- // Most powerful attack skills are almost entirely nullified
+ // Most powerful attack skills are almost entirely nullified
SkillAttacks: {
MG_FIREBALL: 5000
MG_NAPALMBEAT: 5000