Update translations

Update Option: Target Dummy (no longer touch spellable or polymorphable, boss dummy hides health bar) Update custom damage numbers and dps tracker to update every frame instead of every time they take damage (tiny optimization) Add Game Modifier: Uber Boss Update loadouts that used deprecated spells Update Loadout: Gunner Update Action: Burst Fire (remove magic hand logic) Fix crash when using custom damage numbers Update projectile capture spells so they no longer happen out of order Update Action: Projectile Orbit to have orbit radius based on spread Update Option: Combine Gold (reduce range) Fix Game Modifier: Guaranteed Always Cast Fix wand generation options to not effect held wands (fixes wands spawned directly on the player from shuffling held wands)
gokiburikin · Oct 19, 2020 · a4d9f86 · a4d9f86
1 parent f8f4dd0
commit a4d9f86
Show file tree

Hide file tree

Showing 29 changed files with 524 additions and 339 deletions.
diff --git a/files/gkbrkn/actions/projectile_orbit/projectile_update.lua b/files/gkbrkn/actions/projectile_orbit/projectile_update.lua
@@ -1,10 +1,22 @@
 dofile_once( "mods/gkbrkn_noita/files/gkbrkn/lib/variables.lua");
-TWO_PI = math.pi * 2;
-ORBIT_RADIUS = 8;
-ORBIT_SPEED = 8;
+local TWO_PI = math.pi * 2;
+local ORBIT_RADIUS = 8;
+local ORBIT_SPEED = 8;
 local entity = GetUpdatedEntityID();
 local parent = tonumber(EntityGetVariableString( entity, "gkbrkn_soft_parent", "0" ));
 
+local projectile_data = EntityGetFirstComponentIncludingDisabled( entity, "ProjectileComponent" );
+if projectile_data then
+    local radius = ComponentObjectGetValue2( projectile_data, "config", "action_unidentified_sprite_filename" );
+    if radius then
+        local _,_,radius = radius:find("orbital_radius_(%d+)");
+        if radius then
+            radius = tonumber( radius );
+            ORBIT_RADIUS = (radius ^ 0.6 + 8) or ORBIT_RADIUS;
+        end
+    end
+end
+
 if parent ~= 0 and EntityGetIsAlive(parent) then
     local orbit = EntityGetFirstComponentIncludingDisabled( entity, "VariableStorageComponent", "gkbrkn_orbit" );
     local orbit_index = ComponentGetValue2( orbit, "value_int" );

diff --git a/files/gkbrkn/append/boss_centipede_update.lua b/files/gkbrkn/append/boss_centipede_update.lua
@@ -0,0 +1,8 @@
+dofile_once( "mods/gkbrkn_noita/files/gkbrkn/lib/flags.lua");
+if GameHasFlagRun( FLAGS.UberBoss ) then
+    local _GameGetOrbCountThisRun = GameGetOrbCountThisRun;
+    function GameGetOrbCountThisRun()
+        _GameGetOrbCountThisRun();
+        return 33;
+    end
+end
diff --git a/files/gkbrkn/append/common.csv b/files/gkbrkn/append/common.csv
@@ -38,6 +38,8 @@ dev_option_name_gkbrkn_recover_health,"Recover Health",,,,,,,,,,,
 dev_option_desc_gkbrkn_recover_health,"Recover Health",,,,,,,,,,,
 dev_option_name_gkbrkn_invincibility,"Invincibility",,,,,,,,,,,
 dev_option_desc_gkbrkn_invincibility,"Invincibility",,,,,,,,,,,
+dev_option_name_gkbrkn_no_polymorph,"No Polymorph",,,,,,,,,,,
+dev_option_desc_gkbrkn_no_polymorph,"No Polymorph",,,,,,,,,,,
 dev_option_name_gkbrkn_cheap_rerolls,"Cheap Rerolls",,,,,,,,,,,
 dev_option_desc_gkbrkn_cheap_rerolls,"Cheap Rerolls",,,,,,,,,,,
 dev_option_name_gkbrkn_infinite_money,"Infinite Money",,,,,,,,,,,
@@ -607,7 +609,7 @@ tweak_name_gkbrkn_revenge_tentacle,"Revenge Tentacle Fix",,,,,,,,,,,
 tweak_desc_gkbrkn_revenge_tentacle,"Will no longer trigger on self or environmental damage",,,,,,,,,,,
 tweak_name_gkbrkn_glass_cannon,"Glass Cannon Rework",,,,,,,,,,,
 tweak_desc_gkbrkn_glass_cannon,"3x damage dealt, 3x damage taken, no health reduction, no explosion radius changes",,,,,,,,,,,
