Skip to content
This repository was archived by the owner on Sep 20, 2020. It is now read-only.

Commit b84b584

Browse files
Make managers into namespaces
1 parent e93abf3 commit b84b584

14 files changed

+572
-501
lines changed

lib/main.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export declare class Main {
2323
makeErrorHtml(name: string, message: string): string;
2424

2525
onWindowLoad(): void;
26-
onWindowError(e: ErrorEvent): voi;
26+
onWindowError(e: ErrorEvent): void;
2727

2828
isPathRandomized(): boolean;
2929

lib/rmmz_managers/AudioManager.d.ts

Lines changed: 40 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -8,90 +8,74 @@ declare interface CurrentAudio {
88
pos?: number;
99
}
1010

11-
declare class AudioManager {
12-
private static _bgmVolume: number;
13-
private static _bgsVolume: number;
14-
private static _meVolume: number;
15-
private static _seVolume: number;
16-
17-
private static _currentBgm: CurrentAudio;
18-
private static _currentBgs: CurrentAudio;
11+
declare namespace AudioManager {
1912

20-
private static _bgmBuffer: WebAudio;
21-
private static _bgsBuffer: WebAudio;
22-
private static _meBuffer: WebAudio;
23-
private static _seBuffer: WebAudio;
13+
export let bgmVolume: number;
14+
export let bgsVolume: number;
15+
export let meVolume: number;
16+
export let seVolume: number;
2417

25-
private static _staticBuffers: WebAudio[];
18+
export function playBgm(bgm: CurrentAudio, pos: number): void;
19+
export function replayBgm(bgm: CurrentAudio): void;
2620

27-
private static _replayFadeTime: number;
28-
private static _path: string;
21+
export function isCurrentBgm(bgm: CurrentAudio): boolean;
2922

30-
public static bgmVolume: number;
31-
public static bgsVolume: number;
32-
public static meVolume: number;
33-
public static seVolume: number;
23+
export function updateBgmParameters(bgm: CurrentAudio): void;
24+
export function updateCurrentBgm(bgm: CurrentAudio, pos: number): void;
3425

35-
public static playBgm(bgm: CurrentAudio, pos: number): void;
36-
public static replayBgm(bgm: CurrentAudio): void;
26+
export function stopBgm(): void;
3727

38-
public static isCurrentBgm(bgm: CurrentAudio): boolean;
28+
export function fadeOutBgm(duration: number): void;
29+
export function fadeInBgm(duration: number): void;
3930

40-
public static updateBgmParameters(bgm: CurrentAudio): void;
41-
public static updateCurrentBgm(bgm: CurrentAudio, pos: number): void;
31+
export function playBgs(bgs: CurrentAudio, pos: number): void;
32+
export function replayBgs(bgs: CurrentAudio): void;
4233

43-
public static stopBgm(): void;
34+
export function isCurrentBgs(bgs: CurrentAudio): boolean;
4435

45-
public static fadeOutBgm(duration: number): void;
46-
public static fadeInBgm(duration: number): void;
36+
export function updateBgsParameters(bgs: CurrentAudio): void;
4737

48-
public static playBgs(bgs: CurrentAudio, pos: number): void;
49-
public static replayBgs(bgs: CurrentAudio): void;
38+
export function stopBgs(): void;
5039

51-
public static isCurrentBgs(bgs: CurrentAudio): boolean;
40+
export function fadeOutBgs(duration: number): void;
41+
export function fadeInBgs(duration: number): void;
5242

53-
public static updateBgsParameters(bgs: CurrentAudio): void;
43+
export function playMe(me: CurrentAudio): void;
5444

55-
public static stopBgs(): void;
45+
export function updateMeParameters(me: CurrentAudio): void;
5646

57-
public static fadeOutBgs(duration: number): void;
58-
public static fadeInBgs(duration: number): void;
47+
export function fadeOutMe(duration: number): void;
5948

60-
public static playMe(me: CurrentAudio): void;
49+
export function stopMe(): void;
6150

62-
public static updateMeParameters(me: CurrentAudio): void;
51+
export function playSe(se: CurrentAudio): void;
6352

64-
public static fadeOutMe(duration: number): void;
53+
export function updateSeParameters(buffer: WebAudio, se: CurrentAudio): void;
6554

66-
public static stopMe(): void;
55+
export function cleanupSe(): void;
6756

68-
public static playSe(se: CurrentAudio): void;
57+
export function stopSe(): void;
6958

70-
public static updateSeParameters(buffer: WebAudio, se: CurrentAudio): void;
59+
export function playStaticSe(se: CurrentAudio): void;
60+
export function loadStaticSe(se: CurrentAudio): void;
7161

72-
public static cleanupSe(): void;
62+
export function isStaticSe(se: CurrentAudio): boolean;
7363

74-
public static stopSe(): void;
64+
export function stopAll(): void;
7565

76-
public static playStaticSe(se: CurrentAudio): void;
77-
public static loadStaticSe(se: CurrentAudio): void;
66+
export function saveBgm(): CurrentAudio;
67+
export function saveBgs(): CurrentAudio;
7868

79-
public static isStaticSe(se: CurrentAudio): boolean;
69+
export function makeEmptyAudioObject(): CurrentAudio;
8070

81-
public static stopAll(): void;
71+
export function createBuffer(folder: string, name: string): WebAudio;
72+
export function updateBufferParameters(buffer: WebAudio, configVolume: number, audio: CurrentAudio): void;
8273

83-
public static saveBgm(): CurrentAudio;
84-
public static saveBgs(): CurrentAudio;
74+
export function audioFileExt(): string;
8575

86-
public static makeEmptyAudioObject(): CurrentAudio;
76+
export function checkErrors(): void;
77+
export function throwLoadError(webAudio: WebAudio): void;
8778

88-
public static createBuffer(folder: string, name: string): WebAudio;
89-
public static updateBufferParameters(buffer: WebAudio, configVolume: number, audio: CurrentAudio): void;
90-
91-
public static audioFileExt(): string;
92-
93-
public static checkErrors(): void;
94-
public static throwLoadError(webAudio: WebAudio): void;
9579
}
9680

9781
export { AudioManager, CurrentAudio };
Lines changed: 165 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,175 @@
1-
import { CurrentAudio } from "./AudioManager";
1+
import { Game_Actor, Game_Action } from '../rmmz_objects';
22

3-
import { Game_Actor } from '../rmmz_objects/Game_Actor';
4-
import { Game_Action } from '../rmmz_objects/Game_Action';
3+
import { Spriteset_Battle } from "../rmmz_sprites";
54

6-
import { Spriteset_Battle } from "../rmmz_sprites/Spriteset_Battle";
5+
import { Window_BattleLog } from '../rmmz_windows';
76

8-
import { Window_BattleLog } from '../rmmz_windows/Window_BattleLog';
7+
declare namespace BattleManager {
98

10-
declare class BattleManager {
9+
enum Result {
10+
Victory = 0,
11+
Abort = 1,
12+
Defeat = 2
13+
}
1114

12-
private static _phase: string;
13-
private static _inputting: boolean;
14-
private static _canEscape: boolean;
15-
private static _canLose: boolean;
16-
private static _battleTest: boolean;
17-
private static _eventCallback: boolean;
18-
private static _preemptive: boolean;
19-
private static _surprise: boolean;
20-
private static _currentActor: Game_Actor;
21-
private static _actionForceBattler: Game_Action;
22-
private static _mapBgm: CurrentAudio;
23-
private static _mapBgs: CurrentAudio;
15+
export function setup(troopId: number, canEscape: boolean, canLose: boolean): void;
16+
export function initMembers(): void;
17+
export function isTpb(): boolean;
18+
export function isActiveTpb(): boolean;
19+
export function isBattleTest(): boolean;
2420

25-
private static _actionBattlers: Game_Battler[];
21+
export function setBattleTest(battleTest: boolean): void;
22+
export function setEventCallback(callback: (result: BattleManager.Result) => void): void;
23+
export function setLogWindow(logWindow: Window_BattleLog): void;
24+
export function setSpriteset(spriteset: Spriteset_Battle): void;
2625

27-
private static _subject: Game_Battler;
28-
private static _action: Game_Action;
26+
export function onEncounter(): void;
2927

30-
private static _targets: Game_Battler[];
31-
private static _logWindow: Window_BattleLog;
28+
export function ratePreemptive(): number;
29+
export function rateSurprise(): number;
30+
31+
export function saveBgmAndBgs(): void;
32+
export function playBattleBgm(): void;
33+
export function playVictoryMe(): void;
34+
export function playDefeatMe(): void;
35+
export function replayBgmAndBgs(): void;
36+
37+
export function makeEscapeRatio(): void;
38+
39+
export function update(timeActive: number): void;
40+
41+
export function updatePhase(timeActive: number): void;
42+
export function updateEvent(): void;
43+
export function updateEventMain(): boolean;
44+
45+
export function isBusy(): boolean;
46+
47+
export function updateTpbInput(): void;
48+
49+
export function checkTpbInputClose(): void;
50+
export function checkTpbInputOpen(): void;
51+
52+
export function isPartyTpbInputtable(): boolean;
3253

33-
private static _spriteset: Spriteset_Battle;
34-
private static _escapeRatio: number;
35-
private static _escaped: boolean;
36-
private static _rewards: Record<string, unknown>;
37-
private static _tpbNeedsPartyCommand: boolean;
54+
export function needsActorInputCancel(): boolean;
55+
56+
export function isTpbMainPhase(): boolean;
57+
export function isInputting(): boolean;
58+
export function isInTurn(): boolean;
59+
60+
export function isTurnEnd(): boolean;
61+
export function isAborting(): boolean;
62+
export function isBattleEnd(): boolean;
63+
64+
export function canEscape(): boolean;
65+
export function canLose(): boolean;
66+
67+
export function isEscaped(): boolean;
68+
69+
export function actor(): Game_Actor;
70+
71+
export function startBattle(): void;
72+
73+
export function displayStartMessages(): void;
74+
75+
export function startInput(): void;
76+
77+
export function inputtingAction(): Game_Action;
78+
79+
export function selectNextCommand(): void;
80+
81+
export function selectNextActor(): void;
82+
export function selectPreviousCommand(): void;
83+
export function selectPreviousActor(): void;
84+
85+
export function changeCurrentActor(forward: boolean): void;
86+
87+
export function startActorInput(): void;
88+
89+
export function finishActorInput(): void;
90+
export function cancelActorInput(): void;
91+
92+
export function updateStart(): void;
93+
94+
export function startTurn(): void;
95+
96+
export function updateTurn(timeActive: boolean): void;
97+
export function updateTpb(): void;
98+
export function updateAllTpbBattlers(): void;
99+
export function updateTpbBattler(battler): void;
100+
101+
export function checkTpbTurnEnd(): void;
102+
103+
export function processTurn(): void;
104+
105+
export function endBattlerActions(battler): void;
106+
107+
export function endTurn(): void;
108+
109+
export function endAllBattlersTurn(): void;
110+
111+
export function displayBattlerStatus(battler: Game_Battler, current: boolean): void;
112+
113+
export function updateTurnEnd(): void;
114+
115+
export function getNextSubject(): Game_Battler | null;
116+
117+
export function allBattleMembers(): Game_Battler[];
118+
119+
export function makeActionOrders(): void;
120+
121+
export function startAction(): void;
122+
export function updateAction(): void;
123+
export function endAction(): void;
124+
125+
export function invokeAction(subject: Game_Battler, target: Game_Battler): void;
126+
export function invokeNormalAction(subject: Game_Battler, target: Game_Battler): void;
127+
export function invokeCounterAttack(subject: Game_Battler, target: Game_Battler): void;
128+
export function invokeMagicReflection(subject: Game_Battler, target: Game_Battler): void;
129+
130+
export function applySubstitute(target: Game_Battler): Game_Battler;
131+
export function checkSubstitute(target: Game_Battler): boolean;
132+
133+
export function isActionForced(): boolean;
134+
135+
export function forceAction(battler: Game_Battler): void;
136+
137+
export function processForcedAction(): void;
138+
139+
export function abort(): void;
140+
141+
export function checkBattleEnd(): boolean;
142+
export function checkAbort(): boolean;
143+
144+
export function processVictory(): void;
145+
export function processEscape(): boolean;
146+
147+
export function onEscapeSuccess(): void;
148+
export function onEscapeFailure(): void;
149+
150+
export function processAbort(): void;
151+
export function processDefeat(): void;
152+
153+
export function endBattle(result: BattleManager.Result): void;
154+
155+
export function updateBattleEnd(): void;
156+
157+
export function makeRewards(): void;
158+
159+
export function displayVictoryMessage(): void;
160+
export function displayDefeatMessage(): void;
161+
export function displayEscapeSuccessMessage(): void;
162+
export function displayEscapeFailureMessage();
163+
export function displayRewards(): void;
164+
export function displayExp(): void;
165+
export function displayGold(): void;
166+
export function displayDropItems(): void;
167+
168+
export function gainRewards(): void;
169+
export function gainExp(): void;
170+
export function gainGold(): void;
171+
export function gainDropItems(): void;
172+
173+
}
38174

39-
}
175+
export { BattleManager };

0 commit comments

Comments
 (0)