Skip to content

Commit

Permalink
Merge pull request #19 from RodneyMcKay/developer
Browse files Browse the repository at this point in the history
1

Former-commit-id: 307dbfa
  • Loading branch information
MouJiaoZi authored Oct 28, 2017
2 parents e7462bf + e13acfa commit 4ff23b5
Show file tree
Hide file tree
Showing 26 changed files with 77 additions and 84 deletions.
Binary file removed content/dota_addons/dota_imba/maps/imba_12v12.vmap
Binary file not shown.
Binary file removed content/dota_addons/dota_imba/maps/imba_arena.vmap
Binary file not shown.
Binary file removed content/dota_addons/dota_imba/maps/imba_custom.vmap
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<root>
<Panel style="visibility:collapse;">
<Panel id="container" style="visibility:collapse;">
<Image src="file://panorama/images/custom_game/loading_screen/diretide.jpg" hittest="false" />
<Image src="file://panorama/images/heroes/icons/npc_dota_hero_ghost_revenant.png" hittest="false" />
<Image src="file://panorama/images/heroes/icons/npc_dota_hero_hell_empress.png" hittest="false" />
<Image src="file://panorama/images/heroes/icons/npc_dota_storegga.png" hittest="false" />
</Panel>
</Panel>
</root>
10 changes: 5 additions & 5 deletions game/dota_addons/dota_imba/addoninfo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"addonContent_Campaign" "0"
"addonDescription" "A modified version of Dota, where everything is insanely powerful."

"maps" "imba_diretide imba_standard imba_10v10 imba_custom_10v10"
"maps" "imba_standard imba_10v10 imba_custom_10v10"
// "maps" "imba_standard imba_10v10 imba_custom imba_custom_10v10"

"IsPlayable" "1"
Expand All @@ -36,10 +36,10 @@
"MaxPlayers" "20"
}

"imba_diretide"
{
"MaxPlayers" "10"
}
// "imba_diretide"
// {
// "MaxPlayers" "10"
// }

// "imba_12v12"
// {
Expand Down
18 changes: 18 additions & 0 deletions game/dota_addons/dota_imba/panorama/localization/addon_english.txt
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,24 @@
"DOTA_Tooltip_Talent_special_bonus_imba_mirana_8_title" "Seed of the Moon"
"DOTA_Tooltip_Talent_special_bonus_imba_mirana_8_Description" "Primary Starstorms that hit targets marks them with the Seed of the Moon for one second. If Mirana attacks a target that is marked, the debuff is consumed, and a secondary Starstorm procs on the target.<br>Secondary Starstorm do not mark the target, but the target can be marked multiple times from other primary Starstorms, including the Aghnaim's Scepter's wave.<br><br><i>Using lunar shards, Mirana signals her Goddess to drop her stars on her targets.</i>"

// Nevermore / Shadow Fiend
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_1_title" "Shadow Pool"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_1_Description" "Each Shadowraze will leave behind a pool of desperate souls for 2 seconds. Any enemy standing in them will take 100 magic dmg per second. <br><br><i>The desperate cry of the souls taken away by Nevermore can be heard from these crimson pools...</i>"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_2_title" "Soul Eater"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_2_Description" "Necromastery can be activated to heal in exchange of souls. Each consumed soul will heal 80 hp and Shadow Fiend will stop consuming when either there are no more souls or has healed completely. This can be done once every 12 seconds. <br><br><i>The Shadow Fiend shares a sadistic pleasure in consuming the souls he collected, so much that he feel invigorated from it.</i>"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_3_title" "Shadow harem"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_3_Description" "Necromastery soul stacks cap permanently increases by 1 each time you kill an enemy hero. This has no limit. <br><br><i>Nevermore intellect strenghen whenever he siphons away the spirit of those too stupid to face, allowing him to enslave more souls.</i>"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_4_title" "Spirit siphon"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_4_Description" "Each soul collected will increase the lifesteal by 0.4% <br><br><i> Even standing near Nevermore would be enough to drain vitality from the weak, let alone being engulfed in the grim embrace of his enslaved souls.</i>"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_5_title" "Demonlord Charm"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_5_Description" "Presence of the Lord periodically steal souls from nearby enemy heroes. <br><br><i> Among Nevermore's most favourite ways to collect souls is letting his overwhelming presence twist the souls of those near him until they are begging him to rip them from their bodies.</i>"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_6_title" "Soul Rend"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_6_Description" "Shadowraze can refresh the debuff from Requiem of Souls on enemies hit. This can be done infinitely. <br><br><i>What's the best way to rekindly the searing demonic energies? More demonic energy!</i>"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_7_title" "Nevermore's recall"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_7_Description" "Shadow Fiend won't lose souls when dying. <br><br><i>Even thought the souls enslaved by Nevermore cry in desperation, their master recall is too strong to resist... and thus end up going straight back to him.</i>"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_8_title" "Shadow Frenzy"
"DOTA_Tooltip_Talent_special_bonus_imba_nevermore_8_Description" "Shadowraze cast point is halved during Soul Frenzy, allowing to quicker successive casts. <br><br><i>Watching the souls wrecking havoc during the requiem drives Nevermore into a state of pure ecstasy, where himself unleash hell on the living so that he can witness the Requiem once more soon enough."