-tweak_name_gkbrkn_area_damage,"Area Damage Nerf",,,,,,,,,,,
+tweak_name_gkbrkn_area_damage,"Damage Field Nerf",,,,,,,,,,,
 tweak_desc_gkbrkn_area_damage,"Damage every 5 frames instead of every frame",,,,,,,,,,,
 tweak_name_gkbrkn_chain_bolt,"Chain Bolt Fix",,,,,,,,,,,
 tweak_desc_gkbrkn_chain_bolt,"Fixes targeting issues and script typos",,,,,,,,,,,
@@ -708,6 +710,8 @@ loadout_lancer,"Lancer TYPE",,,,,,,,,,,
 loadout_wandsmith,"Wandsmith",,,,,,,,,,,
 loadout_zoning,"Zoning TYPE",,,,,,,,,,,
 loadout_gunner,"Gunner TYPE",,,,,,,,,,,
+game_modifier_name_gkbrkn_uber_boss,"Uber Boss",,,,,,,,,,,
+game_modifier_desc_gkbrkn_uber_boss,"The boss will behave as though you have collected all (33) of the orbs",,,,,,,,,,,
 game_modifier_name_gkbrkn_disable_random_spells,"Disable Random Spells",,,,,,,,,,,
 game_modifier_desc_gkbrkn_disable_random_spells,"A challenge option that disables 10% of spells at the start of the run",,,,,,,,,,,
 game_modifier_name_gkbrkn_generate_random_spellbooks,"Generate Random Spellbooks",,,,,,,,,,,

diff --git a/files/gkbrkn/append/gun_extra_modifiers.lua b/files/gkbrkn/append/gun_extra_modifiers.lua
@@ -16,4 +16,11 @@ end
 
 extra_modifiers["gkbrkn_no_recoil"] = function()
 	shot_effects.recoil_knockback = -999999;
+end
+
+extra_modifiers["matran"] = function()
+    local data = hand[#hand];
+    if data.mana ~= nil then
+        mana = mana + data.mana * 0.5;
+    end
 end
diff --git a/files/gkbrkn/append/gun_procedural.lua b/files/gkbrkn/append/gun_procedural.lua
diff --git a/files/gkbrkn/append/temple_altar.lua b/files/gkbrkn/append/temple_altar.lua
@@ -6,7 +6,7 @@ local _spawn_hp = spawn_hp;
 function spawn_hp( x, y )
 	_spawn_hp( x, y );
     if HasFlagPersistent( MISC.TargetDummy.EnabledFlag ) then
-        EntityLoad( "mods/gkbrkn_noita/files/gkbrkn/misc/dummy_target.xml", x - 228, y + 50 );
+        EntityLoad( "mods/gkbrkn_noita/files/gkbrkn/misc/dummy_target.xml", x - 198, y + 40 );
     end
 end
 

diff --git a/files/gkbrkn/config.lua b/files/gkbrkn/config.lua
@@ -8,7 +8,7 @@ dofile_once( "mods/gkbrkn_noita/files/gkbrkn/lib/helper.lua" );
 
 local has_content_been_cached = false;
 local SETTINGS = {
-    Version = "c101"
+    Version = "c102"
 }
 
 local CONTENT_ACTIVATION_TYPE = {
@@ -176,7 +176,7 @@ end
             register_option_localized( MISC.GoldDecay.EnabledFlag, CONTENT_ACTIVATION_TYPE.Immediate ),
             register_option_localized( MISC.PersistentGold.EnabledFlag, CONTENT_ACTIVATION_TYPE.Immediate ),
             register_option_localized( MISC.AutoPickupGold.EnabledFlag, CONTENT_ACTIVATION_TYPE.Immediate ),
-            register_option_localized( MISC.CombineGold.EnabledFlag, CONTENT_ACTIVATION_TYPE.Immediate, nil, nil, {goki_thing = true} )
+            register_option_localized( MISC.CombineGold.EnabledFlag, CONTENT_ACTIVATION_TYPE.Immediate )
         ),
         register_option_group_localized( "gkbrkn_invincibility_frames",
             register_option_localized( MISC.InvincibilityFrames.EnabledFlag, CONTENT_ACTIVATION_TYPE.Immediate ),

diff --git a/files/gkbrkn/content/actions.lua b/files/gkbrkn/content/actions.lua
@@ -134,7 +134,6 @@ dofile_once( "mods/gkbrkn_noita/files/gkbrkn/lib/helper.lua");
                         EndTrigger();
                     EndProjectile();
                     reset_modifiers( c );
-                    c.extra_entities = c.extra_entities.."mods/gkbrkn_noita/files/gkbrkn/actions/carry_shot/projectile_extra_entity.xml,";
                     c.lifetime_add = c.lifetime_add + burst_wait * 3;
                     register_action( c );
                     SetProjectileConfigs();
@@ -1293,7 +1292,7 @@ dofile_once( "mods/gkbrkn_noita/files/gkbrkn/lib/helper.lua");
     ) );
 
 --[[ CAPTURES ]]
