[aquaria] [PATCH] Script fix
Andrew Church
achurch+aquaria at achurch.org
Sun Jun 26 01:35:12 EDT 2011
I botched an automated edit when updating the scripts in r184; fix below.
--Andrew Church
achurch at achurch.org
http://achurch.org/
# HG changeset patch
# User achurch
# Date 1309019680 -32400
# Node ID 0a04fc0fd89e188d1adf66ec3799ea6bc13d5e19
# Parent bfa7c24822c0d4e5ec10f8631b15d5c3a7039804
Fix a botched automated edit in r184 (acfa5176c17c).
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/_mods/guert_mod/scripts/nautilusprime.lua
--- a/game_scripts/_mods/guert_mod/scripts/nautilusprime.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/_mods/guert_mod/scripts/nautilusprime.lua Sun Jun 26 01:34:40 2011 +0900
@@ -133,7 +133,6 @@
--[[
if not v.seen and entity_isEntityInRange(me, getNaija(), 600) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
emote(EMOTE_NAIJAWOW)
v.seen = true
end
@@ -182,7 +181,6 @@
local s = 0
if not v.beserk then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
s = createShot("NautilusPrimeAngry", me, entity_getTarget(me), firex, firey)
v.fireDelay = 0.3
else
@@ -348,7 +346,6 @@
function exitState(me)
if entity_getState(me)==STATE_ATTACKPREP then
if not v.beserk then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_setState(me, STATE_ATTACK, 2.5)
else
entity_setState(me, STATE_ATTACK, 3)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/_mods/guert_mod/tempo/seedcommon.lua
--- a/game_scripts/_mods/guert_mod/tempo/seedcommon.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/_mods/guert_mod/tempo/seedcommon.lua Sun Jun 26 01:34:40 2011 +0900
@@ -67,7 +67,6 @@
local function terminate(me)
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if v.seedType == v.SEED_VINE then
registerSporeDrop(entity_x(me), entity_y(me),1)
@@ -91,7 +90,6 @@
function update(me, dt)
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if entity_updateCurrents(me, dt) then
entity_setWeight(me, 1)
else
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/_unused/13_mainarea.lua
--- a/game_scripts/scripts/entities/_unused/13_mainarea.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/_unused/13_mainarea.lua Sun Jun 26 01:34:40 2011 +0900
@@ -107,7 +107,6 @@
end
if isFlag(FLAG_VISION_ENERGYTEMPLE, 0) and v.n ~= 0 then
if not v.done1st and v.curNode == 1 and node_isEntityIn(v.lastNode, v.n) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
doScene(me)
end
if not entity_isInterpolating(me) and entity_isEntityInRange(me, v.n, 256) and not v.is then
@@ -230,7 +229,6 @@
end
end
if not v.over then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if math.abs(entity_x(me)-entity_x(v.n)) > 100 then
entity_flipToEntity(me, v.n)
end
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/_unused/cc_lostincave.lua
--- a/game_scripts/scripts/entities/_unused/cc_lostincave.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/_unused/cc_lostincave.lua Sun Jun 26 01:34:40 2011 +0900
@@ -94,7 +94,6 @@
end
elseif entity_isState(me, STATE_FOLLOW) then
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if node_isEntityIn(v.escapeNode, me) then
cutScene(me)
else
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/_unused/ompo.lua
--- a/game_scripts/scripts/entities/_unused/ompo.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/_unused/ompo.lua Sun Jun 26 01:34:40 2011 +0900
@@ -85,7 +85,6 @@
function update(me, dt)
if entity_isState(me, STATE_IDLE) then
if not v.following then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_doCollisionAvoidance(me, dt, 2, 1)
if v.following then
@@ -295,7 +294,6 @@
--bone_scale(v.glowBody,
--[[
if not v.spinning then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.spinning = true
entity_rotate(me, 360+entity_getRotation(me), 1, -1)
end
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/aggrobaby.lua
--- a/game_scripts/scripts/entities/aggrobaby.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/aggrobaby.lua Sun Jun 26 01:34:40 2011 +0900
@@ -110,7 +110,6 @@
entity_findTarget(me, 1200)
else
if not v.angry then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if entity_isTargetInRange(me, 400) then
v.jumpDelay = v.jumpDelay - dt
if v.jumpDelay < 0 then
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/aggrohopper.lua
--- a/game_scripts/scripts/entities/aggrohopper.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/aggrohopper.lua Sun Jun 26 01:34:40 2011 +0900
@@ -120,7 +120,6 @@
entity_findTarget(me, 1200)
else
if not v.angry then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if entity_isTargetInRange(me, 400) then
v.jumpDelay = v.jumpDelay - dt
if v.jumpDelay < 0 then
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/anglerfish.lua
--- a/game_scripts/scripts/entities/anglerfish.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/anglerfish.lua Sun Jun 26 01:34:40 2011 +0900
@@ -125,7 +125,6 @@
end
if entity_isState(me, STATE_LUNGE) then
if not v.lunging then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_doFriction(me, dt, 1000)
else
entity_moveTowardsTarget(me, dt, 500)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/camopus.lua
--- a/game_scripts/scripts/entities/camopus.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/camopus.lua Sun Jun 26 01:34:40 2011 +0900
@@ -87,7 +87,6 @@
if entity_isState(me, STATE_IDLE) then
v.inout = v.inout + dt*v.dir
if not v.spawn and v.inout > 0.2 then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
spawnParticleEffect("bubble-release", entity_x(me), entity_y(me))
v.spawn = true
end
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/cc_getrocked.lua
--- a/game_scripts/scripts/entities/cc_getrocked.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/cc_getrocked.lua Sun Jun 26 01:34:40 2011 +0900
@@ -94,7 +94,6 @@
end
else
if not v.spawnedEnemies then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if entity_isEntityInRange(me, v.n, 128) then
spawnEnemies(me)
end
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/cc_gf.lua
--- a/game_scripts/scripts/entities/cc_gf.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/cc_gf.lua Sun Jun 26 01:34:40 2011 +0900
@@ -137,7 +137,6 @@
return
end
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if entity_isPositionInRange(me, x, y, 700) then
if v.lx == 0 and v.ly == 0 then
v.lx,v.ly = entity_getPosition(me)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/chestmonster.lua
--- a/game_scripts/scripts/entities/chestmonster.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/chestmonster.lua Sun Jun 26 01:34:40 2011 +0900
@@ -119,7 +119,6 @@
function damage(me, attacker, bone, damageType, dmg)
if entity_isState(me, STATE_OPEN) and bone == v.head then
if not v.hit then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.hit = true
playSfx("creatorform6-die3")
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/clam.lua
--- a/game_scripts/scripts/entities/clam.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/clam.lua Sun Jun 26 01:34:40 2011 +0900
@@ -52,7 +52,6 @@
function update(me, dt)
if not v.seen and entity_isEntityInRange(me, v.n, 700) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if chance(50) then
emote(EMOTE_NAIJAGIGGLE)
else
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/crabboss.lua
--- a/game_scripts/scripts/entities/crabboss.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/crabboss.lua Sun Jun 26 01:34:40 2011 +0900
@@ -217,7 +217,6 @@
end
if not moving then
if not v.leftArmAlive and not v.rightArmAlive then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if entity_x(v.naija) > entity_x(me)-256 and entity_x(v.naija) < entity_x(me)+256 then
if entity_y(v.naija) < entity_y(me)-512 then
entity_setState(me, STATE_JUMPPREP)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/creatorform1.lua
--- a/game_scripts/scripts/entities/creatorform1.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/creatorform1.lua Sun Jun 26 01:34:40 2011 +0900
@@ -263,7 +263,6 @@
entity_setStateTime(me, 5)
elseif entity_isState(me, STATE_TRANSITION2) then
if not v.intrans2 then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.intrans2 = true
v.n = getNaija()
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/creatorform2.lua
--- a/game_scripts/scripts/entities/creatorform2.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/creatorform2.lua Sun Jun 26 01:34:40 2011 +0900
@@ -100,12 +100,10 @@
if bone ~= 0 then
if not v.inHand and v.grabDelay == 0 and bone == v.grabPoint then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.inHand = true
avatar_fallOffWall()
end
if not v.inHand and avatar_isBursting() and bone == v.bone_body and entity_setBoneLock(v.n, me, bone) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
else
local bx, by = bone_getWorldPosition(bone)
local x, y = entity_getPosition(v.n)
@@ -142,7 +140,6 @@
end
if not v.inHand and math.abs(entity_x(me) - entity_x(v.n)) > 256 then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_flipToEntity(me, v.n)
end
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/creatorform5.lua
--- a/game_scripts/scripts/entities/creatorform5.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/creatorform5.lua Sun Jun 26 01:34:40 2011 +0900
@@ -241,7 +241,6 @@
end
elseif entity_isState(me, STATE_TRANSITION) then
if not v.incut then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_setStateTime(me, 99)
v.incut = true
entity_idle(v.n)
@@ -282,7 +281,6 @@
entity_setState(me, STATE_INTRO2)
elseif entity_isState(me, STATE_SPAWNSPHERES) then
if not v.ic then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.ic = true
for n=1,v.songSize do
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/crystalholder.lua
--- a/game_scripts/scripts/entities/crystalholder.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/crystalholder.lua Sun Jun 26 01:34:40 2011 +0900
@@ -66,7 +66,6 @@
function update(me, dt)
if not v.setWaterLevel then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.lx,v.ly = entity_getPosition(me)
entity_setPosition(me, entity_x(me), getWaterLevel())
if not entity_isNearObstruction(me, 1) then
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/darkjellyfg.lua
--- a/game_scripts/scripts/entities/darkjellyfg.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/darkjellyfg.lua Sun Jun 26 01:34:40 2011 +0900
@@ -180,7 +180,6 @@
end
if not v.seen and entity_isEntityInRange(me, v.n, 512) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
emote(EMOTE_NAIJAWOW)
v.seen = true
end
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/deepwhale.lua
--- a/game_scripts/scripts/entities/deepwhale.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/deepwhale.lua Sun Jun 26 01:34:40 2011 +0900
@@ -109,7 +109,6 @@
function lightFlare(me)
if not v.seen then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if entity_isEntityInRange(me, v.n, 600) then
entity_idle(v.n)
v.seen = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/energyboss.lua
--- a/game_scripts/scripts/entities/energyboss.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/energyboss.lua Sun Jun 26 01:34:40 2011 +0900
@@ -218,7 +218,6 @@
return
end
if not v.awoken and not v.playedMusic and getFlag(FLAG_ENERGYBOSSDEAD)==0 then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if not isFlag(FLAG_OMPO, 4) then
if entity_isEntityInRange(me, v.naija, 1220) then
emote(EMOTE_NAIJAUGH)
@@ -231,7 +230,6 @@
end
if not v.awoken then return end
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if entity_isState(me, STATE_COLLAPSED) then
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/forestgod.lua
--- a/game_scripts/scripts/entities/forestgod.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/forestgod.lua Sun Jun 26 01:34:40 2011 +0900
@@ -234,7 +234,6 @@
local function cutscene(me)
v.n = getNaija()
if not v.inCutScene then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.inCutScene = true
pickupGem("Boss-PlantGoddess")
setFlag(FLAG_BOSS_FOREST,1)
@@ -336,7 +335,6 @@
if isFlag(FLAG_BOSS_FOREST, 0) and node_isEntityIn(v.enter, v.n) then
if not v.started then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.started = true
entity_setState(v.door, STATE_CLOSE)
playMusic("ForestGod")
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/hellbeast.lua
--- a/game_scripts/scripts/entities/hellbeast.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/hellbeast.lua Sun Jun 26 01:34:40 2011 +0900
@@ -267,7 +267,6 @@
end
if not v.skull then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
bone_damageFlash(v.bone_head, 1)
bone_damageFlash(v.bone_jaw, 1)
--playNoEffect()
@@ -299,7 +298,6 @@
playSfx("HellBeast-Stomp")
shakeCamera(30, 0.5)
if not v.skull then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
setSceneColor(0.7, 0.7, 0.7)
setSceneColor(1, 1, 1, 0.5)
end
@@ -340,7 +338,6 @@
if not(entity_isState(me, STATE_DONE) or entity_isState(me, STATE_DIE)) then
if entity_isEntityInRange(me, v.n, 2848) then
if not v.started then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
emote(EMOTE_NAIJAUGH)
playMusic("Mithala")
playSfx("HellBeast-Roar")
@@ -409,7 +406,6 @@
local my_y = entity_y(me)
if not v.skull then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.attacksToGo = v.attacksToGo - 1
if node_getNumEntitiesIn(v.node_check, "MermanThin")<=0 then
@@ -432,7 +428,6 @@
else
debugLog("not no stomp")
if not v.lastAcid then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if chance(50) then
entity_setState(me, STATE_ACIDSPRAY)
v.lastAcid = true
@@ -478,7 +473,6 @@
end
else
if not v.lastAcid then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.lastAcid = true
entity_setState(me, STATE_ACIDSPRAY)
else
@@ -609,7 +603,6 @@
v.hurtDelay = v.hurtDelay - dt
else
if not v.inHand and
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
not entity_isState(me, STATE_DONE) and not entity_isState(me, STATE_DIE)
then
local bone = entity_collideSkeletalVsCircle(me, v.n)
@@ -630,7 +623,6 @@
entity_setState(me, STATE_IDLE)
end
if not v.inHand then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if not entity_isState(me, STATE_PAIN) and not entity_isState(me, STATE_DIE) and not entity_isState(me, STATE_CREATEMERMAN)
and not entity_isState(me, STATE_TRANSFORM) then
entity_damage(v.n, me, 1)
@@ -727,7 +719,6 @@
local function cutscene(me)
v.n = getNaija()
if not v.inCutScene then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.inCutScene = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/kingjelly.lua
--- a/game_scripts/scripts/entities/kingjelly.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/kingjelly.lua Sun Jun 26 01:34:40 2011 +0900
@@ -163,7 +163,6 @@
local function zapCollision(me, dt)
if not v.zapsOn then return end
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if avatar_isShieldActive() then return end
for i=1,v.nZaps do
local rot = bone_getRotation(v.zaps[i])
@@ -261,7 +260,6 @@
if entity_isState(me, STATE_IDLE) then
elseif entity_isState(me, STATE_READY) then
if not v.started then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
overrideZoom(0.5, 1)
playMusic("MiniBoss")
emote(EMOTE_NAIJAUGH)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/krilleggs.lua
--- a/game_scripts/scripts/entities/krilleggs.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/krilleggs.lua Sun Jun 26 01:34:40 2011 +0900
@@ -49,7 +49,6 @@
function update(me, dt)
if not v.scaling and not entity_isNearObstruction(me, 1) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_addVel(me, 0, 98*dt)
entity_updateCurrents(me, dt)
entity_updateMovement(me, dt)
@@ -74,7 +73,6 @@
end
end
if not v.scaling then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_handleShotCollisions(me)
end
end
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/li.lua
--- a/game_scripts/scripts/entities/li.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/li.lua Sun Jun 26 01:34:40 2011 +0900
@@ -146,7 +146,6 @@
entity_idle(v.n)
watch(1)
if not v.switchGiggle then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
emote(EMOTE_NAIJAGIGGLE)
v.switchGiggle = true
end
@@ -1047,7 +1046,6 @@
bone_setRenderPass(v.bone_leftHand, 3)
if not v.forcedHug then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if not isForm(FORM_NORMAL) or not isInputEnabled() or entity_isFollowingPath(v.n) or avatar_getStillTimer() < 1 or v.honeyPower ~= entity_getHealthPerc(v.n) then
endHug(me)
end
@@ -1244,7 +1242,6 @@
entity_setActivationType(me, AT_CLICK)
if not v.forcedHug then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if chance(75) then
if chance(50) then
emote(EMOTE_NAIJAGIGGLE)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/licage.lua
--- a/game_scripts/scripts/entities/licage.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/licage.lua Sun Jun 26 01:34:40 2011 +0900
@@ -113,7 +113,6 @@
if not isFlag(FLAG_FINAL, FINAL_FREEDLI) then
if not v.seen and entity_isEntityInRange(me, v.n, 600) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_flipToEntity(v.n, me)
entity_idle(v.n)
emote(EMOTE_NAIJALI)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/mantis.lua
--- a/game_scripts/scripts/entities/mantis.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/mantis.lua Sun Jun 26 01:34:40 2011 +0900
@@ -141,9 +141,7 @@
function update(me, dt)
--entity_updateMovement(me, dt)
if not v.fight and entity_isEntityInRange(me, v.n, 1400) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if not v.cut then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.cut = true
v.fight = true
entity_idle(v.n)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/mermanthin.lua
--- a/game_scripts/scripts/entities/mermanthin.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/mermanthin.lua Sun Jun 26 01:34:40 2011 +0900
@@ -205,7 +205,6 @@
end
if not v.playedSound and entity_isEntityInRange(me, getNaija(), 800) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.playSoundDelay = v.playSoundDelay - dt
if v.playSoundDelay < 0 then
v.playedSound = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/natureformflowers.lua
--- a/game_scripts/scripts/entities/natureformflowers.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/natureformflowers.lua Sun Jun 26 01:34:40 2011 +0900
@@ -72,7 +72,6 @@
function update(me, dt)
if entity_isState(me, STATE_IDLE) then
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.lifeTime = v.lifeTime - dt
if v.lifeTime < 0 then
v.done = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/nautilusprime.lua
--- a/game_scripts/scripts/entities/nautilusprime.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/nautilusprime.lua Sun Jun 26 01:34:40 2011 +0900
@@ -135,7 +135,6 @@
--[[
if not v.seen and entity_isEntityInRange(me, getNaija(), 600) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
emote(EMOTE_NAIJAWOW)
v.seen = true
end
@@ -188,7 +187,6 @@
local s = 0
if not v.beserk then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
s = createShot("NautilusPrimeAngry", me, entity_getTarget(me), firex, firey)
v.fireDelay = 0.3
else
@@ -365,7 +363,6 @@
function exitState(me)
if entity_getState(me)==STATE_ATTACKPREP then
if not v.beserk then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_setState(me, STATE_ATTACK, 2.5)
else
entity_setState(me, STATE_ATTACK, 3)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/nudicommon.lua
--- a/game_scripts/scripts/entities/nudicommon.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/nudicommon.lua Sun Jun 26 01:34:40 2011 +0900
@@ -89,7 +89,6 @@
entity_handleShotCollisions(me)
if not v.isShell then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if v.hasShell then
entity_moveAlongSurface(me, dt, 40, 6, 30)
else
@@ -114,7 +113,6 @@
if entity_isBeingPulled(me) then
local x, y = entity_getVectorToEntity(getNaija(), me)
--if not vector_isLength2DIn(x, y, 300) and not v.escaping then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if true then
entity_animate(me, "shellQuiver", LOOP_INF)
v.pullTime = v.pullTime - dt
@@ -175,7 +173,6 @@
function dieNormal(me)
if not v.isShell and not v.hasShell then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
--50% poultice, 20% healing poultice, 2% sight poultice, 2% leeching poultice
local p = randRange(1, 100)
if p >= 1 and p <= 2 then
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/octomun.lua
--- a/game_scripts/scripts/entities/octomun.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/octomun.lua Sun Jun 26 01:34:40 2011 +0900
@@ -144,7 +144,6 @@
end
if not v.started then return end
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if quad_getAlpha(v.dark) < 0.1 then
v.inkBlastDelay = v.inkBlastDelay + dt
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/orbholder.lua
--- a/game_scripts/scripts/entities/orbholder.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/orbholder.lua Sun Jun 26 01:34:40 2011 +0900
@@ -46,13 +46,11 @@
entity_clearVel(v.energyOrb)
entity_setPosition(v.energyOrb, entity_x(me), entity_y(me))
if not v.openedDoors and entity_isState(v.energyOrb, STATE_CHARGED) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.openedDoors = true
local node = entity_getNearestNode(me)
node_activate(node)
end
if not v.savedOrb and entity_isState(v.energyOrb, STATE_IDLE) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
local node = entity_getNearestNode(me)
node_activate(node)
v.savedOrb = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/rotcore.lua
--- a/game_scripts/scripts/entities/rotcore.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/rotcore.lua Sun Jun 26 01:34:40 2011 +0900
@@ -182,7 +182,6 @@
end
if not v.seen and entity_isEntityInRange(me, v.n, 800) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
emote(EMOTE_NAIJAUGH)
v.seen = true
end
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/scooter.lua
--- a/game_scripts/scripts/entities/scooter.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/scooter.lua Sun Jun 26 01:34:40 2011 +0900
@@ -169,7 +169,6 @@
end
if not v.hungry and v.eating==0 then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.fedTime = v.fedTime - dt
if v.fedTime < 0 then
v.hungry = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/seahorsecommon.lua
--- a/game_scripts/scripts/entities/seahorsecommon.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/seahorsecommon.lua Sun Jun 26 01:34:40 2011 +0900
@@ -261,7 +261,6 @@
end
if not v.seahorseCostume then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if inCurrent then
entity_setMaxSpeed(me, 150)
else
@@ -318,7 +317,6 @@
setRideSpeed(me)
--entity_setMaxSpeedLerp(me, 1, 0.8)
if not v.riding then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_setMaxSpeedLerp(me, 1, 1)
else
setRideSpeed(me)
@@ -347,7 +345,6 @@
]]--
if entity_isState(me, STATE_IDLE) then
if not v.riding then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.avoidCollisionsTimer = v.avoidCollisionsTimer + dt
if v.avoidCollisionsTimer > 5 then
v.avoidCollisionsTimer = 0
@@ -499,7 +496,6 @@
function enterState(me)
if entity_isState(me, STATE_IDLE) then
if not v.riding then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_setMaxSpeedLerp(me, 1, 1)
end
v.avoidCollisionsTimer = 0
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/seaturtlecommon.lua
--- a/game_scripts/scripts/entities/seaturtlecommon.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/seaturtlecommon.lua Sun Jun 26 01:34:40 2011 +0900
@@ -203,7 +203,6 @@
-- SWIM ANGLE
if not v.follower then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if entity_getState(me) == STATE_GLIDING then
v.swimTime = v.swimTime - dt
if v.swimTime < 0 then
@@ -300,7 +299,6 @@
if v.follower then
if not v.following and entity_isEntityInRange(me, getNaija(), 512) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
musicVolume(0.5, 0.2)
else
musicVolume(1.0, 0.2)
@@ -313,7 +311,6 @@
end
end
if not v.following then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if entity_isEntityInRange(me, getNaija(), 800) then
if v.singing then
v.songNoteTimer = v.songNoteTimer + dt
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/seedcommon.lua
--- a/game_scripts/scripts/entities/seedcommon.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/seedcommon.lua Sun Jun 26 01:34:40 2011 +0900
@@ -67,7 +67,6 @@
local function terminate(me)
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if v.seedType == v.SEED_VINE then
registerSporeDrop(entity_x(me), entity_y(me),1)
@@ -91,7 +90,6 @@
function update(me, dt)
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if entity_updateCurrents(me, dt) then
entity_setWeight(me, 1)
else
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/sunkendad.lua
--- a/game_scripts/scripts/entities/sunkendad.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/sunkendad.lua Sun Jun 26 01:34:40 2011 +0900
@@ -327,7 +327,6 @@
function update(me, dt)
if not v.started then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
return
end
entity_clearTargetPoints(me)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/sunkenmom.lua
--- a/game_scripts/scripts/entities/sunkenmom.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/sunkenmom.lua Sun Jun 26 01:34:40 2011 +0900
@@ -78,7 +78,6 @@
function update(me, dt)
if not v.started then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
return
end
if not entity_isState(me, STATE_DEATHSCENE) then
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/sunworm.lua
--- a/game_scripts/scripts/entities/sunworm.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/sunworm.lua Sun Jun 26 01:34:40 2011 +0900
@@ -210,11 +210,9 @@
end
if entity_getState(me)==STATE_IDLE or entity_isState(me, STATE_BLOW) then
if not v.started then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if not entity_hasTarget(me) then
--entity_findTarget(me, 2000)
--if not v.started then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if node_isEntityIn(v.enter, v.n) then
v.started = true
playSfx("sunworm-roar")
@@ -384,7 +382,6 @@
avatar_fallOffWall()
elseif entity_isState(me, STATE_DEATHSCENE) then
if not v.inCutScene then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.inCutScene = true
entity_setStateTime(me, 99)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/transturtle.lua
--- a/game_scripts/scripts/entities/transturtle.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/transturtle.lua Sun Jun 26 01:34:40 2011 +0900
@@ -232,7 +232,6 @@
if entity_isEntityInRange(me, v.n, 300) then
if not v.seen then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
emote(EMOTE_NAIJAWOW)
if anyOtherFlag() then
setControlHint(getStringBank(226), 0, 0, 0, 5, "transturtle/headicon")
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/turtlecommon.lua
--- a/game_scripts/scripts/entities/turtlecommon.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/turtlecommon.lua Sun Jun 26 01:34:40 2011 +0900
@@ -102,7 +102,6 @@
end
]]--
if not v.isShell then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_rotateToVel(me, 0.1)
@@ -147,7 +146,6 @@
end
if not vector_isLength2DIn(x, y, 300) and not v.escaping then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
end
@@ -191,7 +189,6 @@
end
if not v.isShell then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_doEntityAvoidance(me, dt, 32, 1.0)
entity_doCollisionAvoidance(me, dt, 6, 1.0)
end
@@ -222,7 +219,6 @@
function dieNormal(me)
if not v.isShell and not v.hasShell then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
spawnIngredient("TurtleMeat", entity_x(me), entity_y(me))
end
end
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/ubervinecommon.lua
--- a/game_scripts/scripts/entities/ubervinecommon.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/ubervinecommon.lua Sun Jun 26 01:34:40 2011 +0900
@@ -193,7 +193,6 @@
end
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
entity_handleShotCollisionsSkeletal(me)
v.lifeTime = v.lifeTime - dt
if v.lifeTime < 0 then
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/vine.lua
--- a/game_scripts/scripts/entities/vine.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/vine.lua Sun Jun 26 01:34:40 2011 +0900
@@ -61,7 +61,6 @@
function update(me, dt)
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.lifeTime = v.lifeTime - dt
if v.lifeTime < 0 then
entity_delete(me, 0.2)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/walker.lua
--- a/game_scripts/scripts/entities/walker.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/walker.lua Sun Jun 26 01:34:40 2011 +0900
@@ -111,7 +111,6 @@
-- emote
if entity_isEntityInRange(me, v.n, 512) then
if not v.seen then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if chance(50) then
emote(EMOTE_NAIJAWOW)
else
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/entities/whelkcommon.lua
--- a/game_scripts/scripts/entities/whelkcommon.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/entities/whelkcommon.lua Sun Jun 26 01:34:40 2011 +0900
@@ -96,7 +96,6 @@
end
if not v.isShell then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if v.hasShell then
entity_moveAlongSurface(me, dt, 40, 6, 30)
else
@@ -121,7 +120,6 @@
if entity_isBeingPulled(me) then
local x, y = entity_getVectorToEntity(getNaija(), me)
--if not vector_isLength2DIn(x, y, 300) and not v.escaping then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if true then
entity_animate(me, "shellQuiver", LOOP_INF)
v.pullTime = v.pullTime - dt
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/_unused/node_energyboss_enter.lua
--- a/game_scripts/scripts/maps/_unused/node_energyboss_enter.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/_unused/node_energyboss_enter.lua Sun Jun 26 01:34:40 2011 +0900
@@ -38,7 +38,6 @@
function update(me, dt)
if not v.done and getStory() <= 8 then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if node_isEntityIn(me, v.naija) then
v.done = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/_unused/node_givealltreasures.lua
--- a/game_scripts/scripts/maps/_unused/node_givealltreasures.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/_unused/node_givealltreasures.lua Sun Jun 26 01:34:40 2011 +0900
@@ -30,7 +30,6 @@
function update(me, dt)
if isDeveloperKeys() then
if not v.done and node_isEntityIn(me, v.n) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
debugLog("all treasures")
for i = FLAG_COLLECTIBLE_START, (FLAG_COLLECTIBLE_END-1) do
setFlag(i, 1)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/_unused/node_seeompo.lua
--- a/game_scripts/scripts/maps/_unused/node_seeompo.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/_unused/node_seeompo.lua Sun Jun 26 01:34:40 2011 +0900
@@ -33,7 +33,6 @@
v.ompo = getEntity("Ompo")
end
if not v.done and isFlag(FLAG_OMPO, 2) and node_isEntityIn(me, v.n) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.done = true
entity_idle(v.n)
watch(1)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/_unused/node_slowmotest.lua
--- a/game_scripts/scripts/maps/_unused/node_slowmotest.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/_unused/node_slowmotest.lua Sun Jun 26 01:34:40 2011 +0900
@@ -28,7 +28,6 @@
function update(me)
if node_isEntityIn(me, getNaija()) then
if not v.slow then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
setGameSpeed(0.5, 0.2)
v.slow = true
end
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/_unused/node_sunkencityboss.lua
--- a/game_scripts/scripts/maps/_unused/node_sunkencityboss.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/_unused/node_sunkencityboss.lua Sun Jun 26 01:34:40 2011 +0900
@@ -44,7 +44,6 @@
function update(me, dt)
if not v.didInit then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
doInit(me)
v.didInit = true
end
@@ -56,7 +55,6 @@
entity_setState(v.door, STATE_OPEN)
end
if not v.spawned then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if node_isEntityIn(me, getNaija()) then
entity_setState(v.dad, STATE_START)
entity_setState(v.mom, STATE_START)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_13encounter.lua
--- a/game_scripts/scripts/maps/node_13encounter.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_13encounter.lua Sun Jun 26 01:34:40 2011 +0900
@@ -37,7 +37,6 @@
function update(me, dt)
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if node_isEntityIn(me, v.n) then
--debugLog(string.format("mithala flag: %d", getFlag(FLAG_BOSS_MITHALA)))
if isFlag(FLAG_BOSS_MITHALA, 1) then
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_closefinaldoor.lua
--- a/game_scripts/scripts/maps/node_closefinaldoor.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_closefinaldoor.lua Sun Jun 26 01:34:40 2011 +0900
@@ -41,7 +41,6 @@
end
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if node_isEntityIn(me, v.n) and not (entity_isState(v.ent, STATE_CLOSED) or entity_isState(v.ent, STATE_CLOSE)) then
entity_setState(v.ent, STATE_CLOSE, -1, 1)
v.done = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_endofdemo.lua
--- a/game_scripts/scripts/maps/node_endofdemo.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_endofdemo.lua Sun Jun 26 01:34:40 2011 +0900
@@ -29,7 +29,6 @@
function update(me, dt)
if not v.done and node_isEntityIn(me, v.n) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.done = true
if isDemo() then
entity_idle(v.n)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_miasecretend.lua
--- a/game_scripts/scripts/maps/node_miasecretend.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_miasecretend.lua Sun Jun 26 01:34:40 2011 +0900
@@ -42,7 +42,6 @@
entity_setPosition(v.n, entity_x(v.n), by)
end
if not v.done and node_isEntityIn(me, getNaija()) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.done = true
local cam = getNode("cam")
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_openfinaldoor.lua
--- a/game_scripts/scripts/maps/node_openfinaldoor.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_openfinaldoor.lua Sun Jun 26 01:34:40 2011 +0900
@@ -34,7 +34,6 @@
function update(me, dt)
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if node_isEntityIn(me, v.n) and not (entity_isState(v.ent, STATE_OPENED) or entity_isState(v.ent, STATE_OPEN)) then
entity_setState(v.ent, STATE_OPEN, -1, 1)
v.done = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_priestbrain.lua
--- a/game_scripts/scripts/maps/node_priestbrain.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_priestbrain.lua Sun Jun 26 01:34:40 2011 +0900
@@ -55,7 +55,6 @@
function update(me, dt)
if isFlag(FLAG_MITHALAS_PRIESTS,0) then
if not v.started then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if node_isEntityIn(me, v.n) then
v.started = true
entity_idle(v.n)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_seahorserace.lua
--- a/game_scripts/scripts/maps/node_seahorserace.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_seahorserace.lua Sun Jun 26 01:34:40 2011 +0900
@@ -165,7 +165,6 @@
function songNoteDone(me, note, t)
if not v.raceStarted then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.songNote1 = v.songNote2
v.songNote2 = v.songNote3
v.songNote3 = v.songNote4
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_secret01.lua
--- a/game_scripts/scripts/maps/node_secret01.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_secret01.lua Sun Jun 26 01:34:40 2011 +0900
@@ -40,7 +40,6 @@
function update(me, dt)
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if node_isEntityIn(me, v.n) then
v.done = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_secret02.lua
--- a/game_scripts/scripts/maps/node_secret02.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_secret02.lua Sun Jun 26 01:34:40 2011 +0900
@@ -41,7 +41,6 @@
function update(me, dt)
if not v.done and isFlag(FLAG_SECRET02, 0) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if node_isEntityIn(me, v.n) then
v.done = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_secret03.lua
--- a/game_scripts/scripts/maps/node_secret03.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_secret03.lua Sun Jun 26 01:34:40 2011 +0900
@@ -43,7 +43,6 @@
function update(me, dt)
if not v.done and isFlag(FLAG_SECRET03, 0) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if node_isEntityIn(me, v.n) then
v.done = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_see13firsttime.lua
--- a/game_scripts/scripts/maps/node_see13firsttime.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_see13firsttime.lua Sun Jun 26 01:34:40 2011 +0900
@@ -37,7 +37,6 @@
function update(me, dt)
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if isFlag(FLAG_VISION_ENERGYTEMPLE, 0) and node_isEntityIn(me, v.n) then
v.done = true
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_seehealthup.lua
--- a/game_scripts/scripts/maps/node_seehealthup.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_seehealthup.lua Sun Jun 26 01:34:40 2011 +0900
@@ -29,7 +29,6 @@
function update(me)
if not v.done and node_isEntityIn(me, v.n) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
v.done = true
local h = getEntity("healthupgrade3")
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_sleep.lua
--- a/game_scripts/scripts/maps/node_sleep.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_sleep.lua Sun Jun 26 01:34:40 2011 +0900
@@ -106,7 +106,6 @@
watch(2)
if not visions(me) then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
watch(2)
fadeIn(1)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_songdoormural.lua
--- a/game_scripts/scripts/maps/node_songdoormural.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_songdoormural.lua Sun Jun 26 01:34:40 2011 +0900
@@ -34,7 +34,6 @@
screenFadeGo(3)
watch(3)
if not v.giggled then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
emote(EMOTE_NAIJAGIGGLE)
v.giggled = true
end
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_sunkencityboss2.lua
--- a/game_scripts/scripts/maps/node_sunkencityboss2.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_sunkencityboss2.lua Sun Jun 26 01:34:40 2011 +0900
@@ -54,7 +54,6 @@
end
if not v.spawned and getFlag(FLAG_SUNKENCITY_PUZZLE) == SUNKENCITY_CLAYDONE then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
debugLog("starting boss fight")
shakeCamera(5, 3)
@@ -81,7 +80,6 @@
end
--[[
if not v.spawned then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if node_isEntityIn(me, getNaija()) then
entity_setState(v.dad, STATE_START)
entity_setState(v.mom, STATE_START)
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_sunkencityclosedoor.lua
--- a/game_scripts/scripts/maps/node_sunkencityclosedoor.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_sunkencityclosedoor.lua Sun Jun 26 01:34:40 2011 +0900
@@ -36,13 +36,11 @@
function update(me, dt)
if not v.didInit then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
doInit(me)
v.didInit = true
end
if not v.done then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
if getFlag(FLAG_SUNKENCITY_PUZZLE) < SUNKENCITY_BOSSDONE then
if node_isEntityIn(me, getNaija()) then
debugLog("closing door")
diff -r bfa7c24822c0 -r 0a04fc0fd89e game_scripts/scripts/maps/node_sunwormcavebrain.lua
--- a/game_scripts/scripts/maps/node_sunwormcavebrain.lua Thu May 19 19:06:19 2011 -0600
+++ b/game_scripts/scripts/maps/node_sunwormcavebrain.lua Sun Jun 26 01:34:40 2011 +0900
@@ -51,7 +51,6 @@
end
if entity_x(v.n) > node_x(v.past) then
if not v.pastDefault then
-if not AQUARIA_VERSION then dofile("scripts/entities/entityinclude.lua") end
setWaterLevel(node_y(v.h1), 2)
v.pastDefault = true
end
More information about the aquaria
mailing list