Modul:Commodity - Versionsgeschichte

FoXFTW am 23. Februar 2025 um 20:43 Uhr

2025-02-23T20:43:09Z

← Nächstältere Version		Version vom 23. Februar 2025, 22:43 Uhr
Zeile 46:		Zeile 46:
	if commodity.type == 'Vehicle' or commodity.type == 'GroundVehicle' then		if commodity.type == 'Vehicle' or commodity.type == 'GroundVehicle' then
	if commodity.sub_type == 'Vehicle_Spaceship' then		if commodity.sub_type == 'Vehicle_Spaceship' then
	commodity.type = {		commodity.type = 'Raumschiff'
	'Raumschiff~~@de~~',
	~~'Ship@en',~~
	}
	else		else
	commodity.type = 'Fahrzeug'		commodity.type = 'Fahrzeug'

FoXFTW am 23. Februar 2025 um 20:37 Uhr

2025-02-23T20:37:24Z

← Nächstältere Version		Version vom 23. Februar 2025, 22:37 Uhr
Zeile 51:		Zeile 51:
	}		}
	else		else
	commodity.type = {		commodity.type = 'Fahrzeug'
	'Fahrzeug~~@de~~',
	~~'Vehicle@en',~~
	}
	end		end
	else		else
	commodity.type = {		commodity.type = commodity.type
	commodity.type ~~.. '@en',~~
	~~commodity.type .. '@de',~~
	}
	end		end

FoXFTW am 23. Mai 2023 um 12:12 Uhr

2023-05-23T12:12:17Z

← Nächstältere Version		Version vom 23. Mai 2023, 14:12 Uhr
Zeile 263:		Zeile 263:
	'?Preis#-p0=price',		'?Preis#-p0=price',
	'mainlabel=-',		'mainlabel=-',
	'limit=1'		'limit=1',
			'order=asc',
			'sort=Preis',
	}		}

FoXFTW am 23. Mai 2023 um 11:42 Uhr

2023-05-23T11:42:50Z

← Nächstältere Version		Version vom 23. Mai 2023, 13:42 Uhr
Zeile 253:		Zeile 253:

	return round( priceNum * ( 1 - ( percentage / 100 ) ), power )		return round( priceNum * ( 1 - ( percentage / 100 ) ), power )
			end


			--- @param name string
			--- @return table
			function Commodity.getPrice( name )
			local query = {
			'[[Name::' .. name .. ']][[Kaufbar::1]]',
			'?Preis#-p0=price',
			'mainlabel=-',
			'limit=1'
			}

			return mw.smw.ask( query )
	end		end

FoXFTW: Fix setting commodity rental data

2023-05-14T09:16:23Z

Fix setting commodity rental data

← Nächstältere Version		Version vom 14. Mai 2023, 11:16 Uhr
Zeile 88:		Zeile 88:

	if commodity.rental_price_days.duration_1 ~= nil then		if commodity.rental_price_days.duration_1 ~= nil then
	object[ '1 Tag' ] = common.formatNum( commodity.duration_1, 0 ) .. ' aUEC'		object[ '1 Tag' ] = common.formatNum( commodity.rental_price_days.duration_1, 0 ) .. ' aUEC'
	object[ '3 Tage' ] = common.formatNum( commodity.duration_3, 0 ) .. ' aUEC'		object[ '3 Tage' ] = common.formatNum( commodity.rental_price_days.duration_3, 0 ) .. ' aUEC'
	object[ '7 Tage' ] = common.formatNum( commodity.duration_7, 0 ) .. ' aUEC'		object[ '7 Tage' ] = common.formatNum( commodity.rental_price_days.duration_7, 0 ) .. ' aUEC'
	object[ '30 Tage' ] = common.formatNum( commodity.duration_30, 0 ) .. ' aUEC'		object[ '30 Tage' ] = common.formatNum( commodity.rental_price_days.duration_30, 0 ) .. ' aUEC'
	else		else
	object[ '1 Tag' ] = common.formatNum( commodity.rental_price_days[ 1 ], 0 ) .. ' aUEC'		object[ '1 Tag' ] = common.formatNum( commodity.rental_price_days[ 1 ], 0 ) .. ' aUEC'

FoXFTW: bug: Fix setting rental subobject

2023-05-14T08:16:21Z

