Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Mission emp_collective00.lua is working again.

Browse Source
This commit is contained in:
Allanis 2013-08-26 15:23:27 +01:00
parent 4fa786ce21
commit 68a82bd3c9
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dat/mission.xml
View File

@ -46,8 +46,8 @@
<unique>1</unique> <unique>1</unique>
</flags> </flags>
<avail> <avail>
<cond>var.peek("es_cargo") == true and space.getSystem("NGC-7291"):jumpDist() &lt; 5 and player.getFaction("Empire") &gt; 5 and player.getRating() &gt; 10</cond> <cond>var.peek("es_cargo") == true and space.getSystem("NGC-7291"):jumpDist() &lt; 5 and player.getFaction("Empire") &gt; 5 and player.getRating() &gt; 5</cond>
<chance>60</chance> <chance>80</chance>
<location>Bar</location> <location>Bar</location>
<faction>Empire</faction> <faction>Empire</faction>
</avail> </avail>
@ -58,7 +58,7 @@
<unique>1</unique> <unique>1</unique>
</flags> </flags>
<avail> <avail>
<cond>player.getFaction("Empire") > 30</cond> <cond>player.getFaction("Empire") &gt; 5</cond>
<done>Collective Scouting</done> <done>Collective Scouting</done>
<chance>100</chance> <chance>100</chance>
<location>Bar</location> <location>Bar</location>
@ -71,7 +71,7 @@
<unique>1</unique> <unique>1</unique>
</flags> </flags>
<avail> <avail>
<cond>player.getFaction("Empire") > 30</cond> <cond>player.getFaction("Empire") &gt; 5</cond>
<done>Collective Espionage 1</done> <done>Collective Espionage 1</done>
<chance>100</chance> <chance>100</chance>
<location>Bar</location> <location>Bar</location>

4
dat/missions/emp_collective00.lua
View File

@ -63,11 +63,11 @@ function enter()
end end
end end
-- update mission. -- Update mission.
if misn_stage == 0 and sys == misn_target then if misn_stage == 0 and sys == misn_target then
misn.setDesc(string.format(misn_desc[2], misn_base:name() ,misn_base_sys:name())) misn.setDesc(string.format(misn_desc[2], misn_base:name() ,misn_base_sys:name()))
misn_stage = 1 misn_stage = 1
misn.setMarker(misn_base_sys:name()) -- Now we mark return to base. misn.setMarker(misn_base_sys) -- Now we mark return to base.
end end
end end

10
src/llua_space.c
View File

@ -166,8 +166,7 @@ static int planetL_get(lua_State* L) {
/* Get a planet by name. */ /* Get a planet by name. */
else if(lua_isstring(L, 1)) { else if(lua_isstring(L, 1)) {
i = faction_get((char*)lua_tostring(L, 1)); rndplanet = (char*) lua_tostring(L, 1);
planets = space_getFactionPlanet(&nplanets, &i, 1);
} }
/* Get a planet from faction list. */ /* Get a planet from faction list. */
@ -295,12 +294,15 @@ int lua_issystem(lua_State* L, int ind) {
/* Get a system. */ /* Get a system. */
static int systemL_get(lua_State* L) { static int systemL_get(lua_State* L) {
LLUA_MIN_ARGS(1);
LuaSystem sys; LuaSystem sys;
LuaPlanet* p; LuaPlanet* p;
/* Get the current system with no parameters. */
if(lua_gettop(L) == 0) {
sys.s = cur_system;
}
/* Passing a string (systemname) */ /* Passing a string (systemname) */
if(lua_isstring(L, 1)) { else if(lua_isstring(L, 1)) {
sys.s = system_get((char*)lua_tostring(L, 1)); sys.s = system_get((char*)lua_tostring(L, 1));
} }
/* Passing a planet */ /* Passing a planet */