diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml index 6e555ef771f..ea8c8bc6bb9 100644 --- a/db/re/item_db_equip.yml +++ b/db/re/item_db_equip.yml @@ -78060,6 +78060,22 @@ Body: Costume_Head_Top: true ArmorLevel: 1 View: 887 + - Id: 15854 + AegisName: C_Phigasia_Scarf_EXE + Name: Costume Phigasia Scarf + Type: Armor + Locations: + Costume_Head_Top: true + Trade: + NoMail: true + NoAuction: true + NoGuildStorage: true + ArmorLevel: 1 + View: 2079 + Script: | + hateffect HAT_EF_C_Phigasia_Scarf_EXE,true; + UnEquipScript: | + hateffect HAT_EF_C_Phigasia_Scarf_EXE,false; - Id: 15855 AegisName: Ermac_Veil_EXE Name: Ermac's Veil (OSM) @@ -178432,6 +178448,21 @@ Body: Costume_Head_Top: true ArmorLevel: 1 View: 2673 + - Id: 400801 + AegisName: C_FumiHausu_Doll + Name: Costume Fumi Hausu Doll + Type: Armor + Locations: + Costume_Head_Top: true + Trade: + NoDrop: true + NoTrade: true + NoCart: true + NoMail: true + NoAuction: true + NoGuildStorage: true + ArmorLevel: 1 + View: 2676 - Id: 400803 AegisName: C_Muka_Sombrero Name: Costume Muka Sombrero @@ -180127,6 +180158,27 @@ Body: Costume_Head_Top: true ArmorLevel: 1 View: 2556 + - Id: 401113 + AegisName: C_Rune_Helm_Ice + Name: Costume Snow Rune Helm + Type: Armor + Locations: + Costume_Head_Top: true + Trade: + NoSell: true + NoMail: true + NoAuction: true + NoGuildStorage: true + ArmorLevel: 1 + View: 2203 + - Id: 401114 + AegisName: C_Asgard_Circlet_TH + Name: Costume Asgard Wing Hairband + Type: Armor + Locations: + Costume_Head_Top: true + ArmorLevel: 1 + View: 2100 - Id: 401115 AegisName: Sky_Rune_Crown_MS Name: Sky Rune Crown (Meister) # !todo check english name @@ -180452,6 +180504,18 @@ Body: NoAuction: true ArmorLevel: 1 View: 2805 + - Id: 401213 + AegisName: C_Jaow_Pirun + Name: Costume Jaow Pirun Sra Yok + Type: Armor + Locations: + Costume_Head_Top: true + ArmorLevel: 1 + View: 2810 + Script: | + hateffect HAT_EF_C_JAOW_PIRUN,true; + UnEquipScript: | + hateffect HAT_EF_C_JAOW_PIRUN,false; - Id: 401239 AegisName: Hs_Sun_God Name: Herosria Hat of Sun God @@ -184912,6 +184976,22 @@ Body: Costume_Head_Mid: true ArmorLevel: 1 View: 2594 + - Id: 410368 + AegisName: C_Perm_Frost_Oblivion + Name: Costume Permafrost Oblivion + Type: Armor + Locations: + Costume_Head_Mid: true + Trage: + NoMail: true + NoAuction: true + NoGuildStorage: true + ArmorLevel: 1 + View: 2595 + Script: | + hateffect HAT_EF_PERM_FROST_OBLIVION,true; + UnEquipScript: | + hateffect HAT_EF_PERM_FROST_OBLIVION,false; - Id: 410370 AegisName: C_Happy_Pierrot_Mask_V Name: Costume Happy Clown Mask (Middle) @@ -184995,6 +185075,21 @@ Body: NoAuction: true ArmorLevel: 1 View: 1303 + - Id: 410397 + AegisName: C_Doughkun + Name: Costume DoughKun + Type: Armor + Locations: + Costume_Head_Mid: true + Trade: + NoDrop: true + NoTrade: true + NoCart: true + NoMail: true + NoAuction: true + NoGuildStorage: true + ArmorLevel: 1 + View: 2677 - Id: 410399 AegisName: C_Capybara Name: Costume Capybara diff --git a/src/char/inter.cpp b/src/char/inter.cpp index 16e03961f76..cf3d4e94173 100644 --- a/src/char/inter.cpp +++ b/src/char/inter.cpp @@ -387,21 +387,21 @@ const char * geoip_countryname[253] = {"Unknown","Asia/Pacific Region","Europe", "Ghana","Gibraltar","Greenland","Gambia","Guinea","Guadeloupe","Equatorial Guinea","Greece","South Georgia and the South Sandwich Islands","Guatemala", "Guam","Guinea-Bissau","Guyana","Hong Kong","Heard Island and McDonald Islands","Honduras","Croatia","Haiti","Hungary","Indonesia", "Ireland","Israel","India","British Indian Ocean Territory","Iraq","Iran, Islamic Republic of","Iceland","Italy","Jamaica","Jordan", - "Japan","Kenya","Kyrgyzstan","Cambodia","Kiribati","Comoros","Saint32 Kitts and Nevis","Korea, Democratic People's Republic of","Korea, Republic of","Kuwait", - "Cayman Islands","Kazakhstan","Lao People's Democratic Republic","Lebanon","Saint32 Lucia","Liechtenstein","Sri Lanka","Liberia","Lesotho","Lithuania", + "Japan","Kenya","Kyrgyzstan","Cambodia","Kiribati","Comoros","Saint Kitts and Nevis","Korea, Democratic People's Republic of","Korea, Republic of","Kuwait", + "Cayman Islands","Kazakhstan","Lao People's Democratic Republic","Lebanon","Saint Lucia","Liechtenstein","Sri Lanka","Liberia","Lesotho","Lithuania", "Luxembourg","Latvia","Libyan Arab Jamahiriya","Morocco","Monaco","Moldova, Republic of","Madagascar","Marshall Islands","Macedonia","Mali", "Myanmar","Mongolia","Macau","Northern Mariana Islands","Martinique","Mauritania","Montserrat","Malta","Mauritius","Maldives", "Malawi","Mexico","Malaysia","Mozambique","Namibia","New Caledonia","Niger","Norfolk Island","Nigeria","Nicaragua", "Netherlands","Norway","Nepal","Nauru","Niue","New Zealand","Oman","Panama","Peru","French Polynesia", - "Papua New Guinea","Philippines","Pakistan","Poland","Saint32 Pierre and Miquelon","Pitcairn Islands","Puerto Rico","Palestinian Territory","Portugal","Palau", + "Papua New Guinea","Philippines","Pakistan","Poland","Saint Pierre and Miquelon","Pitcairn Islands","Puerto Rico","Palestinian Territory","Portugal","Palau", "Paraguay","Qatar","Reunion","Romania","Russian Federation","Rwanda","Saudi Arabia","Solomon Islands","Seychelles","Sudan", - "Sweden","Singapore","Saint32 Helena","Slovenia","Svalbard and Jan Mayen","Slovakia","Sierra Leone","San Marino","Senegal","Somalia","Suriname", + "Sweden","Singapore","Saint Helena","Slovenia","Svalbard and Jan Mayen","Slovakia","Sierra Leone","San Marino","Senegal","Somalia","Suriname", "Sao Tome and Principe","El Salvador","Syrian Arab Republic","Swaziland","Turks and Caicos Islands","Chad","French Southern Territories","Togo","Thailand", "Tajikistan","Tokelau","Turkmenistan","Tunisia","Tonga","Timor-Leste","Turkey","Trinidad and Tobago","Tuvalu","Taiwan", - "Tanzania, United Republic of","Ukraine","Uganda","United States Minor Outlying Islands","United States","Uruguay","Uzbekistan","Holy See (Vatican City State)","Saint32 Vincent and the Grenadines","Venezuela", + "Tanzania, United Republic of","Ukraine","Uganda","United States Minor Outlying Islands","United States","Uruguay","Uzbekistan","Holy See (Vatican City State)","Saint Vincent and the Grenadines","Venezuela", "Virgin Islands, British","Virgin Islands, U.S.","Vietnam","Vanuatu","Wallis and Futuna","Samoa","Yemen","Mayotte","Serbia","South Africa", "Zambia","Montenegro","Zimbabwe","Anonymous Proxy","Satellite Provider","Other","Aland Islands","Guernsey","Isle of Man","Jersey", - "Saint32 Barthelemy","Saint32 Martin"}; + "Saint Barthelemy","Saint Martin"}; unsigned char *geoip_cache; void geoip_readdb(void){ struct stat bufa; diff --git a/src/map/skill.cpp b/src/map/skill.cpp index 3c8c8855f6d..da1a44280ae 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -9565,7 +9565,7 @@ bool skill_check_condition_castend( map_session_data& sd, uint16 skill_id, uint1 else if( require.itemid[i] == ITEMID_BLUE_GEMSTONE ) clif_skill_fail( sd, skill_id, USESKILL_FAIL_BLUEJAMSTONE ); //Blue gemstone is required. else if( require.itemid[i] == ITEMID_PAINT_BRUSH ) - clif_skill_fail( sd, skill_id, USESKILL_FAIL_PAINTBRUSH ); //Paint32 brush is required. + clif_skill_fail( sd, skill_id, USESKILL_FAIL_PAINTBRUSH ); //Paint brush is required. else if( require.itemid[i] == ITEMID_ANCILLA ) clif_skill_fail( sd, skill_id, USESKILL_FAIL_ANCILLA ); //Ancilla is required. else diff --git a/src/map/skills/acolyte/flashcombo.cpp b/src/map/skills/acolyte/flashcombo.cpp index 945c0a02b95..3097bddb1f7 100644 --- a/src/map/skills/acolyte/flashcombo.cpp +++ b/src/map/skills/acolyte/flashcombo.cpp @@ -6,7 +6,7 @@ #include "map/pc.hpp" #include "map/status.hpp" -SkillFlashCombo::SkillFlashCombo() : StatusSkillImpl(SR_FLASHCOMBO) { +SkillFlashCombo::SkillFlashCombo() : SkillImpl(SR_FLASHCOMBO) { } void SkillFlashCombo::castendNoDamageId(block_list *src, block_list *target, uint16 skill_lv, t_tick tick, int32& flag) const { @@ -18,7 +18,8 @@ void SkillFlashCombo::castendNoDamageId(block_list *src, block_list *target, uin if (sd) // Disable attacking/acting/moving for skill's duration. sd->ud.attackabletime = sd->canuseitem_tick = sd->ud.canact_tick = tick + delay[2]; - StatusSkillImpl::castendNoDamageId(src, target, skill_lv, tick, flag); + clif_skill_nodamage(src, *target, getSkillId(), skill_lv, + sc_start(src, src, skill_get_sc(getSkillId()), 100, skill_lv, skill_get_time(getSkillId(), skill_lv))); for (int32 i = 0; i < ARRAYLENGTH(combo); i++) skill_addtimerskill(src,tick + delay[i],target->id,0,0,combo[i],skill_lv,BF_WEAPON,flag|SD_LEVEL); diff --git a/src/map/skills/acolyte/flashcombo.hpp b/src/map/skills/acolyte/flashcombo.hpp index 9a0bcf6f2c8..a2eab28b77a 100644 --- a/src/map/skills/acolyte/flashcombo.hpp +++ b/src/map/skills/acolyte/flashcombo.hpp @@ -5,7 +5,7 @@ #include "../skill_impl.hpp" -class SkillFlashCombo : public StatusSkillImpl { +class SkillFlashCombo : public SkillImpl { public: SkillFlashCombo(); diff --git a/src/map/skills/mage/dispell.cpp b/src/map/skills/mage/dispell.cpp index d28fa2caa6a..ea56a8b26d8 100644 --- a/src/map/skills/mage/dispell.cpp +++ b/src/map/skills/mage/dispell.cpp @@ -23,7 +23,7 @@ void SkillDispell::castendNoDamageId(block_list *src, block_list *target, uint16 return; // Outside PvP it should only affect party members and no skill fail message clif_skill_nodamage(src,*target,getSkillId(),skill_lv); if((dstsd && (dstsd->class_&MAPID_SECONDMASK) == MAPID_SOUL_LINKER) - || (tsc && tsc->getSCE(SC_SPIRIT) && tsc->getSCE(SC_SPIRIT)->val2 == SL_ROGUE) //Rogue's spirit defends againt32 dispel. + || (tsc && tsc->getSCE(SC_SPIRIT) && tsc->getSCE(SC_SPIRIT)->val2 == SL_ROGUE) //Rogue's spirit defends against dispel. || rnd()%100 >= 50+10*skill_lv) { if (sd)