bug: Fix setting rental subobject

← Nächstältere Version		Version vom 14. Mai 2023, 10:16 Uhr
Zeile 99:		Zeile 99:
	end		end

	mw.smw.subobject( )		mw.smw.subobject( object )
	end		end

FoXFTW am 12. Mai 2023 um 08:27 Uhr

2023-05-12T08:27:26Z

← Nächstältere Version		Version vom 12. Mai 2023, 10:27 Uhr
Zeile 75:		Zeile 75:
	return		return
	end		end

	~~mw.smw.subobject(~~ {		local object = {
	[ 'Name' ] = commodity.name,		[ 'Name' ] = commodity.name,
	[ 'UUID' ] = commodity.uuid,		[ 'UUID' ] = commodity.uuid,
Zeile 84:		Zeile 84:
	[ 'Ort' ] = shop.position,		[ 'Ort' ] = shop.position,

	[ '1 Tag' ] = common.formatNum( commodity.rental_price_days[ 1 ], 0 ) .. ' aUEC',		[ 'Spielversion' ] = commodity.version,
	[ '3 Tage' ] = common.formatNum( commodity.rental_price_days[ 3 ], 0 ) .. ' aUEC',		}
	[ '7 Tage' ] = common.formatNum( commodity.rental_price_days[ 7 ], 0 ) .. ' aUEC',
	[ '30 Tage' ] = common.formatNum( commodity.rental_price_days[ 30 ], 0 ) .. ' aUEC',		if commodity.rental_price_days.duration_1 ~= nil then
			object[ '1 Tag' ] = common.formatNum( commodity.duration_1, 0 ) .. ' aUEC'
			object[ '3 Tage' ] = common.formatNum( commodity.duration_3, 0 ) .. ' aUEC'
			object[ '7 Tage' ] = common.formatNum( commodity.duration_7, 0 ) .. ' aUEC'
			object[ '30 Tage' ] = common.formatNum( commodity.duration_30, 0 ) .. ' aUEC'
			else
			object[ '1 Tag' ] = common.formatNum( commodity.rental_price_days[ 1 ], 0 ) .. ' aUEC'
			object[ '3 Tage' ] = common.formatNum( commodity.rental_price_days[ 3 ], 0 ) .. ' aUEC'
			object[ '7 Tage' ] = common.formatNum( commodity.rental_price_days[ 7 ], 0 ) .. ' aUEC'
			object[ '30 Tage' ] = common.formatNum( commodity.rental_price_days[ 30 ], 0 ) .. ' aUEC'
			end

	~~[ 'Spielversion' ] = commodity~~.~~version,~~		mw.smw.subobject( )
	} )
	end		end

Zeile 140:		Zeile 149:
	end		end

	local data = ~~nil~~		local data = {}
	if type( shop.items.data ) == 'table' then		if type( shop.items.data ) == 'table' then
	data = shop.items.data		data = shop.items.data
	elseif type( shop.items ) == 'table' then		elseif type( shop.items ) == 'table' then
	data = shop.items		data = shop.items
	~~else~~
	~~return~~
	end		end

Zeile 168:		Zeile 175:
	end		end

	local shopData = ~~nil~~		local shopData = {}
	if type( data.shops.data ) == 'table' then		if type( data.shops.data ) == 'table' then
	shopData = data.shops.data		shopData = data.shops.data
	elseif type( data.shops ) == 'table' then		elseif type( data.shops ) == 'table' then
	shopData = data.shops		shopData = data.shops
	~~else~~
	~~return~~
	end		end

FoXFTW: Fix

2023-05-12T06:59:43Z

Fix

← Nächstältere Version		Version vom 12. Mai 2023, 08:59 Uhr
Zeile 168:		Zeile 168:
	end		end

	local ~~data~~ = nil		local shopData = nil
	if type( data.shops.data ) == 'table' then		if type( data.shops.data ) == 'table' then
	~~data~~ = data.shops.data		shopData = data.shops.data
	elseif type( data.shops ) == 'table' then		elseif type( data.shops ) == 'table' then
	~~data~~ = data.shops		shopData = data.shops
	else		else
	return		return
	end		end

	for _, shop in pairs( ~~data~~ ) do		for _, shop in pairs( shopData ) do
	self:addShop( shop )		self:addShop( shop )
	end		end

