Skip to content

Commit

Permalink
Merge pull request #1 from SGG-Modding/dev
Browse files Browse the repository at this point in the history
prefix rename and new output file
  • Loading branch information
AndreLouisIssa authored May 21, 2024
2 parents a4deabe + 4e74d0c commit 725901c
Show file tree
Hide file tree
Showing 469 changed files with 4,986 additions and 4,942 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- 'game-import' when using something that imports all of the globals into your environment

### Changed

- Reserve the name 'game' for definitions
- Rename prefixes, e.g. 'SGG_Modding-Hades2GameDef' became 'game'

## [1.0.1] - 2024-05-15

### Added
Expand Down
2 changes: 1 addition & 1 deletion src/Scripts/AchievementData.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AchievementData
---@meta game-Scripts-AchievementData
local game = {}

return game
12 changes: 6 additions & 6 deletions src/Scripts/AchievementLogic.lua
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AchievementLogic
---@meta game-Scripts-AchievementLogic
local game = {}

---@class SGG_Modding-Hades2GameDef-Scripts-AchievementLogic*SessionAchivementUnlocks
---@class game-Scripts-AchievementLogic*SessionAchivementUnlocks

---@type SGG_Modding-Hades2GameDef-Scripts-AchievementLogic*SessionAchivementUnlocks
---@type game-Scripts-AchievementLogic*SessionAchivementUnlocks
game.SessionAchivementUnlocks = {}
---@alias SGG_Modding-Hades2GameDef-Scripts-AchievementLogic.SessionAchivementUnlocks ...
---@alias game-Scripts-AchievementLogic.SessionAchivementUnlocks ...

function game.CheckAchievement(a) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AchievementLogic.CheckAchievement ...
---@alias game-Scripts-AchievementLogic.CheckAchievement ...

function game.CheckProgressAchievements(a) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AchievementLogic.CheckProgressAchievements ...
---@alias game-Scripts-AchievementLogic.CheckProgressAchievements ...

return game
2 changes: 1 addition & 1 deletion src/Scripts/AllyData.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AllyData
---@meta game-Scripts-AllyData
local game = {}

return game
14 changes: 7 additions & 7 deletions src/Scripts/AmmoLogic.lua
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AmmoLogic
---@meta game-Scripts-AmmoLogic
local game = {}

function game.AddAmmo(a, b) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AmmoLogic.AddAmmo ...
---@alias game-Scripts-AmmoLogic.AddAmmo ...

function game.GetCurrentAmmo(a) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AmmoLogic.GetCurrentAmmo ...
---@alias game-Scripts-AmmoLogic.GetCurrentAmmo ...

function game.GetMaxAmmo(a) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AmmoLogic.GetMaxAmmo ...
---@alias game-Scripts-AmmoLogic.GetMaxAmmo ...

function game.ReloadAmmo(a) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AmmoLogic.ReloadAmmo ...
---@alias game-Scripts-AmmoLogic.ReloadAmmo ...

function game.SpendAmmo(a) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AmmoLogic.SpendAmmo ...
---@alias game-Scripts-AmmoLogic.SpendAmmo ...

function game.UpdateWeaponAmmo(a, b, c) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AmmoLogic.UpdateWeaponAmmo ...
---@alias game-Scripts-AmmoLogic.UpdateWeaponAmmo ...

return game
14 changes: 7 additions & 7 deletions src/Scripts/AssistLogic.lua
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AssistLogic
---@meta game-Scripts-AssistLogic
local game = {}

function game.AddAssistWeapons(a, b) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AssistLogic.AddAssistWeapons ...
---@alias game-Scripts-AssistLogic.AddAssistWeapons ...

function game.AssistHintDelay(a, b) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AssistLogic.AssistHintDelay ...
---@alias game-Scripts-AssistLogic.AssistHintDelay ...

function game.CanFireAssist() end
---@alias SGG_Modding-Hades2GameDef-Scripts-AssistLogic.CanFireAssist ...
---@alias game-Scripts-AssistLogic.CanFireAssist ...

function game.CheckAssistHint(a, b) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AssistLogic.CheckAssistHint ...
---@alias game-Scripts-AssistLogic.CheckAssistHint ...

function game.DoAssist(a) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AssistLogic.DoAssist ...
---@alias game-Scripts-AssistLogic.DoAssist ...

function game.RemoveAssistWeapons(a, b) end
---@alias SGG_Modding-Hades2GameDef-Scripts-AssistLogic.RemoveAssistWeapons ...
---@alias game-Scripts-AssistLogic.RemoveAssistWeapons ...

return game
52 changes: 26 additions & 26 deletions src/Scripts/AudioData.lua
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData
---@meta game-Scripts-AudioData
local game = {}

game.GossipSubtitlesMinDistance = 1200
---@alias SGG_Modding-Hades2GameDef-Scripts-AudioData.GossipSubtitlesMinDistance ...
---@alias game-Scripts-AudioData.GossipSubtitlesMinDistance ...

---@class SGG_Modding-Hades2GameDef-Scripts-AudioData*CombatOverMusicEvents
---@class game-Scripts-AudioData*CombatOverMusicEvents

---@type SGG_Modding-Hades2GameDef-Scripts-AudioData*CombatOverMusicEvents
---@type game-Scripts-AudioData*CombatOverMusicEvents
game.CombatOverMusicEvents = {}
---@alias SGG_Modding-Hades2GameDef-Scripts-AudioData.CombatOverMusicEvents ...
---@alias game-Scripts-AudioData.CombatOverMusicEvents ...

