Skip to content

Commit

Permalink
Final changes for 1.4.0
Browse files Browse the repository at this point in the history
- Fixed tooltips for new rect generator lighting abilities and old weather abilities.
- Final unit data fixes.
- Added credits to quests.
- Set period of AutoRectEnvironment to 1/64.
- Disabled ability cooldown lib to avoid crashes.
- Updated w3i.
  • Loading branch information
Son-Guhun committed Jan 8, 2020
1 parent a21ef65 commit 6f441da
Show file tree
Hide file tree
Showing 6 changed files with 103 additions and 25 deletions.
82 changes: 78 additions & 4 deletions release/table/ability.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7849,6 +7849,80 @@ levels = 1
-- Race
race = "other"

[A063]
_parent = "ANcl"
-- Icon - Normal
Art = "ReplaceableTextures\\CommandButtons\\BTNReplay-SpeedUp.blp"
-- Button Position - Normal (X)
Buttonpos_1 = 1
-- Button Position - Normal (Y)
Buttonpos_2 = 2
-- Caster
CasterArt = ""
-- Follow Through Time
DataA = 0.
-- Options
DataC = 1
-- Disable Other Abilities
DataE = 0
-- Base Order ID
DataF = "auraunholy"
-- Effect
EffectArt = ""
-- Hotkey - Normal
Hotkey = "X"
-- Name
Name = "GUDR Lighting Next"
-- Target
TargetArt = ""
-- Tooltip - Normal
Tip = "Lighting - Next - [|cffffcc00Q|r]"
-- Tooltip - Normal - Extended
Ubertip = "Changes lighting in the rect to the previous lighting environment.|n0: Total Darkness|n1: Ashenvale|n2: Dalaran|n3: Dungeon|n4: Felwood|n5: Lordaeron (Default)|n6: Underground"
-- Hero Ability
hero = 0
-- Levels
levels = 1
-- Race
race = "other"

[A064]
_parent = "ANcl"
-- Icon - Normal
Art = "ReplaceableTextures\\CommandButtons\\BTNReplay-SpeedDown.blp"
-- Button Position - Normal (X)
Buttonpos_1 = 0
-- Button Position - Normal (Y)
Buttonpos_2 = 2
-- Caster
CasterArt = ""
-- Follow Through Time
DataA = 0.
-- Options
DataC = 1
-- Disable Other Abilities
DataE = 0
-- Base Order ID
DataF = "attributemodskill"
-- Effect
EffectArt = ""
-- Hotkey - Normal
Hotkey = "Z"
-- Name
Name = "GUDR Lighting Prev"
-- Target
TargetArt = ""
-- Tooltip - Normal
Tip = "Weather - Previous - [|cffffcc00C|r]"
-- Tooltip - Normal - Extended
Ubertip = "Changes lighting in the rect to the next lighting environment.|n|n0: Total Darkness|n1: Ashenvale|n2: Dalaran|n3: Dungeon|n4: Felwood|n5: Lordaeron (Default)|n6: Underground"
-- Hero Ability
hero = 0
-- Levels
levels = 1
-- Race
race = "other"

