Merge pull request #27 from Joglacraft/dev

Fixed many, many of my goofs...

Author: Joglacraft

content/aux_functions.lua

@@ -41,7 +41,7 @@ function FG.alternate_card(key,card,table)
 		key = tostring(convert_to),
 	})
 	if card.edition then
-		FG.update_edition(new_card)
+		FG.update_edition(card,new_card)
 	end
 	card:start_dissolve(nil,false,0,true)
 end
@@ -69,11 +69,11 @@ end
 
 -- Transfers the edition from the old card to the new card.
 -- card is the card object of which the edition has to be updated.
-function FG.update_edition(card)
-	if card.edition then
-		card:set_edition(tostring(card.edition.key),true,true)
+function FG.update_edition(old_card,new_card)
+	if old_card.edition then
+		new_card:set_edition(tostring(old_card.edition.key),true,true)
 	else
-		card:set_edition(nil,true,true)
+		new_card:set_edition(nil,true,true)
 	end
 end
 

content/jokers.lua

@@ -469,7 +469,7 @@ SMODS.Joker {
 	key = 'joker',
 	config = { extra = { mult = 0.5 } },
 	loc_vars = function(self, info_queue, card)
-		info_queue[#info_queue + 1] = G.P_CENTERS['j_joker']
+		--info_queue[#info_queue + 1] = G.P_CENTERS['j_joker']
 		return { vars = { card.ability.extra.mult } }
 	end,
 	rarity = "fg_common",

content/test.lua

@@ -0,0 +1,2 @@
+FG.test = {}
+-- Test any variables and functions here, under FG.test

fools_gambit.json

@@ -9,7 +9,7 @@
 	"priority": 0,
 	"badge_colour": "6fa0e8",
 	"badge_text_colour": "e6eaf0",
-	"version": "0.1.0-pre4",
+	"version": "0.1.0-pre5",
 	"dependencies": [
         "Steamodded (>=1.*)",
 		"Lovely (>=0.6)"

main.lua

@@ -1,5 +1,6 @@
 FG = {}
 FG.config = SMODS.current_mod.config
+FG.config.version = SMODS.current_mod.version
 
 -- This is in preparation for file splitting. I'll do that later. - Jogla
 -- im splitting jokers and stuff into sections to make this easier later - jenku
@@ -11,7 +12,8 @@ local mod_contents = {
 	"booster_packs",
 	"rarities",
 	"vouchers",
-	"enhancements"
+	"enhancements",
+	"test"
 }
 
 for k, v in pairs(mod_contents) do -- Load this mod's files
@@ -52,6 +54,7 @@ SMODS.current_mod.extra_tabs = function()
 				}, nodes = {
 					-- work your UI wizardry here, see 'Building a UI' page
 					{n = G.UIT.R, config = {align = "tm"}, nodes = {{n = G.UIT.T, config = {text = "Fool's Gambit", colour = G.C.PURPLE, scale = .7}}}},
+					{n = G.UIT.R, config = {align = "tm"}, nodes = {{n = G.UIT.T, config = {text = tostring("Version: "..FG.config.version), colour = G.C.GREY, scale = .3}}}},
 					{n = G.UIT.R, config = {align = "tm", minh = .2}},
 					{n = G.UIT.R, config = {align = "tm"}, nodes = {{n = G.UIT.T, config = {text = "Lead developer", colour = G.C.GOLD, scale = .5}}}},
 					{n = G.UIT.R, config = {align = "tm"}, nodes = {{n = G.UIT.T, config = {text = "GoldenLeaf", colour = G.C.WHITE, scale = .3}}}},