FoXFTW am 11. Mai 2023 um 17:55 Uhr

2023-05-11T17:55:22Z

← Nächstältere Version		Version vom 11. Mai 2023, 19:55 Uhr
Zeile 136:		Zeile 136:
	--- @return void		--- @return void
	function methodtable.addShop( self, shop )		function methodtable.addShop( self, shop )
	if type( shop ) ~= 'table' or shop.items == nil ~~or type( shop.items.data ) ~= 'table'~~ then		if type( shop ) ~= 'table' or shop.items == nil then
	return		return
	end		end

			local data = nil
			if type( shop.items.data ) == 'table' then
			data = shop.items.data
			elseif type( shop.items ) == 'table' then
			data = shop.items
			else
			return
			end

	for _, commodity in pairs( ~~shop.items.~~data ) do		for _, commodity in pairs( data ) do
	commodity = fixVehicleName( commodity )		commodity = fixVehicleName( commodity )
	commodity = fixType( commodity )		commodity = fixType( commodity )
Zeile 155:		Zeile 164:
	--- @return void		--- @return void
	function methodtable.addShopData( self, data )		function methodtable.addShopData( self, data )
	if type( data ) ~= 'table' or data.shops == nil or type( data.shops~~.data~~ ) ~= 'table' then		if type( data ) ~= 'table' or data.shops == nil or type( data.shops ) ~= 'table' then
	return		return
	end		end

	for _, shop in pairs( ~~data.shops.~~data ) do		local data = nil
			if type( data.shops.data ) == 'table' then
			data = data.shops.data
			elseif type( data.shops ) == 'table' then
			data = data.shops
			else
			return
			end

			for _, shop in pairs( data ) do
	self:addShop( shop )		self:addShop( shop )
	end		end

imported>FoXFTW am 11. Januar 2022 um 15:15 Uhr

2022-01-11T15:15:53Z

Neue Seite

local Commodity = {}

local metatable = {}
local methodtable = {}
local common = require('Module:Common')

metatable.__index = methodtable

local function round( number, decimals )
local power = 10^decimals
return math.floor( number * power ) / power
end

--- Removes the Manufacturer Prefix from vehicle entries
---
--- @param commodity table
--- @return table
local function fixVehicleName( commodity )
if commodity == nil or commodity.type == nil then
return commodity
end

if ( commodity.type == 'Vehicle' or commodity.type == 'GroundVehicle' ) and commodity.name ~= nil and commodity.fixed == nil then
local exploded = mw.text.split( commodity.name, ' ', true )
table.remove( exploded, 1 )

commodity.name = mw.text.trim( table.concat( exploded, ' ' ) )
commodity.fixed = true
end

return commodity
end

--- Updates the type for vehicles
---
--- @param commodity table
--- @return table
local function fixType( commodity )
if commodity == nil or commodity.type == nil then
return commodity
end

if commodity.type == 'Vehicle' or commodity.type == 'GroundVehicle' then
if commodity.sub_type == 'Vehicle_Spaceship' then
commodity.type = {
'Raumschiff@de',
'Ship@en',
}
else
commodity.type = {
'Fahrzeug@de',
'Vehicle@en',
}
end
else
commodity.type = {
commodity.type .. '@en',
commodity.type .. '@de',
}
end

return commodity
end

--- Adds a rental subobejct, if the commodity can be rented
---
--- @param commodity table
--- @param shop table
local function addRentalSubObject( commodity, shop )
if commodity.rentable == false or type( commodity.rental_price_days ) ~= 'table' then
return
end

mw.smw.subobject( {
[ 'Name' ] = commodity.name,
[ 'UUID' ] = commodity.uuid,
[ 'Typ' ] = commodity.type,

[ 'Händler' ] = shop.name,
[ 'Ort' ] = shop.position,

[ '1 Tag' ] = common.formatNum( commodity.rental_price_days[ 1 ], 0 ) .. ' aUEC',
[ '3 Tage' ] = common.formatNum( commodity.rental_price_days[ 3 ], 0 ) .. ' aUEC',
[ '7 Tage' ] = common.formatNum( commodity.rental_price_days[ 7 ], 0 ) .. ' aUEC',
[ '30 Tage' ] = common.formatNum( commodity.rental_price_days[ 30 ], 0 ) .. ' aUEC',

[ 'Spielversion' ] = commodity.version,
} )
end