// Nyx
"DOTA_Tooltip_Talent_special_bonus_imba_nyx_assassin_1_title" "Everlasting Vendetta"
"DOTA_Tooltip_Talent_special_bonus_imba_nyx_assassin_1_Description" "If Vendetta kills an enemy unit, it doesn't consume the Eye for Eye stacks.<br><br><i>A successful hunt does not mean the end of Nyx's Vendetta.</i>"
Expand Down
Binary file modified game/dota_addons/dota_imba/resource/addon_english.txt
Binary file not shown.
18 changes: 9 additions & 9 deletions game/dota_addons/dota_imba/scripts/npc/npc_abilities_custom.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40214,7 +40214,7 @@

// Time
//-------------------------------------------------------------------------------------------------------------
"AbilityCooldown" "27 25 23 21 19 17 15"
"AbilityCooldown" "11.0"

// Cost
//-------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -40262,7 +40262,7 @@
"08"
{
"var_type" "FIELD_INTEGER"
"projectile_vision" "225"
"projectile_vision" "300"
}
}
}
Expand All @@ -40284,7 +40284,7 @@

// Time
//-------------------------------------------------------------------------------------------------------------
"AbilityCooldown" "27 25 23 21 19 17 15"
"AbilityCooldown" "13.0"

// Cost
//-------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -40334,7 +40334,7 @@

// Time
//-------------------------------------------------------------------------------------------------------------
"AbilityCooldown" "40 40 35 35 30 30 25"
"AbilityCooldown" "17.0"

// Cost
//-------------------------------------------------------------------------------------------------------------
Expand All @@ -40357,12 +40357,12 @@
"03"
{
"var_type" "FIELD_INTEGER"
"dmg_per_sec" "10 20 30 40 50 60 70"
"dmg_per_sec" "7 7 7 7 8 9 10"
}
"04"
{
"var_type" "FIELD_FLOAT"
"duration" "13.0"
"duration" "10.0 11.0 12.0 13.0 13.0 13.0 13.0"
}
}
}
Expand Down Expand Up @@ -40398,7 +40398,7 @@
"03"
{
"var_type" "FIELD_INTEGER"
"hp_loss_pct" "1"
"hp_loss_pct" "2"
}
}
}
Expand Down Expand Up @@ -40525,7 +40525,7 @@

// Casting
//-------------------------------------------------------------------------------------------------------------
"AbilityCastRange" "1000"
"AbilityCastRange" "1300"
"AbilityCastPoint" "0.25"
"AbilityCastAnimation" "ACT_DOTA_CAST_ABILITY_2"

