Compare commits
No commits in common. "master" and "feature/npcblockskills" have entirely different histories.
master
...
feature/np
@ -202634,17 +202634,6 @@ Body:
|
||||
}
|
||||
}
|
||||
}
|
||||
- Id: 480470
|
||||
AegisName: C_Summer_Beach
|
||||
Name: Costume Summer Beach # !todo check english name
|
||||
Type: Armor
|
||||
Locations:
|
||||
Costume_Garment: true
|
||||
ArmorLevel: 1
|
||||
Script: |
|
||||
hateffect HAT_EF_VACATION,true;
|
||||
UnEquipScript: |
|
||||
hateffect HAT_EF_VACATION,false;
|
||||
- Id: 490004
|
||||
AegisName: Atker_Ring
|
||||
Name: Attacker Booster Ring
|
||||
|
@ -80408,28 +80408,6 @@ Body:
|
||||
Name: Footprint Effect
|
||||
Type: Card
|
||||
SubType: Enchant
|
||||
Script: |
|
||||
hateffect FOOTPRINT_EF_BASE,true;
|
||||
UnEquipScript: |
|
||||
hateffect FOOTPRINT_EF_BASE,false;
|
||||
- Id: 313067
|
||||
AegisName: aegis_313067
|
||||
Name: Purple Star Footprint
|
||||
Type: Card
|
||||
SubType: Enchant
|
||||
Script: |
|
||||
hateffect FOOTPRINT_EF_PURPLESTAR,true;
|
||||
UnEquipScript: |
|
||||
hateffect FOOTPRINT_EF_PURPLESTAR,false;
|
||||
- Id: 313068
|
||||
AegisName: aegis_313068
|
||||
Name: Yellow Star Footprint
|
||||
Type: Card
|
||||
SubType: Enchant
|
||||
Script: |
|
||||
hateffect FOOTPRINT_EF_YELLOWSTAR,true;
|
||||
UnEquipScript: |
|
||||
hateffect FOOTPRINT_EF_YELLOWSTAR,false;
|
||||
- Id: 313070
|
||||
AegisName: Ep21_4_Def
|
||||
Name: Forest Magic Orb (Physical Defense)
|
||||
@ -81918,15 +81896,6 @@ Body:
|
||||
Script: |
|
||||
bonus bLongAtkRate,getskilllv("SH_HOWLING_OF_CHUL_HO");
|
||||
bonus bBaseAtk,4*getskilllv("SH_HOWLING_OF_CHUL_HO");
|
||||
- Id: 313345
|
||||
AegisName: aegis_313345
|
||||
Name: Puppy Footprint
|
||||
Type: Card
|
||||
SubType: Enchant
|
||||
Script: |
|
||||
hateffect FOOTPRINT_EF_DOGFOOT,true;
|
||||
UnEquipScript: |
|
||||
hateffect FOOTPRINT_EF_DOGFOOT,false;
|
||||
- Id: 1000000
|
||||
AegisName: IDTest_event
|
||||
Name: IDTest event
|
||||
@ -89471,11 +89440,6 @@ Body:
|
||||
Name: Footprint Effect (Garment)
|
||||
Type: Etc
|
||||
Weight: 100
|
||||
- Id: 1001617
|
||||
AegisName: PurpleStar_Foot_Robe
|
||||
Name: Purple Star Footprint (Garment)
|
||||
Type: Etc
|
||||
Weight: 100
|
||||
- Id: 1001618
|
||||
AegisName: aegis_1001618
|
||||
Name: Wigner Premium Exchange Ticket
|
||||
@ -89745,11 +89709,6 @@ Body:
|
||||
Weight: 10
|
||||
Flags:
|
||||
BuyingStore: true
|
||||
- Id: 1001650
|
||||
AegisName: YellowStar_Foot_Robe
|
||||
Name: Yellow Star Footprint (Garment)
|
||||
Type: Etc
|
||||
Weight: 100
|
||||
- Id: 1001653
|
||||
AegisName: Ep21_Armor_E_Stone1
|
||||
Name: Turquoise Magic Stone
|
||||
@ -90363,11 +90322,6 @@ Body:
|
||||
NoGuildStorage: true
|
||||
NoMail: true
|
||||
NoAuction: true
|
||||
- Id: 1001772
|
||||
AegisName: aegis_1001772
|
||||
Name: Puppy Footprint (Garment)
|
||||
Type: Etc
|
||||
Weight: 100
|
||||
- Id: 1200000
|
||||
AegisName: IDTest_arrow
|
||||
Name: IDTest arrow
|
||||
|
@ -78855,11 +78855,6 @@ Body:
|
||||
NoAuction: true
|
||||
Script: |
|
||||
getgroupitem(IG_STOVE_CHANNELING_BOX_4);
|
||||
- Id: 103263
|
||||
AegisName: Summer_Select_Box4
|
||||
Name: Star Footprint Selection Box (Summer Beach)
|
||||
Type: Usable
|
||||
Weight: 10
|
||||
- Id: 200000
|
||||
AegisName: IDTest_Cash
|
||||
Name: IDTest Cash
|
||||
|
@ -980,13 +980,3 @@ Body:
|
||||
- Group: 1
|
||||
Items:
|
||||
- Item: C_Chaos_Emerald
|
||||
- Item: Summer_Select_Box4
|
||||
Groups:
|
||||
- Group: 0
|
||||
Items:
|
||||
- Item: PurpleStar_Foot_Robe
|
||||
- Item: C_Summer_Beach
|
||||
- Group: 1
|
||||
Items:
|
||||
- Item: YellowStar_Foot_Robe
|
||||
- Item: C_Summer_Beach
|
||||
|
1581
db/re/job_stats.yml
1581
db/re/job_stats.yml
File diff suppressed because it is too large
Load Diff
@ -7535,7 +7535,7 @@ Body:
|
||||
TargetTrap: true
|
||||
Range: 9
|
||||
Hit: Multi_Hit
|
||||
HitCount: -5
|
||||
HitCount: 5
|
||||
Element: Weapon
|
||||
CopyFlags:
|
||||
Skill:
|
||||
|
@ -3693,12 +3693,6 @@ static int battle_get_spiritball_damage(struct Damage& wd, struct block_list& sr
|
||||
// These skills used as many spheres as they do hits
|
||||
damage = (wd.div_ + sd->spiritball) * 3;
|
||||
break;
|
||||
#ifdef RENEWAL
|
||||
case MO_FINGEROFFENSIVE:
|
||||
// These skills store the spheres used in spiritball_old
|
||||
damage = (sd->spiritball_old + sd->spiritball) * 3;
|
||||
break;
|
||||
#endif
|
||||
case MO_EXTREMITYFIST:
|
||||
// These skills store the number of spheres the player had before cast
|
||||
damage = sd->spiritball_old * 3;
|
||||
@ -6809,9 +6803,9 @@ static void battle_calc_attack_plant(struct Damage* wd, struct block_list *src,s
|
||||
return;
|
||||
}
|
||||
|
||||
// Triple Attack and Finger Offensive have a special property, they do not split damage on plant mode
|
||||
// Triple Attack has a special property that it does not split damage on plant mode
|
||||
// In pre-renewal, it requires the monster to have exactly 100 def
|
||||
if ((skill_id == MO_TRIPLEATTACK || skill_id == MO_FINGEROFFENSIVE) && wd->div_ < 0
|
||||
if (skill_id == MO_TRIPLEATTACK && wd->div_ < 0
|
||||
#ifndef RENEWAL
|
||||
&& tstatus->def == 100
|
||||
#endif
|
||||
|
@ -10682,7 +10682,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
||||
case HAMI_CASTLE: //[orn]
|
||||
if (src != bl && rnd_chance(20 * skill_lv, 100)) {
|
||||
// Get one of the monsters targeting the player and set the homunculus as its new target
|
||||
if (block_list* tbl = battle_gettargeted(bl); tbl != nullptr && tbl->type == BL_MOB) {
|
||||
if (block_list* tbl = battle_getenemy(bl, BL_MOB, AREA_SIZE); tbl != nullptr) {
|
||||
if (unit_data* ud = unit_bl2ud(tbl); ud != nullptr)
|
||||
unit_changetarget_sub(*ud, *src);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user