-    local capture_projectile_draw = function( capture_id, amount )
+    local capture_projectile_draw = function( capture_id, amount, callback )
         if reflecting then return; end
         local projectile_path = "mods/gkbrkn_noita/files/gkbrkn/actions/trigger_projectile.xml";
         local old_c = c;
@@ -1312,6 +1311,9 @@ dofile_once( "mods/gkbrkn_noita/files/gkbrkn/lib/helper.lua");
                 gkbrkn.register_action_callback = function( state )
                     gkbrkn.register_action_callback = old_register_action_callback;
                     state.action_unidentified_sprite_filename = state.action_unidentified_sprite_filename..iterate_group(capture_id)..",";
+                    if callback ~= nil then
+                        callback( projectile_path, state );
+                    end
                 end
                 new_cast_delay = c.fire_rate_wait;
                 register_action( c );
@@ -1364,7 +1366,7 @@ dofile_once( "mods/gkbrkn_noita/files/gkbrkn/lib/helper.lua");
         "0,1,2,3,4,5,6", "0.1,0.1,0.1,0.1,0.1,0.1,0.1", 100, 12, -1,
         nil,
         function()
-            capture_projectile_draw( "projectile_orbit", 5 );
+            capture_projectile_draw( "projectile_orbit", 5, function( projectile_path, state ) state.action_unidentified_sprite_filename = state.action_unidentified_sprite_filename.."orbital_radius_"..state.spread_degrees..","; end );
         end
     ) );
 

diff --git a/files/gkbrkn/content/dev_options.lua b/files/gkbrkn/content/dev_options.lua
@@ -39,6 +39,12 @@ dev_options = {
         description = "$dev_option_desc_gkbrkn_invincibility",
         author = "$ui_author_name_goki_dev",
     },
+    {
+        id = "no_polymorph",
+        name = "$dev_option_name_gkbrkn_no_polymorph",
+        description = "$dev_option_desc_gkbrkn_no_polymorph",
+        author = "$ui_author_name_goki_dev",
+    },
     {
         id = "infinite_money",
         name = "$dev_option_name_gkbrkn_infinite_money",

diff --git a/files/gkbrkn/content/game_modifiers.lua b/files/gkbrkn/content/game_modifiers.lua
@@ -16,6 +16,15 @@ function find_game_modifier( id )
 end
 
 game_modifiers = {
+    {
+        id = "uber_boss",
+        name = "$game_modifier_name_gkbrkn_uber_boss",
+        description = "$game_modifier_desc_gkbrkn_uber_boss",
+        author = "$ui_author_name_goki_dev",
+        options = {
+            run_flags = { FLAGS.UberBoss }
+        }
+    },
     {
         id = "goo_mode",
         name = "$game_modifier_name_gkbrkn_goo_mode",

diff --git a/files/gkbrkn/content/legendary_wands.lua b/files/gkbrkn/content/legendary_wands.lua
@@ -82,7 +82,7 @@ legendary_wands = {
                 { { action="TELEPORT_CAST", locked=false } },
                 { { action="DAMAGE", locked=false } },
                 { { action="GKBRKN_TIME_COMPRESSION", locked=false } },
-                { { action="GKBRKN_TRIGGER_DEATH", locked=false } },
+                { { action="ADD_EXPIRATION_TRIGGER", locked=false } },
                 { { action="TELEPORT_PROJECTILE", locked=false } },
             }
         }
@@ -395,7 +395,7 @@ legendary_wands = {
             actions = {
                 { { action="GKBRKN_BOUND_SHOT", locked=true } },
                 { { action="GKBRKN_GUIDED_SHOT", locked=true } },
-                { { action="GKBRKN_TRIGGER_DEATH", locked=true } },
+                { { action="ADD_EXPIRATION_TRIGGER", locked=true } },
                 { { action="LIGHT", locked=true } },
                 { { action="SLIMEBALL", locked=true } },
                 { { action="EXPLOSION", locked=true } },
@@ -864,7 +864,7 @@ legendary_wands = {
                 { { action="GKBRKN_SPELL_DUPLICATOR", locked=true } },
                 { { action="HORIZONTAL_ARC", locked=true } },
                 { { action="LONG_DISTANCE_CAST", locked=true } },
-                { { action="GKBRKN_TRIGGER_DEATH", locked=true } },
+                { { action="ADD_EXPIRATION_TRIGGER", locked=true } },
                 { { action="DIGGER", locked=true } },
                 { { action="GKBRKN_FORMATION_STACK", locked=false } },
                 { { action="LIGHT_BULLET", locked=false } },