Expand Down Expand Up @@ -40562,7 +40562,7 @@
"03"
{
"var_type" "FIELD_INTEGER"
"target_radius" "1000"
"target_radius" "1300"
}
"04"
{
Expand Down
16 changes: 8 additions & 8 deletions game/dota_addons/dota_imba/scripts/npc/npc_heroes_custom.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3436,7 +3436,7 @@
"AttackDamageMin" "30" // Damage range min.
"AttackDamageMax" "40" // Damage range max.
"AttackDamageType" "DAMAGE_TYPE_ArmorPhysical" // Type of damage dealt.
"AttackRate" "1.900" // Speed of attack.
"AttackRate" "1.700" // Speed of attack.
"AttackAnimationPoint" "0.300" // Normalized time in animation cycle to attack.
"AttackAcquisitionRange" "600" // Range within a target can be acquired.
"AttackRange" "150" // Range within a target can be attacked.
Expand All @@ -3447,11 +3447,11 @@
//-------------------------------------------------------------------------------------------------------------
"AttributePrimary" "DOTA_ATTRIBUTE_INTELLECT" // Primary Attribute
"AttributeBaseStrength" "23" // Base strength
"AttributeStrengthGain" "1.9" // Strength bonus per level.
"AttributeStrengthGain" "2.3" // Strength bonus per level.
"AttributeBaseIntelligence" "24" // Base intelligence
"AttributeIntelligenceGain" "3.3" // Intelligence bonus per level.
"AttributeBaseAgility" "13" // Base agility
"AttributeAgilityGain" "1.4" // Agility bonus per level.
"AttributeBaseAgility" "21" // Base agility
"AttributeAgilityGain" "2.4" // Agility bonus per level.

// Bounds
//-------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -3525,7 +3525,7 @@
"AttackDamageMin" "30" // Damage range min.
"AttackDamageMax" "40" // Damage range max.
"AttackDamageType" "DAMAGE_TYPE_ArmorPhysical" // Type of damage dealt.
"AttackRate" "1.900" // Speed of attack.
"AttackRate" "1.700" // Speed of attack.
"AttackAnimationPoint" "0.300" // Normalized time in animation cycle to attack.
"AttackAcquisitionRange" "600" // Range within a target can be acquired.
"AttackRange" "250" // Range within a target can be attacked.
Expand All @@ -3537,10 +3537,10 @@
"AttributePrimary" "DOTA_ATTRIBUTE_INTELLECT" // Primary Attribute
"AttributeBaseStrength" "40" // Base strength
"AttributeStrengthGain" "2.1" // Strength bonus per level.
"AttributeBaseIntelligence" "13" // Base intelligence
"AttributeBaseIntelligence" "19" // Base intelligence
"AttributeIntelligenceGain" "3.6" // Intelligence bonus per level.
"AttributeBaseAgility" "10" // Base agility
"AttributeAgilityGain" "1.75" // Agility bonus per level.
"AttributeBaseAgility" "29" // Base agility
"AttributeAgilityGain" "2.6" // Agility bonus per level.

// Bounds
//-------------------------------------------------------------------------------------------------------------
Expand Down
20 changes: 10 additions & 10 deletions game/dota_addons/dota_imba/scripts/npc/npc_units_custom.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12584,7 +12584,7 @@
"AttackDamageMin" "30" // Damage range min.
"AttackDamageMax" "40" // Damage range max.
"AttackDamageType" "DAMAGE_TYPE_ArmorPhysical" // Type of damage dealt.
"AttackRate" "1.900" // Speed of attack.
"AttackRate" "1.700" // Speed of attack.
"AttackAnimationPoint" "0.300" // Normalized time in animation cycle to attack.
"AttackAcquisitionRange" "600" // Range within a target can be acquired.
"AttackRange" "150" // Range within a target can be attacked.
Expand All @@ -12595,11 +12595,11 @@
//-------------------------------------------------------------------------------------------------------------
"AttributePrimary" "DOTA_ATTRIBUTE_INTELLECT" // Primary Attribute
"AttributeBaseStrength" "23" // Base strength
"AttributeStrengthGain" "1.9" // Strength bonus per level.
"AttributeStrengthGain" "2.3" // Strength bonus per level.
"AttributeBaseIntelligence" "24" // Base intelligence
"AttributeIntelligenceGain" "3.3" // Intelligence bonus per level.
"AttributeBaseAgility" "13" // Base agility
"AttributeAgilityGain" "1.4" // Agility bonus per level.
"AttributeBaseAgility" "21" // Base agility
"AttributeAgilityGain" "2.4" // Agility bonus per level.

// Bounds
//-------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -12688,7 +12688,7 @@
"AttackDamageMin" "30" // Damage range min.
"AttackDamageMax" "40" // Damage range max.
"AttackDamageType" "DAMAGE_TYPE_ArmorPhysical" // Type of damage dealt.
"AttackRate" "1.900" // Speed of attack.
"AttackRate" "1.700" // Speed of attack.
"AttackAnimationPoint" "0.300" // Normalized time in animation cycle to attack.
"AttackAcquisitionRange" "600" // Range within a target can be acquired.
"AttackRange" "250" // Range within a target can be attacked.
Expand All @@ -12699,11 +12699,11 @@
//-------------------------------------------------------------------------------------------------------------
"AttributePrimary" "DOTA_ATTRIBUTE_INTELLECT" // Primary Attribute
"AttributeBaseStrength" "40" // Base strength
"AttributeStrengthGain" "2.5" // Strength bonus per level.
"AttributeBaseIntelligence" "8" // Base intelligence
"AttributeIntelligenceGain" "0.6" // Intelligence bonus per level.
"AttributeBaseAgility" "10" // Base agility
"AttributeAgilityGain" "0.75" // Agility bonus per level.
"AttributeStrengthGain" "2.1" // Strength bonus per level.
"AttributeBaseIntelligence" "19" // Base intelligence
"AttributeIntelligenceGain" "3.6" // Intelligence bonus per level.
"AttributeBaseAgility" "29" // Base agility
"AttributeAgilityGain" "2.6" // Agility bonus per level.

// Bounds
//-------------------------------------------------------------------------------------------------------------
Expand Down
34 changes: 17 additions & 17 deletions game/dota_addons/dota_imba/scripts/vscripts/events.lua
Original file line number Diff line number Diff line change
Expand Up @@ -244,23 +244,23 @@ local normal_xp = npc:GetDeathXP()
end
end

for i = 1, #banned_players do
if PlayerResource:GetSteamAccountID(npc:GetPlayerID()) == banned_players[i] then
if npc:GetUnitName() ~= "npc_dota_hero_wisp" or npc.is_real_wisp then
if not npc:HasModifier("modifier_command_restricted") then
npc:AddNewModifier(npc, nil, "modifier_command_restricted", {})
Timers:CreateTimer(0.1, function()
PlayerResource:SetCameraTarget(npc:GetPlayerOwnerID(), npc)
end)
Timers:CreateTimer(2.0, function()
StartAnimation(npc, {duration=2.0, activity=ACT_DOTA_DEFEAT, rate=1.0})
return 2.0
end)
Notifications:Bottom(npc:GetPlayerID(), {text="Hey what are you doing there, i thought this mod was shit?", duration=99999, style={color="red"}})
end
end
end
end
-- for i = 1, #banned_players do
-- if PlayerResource:GetSteamAccountID(npc:GetPlayerID()) == banned_players[i] then
-- if npc:GetUnitName() ~= "npc_dota_hero_wisp" or npc.is_real_wisp then
-- if not npc:HasModifier("modifier_command_restricted") then
-- npc:AddNewModifier(npc, nil, "modifier_command_restricted", {})
-- Timers:CreateTimer(0.1, function()
-- PlayerResource:SetCameraTarget(npc:GetPlayerOwnerID(), npc)
-- end)
-- Timers:CreateTimer(2.0, function()
-- StartAnimation(npc, {duration=2.0, activity=ACT_DOTA_DEFEAT, rate=1.0})
-- return 2.0
-- end)
-- Notifications:Bottom(npc:GetPlayerID(), {text="Hey what are you doing there, i thought this mod was shit?", duration=99999, style={color="red"}})
-- end
-- end
-- end
-- end

-- fix for killed with Ghost Revenant immolation
if npc:HasModifier("modifier_ghost_revenant_ghost_immolation_debuff") then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ end

function modifier_ghost_revenant_miasma:OnCreated()
if IsServer() then
self.damage = self:GetAbility():GetSpecialValueFor("dmg_per_sec")
self.damage = self:GetAbility():GetSpecialValueFor("dmg_per_sec") * 0.01
self.tick = self:GetAbility():GetSpecialValueFor("tick")

self:StartIntervalThink(self.tick)
Expand Down Expand Up @@ -337,7 +337,7 @@ function modifier_ghost_revenant_miasma:GetModifierMoveSpeedBonus_Percentage()
end

function modifier_ghost_revenant_miasma:OnIntervalThink()
ApplyDamage({victim = self:GetParent(), attacker = self:GetCaster(), damage = self.damage, damage_type = DAMAGE_TYPE_MAGICAL})
ApplyDamage({victim = self:GetParent(), attacker = self:GetCaster(), damage = self:GetParent():GetMaxHealth() * self.damage, damage_type = DAMAGE_TYPE_MAGICAL})
end

-----------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -469,9 +469,11 @@ function modifier_ghost_revenant_ghost_immolation_debuff:OnIntervalThink()
end

if self.lose_hp == true then
self:SetStackCount(self:GetStackCount() + self.interval_time)
if self:GetStackCount() < 99 then
self:SetStackCount(self:GetStackCount() + self.hp_loss_pct)
end
else
self:SetStackCount(self:GetStackCount() - self.interval_time)
self:SetStackCount(self:GetStackCount() - self.hp_loss_pct)
end

-- Re-calculate health stats
Expand All @@ -491,7 +493,7 @@ end

function modifier_ghost_revenant_ghost_immolation_debuff:GetModifierExtraHealthPercentage()
if IsServer() then
local hp_to_reduce = self.hp_loss_pct * 0.01 * self:GetStackCount() * (-1)
local hp_to_reduce = 0.01 * self:GetStackCount() * (-1)
-- Make sure you don't go over 100%
if hp_to_reduce < -0.99 then
return -0.99
Expand Down

0 comments on commit 4ff23b5

Please sign in to comment.