[A09Y]
_parent = "Aasl"
-- Area of Effect
Expand Down Expand Up @@ -10079,9 +10153,9 @@ Name = "GUDR Weather Next"
-- Target
TargetArt = ""
-- Tooltip - Normal
Tip = "Weather - Previous - [|cffffcc00Q|r]"
Tip = "Weather - Next - [|cffffcc00Q|r]"
-- Tooltip - Normal - Extended
Ubertip = "Sets the Weather to the previous one on the list."
Ubertip = "Sets the Weather to the next one on the list."
-- Hero Ability
hero = 0
-- Levels
Expand Down Expand Up @@ -10116,9 +10190,9 @@ Name = "GUDR Weather Prev"
-- Target
TargetArt = ""
-- Tooltip - Normal
Tip = "Weather - Next - [|cffffcc00C|r]"
Tip = "Weather - Previous - [|cffffcc00C|r]"
-- Tooltip - Normal - Extended
Ubertip = "Sets the Weather to the next one on the list."
Ubertip = "Sets the Weather to the previous one on the list."
-- Hero Ability
hero = 0
-- Levels
Expand Down
28 changes: 15 additions & 13 deletions release/table/unit.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22757,7 +22757,7 @@ Tip = "High Elf Impaler"
-- Tooltip - Extended
Ubertip = ""
-- Normal
abilList = "A03F,AInv,AOcr,AOmi,AOww"
abilList = "A035,AInv,AOcr,AOmi,A05P"
-- Model File
file = "_unoptmized\\units\\Elf\\HighElf\\Impaler.mdl"
-- Food Cost
Expand Down Expand Up @@ -100327,6 +100327,8 @@ file = "_unoptmized\\units\\Elf\\GrayElf\\Gelldir Swordsman.mdl"
fused = 0
-- Gold Cost
goldcost = 0
-- Scaling Value
modelScale = 1.2
-- Race
race = "nightelf"
-- Upgrades Used
Expand Down Expand Up @@ -168396,7 +168398,7 @@ _parent = "hfoo"
-- Icon - Game Interface
Art = "ReplaceableTextures\\CommandButtons\\BTNSteelRanged.blp"
-- Button Position (X)
Buttonpos_1 = 2
Buttonpos_1 = 1
-- Button Position (Y)
Buttonpos_2 = 1
-- Hit Points Maximum (Base)
Expand All @@ -168406,7 +168408,7 @@ Hotkey = "D"
-- Name
Name = "Estalian Spearman"
-- Tooltip - Basic
Tip = "Estalian Spearman - [|cffffcc00D|r]"
Tip = "Estalian Spearman - [|cffffcc00S|r]"
-- Tooltip - Extended
Ubertip = ""
-- Normal
Expand Down Expand Up @@ -169204,13 +169206,13 @@ EditorSuffix = "[prod]"
-- Hotkey
Hotkey = "W"
-- Name
Name = "Estailian Barracks"
Name = "Estalian Barracks"
-- Researches Available
Researches = ""
-- Tooltip - Basic
Tip = "Estailian Barracks"
Tip = "Estalian Barracks"
-- Units Trained
Trains = "h1IY,h1IS,h1IV,h1IZ,h1IP,h1IU,h1IR"
Trains = "h1IY,h1IS,h1IV,h1IZ,h1IP,h1IR"
-- Tooltip - Extended
Ubertip = ""
-- Normal
Expand Down Expand Up @@ -175462,7 +175464,7 @@ Name = "Column Wooden Pillar"
-- Attack 1 - Range Motion Buffer
RngBuff1 = 250.
-- Special
Specialart = ",_unoptmized\\Decorations\\Columns\\pillar.mdx"
Specialart = ",_unoptmized\\Decorations\\Columns\\pillar.mdl"
-- Tooltip - Basic
Tip = "Column Wooden Pillar - [|cffffcc00Z|r]"
-- Tooltip - Extended
Expand Down Expand Up @@ -180527,7 +180529,7 @@ elevPts = 0
-- Elevation - Sample Radius
elevRad = 0.
-- Model File
file = "_unoptmized\\Decorations\\Columns\\RUNE PILLAR .mdl"
file = "_unoptmized\\Decorations\\Columns\\RUNE PILLAR.mdl"
-- Food Produced
fmade = 5
-- Gold Cost
Expand Down Expand Up @@ -188075,15 +188077,15 @@ Buttonpos_2 = 2
-- Hotkey
Hotkey = "Z"
-- Name
Name = "War Wolf"
Name = "Norse War Wolf"
-- Tooltip - Basic
Tip = "War Wolf - [|cffffcc00Z|r]"
Tip = "Norse War Wolf - [|cffffcc00Z|r]"
-- Tooltip - Extended
Ubertip = ""
-- Build Time
bldtm = 2
-- Model File
file = "Norse Armored Wolf.mdl"
file = "_unoptmized\\units\\Human\\Norse\\Norse Armored Wolf.mdl"
-- Food Cost
fused = 0
-- Gold Cost
Expand Down Expand Up @@ -200891,9 +200893,9 @@ Builds = "h1DL,h1DM,h1DN,h1DO,h1DP"
-- Name
Name = "Deco Builder Murloc"
-- Tooltip - Basic
Tip = "Deco Builder Arabian 1"
Tip = "Deco Builder Murloc"
-- Tooltip - Extended
Ubertip = ""
Ubertip = "Mrglglglgl!"
-- Normal
abilList = "A00J,A0CA,Avul"
-- Build Time
Expand Down
13 changes: 7 additions & 6 deletions release/table/w3i.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[map]
file_version = 25
map_version = 10799
map_version = 10875
we_version = 6060
map_name = "Titan Land: LoP 1.4.0-beta5"
map_name = "Titan Land: LoP 1.4.0-final"
author_name = "Guhun"
map_desc = [=[
Titan Land map based on RoK and BotE. Inspiration received from KoT.
Expand Down Expand Up @@ -57,15 +57,16 @@ unknown_9 = 0
id = -1
path = "war3mapImported\\OrbitalRay.mdx"
text = [=[
Special thanks to: Mori, LichKing76, King_Katanova and Aillish.
Map by Guhun. Race design by King_Katanova. Special thanks to: Mori, LichKing76 and Aillish.

|c00ffff00Want your name on the loading screen? Please consider supporting the project at:|r ko-fi.com/songuhun

|c00ffff00Join the discord for newest version:|r discord.titan.land

|c00ffcc00beta4:|r IKJL -freecam rotation. Added more missing models. Hopefully final beta.]=]
title = "|cff0000ffGuhun Presents|r"
subtitle = "|cffffffffTitan Land: Lands of Plenty 1.4.0-beta5|r"
|c00ccccccStep forth, heroes of mankind! For honor and glory.|r
|c00ffcc00New features:|r Relocate Rect Generator saves. Human racial overhaul, many new races. Ships. New -freecam command. Math operations in commands. Mounts.]=]
title = "|cff9b870cTitan Land: Lands of Plenty 1.4.0|r"
subtitle = "Rise of Humanity"