---@class SGG_Modding-Hades2GameDef-Scripts-AudioData*GlobalVoiceLines
---@class game-Scripts-AudioData*GlobalVoiceLines

---@type SGG_Modding-Hades2GameDef-Scripts-AudioData*GlobalVoiceLines
---@type game-Scripts-AudioData*GlobalVoiceLines
game.GlobalVoiceLines = {}
---@alias SGG_Modding-Hades2GameDef-Scripts-AudioData.GlobalVoiceLines ...
---@alias game-Scripts-AudioData.GlobalVoiceLines ...

---@class SGG_Modding-Hades2GameDef-Scripts-AudioData*MusicMarkerData
---@class game-Scripts-AudioData*MusicMarkerData

---@type SGG_Modding-Hades2GameDef-Scripts-AudioData*MusicMarkerData
---@type game-Scripts-AudioData*MusicMarkerData
game.MusicMarkerData = {}
---@alias SGG_Modding-Hades2GameDef-Scripts-AudioData.MusicMarkerData ...
---@alias game-Scripts-AudioData.MusicMarkerData ...

---@class SGG_Modding-Hades2GameDef-Scripts-AudioData*MusicPlayerTrackData
---@class game-Scripts-AudioData*MusicPlayerTrackData

---@type SGG_Modding-Hades2GameDef-Scripts-AudioData*MusicPlayerTrackData
---@type game-Scripts-AudioData*MusicPlayerTrackData
game.MusicPlayerTrackData = {}
---@alias SGG_Modding-Hades2GameDef-Scripts-AudioData.MusicPlayerTrackData ...
---@alias game-Scripts-AudioData.MusicPlayerTrackData ...

---@class SGG_Modding-Hades2GameDef-Scripts-AudioData*MusicPlayerTrackOrderData
---@class game-Scripts-AudioData*MusicPlayerTrackOrderData

---@type SGG_Modding-Hades2GameDef-Scripts-AudioData*MusicPlayerTrackOrderData
---@type game-Scripts-AudioData*MusicPlayerTrackOrderData
game.MusicPlayerTrackOrderData = {}
---@alias SGG_Modding-Hades2GameDef-Scripts-AudioData.MusicPlayerTrackOrderData ...
---@alias game-Scripts-AudioData.MusicPlayerTrackOrderData ...

---@class SGG_Modding-Hades2GameDef-Scripts-AudioData*MusicTrackData
---@class game-Scripts-AudioData*MusicTrackData

---@type SGG_Modding-Hades2GameDef-Scripts-AudioData*MusicTrackData
---@type game-Scripts-AudioData*MusicTrackData
game.MusicTrackData = {}
---@alias SGG_Modding-Hades2GameDef-Scripts-AudioData.MusicTrackData ...
---@alias game-Scripts-AudioData.MusicTrackData ...

---@class SGG_Modding-Hades2GameDef-Scripts-AudioData*PresetAudioArgs
---@class game-Scripts-AudioData*PresetAudioArgs

---@type SGG_Modding-Hades2GameDef-Scripts-AudioData*PresetAudioArgs
---@type game-Scripts-AudioData*PresetAudioArgs
game.PresetAudioArgs = {}
---@alias SGG_Modding-Hades2GameDef-Scripts-AudioData.PresetAudioArgs ...
---@alias game-Scripts-AudioData.PresetAudioArgs ...

---@class SGG_Modding-Hades2GameDef-Scripts-AudioData*RoomStartMusicEvents
---@class game-Scripts-AudioData*RoomStartMusicEvents

---@type SGG_Modding-Hades2GameDef-Scripts-AudioData*RoomStartMusicEvents
---@type game-Scripts-AudioData*RoomStartMusicEvents
game.RoomStartMusicEvents = {}
---@alias SGG_Modding-Hades2GameDef-Scripts-AudioData.RoomStartMusicEvents ...
---@alias game-Scripts-AudioData.RoomStartMusicEvents ...

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Challenge.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Challenge
---@meta game-Scripts-AudioData_Challenge
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Chaos.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Chaos
---@meta game-Scripts-AudioData_Chaos
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Chronos.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Chronos
---@meta game-Scripts-AudioData_Chronos
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Circe.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Circe
---@meta game-Scripts-AudioData_Circe
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Echo.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Echo
---@meta game-Scripts-AudioData_Echo
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Eris.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Eris
---@meta game-Scripts-AudioData_Eris
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Heracles.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Heracles
---@meta game-Scripts-AudioData_Heracles
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Hermes.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Hermes
---@meta game-Scripts-AudioData_Hermes
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Icarus.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Icarus
---@meta game-Scripts-AudioData_Icarus
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Mailbox.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Mailbox
---@meta game-Scripts-AudioData_Mailbox
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Medea.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Medea
---@meta game-Scripts-AudioData_Medea
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Narcissus.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Narcissus
---@meta game-Scripts-AudioData_Narcissus
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Polyphemus.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Polyphemus
---@meta game-Scripts-AudioData_Polyphemus
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Scylla.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Scylla
---@meta game-Scripts-AudioData_Scylla
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Shrine.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Shrine
---@meta game-Scripts-AudioData_Shrine
local game = {}

return game
2 changes: 1 addition & 1 deletion src/Scripts/AudioData_Tartarus.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---@meta SGG_Modding-Hades2GameDef-Scripts-AudioData_Tartarus
---@meta game-Scripts-AudioData_Tartarus
local game = {}

return game
Loading

0 comments on commit 725901c

Please sign in to comment.