--- Adds a buy subobejct, if the commodity can be bought
---
--- @param commodity table
--- @param shop table
local function addBuySubObject( commodity, shop )
if commodity.buyable == false then
return
end

mw.smw.subobject( {
[ 'UUID' ] = commodity.uuid,
[ 'Name' ] = commodity.name,
[ 'Basispreis' ] = common.formatNum( commodity.base_price or nil, nil ),
[ 'Preis' ] = common.formatNum( commodity.price_calculated or nil, nil ),
[ 'Minimalpreis' ] = common.formatNum( commodity.price_range.min or nil, nil ),
[ 'Maximalpreis' ] = common.formatNum( commodity.price_range.max or nil, nil ),

[ 'Preisoffset' ] = common.formatNum( commodity.base_price_offset or nil, nil ),
[ 'Rabatt' ] = common.formatNum( commodity.max_discount or nil, nil ),
[ 'Premium' ] = common.formatNum( commodity.max_premium or nil, nil ),
[ 'Bestand' ] = common.formatNum( commodity.inventory or nil, nil ),
[ 'Maximalbestand' ] = common.formatNum( commodity.max_inventory or nil, nil ),
[ 'Wiederauffüllungsrate' ] = common.formatNum( commodity.refresh_rate or nil, nil ),

[ 'Kaufbar' ] = commodity.buyable,
[ 'Verkaufbar' ] = commodity.sellable,
[ 'Mietbar' ] = type( commodity.rental_price_days ) == 'table',
[ 'Typ' ] = commodity.type,

[ 'Händler' ] = shop.name,
[ 'Ort' ] = shop.position,

[ 'Spielversion' ] = commodity.version,
} )
end

--- Adds all available commodities from a shop to the page
---
--- @param shop table
--- @return void
function methodtable.addShop( self, shop )
if type( shop ) ~= 'table' or shop.items == nil or type( shop.items.data ) ~= 'table' then
return
end

for _, commodity in pairs( shop.items.data ) do
commodity = fixVehicleName( commodity )
commodity = fixType( commodity )

addBuySubObject( commodity, shop )
addRentalSubObject( commodity, shop )
end
end

--- Adds all available shop data to the page
---
--- @param data table
--- @return void
function methodtable.addShopData( self, data )
if type( data ) ~= 'table' or data.shops == nil or type( data.shops.data ) ~= 'table' then
return
end

for _, shop in pairs( data.shops.data ) do
self:addShop( shop )
end
end

function Commodity.formatOffset( offset )
if offset == nil or offset == 0 or offset == '0' then
return '0%'
end

return '<span title="' .. offset .. '%">' .. math.floor( offset ) .. '%</span>'
end

--- Calculates the price based on the items offset
--- price * ( 1 + ( offset / 100 ) )
---
--- @param price string|number base price
--- @param offset string|number|nil offset
--- @return string
function Commodity.calcPrice( price, offset, power )
power = power or 0
offset = common.toNumber( offset, false )

if type( price ) == 'table' then
price = price[ 1 ]
end

local priceNum = common.toNumber( price, false )

if offset == nil or offset == false or offset == 0 or offset == -100 then
return mw.getContentLanguage():formatNum( priceNum )
end

if priceNum == false then
-- Failsafe
return price
end

priceNum = round( priceNum * ( 1 + ( offset / 100 ) ), power )
local formatted = mw.getContentLanguage():formatNum( priceNum )

if formatted == nil then
return priceNum
end

return formatted
end

--- Calculates a price plus or minus a given percentage
---
--- @param price string|number price
--- @param range string|number|nil range call as whole percent (e.g. 25 for 25% etc.)
--- @param isPremium boolean True to add percentage
--- @return number
function Commodity.calcPricePP( price, percentage, isPremium, power )
power = power or 0
local priceNum = common.toNumber( price, false )
percentage = common.toNumber( percentage, false )

if percentage == false or priceNum == false then
return price
end

if isPremium == true then
percentage = percentage * -1
end

return round( priceNum * ( 1 - ( percentage / 100 ) ), power )
end

--- New Instance
--- Library entrance
function Commodity.new( self )
local instance = {}

setmetatable( instance, metatable )

return instance
end

return Commodity