[prologue]
path = ""
Expand Down
2 changes: 1 addition & 1 deletion release/trigger/05-Map Init/4-Init Quests.j
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ TiJil, unwirklich
// Model Credits 2
set quest_text = "
|cff00b300The Hive Workshop:|r
PrinceYaser, shiik, Dr.Death, Sant, Eagle XI, Afroknight_76, Deleted member 238226 (unknown), GhostThruster, Whitewolf8, WhiteDeath, A.R., Xezko, Deep Sea Kraken, Hellx-Magnus, -Berz-, CRAZYRUSSIAN, HappyCockroach, Tamplier777, Kehel, Radagast, Lordaeron Creator, The D3ath, Gottfrei, bu3ny, CloudWolf, Gyrosphinx, Marenko, Talavaj, !!GORO!!, THE_SILENT, Kenntaur, skrab, simkitty181, olyvian, Darkfang, JollyD, paulH, apaka, Just_Spectating, Leopard, GiFun, erwtenpeller, wc3neverdies, Spinel, Miseracord, JesusHipster, Shakral, strongwill, Blood Raven, Kanadaj, PrinceYaser, The Leader
PrinceYaser, shiik, Dr.Death, Sant, Eagle XI, Afroknight_76, Deleted member 238226 (unknown), GhostThruster, Whitewolf8, WhiteDeath, A.R., Xezko, Deep Sea Kraken, Hellx-Magnus, -Berz-, CRAZYRUSSIAN, HappyCockroach, Tamplier777, Kehel, Radagast, Lordaeron Creator, The D3ath, Gottfrei, bu3ny, CloudWolf, Gyrosphinx, Marenko, Talavaj, !!GORO!!, THE_SILENT, Kenntaur, skrab, simkitty181, olyvian, Darkfang, JollyD, paulH, apaka, Just_Spectating, Leopard, GiFun, erwtenpeller, wc3neverdies, Spinel, Miseracord, JesusHipster, Shakral, strongwill, Blood Raven, Kanadaj, PrinceYaser, The Leader, hortaxman, Cihparg, muna420, Aeroblyctos, Adikutz

|cffff0000XGM:|r
P4ela, Kolbosa, Wulfrein, DampirTBs, Feleer, Jack Sparrow, DiKey51, Ket, LongbowMan
Expand Down
2 changes: 1 addition & 1 deletion release/trigger/18-Rects/4-AutoRectEnvironment.j
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ function onTimer takes nothing returns nothing
endfunction

globals
private constant real PERIOD = 0.03
private constant real PERIOD = 1/64.
endglobals

private module InitModule
Expand Down
1 change: 1 addition & 0 deletions release/trigger/catalog.lml
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@
'40-No Spell System Spells': 'No Spell System Spells'
01-FilterTransformations: FilterTransformations
'02-Ability Cooldown': 'Ability Cooldown'
Disab
03-Summon: Summon
'04-Sargeras Silence New': 'Sargeras Silence New'
'05-Aura Of Restitution': 'Aura Of Restitution'
Expand Down

0 comments on commit 6f441da

Please sign in to comment.