Mercurial Mercurial > aquaria-psp / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge latest changes from branch miscellaneous-fixes. patched
authorachurch
Sun, 30 Jan 2011 02:11:03 +0900
branchpatched
changeset 653 54626bb54d30
parent 651 4907dad4321e (current diff)
parent 652 8cc6d08d2392 (diff)
child 654 e9e13ea86644
child 656 7787c8b72b09
Merge latest changes from branch miscellaneous-fixes.
game_scripts/scripts/entities/deepwhale.lua file | annotate | diff | comparison | revisions
game_scripts/scripts/entities/licage.lua file | annotate | diff | comparison | revisions 
--- a/game_scripts/scripts/entities/deepwhale.lua	Sun Jan 30 01:41:00 2011 +0900
+++ b/game_scripts/scripts/entities/deepwhale.lua	Sun Jan 30 02:11:03 2011 +0900
@@ -129,6 +129,8 @@
 		debugLog(string.format("curNote: %d", v.curNote))
 		if notes[v.curNote] == note then
 			v.curNote = v.curNote + 1
+		elseif notes[1] == note then
+			v.curNote = 2
 		else
 			v.curNote = 1
 		end
--- a/game_scripts/scripts/entities/licage.lua	Sun Jan 30 01:41:00 2011 +0900
+++ b/game_scripts/scripts/entities/licage.lua	Sun Jan 30 02:11:03 2011 +0900
@@ -262,6 +262,8 @@
 			--debugLog(string.format("curNote: %d", v.curNote))
 			if notes[v.curNote] == note then
 				v.curNote = v.curNote + 1
+			elseif notes[1] == note then
+				v.curNote = 2
 			else
 				v.curNote = 1
 			end
aquaria-psp