Lower number of pirates during chapter 0.

naev · Apr 26, 2024 · a04ae05 · a04ae05
1 parent 2039977
commit a04ae05
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 1 deletion.
diff --git a/dat/events/start.lua b/dat/events/start.lua
@@ -63,6 +63,9 @@ function create()
    player.outfitAdd( "GUI - Slimv2" )
    player.outfitAdd( "GUI - Legacy" )
 
+   -- Apply starting unidiff
+   diff.apply( "Chapter 0" )
+
    hook.timer(3, "timer_tutorial")
 end
 

diff --git a/dat/events/updater.lua b/dat/events/updater.lua
@@ -14,6 +14,14 @@ local vn  = require 'vn'
 local fmt = require 'format'
 local luatk = require "luatk"
 
+-- Runs on saves older than 0.11.0
+local function updater0120( _did0110, _did0100, _did090 )
+   print( player.chapter()=="0", not diff.isApplied( "Chapter 0" ) )
+   if player.chapter()=="0" and not diff.isApplied( "Chapter 0" ) then
+      diff.apply( "Chapter 0" )
+   end
+end
+
 -- Runs on saves older than 0.11.0
 local function updater0110( did0100, did090 )
    local metai = (var.peek("shipai_name") ~= nil)
@@ -194,8 +202,8 @@ function create ()
       faction.get("Black Lotus"):setKnown(true)
    end
 
+   local did090, did0100, did0110
    -- Run on saves older than 0.9.0
-   local did090, did0100
    if not save_version or naev.versionTest( save_version, "0.9.0" ) < 0 then
       updater090()
       didupdate = true
@@ -211,6 +219,12 @@ function create ()
    if not save_version or naev.versionTest( save_version, "0.11.0") < 0 then
       updater0110( did0100, did090 )
       didupdate = true
+      did0110 = true
+   end
+   -- Run on saves older than 0.12.0
+   if not save_version or naev.versionTest( save_version, "0.12.0") < 0 then
+      updater0120( did0110, did0100, did090 )
+      didupdate = true
    end
 
    -- Note that games before 0.10.0 will have lastplayed set days from the unix epoch

diff --git a/dat/spob_virtual/pirate_tiny.xml b/dat/spob_virtual/pirate_tiny.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<spob name="Pirate Tiny">
+ <presence>
+  <faction>Pirate</faction>
+  <base>40</base>
+  <bonus>20</bonus>
+  <range>2</range>
+ </presence>
+</spob>
diff --git a/dat/unidiff/chapter0.xml b/dat/unidiff/chapter0.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<unidiff name="Chapter 0">
+ <spob name="Efferey">
+  <presence_base>100.000000</presence_base>
+  <presence_bonus>25.000000</presence_bonus>
+ </spob>
+ <spob name="Foundation Station">
+  <presence_base>150.000000</presence_base>
+  <presence_bonus>25.000000</presence_bonus>
+ </spob>
+ <spob name="New Haven">
+  <presence_base>250.000000</presence_base>
+  <presence_bonus>25.000000</presence_bonus>
+  <presence_range>4</presence_range>
+ </spob>
+ <spob name="Pirate's Cove">
+  <presence_base>100.000000</presence_base>
+  <presence_bonus>60.000000</presence_bonus>
+ </spob>
+ <spob name="Qorellia">
+  <presence_base>200.000000</presence_base>
+  <presence_bonus>25.000000</presence_bonus>
+  <presence_range>4</presence_range>
+ </spob>
+ <spob name="Sanchez">
+  <presence_base>250.000000</presence_base>
+  <presence_bonus>25.000000</presence_bonus>
+ </spob>
+ <spob name="Warden's End">
+  <presence_base>250.000000</presence_base>
+  <presence_bonus>25.000000</presence_bonus>
+ </spob>
+</unidiff>
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -1950,6 +1950,7 @@ dat/spob_virtual/pirate_all_unpresence_range1.xml
 dat/spob_virtual/pirate_all_unpresence_range2.xml
 dat/spob_virtual/pirate_medium.xml
 dat/spob_virtual/pirate_small.xml
+dat/spob_virtual/pirate_tiny.xml
 dat/spob_virtual/pirate_unpresence.xml
 dat/spob_virtual/proteron_small.xml
 dat/spob_virtual/proteron_unpresence.xml
@@ -2652,6 +2653,7 @@ dat/unidiff/antlejosv_6.xml
 dat/unidiff/antlejosv_7.xml
 dat/unidiff/antlejosv_8.xml
 dat/unidiff/antlejosv_9.xml
+dat/unidiff/chapter0.xml
 dat/unidiff/collective_dead.xml
 dat/unidiff/durea_safe.xml
 dat/unidiff/energy_harpoon.xml