Skip to content

Commit

Permalink
Reworked Satanic Core (#793)
Browse files Browse the repository at this point in the history 
* made satanic lifesteal progress

* fixed satanic core tooltip

* changed satanic core again after merge; fixed octarine core 1 values not matching those in octarine core 2

* fixed unholy creep lifesteal not adding to 100

* fixed some weird things git did when rebasing; probably while trying to fix conflicts; also fixed some indentation
  • Loading branch information
@Haganeko @chrisinajar
Haganeko authored and chrisinajar committed May 20, 2017
1 parent b5a8bb3 commit 6897a7a
Show file tree
Hide file tree
Showing 10 changed files with 87 additions and 72 deletions.
6 changes: 3 additions & 3 deletions game/resource/English/ability/items/tooltip_satanic_core.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"DOTA_Tooltip_Ability_item_satanic_core_hero_lifesteal" "%HERO SPELL LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_creep_lifesteal" "%CREEP SPELL LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_lifesteal_percent" "%LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_unholy_lifesteal_percent" "%UNHOLY RAGE LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_unholy_lifesteal_total_tooltip" "%UNHOLY RAGE LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_unholy_duration" "%UNHOLY RAGE DURATION:"

"DOTA_Tooltip_Ability_item_satanic_core_2" "Satanic Core"
Expand All @@ -30,7 +30,7 @@
"DOTA_Tooltip_Ability_item_satanic_core_2_hero_lifesteal" "%HERO SPELL LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_2_creep_lifesteal" "%CREEP SPELL LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_2_lifesteal_percent" "%LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_2_unholy_lifesteal_percent" "%UNHOLY RAGE LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_2_unholy_lifesteal_total_tooltip" "%UNHOLY RAGE LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_2_unholy_duration" "%UNHOLY RAGE DURATION:"

"DOTA_Tooltip_Ability_item_satanic_core_3" "Satanic Core"
Expand All @@ -46,5 +46,5 @@
"DOTA_Tooltip_Ability_item_satanic_core_3_hero_lifesteal" "%HERO SPELL LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_3_creep_lifesteal" "%CREEP SPELL LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_3_lifesteal_percent" "%LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_3_unholy_lifesteal_percent" "%UNHOLY RAGE LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_3_unholy_lifesteal_total_tooltip" "%UNHOLY RAGE LIFESTEAL:"
"DOTA_Tooltip_Ability_item_satanic_core_3_unholy_duration" "%UNHOLY RAGE DURATION:"
2 changes: 1 addition & 1 deletion game/scripts/npc/items/item_octarine_core.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"05"
{
"var_type" "FIELD_FLOAT"
"hero_lifesteal" "25 35"
"hero_lifesteal" "25 30"
}
"06"
{
Expand Down
4 changes: 2 additions & 2 deletions game/scripts/npc/items/item_satanic.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
"04"
{
"var_type" "FIELD_INTEGER"
"lifesteal_percent" "25"
"lifesteal_percent" "25 30 35 40 45"
}
"05"
{
"var_type" "FIELD_INTEGER"
"unholy_lifesteal_percent" "175"
"unholy_lifesteal_percent" "175 170 165 160 155"
}
"06"
{
Expand Down
4 changes: 2 additions & 2 deletions game/scripts/npc/items/item_satanic_2.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@
"04"
{
"var_type" "FIELD_INTEGER"
"lifesteal_percent" "25"
"lifesteal_percent" "25 30 35 40 45"
}
"05"
{
"var_type" "FIELD_INTEGER"
"unholy_lifesteal_percent" "175"
"unholy_lifesteal_percent" "175 170 165 160 155"
}
"06"
{
Expand Down
4 changes: 2 additions & 2 deletions game/scripts/npc/items/item_satanic_3.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@
"04"
{
"var_type" "FIELD_INTEGER"
"lifesteal_percent" "25"
"lifesteal_percent" "25 30 35 40 45"
}
"05"
{
"var_type" "FIELD_INTEGER"
"unholy_lifesteal_percent" "175"
"unholy_lifesteal_percent" "175 170 165 160 155"
}
"06"
{
Expand Down
4 changes: 2 additions & 2 deletions game/scripts/npc/items/item_satanic_4.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@
"04"
{
"var_type" "FIELD_INTEGER"
"lifesteal_percent" "25"
"lifesteal_percent" "25 30 35 40 45"
}
"05"
{
"var_type" "FIELD_INTEGER"
"unholy_lifesteal_percent" "175"
"unholy_lifesteal_percent" "175 170 165 160 155"
}
"06"
{
Expand Down
4 changes: 2 additions & 2 deletions game/scripts/npc/items/item_satanic_5.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@
"04"
{
"var_type" "FIELD_INTEGER"
"lifesteal_percent" "25"
"lifesteal_percent" "25 30 35 40 45"
}
"05"
{
"var_type" "FIELD_INTEGER"
"unholy_lifesteal_percent" "175"
"unholy_lifesteal_percent" "175 170 165 160 155"
}
"06"
{
Expand Down
49 changes: 27 additions & 22 deletions game/scripts/npc/items/item_satanic_core.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"02"
{
"var_type" "FIELD_INTEGER"
"bonus_intelligence" "25 35 45"
"bonus_intelligence" "25 35 45"
}
"03"
{
Expand All @@ -90,45 +90,50 @@
"06"
{
"var_type" "FIELD_INTEGER"
"lifesteal_percent" "25"
"lifesteal_percent" "35"
}
"07"
{
"var_type" "FIELD_INTEGER"
"unholy_lifesteal_percent" "200"
"unholy_lifesteal_percent" "165"
}
"08"
{
"var_type" "FIELD_INTEGER"
"unholy_lifesteal_total_tooltip" "200"
}
"09"
{
"var_type" "FIELD_FLOAT"
"unholy_duration" "4.5"
}
// Octarine Core Parameters
"09"
"10"
{
"var_type" "FIELD_INTEGER"
"bonus_cooldown" "25 25 25"
}
"10"
"11"
{
"var_type" "FIELD_FLOAT"
"hero_lifesteal" "35"
}
"12"
{
"var_type" "FIELD_FLOAT"
"creep_lifesteal" "10 20 30"
}
// unholy spellsteal
"13"
{
"var_type" "FIELD_FLOAT"
"hero_spellsteal_unholy" "165"
}
"14"
{
"var_type" "FIELD_FLOAT"
"hero_lifesteal" "35 45 55"
"creep_spellsteal_unholy" "190 180 170"
}
"11"
{
"var_type" "FIELD_FLOAT"
"creep_lifesteal" "10 20 30"
}
// unholy spellsteal
"12"
{
"var_type" "FIELD_FLOAT"
"hero_spellsteal_unholy" "200"
}
"13"
{
"var_type" "FIELD_FLOAT"
"creep_spellsteal_unholy" "200"
}
}
}
}
41 changes: 23 additions & 18 deletions game/scripts/npc/items/item_satanic_core_2.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"02"
{
"var_type" "FIELD_INTEGER"
"bonus_intelligence" "25 35 45"
"bonus_intelligence" "25 35 45"
}
"03"
{
Expand All @@ -78,45 +78,50 @@
"06"
{
"var_type" "FIELD_INTEGER"
"lifesteal_percent" "25"
"lifesteal_percent" "35"
}
"07"
{
"var_type" "FIELD_INTEGER"
"unholy_lifesteal_percent" "200"
"unholy_lifesteal_percent" "165"
}
"08"
{
"var_type" "FIELD_INTEGER"
"unholy_lifesteal_total_tooltip" "200"
}
"09"
{
"var_type" "FIELD_FLOAT"
"unholy_duration" "4.5"
}
// Octarine Core Parameters
"09"
"10"
{
"var_type" "FIELD_INTEGER"
"bonus_cooldown" "25 25 25"
}
"10"
"11"
{
"var_type" "FIELD_FLOAT"
"hero_lifesteal" "35 45 55"
"hero_lifesteal" "35"
}
"11"
"12"
{
"var_type" "FIELD_FLOAT"
"creep_lifesteal" "10 20 30"
}
// unholy spellsteal
"12"
{
"var_type" "FIELD_FLOAT"
"hero_spellsteal_unholy" "200"
}
"13"
{
"var_type" "FIELD_FLOAT"
"creep_spellsteal_unholy" "200"
}
// unholy spellsteal
"13"
{
"var_type" "FIELD_FLOAT"
"hero_spellsteal_unholy" "165"
}
"14"
{
"var_type" "FIELD_FLOAT"
"creep_spellsteal_unholy" "190 180 170"
}
}
}
}
41 changes: 23 additions & 18 deletions game/scripts/npc/items/item_satanic_core_3.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"02"
{
"var_type" "FIELD_INTEGER"
"bonus_intelligence" "25 35 45"
"bonus_intelligence" "25 35 45"
}
"03"
{
Expand All @@ -77,45 +77,50 @@
"06"
{
"var_type" "FIELD_INTEGER"
"lifesteal_percent" "25"
"lifesteal_percent" "35"
}
"07"
{
"var_type" "FIELD_INTEGER"
"unholy_lifesteal_percent" "200"
"unholy_lifesteal_percent" "165"
}
"08"
{
"var_type" "FIELD_INTEGER"
"unholy_lifesteal_total_tooltip" "200"
}
"09"
{
"var_type" "FIELD_FLOAT"
"unholy_duration" "4.5"
}
// Octarine Core Parameters
"09"
"10"
{
"var_type" "FIELD_INTEGER"
"bonus_cooldown" "25 25 25"
}
"10"
"11"
{
"var_type" "FIELD_FLOAT"
"hero_lifesteal" "35 45 55"
"hero_lifesteal" "35"
}
"11"
"12"
{
"var_type" "FIELD_FLOAT"
"creep_lifesteal" "10 20 30"
}
// unholy spellsteal
"12"
{
"var_type" "FIELD_FLOAT"
"hero_spellsteal_unholy" "200"
}
"13"
{
"var_type" "FIELD_FLOAT"
"creep_spellsteal_unholy" "200"
}
// unholy spellsteal
"13"
{
"var_type" "FIELD_FLOAT"
"hero_spellsteal_unholy" "165"
}
"14"
{
"var_type" "FIELD_FLOAT"
"creep_spellsteal_unholy" "190 180 170"
}
}
}
}

0 comments on commit 6897a7a

Please sign in to comment.