Some news-related file rearrangements (#27347)

* goodbye

* hello

* ground work

* why tho
This commit is contained in:
DeityLink
2020-08-02 22:04:45 +02:00
committed by GitHub
parent dcc3b52613
commit 9bc85f1215
8 changed files with 19 additions and 21 deletions

View File

@@ -9,7 +9,7 @@ var/datum/subsystem/more_init/SSmore_init
NEW_SS_GLOBAL(SSmore_init)
/datum/subsystem/more_init/Initialize(timeofday)
setup_economy()
setup_news()
var/watch=start_watch()
log_startup_progress("Caching damage icons...")
cachedamageicons()

View File

@@ -208,9 +208,6 @@ var/datum/controller/gameticker/ticker
player.new_player_panel_proc()
//here to initialize the random events nicely at round start
setup_economy()
#if UNIT_TESTS_AUTORUN
run_unit_tests()
#endif

View File

@@ -26,9 +26,10 @@ var/list/event_last_fired = list()
// code\modules\Economy\Economy_Events.dm
// code\modules\Economy\Economy_Events_Mundane.dm
//Commented out for now. Let's be honest, a string of text on PDA is not worth a meteor shower or ion storm
//possibleEvents[/datum/event/economic_event] = 100
//possibleEvents[/datum/event/trivial_news] = 150
//possibleEvents[/datum/event/mundane_news] = 100
//Will be re-implemented in the near future, its chance to proc will be independant from the other random events
//possibleEvents[/datum/event/news_event] = 100//
//possibleEvents[/datum/event/trivial_news] = 150//Gibson Gazette, taken from config/trivial.txt
//possibleEvents[/datum/event/mundane_news] = 100//Tau Ceti Daily
//It is this coder's thought that weighting events on job counts is dumb and predictable as hell. 10 Engies ? Hope you like Meteors
//Instead, weighting goes from 100 (boring and common) to 10 (exceptional)

View File

@@ -63,9 +63,9 @@
//Destroyers are medium sized vessels, often used for escorting larger ships but able to go toe-to-toe with them if need be.
//Frigates are medium sized vessels, often used for escorting larger ships. They will rapidly find themselves outclassed if forced to face heavy warships head on.
var/setup_economy = 0
/proc/setup_economy()
if(setup_economy)
var/setup_news = 0
/proc/setup_news()
if(setup_news)
return
var/datum/feed_channel/newChannel = new /datum/feed_channel
newChannel.channel_name = "Tau Ceti Daily"
@@ -86,4 +86,4 @@ var/setup_economy = 0
weighted_randomevent_locations[D] = D.viable_random_events.len
weighted_mundaneevent_locations[D] = D.viable_mundane_events.len
setup_economy = 1
setup_news = 1

View File

@@ -1,5 +1,5 @@
/datum/event/economic_event
/datum/event/news_event
endWhen = 50 //this will be set randomly, later
announceWhen = 15
var/event_type = 0
@@ -7,9 +7,9 @@
var/list/dearer_goods = list()
var/datum/trade_destination/affected_dest
/datum/event/economic_event/start()
if(!setup_economy)
setup_economy()
/datum/event/news_event/start()
if(!setup_news)
setup_news()
affected_dest = pickweight(weighted_randomevent_locations)
if(affected_dest.viable_random_events.len)
@@ -54,7 +54,7 @@
for(var/good_type in cheaper_goods)
affected_dest.temp_price_change[good_type] = rand(1,100) / 100
/datum/event/economic_event/announce()
/datum/event/news_event/announce()
//copy-pasted from the admin verbs to submit new newscaster messages
var/datum/feed_message/newMsg = new /datum/feed_message
newMsg.author = "Tau Ceti Daily"
@@ -101,7 +101,7 @@
for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
NEWSCASTER.newsAlert("Tau Ceti Daily")
/datum/event/economic_event/end()
/datum/event/news_event/end()
for(var/good_type in dearer_goods)
affected_dest.temp_price_change[good_type] = 1
for(var/good_type in cheaper_goods)

View File

@@ -1465,10 +1465,6 @@
#include "code\modules\Economy\Accounts.dm"
#include "code\modules\Economy\AdminTools.dm"
#include "code\modules\Economy\debit_card.dm"
#include "code\modules\Economy\Economy.dm"
#include "code\modules\Economy\Economy_Events.dm"
#include "code\modules\Economy\Economy_Events_Mundane.dm"
#include "code\modules\Economy\Economy_TradeDestinations.dm"
#include "code\modules\Economy\EFTPOS.dm"
#include "code\modules\Economy\Job_Departments.dm"
#include "code\modules\Economy\POS.dm"
@@ -2006,6 +2002,10 @@
#include "code\modules\nano\nanoexternal.dm"
#include "code\modules\nano\nanomanager.dm"
#include "code\modules\nano\nanoui.dm"
#include "code\modules\news\news.dm"
#include "code\modules\news\news_events.dm"
#include "code\modules\news\news_events_mundane.dm"
#include "code\modules\news\news_trade_destinations.dm"
#include "code\modules\optics\photocollector.dm"
#include "code\modules\optics\prism.dm"
#include "code\modules\optics\mirrors\frame.dm"